Merge pull request #321 from HarryEMartland/feat-restart-event-reques…

…t-after-connection-error

retry on other error codes and sets max retry delay

lib/events.js

@@ -26,6 +26,8 @@ module.exports = function(Cam) {
 
 	const linerase = require('./utils').linerase;
 	const parseSOAPString = require('./utils').parseSOAPString;
+	const retryErrorCodes = ['ECONNREFUSED','ECONNRESET','ETIMEDOUT', 'ENETUNREACH'];
+	const maxEventReconnectMs = 2 * 60 * 1000;
 
 
 	/**
@@ -350,10 +352,11 @@ module.exports = function(Cam) {
 				this.createPullPointSubscription(function(error) {
 					if (!error) {
 						this._eventPull();
-					} else if (typeof error === 'object' && error.code === 'ECONNRESET') {
+					} else if (typeof error === 'object' && retryErrorCodes.includes( error.code)) {
 						// connection reset on creation - restart Event loop for pullMessages request
 						this._restartEventRequest();
 					}
+					console.log("Error: " + error.code);
 				}.bind(this));
 			} else {
 				this._eventPull();
@@ -376,6 +379,7 @@ module.exports = function(Cam) {
 			}, function(err, data, xml) {
 				if (!err) {
 					if (data.notificationMessage) {
+						this._eventReconnectms = 0;
 						if (!Array.isArray(data.notificationMessage)) {
 							data.notificationMessage = [data.notificationMessage];
 						}
@@ -424,11 +428,13 @@ module.exports = function(Cam) {
 	 */
 	Cam.prototype._restartEventRequest = function() {
 		// TODO maybe stop trying to connect after some time
-		if (!this._eventReconnectms || this._eventReconnectms > 2 * 60 * 1000) {
+		if (!this._eventReconnectms) {
 			this._eventReconnectms = 10;
 		}
 		setTimeout(this._eventRequest.bind(this), this._eventReconnectms);
-		this._eventReconnectms = 1.111 * this._eventReconnectms;
+		if (this._eventReconnectms < maxEventReconnectMs) {
+			this._eventReconnectms = 1.111 * this._eventReconnectms;
+		}
 	};
 
 	/**