homebridge-smartsystem 6.1.6 → 6.2.3

package/README.md

@@ -257,6 +257,22 @@ Homebridge UI version
  - 4: errors when starting power mgrs from platform.ts
  - 5: v6.1.3 changes were gone... restored them.
  - 6: added login with pw in config + http.get with on-error
+ - 6: allow + and - in power rules expressions
+ - 7: allow NaN in bindings compare for update
+
+### v6.2.0 - 10-08-2022 - fully use Homebridge UI (login, config)
+ - receive config through Platform on startup, 
+ - moved all config to global variable, keep in sync through API of HB-UI
+ - implemented login page, use HB-UI api -> bearer jwt token
+ - added upgrade method from 6.1.x to v6.2.x (adding files from /home/homebridge/duotecno/config.*.json to global config.*)
+ - homebridge config is saved by UI in: /var/lib/homebridge/config.json (as well as the logfile: homebridge.log)
+ - smartapp calls Homebridge UI API to save changes
+
+ ### v6.2.x - 11-08-2022 - P1 release
+ - 1: always write config to file too (next to sending through the HB-UI API)
+ - 2: added headers to http calls from switches, dimmers and up/down's (including OH stuff)
+ - 3: fixed bug in Sanitizer of UnitConfig preventing from publishing units to homebridge
+ 
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/accessories/accessory.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Accessory = void 0;
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 // Johan Coppieters Jan 2019
 //
 // base class for all kind of accessories on our platform
@@ -17,7 +17,7 @@ class Accessory {
         this.services.push(this.getInformationService());
     }
     makeService(service) {
-        (0, types_1.log)("accessory", "accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
+        (0, logger_1.log)("accessory", "accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
         this.me = new service(this.name);
         return this.me;
     }
@@ -50,7 +50,7 @@ class Accessory {
         if (this.unit) {
             this.unit.reqState(unit => {
                 next(null, unit.status);
-                (0, types_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+                (0, logger_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
             }).catch(err => next(err));
         }
         else {
@@ -61,7 +61,7 @@ class Accessory {
         if (this.unit) {
             this.unit.reqState(unit => {
                 next(null, unit.value);
-                (0, types_1.log)("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                (0, logger_1.log)("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
             }).catch(err => next(err));
         }
         else {

package/accessories/accessory.ts

@@ -1,4 +1,4 @@
-import { log } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Unit } from "../duotecno/protocol";
 import { API, HAP, Service } from "homebridge";
 
@@ -10,7 +10,6 @@ import { API, HAP, Service } from "homebridge";
 export class Accessory {
   homebridge: HAP; // homebridge api endpoint
   unit: Unit;
-  config: any;     // all config params
   name: string;
   uuid_base: string;
   services: Array<Service>;

package/accessories/dimmer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dimmer = void 0;
 const accessory_1 = require("./accessory");
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 // Johan Coppieters Jan 2019
 //
 // Dimmer
@@ -31,7 +31,7 @@ class Dimmer extends accessory_1.Accessory {
         if (this.unit) {
             this.unit.reqState(unit => {
                 next(null, unit.value);
-                (0, types_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                (0, logger_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
             }).catch(err => next(err));
         }
         else {
@@ -40,10 +40,10 @@ class Dimmer extends accessory_1.Accessory {
     }
     setPower(powerOn, next) {
         this.waitingSetPower = true;
-        (0, types_1.log)("accessory", "setPower: *** waiting *** " + powerOn);
+        (0, logger_1.log)("accessory", "setPower: *** waiting *** " + powerOn);
         setTimeout(() => {
             if (!this.preventSetPower) {
-                (0, types_1.log)("accessory", "setPower: " + powerOn);
+                (0, logger_1.log)("accessory", "setPower: " + powerOn);
                 this.unit.setState(powerOn)
                     .then(() => next())
                     .catch(err => next(err));
@@ -60,9 +60,9 @@ class Dimmer extends accessory_1.Accessory {
         // crush set on/off requests, bug in homekit / homebridge
         if (this.waitingSetPower) {
             this.preventSetPower = true;
-            (0, types_1.log)("accessory", "setBrightness -> setPower: *** cancelled ***");
+            (0, logger_1.log)("accessory", "setBrightness -> setPower: *** cancelled ***");
         }
-        (0, types_1.log)("accessory", "setBrightness " + value);
+        (0, logger_1.log)("accessory", "setBrightness " + value);
         this.unit.setState(value)
             .then(() => next())
             .catch(err => next(err));

package/accessories/dimmer.ts

@@ -1,7 +1,7 @@
 import { Accessory } from "./accessory";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
-import { log } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 
 // Johan Coppieters Jan 2019
 //

package/accessories/door.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Door = void 0;
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const windowcovering_1 = require("./windowcovering");
 // Johan Coppieters Jun 2020
 //
@@ -68,7 +68,7 @@ class Door extends windowcovering_1.WindowCovering {
     // in response to Duotecno status messages
     updateState() {
         const value = this.DT2HB(this.unit.status);
-        (0, types_1.log)("accessory", "Received updateState -> Homekit Door for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
+        (0, logger_1.log)("accessory", "Received updateState -> Homekit Door for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
         this.me.getCharacteristic(this.homebridge.Characteristic.CurrentPosition).updateValue(value);
     }
 }

package/accessories/door.ts

@@ -1,4 +1,4 @@
-import { log } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { WindowCovering } from "./windowcovering";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";

package/accessories/garagedoor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GarageDoor = void 0;
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const accessory_1 = require("./accessory");
 // Johan Coppieters Jun 2020
 //
@@ -55,7 +56,7 @@ class GarageDoor extends accessory_1.Accessory {
         try {
             this.unit.reqState(unit => {
                 const hb = this.DT2HB(unit.status);
-                (0, types_1.log)("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
+                (0, logger_1.log)("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
                 next(null, hb);
             });
         }
@@ -69,18 +70,18 @@ class GarageDoor extends accessory_1.Accessory {
         this.targetState = value;
         let cmd = this.HB2DT(value);
         if (cmd) {
-            (0, types_1.log)("accessory", "Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd=" + cmd);
+            (0, logger_1.log)("accessory", "Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd=" + cmd);
             this.unit.setState(cmd)
                 .then(() => next())
                 .catch(err => next(err));
         }
         else {
-            (0, types_1.log)("accessory", "Set TargetDoorState of " + this.name + " -> failed for : " + value);
+            (0, logger_1.log)("accessory", "Set TargetDoorState of " + this.name + " -> failed for : " + value);
             next(new Error("TargetDoorState of " + this.name + " -> failed"));
         }
     }
     getTargetDoorState(next) {
-        (0, types_1.log)("accessory", "Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
+        (0, logger_1.log)("accessory", "Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
         next(null, this.targetState);
     }
     // in response to Duotecno status messages

package/accessories/garagedoor.ts

@@ -1,6 +1,7 @@
 import { API } from "homebridge";
 import { Unit } from "../duotecno/protocol";
-import { log, UnitMotorCmd, UnitState } from "../duotecno/types";
+import { UnitMotorCmd, UnitState } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020

package/accessories/lock.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lock = void 0;
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const accessory_1 = require("./accessory");
 // Johan Coppieters Jun 2020
 //
@@ -14,7 +15,7 @@ class Lock extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
         this.targetState = 1; // locked
-        (0, types_1.log)("accessory", "created Lock -> " + unit.getDescription());
+        (0, logger_1.log)("accessory", "created Lock -> " + unit.getDescription());
         // set default for Unlocked to Locked
         if (this.unit.getType() === types_1.UnitExtendedType.kUnlocker)
             unit.setState(1);
@@ -36,7 +37,7 @@ class Lock extends accessory_1.Accessory {
         this.targetState = value;
         // unlocker is a mood, a lock is a switch
         const dtVal = (this.unit.getType() === types_1.UnitExtendedType.kUnlocker) ? -1 : value;
-        (0, types_1.log)("accessory", "HB setting target state of lock: to " + value + " of " + this.unit.getDescription() + " (duotecno: " + dtVal + ")");
+        (0, logger_1.log)("accessory", "HB setting target state of lock: to " + value + " of " + this.unit.getDescription() + " (duotecno: " + dtVal + ")");
         this.unit.setState(dtVal)
             .then(() => {
             //bypass ip node update mechanism of Duotecno
@@ -45,7 +46,7 @@ class Lock extends accessory_1.Accessory {
             if (this.unit.getType() === types_1.UnitExtendedType.kUnlocker) {
                 // always set to "locked" after sending the request.
                 this.unit.resetTimer = setTimeout(() => {
-                    (0, types_1.log)("accessory", "Autolock for an unlocker after 2 secs of " + this.unit.getDescription());
+                    (0, logger_1.log)("accessory", "Autolock for an unlocker after 2 secs of " + this.unit.getDescription());
                     this.targetState = 1;
                     this.me.getCharacteristic(this.homebridge.Characteristic.LockTargetState).updateValue(1);
                     this.unit.status = 1;
@@ -57,12 +58,12 @@ class Lock extends accessory_1.Accessory {
             .catch(err => next(err));
     }
     getTarget(next) {
-        (0, types_1.log)("accessory", "HB getting target state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+        (0, logger_1.log)("accessory", "HB getting target state of lock = " + this.unit.status + " of " + this.unit.getDescription());
         next(null, this.targetState);
     }
     getCurrent(next) {
         this.unit.reqState(unit => {
-            (0, types_1.log)("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+            (0, logger_1.log)("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
             next(null, !!this.unit.status);
         });
     }

package/accessories/lock.ts

@@ -1,6 +1,7 @@
 import { API } from "homebridge";
 import { Unit } from "../duotecno/protocol";
-import { log, UnitExtendedType } from "../duotecno/types";
+import { UnitExtendedType } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020

package/accessories/mood.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mood = void 0;
 const accessory_1 = require("./accessory");
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 // Johan Coppieters Jan 2019
 //
 // Mood
@@ -22,7 +23,7 @@ class Mood extends accessory_1.Accessory {
         return [moodService];
     }
     getMood(next) {
-        (0, types_1.log)("accessory", "getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
+        (0, logger_1.log)("accessory", "getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
         next(null, !!this.unit.value);
     }
     setMood(value, next) {

package/accessories/mood.ts

@@ -1,5 +1,6 @@
 import { Accessory } from "./accessory";
-import { log, UnitExtendedType } from "../duotecno/types";
+import { UnitExtendedType } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
 

package/accessories/temperature.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Temperature = void 0;
 const accessory_1 = require("./accessory");
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 // Johan Coppieters Jan 2019
 //
 // Temperature Sensor
@@ -23,7 +23,7 @@ class Temperature extends accessory_1.Accessory {
     getTemperature(next) {
         if (this.unit) {
             this.unit.reqState(unit => {
-                (0, types_1.log)("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                (0, logger_1.log)("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
                 next(null, unit.value / 10.0);
             })
                 .catch(err => next(err));

package/accessories/temperature.ts

@@ -1,5 +1,5 @@
 import { Accessory } from "./accessory";
-import { log } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
 

package/accessories/windowcovering.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WindowCovering = void 0;
 const accessory_1 = require("./accessory");
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 // Johan Coppieters v1: Jan 2019, v2: Jun 2020
 //
 // WindowCovering
@@ -86,11 +87,11 @@ class WindowCovering extends accessory_1.Accessory {
             return 50;
     }
     getPositionState(next) {
-        (0, types_1.log)("accessory", "get PositionState was called of " + this.name + " -> " + this.targetState);
+        (0, logger_1.log)("accessory", "get PositionState was called of " + this.name + " -> " + this.targetState);
         next(null, this.targetState);
     }
     getCurrentPosition(next) {
-        (0, types_1.log)("accessory", "get CurrentPosition was called of " + this.name);
+        (0, logger_1.log)("accessory", "get CurrentPosition was called of " + this.name);
         this.unit.reqState(unit => {
             if (unit.status == types_1.UnitState.kOpen)
                 next(null, 100);
@@ -103,7 +104,7 @@ class WindowCovering extends accessory_1.Accessory {
     setTargetPosition(value, next) {
         // homekit is giving 0-100 for windows
         // the smartbox -> 5=down, 4=up, 3=stop
-        (0, types_1.log)("accessory", "set Characteristic.TargetPosition was called with value = " + value);
+        (0, logger_1.log)("accessory", "set Characteristic.TargetPosition was called with value = " + value);
         let cmd = 0;
         if (value == 100) {
             cmd = types_1.UnitMotorCmd.kOpen;
@@ -114,13 +115,13 @@ class WindowCovering extends accessory_1.Accessory {
         else {
             cmd = types_1.UnitMotorCmd.kStop;
         }
-        (0, types_1.log)("accessory", "setUpDown, value =" + value + " -> cmd=" + cmd);
+        (0, logger_1.log)("accessory", "setUpDown, value =" + value + " -> cmd=" + cmd);
         this.unit.setState(cmd)
             .then(() => next())
             .catch(err => next(err));
     }
     getTargetPosition(next) {
-        (0, types_1.log)("accessory", "get Characteristic.TargetPosition was called");
+        (0, logger_1.log)("accessory", "get Characteristic.TargetPosition was called");
         this.unit.reqState(unit => {
             if (this.unit.status == types_1.UnitState.kOpen)
                 next(null, 100);
@@ -137,11 +138,11 @@ class WindowCovering extends accessory_1.Accessory {
         this.me.getCharacteristic(this.homebridge.Characteristic.CurrentPosition).updateValue(value);
         if (this.unit.status == types_1.UnitState.kClosing) {
             this.me.getCharacteristic(this.homebridge.Characteristic.TargetPosition).updateValue(0);
-            (0, types_1.log)("accessory", "Setting targetposition to 0");
+            (0, logger_1.log)("accessory", "Setting targetposition to 0");
         }
         else if (this.unit.status == types_1.UnitState.kOpening) {
             this.me.getCharacteristic(this.homebridge.Characteristic.TargetPosition).updateValue(100);
-            (0, types_1.log)("accessory", "Setting targetposition to 100");
+            (0, logger_1.log)("accessory", "Setting targetposition to 100");
         }
     }
 }

package/accessories/windowcovering.ts

@@ -1,5 +1,6 @@
 import { Accessory } from "./accessory";
-import { log, UnitMotorCmd, UnitState } from "../duotecno/types";
+import { UnitMotorCmd, UnitState } from "../duotecno/types";
+import { log } from "../duotecno/logger";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";