ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up unexpected error handling

Browse Source
This commit is contained in:
Matthew Oslan
2019-09-02 12:11:27 -04:00
parent 1a1ecafcb0
commit 3f11dbc1cc
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
errors.ts
View File

@@ -55,11 +55,11 @@ export enum ErrorCode {
}
/** An error with a numeric code that can be used to identify the type of error. */
export class CodedError {
export class CodedError extends Error {
public readonly errCode: ErrorCode;
public readonly message: string;
public constructor( errCode: ErrorCode ) {
public constructor( errCode: ErrorCode, message?: string ) {
super( message );
this.errCode = errCode;
}
}

25
routes/weather.ts
View File

@@ -219,12 +219,7 @@ export const getWateringData = async function( req: express.Request, res: expres
try {
coordinates = await resolveCoordinates( location );
} catch ( err ) {
let codedError: CodedError = makeCodedError( err );
if ( codedError.errCode === ErrorCode.UnexpectedError ) {
console.error( `An unexpected error occurred during location resolution for "${ req.url }": `, err );
}
sendWateringError( res, codedError );
sendWateringError( res, makeCodedError( err ) );
return;
}
@@ -283,12 +278,7 @@ export const getWateringData = async function( req: express.Request, res: expres
adjustmentOptions, coordinates, weatherProvider, pws
);
} catch ( err ) {
let codedError: CodedError = makeCodedError( err );
if ( codedError.errCode === ErrorCode.UnexpectedError ) {
console.error( `An unexpected error occurred during watering scale calculation for "${ req.url }": `, err );
}
sendWateringError( res, codedError );
sendWateringError( res, makeCodedError( err ) );
return;
}
@@ -303,12 +293,7 @@ export const getWateringData = async function( req: express.Request, res: expres
try {
wateringData = await weatherProvider.getWateringData( coordinates );
} catch ( err ) {
let codedError: CodedError = makeCodedError( err );
if ( codedError.errCode === ErrorCode.UnexpectedError ) {
console.error( `An unexpected error occurred during restriction checks for "${ req.url }": `, err );
}
sendWateringError( res, codedError );
sendWateringError( res, makeCodedError( err ) );
return;
}
}
@@ -339,6 +324,10 @@ export const getWateringData = async function( req: express.Request, res: expres
* @param useJson Indicates if the response body should use a JSON format instead of a format similar to URL query strings.
*/
function sendWateringError( res: express.Response, error: CodedError, useJson: boolean = false ) {
if ( error.errCode === ErrorCode.UnexpectedError ) {
console.error( `An unexpected error occurred:`, error );
}
sendWateringData( res, { errCode: error.errCode, scale: 100 } );
}