homebridge-smartsystem 7.1.26 → 7.2.2

package/duotecno/types.js

@@ -20,7 +20,9 @@ exports.kEmptyProxy = {
     cloudPort: 5097,
     masterAddress: "",
     masterPort: 5001,
+    masterPortEnabled: false,
     masterConfigPort: 8080,
+    masterConfigPortEnabled: false,
     installationId: "",
     nodeNumber: 0xff,
     httpEnabled: false,
@@ -441,7 +443,9 @@ exports.Sanitizers = {
         c.cloudPort = (config === null || config === void 0 ? void 0 : config.cloudPort) || exports.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) || "";
         c.masterPort = (config === null || config === void 0 ? void 0 : config.masterPort) || ((_b = system === null || system === void 0 ? void 0 : system.cmasters[0]) === null || _b === void 0 ? void 0 : _b.port) || 5001;
+        c.masterPortEnabled = !!(config === null || config === void 0 ? void 0 : config.masterPortEnabled);
         c.masterConfigPort = (config === null || config === void 0 ? void 0 : config.masterConfigPort) || exports.kEmptyProxy.masterConfigPort;
+        c.masterConfigPortEnabled = !!(config === null || config === void 0 ? void 0 : config.masterConfigPortEnabled);
         c.installationId = (config === null || config === void 0 ? void 0 : config.installationId) || exports.kEmptyProxy.installationId;
         c.nodeNumber = (typeof (config === null || config === void 0 ? void 0 : config.nodeNumber) === "number") ? config.nodeNumber : exports.kEmptyProxy.nodeNumber;
         c.httpEnabled = !!(config === null || config === void 0 ? void 0 : config.httpEnabled);

package/duotecno/udpConfig.js

@@ -0,0 +1,90 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setHomeServerCfg = exports.UDP_CONFIG_PORT = void 0;
+// Minimal client for Duotecno's "UDP config tool" protocol -- just enough to
+// push a new home-server (master) password/port to a master over UDP.
+//
+// Wire format reverse-engineered from the real `dtudpconfigLIB` source (see
+// the Duotecno Designer project's src/services/udpConfig/protocol.ts for the
+// full writeup and provenance notes). Devices listen on UDP port 8002.
+// ASCII framing: `[b0,b1,...]` + LF, every byte its decimal string,
+// comma-separated. Strings are length-prefixed (one length byte, then that
+// many byte-per-char, no null terminator). Multi-byte ints are MSB-first.
+const dgram = require("dgram");
+exports.UDP_CONFIG_PORT = 8002;
+const CMD_FC_APPCONFIG = 189;
+const CMD_EV_APPCONFIG = 15;
+const ATTR_HOMESRVCFG_SET = 2;
+// Always written as "closed + open protocol enabled", matching the legacy
+// config tool -- it's a read-only display value, not a user-editable input.
+const HOMESRVCFG_PROTOCOL_FLAGS = 0x03;
+function encodePacket(bytes) {
+    return Buffer.from(`[${bytes.join(",")}]\n`, "ascii");
+}
+function decodePacket(buf) {
+    const str = buf.toString("ascii").trim();
+    const match = /^\[([^\]]*)\]/.exec(str);
+    if (!match || !match[1])
+        return [];
+    return match[1].split(",").map((s) => parseInt(s.trim(), 10));
+}
+function stringToBytes(s) {
+    return [s.length, ...Array.from(s).map((c) => c.charCodeAt(0))];
+}
+function u16ToBytes(v) {
+    return [(v >> 8) & 0xff, v & 0xff];
+}
+/** Sends one unicast packet to ip:8002 and waits for a matching reply, retrying on timeout (UDP can drop packets). */
+function request(ip, packetBytes, expectCmd, expectMethod, timeoutMs = 1500, retries = 2) {
+    return new Promise((resolve, reject) => {
+        const socket = dgram.createSocket({ type: "udp4", reuseAddr: true });
+        let attemptsLeft = retries;
+        let timer;
+        const cleanup = () => {
+            clearTimeout(timer);
+            socket.close();
+        };
+        socket.on("error", (err) => {
+            cleanup();
+            reject(err);
+        });
+        socket.on("message", (msg) => {
+            const data = decodePacket(msg);
+            if (data[0] === expectCmd && data[1] === expectMethod) {
+                cleanup();
+                resolve(data);
+            }
+        });
+        function send() {
+            socket.send(encodePacket(packetBytes), exports.UDP_CONFIG_PORT, ip);
+            timer = setTimeout(() => {
+                if (attemptsLeft-- > 0)
+                    send();
+                else {
+                    cleanup();
+                    reject(new Error(`No UDP config reply from ${ip} (cmd ${expectCmd}/${expectMethod})`));
+                }
+            }, timeoutMs);
+        }
+        socket.bind(0, send);
+    });
+}
+/** Pushes a new home-server password/TCP-port to a master over the UDP config protocol (port 8002). */
+function setHomeServerCfg(ip, password, ipPort, timeoutMs) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const packet = [CMD_FC_APPCONFIG, ATTR_HOMESRVCFG_SET, ...stringToBytes(password), ...u16ToBytes(ipPort), ...u16ToBytes(HOMESRVCFG_PROTOCOL_FLAGS)];
+        const reply = yield request(ip, packet, CMD_EV_APPCONFIG, ATTR_HOMESRVCFG_SET, timeoutMs);
+        return reply[2] === 1;
+    });
+}
+exports.setHomeServerCfg = setHomeServerCfg;
+//# sourceMappingURL=udpConfig.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.26",
+  "version": "7.2.2",
   "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

@@ -90,7 +90,9 @@ function setProxyConfig(c) {
         config.cloudPort = c.cloudPort || types_1.kEmptyProxy.cloudPort;
         config.masterAddress = c.masterAddress || types_1.kEmptyProxy.masterAddress;
         config.masterPort = c.masterPort || types_1.kEmptyProxy.masterPort;
+        config.masterPortEnabled = !!c.masterPortEnabled;
         config.masterConfigPort = c.masterConfigPort || types_1.kEmptyProxy.masterConfigPort;
+        config.masterConfigPortEnabled = !!c.masterConfigPortEnabled;
         config.installationId = c.installationId || types_1.kEmptyProxy.installationId;
         config.nodeNumber = (typeof c.nodeNumber === "number") ? c.nodeNumber : types_1.kEmptyProxy.nodeNumber;
         config.httpEnabled = !!c.httpEnabled;
@@ -194,21 +196,25 @@ function cleanStart(restart = false) {
     if (restart) {
         log(`[PROXY] → [CLOUD] Restarting proxy...`);
         let connectionsStarted = 0;
-        // Start connection for the master device's raw protocol port if an installation ID is configured.
-        // Masters always register under the fixed master node number (kMasterNodeNumber), not the
-        // gateway's own (configurable) nodeNumber.
-        if (config.installationId && config.masterAddress) {
+        // Start connection for the master device's raw protocol port if an installation ID is configured
+        // and this tunnel is explicitly enabled (off by default). Masters always register under the
+        // fixed master node number (kMasterNodeNumber), not the gateway's own (configurable) nodeNumber.
+        if (config.installationId && config.masterAddress && config.masterPortEnabled) {
             const masterId = makeDeviceId(config, exports.kMasterNodeNumber, "tcp", config.masterPort);
             log(`[PROXY] Starting proxy for master device: ${masterId}`);
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, masterId);
             connectionsStarted++;
         }
+        else if (config.installationId && config.masterAddress) {
+            log(`[PROXY] → [CLOUD] Master TCP tunnel disabled, skipping master connection.`);
+        }
         else if (config.installationId) {
             log(`[PROXY] → [CLOUD] Installation ID configured but no masterAddress, skipping master connection.`);
         }
         // Start a proxy for the master's Config API port -- this is an HTTP API, so it's tagged
         // "http" rather than "tcp" even though the tunnel itself just relays raw bytes either way.
-        if (config.installationId && config.masterAddress && config.masterConfigPort) {
+        // Also off by default, only started when explicitly enabled.
+        if (config.installationId && config.masterAddress && config.masterConfigPort && config.masterConfigPortEnabled) {
             const configId = makeDeviceId(config, exports.kMasterNodeNumber, "http", config.masterConfigPort);
             log(`[PROXY] Starting proxy for Config API: ${configId} -> ${config.masterAddress}:${config.masterConfigPort}`);
             // All connections use the same cloud port for WebSocket multiplexing

package/server/smartapp.js

@@ -27,6 +27,7 @@ const somfy = require("./somfy");
 const fs_1 = require("fs");
 const overkiz_1 = require("./overkiz");
 const config_1 = require("../duotecno/config");
+const udpConfig_1 = require("../duotecno/udpConfig");
 const HB_1 = require("./HB");
 const HA_API_1 = require("./HA-API");
 const proxy_1 = require("./proxy");
@@ -74,7 +75,7 @@ class SmartApp extends webapp_1.WebApp {
         // get some configurated params
         const configuredPort = this.config.port || 80;
         this.password = platform.config.password || this.config.password || "";
-        this.user = platform.config.user || this.config.user || "pi";
+        this.user = platform.config.user || this.config.user || "duotecno";
         // Set up multi-port listening if port is not 80
         // Note: Port 80 requires root/sudo on Unix-like systems
         // For development on macOS/Linux without sudo, use only configured port
@@ -391,7 +392,9 @@ function SmartSocketInit(message){
                 config.cloudPort = context.getParam({ name: "cloudPort", type: "integer" });
                 config.masterAddress = context.getParam({ name: "masterAddress", type: "string" });
                 config.masterPort = context.getParam({ name: "masterPort", type: "integer" });
+                config.masterPortEnabled = !!context.getParam({ name: "masterPortEnabled", type: "string" });
                 config.masterConfigPort = context.getParam({ name: "masterConfigPort", type: "integer" });
+                config.masterConfigPortEnabled = !!context.getParam({ name: "masterConfigPortEnabled", type: "string" });
                 config.installationId = context.getParam({ name: "installationId", type: "string" });
                 config.nodeNumber = context.getParam({ name: "nodeNumber", type: "string" })
                     ? parseInt(context.getParam({ name: "nodeNumber", type: "string" }), 16) : proxy_1.kEmptyProxy.nodeNumber;
@@ -794,8 +797,22 @@ function SmartSocketInit(message){
                 yield this.informOverkizUpDown(u, link);
                 return;
             }
-            // dimmer: dt2hbvalue reports the raw 0-100 intensity directly, no
-            // real/virtual distinction to worry about here (unlike up/down below).
+            // A dimmer (or, for a Screen/Awning target, a mood carrying a numeric
+            // macro payload -- the same "set to X%" trick previously used to park a
+            // screen/awning at a specific height) linked to a Screen/Awning sets its
+            // position; linked to a Light it sets intensity instead. Dispatch on the
+            // Overkiz device's own type, not just the Duotecno unit's type, since a
+            // dimmer unit is now also how a real Overkiz dimmer (Light) gets driven.
+            const targetUiClass = this.power.overkiz.uiClass(link.accId);
+            const isPositional = (targetUiClass === "Screen") || (targetUiClass === "Awning");
+            if (isPositional && (u.isDimmer() || u.isMood())) {
+                yield this.informOverkizPosition(u, link);
+                return;
+            }
+            if (!u.isDimmer())
+                return;
+            // dt2hbvalue reports the raw 0-100 intensity directly, no real/virtual
+            // distinction to worry about here (unlike up/down above).
             const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
             if ((typeof hbValue === "undefined") || (hbValue === link.hbValue))
                 return;
@@ -809,6 +826,32 @@ function SmartSocketInit(message){
             }
         });
     }
+    // Sets a Screen/Awning to a specific position (0-100) from a dimmer's raw
+    // value, or from a mood unit's value when Duotecno programming sends it a
+    // numeric macro payload (the same mechanism dimmers use -- a mood isn't
+    // normally more than an on/off trigger, but if its macro carries a value
+    // it ends up in unit.value exactly like a dimmer's does). Our scale is
+    // 0=off/closed, 100=on/fully open (matching how dimmer links always
+    // worked here); Overkiz's closure/deployment scale is the opposite
+    // (0=open, 100=closed), so invert on the way out.
+    informOverkizPosition(u, link) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.power.overkiz)
+                return;
+            const raw = (typeof u.value === "boolean") ? (u.value ? 100 : 0) : Math.round(u.value);
+            const position = Math.max(0, Math.min(100, raw));
+            if (position === link.hbValue)
+                return;
+            try {
+                link.hbValue = position;
+                (0, logger_1.log)("smartapp", "-> Setting Overkiz position for: " + link.accName + " to " + position + "% of Duotecno unit: " + u.getDisplayName());
+                yield this.power.overkiz.setClosure(link.accId, 100 - position);
+            }
+            catch (e) {
+                (0, logger_1.err)("smartapp", "informOverkizPosition: failed for " + link.accName + " -> " + e.toString());
+            }
+        });
+    }
     // A Duotecno up/down (kSwitchingMotor) unit reports status two different
     // ways depending on how it's wired in the Duotecno programming:
     //  - a "virtual button" duoswitch macro event -> unit.value = 10 (stop) /
@@ -888,10 +931,27 @@ function SmartSocketInit(message){
         if (!this.power.overkiz || (this.power.overkiz === this.attachedOverkiz))
             return;
         this.attachedOverkiz = this.power.overkiz;
-        this.power.overkiz.emitter.on("state", (deviceURL, unitState) => {
+        this.power.overkiz.emitter.on("state", (deviceURL, unitState, closure) => {
             for (const link of this.links) {
                 if ((link.type !== types_1.LinkType.kOverkiz) || (link.accId !== deviceURL) || !link.unit)
                     continue;
+                if (link.unit.isDimmer()) {
+                    // position-sourced link: reflect Overkiz's position back as a
+                    // dimmer value. Overkiz's closure/deployment scale is the opposite
+                    // of ours (0=open/100=closed vs our 0=off/100=on) -- invert back.
+                    const position = Math.max(0, Math.min(100, Math.round(100 - closure)));
+                    if (position === link.dtValue)
+                        continue;
+                    link.dtValue = position;
+                    (0, logger_1.log)("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + position + " from Overkiz position " + closure + " of: " + link.accName);
+                    link.unit.setState(position);
+                    continue;
+                }
+                // a mood can only be triggered, not set to an arbitrary value, so a
+                // mood-sourced position link is Duotecno -> Overkiz only; nothing to
+                // reflect back here. Only an up/down unit gets the state below.
+                if (!link.unit.isUpDown())
+                    continue;
                 if (unitState === link.dtValue)
                     continue; // no repeat
                 link.dtValue = unitState;
@@ -1674,7 +1734,7 @@ function SmartSocketInit(message){
             let message;
             try {
                 if (context.action === "new") {
-                    return this.ejs("masterDetail", context, { config: types_1.Sanitizers.masterConfig(null), registers: [], nodes: [] });
+                    return this.ejs("masterDetail", context, { config: types_1.Sanitizers.masterConfig(null), registers: [], nodes: [], loggedIn: false });
                 }
                 else if (context.action === "list") {
                     return this.ejs("unitList", context, { masters: this.system.masters });
@@ -1686,7 +1746,7 @@ function SmartSocketInit(message){
                     context.getMaster("id");
                     const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
                     if (master)
-                        return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig(), registers: master.registers });
+                        return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig(), registers: master.registers, loggedIn: master.isLoggedIn });
                     else
                         message = "Error: Master not found";
                 }
@@ -1713,6 +1773,27 @@ function SmartSocketInit(message){
                     else
                         message = "Error: Master not found";
                 }
+                else if (context.action === "changepw") {
+                    const master = this.system.findMaster(context.getParam(kAddressOld), context.getParam(kPortOld));
+                    if (!master)
+                        message = "Error: Master not found";
+                    else if (!master.isLoggedIn)
+                        message = "Error: not logged in to this master -> refused to change its password";
+                    else {
+                        const address = context.getParam(kAddress);
+                        const port = context.getParam(kPort);
+                        const password = context.getParam(kPassword);
+                        if (yield (0, udpConfig_1.setHomeServerCfg)(address, password, port)) {
+                            const updated = yield this.system.addMaster(context.getParam(kAddressOld), context.getParam(kPortOld), { address, port, password, name: context.getParam(kName),
+                                active: context.getParam(kActive) != "N", nodenames: {} });
+                            this.updateNodes(updated, context.params.nodes || "", context.params);
+                            this.system.writeConfig();
+                            message = "Password changed on master and saved";
+                        }
+                        else
+                            message = "Error: master refused the new password";
+                    }
+                }
             }
             catch (e) {
                 message = e.toString();

package/server/views/master-detail.ejs

@@ -45,6 +45,16 @@
             <label for="password">Password</label>
           </div>
         </div>
+        <% if (typeof nodes !== "undefined") { %>
+        <div class="row">
+          <div class="col s12">
+            <button class="btn waves-effect waves-light" type="submit" name="action" value="changepw" <%= loggedIn ? '' : 'disabled' %>>Change Password on Master</button>
+            <% if (!loggedIn) { %>
+            <span class="grey-text"><small>Only available while logged in to this master.</small></span>
+            <% } %>
+          </div>
+        </div>
+        <% } %>
         <div class="row">
           <div class="col s6">
             Active

package/server/views/nav.ejs

@@ -46,11 +46,11 @@
   <li <% if (request === "proxy") { %>class="active"<% } %>><a href="<%= basePath %>/proxy">Proxy</a></li>
   <li><div class="divider"></div></li>
   <li class="subheader">Linking</li>
-  <li <% if (request === "switches") { %>class="active"<% } %>><a href="<%= basePath %>/switches">Http Switches</a></li>
-  <li <% if (request === "links") { %>class="active"<% } %>><a href="<%= basePath %>/links">Accessory Links</a></li>
+  <li <% if (request === "switches") { %>class="active"<% } %>><a href="<%= basePath %>/switches">Http</a></li>
+  <li <% if (request === "links") { %>class="active"<% } %>><a href="<%= basePath %>/links">Accessory</a></li>
   <li><div class="divider"></div></li>
   <li class="subheader">Energy</li>
-  <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Websocket devices</a></li>
+  <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Julix</a></li>
   <% if (hasSmappee) { %><li <% if ((request === "power") && (type === "smappee")) { %>class="active"<% } %>><a href="<%= basePath %>/power?type=smappee">Smappee</a></li><% } %>
   <% if (hasP1) { %><li <% if ((request === "power") && (type === "p1")) { %>class="active"<% } %>><a href="<%= basePath %>/power?type=p1">P1 Meter</a></li><% } %>
   <% if (hasShelly) { %><li <% if ((request === "power") && (type === "shelly")) { %>class="active"<% } %>><a href="<%= basePath %>/power?type=shelly">Shelly PM</a></li><% } %>

package/server/views/proxy.ejs

@@ -144,7 +144,8 @@
           <div class="col s6">
             <p>
               <label>
-                <input type="checkbox" class="filled-in" checked disabled />
+                <input type="checkbox" class="filled-in" id="masterPortEnabled" name="masterPortEnabled" value="Y"
+                       <%= config.masterPortEnabled ? "checked" : "" %> />
                 <span><strong>Websocket</strong></span>
               </label>
             </p>
@@ -157,7 +158,8 @@
           <div class="col s6">
             <p>
               <label>
-                <input type="checkbox" class="filled-in" checked disabled />
+                <input type="checkbox" class="filled-in" id="masterConfigPortEnabled" name="masterConfigPortEnabled" value="Y"
+                       <%= config.masterConfigPortEnabled ? "checked" : "" %> />
                 <span><strong>Config port</strong></span>
               </label>
             </p>