homebridge-smartsystem 6.8.5 → 6.8.7

package/README.md

@@ -309,6 +309,8 @@ Homebridge UI version
 - 3: remember request before the login kicked in (and redirect to that one, once the login was succesful)
 - 4: now using only TCP sockets to the server
 - 5: making it more robust / inline with repo-service version
+- 6: removed double error handlers on cloudSocket
+- 7: restart if no free connections
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.8.5",
+  "version": "6.8.7",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/proxy.js

@@ -38,6 +38,7 @@ catch (e) {
     setProxyConfig();
     console.log("No config-proxy.json found, using default values from homebridge or other.");
 }
+let connectionChecker = null;
 const gCloudConnections = [];
 const kDebug = config.debug || false; // enable debug mode from config
 /////////////
@@ -60,13 +61,23 @@ function error(str) {
 ///////////////////////////////
 // Start up the proxy server //
 ///////////////////////////////
-if (config.uniqueId) {
-    makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
-}
+cleanStart(true);
 function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count = 0) {
+    // retry making a cloud connection
+    function reconnect(err) {
+        error(`[PROXY] → [CLOUD] Failed to connect ${count + 1} times to the Cloud server: ${err.message}`);
+        if (count < 3) {
+            setTimeout(() => {
+                makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count + 1);
+            }, 1000);
+        }
+    }
     const cloudSocket = new net.Socket();
+    cloudSocket.once('error', reconnect);
+    log(`[PROXY] → [CLOUD] Attempt ${count + 1} to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
     cloudSocket.connect(serverPort, server, () => {
         log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
+        cloudSocket.removeListener('error', reconnect);
         // Send unique ID as the first message to identify this proxy/device
         cloudSocket.write(`[${uniqueId}]`);
         debug(`[PROXY] → [CLOUD] Sent unique ID: ${uniqueId}`);
@@ -74,27 +85,32 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
         gCloudConnections.push(context);
         log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
     });
-    cloudSocket.on('error', (err) => {
-        error(`[PROXY] → [CLOUD] Failed to connect ${count + 1} times to the Cloud server: ${err.message}`);
-        if (count < 3) {
-            setTimeout(() => {
-                makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count + 1);
-            }, 1000);
-        }
-    });
-    log(`[PROXY] → [CLOUD] Attempt ${count + 1} to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
 }
 exports.makeNewCloudConnection = makeNewCloudConnection;
 ////////////////
 // Restarting //
 ////////////////
 function cleanStart(restart = false) {
-    gCloudConnections.forEach(ctx => ctx.cleanupSockets());
-    log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
-    gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+    if (gCloudConnections.length) {
+        gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+        log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
+        gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+    }
+    if (connectionChecker) {
+        clearInterval(connectionChecker);
+        connectionChecker = null;
+    }
     if (restart) {
         if (config.uniqueId) {
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+            // check every 5 second for a free connection
+            connectionChecker = setInterval(() => {
+                const freeConnection = gCloudConnections.find((ctx) => (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open'));
+                if (!freeConnection) {
+                    error(`[PROXY] → [CLOUD] No free connections available, restarting proxy. ***************************`);
+                    cleanStart(true);
+                }
+            }, 5000);
         }
         else {
             log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
@@ -293,6 +309,8 @@ function restart() {
 // Graceful shutdown handler
 function handleShutdown(signal) {
     log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
+    if (connectionChecker)
+        clearInterval(connectionChecker);
     // Close all cloud connections
     gCloudConnections.forEach(ctx => ctx.cleanupSockets());
     gCloudConnections.splice(0, gCloudConnections.length);

package/server/proxy.ts

@@ -51,6 +51,7 @@ try {
 }
 
 
+let connectionChecker: NodeJS.Timer | null = null;
 
 const gCloudConnections: Array<Context> = [];
 const kDebug = config.debug || false; // enable debug mode from config
@@ -77,16 +78,28 @@ function error(str: string) {
 ///////////////////////////////
 // Start up the proxy server //
 ///////////////////////////////
-if (config.uniqueId) {
-  makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
-}
+cleanStart(true);
 
 
 export function makeNewCloudConnection(master: string, masterPort: number, server: string, serverPort: number, uniqueId: string, count = 0) {
+  // retry making a cloud connection
+  function reconnect(err: Error) {
+    error(`[PROXY] → [CLOUD] Failed to connect ${count+1} times to the Cloud server: ${err.message}`);
+    if (count < 3) {
+      setTimeout(() => {
+        makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count + 1);
+      }, 1000);
+    }
+  }
+
   const cloudSocket = new net.Socket();
-  
+  cloudSocket.once('error', reconnect);
+
+  log(`[PROXY] → [CLOUD] Attempt ${count+1} to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
+
   cloudSocket.connect(serverPort, server, () => {
     log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
+    cloudSocket.removeListener('error', reconnect);
     
     // Send unique ID as the first message to identify this proxy/device
     cloudSocket.write(`[${uniqueId}]`);
@@ -96,17 +109,6 @@ export function makeNewCloudConnection(master: string, masterPort: number, serve
     gCloudConnections.push(context);
     log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
   });
-
-  cloudSocket.on('error', (err) => {
-    error(`[PROXY] → [CLOUD] Failed to connect ${count+1} times to the Cloud server: ${err.message}`);
-    if (count < 3) {
-      setTimeout(() => {
-        makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count + 1);
-      }, 1000);
-    }
-  });
-
-  log(`[PROXY] → [CLOUD] Attempt ${count+1} to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
 }
 
 
@@ -114,14 +116,33 @@ export function makeNewCloudConnection(master: string, masterPort: number, serve
 // Restarting //
 ////////////////
 export function cleanStart(restart: boolean = false) {
-  gCloudConnections.forEach(ctx => ctx.cleanupSockets());
-  log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
+  if (gCloudConnections.length) {
+    gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+    log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
 
-  gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+    gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+  }
+
+  if (connectionChecker) {
+    clearInterval(connectionChecker);
+    connectionChecker = null;
+  }
 
   if (restart) {
     if (config.uniqueId) {
       makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+
+      // check every 5 second for a free connection
+      connectionChecker = setInterval(() => {
+        const freeConnection = gCloudConnections.find((ctx: Context) =>
+          (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open')
+        );
+        if (!freeConnection) {
+          error(`[PROXY] → [CLOUD] No free connections available, restarting proxy. ***************************`);
+          cleanStart(true);
+        }
+      }, 5000);
+
     } else {
       log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
     }
@@ -364,6 +385,8 @@ function restart() {
 function handleShutdown(signal: string) {
   log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
 
+  if (connectionChecker)clearInterval(connectionChecker);
+
   // Close all cloud connections
   gCloudConnections.forEach(ctx => ctx.cleanupSockets());
   gCloudConnections.splice(0, gCloudConnections.length);