homebridge-smartsystem 6.7.3 → 6.8.0

package/README.md

@@ -298,6 +298,11 @@ Homebridge UI version
 - 1: updated the readme file
 - 2: use HB Accessory characteristics in set/get, ignore status for the moment
 - 2: remember/show username in login screen + set focus to password
+- 3: do dimmers/up-downs
+- 4: better up-down values to and from HB
+
+### v6.8.0 - 08/07/2025
+- 0: first version including the proxy
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/config.json

@@ -270,22 +270,6 @@
           "ObstructionDetected"
         ],
         "type": "accessory"
-      },
-      {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 30,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "dimmers",
-        "displayName": "dimmers",
-        "extendedType": 0,
-        "accId": "da32bb657ad68d3fd63004015406e0cbde28355fc950204cec2fcd90d835e044",
-        "accName": "Somfy Dimmer",
-        "accService": [
-          "On",
-          "Brightness"
-        ],
-        "type": "accessory"
       }
     ]
   },
@@ -373,6 +357,18 @@
         "used": "Y",
         "group": 0
       },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 28,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Garage $",
+        "displayName": "Garage ",
+        "extendedType": 8,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 3,
         "logicalAddress": 31,
@@ -484,5 +480,14 @@
       "gateway2": ""
     }
   },
-  "p1": false
+  "p1": false,
+  "proxy": {
+    "cloudServer": "ws.duotecno.eu",
+    "cloudPort": 5098,
+    "masterAddress": "192.168.0.97",
+    "masterPort": 5001,
+    "uniqueId": "",
+    "debug": false,
+    "kind": "solo"
+  }
 }

package/duotecno/logger.js

@@ -15,7 +15,7 @@ var LogLevel;
 exports.logSettings = {
     "*": LogLevel.log,
     "master": LogLevel.log,
-    "protocol": LogLevel.noLog,
+    "protocol": LogLevel.debug,
     "webapp": LogLevel.log,
     "p1": LogLevel.log,
     "shelly": LogLevel.log,

package/duotecno/logger.ts

@@ -10,7 +10,7 @@ export enum LogLevel { noLog = 0, log = 1, debug = 2 };
 export const logSettings = {
   "*": LogLevel.log,
   "master": LogLevel.log,
-  "protocol": LogLevel.noLog,
+  "protocol": LogLevel.debug,
   "webapp": LogLevel.log,
   "p1": LogLevel.log,
   "shelly": LogLevel.log,

package/duotecno/types.js

@@ -15,6 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyLink = exports.LinkType = exports.kEmptySwitch = exports.SwitchType = exports.kEmptyRule = exports.kEmptyAction = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
+const proxy_1 = require("../server/proxy");
 // Node types
 var NodeType;
 (function (NodeType) {
@@ -204,6 +205,7 @@ exports.Sanitizers = {
         config.shelly = config.shelly || false;
         config.smartapp = config.smartapp || null;
         config.system = exports.Sanitizers.system(config.system);
+        config.proxy = exports.Sanitizers.proxy(config.proxy, config.system);
         return config;
     },
     homebridge: function (config) {
@@ -358,6 +360,19 @@ exports.Sanitizers = {
             b.channel = binding.channel || "0";
         return b;
     },
+    ///////////
+    // Proxy //
+    ///////////
+    proxy: function (config, system) {
+        var _a, _b;
+        const c = 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) || "";
+        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.uniqueId = (config === null || config === void 0 ? void 0 : config.uniqueId) || proxy_1.kEmptyProxy.uniqueId;
+        return c;
+    },
     //////////////
     // Duotecno //
     //////////////

package/duotecno/types.ts

@@ -4,6 +4,7 @@
 // v3 - smart server version, Mar 2020
 // v3.1 - added scenes from app version, May 2020
 
+import { kEmptyProxy, ProxyConfig } from "../server/proxy";
 import { Unit } from "./protocol";
 
 // for Active=Y/N or New=X
@@ -269,8 +270,8 @@ export interface Link extends UnitDef{
   accService: Array<string>; // e.g. ["On", "Brightness"], ["TargetPosition", "CurrentPosition", ...]
   type: LinkType;
   unit?: Unit;
-  status?: number | boolean;
-  value?: number | boolean | string
+  dtValue?: number | boolean | string;
+  hbValue?: number | boolean | string
 }
 
 export const kEmptyLink: Link = { 
@@ -412,6 +413,7 @@ export const Sanitizers = {
     config.shelly = config.shelly || false;
     config.smartapp = config.smartapp || null;
     config.system = Sanitizers.system(config.system);
+    config.proxy = Sanitizers.proxy(config.proxy, config.system);
     
     return config;
   },
@@ -581,6 +583,19 @@ export const Sanitizers = {
     return b;
   },
 
+  ///////////
+  // Proxy //
+  ///////////
+  proxy: function(config?: ProxyConfig, system?: SystemConfig): ProxyConfig {
+    const c = kEmptyProxy as ProxyConfig;
+    c.cloudServer = config?.cloudServer || kEmptyProxy.cloudServer;
+    c.cloudPort = config?.cloudPort || kEmptyProxy.cloudPort;
+    c.masterAddress = config?.masterAddress || system?.cmasters[0]?.address || "";
+    c.masterPort = config?.masterPort || system?.cmasters[0]?.port || 5001;
+    c.uniqueId = config?.uniqueId || kEmptyProxy.uniqueId;
+    return c;
+  },
+
   //////////////
   // Duotecno //
   //////////////

package/package.json

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

package/server/HB.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hbUnsubscribe = exports.hbSubscribe = exports.hbGetState = exports.hbSetState = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = void 0;
+exports.hbUnsubscribe = exports.hbSubscribe = exports.hbGetValue = exports.hbSetState = exports.dt2hbvalue = exports.hb2dtvalue = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = void 0;
 const logger_1 = require("../duotecno/logger");
 const HA_API_1 = require("./HA-API");
 let gAccessories = [];
@@ -200,21 +200,49 @@ function hbLoad(value, service) {
     ;
     return data;
 }
+function hb2dtvalue(unit, value) {
+    let dtTarget;
+    let dtValue;
+    if (typeof value === "boolean")
+        value = (value) ? 99 : 1;
+    value = Math.round(value);
+    if (unit.isUpDown()) {
+        dtTarget = (value >= 50) ? 4 : 5; // 4 = up, 5 = down
+        dtValue = (value >= 50) ? 2 : 1; // 2 = idle-up, 1 = idle-down
+    }
+    if (unit.isDimmer())
+        dtTarget = dtValue = (value <= 1) ? 1 : (value >= 99) ? 100 : value;
+    if (unit.isSwitch() || unit.isMood())
+        dtTarget = dtValue = (value > 50) ? 1 : 0;
+    return { dtTarget, dtValue };
+}
+exports.hb2dtvalue = hb2dtvalue;
+function dt2hbvalue(unit, dontChangeValue) {
+    let value = (typeof unit.value === "boolean") ? (unit.value ? 100 : 0) : Math.round(unit.value);
+    // status Motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
+    if (unit.isUpDown())
+        return ((value === 1) || (value === 3)) ? 0 : ((value === 2) || (value === 4)) ? 100 : dontChangeValue;
+    if (unit.isDimmer())
+        return (value <= 2) ? 0 : (value >= 99) ? 100 : value;
+    if (unit.isSwitch() || unit.isMood())
+        return (value) ? 1 : 0;
+    return value;
+}
+exports.dt2hbvalue = dt2hbvalue;
 function hbValue(data, service) {
-    const values = {};
     if (service.includes("Brightness")) {
-        values["value"] = parseInt(data["Brightness"]);
+        return parseInt(data["Brightness"]);
     }
     if (service.includes("On")) {
-        values["state"] = parseInt(data["On"]);
+        return parseInt(data["On"]);
     }
     if (service.includes("TargetPosition")) {
-        values["value"] = parseInt(data["TargetPosition"]);
+        return parseInt(data["TargetPosition"]);
     }
-    return values;
+    return undefined;
 }
 // send a status change to HB Accessory
-function hbSetState(server, id, service, value, state, token) {
+function hbSetState(server, id, service, value, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const data = hbLoad(value, service);
         (0, logger_1.log)("HB", "hbSetState: " + id + " -> " + JSON.stringify(data));
@@ -228,26 +256,26 @@ function hbSetState(server, id, service, value, state, token) {
 }
 exports.hbSetState = hbSetState;
 // send a status change to HB Accessory
-function hbGetState(server, id, service, token) {
+function hbGetValue(server, id, service, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const respBody = yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'GET', "", HA_API_1.ContentType.json, {
             Authorization: 'Bearer ' + token
         });
         if (respBody && respBody.error) {
             (0, logger_1.log)("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
-            return {};
+            return undefined;
         }
         else if (respBody && respBody.values) {
             return hbValue(respBody.values, service);
         }
         else {
             (0, logger_1.log)("HB", "hbGetState: " + id + " -> no values?? : " + JSON.stringify(respBody));
-            return {};
+            return undefined;
         }
         ;
     });
 }
-exports.hbGetState = hbGetState;
+exports.hbGetValue = hbGetValue;
 function hbSubscribe(callback) {
     if (timer) {
         clearInterval(timer);

package/server/HB.ts

@@ -1,4 +1,5 @@
 import { err, log } from "../duotecno/logger";
+import { Unit } from "../duotecno/protocol";
 import { ContentType, httpRequest } from "./HA-API";
 
 export interface HBAccessory {
@@ -205,24 +206,52 @@ function hbLoad(value: number | boolean, service: Array<string>): Record<string,
   return data;
 }
 
-function hbValue(data: Record<string, any>, service: Array<string>): {value?: number, state?: number} {
-  const values = {};
+export function hb2dtvalue(unit: Unit, value: number | boolean): {dtValue: number, dtTarget: number} {
+  let dtTarget;
+  let dtValue;
+
+  if (typeof value === "boolean") value = (value) ? 99 : 1;
+  value = Math.round(value);
+
+  if (unit.isUpDown()) {
+    dtTarget = (value >= 50) ? 4 : 5;  // 4 = up, 5 = down
+    dtValue = (value >= 50) ? 2 : 1;   // 2 = idle-up, 1 = idle-down
+  }
+  if (unit.isDimmer()) dtTarget = dtValue = (value <= 1) ? 1 : (value >= 99) ? 100 : value;
+  if (unit.isSwitch() || unit.isMood()) dtTarget = dtValue = (value > 50) ? 1 : 0;
+
+  return {dtTarget, dtValue};
+}
+
+export function dt2hbvalue(unit: Unit, dontChangeValue: number): number {
+  let value = (typeof unit.value === "boolean") ? (unit.value ? 100 : 0) : Math.round(unit.value);
+
+  // status Motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
+  if (unit.isUpDown()) return ((value === 1) || (value === 3)) ? 0 : ((value === 2) || (value === 4)) ? 100 : dontChangeValue;
+
+  if (unit.isDimmer()) return (value <= 2) ? 0 : (value >= 99) ? 100 : value;
+  if (unit.isSwitch() || unit.isMood()) return (value) ? 1 : 0;
+
+  return value;
+}
+
+function hbValue(data: Record<string, any>, service: Array<string>): number {
   if (service.includes("Brightness")) {
-    values["value"] = parseInt(data["Brightness"]);
+    return parseInt(data["Brightness"]);
   }
   
   if (service.includes("On")) {
-    values["state"] = parseInt(data["On"])
+    return parseInt(data["On"])
   }
   
   if (service.includes("TargetPosition")) {
-    values["value"] = parseInt(data["TargetPosition"]);
+    return parseInt(data["TargetPosition"]);
   }
-  return values
+  return undefined
 } 
 
 // send a status change to HB Accessory
-export async function hbSetState(server: string, id: string, service: Array<string>, value: number | boolean, state: number, token: string) : Promise<void> {
+export async function hbSetState(server: string, id: string, service: Array<string>, value: number | boolean, token: string) : Promise<void> {
   const data = hbLoad(value, service);
 
   log("HB", "hbSetState: " + id + " -> " + JSON.stringify(data));
@@ -236,20 +265,20 @@ export async function hbSetState(server: string, id: string, service: Array<stri
 }
 
 // send a status change to HB Accessory
-export async function hbGetState(server: string, id: string, service: Array<string>, token: string) : Promise<{value?: number, state?: number}> {
+export async function hbGetValue(server: string, id: string, service: Array<string>, token: string) : Promise<number> {
   const respBody = await httpRequest(server + "/api/accessories/"+id, 'GET', "", ContentType.json, {
     Authorization: 'Bearer ' + token
   });
   if (respBody && respBody.error) {
     log("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
-    return {};
+    return undefined;
 
   } else if (respBody && respBody.values) {
     return hbValue(respBody.values, service);
 
    } else {
     log("HB", "hbGetState: " + id + " -> no values?? : " + JSON.stringify(respBody));
-    return {};
+    return undefined;
    };
 }
 

package/server/platform.js

@@ -30,8 +30,10 @@ const p1_1 = require("./p1");
 const shelly_1 = require("./shelly");
 const config_1 = require("../duotecno/config");
 const fs_1 = require("fs");
+const proxy_1 = require("./proxy");
 class Platform extends base_1.Base {
     constructor(logger, pConfig, api) {
+        var _a;
         super("homebridge");
         this.accessoryList = [];
         this.ready = false;
@@ -109,6 +111,15 @@ class Platform extends base_1.Base {
         else {
             (0, logger_1.log)("homebridge", "platform - No SocApp configured.");
         }
+        if (this.config.proxy && ((_a = this.config.proxy) === null || _a === void 0 ? void 0 : _a.uniqueId)) {
+            this.config.proxy.kind = "gw";
+            (0, proxy_1.setProxyConfig)(this.config.proxy);
+            (0, proxy_1.cleanStart)(true);
+            (0, logger_1.log)("homebridge", "platform - Proxy configured: " + JSON.stringify(this.config.proxy, null, 2));
+        }
+        else {
+            (0, logger_1.log)("homebridge", "platform - No Proxy configured.");
+        }
     }
     startPower(type, PowerMgr) {
         // startup a power handler, if configured

package/server/platform.ts

@@ -20,7 +20,8 @@ import { Lock } from "../accessories/lock";
 import { P1 } from "./p1";
 import { Shelly } from "./shelly";
 import { kConfigFiles, setConfig } from "../duotecno/config";
-import { fstat, readFileSync } from "fs";
+import { readFileSync } from "fs";
+import { cleanStart, setProxyConfig } from "./proxy";
 
 
 export class Platform extends Base {
@@ -115,6 +116,15 @@ export class Platform extends Base {
     } else {
       log("homebridge", "platform - No SocApp configured.");
     }
+
+    if (this.config.proxy && this.config.proxy?.uniqueId) {
+      this.config.proxy.kind = "gw";
+      setProxyConfig(this.config.proxy);
+      cleanStart(true);
+      log("homebridge", "platform - Proxy configured: " + JSON.stringify(this.config.proxy, null, 2));
+    } else {
+      log("homebridge", "platform - No Proxy configured.");
+    }
   }
 
   startPower(type: string, PowerMgr: any) {