homebridge-smartsystem 6.0.7 → 6.0.8

package/accessories/accessory.js

@@ -85,7 +85,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);
+        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
     }
 }
 exports.Accessory = Accessory;

package/accessories/accessory.ts

@@ -1,5 +1,6 @@
-import { LogFunction, Service } from "../duotecno/types";
+import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API, HAP, Service } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -7,17 +8,17 @@ import { Unit } from "../duotecno/protocol";
 // handling the homekit required services.
 
 export class Accessory {
-  homebridge: any; // homebridge api endpoint
+  homebridge: HAP; // homebridge api endpoint
   log: LogFunction;
   unit: Unit;
   config: any;     // all config params
   name: string;
   uuid_base: string;
   services: Array<Service>;
-  me: any; // some homebridge type... sorry. PlatformAccessory?  Accessory?
+  me: Service;
    
 
-  constructor(log: LogFunction, api, unit: Unit ) {
+  constructor(log: LogFunction, api: API, unit: Unit) {
     this.homebridge = api.hap;
     this.log = log;         // : function(message)
     this.unit = unit;       // : Unit
@@ -27,7 +28,7 @@ export class Accessory {
     this.services.push(this.getInformationService());
   }
 
-  makeService(service: Service): any {
+  makeService(service: any): Service {
     this.log("accessory - Making service: " + this.name + ", serial: " + this.uuid_base);
     this.me = new service(this.name);
     return this.me;
@@ -106,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);
+    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
   }
 
 }

package/accessories/bulb.ts

@@ -1,6 +1,7 @@
 import { Accessory } from "./accessory";
 import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -12,7 +13,7 @@ import { Unit } from "../duotecno/protocol";
 
 export class Bulb extends Accessory {
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
   }
 

package/accessories/dimmer.js

@@ -68,7 +68,7 @@ class Dimmer extends accessory_1.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);
+        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
     }
 }
 exports.Dimmer = Dimmer;

package/accessories/dimmer.ts

@@ -1,6 +1,7 @@
 import { Accessory } from "./accessory";
 import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -14,7 +15,7 @@ export class Dimmer extends Accessory {
   preventSetPower: boolean;
   waitingSetPower: boolean;
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     this.currValue = 0;
     this.preventSetPower = false;
@@ -83,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);
+    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> Brightness = " + this.unit.value);
   }
 
 }

package/accessories/door.ts

@@ -1,6 +1,8 @@
 import { Accessory } from "./accessory";
-import { UnitMotorCmd, UnitState } from "../duotecno/types";
+import { LogFunction, UnitMotorCmd, UnitState } from "../duotecno/types";
 import { WindowCovering } from "./windowcovering";
+import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jun 2020
 //
@@ -51,7 +53,7 @@ import { WindowCovering } from "./windowcovering";
 export class Door extends WindowCovering {
   targetState;
 
-  constructor(log, homebridge, unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
   }
 

package/accessories/garagedoor.js

@@ -86,7 +86,7 @@ class GarageDoor extends accessory_1.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);
+        // this.log("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,4 +1,6 @@
-import { UnitMotorCmd, UnitState } from "../duotecno/types";
+import { API } from "homebridge";
+import { Unit } from "../duotecno/protocol";
+import { LogFunction, UnitMotorCmd, UnitState } from "../duotecno/types";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020
@@ -14,7 +16,7 @@ import { Accessory } from "./accessory";
 export class GarageDoor extends Accessory {
   targetState;
 
-  constructor(log, homebridge, unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
   }
 
@@ -114,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);
+    // this.log("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

@@ -67,7 +67,7 @@ class Lock extends accessory_1.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);
+        // this.log("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,4 +1,6 @@
-import { UnitExtendedType } from "../duotecno/types";
+import { API } from "homebridge";
+import { Unit } from "../duotecno/protocol";
+import { LogFunction, UnitExtendedType } from "../duotecno/types";
 import { Accessory } from "./accessory";
 
 // Johan Coppieters Jun 2020
@@ -14,7 +16,7 @@ import { Accessory } from "./accessory";
 export class Lock extends Accessory {
   targetState;
 
-  constructor(log, homebridge, unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     this.log("created Lock -> " + unit.getDescription());
 
@@ -86,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);
+    // this.log("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

@@ -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);
+        // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
     }
 }
 exports.Mood = Mood;

package/accessories/mood.ts

@@ -1,6 +1,7 @@
 import { Accessory } from "./accessory";
 import { LogFunction, UnitExtendedType } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -12,7 +13,7 @@ import { Unit } from "../duotecno/protocol";
 export class Mood extends Accessory {
   myService;
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     
   }
@@ -60,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);
+    // this.log("Received status change -> update accessory -> " + this.unit.getName() + " -> On = " + !!this.unit.value);
   }
 
 }

package/accessories/switch.ts

@@ -1,6 +1,7 @@
 import { LogFunction } from "../duotecno/types";
 import { Accessory } from "./accessory";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -10,7 +11,7 @@ import { Unit } from "../duotecno/protocol";
 
 export class Switch extends Accessory {
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     
   }

package/accessories/temperature.js

@@ -33,7 +33,7 @@ class Temperature extends accessory_1.Accessory {
     }
     updateState() {
         this.me.getCharacteristic(this.homebridge.Characteristic.CurrentTemperature).updateValue(this.unit.value / 10.0);
-        this.log("Received updateState -> Homekit Temperature -> " + this.unit.getName() + " -> temp = " + this.unit.value / 10.0);
+        // this.log("Received updateState -> Homekit Temperature -> " + this.unit.getName() + " -> temp = " +(<number>this.unit.value) / 10.0);
     }
 }
 exports.Temperature = Temperature;

package/accessories/temperature.ts

@@ -1,6 +1,7 @@
 import { Accessory } from "./accessory";
 import { LogFunction } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters Jan 2019
 //
@@ -11,7 +12,7 @@ import { Unit } from "../duotecno/protocol";
 
 export class Temperature extends Accessory {
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     
   }
@@ -41,7 +42,7 @@ export class Temperature extends Accessory {
 
   updateState() {
     this.me.getCharacteristic(this.homebridge.Characteristic.CurrentTemperature).updateValue((<number>this.unit.value) / 10.0);
-    this.log("Received updateState -> Homekit Temperature -> " + this.unit.getName() + " -> temp = " +(<number>this.unit.value) / 10.0);
+    // this.log("Received updateState -> Homekit Temperature -> " + this.unit.getName() + " -> temp = " +(<number>this.unit.value) / 10.0);
   }
 
 }

package/accessories/windowcovering.js

@@ -133,7 +133,7 @@ class WindowCovering extends accessory_1.Accessory {
     // called in response to Duotecno status update
     updateState() {
         const value = this.DT2HB(this.unit.status);
-        this.log("Received updateState -> Homekit WindowCovering for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing: " + value);
+        // this.log("Received updateState -> Homekit WindowCovering for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing: " + value);
         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);

package/accessories/windowcovering.ts

@@ -1,6 +1,7 @@
 import { Accessory } from "./accessory";
 import { LogFunction, UnitMotorCmd, UnitState } from "../duotecno/types";
 import { Unit } from "../duotecno/protocol";
+import { API } from "homebridge";
 
 // Johan Coppieters v1: Jan 2019, v2: Jun 2020
 //
@@ -58,7 +59,7 @@ import { Unit } from "../duotecno/protocol";
 export class WindowCovering extends Accessory {
   targetState;
 
-  constructor(log: LogFunction, homebridge, unit: Unit) {
+  constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);
     this.targetState = 0; // down or closed by default ??
 
@@ -159,7 +160,7 @@ export class WindowCovering extends Accessory {
   // called in response to Duotecno status update
   updateState() {
     const value = this.DT2HB(this.unit.status);
-    this.log("Received updateState -> Homekit WindowCovering for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing: " + value);
+    // this.log("Received updateState -> Homekit WindowCovering for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing: " + value);
 
     this.me.getCharacteristic(this.homebridge.Characteristic.CurrentPosition).updateValue(value);
 

package/duotecno/protocol.js

@@ -447,7 +447,8 @@ exports.Protocol = {
     emitter: null,
     setLogger(logger, debug) {
         this.logger = logger;
-        this.debugger = debug || ((message, ...optionalParams) => { });
+        if (debug)
+            this.debugger = debug;
     },
     setEmitter(emitter) {
         this.emitter = emitter;

package/duotecno/protocol.ts

@@ -525,7 +525,7 @@ export const Protocol = {
 
   setLogger(logger: LogFunction, debug?: LogFunction) {
     this.logger = logger;
-    this.debugger = debug || ((message: any, ...optionalParams: any[]) => {});
+    if (debug) this.debugger = debug;
   },
   setEmitter(emitter: EventEmitter) {
     this.emitter = emitter;

package/duotecno/types.ts

@@ -273,7 +273,6 @@ export interface SmappeeConfig extends BaseConfig {
 // coming from Homebridge or from unit tests
 export type LogFunction = (message: any, ...optionalParams: any[]) => void;
 // needed as return objects to Homebridge
-export type Service = new (nodeName: string) => any;
 
 
 export interface Bridge {

package/package.json

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

package/server/base.js

@@ -6,7 +6,7 @@ const protocol_1 = require("../duotecno/protocol");
 const types_1 = require("../duotecno/types");
 const fs_1 = require("fs");
 const os_1 = require("os");
-const kConfigFiles = (0, os_1.homedir)() + "/homebridge";
+const kConfigFiles = (0, os_1.homedir)() + "/duotecno";
 if (!(0, fs_1.existsSync)(kConfigFiles))
     (0, fs_1.mkdirSync)(kConfigFiles);
 ///////////////

package/server/base.ts

@@ -6,7 +6,7 @@ import { LogFunction, now, Sanitizers } from "../duotecno/types";
 import { existsSync, mkdirSync } from "fs";
 import { homedir } from "os";
 
-const kConfigFiles = homedir() + "/homebridge";
+const kConfigFiles = homedir() + "/duotecno";
 if (! existsSync(kConfigFiles)) mkdirSync(kConfigFiles);
 
 

package/server/views/footer.ejs

@@ -1,3 +1,3 @@
 <footer class="page-footer">
-  <p>Johan Coppieters - Duotecno, 2019-2022 - v5.14.1</p>
+  <p>Johan Coppieters - Duotecno, 2019-2022 - v6.0.8</p>
 </footer>

package/server/webapp.js

@@ -12,7 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebApp = exports.Context = exports.single = void 0;
+exports.WebApp = exports.Context = exports.kVersion = exports.single = void 0;
 const ejs = require("ejs");
 const http = require("http");
 const fs = require("fs");
@@ -30,6 +30,7 @@ function single(val) {
     return (val instanceof Array) ? val[0] : val;
 }
 exports.single = single;
+exports.kVersion = require("../package.json").version;
 ///////////////////
 // Context Class //
 ///////////////////
@@ -61,6 +62,10 @@ class Context {
         this.res = res;
         // can be used for sending different answers
         this.jsonrequest = !!(((_a = req.headers['content-type']) === null || _a === void 0 ? void 0 : _a.toLowerCase().indexOf('application/json')) > -1);
+        // helpers for ejs
+        this.today = new Date();
+        this.year = this.today.getFullYear();
+        this.version = exports.kVersion;
         this.nums = [0, 0, 0];
         // check short urls with numbers a parts
         const p1 = parseInt(this.request);

package/server/webapp.ts

@@ -54,6 +54,7 @@ export function single(val: string | Array<string>): string {
   return (val instanceof Array) ? val[0] : val;
 }
 
+export const kVersion = require("../package.json").version;
 
 ///////////////////
 // Context Class //
@@ -70,6 +71,9 @@ export class Context {
   res: http.ServerResponse;         // from http request
   jsonrequest: boolean;             // from http request
   message = "";                     // display if not empty
+  today: Date;
+  year: number;
+  version: string;
 
   time = types.time;
   hex = types.hex;
@@ -102,6 +106,11 @@ export class Context {
     // can be used for sending different answers
     this.jsonrequest = !!(req.headers['content-type']?.toLowerCase().indexOf('application/json')> -1);
 
+    // helpers for ejs
+    this.today = new Date();
+    this.year = this.today.getFullYear();
+    this.version = kVersion;
+
     this.nums = [0,0,0];
     // check short urls with numbers a parts
     const p1 = parseInt(this.request);