homebridge-smartsystem 6.7.3 → 6.7.4

package/README.md

@@ -298,6 +298,8 @@ 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
 
 ## 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,

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.ts

@@ -269,8 +269,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 = { 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.7.3",
+  "version": "6.7.4",
   "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/smartapp.js

@@ -396,8 +396,7 @@ class SmartApp extends webapp_1.WebApp {
         this.links.forEach(link => {
             link.unit || (link.unit = this.system.findUnit(this.system.findMaster(link.masterAddress, link.masterPort), link.logicalNodeAddress, link.logicalAddress));
             if (link.unit) {
-                link.value = link.unit.value;
-                link.status = link.unit.status;
+                link.dtValue = link.unit.value;
             }
             else {
                 (0, logger_1.log)("smartapp", "** error ** missing unit: " + (0, types_1.hex)(link.logicalNodeAddress) + "/" + (0, types_1.hex)(link.logicalAddress) + " **");
@@ -408,23 +407,17 @@ class SmartApp extends webapp_1.WebApp {
             if (this.links.length && (yield this.checkToken())) {
                 for (const link of this.links) {
                     if ((link.type === types_1.LinkType.kAccessory) && link.unit) {
-                        let { value, state } = yield (0, HB_1.hbGetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
-                        (0, logger_1.debug)("smartapp", "Received HB value for accessory: " + link.accName + " -> " + value + " / " + state + " from accessory");
-                        if (typeof value != "undefined") {
-                            if (link.unit.isUpDown())
-                                value = (value >= 50) ? 4 : 5;
-                            if (link.unit.isDimmer)
-                                value = (value <= 1) ? 1 : (value >= 99) ? 100 : value;
-                            if (link.unit.isSwitch() || link.unit.isMood())
-                                value = (value > 50) ? 1 : 0;
-                            if (value !== link.value) { //  || state !== link.status
-                                (0, logger_1.log)("smartapp", " -> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + value + " of HB accessory: " + link.accName);
-                                link.value = value;
-                                // link.status = state;
-                                link.unit.setState(value);
+                        const hbValue = yield (0, HB_1.hbGetValue)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
+                        (0, logger_1.debug)("smartapp", "Received HB value for accessory: " + link.accName + " -> " + hbValue + " from accessory");
+                        if (typeof hbValue != "undefined") {
+                            const { dtValue, dtTarget } = (0, HB_1.hb2dtvalue)(link.unit, hbValue);
+                            if (dtValue !== link.dtValue) { //  || state !== link.status
+                                (0, logger_1.log)("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + dtTarget + " of HB accessory: " + link.accName + " with value " + hbValue);
+                                link.dtValue = dtValue;
+                                link.unit.setState(dtTarget);
                             }
                             else {
-                                (0, logger_1.debug)("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+                                (0, logger_1.debug)("smartapp", "-> No change for unit: " + link.unit.getDisplayName() + " to " + dtValue);
                             }
                         }
                     }
@@ -437,21 +430,14 @@ class SmartApp extends webapp_1.WebApp {
             (0, logger_1.debug)("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
             for (const link of this.links) {
                 if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
-                    let value = (typeof u.value === "boolean") ? (u.value ? 100 : 0) : u.value;
-                    if (u.isUpDown())
-                        value = ((value === 1) || (value === 3)) ? 100 : 0;
-                    if (u.isDimmer)
-                        value = (value <= 2) ? 0 : (value >= 99) ? 100 : value;
-                    if (u.isSwitch() || link.unit.isMood())
-                        value = (value) ? 1 : 0;
-                    if (link.value !== value) { //  || link.status !== u.status
-                        (0, logger_1.log)("smartapp", " -> Setting HB value for accessory: " + link.accName + " to " + value + " / " + u.status + " of Duotecno unit: " + u.getDisplayName());
-                        link.value = value;
-                        link.status = u.status;
-                        yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, u.value, u.status, this.token);
+                    const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue);
+                    if ((typeof hbValue != "undefined") && (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);
+                        (0, logger_1.debug)("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
                     }
                 }
             }
@@ -569,7 +555,7 @@ class SmartApp extends webapp_1.WebApp {
             else {
                 if (link.type == types_1.LinkType.kAccessory) {
                     if (yield this.checkToken())
-                        yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.id, link.service, link.unit.value, link.unit.status, this.token);
+                        yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.id, link.service, link.unit.value, this.token);
                 }
                 else {
                     (0, logger_1.err)("smartapp", "Don't know how to set a link of type " + link.type);

package/server/smartapp.ts

@@ -22,7 +22,7 @@ import { Shelly } from './shelly';
 import { P1 } from './p1';
 import { setToken } from "../duotecno/config";
 import { PowerBase } from "./powerbase";
-import { hbAccessories, hbGetState, hbLogin, hbName, hbService, hbSetState, hbSubscribe } from "./HB";
+import { dt2hbvalue, hb2dtvalue, hbAccessories, hbGetValue, hbLogin, hbName, hbService, hbSetState, hbSubscribe } from "./HB";
 import { httpRequest, ContentType } from "./HA-API";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
@@ -447,8 +447,7 @@ export class SmartApp extends WebApp {
       link.unit ||= this.system.findUnit(this.system.findMaster(link.masterAddress, link.masterPort), 
                                          link.logicalNodeAddress, link.logicalAddress);
       if (link.unit) {
-        link.value = link.unit.value;
-        link.status = link.unit.status;
+        link.dtValue = link.unit.value;
       } else {
         log("smartapp", "** error ** missing unit: " + hex(link.logicalNodeAddress)+"/"+hex(link.logicalAddress) + " **");
       }
@@ -459,20 +458,18 @@ export class SmartApp extends WebApp {
       if (this.links.length && await this.checkToken()) {
         for (const link of this.links) {
           if ((link.type === LinkType.kAccessory) && link.unit) {
-            let {value, state} = await hbGetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
-            debug("smartapp", "Received HB value for accessory: " + link.accName + " -> " + value + " / " + state + " from accessory");
-            if (typeof value != "undefined") {
-              if (link.unit.isUpDown()) value = (value >= 50) ? 4 : 5;
-              if (link.unit.isDimmer) value = (value <= 1) ? 1 : (value >= 99) ? 100 : value;
-              if (link.unit.isSwitch() || link.unit.isMood()) value = (value > 50) ? 1 : 0;
-
-              if (value !== link.value) { //  || state !== link.status
-                log("smartapp", " -> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + value + " of HB accessory: " + link.accName);
-                link.value = value;
-                // link.status = state;
-                link.unit.setState(value);
+            const hbValue = await hbGetValue(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
+            debug("smartapp", "Received HB value for accessory: " + link.accName + " -> " + hbValue  + " from accessory");
+
+            if (typeof hbValue != "undefined") {
+              const {dtValue, dtTarget} = hb2dtvalue(link.unit, hbValue);
+
+              if (dtValue !== link.dtValue) { //  || state !== link.status
+                log("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + dtTarget + " of HB accessory: " + link.accName + " with value " + hbValue); 
+                link.dtValue = dtValue;
+                link.unit.setState(dtTarget);
               } else {
-                debug("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+                debug("smartapp", "-> No change for unit: " + link.unit.getDisplayName() + " to " + dtValue);
               }
             }
           }
@@ -486,19 +483,15 @@ export class SmartApp extends WebApp {
     debug("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
     for (const link of this.links) {
       if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
-        let value = (typeof u.value === "boolean") ? (u.value ? 100 : 0) : u.value;
-        if (u.isUpDown()) value = ((value === 1) || (value === 3)) ? 100 : 0;
-        if (u.isDimmer) value = (value <= 2) ? 0 : (value >= 99) ? 100 : value;
-        if (u.isSwitch() || link.unit.isMood()) value = (value) ? 1 : 0;
+        const hbValue = dt2hbvalue(u, link.hbValue as number);
 
-        if (link.value !== value) {  //  || link.status !== u.status
-          log("smartapp", " -> Setting HB value for accessory: " + link.accName + " to " + value + " / " + u.status + " of Duotecno unit: " + u.getDisplayName());
-          link.value = value;
-          link.status = u.status; 
-          await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, u.value, u.status, this.token);
+        if ((typeof hbValue != "undefined") && (hbValue !== link.hbValue)) {
+          log("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
+          link.hbValue = hbValue;
+          await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, hbValue, this.token);
 
         } else {
-          debug("smartapp", " -> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+          debug("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
         }
       }
     };
@@ -626,7 +619,7 @@ export class SmartApp extends WebApp {
     } else {
       if (link.type == LinkType.kAccessory) {
         if (await this.checkToken())
-          await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.id, link.service, link.unit.value, link.unit.status, this.token)
+          await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.id, link.service, link.unit.value, this.token)
 
       } else {
         err("smartapp", "Don't know how to set a link of type " + link.type);

package/server/views/link-details.ejs

@@ -60,7 +60,7 @@
               <option value="">Select a unit</option>
               <% for (let u of units) { %>
                 <option value="<%= u.node.master.getURL()+"-"+u.logicalNodeAddress+"/"+u.logicalAddress %>" 
-                  <%= ((u.masterAddress == link.masterAddress) && (u.masterPort == link.masterPort) && (u.logicalNodeAddress == link.logicalNodeAddress) && (u.logicalAddress == link.logicalAddress)) ? "selected" : "" %>
+                  <%= ((u.node.master.config.address == link.masterAddress) && (u.node.master.config.port == link.masterPort) && (u.logicalNodeAddress == link.logicalNodeAddress) && (u.logicalAddress == link.logicalAddress)) ? "selected" : "" %>
                 ><%= u.name %></option>
               <% } %>
             </select>