homebridge-smartsystem 6.0.10 → 6.1.1

package/README.md

@@ -244,6 +244,15 @@ switch =>
  added "restart plugin" to settings, 
  set lock target state to "locked"
 
+ ## v6.1.0 - 15-07-2022
+ - global debug, log, err functions in types.ts
+ - split smappee.ts in PowerBase + smappee/p1/shelly
+
+ ## v6.1.1 - 21-07-2022 - P1 release
+ - R1: implemented P1 power meter telegram
+ - R2: bugfixes, timeout mgt, etc...
+
+
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 
 and (if configured) to a Smappee Infinity (power and plugs) 

package/accessories/accessory.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Accessory = void 0;
+const types_1 = require("../duotecno/types");
 // Johan Coppieters Jan 2019
 //
 // base class for all kind of accessories on our platform
 // handling the homekit required services.
 class Accessory {
-    constructor(log, api, unit) {
+    constructor(api, unit) {
         this.homebridge = api.hap;
-        this.log = log; // : function(message)
         this.unit = unit; // : Duotecno Unit
         this.name = unit.getDisplayName();
         this.uuid_base = unit.getSerialNr();
@@ -17,7 +17,7 @@ class Accessory {
         this.services.push(this.getInformationService());
     }
     makeService(service) {
-        this.log("accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
+        (0, types_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);
-                this.log("getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+                (0, types_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);
-                this.log("getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                (0, types_1.log)("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
             }).catch(err => next(err));
         }
         else {
@@ -86,7 +86,7 @@ class Accessory {
     }
     updateState() {
         this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(this.unit.status);
-        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
+        // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
     }
 }
 exports.Accessory = Accessory;

package/accessories/accessory.ts

@@ -1,4 +1,4 @@
-import { LogFunction } from "../duotecno/types";
+import { log } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
 import { API, HAP, Service } from "homebridge";
 
@@ -9,7 +9,6 @@ import { API, HAP, Service } from "homebridge";
 
 export class Accessory {
   homebridge: HAP; // homebridge api endpoint
-  log: LogFunction;
   unit: Unit;
   config: any;     // all config params
   name: string;
@@ -18,9 +17,8 @@ export class Accessory {
   me: Service;
    
 
-  constructor(log: LogFunction, api: API, unit: Unit) {
+  constructor(api: API, unit: Unit) {
     this.homebridge = api.hap;
-    this.log = log;         // : function(message)
     this.unit = unit;       // : Duotecno Unit
     this.name = unit.getDisplayName();
     this.uuid_base = unit.getSerialNr();
@@ -31,7 +29,7 @@ export class Accessory {
   }
 
   makeService(service: any): Service {
-    this.log("accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
+    log("accessory", "accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
     this.me = new service(this.name);
     return this.me;
   }
@@ -71,7 +69,7 @@ export class Accessory {
     if (this.unit) {
       this.unit.reqState(unit => { 
         next(null, unit.status);
-        this.log("getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+        log("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
       }).catch(err => next(err));
     } else {
       next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
@@ -82,7 +80,7 @@ export class Accessory {
     if (this.unit) {
       this.unit.reqState(unit => { 
         next(null, unit.value);
-        this.log("getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        log("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
       }).catch(err => next(err));
     } else {
       next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
@@ -109,7 +107,7 @@ export class Accessory {
 
   updateState() {
     this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(this.unit.status);
-    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
+    // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
   }
 
 }

package/accessories/bulb.js

@@ -9,8 +9,8 @@ const accessory_1 = require("./accessory");
 //   so when asking to Siri to turn off all lights, these get turned off too.
 // - does same thing as a dimmer (which is also a LightBulb), but we don't supper Brightness.
 class Bulb extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
     }
     getAccessoryServices() {
         const lightbulbService = this.makeService(this.homebridge.Service.Lightbulb);

package/accessories/bulb.ts

@@ -1,5 +1,4 @@
 import { Accessory } from "./accessory";
-import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
 
@@ -13,8 +12,8 @@ import { API } from "homebridge";
 
 export class Bulb extends Accessory {
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
   }
 
 

package/accessories/dimmer.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dimmer = void 0;
 const accessory_1 = require("./accessory");
+const types_1 = require("../duotecno/types");
 // Johan Coppieters Jan 2019
 //
 // Dimmer
 // - a LightBulb to homekit, so a "light"
 //
 class Dimmer extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
         this.currValue = 0;
         this.preventSetPower = false;
         this.waitingSetPower = false;
@@ -30,7 +31,7 @@ class Dimmer extends accessory_1.Accessory {
         if (this.unit) {
             this.unit.reqState(unit => {
                 next(null, unit.value);
-                this.log("getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                (0, types_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
             }).catch(err => next(err));
         }
         else {
@@ -39,10 +40,10 @@ class Dimmer extends accessory_1.Accessory {
     }
     setPower(powerOn, next) {
         this.waitingSetPower = true;
-        this.log("setPower: *** waiting *** " + powerOn);
+        (0, types_1.log)("accessory", "setPower: *** waiting *** " + powerOn);
         setTimeout(() => {
             if (!this.preventSetPower) {
-                this.log("setPower: " + powerOn);
+                (0, types_1.log)("accessory", "setPower: " + powerOn);
                 this.unit.setState(powerOn)
                     .then(() => next())
                     .catch(err => next(err));
@@ -59,16 +60,16 @@ class Dimmer extends accessory_1.Accessory {
         // crush set on/off requests, bug in homekit / homebridge
         if (this.waitingSetPower) {
             this.preventSetPower = true;
-            this.log("setBrightness -> setPower: *** cancelled ***");
+            (0, types_1.log)("accessory", "setBrightness -> setPower: *** cancelled ***");
         }
-        this.log("setBrightness " + value);
+        (0, types_1.log)("accessory", "setBrightness " + value);
         this.unit.setState(value)
             .then(() => next())
             .catch(err => next(err));
     }
     updateState() {
         this.me.getCharacteristic(this.homebridge.Characteristic.Brightness).updateValue(this.unit.value);
-        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
+        // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
     }
 }
 exports.Dimmer = Dimmer;

package/accessories/dimmer.ts

@@ -1,7 +1,7 @@
 import { Accessory } from "./accessory";
-import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
+import { log } from "../duotecno/types";
 
 // Johan Coppieters Jan 2019
 //
@@ -15,8 +15,8 @@ export class Dimmer extends Accessory {
   preventSetPower: boolean;
   waitingSetPower: boolean;
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
     this.currValue = 0;
     this.preventSetPower = false;
     this.waitingSetPower = false;
@@ -42,7 +42,7 @@ export class Dimmer extends Accessory {
     if (this.unit) {
       this.unit.reqState(unit => { 
         next(null, unit.value);
-        this.log("getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        log("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
       }).catch(err => next(err));
     } else {
       next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
@@ -51,10 +51,10 @@ export class Dimmer extends Accessory {
 
   setPower(powerOn, next) {
     this.waitingSetPower = true;
-    this.log("setPower: *** waiting *** " + powerOn);
+    log("accessory", "setPower: *** waiting *** " + powerOn);
     setTimeout( () => {
       if (!this.preventSetPower) {
-        this.log("setPower: " + powerOn);
+        log("accessory", "setPower: " + powerOn);
         this.unit.setState(powerOn)
           .then(() => next())
           .catch(err => next(err))
@@ -72,10 +72,10 @@ export class Dimmer extends Accessory {
     // crush set on/off requests, bug in homekit / homebridge
     if (this.waitingSetPower) {
       this.preventSetPower = true;
-      this.log("setBrightness -> setPower: *** cancelled ***");
+      log("accessory", "setBrightness -> setPower: *** cancelled ***");
     } 
     
-    this.log("setBrightness " + value);
+    log("accessory", "setBrightness " + value);
 
     this.unit.setState(value)
       .then(() => next())
@@ -84,7 +84,7 @@ export class Dimmer extends Accessory {
 
   updateState() {
     this.me.getCharacteristic(this.homebridge.Characteristic.Brightness).updateValue(this.unit.value);
-    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
+    // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
   }
 
 }

package/accessories/door.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Door = void 0;
+const types_1 = require("../duotecno/types");
 const windowcovering_1 = require("./windowcovering");
 // Johan Coppieters Jun 2020
 //
@@ -46,8 +47,8 @@ const windowcovering_1 = require("./windowcovering");
 
 */
 class Door extends windowcovering_1.WindowCovering {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
     }
     getAccessoryServices() {
         // DoorOpener needs authentication
@@ -67,7 +68,7 @@ class Door extends windowcovering_1.WindowCovering {
     // in response to Duotecno status messages
     updateState() {
         const value = this.DT2HB(this.unit.status);
-        this.log("Received updateState -> Homekit Door for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
+        (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);
         this.me.getCharacteristic(this.homebridge.Characteristic.CurrentPosition).updateValue(value);
     }
 }

package/accessories/door.ts

@@ -1,5 +1,4 @@
-import { Accessory } from "./accessory";
-import { LogFunction, UnitMotorCmd, UnitState } from "../duotecno/types";
+import { log } from "../duotecno/types";
 import { WindowCovering } from "./windowcovering";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
@@ -53,8 +52,8 @@ import { API } from "homebridge";
 export class Door extends WindowCovering {
   targetState;
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
   }
 
   getAccessoryServices() {
@@ -82,7 +81,7 @@ export class Door extends WindowCovering {
   // in response to Duotecno status messages
   updateState() {
     const value = this.DT2HB(this.unit.status);
-    this.log("Received updateState -> Homekit Door for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
+    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/garagedoor.js

@@ -11,8 +11,8 @@ const accessory_1 = require("./accessory");
 //
 //
 class GarageDoor extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
     }
     getAccessoryServices() {
         // GarageDoorOpener needs authentication
@@ -55,7 +55,7 @@ class GarageDoor extends accessory_1.Accessory {
         try {
             this.unit.reqState(unit => {
                 const hb = this.DT2HB(unit.status);
-                this.log("Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
+                (0, types_1.log)("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
                 next(null, hb);
             });
         }
@@ -69,24 +69,24 @@ class GarageDoor extends accessory_1.Accessory {
         this.targetState = value;
         let cmd = this.HB2DT(value);
         if (cmd) {
-            this.log("Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd=" + cmd);
+            (0, types_1.log)("accessory", "Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd=" + cmd);
             this.unit.setState(cmd)
                 .then(() => next())
                 .catch(err => next(err));
         }
         else {
-            this.log("Set TargetDoorState of " + this.name + " -> failed for : " + value);
+            (0, types_1.log)("accessory", "Set TargetDoorState of " + this.name + " -> failed for : " + value);
             next(new Error("TargetDoorState of " + this.name + " -> failed"));
         }
     }
     getTargetDoorState(next) {
-        this.log("Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
+        (0, types_1.log)("accessory", "Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
         next(null, this.targetState);
     }
     // in response to Duotecno status messages
     updateState() {
         const value = this.DT2HB(this.unit.status);
-        // this.log("Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
+        // log("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
         this.me.getCharacteristic(this.homebridge.Characteristic.CurrentDoorState).updateValue(value);
     }
 }

package/accessories/garagedoor.ts

@@ -1,6 +1,6 @@
 import { API } from "homebridge";
 import { Unit } from "../duotecno/protocol";
-import { LogFunction, UnitMotorCmd, UnitState } from "../duotecno/types";
+import { log, UnitMotorCmd, UnitState } from "../duotecno/types";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020
@@ -16,8 +16,8 @@ import { Accessory } from "./accessory";
 export class GarageDoor extends Accessory {
   targetState;
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
   }
 
   getAccessoryServices() {
@@ -79,7 +79,7 @@ export class GarageDoor extends Accessory {
     try {
       this.unit.reqState(unit => {
         const hb = this.DT2HB(unit.status);
-        this.log("Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
+        log("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
         next(null, hb);
       });
 
@@ -96,19 +96,19 @@ export class GarageDoor extends Accessory {
     let cmd = this.HB2DT(value);
 
     if (cmd) {
-      this.log("Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd="+cmd);
+      log("accessory", "Set TargetDoorState of " + this.name + ", value =" + value + " -> cmd="+cmd);
       this.unit.setState(cmd)
         .then(() => next())
         .catch(err => next(err));
 
     } else {
-      this.log("Set TargetDoorState of " + this.name + " -> failed for : " + value);
+      log("accessory", "Set TargetDoorState of " + this.name + " -> failed for : " + value);
       next(new Error("TargetDoorState of " + this.name + " -> failed"));
     }
   }
 
   getTargetDoorState(next) {
-    this.log("Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
+    log("accessory", "Characteristic.TargetDoorState.get was called of " + this.name + " = " + this.targetState);
     next(null, this.targetState);
   }
 
@@ -116,7 +116,7 @@ export class GarageDoor extends Accessory {
   // in response to Duotecno status messages
   updateState() {
     const value = this.DT2HB(this.unit.status);
-    // this.log("Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
+    // log("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
     this.me.getCharacteristic(this.homebridge.Characteristic.CurrentDoorState).updateValue(value);
   }
 

package/accessories/lock.js

@@ -11,10 +11,10 @@ const accessory_1 = require("./accessory");
 //      if name contains * = permanent locked=on/unlocked=off
 //      else short press -> unlock, locked again after 1.2 sec
 class Lock extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
         this.targetState = 1; // locked
-        this.log("created Lock -> " + unit.getDescription());
+        (0, types_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 +36,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;
-        this.log("HB setting target state of lock: to " + value + " of " + this.unit.getDescription() + " (duotecno: " + dtVal + ")");
+        (0, types_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 +45,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(() => {
-                    this.log("Autolock for an unlocker after 2 secs of " + this.unit.getDescription());
+                    (0, types_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,18 +57,18 @@ class Lock extends accessory_1.Accessory {
             .catch(err => next(err));
     }
     getTarget(next) {
-        this.log("HB getting target state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+        (0, types_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 => {
-            this.log("HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+            (0, types_1.log)("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
             next(null, !!this.unit.status);
         });
     }
     // in response to Duotecno status messages
     updateState() {
-        // this.log("Received updateState -> Homekit Lock for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+        // log("accessory", "Received updateState -> Homekit Lock for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
         this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(this.unit.status);
     }
 }

package/accessories/lock.ts

@@ -1,6 +1,6 @@
 import { API } from "homebridge";
 import { Unit } from "../duotecno/protocol";
-import { LogFunction, UnitExtendedType } from "../duotecno/types";
+import { log, UnitExtendedType } from "../duotecno/types";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020
@@ -16,9 +16,9 @@ import { Accessory } from "./accessory";
 export class Lock extends Accessory {
   targetState = 1; // locked
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
-    this.log("created Lock -> " + unit.getDescription());
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
+    log("accessory", "created Lock -> " + unit.getDescription());
 
     // set default for Unlocked to Locked
     if (this.unit.getType() === UnitExtendedType.kUnlocker)
@@ -49,7 +49,7 @@ export class Lock extends Accessory {
     // unlocker is a mood, a lock is a switch
     const dtVal = (this.unit.getType() === UnitExtendedType.kUnlocker) ? -1 : value;
 
-    this.log("HB setting target state of lock: to " + value + " of " + this.unit.getDescription() + " (duotecno: " + dtVal + ")");
+    log("accessory", "HB setting target state of lock: to " + value + " of " + this.unit.getDescription() + " (duotecno: " + dtVal + ")");
 
     this.unit.setState(dtVal)
       .then(() => {
@@ -60,7 +60,7 @@ export class Lock extends Accessory {
         if (this.unit.getType() === UnitExtendedType.kUnlocker) {
           // always set to "locked" after sending the request.
           this.unit.resetTimer = setTimeout(() => {
-            this.log("Autolock for an unlocker after 2 secs of " + this.unit.getDescription())
+            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;
@@ -74,13 +74,13 @@ export class Lock extends Accessory {
   }
 
   getTarget(next) {
-    this.log("HB getting target state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+    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 => {
-      this.log("HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+      log("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
       next(null, !!this.unit.status);
     });
   }
@@ -88,7 +88,7 @@ export class Lock extends Accessory {
 
   // in response to Duotecno status messages
   updateState() {
-    // this.log("Received updateState -> Homekit Lock for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+    // log("accessory", "Received updateState -> Homekit Lock for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
     this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(this.unit.status);
   }
 

package/accessories/mood.js

@@ -9,8 +9,8 @@ const types_1 = require("../duotecno/types");
 // - is a Switch to homekit, so it doesn't get turned off with the "all lights out"
 //
 class Mood extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
     }
     getAccessoryServices() {
         const moodService = this.makeService(this.homebridge.Service.Switch);
@@ -22,7 +22,7 @@ class Mood extends accessory_1.Accessory {
         return [moodService];
     }
     getMood(next) {
-        this.log("getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
+        (0, types_1.log)("accessory", "getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
         next(null, !!this.unit.value);
     }
     setMood(value, next) {
@@ -50,7 +50,7 @@ class Mood extends accessory_1.Accessory {
     }
     updateState() {
         this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(!!this.unit.value);
-        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
+        // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
     }
 }
 exports.Mood = Mood;

package/accessories/mood.ts

@@ -1,5 +1,5 @@
 import { Accessory } from "./accessory";
-import { LogFunction, UnitExtendedType } from "../duotecno/types";
+import { log, UnitExtendedType } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
 import { API } from "homebridge";
 
@@ -13,8 +13,8 @@ import { API } from "homebridge";
 export class Mood extends Accessory {
   myService;
 
-  constructor(log: LogFunction, homebridge: API, unit: Unit) {
-    super(log, homebridge, unit);
+  constructor(homebridge: API, unit: Unit) {
+    super(homebridge, unit);
     
   }
 
@@ -31,7 +31,7 @@ export class Mood extends Accessory {
   }
 
   getMood(next) {
-    this.log("getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
+    log("accessory", "getMood was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> false");
 
     next(null, !!this.unit.value);
   }
@@ -61,7 +61,7 @@ export class Mood extends Accessory {
   }
   updateState() {
     this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(!!this.unit.value);
-    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
+    // log("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
   }
 
 }

package/accessories/switch.js

@@ -8,8 +8,8 @@ const accessory_1 = require("./accessory");
 // - not a light.
 //
 class Switch extends accessory_1.Accessory {
-    constructor(log, homebridge, unit) {
-        super(log, homebridge, unit);
+    constructor(homebridge, unit) {
+        super(homebridge, unit);
     }
     getAccessoryServices() {
         const switchService = this.makeService(this.homebridge.Service.Switch);