homebridge-smartsystem 5.14.1 → 6.0.0

package/duotecno/master.js

@@ -213,7 +213,7 @@ class Master extends base_1.Base {
             }
             try {
                 // params 3-6: data message, closed, log and error functions
-                this.socket = yield smartsocket_1.getSocket(this.config.address, this.config.port, (msg) => {
+                this.socket = yield (0, smartsocket_1.getSocket)(this.config.address, this.config.port, (msg) => {
                     this.handleData(msg);
                 }, (end) => {
                     this.isOpen = false;
@@ -354,7 +354,7 @@ class Master extends base_1.Base {
         else {
             if ((next.cmd != protocol_1.Rec.TimeDateStatus) &&
                 (next.cmd != protocol_1.Rec.Sensor))
-                this.info(protocol_1.recName(next.cmd) + " -> " + ((!next.message) ?
+                this.info((0, protocol_1.recName)(next.cmd) + " -> " + ((!next.message) ?
                     "--" : ((next.message instanceof Array) ? next.message.join(",") : next.message)));
             this.Q.do();
             if (next.isStatus) {

package/duotecno/protocol.js

@@ -125,7 +125,7 @@ class Node {
         return this.getName().toLowerCase();
     }
     getNumber() {
-        return types_1.hex(this.logicalAddress);
+        return (0, types_1.hex)(this.logicalAddress);
     }
     getDescription() {
         return this.getName() + ", active: " + this.active + ", type: " + this.typeName() + ", node: " + this.getName();
@@ -218,7 +218,7 @@ class Unit {
         return this.displayName;
     }
     getNumber() {
-        return this.node.getNumber() + ";" + types_1.hex(this.logicalAddress);
+        return this.node.getNumber() + ";" + (0, types_1.hex)(this.logicalAddress);
     }
     getSort() {
         const name = this.getName().toLowerCase();
@@ -322,7 +322,7 @@ class Unit {
             return "N" + this.logicalNodeAddress + "-U" + this.logicalAddress;
     }
     getModelName() {
-        return this.typeName() + " " + types_1.hex(this.node.logicalAddress) + ";" + types_1.hex(this.logicalAddress);
+        return this.typeName() + " " + (0, types_1.hex)(this.node.logicalAddress) + ";" + (0, types_1.hex)(this.logicalAddress);
     }
     isCtrl() {
         return this.isSwitch() || this.isDimmer() || this.isUpDown();
@@ -402,7 +402,7 @@ class Unit {
                 return (isNaN(aval) ? "-" :
                     ((aval < 10000) ?
                         (aval + " W") :
-                        (Math.round(aval / 1000) + "." + types_1.two(Math.round(aval % 1000 / 100)) + " kW")));
+                        (Math.round(aval / 1000) + "." + (0, types_1.two)(Math.round(aval % 1000 / 100)) + " kW")));
             case types_1.UnitExtendedType.kTemperature:
                 return isNaN(this.value) ? "-" : ((this.value / 10.0) + 'C');
             case types_1.UnitExtendedType.kCondition:

package/index.spec.js

@@ -12,7 +12,7 @@ function adder(plugin, platform, list) {
     console.log("************* plugin: " + plugin + ", platform: " + platform, list);
 }
 function tester() {
-    const platform = new platform_1.Platform(console.log, { debug: false, smappee: true, smartapp: true, socapp: false, system: true,
+    const platform = new platform_1.Platform(console, { debug: false, smappee: true, smartapp: true, socapp: false, system: true,
         manufacturer: "Duotecno", platform: "ssoc" }, { registerPlatformAccessories: adder });
     // testing
     let m = new master_1.Master(platform.system, types_1.Sanitizers.masterConfig({ name: "master1", address: "12", port: 21, password: "x", active: true, nodenames: {} }));

package/index.spec.ts

@@ -13,7 +13,7 @@ function adder(plugin: string, platform: string, list: any[]) {
 }
 
 function tester() {
-  const platform = new Platform(console.log, {debug: false, smappee: true, smartapp: true, socapp: false, system: true, 
+  const platform = new Platform(console, {debug: false, smappee: true, smartapp: true, socapp: false, system: true, 
     manufacturer: "Duotecno", platform: "ssoc"}, {registerPlatformAccessories: adder});
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
-  "displayname": "Duotechno Bridge",
-  "version": "5.14.1",
+  "displayname": "Duotecno Bridge",
+  "version": "6.0.0",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -12,8 +12,8 @@
     "watch": "npx tsc --build . --watch"
   },
   "engines": {
-    "node": ">=8.0.0",
-    "homebridge": ">=0.4.0"
+    "node": ">=14.18.1",
+    "homebridge": ">=1.3.5"
   },
   "keywords": [
     "websockets",
@@ -34,12 +34,13 @@
     "mqtt": "^4.3.7",
     "node-fetch": "^3.2.4",
     "rpi-gpio": "^2.1.7",
-    "typescript": "^4.0.5",
     "ws": "^7.4.6"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.0",
-    "@types/node": "^11.15.3",
-    "@types/ws": "^6.0.4"
+    "@types/node": "^16.10.9",
+    "@types/ws": "^6.0.4",
+    "typescript": "^4.7.4",
+    "homebridge": "^1.3.9"
   }
 }

package/server/base.js

@@ -30,7 +30,7 @@ class Base {
         this.logger("[" + this.type + "] " + msg);
     }
     err(msg) {
-        this.logger("[" + this.type + "] *** " + types_1.now() + " *** " + msg + " ***");
+        this.logger("[" + this.type + "] *** " + (0, types_1.now)() + " *** " + msg + " ***");
     }
     //////////////////
     // Config stuff //

package/server/platform.js

@@ -28,25 +28,25 @@ const lock_1 = require("../accessories/lock");
 class Platform extends base_1.Base {
     constructor(log, config, homebridge) {
         // set debug to true for new config files
-        super("homebridge", log);
+        super("homebridge", log.info);
         this.accessoryList = [];
         this.ready = false;
         this.startWaiting = 0;
         this.config = Object.assign({}, config);
         this.config.debug = (config && ("debug" in config)) ? config.debug : false;
-        log("running in directory: " + process.cwd());
-        log("with config:" + JSON.stringify(config, null, 2));
+        this.log("running in directory: " + process.cwd());
+        this.log("with config:" + JSON.stringify(config, null, 2));
         // log("homebridge object:", homebridge);
         this.homebridge = homebridge;
         if (this.config.system) {
             try {
-                this.system = new system_1.System(log, false);
+                this.system = new system_1.System(this.log, false);
                 this.system.openMasters(true);
                 this.system.emitter.on('ready', this.systemReady.bind(this));
                 this.system.emitter.on('update', this.updateState.bind(this));
             }
             catch (err) {
-                log(err);
+                log.error(err);
                 if (!this.system) {
                     this.log("platform - Can't run without a System.");
                     return;
@@ -60,7 +60,7 @@ class Platform extends base_1.Base {
         // startup a Smappee MQTT subscriber, if one is configured
         if (this.config.smappee) {
             try {
-                this.smappee = new smappee_1.Smappee(this.system, log);
+                this.smappee = new smappee_1.Smappee(this.system, this.log);
             }
             catch (err) {
                 this.log(err);
@@ -75,7 +75,7 @@ class Platform extends base_1.Base {
         // startup a smartApp if configured -> only on Raspberry's
         if (this.config.smartapp) {
             try {
-                this.smartapp = new smartapp_1.SmartApp(this.system, this.smappee, this, log, false);
+                this.smartapp = new smartapp_1.SmartApp(this.system, this.smappee, this, this.log, false);
                 this.smartapp.serve();
             }
             catch (err) {
@@ -92,7 +92,7 @@ class Platform extends base_1.Base {
         if (this.config.socapp) {
             try {
                 // reuse the config file from the smartapp
-                this.smartsoc = new socapp_1.SocApp(this.system, 'smartapp', log);
+                this.smartsoc = new socapp_1.SocApp(this.system, 'smartapp', this.log);
                 this.smartsoc.serve();
             }
             catch (err) {

package/server/platform.ts

@@ -1,4 +1,5 @@
 import { LogFunction, PlatformConfig, UnitExtendedType } from "../duotecno/types";
+import { Logger } from "homebridge";
 import { System } from "../duotecno/system";
 import { Smappee } from "./smappee";
 import { SmartApp } from "./smartapp";
@@ -27,30 +28,31 @@ export class Platform extends Base {
   accessoryList: Array<Accessory> = [];
   ready = false;
   startWaiting = 0;
+  log: LogFunction;
 
-  constructor(log: LogFunction, config: PlatformConfig, homebridge) {
+  constructor(log: Logger, config: PlatformConfig, homebridge) {
     // set debug to true for new config files
-    super("homebridge", log);
+    super("homebridge", log.info);
 
     this.config = {... config};
     this.config.debug = (config && ("debug" in config)) ? config.debug : false;
 
-    log("running in directory: " + process.cwd());
-    log("with config:" + JSON.stringify(config, null, 2));
+    this.log("running in directory: " + process.cwd());
+    this.log("with config:" + JSON.stringify(config, null, 2));
     // log("homebridge object:", homebridge);
 
     this.homebridge = homebridge;
 
     if (this.config.system) {
       try {
-        this.system = new System(log, false);
+        this.system = new System(this.log, false);
         this.system.openMasters(true);
 
         this.system.emitter.on('ready', this.systemReady.bind(this));
         this.system.emitter.on('update', this.updateState.bind(this));
 
       } catch(err) {
-        log(err);
+        log.error(err);
         if (!this.system) {
           this.log("platform - Can't run without a System.");
           return;
@@ -64,7 +66,7 @@ export class Platform extends Base {
     // startup a Smappee MQTT subscriber, if one is configured
     if (this.config.smappee) {
       try {
-        this.smappee = new Smappee(this.system, log);
+        this.smappee = new Smappee(this.system, this.log);
 
       } catch(err) {
         this.log(err);
@@ -79,7 +81,7 @@ export class Platform extends Base {
     // startup a smartApp if configured -> only on Raspberry's
     if (this.config.smartapp) {
       try {
-        this.smartapp = new SmartApp(this.system, this.smappee, this, log, false);
+        this.smartapp = new SmartApp(this.system, this.smappee, this, this.log, false);
         this.smartapp.serve();
 
       } catch(err) {
@@ -96,7 +98,7 @@ export class Platform extends Base {
     if (this.config.socapp) {
       try {
         // reuse the config file from the smartapp
-        this.smartsoc = new SocApp(this.system, 'smartapp', log);
+        this.smartsoc = new SocApp(this.system, 'smartapp', this.log);
         this.smartsoc.serve();
 
       } catch(err) {

package/server/smartapp.js

@@ -53,7 +53,7 @@ const kAccessoryPins = {
     "577-03-010": "CC:22:3D:E3:A1:0A"
 };
 // Mac file system -> write locally
-const isMac = fs_1.existsSync("/Volumes");
+const isMac = (0, fs_1.existsSync)("/Volumes");
 const kDHCPConfigFile = isMac ? "./config.dhcpcd" : "/etc/dhcpcd.conf";
 var ContentType;
 (function (ContentType) {
@@ -187,7 +187,7 @@ class SmartApp extends webapp_1.WebApp {
         let unit = null;
         let logicalNodeAddress, logicalAddress;
         let name = context.getParam({ name: "unit" + boundary, type: "string", default: "--" });
-        const value = types_1.actionValue(context.getParam({ name: "value" + boundary, type: "string", default: "0" }));
+        const value = (0, types_1.actionValue)(context.getParam({ name: "value" + boundary, type: "string", default: "0" }));
         // hex addresses or name
         if ((name[0] === "0") && (name[1] === "x")) {
             ({ logicalNodeAddress, logicalAddress } = context.addr(name));
@@ -245,7 +245,7 @@ class SmartApp extends webapp_1.WebApp {
     writeDHCP(context, config) {
         try {
             this.resetDHCP(context);
-            fs_1.writeFileSync(kDHCPConfigFile, this.DHCPdFile(config.network));
+            (0, fs_1.writeFileSync)(kDHCPConfigFile, this.DHCPdFile(config.network));
         }
         catch (err) {
             context.message = JSON.stringify(err);
@@ -253,8 +253,8 @@ class SmartApp extends webapp_1.WebApp {
     }
     resetDHCP(context) {
         try {
-            if (fs_1.existsSync(kDHCPConfigFile))
-                fs_1.truncateSync(kDHCPConfigFile);
+            if ((0, fs_1.existsSync)(kDHCPConfigFile))
+                (0, fs_1.truncateSync)(kDHCPConfigFile);
         }
         catch (err) {
             context.message = JSON.stringify(err);
@@ -283,7 +283,7 @@ class SmartApp extends webapp_1.WebApp {
             doRequest: { get: () => super.doRequest }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const kDir = os_1.homedir() + "/.homebridge/";
+            const kDir = (0, os_1.homedir)() + "/.homebridge/";
             const kFN = kDir + "config.json";
             let message;
             let config;
@@ -297,8 +297,8 @@ class SmartApp extends webapp_1.WebApp {
             }
             else if (context.action === "save") {
                 const bridge = this.scrapePlatformConfig(context);
-                if (!fs_1.existsSync(kDir))
-                    fs_1.mkdirSync(kDir);
+                if (!(0, fs_1.existsSync)(kDir))
+                    (0, fs_1.mkdirSync)(kDir);
                 config = this.read("homebridge", kFN);
                 config.bridge = bridge;
                 this.log("writing config");
@@ -424,7 +424,7 @@ class SmartApp extends webapp_1.WebApp {
                     swtch.status = swtch.unit.status;
                 }
                 else {
-                    this.log("** error ** missing unit: " + types_1.hex(swtch.logicalNodeAddress) + "/" + types_1.hex(swtch.logicalAddress) + " **");
+                    this.log("** error ** missing unit: " + (0, types_1.hex)(swtch.logicalNodeAddress) + "/" + (0, types_1.hex)(swtch.logicalAddress) + " **");
                 }
             }
         });

package/server/somfy.js

@@ -36,7 +36,7 @@ function setlogger(logF) {
 }
 exports.setlogger = setlogger;
 function myLogger(msg) {
-    console.log("[" + types_1.now() + "] [somfy] " + msg);
+    console.log("[" + (0, types_1.now)() + "] [somfy] " + msg);
 }
 function mS(nr) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -75,7 +75,8 @@ function toggle(pin) {
 }
 function selected(screen) {
     return __awaiter(this, void 0, void 0, function* () {
-        const screens = [false, !(yield gpio.read(sScreen1)),
+        const screens = [false,
+            !(yield gpio.read(sScreen1)),
             !(yield gpio.read(sScreen2)),
             !(yield gpio.read(sScreen3)),
             !(yield gpio.read(sScreen4))];

package/server/webapp.js

@@ -215,7 +215,7 @@ class WebApp extends base_1.Base {
         this.server.listen(this.port, onConnected);
     }
     addFile(name, filename, type, enc) {
-        this.addContent(name, fs.readFileSync(filename, enc || 'utf-8'), type || "text/html", filename);
+        this.addContent(name, fs.readFileSync(filename, { encoding: enc || 'utf-8' }), type || "text/html", filename);
     }
     addContent(name, content, type, filename) {
         this.files[name] = { content, type, filename };
@@ -322,7 +322,7 @@ class WebApp extends base_1.Base {
             // 2) add file to sudo
             //   sudo /etc/sudoers.d/mysudoersfile
             return new Promise((resolve, reject) => {
-                child_process_1.exec("sudo shutdown -r now", (error, stdout, stderr) => {
+                (0, child_process_1.exec)("sudo shutdown -r now", (error, stdout, stderr) => {
                     if (error) {
                         // context.message = stderr;
                         // console.log("error shutting down: ", error, stdout, stderr);

package/server/webapp.ts

@@ -269,8 +269,8 @@ export class WebApp extends Base {
     this.server.listen(this.port, onConnected);
   }
 
-  addFile(name: string, filename: string, type?: string, enc?: string) {
-    this.addContent(name, fs.readFileSync(filename, enc || 'utf-8'), type || "text/html", filename);
+  addFile(name: string, filename: string, type?: string, enc?: BufferEncoding) {
+    this.addContent(name, fs.readFileSync(filename, {encoding: enc || 'utf-8'}), type || "text/html", filename);
   }
   addContent(name: string, content: string, type: string, filename: string) {
     this.files[name] = { content, type, filename };