homebridge-smartsystem 6.7.2 → 6.7.3

package/duotecno/protocol.js

@@ -41,13 +41,15 @@ var Cmd;
     Cmd[Cmd["Heartbeat"] = 215] = "Heartbeat";
     Cmd[Cmd["DatabaseInfo"] = 209] = "DatabaseInfo";
     Cmd[Cmd["SetSchedule"] = 217] = "SetSchedule";
+    Cmd[Cmd["reqSchedule"] = 218] = "reqSchedule";
+    Cmd[Cmd["reqNodeManagement"] = 220] = "reqNodeManagement";
     Cmd[Cmd["Register"] = 224] = "Register";
 })(Cmd || (Cmd = {}));
-// for Set Switch/Dimmer/Control
+// for Set Switch/Dimmer/Control/Motor/Sensor = 162, 163, 168, 182, 136
 const reqDim = 3;
 const reqOff = 9;
 const reqOn = 10;
-// for Login
+// for Login = 214
 const reqDisconnect = 0;
 const reqConnect = 3;
 // for DatabaseInfo = 209;
@@ -55,10 +57,7 @@ const reqDBInfo = 0;
 const reqNodeInfo = 1;
 const reqUnitInfo = 2;
 const reqUnitStatus = 3;
-// for Schedule
-const reqSchedule = 218;
-// for versions et al
-const reqNodeManagement = 220;
+// for reqNodeMgt, versions et al
 var reqNodeAttributes;
 (function (reqNodeAttributes) {
     reqNodeAttributes[reqNodeAttributes["masterSupported"] = 0] = "masterSupported";
@@ -671,10 +670,10 @@ exports.Protocol = {
         return [Cmd.DatabaseInfo, reqUnitStatus, node.logicalAddress, unit.logicalAddress, unit.type];
     },
     buildRequestSchedule() {
-        return [reqSchedule, 0];
+        return [Cmd.reqSchedule, 0];
     },
     buildRequestNodeMgt(method = reqNodeAttributes.nodeProtocol) {
-        return [reqNodeManagement, method];
+        return [Cmd.reqNodeManagement, method];
     },
     getCmdAndMethod: function (unit, value) {
         switch (unit.type) {

package/duotecno/protocol.ts

@@ -38,15 +38,17 @@ enum Cmd {
   Heartbeat = 215,
   DatabaseInfo = 209,
   SetSchedule = 217,
+  reqSchedule = 218,
+  reqNodeManagement = 220,
   Register = 224
 }
 
-// for Set Switch/Dimmer/Control
+// for Set Switch/Dimmer/Control/Motor/Sensor = 162, 163, 168, 182, 136
 const reqDim = 3;
 const reqOff = 9;
 const reqOn = 10;
 
-// for Login
+// for Login = 214
 const reqDisconnect = 0;
 const reqConnect = 3;
 
@@ -56,11 +58,7 @@ const reqNodeInfo = 1;
 const reqUnitInfo = 2;
 const reqUnitStatus = 3;
 
-// for Schedule
-const reqSchedule = 218;
-
-// for versions et al
-const reqNodeManagement = 220;
+// for reqNodeMgt, versions et al
 export enum reqNodeAttributes {
   masterSupported = 0,
   isMaster = 4,
@@ -782,10 +780,10 @@ export const Protocol = {
   },
 
   buildRequestSchedule(): Message {
-    return [reqSchedule, 0];
+    return [Cmd.reqSchedule, 0];
   },
   buildRequestNodeMgt(method = reqNodeAttributes.nodeProtocol): Message {
-    return [reqNodeManagement, method];
+    return [Cmd.reqNodeManagement, method];
   },
 
   getCmdAndMethod: function(unit: Unit, value: number | boolean): CmdSet {

package/package.json

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

package/server/HB.js

@@ -168,17 +168,33 @@ function hbLogin(server, username, password) {
 }
 exports.hbLogin = hbLogin;
 function hbLoad(value, service) {
+    function hbvalue(value) {
+        if (typeof value === "boolean") {
+            return (value) ? 100 : 0;
+        }
+        else if (typeof value === "number") {
+            if (value <= 2) {
+                return 0;
+            }
+            else if (value >= 98) {
+                return 100;
+            }
+            else {
+                return Math.round(value);
+            }
+        }
+    }
     const data = {};
     if (service.includes("On")) {
         data["value"] = value;
         data["characteristicType"] = "On";
     }
     if (service.includes("Brightness")) {
-        data["value"] = value;
+        data["value"] = hbvalue(value);
         data["characteristicType"] = "Brightness";
     }
     if (service.includes("TargetPosition")) {
-        data["value"] = value;
+        data["value"] = hbvalue(value);
         data["characteristicType"] = "TargetPosition";
     }
     ;
@@ -221,7 +237,14 @@ function hbGetState(server, id, service, token) {
             (0, logger_1.log)("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
             return {};
         }
-        return hbValue(respBody.values, service);
+        else if (respBody && respBody.values) {
+            return hbValue(respBody.values, service);
+        }
+        else {
+            (0, logger_1.log)("HB", "hbGetState: " + id + " -> no values?? : " + JSON.stringify(respBody));
+            return {};
+        }
+        ;
     });
 }
 exports.hbGetState = hbGetState;

package/server/HB.ts

@@ -170,19 +170,36 @@ export async function hbLogin(server: string, username: string, password: string
   }
 }
 
+
 function hbLoad(value: number | boolean, service: Array<string>): Record<string, number | boolean> {
+  function hbvalue(value: number | boolean): number {
+    if (typeof value === "boolean") {
+      return (value) ? 100 : 0;
+    } else if (typeof value === "number") {
+      if (value <= 2) {
+        return 0;
+      } else if (value >= 98) {
+        return 100;  
+      } else {
+        return Math.round(value);
+      }
+    }
+  }
+
   const data = {};
   
   if (service.includes("On")) {
     data["value"] = value;
     data["characteristicType"] = "On";
   }
+
   if (service.includes("Brightness")) {
-    data["value"] = value;
+    data["value"] = hbvalue(value);
     data["characteristicType"] = "Brightness";
   }
+
   if (service.includes("TargetPosition")) {
-    data["value"] = value;
+    data["value"] = hbvalue(value);
     data["characteristicType"] = "TargetPosition";
   };
   return data;
@@ -226,9 +243,14 @@ export async function hbGetState(server: string, id: string, service: Array<stri
   if (respBody && respBody.error) {
     log("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
     return {};
-  }
 
-  return hbValue(respBody.values, service);
+  } else if (respBody && respBody.values) {
+    return hbValue(respBody.values, service);
+
+   } else {
+    log("HB", "hbGetState: " + id + " -> no values?? : " + JSON.stringify(respBody));
+    return {};
+   };
 }
 
 export function hbSubscribe(callback) {

package/server/smartapp.js

@@ -408,16 +408,24 @@ 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) {
-                        const { value, state } = yield (0, HB_1.hbGetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
+                        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") && (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);
-                        }
-                        else {
-                            (0, logger_1.debug)("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+                        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);
+                            }
+                            else {
+                                (0, logger_1.debug)("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+                            }
                         }
                     }
                 }
@@ -429,9 +437,16 @@ 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)) {
-                    if (link.value !== u.value) { //  || link.status !== u.status
-                        (0, logger_1.log)("smartapp", " -> Setting HB value for accessory: " + link.accName + " to " + u.value + " / " + u.status + " of Duotecno unit: " + u.getDisplayName());
-                        link.value = u.value;
+                    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);
                     }

package/server/smartapp.ts

@@ -459,15 +459,21 @@ 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) {
-            const {value, state} = await hbGetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
+            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") && (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);
-            } else {
-              debug("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+            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);
+              } else {
+                debug("smartapp", " -> No change for unit: " + link.unit.getDisplayName() + " to " + value);
+              }
             }
           }
         }
@@ -480,9 +486,14 @@ 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)) {
-        if (link.value !== u.value) {  //  || link.status !== u.status
-          log("smartapp", " -> Setting HB value for accessory: " + link.accName + " to " + u.value + " / " + u.status + " of Duotecno unit: " + u.getDisplayName());
-          link.value = u.value;
+        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
+          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);