Attempt to fix 'stalling' of rain updates

Author: gvdhoven

dutch-weather.js

@@ -45,6 +45,10 @@ module.exports = function(RED) {
 		}
 
 		var node = this;
+		this.conf.weatherLogic.on('rain-error', function (msg) {
+			node.warn(msg);
+		});
+
 		this.conf.weatherLogic.on('rain-state', function (rainState) {
 			node.send({ 'topic': 'rain-state', 'payload': rainState});
 		});

lib/WeatherLogic.js

@@ -171,23 +171,37 @@ class WeatherLogic extends EventEmitter {
 			var atTime = new Date(after.getTime() + (inMinutes * MINUTE));
 
 			// Get forecasts for both providers
+			var buienalarmPrecipitation = -1;
 			try {
-				var buienalarmPrecipitation = await this.Buienalarm.getForecast(atTime);
-				var buienradarPrecipitation = await this.Buienradar.getForecast(atTime);
-				if ((buienradarPrecipitation != null) && (buienalarmPrecipitation != null)) {
-					var stateAtTime = this.rainStatePayload(atTime, inMinutes, buienradarPrecipitation.mmh, buienalarmPrecipitation.mmh);
-					
-					if (!tempState.hasOwnProperty('now')) {
-						tempState.now = stateAtTime;
-					} else {
-						if (!tempState.hasOwnProperty('prediction') && (tempState.now.state !== stateAtTime.state) && (stateAtTime.probability == 100)) {
-						 	tempState.prediction = stateAtTime;
-						 	break;
-						}
-					}
-				}
+				buienalarmPrecipitation = await this.Buienalarm.getForecast(atTime);
+				buienalarmPrecipitation = buienalarmPrecipitation.mmh;
 			} catch(e) {
-				console.log(e);
+				// In case this fails, we log it and use '-1' as value
+				this.emit('rain-error', 'Failed getting prediction for Buienalarm for time ' + atTime.toISOString() + ': ' + JSON.stringify(e));
+				buienalarmPrecipitation = -1;
+			}
+
+			var buienradarPrecipitation = -1;
+			try {
+				buienradarPrecipitation = await this.Buienradar.getForecast(atTime);
+				buienradarPrecipitation = buienradarPrecipitation.mmh;
+			} catch(e) {
+				// In case this fails, we log it and use '-1' as value
+				this.emit('rain-error', 'Failed getting prediction for Buienradar for time ' + atTime.toISOString() + ': ' + JSON.stringify(e));
+				buienradarPrecipitation = -1;
+			}
+
+			var stateAtTime = this.rainStatePayload(atTime, inMinutes, buienradarPrecipitation, buienalarmPrecipitation);
+
+			// First loop we set the 'current' state
+			if (!tempState.hasOwnProperty('now')) {
+				tempState.now = stateAtTime;
+			}
+
+			// Subsequent checks we set the prediction if the state changes
+			if (!tempState.hasOwnProperty('prediction') && (tempState.now.state !== stateAtTime.state) && (stateAtTime.probability == 100)) {
+			 	tempState.prediction = stateAtTime;
+			 	break;
 			}
 		}