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

Make error handling backwards compatible

Browse Source
This commit is contained in:
Matthew Oslan
2019-06-06 17:14:03 -04:00
parent b57b019295
commit f489993d8c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
routes/weather.ts
View File

@@ -225,6 +225,12 @@ export const getWateringData = async function( req: express.Request, res: expres
remoteAddress: string = getParameter(req.headers[ "x-forwarded-for" ]) || req.connection.remoteAddress, remoteAddress: string = getParameter(req.headers[ "x-forwarded-for" ]) || req.connection.remoteAddress,
adjustmentOptions: AdjustmentOptions; adjustmentOptions: AdjustmentOptions;
/* A message to include in the response to indicate that the watering scale was not calculated correctly and
defaulted to 100%. This approach is used for backwards compatibility because older OS firmware versions were
hardcoded to keep the previous watering scale if the response did not include a watering scale, but newer versions
might allow for different behaviors. */
let errorMessage: string = undefined;
// X-Forwarded-For header may contain more than one IP address and therefore // X-Forwarded-For header may contain more than one IP address and therefore
// the string is split against a comma and the first value is selected // the string is split against a comma and the first value is selected
@@ -272,8 +278,9 @@ export const getWateringData = async function( req: express.Request, res: expres
try { try {
scale = calculateZimmermanWateringScale( adjustmentOptions, wateringData ); scale = calculateZimmermanWateringScale( adjustmentOptions, wateringData );
} catch ( err ) { } catch ( err ) {
res.send( "Error: " + err ); // Default to a scale of 100% if the scale can't be calculated.
return; scale = 100;
errorMessage = err;
} }
} }
@@ -305,7 +312,8 @@ export const getWateringData = async function( req: express.Request, res: expres
sunrise: timeData.sunrise, sunrise: timeData.sunrise,
sunset: timeData.sunset, sunset: timeData.sunset,
eip: ipToInt( remoteAddress ), eip: ipToInt( remoteAddress ),
rawData: undefined rawData: undefined,
error: errorMessage
}; };
if ( adjustmentMethod > ADJUSTMENT_METHOD.MANUAL ) { if ( adjustmentMethod > ADJUSTMENT_METHOD.MANUAL ) {
@@ -327,7 +335,8 @@ export const getWateringData = async function( req: express.Request, res: expres
"&sunrise=" + data.sunrise + "&sunrise=" + data.sunrise +
"&sunset=" + data.sunset + "&sunset=" + data.sunset +
"&eip=" + data.eip + "&eip=" + data.eip +
( data.rawData ? "&rawData=" + JSON.stringify( data.rawData ) : "" ) ( data.rawData ? "&rawData=" + JSON.stringify( data.rawData ) : "" ) +
( errorMessage ? "&error=" + encodeURIComponent( errorMessage ) : "" )
); );
} }