homebridge-smartsystem 6.8.4 → 6.8.5

package/README.md

@@ -307,6 +307,8 @@ Homebridge UI version
 - 1: max/min values for hbValues
 - 2: HB up/down -> don't respond to motor unit's, only macro
 - 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
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.8.4",
-  "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
+  "version": "6.8.5",
+  "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
   "homepage": "http://www.duotecno.be",

package/server/proxy.js

@@ -63,7 +63,7 @@ function error(str) {
 if (config.uniqueId) {
     makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
 }
-function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId) {
+function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId, count = 0) {
     const cloudSocket = new net.Socket();
     cloudSocket.connect(serverPort, server, () => {
         log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
@@ -75,27 +75,23 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
         log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
     });
     cloudSocket.on('error', (err) => {
-        error(`[PROXY] → [CLOUD] Failed to connect to Cloud: ${err.message}`);
+        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] Attempting to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
+    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) {
-    if (gCloudConnections.length) {
-        gCloudConnections.forEach(context => {
-            if (context.deviceSocket) {
-                context.deviceSocket.end();
-                context.deviceSocket = null;
-            }
-            context.cloudSocket.end();
-            context.cloudSocket = null;
-        });
-        gCloudConnections.splice(0, gCloudConnections.length); // clear the array
-        log(`[PROXY] → [CLOUD] Cleaned up all cloud connections.`);
-    }
+    gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+    log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
+    gCloudConnections.splice(0, gCloudConnections.length); // clear the array
     if (restart) {
         if (config.uniqueId) {
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
@@ -122,7 +118,7 @@ class Context {
     }
     setupCloudSocket() {
         // set up handlers for the cloud socket
-        this.cloudSocket.on('data', data => {
+        this.cloudSocket.on('data', (data) => {
             this.handleDataFromCloud(data);
         });
         this.cloudSocket.on('close', () => {
@@ -165,8 +161,8 @@ class Context {
             }
         }
         else if (this.deviceSocket.readyState === 'open') {
-            this.deviceSocket.write(new Uint8Array(data));
-            debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().slice(0, -1)}`);
+            this.deviceSocket.write(data);
+            debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().trim()}`);
         }
         else {
             warning(`[PROXY] → [DEVICE] Device socket is not open yet, waiting for connection... what to do with the data??`);
@@ -185,13 +181,13 @@ class Context {
                 }
                 log(`[PROXY] → [DEVICE] Connected to local device at ${address}:${port}`);
                 this.setUpDeviceSocket();
-                log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().slice(0, -1)}`);
-                this.deviceSocket.write(new Uint8Array(data));
+                log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().trim()}`);
+                this.deviceSocket.write(data);
             });
         }
         else if (this.deviceSocket.readyState === 'open') {
             warning(`[PROXY] → [DEVICE] Device socket already open, sending data directly -- STRANGE !!`);
-            this.deviceSocket.write(new Uint8Array(data));
+            this.deviceSocket.write(data);
         }
         else {
             error(`[PROXY] → [DEVICE] Device socket exists, but is not open yet !!`);
@@ -204,8 +200,8 @@ class Context {
         }
         this.deviceSocket.on('data', (data) => {
             const message = data.toString('utf-8');
-            debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.slice(0, -1)}`);
-            this.cloudSocket.write(message);
+            debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.trim()}`);
+            this.cloudSocket.write(data);
         });
         this.deviceSocket.on('close', () => {
             log(`[DEVICE] → [PROXY] Device socket closed`);
@@ -216,33 +212,43 @@ class Context {
             this.removeConnection();
         });
     }
-    removeConnection() {
-        // Clean up device socket
+    cleanupSockets() {
+        // Clean up the device socket
         if (this.deviceSocket) {
             if (!this.deviceSocket.destroyed) {
+                this.deviceSocket.removeAllListeners();
                 this.deviceSocket.end();
+                this.deviceSocket.destroy();
             }
             this.deviceSocket = null;
         }
-        // remove this context and close the cloud socket
-        const index = gCloudConnections.indexOf(this);
-        if (index !== -1) {
-            this.cloudSocket.end();
+        // Clean up the cloud socket
+        if (this.cloudSocket) {
+            if (!this.cloudSocket.destroyed) {
+                this.cloudSocket.removeAllListeners();
+                this.cloudSocket.end();
+                this.cloudSocket.destroy();
+            }
             this.cloudSocket = null;
-            gCloudConnections.splice(index, 1);
-            log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
         }
+    }
+    removeConnection() {
+        const index = gCloudConnections.indexOf(this);
+        if (index !== -1)
+            gCloudConnections.splice(index, 1);
+        this.cleanupSockets();
+        log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
         if (gCloudConnections.length === 0) {
             log(`[PROXY] → [CLOUD] No more cloud connections, restarting proxy.`);
             // just to be sure: restart...
             if (config.kind === "pm2") {
                 // PM2 should restart us.
                 log(`[PROXY] → [CLOUD] PM2 should restart us, exiting now.`);
-                process.exit();
+                setTimeout(() => process.exit(0), 100);
             }
             else if (config.kind === "solo") {
                 log(`[PROXY] → [CLOUD] Running solo, restarting proxy.`);
-                this.restart();
+                restart();
             }
             else {
                 log(`[PROXY] → [CLOUD] Running under gateway/homebridge, not restarting... not sure what to do here.`);
@@ -252,25 +258,18 @@ class Context {
     ///////////////
     // Utilities //
     ///////////////
-    restart() {
-        console.log('🔄 Restarting...');
-        (0, child_process_1.spawn)(process_1.execPath, process_1.argv.slice(1), {
-            cwd: (0, process_1.cwd)(),
-            detached: true,
-            stdio: 'inherit',
-        });
-        process.exit();
-    }
     // check if it's a heartbeat request from the server
     isHeartbeatRequest(data) {
+        const msg = data.toString('utf-8').trim();
+        return msg === '[215,3]';
         // hearbeatKind = (poll = 1, poll_old = 2, serve = 3)
-        return ((data[0] === 91) && // [
-            (data[1] === 50) && // 2
-            (data[2] === 49) && // 1
-            (data[3] === 53) && // 5
-            (data[4] === 44) && // ,
-            (data[5] === 51) && // 3
-            (data[6] === 93)); // ]
+        // return ((data[0] === 91) &&           // [
+        //         (data[1] === 50) &&           // 2
+        //         (data[2] === 49) &&           // 1
+        //         (data[3] === 53) &&           // 5
+        //         (data[4] === 44) &&           // ,
+        //         (data[5] === 51) &&           // 3
+        //         (data[6] === 93));            // ]
     }
     // check if it's a server response after connecting and sending our uniqueID
     isConnectionResponse(data) {
@@ -280,4 +279,50 @@ class Context {
     }
 }
 exports.Context = Context;
+function restart() {
+    console.log('🔄 Restarting...');
+    setTimeout(() => {
+        (0, child_process_1.spawn)(process_1.execPath, process_1.argv.slice(1), {
+            cwd: (0, process_1.cwd)(),
+            detached: true,
+            stdio: 'inherit',
+        });
+        process.exit(0);
+    }, 100);
+}
+// Graceful shutdown handler
+function handleShutdown(signal) {
+    log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
+    // Close all cloud connections
+    gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+    gCloudConnections.splice(0, gCloudConnections.length);
+    log(`[PROXY] → [SYSTEM] All connections closed. Exiting.`);
+    if (config.kind === "solo") {
+        log(`[PROXY] → [SYSTEM] Restarting proxy in solo mode...`);
+        restart();
+    }
+    else {
+        log(`[PROXY] → [SYSTEM] Exiting without restart.`);
+        setTimeout(() => process.exit(0), 100);
+    }
+}
+// Listen for termination signals
+process.on('SIGINT', () => handleShutdown('SIGINT'));
+process.on('SIGTERM', () => handleShutdown('SIGTERM'));
+process.on('SIGINT', (err) => {
+    error(`[SYSTEM] received SIGINT`);
+    handleShutdown('SIGINT');
+});
+process.on('SIGTERM', (err) => {
+    error(`[SYSTEM] received SIGTERM`);
+    handleShutdown('SIGTERM');
+});
+process.on('uncaughtException', (err) => {
+    error(`[SYSTEM] Uncaught Exception: ${err.message}`);
+    handleShutdown('uncaughtException');
+});
+process.on('unhandledRejection', (reason) => {
+    error(`[SYSTEM] Unhandled Rejection: ${reason}`);
+    handleShutdown('unhandledRejection');
+});
 //# sourceMappingURL=proxy.js.map

package/server/proxy.ts

@@ -44,7 +44,7 @@ export function setProxyConfig(c?: ProxyConfig): ProxyConfig {
 
 let config: ProxyConfig;
 try {
-  setProxyConfig(require('../config-proxy.json'))
+  setProxyConfig(require('../config-proxy.json'));
 } catch (e) {
   setProxyConfig();
   console.log("No config-proxy.json found, using default values from homebridge or other.");
@@ -82,7 +82,7 @@ if (config.uniqueId) {
 }
 
 
-export function makeNewCloudConnection(master: string, masterPort: number, server: string, serverPort: number, uniqueId: string) {
+export function makeNewCloudConnection(master: string, masterPort: number, server: string, serverPort: number, uniqueId: string, count = 0) {
   const cloudSocket = new net.Socket();
   
   cloudSocket.connect(serverPort, server, () => {
@@ -98,10 +98,15 @@ export function makeNewCloudConnection(master: string, masterPort: number, serve
   });
 
   cloudSocket.on('error', (err) => {
-    error(`[PROXY] → [CLOUD] Failed to connect to Cloud: ${err.message}`);
+    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] Attempting to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
+  log(`[PROXY] → [CLOUD] Attempt ${count+1} to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
 }
 
 
@@ -109,18 +114,10 @@ export function makeNewCloudConnection(master: string, masterPort: number, serve
 // Restarting //
 ////////////////
 export function cleanStart(restart: boolean = false) {
-  if (gCloudConnections.length) {
-    gCloudConnections.forEach(context => {
-      if (context.deviceSocket) {
-        context.deviceSocket.end();
-        context.deviceSocket = null;
-      }
-      context.cloudSocket.end();
-      context.cloudSocket = null;
-    });
-    gCloudConnections.splice(0, gCloudConnections.length); // clear the array
-    log(`[PROXY] → [CLOUD] Cleaned up all cloud connections.`);
-  }
+  gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+  log(`[PROXY] → [CLOUD] Cleaned up all ${gCloudConnections.length} cloud connections.`);
+
+  gCloudConnections.splice(0, gCloudConnections.length); // clear the array
 
   if (restart) {
     if (config.uniqueId) {
@@ -135,11 +132,11 @@ export function cleanStart(restart: boolean = false) {
 
 
 export class Context {
-  deviceSocket: net.Socket;
+  deviceSocket: net.Socket | null;
   master: string;
   masterPort: number;
 
-  cloudSocket: net.Socket;
+  cloudSocket: net.Socket | null;
   server: string;
   serverPort: number;
 
@@ -162,8 +159,8 @@ export class Context {
 
   setupCloudSocket() {
     // set up handlers for the cloud socket
-    this.cloudSocket.on('data', data => {
-      this.handleDataFromCloud(data as Buffer);
+    this.cloudSocket.on('data', (data: Buffer) => {
+      this.handleDataFromCloud(data);
     });
 
     this.cloudSocket.on('close', () => {
@@ -210,8 +207,8 @@ export class Context {
       }
 
     } else if (this.deviceSocket.readyState === 'open') {
-      this.deviceSocket.write(new Uint8Array(data));
-      debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().slice(0, -1)}`);
+      this.deviceSocket.write(data);
+      debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().trim()}`);
 
     } else {
       warning(`[PROXY] → [DEVICE] Device socket is not open yet, waiting for connection... what to do with the data??`);
@@ -236,14 +233,14 @@ export class Context {
         log(`[PROXY] → [DEVICE] Connected to local device at ${address}:${port}`);
 
         this.setUpDeviceSocket();
-  
-        log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().slice(0, -1)}`);
-        this.deviceSocket.write(new Uint8Array(data));
+
+        log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().trim()}`);
+        this.deviceSocket.write(data);
       });
 
     } else if (this.deviceSocket.readyState === 'open') {
         warning(`[PROXY] → [DEVICE] Device socket already open, sending data directly -- STRANGE !!`);
-        this.deviceSocket.write(new Uint8Array(data));
+        this.deviceSocket.write(data);
 
     } else {
       error(`[PROXY] → [DEVICE] Device socket exists, but is not open yet !!`);
@@ -258,8 +255,8 @@ export class Context {
 
     this.deviceSocket.on('data', (data: Buffer) => {
       const message = data.toString('utf-8');
-      debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.slice(0, -1)}`);
-      this.cloudSocket.write(message);
+      debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.trim()}`);
+      this.cloudSocket.write(data);
     });
 
     this.deviceSocket.on('close', () => {
@@ -273,23 +270,34 @@ export class Context {
     });
   }
 
-  removeConnection() {
-    // Clean up device socket
+  cleanupSockets() {
+    // Clean up the device socket
     if (this.deviceSocket) {
       if (!this.deviceSocket.destroyed) {
+        this.deviceSocket.removeAllListeners();
         this.deviceSocket.end();
+        this.deviceSocket.destroy();
       }
       this.deviceSocket = null;
     }
 
-    // remove this context and close the cloud socket
-    const index = gCloudConnections.indexOf(this);
-    if (index !== -1) {
-      this.cloudSocket.end();
+    // Clean up the cloud socket
+    if (this.cloudSocket) {
+      if (!this.cloudSocket.destroyed) {
+        this.cloudSocket.removeAllListeners();
+        this.cloudSocket.end();
+        this.cloudSocket.destroy();
+      }
       this.cloudSocket = null;
-      gCloudConnections.splice(index, 1);
-      log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
     }
+  }
+
+  removeConnection() {
+    const index = gCloudConnections.indexOf(this);
+    if (index !== -1) gCloudConnections.splice(index, 1);
+
+    this.cleanupSockets();
+    log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
 
     if (gCloudConnections.length === 0) {
         log(`[PROXY] → [CLOUD] No more cloud connections, restarting proxy.`);
@@ -297,11 +305,11 @@ export class Context {
       if (config.kind === "pm2") {
         // PM2 should restart us.
         log(`[PROXY] → [CLOUD] PM2 should restart us, exiting now.`);
-        process.exit(); 
+        setTimeout(() => process.exit(0), 100); 
 
       } else if (config.kind === "solo"){
         log(`[PROXY] → [CLOUD] Running solo, restarting proxy.`);
-        this.restart();
+        restart();
 
       } else {
         log(`[PROXY] → [CLOUD] Running under gateway/homebridge, not restarting... not sure what to do here.`);
@@ -314,28 +322,18 @@ export class Context {
   // Utilities //
   ///////////////
 
-  restart() {
-    console.log('🔄 Restarting...');
-
-    spawn(execPath, argv.slice(1), {
-      cwd: cwd(),
-      detached: true,
-      stdio: 'inherit',
-    });
-
-    process.exit();
-  }
-
   // check if it's a heartbeat request from the server
   isHeartbeatRequest(data: Buffer): boolean {
+    const msg = data.toString('utf-8').trim();
+    return msg === '[215,3]';
     // hearbeatKind = (poll = 1, poll_old = 2, serve = 3)
-    return ((data[0] === 91) &&           // [
-            (data[1] === 50) &&           // 2
-            (data[2] === 49) &&           // 1
-            (data[3] === 53) &&           // 5
-            (data[4] === 44) &&           // ,
-            (data[5] === 51) &&           // 3
-            (data[6] === 93));            // ]
+    // return ((data[0] === 91) &&           // [
+    //         (data[1] === 50) &&           // 2
+    //         (data[2] === 49) &&           // 1
+    //         (data[3] === 53) &&           // 5
+    //         (data[4] === 44) &&           // ,
+    //         (data[5] === 51) &&           // 3
+    //         (data[6] === 93));            // ]
   }
 
   // check if it's a server response after connecting and sending our uniqueID
@@ -346,3 +344,62 @@ export class Context {
     return (message.startsWith('[OK')) || (message.startsWith('[ERROR'));
   }
 }
+
+function restart() {
+  console.log('🔄 Restarting...');
+
+  setTimeout(() => {
+    spawn(execPath, argv.slice(1), {
+      cwd: cwd(),
+      detached: true,
+      stdio: 'inherit',
+    });
+
+    process.exit(0);
+  }, 100);
+}
+
+
+// Graceful shutdown handler
+function handleShutdown(signal: string) {
+  log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
+
+  // Close all cloud connections
+  gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+  gCloudConnections.splice(0, gCloudConnections.length);
+
+  log(`[PROXY] → [SYSTEM] All connections closed. Exiting.`);
+
+  if (config.kind === "solo") {
+    log(`[PROXY] → [SYSTEM] Restarting proxy in solo mode...`);
+    restart();
+  } else {
+    log(`[PROXY] → [SYSTEM] Exiting without restart.`);
+    setTimeout(() => process.exit(0), 100);
+  }
+}
+
+// Listen for termination signals
+process.on('SIGINT', () => handleShutdown('SIGINT'));
+process.on('SIGTERM', () => handleShutdown('SIGTERM'));
+
+
+process.on('SIGINT', (err) => {
+  error(`[SYSTEM] received SIGINT`);
+  handleShutdown('SIGINT');
+});
+
+process.on('SIGTERM', (err) => {
+  error(`[SYSTEM] received SIGTERM`);
+  handleShutdown('SIGTERM');
+});
+
+process.on('uncaughtException', (err) => {
+  error(`[SYSTEM] Uncaught Exception: ${err.message}`);
+  handleShutdown('uncaughtException');
+});
+
+process.on('unhandledRejection', (reason) => {
+  error(`[SYSTEM] Unhandled Rejection: ${reason}`);
+  handleShutdown('unhandledRejection');
+});