homebridge-smartsystem 7.0.4 → 7.0.6

package/README.md

@@ -320,6 +320,8 @@ Homebridge UI version
 ### v7.0.0 - 12/11/2025
 - 0: added mDNS/Bonjour + always port 80 + don't preload EJS files if system.debug == true
 - 4: fixed a bug when shelly has empty list of ip addresses
+- 5: better error handling in the proxy.ts + show connection in the /proxy page
+
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/duotecno/types.js

@@ -407,7 +407,7 @@ exports.Sanitizers = {
     ///////////
     proxy: function (config, system) {
         var _a, _b;
-        const c = proxy_1.kEmptyProxy;
+        const c = Object.assign({}, proxy_1.kEmptyProxy);
         c.cloudServer = (config === null || config === void 0 ? void 0 : config.cloudServer) || proxy_1.kEmptyProxy.cloudServer;
         c.cloudPort = (config === null || config === void 0 ? void 0 : config.cloudPort) || proxy_1.kEmptyProxy.cloudPort;
         c.masterAddress = (config === null || config === void 0 ? void 0 : config.masterAddress) || ((_a = system === null || system === void 0 ? void 0 : system.cmasters[0]) === null || _a === void 0 ? void 0 : _a.address) || "";

package/package.json

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

package/server/platform.js

@@ -48,6 +48,13 @@ class Platform extends base_1.Base {
             (0, logger_1.log)("homebridge", "try doing upgrade from pre v6.2 versions");
             this.doUpgradeV62();
         }
+        // we're running under HomeBridge/Platform -> always set proxy kind to "gw"
+        if (!this.config.proxy) {
+            this.config.proxy = Object.assign({}, proxy_1.kEmptyProxy);
+        }
+        else if (this.config.proxy.kind !== "gw") {
+            this.config.proxy.kind = "gw";
+        }
         (0, logger_1.log)("homebridge", "running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
         (0, logger_1.log)("homebridge", "with config:" + JSON.stringify(this.config, null, 2));
         // save config for other components

package/server/proxy.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.setProxyConfig = exports.setWebApp = exports.kEmptyProxy = void 0;
+exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.gCloudConnections = exports.setProxyConfig = exports.setWebApp = exports.kEmptyProxy = void 0;
 const net = require("net");
 const child_process_1 = require("child_process");
 const process_1 = require("process");
@@ -20,7 +20,7 @@ exports.kEmptyProxy = {
     masterPort: 5001,
     uniqueId: "",
     debug: false,
-    kind: "gw" // default running under PM2 or other process manager -> don't restart yourself
+    kind: "gw" // default running under the gateway or other process manager -> don't restart yourself
 };
 const config = Object.assign({}, exports.kEmptyProxy);
 // Store reference to the webapp so we can close servers before restarting
@@ -53,7 +53,7 @@ catch (e) {
     log("[PROXY] No config-proxy.json found, using default values from homebridge or other.");
 }
 let connectionChecker = null;
-const gCloudConnections = [];
+exports.gCloudConnections = [];
 const kDebug = config.debug || false; // enable debug mode from config
 /////////////
 // Logging //
@@ -108,8 +108,8 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
         cloudSocket.write(`[${uniqueId}]`);
         debug(`[PROXY] → [CLOUD] Sent unique ID: ${uniqueId}`);
         const context = new Context(cloudSocket, master, masterPort, server, serverPort, uniqueId);
-        gCloudConnections.push(context);
-        log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
+        exports.gCloudConnections.push(context);
+        log(`[PROXY] → [CLOUD] New free connection #${exports.gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
     });
 }
 exports.makeNewCloudConnection = makeNewCloudConnection;
@@ -117,10 +117,10 @@ exports.makeNewCloudConnection = makeNewCloudConnection;
 // Restarting //
 ////////////////
 function cleanStart(restart = false) {
-    if (gCloudConnections === null || gCloudConnections === void 0 ? void 0 : 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 (exports.gCloudConnections === null || exports.gCloudConnections === void 0 ? void 0 : exports.gCloudConnections.length) {
+        exports.gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+        log(`[PROXY] → [CLOUD] Cleaned up all ${exports.gCloudConnections.length} cloud connections.`);
+        exports.gCloudConnections.splice(0, exports.gCloudConnections.length); // clear the array
     }
     if (connectionChecker) {
         clearInterval(connectionChecker);
@@ -133,7 +133,7 @@ function cleanStart(restart = false) {
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
             // check every 16 second for a free connection
             connectionChecker = setInterval(() => {
-                const freeConnection = gCloudConnections.find((ctx) => (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open'));
+                const freeConnection = exports.gCloudConnections.find((ctx) => (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open'));
                 if (freeConnection) {
                     debug(`[PROXY] → [CLOUD] Found free connection #${freeConnection.uniqueId} to the Cloud -> we're still ok.`);
                 }
@@ -161,6 +161,13 @@ class Context {
         this.server = server;
         this.serverPort = serverPort;
         this.uniqueId = uniqueId;
+        this.deviceStatus = {
+            connected: false,
+            lastAttempt: null,
+            lastSuccess: null,
+            lastError: null,
+            retryCount: 0
+        };
         this.setupCloudSocket();
     }
     setupCloudSocket() {
@@ -217,8 +224,25 @@ class Context {
     }
     makeDeviceConnection(address, port, data) {
         log(`[PROXY] → [DEVICE] Attempting to connect to local device at ${address}:${port}`);
+        this.deviceStatus.lastAttempt = new Date();
         if (!this.deviceSocket) {
             this.deviceSocket = new net.Socket();
+            // Add error handler BEFORE connecting to prevent uncaught exceptions
+            this.deviceSocket.on('error', (err) => {
+                error(`[DEVICE] → [PROXY] Connection error: ${err.message}`);
+                // Update device status
+                this.deviceStatus.connected = false;
+                this.deviceStatus.lastError = err.message;
+                this.deviceStatus.retryCount++;
+                log(`[DEVICE] → [PROXY] Connection failed. Will retry on next cloud request.`);
+                // Clean up this socket
+                if (this.deviceSocket && !this.deviceSocket.destroyed) {
+                    this.deviceSocket.destroy();
+                }
+                this.deviceSocket = null;
+                // Don't create a new cloud connection - we already have one!
+                // The device connection will be retried when the next data comes from the cloud
+            });
             // Connect to local device and send the data that came in from the cloud
             this.deviceSocket.connect(port, address, () => {
                 // Check if socket is still valid (not cleaned up by removeConnection)
@@ -227,6 +251,11 @@ class Context {
                     return;
                 }
                 log(`[PROXY] → [DEVICE] Connected to local device at ${address}:${port}`);
+                // Update device status
+                this.deviceStatus.connected = true;
+                this.deviceStatus.lastSuccess = new Date();
+                this.deviceStatus.lastError = null;
+                this.deviceStatus.retryCount = 0;
                 this.setUpDeviceSocket();
                 log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().trim()}`);
                 this.deviceSocket.write(data);
@@ -254,10 +283,8 @@ class Context {
             log(`[DEVICE] → [PROXY] Device socket closed`);
             this.removeConnection();
         });
-        this.deviceSocket.on('error', (err) => {
-            error(`[DEVICE] → [PROXY] Device socket error: ${err.message}`);
-            this.removeConnection();
-        });
+        // Note: error handler is already added in makeDeviceConnection()
+        // Don't add duplicate error handler here
     }
     cleanupSockets() {
         // Clean up the device socket
@@ -280,12 +307,12 @@ class Context {
         }
     }
     removeConnection() {
-        const index = gCloudConnections.indexOf(this);
+        const index = exports.gCloudConnections.indexOf(this);
         if (index !== -1)
-            gCloudConnections.splice(index, 1);
+            exports.gCloudConnections.splice(index, 1);
         this.cleanupSockets();
         log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
-        if (gCloudConnections && gCloudConnections.length === 0) {
+        if (exports.gCloudConnections && exports.gCloudConnections.length === 0) {
             log(`[PROXY] → [CLOUD] No more cloud connections, restarting proxy.`);
             // just to be sure: restart...
             if (config.kind === "pm2") {
@@ -346,9 +373,9 @@ function handleShutdown(signal) {
             connectionChecker = null;
         }
         // Close all cloud connections
-        if (gCloudConnections && gCloudConnections.length > 0) {
-            gCloudConnections.forEach(ctx => ctx.cleanupSockets());
-            gCloudConnections.splice(0, gCloudConnections.length);
+        if (exports.gCloudConnections && exports.gCloudConnections.length > 0) {
+            exports.gCloudConnections.forEach(ctx => ctx.cleanupSockets());
+            exports.gCloudConnections.splice(0, exports.gCloudConnections.length);
         }
         // Close HTTP servers if available
         if (gWebApp && typeof gWebApp.closeServers === 'function') {
@@ -360,15 +387,16 @@ function handleShutdown(signal) {
                 error(`[PROXY] → [SYSTEM] Error closing servers: ${e.message}`);
             }
         }
-        log(`[PROXY] → [SYSTEM] All connections closed. Exiting.`);
+        log(`[PROXY] → [SYSTEM] All connections closed.`);
         if (config.kind === "solo") {
             log(`[PROXY] → [SYSTEM] Restarting proxy in solo mode...`);
             restart();
         }
         else {
-            log(`[PROXY] → [SYSTEM] Exiting without restart.`);
-            // Give OS time to release ports before exit (helps prevent EADDRINUSE on restart)
-            setTimeout(() => process.exit(0), 500);
+            log(`[PROXY] → [SYSTEM] Running under HomeBridge/Gateway - NOT calling process.exit() to avoid restarting entire system.`);
+            log(`[PROXY] → [SYSTEM] Plugin will remain running. Check /settings page for connection status.`);
+            // Don't call process.exit() when running under HomeBridge!
+            // This would restart the entire HomeBridge + UI system
         }
     });
 }

package/server/smartapp.js

@@ -339,7 +339,7 @@ class SmartApp extends webapp_1.WebApp {
             else {
                 // just show the proxy config
             }
-            return this.ejs("proxy", context, { config });
+            return this.ejs("proxy", context, { config, connections: proxy_1.gCloudConnections });
         });
     }
     //////////////
@@ -363,36 +363,6 @@ class SmartApp extends webapp_1.WebApp {
                 context.request = "restart";
                 return this.doRestart(false);
             }
-            else if (context.action === "install") {
-                // Network IP configuration - temporarily disabled
-                // TODO: Re-implement DHCP configuration
-                message = "Network IP configuration is temporarily disabled. Use 'Save Settings' for mDNS configuration.";
-                /* Commented out until DHCP implementation is fixed
-                config = this.scrapeSettings(context);
-                context.request = "install";
-                this.write("settings", config);
-                this.writeDHCP(context, <SettingsConfig>config);
-                */
-            }
-            else if (context.action === "reset") {
-                // Reset to DHCP - temporarily disabled
-                // TODO: Re-implement DHCP reset
-                message = "DHCP reset is temporarily disabled.";
-                /* Commented out until DHCP implementation is fixed
-                config = { ...kEmptySettings };
-                this.resetDHCP(context);
-                this.write("settings", config);
-                return this.doReboot(context, false);
-                */
-            }
-            else if (context.action === "reboot") {
-                // System reboot - temporarily disabled
-                // TODO: Re-enable after testing
-                message = "System reboot is temporarily disabled.";
-                /* Commented out until we want to enable system reboot
-                return this.doReboot(context, false);
-                */
-            }
             else {
                 // Just display the settings form
             }

package/server/views/proxy.ejs

@@ -7,7 +7,7 @@
     <body>
       <%- include('/views/nav', this); -%>
 
-      <form method="POST" action="/proxy">
+      <form method="POST" action="/proxy" style="padding-bottom: 0">
         <input type="hidden" name="daction" value="save">
         <h1>
           Proxy Config
@@ -56,6 +56,78 @@
         </div>
 
       </form>
+
+      <!-- Connection Status Section -->
+      <form>
+        <% if (connections && connections.length > 0) { %>
+          <table class="striped highlight">
+            <thead>
+              <tr>
+                <th>Cloud Connection</th>
+                <th>Device Connection</th>
+                <th>Last Attempt</th>
+                <th>Last Success</th>
+                <th>Retry Count</th>
+                <th>Last Error</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% connections.forEach(function(conn) { %>
+                <tr>
+                  <td>
+                    <% if (conn.cloudSocket && conn.cloudSocket.readyState === 'open') { %>
+                      <span class="green-text">✓ Connected</span><br>
+                      <small><%= conn.server %>:<%= conn.serverPort %></small>
+                    <% } else { %>
+                      <span class="red-text">✗ Disconnected</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.connected) { %>
+                      <span class="green-text">✓ Connected</span><br>
+                      <small><%= conn.master %>:<%= conn.masterPort %></small>
+                    <% } else { %>
+                      <span class="red-text">✗ Disconnected</span><br>
+                      <small><%= conn.master %>:<%= conn.masterPort %></small>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.lastAttempt) { %>
+                      <%= new Date(conn.deviceStatus.lastAttempt).toLocaleString() %>
+                    <% } else { %>
+                      <span class="grey-text">Never</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.lastSuccess) { %>
+                      <%= new Date(conn.deviceStatus.lastSuccess).toLocaleString() %>
+                    <% } else { %>
+                      <span class="grey-text">Never</span>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.retryCount > 0) { %>
+                      <span class="orange-text"><%= conn.deviceStatus.retryCount %></span>
+                    <% } else { %>
+                      <%= conn.deviceStatus.retryCount %>
+                    <% } %>
+                  </td>
+                  <td>
+                    <% if (conn.deviceStatus.lastError) { %>
+                      <span class="red-text"><%= conn.deviceStatus.lastError %></span>
+                    <% } else { %>
+                      <span class="grey-text">None</span>
+                    <% } %>
+                  </td>
+                </tr>
+              <% }); %>
+            </tbody>
+          </table>
+        <% } else { %>
+          <p class="red-text">No active connections</p>
+        <% } %>
+        </form>
+
       <%- include('/views/footer'); -%>
 
     </body>

package/.gitattributes

@@ -1,4 +0,0 @@
-*.css linguist-detectable=false
-*.map linguist-detectable=false
-*.js linguist-detectable=false
-*.ts linguist-detectable=true

package/MIXINS-GUIDE.md

@@ -1,210 +0,0 @@
-# TypeScript Mixins Pattern for SmartApp
-
-## Overview
-
-Your SmartApp is getting large because it handles multiple concerns:
-- Device management (WebSocket, power measurements)
-- Link management (Homebridge accessories)
-- Switch management (HTTP switches)
-- Power management (Smappee, P1, Shelly)
-- Proxy configuration
-- Settings management
-
-TypeScript doesn't support multiple inheritance, but **mixins** provide a similar capability.
-
-## Solution Options
-
-### **Option 1: Mixin Pattern** (Most Flexible)
-
-Create separate mixin functions that add functionality to your class:
-
-```typescript
-// server/mixins/DeviceMixin.ts
-type Constructor<T = {}> = new (...args: any[]) => T;
-
-export interface DeviceMixinBase {
-  devices: Array<Device>;
-  system: System;
-  power: Power;
-  // ... other required properties
-}
-
-export function DeviceMixin<TBase extends Constructor<DeviceMixinBase>>(Base: TBase) {
-  return class extends Base {
-    setupWebSocketServers() { /* ... */ }
-    sendDeviceList(ws: WebSocket) { /* ... */ }
-    getDeviceList() { /* ... */ }
-    // ... all device-related methods
-  };
-}
-
-// Usage in smartapp.ts
-import { DeviceMixin } from './mixins/DeviceMixin';
-import { LinkMixin } from './mixins/LinkMixin';
-import { SwitchMixin } from './mixins/SwitchMixin';
-
-// Apply mixins
-const SmartAppBase = SwitchMixin(LinkMixin(DeviceMixin(WebApp)));
-
-export class SmartApp extends SmartAppBase {
-  // Only SmartApp-specific logic here
-  constructor(system: System, power: Power, platform: Platform) {
-    super("smartapp");
-    // ...
-  }
-}
-```
-
-**Pros:**
-- True composition - each mixin is independent
-- Can be reused across different classes
-- TypeScript type-safe
-- Easy to test mixins individually
-
-**Cons:**
-- Requires some boilerplate
-- Mixing order matters
-- Can be confusing at first
-
----
-
-### **Option 2: Delegate Pattern** (Simpler)
-
-Create separate service/manager classes and delegate to them:
-
-```typescript
-// server/services/DeviceManager.ts
-export class DeviceManager {
-  constructor(
-    private devices: Array<Device>,
-    private system: System,
-    private power: Power
-  ) {}
-
-  setupWebSocketServers(servers: http.Server[]) { /* ... */ }
-  getDeviceList() { /* ... */ }
-  // ... all device methods
-}
-
-// server/services/LinkManager.ts
-export class LinkManager {
-  constructor(
-    private links: Array<Link>,
-    private system: System
-  ) {}
-
-  initLinks() { /* ... */ }
-  updateLink(inx: number, link: Link) { /* ... */ }
-  // ... all link methods
-}
-
-// In smartapp.ts
-export class SmartApp extends WebApp {
-  private deviceManager: DeviceManager;
-  private linkManager: LinkManager;
-
-  constructor(system: System, power: Power, platform: Platform) {
-    super("smartapp");
-    
-    this.deviceManager = new DeviceManager(this.devices, this.system, this.power);
-    this.linkManager = new LinkManager(this.links, this.system);
-  }
-
-  // Delegate to managers
-  setupWebSocketServers() {
-    this.deviceManager.setupWebSocketServers(this.servers);
-  }
-
-  initLinks() {
-    this.linkManager.initLinks();
-  }
-}
-```
-
-**Pros:**
-- Simple and intuitive
-- Easy to understand
-- Good separation of concerns
-- Easy to unit test
-
-**Cons:**
-- More delegation boilerplate
-- Not as "clean" as mixins
-- Managers need access to SmartApp state
-
----
-
-### **Option 3: Module Pattern** (Most Practical)
-
-Split into separate modules but keep in same class:
-
-```typescript
-// server/smartapp/devices.ts
-export class DeviceManagement {
-  static setupWebSocketServers(app: SmartApp) { /* ... */ }
-  static getDeviceList(app: SmartApp) { /* ... */ }
-  // ... all device methods as static functions
-}
-
-// server/smartapp/links.ts
-export class LinkManagement {
-  static initLinks(app: SmartApp) { /* ... */ }
-  static updateLink(app: SmartApp, inx: number, link: Link) { /* ... */ }
-}
-
-// In smartapp.ts
-import { DeviceManagement } from './smartapp/devices';
-import { LinkManagement } from './smartapp/links';
-
-export class SmartApp extends WebApp {
-  setupWebSocketServers() {
-    DeviceManagement.setupWebSocketServers(this);
-  }
-  
-  initLinks() {
-    LinkManagement.initLinks(this);
-  }
-}
-```
-
-**Pros:**
-- Simple to implement
-- Code is organized in separate files
-- No complex patterns needed
-- Easy to refactor incrementally
-
-**Cons:**
-- Still some methods in main class
-- Not true composition
-- Methods take `app` parameter
-
----
-
-## **Recommended Approach**
-
-For your situation, I'd recommend **Option 2 (Delegate Pattern)** or **Option 3 (Module Pattern)**.
-
-Here's why:
-1. **Easier to understand** - no complex mixin magic
-2. **Incremental refactoring** - move one feature at a time
-3. **Better testability** - each manager/module is isolated
-4. **Clearer dependencies** - you see what each part needs
-
-### Quick Win: Module Pattern
-
-Split your 1680-line smartapp.ts into:
-
-```
-server/
-  smartapp.ts (main class, ~300 lines)
-  smartapp/
-    devices.ts (WebSocket & power, ~300 lines)
-    links.ts (Homebridge links, ~200 lines)
-    switches.ts (HTTP switches, ~200 lines)
-    power.ts (Power bindings, ~150 lines)
-    proxy.ts (Proxy config, ~150 lines)
-    routes.ts (HTTP routing, ~200 lines)
-    units.ts (Unit management, ~150 lines)
-```
-
-Would you like me to help you refactor SmartApp using one of these patterns?