homebridge-smartsystem 7.1.25 → 7.1.26

package/.vscode/launch.json

@@ -8,6 +8,7 @@
       "sourceMaps": true,
       "name": "Test HB Platform",
       "program": "${workspaceFolder}/testHB.js",
+      "runtimeExecutable": "/Users/johan/.nvm/versions/node/v20.19.5/bin/node",
       "skipFiles": [
         "<node_internals>/**"
       ]
@@ -19,6 +20,7 @@
       "sourceMaps": true,
       "name": "Run SmartSocket Proxy",
       "program": "${workspaceFolder}/testProxy.js",
+      "runtimeExecutable": "/Users/johan/.nvm/versions/node/v20.19.5/bin/node",
       "skipFiles": [
         "<node_internals>/**"
       ]
@@ -30,6 +32,7 @@
       "sourceMaps": true,
       "name": "Run Test Websockets",
       "program": "${workspaceFolder}/testWS.js",
+      "runtimeExecutable": "/Users/johan/.nvm/versions/node/v20.19.5/bin/node",
       "skipFiles": [
         "<node_internals>/**"
       ]

package/duotecno/types.js

@@ -167,6 +167,7 @@ var LinkType;
 (function (LinkType) {
     LinkType["kNoType"] = "";
     LinkType["kAccessory"] = "accessory";
+    LinkType["kOverkiz"] = "overkiz";
 })(LinkType = exports.LinkType || (exports.LinkType = {}));
 exports.kEmptyLink = Object.assign(Object.assign({}, exports.kEmptyUnit), { type: LinkType.kNoType, max: 100, min: 0, nostop: "N", accName: "acc", accId: "", accService: [] });
 /////////////

package/package.json

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

package/server/overkiz.js

@@ -8,11 +8,32 @@
 // then polling its HomeKit accessories back into Duotecno via server/HB.ts
 // and the Link mechanism in smartapp.ts.
 //
-// Phase 1 (this file): connect, discover devices, send open/close/stop
-// commands, and emit translated Duotecno-style states when Overkiz reports
-// a change. Wiring this into the Link UI (so a Duotecno unit can be coupled
-// to a specific Somfy screen) is a follow-up step once connectivity against
-// real hardware is confirmed.
+// Connects, discovers devices, sends open/close/stop/dim commands, and emits
+// translated Duotecno-style states when Overkiz reports a change. Wired into
+// the Link UI in smartapp.ts so a Duotecno up/down or dimmer unit can be
+// coupled to a specific Overkiz device.
+//
+// Verified against real hardware (a TaHoma box with Screen and Awning
+// devices): both widget types expose a genuine 'stop' command, unlike the
+// Homebridge-accessory link path (server/HB.ts) which has to fake a stop by
+// re-setting the last known (and often unreliable) position.
+//
+// Screen devices (uiClass "Screen", e.g. roller shutters/blinds) use
+// open/close/stop/setClosure. Awning devices (uiClass "Awning", e.g. sun
+// awnings) use a different command set: undeploy/deploy/stop/setDeployment
+// (there is no "open"/"close" on an Awning). Light devices (uiClass "Light")
+// only expose setIntensity (0-100), no separate on/off.
+//
+// Known overkiz-client (1.0.23) quirk: Client.execute() stores the plain
+// {label, actions} object we pass it into its internal executionPool, but
+// fetchEvents() later assumes pooled entries are Execution instances and
+// calls execution.onStateUpdate(), which throws for our commands ("Polling
+// error - TypeError: execution.onStateUpdate is not a function"). That's
+// caught inside the library and only affects completion-tracking of our own
+// outgoing commands (externally-triggered state changes, e.g. via the Somfy
+// app or remote, aren't affected and still push through normally) -- but to
+// get a reliable resulting state for OUR commands we explicitly refresh the
+// device afterwards instead of trusting that push.
 //
 // Johan Coppieters, 2026.
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -31,10 +52,15 @@ const overkiz_client_1 = require("overkiz-client");
 const types_1 = require("../duotecno/types");
 const logger_1 = require("../duotecno/logger");
 const base_1 = require("./base");
-// core:ClosureState / core:ClosureOrRollerShutterPositionState: 0 = fully
-// open, 100 = fully closed (opposite of HomeKit's TargetPosition scale).
+// Position state: 0 = fully open/undeployed, 100 = fully closed/deployed
+// (opposite of HomeKit's TargetPosition scale). Screens report
+// core:ClosureState, Awnings report core:DeploymentState instead.
+const kPositionStateNames = ["core:ClosureState", "core:DeploymentState"];
+const kIntensityStateNames = ["core:LightIntensityState", "core:IntensityState"];
 const kOpenThreshold = 5;
 const kClosedThreshold = 95;
+const kAwningUiClass = "Awning";
+const kIgnoredUiClasses = ["ProtocolGateway"]; // bridges/gateways: not a controllable end-device
 function closureToUnitState(closure, previousClosure) {
     if (closure <= kOpenThreshold)
         return types_1.UnitState.kOpen;
@@ -62,11 +88,25 @@ class Overkiz extends base_1.Base {
             (0, logger_1.log)("overkiz", "Overkiz not configured (missing user/password) -> not starting.");
         }
     }
+    // (Re)connect using the current config -- used at startup and after the
+    // settings page saves new credentials, so a full process restart isn't
+    // required to pick them up.
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             const bridge = {
                 warn: (...args) => (0, logger_1.log)("overkiz", args.join(" ")),
-                error: (...args) => (0, logger_1.err)("overkiz", args.join(" ")),
+                error: (...args) => {
+                    const msg = args.join(" ");
+                    if (msg.includes("onStateUpdate is not a function")) {
+                        // the known overkiz-client executionPool quirk described up top --
+                        // harmless (the command still executes fine), just log it quietly
+                        // instead of as an error.
+                        (0, logger_1.debug)("overkiz", msg);
+                    }
+                    else {
+                        (0, logger_1.err)("overkiz", msg);
+                    }
+                },
                 debug: (...args) => (0, logger_1.debug)("overkiz", args.join(" ")),
                 info: (...args) => (0, logger_1.log)("overkiz", args.join(" ")),
                 log: (...args) => (0, logger_1.log)("overkiz", args.join(" ")),
@@ -79,32 +119,46 @@ class Overkiz extends base_1.Base {
                 refreshPeriod: this.config.refreshPeriod || 60,
             });
             const setup = yield this.client.getSetup();
+            this.devices.clear();
+            this.closures.clear();
             setup.devices.forEach(device => this.attachDevice(device));
             (0, logger_1.log)("overkiz", `connected -> ${setup.devices.length} device(s) found`);
         });
     }
     attachDevice(device) {
         this.devices.set(device.deviceURL, device);
-        const closure = device.getNumber("core:ClosureState");
-        if (device.hasState("core:ClosureState"))
-            this.closures.set(device.deviceURL, closure);
+        const stateName = kPositionStateNames.find(n => device.hasState(n));
+        if (stateName)
+            this.closures.set(device.deviceURL, device.getNumber(stateName));
         device.on("states", (states) => this.onStates(device, states));
     }
     onStates(device, states) {
         (0, logger_1.debug)("overkiz", `states for ${device.label} -> ${JSON.stringify(states)}`);
-        const closureState = states.find(s => s.name === "core:ClosureState");
-        if (closureState) {
-            const closure = Number(closureState.value);
+        const positionState = states.find(s => kPositionStateNames.includes(s.name));
+        if (positionState) {
+            const closure = Number(positionState.value);
             const previous = this.closures.get(device.deviceURL);
             const unitState = closureToUnitState(closure, previous);
             this.closures.set(device.deviceURL, closure);
-            (0, logger_1.log)("overkiz", `${device.label} -> closure ${closure} -> UnitState ${types_1.UnitState[unitState]}`);
+            (0, logger_1.log)("overkiz", `${device.label} -> position ${closure} -> UnitState ${types_1.UnitState[unitState]}`);
             this.emitter.emit("state", device.deviceURL, unitState, closure);
         }
+        const intensityState = states.find(s => kIntensityStateNames.includes(s.name));
+        if (intensityState) {
+            const intensity = Number(intensityState.value);
+            (0, logger_1.log)("overkiz", `${device.label} -> intensity ${intensity}`);
+            this.emitter.emit("intensity", device.deviceURL, intensity);
+        }
+    }
+    uiClass(deviceURL) {
+        var _a;
+        return ((_a = this.devices.get(deviceURL)) === null || _a === void 0 ? void 0 : _a.definition.uiClass) || "";
     }
     listDevices() {
-        return Array.from(this.devices.values()).map(d => ({
-            deviceURL: d.deviceURL, label: d.label, widget: d.definition.widgetName,
+        return Array.from(this.devices.values())
+            .filter(d => !kIgnoredUiClasses.includes(d.definition.uiClass))
+            .map(d => ({
+            deviceURL: d.deviceURL, label: d.label, widget: d.definition.widgetName, uiClass: d.definition.uiClass,
         }));
     }
     execute(deviceURL, commandName, parameters = []) {
@@ -116,26 +170,46 @@ class Overkiz extends base_1.Base {
                 label: "smartsocket",
                 actions: [{ deviceURL, commands: [{ name: commandName, parameters }] }],
             });
+            // work around the executionPool/onStateUpdate quirk described above: get
+            // an authoritative resulting state ourselves rather than trusting the
+            // (possibly swallowed) push event for our own command.
+            this.client.refreshDeviceStates(deviceURL).catch(e => (0, logger_1.debug)("overkiz", `refreshDeviceStates failed: ${e.message || e}`));
         });
     }
+    hasCommand(deviceURL, commandName) {
+        var _a;
+        return ((_a = this.devices.get(deviceURL)) === null || _a === void 0 ? void 0 : _a.hasCommand(commandName)) || false;
+    }
     up(deviceURL) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.execute(deviceURL, "open");
+            yield this.execute(deviceURL, (this.uiClass(deviceURL) === kAwningUiClass) ? "undeploy" : "open");
         });
     }
     down(deviceURL) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.execute(deviceURL, "close");
+            yield this.execute(deviceURL, (this.uiClass(deviceURL) === kAwningUiClass) ? "deploy" : "close");
         });
     }
+    // Only send a real 'stop' -- never fake one (that's the whole point of this
+    // native integration over the Homebridge-accessory link path). If this
+    // particular device doesn't expose a 'stop' command, do nothing.
     stop(deviceURL) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.hasCommand(deviceURL, "stop")) {
+                (0, logger_1.log)("overkiz", `device ${deviceURL} has no native 'stop' command -> not sending anything`);
+                return;
+            }
             yield this.execute(deviceURL, "stop");
         });
     }
     setClosure(deviceURL, percentClosed) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.execute(deviceURL, "setClosure", [percentClosed]);
+            yield this.execute(deviceURL, (this.uiClass(deviceURL) === kAwningUiClass) ? "setDeployment" : "setClosure", [percentClosed]);
+        });
+    }
+    setIntensity(deviceURL, percent) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.execute(deviceURL, "setIntensity", [percent]);
         });
     }
 }

package/server/smartapp.js

@@ -25,6 +25,7 @@ const logger_1 = require("../duotecno/logger");
 const protocol_1 = require("../duotecno/protocol");
 const somfy = require("./somfy");
 const fs_1 = require("fs");
+const overkiz_1 = require("./overkiz");
 const config_1 = require("../duotecno/config");
 const HB_1 = require("./HB");
 const HA_API_1 = require("./HA-API");
@@ -516,6 +517,7 @@ function SmartSocketInit(message){
     // Settings //
     //////////////
     doSettings(context) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let config = this.read("settings");
             let message = "";
@@ -528,6 +530,9 @@ function SmartSocketInit(message){
                     // Note: Full restart recommended for mDNS changes to take effect properly
                     (0, logger_1.log)("smartapp", "Settings saved. mDNS name updated to: " + config.mdnsName);
                 }
+                const overkizMessage = yield this.saveOverkizSettings(context);
+                if (overkizMessage)
+                    message += " " + overkizMessage;
             }
             else if (context.action === "restart") {
                 context.request = "restart";
@@ -536,7 +541,9 @@ function SmartSocketInit(message){
             else {
                 // Just display the settings form
             }
-            return this.ejs("settings", context, { config, message });
+            const overkizConfig = ((_a = this.power.overkiz) === null || _a === void 0 ? void 0 : _a.config) || types_1.Sanitizers.overkiz(null);
+            const overkizDevices = this.power.overkiz ? this.power.overkiz.listDevices() : [];
+            return this.ejs("settings", context, { config, message, overkizConfig, overkizDevices });
         });
     }
     scrapeSettings(context) {
@@ -683,6 +690,7 @@ function SmartSocketInit(message){
                 (0, logger_1.log)("smartapp", "** error ** missing unit: " + (0, types_1.hex)(link.logicalNodeAddress) + "/" + (0, types_1.hex)(link.logicalAddress) + " **");
             }
         });
+        this.attachOverkizListeners();
         (0, HB_1.hbSubscribe)(() => __awaiter(this, void 0, void 0, function* () {
             // Get all values for subscribed accessories (links)
             if (this.links.length && (yield this.checkToken())) {
@@ -724,42 +732,49 @@ function SmartSocketInit(message){
             (0, logger_1.debug)("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
             if (!this.links.length)
                 return;
-            if (!(yield this.checkToken()))
-                return;
+            // only bother logging into the Homebridge API if we actually have an accessory-type link to serve
+            const needsToken = this.links.some(link => link.type === types_1.LinkType.kAccessory);
+            const tokenOK = needsToken ? yield this.checkToken() : true;
             for (const link of this.links) {
-                if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
-                    const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
-                    if (typeof hbValue != "undefined") {
-                        try {
-                            if (hbValue === -1) {
-                                if (link.nostop === "Y") {
-                                    (0, logger_1.debug)("smartapp", "-> Not sending simulated 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName() + " (disabled)");
-                                }
-                                else {
-                                    (0, logger_1.log)("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
-                                    const val = yield (0, HB_1.hbStop)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
-                                    if (typeof val != "undefined")
-                                        link.hbValue = val;
-                                }
-                            }
-                            else if (hbValue !== link.hbValue) {
-                                (0, logger_1.log)("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
-                                link.hbValue = hbValue;
-                                yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, hbValue, this.token);
+                if (!u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress))
+                    continue;
+                if (link.type === types_1.LinkType.kOverkiz) {
+                    yield this.informOverkizLink(u, link);
+                    continue;
+                }
+                if (!tokenOK)
+                    continue;
+                const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
+                if (typeof hbValue != "undefined") {
+                    try {
+                        if (hbValue === -1) {
+                            if (link.nostop === "Y") {
+                                (0, logger_1.debug)("smartapp", "-> Not sending simulated 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName() + " (disabled)");
                             }
                             else {
-                                (0, logger_1.debug)("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+                                (0, logger_1.log)("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                                const val = yield (0, HB_1.hbStop)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
+                                if (typeof val != "undefined")
+                                    link.hbValue = val;
                             }
                         }
-                        catch (e) {
-                            if (e instanceof HB_1.HbAuthError) {
-                                (0, logger_1.err)("smartapp", "informLinks: Homebridge API token expired for accessory " + link.accName + " -> forcing re-login on next update");
-                                this.token = "";
-                                (0, config_1.setToken)("");
-                            }
-                            else {
-                                (0, logger_1.err)("smartapp", "informLinks: failed to set HB value for accessory " + link.accName + " -> " + e.toString());
-                            }
+                        else if (hbValue !== link.hbValue) {
+                            (0, logger_1.log)("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
+                            link.hbValue = hbValue;
+                            yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, hbValue, this.token);
+                        }
+                        else {
+                            (0, logger_1.debug)("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+                        }
+                    }
+                    catch (e) {
+                        if (e instanceof HB_1.HbAuthError) {
+                            (0, logger_1.err)("smartapp", "informLinks: Homebridge API token expired for accessory " + link.accName + " -> forcing re-login on next update");
+                            this.token = "";
+                            (0, config_1.setToken)("");
+                        }
+                        else {
+                            (0, logger_1.err)("smartapp", "informLinks: failed to set HB value for accessory " + link.accName + " -> " + e.toString());
                         }
                     }
                 }
@@ -767,6 +782,186 @@ function SmartSocketInit(message){
             ;
         });
     }
+    // Duotecno -> Overkiz direction of a kOverkiz link. Mirrors the kAccessory
+    // branch above, but talks straight to the Overkiz device instead of going
+    // through the Homebridge REST API -- and unlike hbStop(), overkiz.stop()
+    // is a genuine 'stop' command, not a simulated one.
+    informOverkizLink(u, link) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.power.overkiz)
+                return;
+            if (u.isUpDown()) {
+                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).
+            const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
+            if ((typeof hbValue === "undefined") || (hbValue === link.hbValue))
+                return;
+            try {
+                link.hbValue = hbValue;
+                (0, logger_1.log)("smartapp", "-> Setting Overkiz intensity for: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName());
+                yield this.power.overkiz.setIntensity(link.accId, hbValue);
+            }
+            catch (e) {
+                (0, logger_1.err)("smartapp", "informOverkizLink: 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) /
+    //    11 (up) / 12 (down), a one-shot pulse (this is what dt2hbvalue/HB.ts
+    //    expects, and is what the existing Homebridge-accessory links rely on).
+    //  - the real motor's own busy/idle status -> unit.value === unit.status,
+    //    one of 0 (stopped), 1 (stopped/down), 2 (stopped/up), 3 (busy/down),
+    //    4 (busy/up) -- e.g. the "Garage" unit, which has no duoswitch macro
+    //    wired to it and only ever reports these real values.
+    // Handle both: a real motor's busy<->idle transition is translated into
+    // up/down/stop the same way a virtual pulse would be.
+    informOverkizUpDown(u, link) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.power.overkiz)
+                return;
+            const rawValue = Math.round(u.value);
+            try {
+                if ((rawValue === 10) || (rawValue === 11) || (rawValue === 12)) {
+                    // virtual duoswitch pulse
+                    if (rawValue === link.hbValue)
+                        return;
+                    link.hbValue = rawValue;
+                    if (rawValue === 10) {
+                        if (link.nostop === "Y") {
+                            (0, logger_1.debug)("smartapp", "-> Not sending 'stop' to Overkiz device: " + link.accName + " (disabled)");
+                        }
+                        else {
+                            (0, logger_1.log)("smartapp", "-> Sending 'stop' to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                            yield this.power.overkiz.stop(link.accId);
+                        }
+                    }
+                    else if (rawValue === 11) {
+                        (0, logger_1.log)("smartapp", "-> Sending up/open to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                        yield this.power.overkiz.up(link.accId);
+                    }
+                    else {
+                        (0, logger_1.log)("smartapp", "-> Sending down/close to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                        yield this.power.overkiz.down(link.accId);
+                    }
+                    return;
+                }
+                // real motor busy/idle status
+                const status = u.status;
+                const wasBusy = (link.hbValue === 3) || (link.hbValue === 4);
+                const isBusy = (status === 3) || (status === 4);
+                if (isBusy && (status !== link.hbValue)) {
+                    link.hbValue = status;
+                    if (status === 4) {
+                        (0, logger_1.log)("smartapp", "-> Sending up/open to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                        yield this.power.overkiz.up(link.accId);
+                    }
+                    else {
+                        (0, logger_1.log)("smartapp", "-> Sending down/close to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                        yield this.power.overkiz.down(link.accId);
+                    }
+                }
+                else if (!isBusy && wasBusy) {
+                    link.hbValue = status;
+                    if (link.nostop === "Y") {
+                        (0, logger_1.debug)("smartapp", "-> Not sending 'stop' to Overkiz device: " + link.accName + " (disabled)");
+                    }
+                    else {
+                        (0, logger_1.log)("smartapp", "-> Sending 'stop' to Overkiz device: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                        yield this.power.overkiz.stop(link.accId);
+                    }
+                }
+                else {
+                    link.hbValue = status;
+                }
+            }
+            catch (e) {
+                (0, logger_1.err)("smartapp", "informOverkizUpDown: failed for " + link.accName + " -> " + e.toString());
+            }
+        });
+    }
+    attachOverkizListeners() {
+        if (!this.power.overkiz || (this.power.overkiz === this.attachedOverkiz))
+            return;
+        this.attachedOverkiz = this.power.overkiz;
+        this.power.overkiz.emitter.on("state", (deviceURL, unitState) => {
+            for (const link of this.links) {
+                if ((link.type !== types_1.LinkType.kOverkiz) || (link.accId !== deviceURL) || !link.unit)
+                    continue;
+                if (unitState === link.dtValue)
+                    continue; // no repeat
+                link.dtValue = unitState;
+                if ((unitState === types_1.UnitState.kOpen) || (unitState === types_1.UnitState.kOpening)) {
+                    (0, logger_1.log)("smartapp", "-> Overkiz reports " + types_1.UnitState[unitState] + " for: " + link.accName + " -> setting Duotecno unit " + link.unit.getDisplayName() + " to open");
+                    link.unit.setState(types_1.UnitMotorCmd.kOpen);
+                }
+                else if ((unitState === types_1.UnitState.kClosed) || (unitState === types_1.UnitState.kClosing)) {
+                    (0, logger_1.log)("smartapp", "-> Overkiz reports " + types_1.UnitState[unitState] + " for: " + link.accName + " -> setting Duotecno unit " + link.unit.getDisplayName() + " to close");
+                    link.unit.setState(types_1.UnitMotorCmd.kClose);
+                }
+                else {
+                    // kStopped: Overkiz reports the device sitting still somewhere in
+                    // the middle (e.g. stopped mid-way via the Somfy app/remote) --
+                    // forward a genuine stop, same as the Duotecno -> Overkiz direction.
+                    if (link.nostop === "Y") {
+                        (0, logger_1.debug)("smartapp", "-> Not forwarding Overkiz 'stopped' for: " + link.accName + " (disabled)");
+                    }
+                    else {
+                        (0, logger_1.log)("smartapp", "-> Overkiz reports stopped for: " + link.accName + " -> setting Duotecno unit " + link.unit.getDisplayName() + " to stop");
+                        link.unit.setState(types_1.UnitMotorCmd.kStop);
+                    }
+                }
+            }
+        });
+        this.power.overkiz.emitter.on("intensity", (deviceURL, intensity) => {
+            for (const link of this.links) {
+                if ((link.type !== types_1.LinkType.kOverkiz) || (link.accId !== deviceURL) || !link.unit)
+                    continue;
+                const { dtValue, dtTarget } = (0, HB_1.hb2dtvalue)(link.unit, intensity);
+                if (dtValue !== link.dtValue) {
+                    (0, logger_1.log)("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + dtTarget + " from Overkiz intensity " + intensity + " of: " + link.accName);
+                    link.dtValue = dtValue;
+                    link.unit.setState(dtTarget);
+                }
+            }
+        });
+    }
+    //////////////////////////////
+    // Overkiz (Somfy/TaHoma)   //
+    //////////////////////////////
+    // Saves the Overkiz fields living on the Settings page and (re)connects.
+    // Only attempts a connection when credentials are actually present, so
+    // saving the rest of the Settings form doesn't produce a spurious
+    // "connection failed" for installs that don't use Overkiz at all.
+    saveOverkizSettings(context) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const service = context.getParam({ name: "service", type: "string", default: "local" });
+            const user = context.getParam({ name: "user", type: "string", default: "" });
+            const submittedPassword = context.getParam({ name: "password", type: "string", default: "" });
+            // blank password field means "keep the current one"
+            const password = submittedPassword || ((_b = (_a = this.power.overkiz) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.password) || "";
+            const pollingPeriod = context.getParam({ name: "pollingPeriod", type: "integer", default: 10 });
+            if (!this.power.overkiz)
+                this.power.overkiz = new overkiz_1.Overkiz(this.system);
+            this.power.overkiz.config = types_1.Sanitizers.overkiz({ service, user, password, pollingPeriod });
+            this.power.overkiz.writeConfig();
+            if (!user || !password)
+                return "";
+            try {
+                yield this.power.overkiz.connect();
+                this.attachOverkizListeners();
+                return "Overkiz connected successfully -> " + this.power.overkiz.listDevices().length + " device(s) found.";
+            }
+            catch (e) {
+                return "Overkiz connection failed: " + (e.message || e.toString());
+            }
+        });
+    }
     checkToken() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.token) {
@@ -793,6 +988,7 @@ function SmartSocketInit(message){
         return __awaiter(this, void 0, void 0, function* () {
             let inx = parseInt(context.id);
             const accessories = yield this.getAccessories();
+            const overkizDevices = this.power.overkiz ? this.power.overkiz.listDevices() : [];
             const units = this.system.allUsedUnits();
             let message;
             try {
@@ -800,11 +996,11 @@ function SmartSocketInit(message){
                     this.links.push(Object.assign(Object.assign({}, types_1.kEmptyLink), { type: types_1.LinkType.kAccessory }));
                     inx = this.links.length - 1;
                     return this.ejs("linkDetail", context, { link: this.links[inx], id: inx,
-                        masters: this.system.masters, accessories, units });
+                        masters: this.system.masters, accessories, overkizDevices, units });
                 }
                 else if (context.action === "edit") {
                     return this.ejs("linkDetail", context, { link: this.links[inx], id: inx,
-                        masters: this.system.masters, accessories, units });
+                        masters: this.system.masters, accessories, overkizDevices, units });
                 }
                 else if (context.action === "delete") {
                     this.deleteLink(inx);
@@ -824,22 +1020,29 @@ function SmartSocketInit(message){
         });
     }
     scrapeLink(context) {
+        var _a;
         // don't take the name of the unit
         const { masterAddress, masterPort, logicalAddress, logicalNodeAddress } = this.scrapeUnit(context, '');
-        // for now only accessory links.
-        const stype = context.getParam({ name: "type", type: "string", default: types_1.LinkType.kAccessory });
         const name = context.getParam({ name: "name", type: "string", default: "--" });
         // max & min values
         const min = context.getParam({ name: "min", type: "integer", default: 0 });
         const max = context.getParam({ name: "max", type: "integer", default: 100 });
         // don't forward the simulated 'stop' of an up/down link to the accessory
         const nostop = context.getParam({ name: "nostop", type: "string", default: "N" });
-        // uniqiue id for the accessory
-        const accId = context.getParam({ name: "accId", type: "string", default: "" });
-        const accName = (0, HB_1.hbName)(accId);
-        const accService = (0, HB_1.hbService)(accId);
-        return { accId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, min, max, nostop };
-        ;
+        // the accessory dropdown offers both Homebridge accessories and Overkiz
+        // devices in one list; an Overkiz option's value is prefixed so we know
+        // which provider -- and hence Link type -- the picked id belongs to.
+        const rawAccId = context.getParam({ name: "accId", type: "string", default: "" });
+        const kOverkizPrefix = "overkiz:";
+        if (rawAccId.startsWith(kOverkizPrefix)) {
+            const accId = rawAccId.substring(kOverkizPrefix.length);
+            const device = (_a = this.power.overkiz) === null || _a === void 0 ? void 0 : _a.listDevices().find(d => d.deviceURL === accId);
+            return { accId, accName: (device === null || device === void 0 ? void 0 : device.label) || "", accService: device ? [device.uiClass] : [],
+                name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: types_1.LinkType.kOverkiz, min, max, nostop };
+        }
+        const accName = (0, HB_1.hbName)(rawAccId);
+        const accService = (0, HB_1.hbService)(rawAccId);
+        return { accId: rawAccId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: types_1.LinkType.kAccessory, min, max, nostop };
     }
     updateLink(inx, link) {
         if ((inx >= 0) && (inx < this.links.length)) {

package/server/views/link-details.ejs

@@ -61,16 +61,24 @@
             <select name="accId" id="accId">
               <option value="" <%= (link.accId == '') ? 'selected' : '' %>>Select an Accessory</option>
               <% for (let a of accessories) { %>
-                <% if (a.manufacturer != manufacturer) { 
-                  if (manufacturer) { %> </optgroup> <% } 
-                  manufacturer = a.manufacturer; %>
+                <% const accManufacturer = (a.manufacturer.indexOf("Coppieters") !== -1) ? "Duotecno" : a.manufacturer; %>
+                <% if (accManufacturer != manufacturer) {
+                  if (manufacturer) { %> </optgroup> <% }
+                  manufacturer = accManufacturer; %>
                   <optgroup label="<%= manufacturer %>">
                 <% } %>
-                 <option value="<%= a.id %>" <%= (link.accId == a.id) ? 'selected' : '' %>><%= a.name %></option>
-              <% } 
+                 <option value="<%= a.id %>" <%= ((link.type == 'accessory') && (link.accId == a.id)) ? 'selected' : '' %>><%= a.name %></option>
+              <% }
               if (manufacturer) { %> </optgroup> <% } %>
+              <% if (overkizDevices && overkizDevices.length) { %>
+                <optgroup label="Overkiz">
+                  <% for (let d of overkizDevices) { %>
+                    <option value="overkiz:<%= d.deviceURL %>" <%= ((link.type == 'overkiz') && (link.accId == d.deviceURL)) ? 'selected' : '' %>><%= d.label %> (<%= d.uiClass %>)</option>
+                  <% } %>
+                </optgroup>
+              <% } %>
             </select>
-            <label for="id">Linked HB accessory</label>
+            <label for="id">Linked accessory (Homebridge or Overkiz)</label>
           </div>
         </div>
 

package/server/views/nav.ejs

@@ -16,17 +16,25 @@
       <li <% if (request === "masters") { %>class="active"<% } %>><a href="<%= basePath %>/masters">Masters</a></li>
       <li <% if (request === "services") { %>class="active"<% } %>><a href="<%= basePath %>/services">Services</a></li>
       <li <% if (request === "proxy") { %>class="active"<% } %>><a href="<%= basePath %>/proxy">Proxy</a></li>
-      <li <% if (request === "links") { %>class="active"<% } %>><a href="<%= basePath %>/links">Links</a></li>
-      <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Devices</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</a></li><% } %>
-      <% if (hasShelly) { %><li <% if ((request === "power") && (type === "shelly")) { %>class="active"<% } %>><a href="<%= basePath %>/power?type=shelly">Shelly</a></li><% } %>
-      <li <% if (request === "switches") { %>class="active"<% } %>><a href="<%= basePath %>/switches">Switches</a></li>
+      <li <% if ((request === "links") || (request === "switches")) { %>class="active"<% } %>><a class="dropdown-trigger" href="#" data-target="linking-dropdown">Linking<i class="material-icons right">arrow_drop_down</i></a></li>
+      <li <% if ((request === "devices") || (request === "power")) { %>class="active"<% } %>><a class="dropdown-trigger" href="#" data-target="energy-dropdown">Energy<i class="material-icons right">arrow_drop_down</i></a></li>
       <li <% if (request === "settings") { %>class="active"<% } %>><a href="<%= basePath %>/settings">Settings</a></li>
     </ul>
   </div>
 </nav>
 
+<ul id="linking-dropdown" class="dropdown-content">
+  <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>
+</ul>
+
+<ul id="energy-dropdown" class="dropdown-content">
+  <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Websocket devices</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</a></li><% } %>
+  <% if (hasShelly) { %><li <% if ((request === "power") && (type === "shelly")) { %>class="active"<% } %>><a href="<%= basePath %>/power?type=shelly">Shelly</a></li><% } %>
+</ul>
+
 <!-- Mobile Slide-out Menu -->
 <ul class="sidenav" id="mobile-menu">
   <li><div class="user-view">
@@ -35,16 +43,18 @@
   </div></li>
   <li <% if (request === "masters") { %>class="active"<% } %>><a href="<%= basePath %>/masters">Masters</a></li>
   <li <% if (request === "services") { %>class="active"<% } %>><a href="<%= basePath %>/services">Services</a></li>
+  <li <% if (request === "proxy") { %>class="active"<% } %>><a href="<%= basePath %>/proxy">Proxy</a></li>
   <li><div class="divider"></div></li>
-  <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Devices</a></li>
-  <li <% if (request === "links") { %>class="active"<% } %>><a href="<%= basePath %>/links">Links</a></li>
-  <li <% if (request === "switches") { %>class="active"<% } %>><a href="<%= basePath %>/switches">Switches</a></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><div class="divider"></div></li>
+  <li class="subheader">Energy</li>
+  <li <% if (request === "devices") { %>class="active"<% } %>><a href="<%= basePath %>/devices">Websocket devices</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><% } %>
   <li><div class="divider"></div></li>
-  <li <% if (request === "proxy") { %>class="active"<% } %>><a href="<%= basePath %>/proxy">Proxy</a></li>
   <li <% if (request === "settings") { %>class="active"<% } %>><a href="<%= basePath %>/settings">Settings</a></li>
 </ul>
 

package/server/views/settings.ejs

@@ -2,6 +2,7 @@
   <html>
     <head>
       <%- include('/views/head'); -%>
+      <style> .select-wrapper { max-width: 300px !important; } </style>
     </head>
 
     <body>
@@ -14,9 +15,9 @@
         <% if (typeof message !== 'undefined' && message) { %>
         <div class="row">
           <div class="col s12">
-            <div class="card-panel <%= message.includes('successfully') ? 'green lighten-4' : 'orange lighten-4' %>">
-              <span class="<%= message.includes('successfully') ? 'green-text text-darken-4' : 'orange-text text-darken-4' %>">
-                <i class="material-icons left"><%= message.includes('successfully') ? 'check_circle' : 'info' %></i>
+            <div class="card-panel <%= message.includes('failed') ? 'orange lighten-4' : 'green lighten-4' %>">
+              <span class="<%= message.includes('failed') ? 'orange-text text-darken-4' : 'green-text text-darken-4' %>">
+                <i class="material-icons left"><%= message.includes('failed') ? 'info' : 'check_circle' %></i>
                 <%= message %>
               </span>
             </div>
@@ -58,6 +59,71 @@
           </div>
         </div>
 
+        <style>
+          /* Materialize floats active labels to translateY(-14px), which sits too
+             close to the input value here -- push these up further. Scoped to this
+             section only, not a site-wide change. */
+          .overkiz-settings .input-field > label.active {
+            transform: translateY(-26px) scale(0.8) !important;
+            -webkit-transform: translateY(-26px) scale(0.8) !important;
+          }
+        </style>
+        <div class="overkiz-settings">
+        <h5>Overkiz (Somfy / TaHoma)</h5>
+        <div class="row">
+          <div class="input-field col s3">
+            <select name="service" id="service">
+              <option value="local" <%= (overkizConfig.service == 'local') ? 'selected' : '' %>>Local (developer mode)</option>
+              <option value="tahoma" <%= (overkizConfig.service == 'tahoma') ? 'selected' : '' %>>Cloud - TaHoma / Somfy Europe</option>
+              <option value="somfy_australia" <%= (overkizConfig.service == 'somfy_australia') ? 'selected' : '' %>>Cloud - Somfy Australia</option>
+              <option value="somfy_north_america" <%= (overkizConfig.service == 'somfy_north_america') ? 'selected' : '' %>>Cloud - Somfy North America</option>
+              <option value="connexoon" <%= (overkizConfig.service == 'connexoon') ? 'selected' : '' %>>Cloud - Connexoon</option>
+              <option value="cozytouch" <%= (overkizConfig.service == 'cozytouch') ? 'selected' : '' %>>Cloud - Cozytouch</option>
+              <option value="hi_kumo" <%= (overkizConfig.service == 'hi_kumo') ? 'selected' : '' %>>Cloud - Hi Kumo</option>
+            </select>
+            <label for="service">Service</label>
+          </div>
+
+          <div class="input-field col s3">
+            <input placeholder="1234-5678-9012 or IP" id="user" name="user" type="text" value="<%= overkizConfig.user %>">
+            <label for="user">User (local: gateway PIN or IP -- cloud: account username)</label>
+          </div>
+
+          <div class="input-field col s3">
+            <input placeholder="leave blank to keep current" id="password" name="password" type="password" value="">
+            <label for="password">Password (local: developer-mode token -- cloud: account password)</label>
+          </div>
+
+          <div class="input-field col s3">
+            <input placeholder="10" id="pollingPeriod" name="pollingPeriod" type="number" min="1" value="<%= overkizConfig.pollingPeriod %>">
+            <label for="pollingPeriod">Polling period (sec) -- how often we check for remote/app-triggered changes</label>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col s12">
+            <b>Local developer mode</b>: activate it in the Somfy TaHoma app first
+            (<a href="https://developer.somfy.com/somfy-tahoma-developer-mode" target="_blank">developer.somfy.com</a>),
+            which gives you the gateway PIN and lets you generate a token.<br />
+            <b>Cloud mode</b> in Belgium choose: Cloud - TaHoma / Somfy Europe.<br />
+            Saving here (re)connects immediately.
+          </div>
+        </div>
+
+        <% if (overkizDevices && overkizDevices.length) { %>
+        <table>
+          <thead>
+            <tr><th>Label</th><th>Type</th><th>deviceURL</th></tr>
+          </thead>
+          <tbody>
+            <% for (let d of overkizDevices) { %>
+              <tr><td><%= d.label %></td><td><%= d.uiClass %> (<%= d.widget %>)</td><td><%= d.deviceURL %></td></tr>
+            <% } %>
+          </tbody>
+        </table>
+        <% } %>
+        </div>
+
         <div class="row">
           <div class="col s12">
             <button class="btn waves-effect waves-light" type="submit" name="action" value="save">