homebridge-smartsystem 7.1.22 → 7.1.23

package/accessories/accessory.js

@@ -49,7 +49,7 @@ class Accessory {
     getState(next) {
         if (this.unit) {
             (0, logger_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
-            next(null, this.unit.status);
+            next(null, !!this.unit.status);
         }
         else {
             next(new Error("accessory - getState needs to be overridden if no unit is provided."));
@@ -81,7 +81,7 @@ class Accessory {
             next(new Error("accessory - setState needs to be overridden if no unit is provided."));
     }
     updateState() {
-        this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(this.unit.status);
+        this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(!!this.unit.status);
         (0, logger_1.log)("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
     }
 }

package/accessories/dimmer.js

@@ -28,9 +28,10 @@ class Dimmer extends accessory_1.Accessory {
         return [lightbulbService];
     }
     getBrightness(next) {
+        var _a;
         if (this.unit) {
             (0, logger_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-            next(null, this.unit.value);
+            next(null, (_a = this.unit.value) !== null && _a !== void 0 ? _a : 0);
         }
         else {
             next(new Error("accessory - getBrightness needs to be overridden if no unit is provided."));

package/accessories/temperature.js

@@ -21,9 +21,10 @@ class Temperature extends accessory_1.Accessory {
         return [temperatureService];
     }
     getTemperature(next) {
+        var _a;
         if (this.unit) {
             (0, logger_1.log)("accessory", "getTemperature was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-            const limited = Math.max(-100, Math.min(100, this.unit.value / 10.0));
+            const limited = Math.max(-100, Math.min(100, ((_a = this.unit.value) !== null && _a !== void 0 ? _a : 0) / 10.0));
             next(null, limited);
         }
         else {

package/duotecno/types.js

@@ -428,6 +428,7 @@ exports.Sanitizers = {
         c.installationId = (config === null || config === void 0 ? void 0 : config.installationId) || proxy_1.kEmptyProxy.installationId;
         c.nodeNumber = (typeof (config === null || config === void 0 ? void 0 : config.nodeNumber) === "number") ? config.nodeNumber : proxy_1.kEmptyProxy.nodeNumber;
         c.httpEnabled = !!(config === null || config === void 0 ? void 0 : config.httpEnabled);
+        c.gatewayPhysicalId = (config === null || config === void 0 ? void 0 : config.gatewayPhysicalId) || proxy_1.kEmptyProxy.gatewayPhysicalId;
         c.kind = "gw";
         return c;
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.22",
+  "version": "7.1.23",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -36,7 +36,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Duotecno-developer/smartsocket.git"
+    "url": "git+https://github.com/Duotecno-developer/smartsocket.git"
   },
   "dependencies": {
     "bonjour-service": "^1.3.0",

package/server/proxy.js

@@ -11,8 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.gCloudConnections = exports.setProxyConfig = exports.setWebApp = exports.kEmptyProxy = exports.gatewayHttpPort = exports.makeDeviceId = exports.kMasterNodeNumber = void 0;
 const net = require("net");
+const os = require("os");
 const child_process_1 = require("child_process");
 const process_1 = require("process");
+const config_1 = require("../duotecno/config");
 // Fixed, non-configurable logical node number every Duotecno master identifies itself with
 // on the bus -- used for both of the master's own registrations (raw protocol + Config API).
 exports.kMasterNodeNumber = 0xfc;
@@ -31,6 +33,47 @@ function gatewayHttpPort() {
     return port || 80;
 }
 exports.gatewayHttpPort = gatewayHttpPort;
+// The cloud server can tell apart two different physical devices that were accidentally
+// registered under the same unique id (instead of assuming a reconnect and evicting the
+// other one), given a "physical address" -- 1-8 hex digits, formatted "0x..." -- alongside
+// the unique id at registration. Masters have a real one: the Duotecno bus physical address
+// of their own logical node (kMasterNodeNumber). Returns '' if not known yet (e.g. the master
+// hasn't finished its initial discovery), in which case no physical address is sent for this
+// registration, same as old firmware.
+function masterPhysicalAddress() {
+    const system = gWebApp === null || gWebApp === void 0 ? void 0 : gWebApp.system;
+    const master = (system === null || system === void 0 ? void 0 : system.findMaster) ? system.findMaster(config.masterAddress, config.masterPort) : null;
+    const node = (master === null || master === void 0 ? void 0 : master.findNode) ? master.findNode(exports.kMasterNodeNumber) : null;
+    const phys = node === null || node === void 0 ? void 0 : node.physicalAddress;
+    return (typeof phys === "number" && phys > 0) ? "0x" + phys.toString(16) : '';
+}
+// The gateway itself has no Duotecno bus address of its own. Prefer the last two groups of a
+// non-internal IPv6 address (8 hex digits total, e.g. "2afa:23fa:b95:9ebf" -> last two groups
+// "b95:9ebf" -> "0x0b959ebf") if one is available on this machine; otherwise fall back to a
+// random id generated once and persisted in config.json, so it stays stable across restarts
+// and lets the cloud tell two different physical gateways apart even if they were accidentally
+// given the same installation id.
+function gatewayPhysicalAddress() {
+    const interfaces = os.networkInterfaces();
+    for (const name in interfaces) {
+        for (const iface of interfaces[name] || []) {
+            if ((iface.family === "IPv6" || iface.family === 6) && !iface.internal) {
+                const groups = iface.address.split(":").filter(g => g.length > 0);
+                if (groups.length >= 2) {
+                    const last2 = groups.slice(-2).map(g => g.padStart(4, '0')).join('');
+                    return "0x" + last2;
+                }
+            }
+        }
+    }
+    if (!config.gatewayPhysicalId) {
+        config.gatewayPhysicalId = "0x" + Math.floor(Math.random() * 0x100000000).toString(16).padStart(8, '0');
+        (0, config_1.setSubConfig)("proxy", config);
+        (0, config_1.setAPIConfig)();
+        log(`[PROXY] No IPv6 address available, generated and stored a random physical id for this gateway: ${config.gatewayPhysicalId}`);
+    }
+    return config.gatewayPhysicalId;
+}
 exports.kEmptyProxy = {
     cloudServer: "masters.duotecno.eu",
     cloudPort: 5097,
@@ -40,6 +83,7 @@ exports.kEmptyProxy = {
     installationId: "",
     nodeNumber: 0xff,
     httpEnabled: false,
+    gatewayPhysicalId: "",
     debug: false,
     kind: "gw" // default running under the gateway or other process manager -> don't restart yourself
 };
@@ -61,6 +105,7 @@ function setProxyConfig(c) {
         config.installationId = c.installationId || exports.kEmptyProxy.installationId;
         config.nodeNumber = (typeof c.nodeNumber === "number") ? c.nodeNumber : exports.kEmptyProxy.nodeNumber;
         config.httpEnabled = !!c.httpEnabled;
+        config.gatewayPhysicalId = c.gatewayPhysicalId || exports.kEmptyProxy.gatewayPhysicalId;
         config.debug = !!c.debug;
         config.kind = c.kind || exports.kEmptyProxy.kind;
     }
@@ -114,6 +159,9 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
             // we check every 16 seconds for a free connection, if none found -> restart
         }
     }
+    // lets the cloud tell two genuinely different physical devices apart if they were ever
+    // accidentally configured with the same unique id, instead of assuming a reconnect
+    const physicalAddress = isGateway ? gatewayPhysicalAddress() : masterPhysicalAddress();
     const cloudSocket = new net.Socket();
     cloudSocket.once('error', reconnect);
     // net.Socket.connect() has no default timeout: if the TCP handshake to the cloud gets
@@ -130,9 +178,9 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
         log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
         cloudSocket.setTimeout(0); // connected -- no longer subject to the connect-attempt timeout
         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}`);
+        // Send unique ID (and physical address, if known) as the first message to identify this proxy/device
+        cloudSocket.write(physicalAddress ? `[${uniqueId}][${physicalAddress}]` : `[${uniqueId}]`);
+        debug(`[PROXY] → [CLOUD] Sent unique ID: ${uniqueId}` + (physicalAddress ? ` physical address: ${physicalAddress}` : ''));
         const context = new Context(cloudSocket, master, masterPort, server, serverPort, uniqueId, isGateway);
         exports.gCloudConnections.push(context);
         log(`[PROXY] → [CLOUD] New free connection #${exports.gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);