homebridge-smartsystem 6.1.7 → 6.2.2

package/server/powerbase.js

@@ -11,15 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PowerBase = void 0;
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const base_1 = require("./base");
-const http = require("http");
 // Power base class
 //  used by Smappee, Shelly PM, P1 Meter, ...
 // Johan Coppieters, Jul 2022.
 //
 class PowerBase extends base_1.Base {
-    constructor(type, system, dev = false) {
-        super(type + (dev ? "-dev" : ""));
+    constructor(type, system) {
+        super(type);
         // called by Base: this.readConfig();
         this.system = system;
         // will grow when we encounter one in the mqtt stream or if we receive a config message
@@ -31,7 +31,7 @@ class PowerBase extends base_1.Base {
         this.rules = (this.config.rules || []).map(rule => types_1.Sanitizers.ruleConfig(rule));
         this.bindings = (this.config.bindings || []).map(binding => types_1.Sanitizers.bindingConfig(binding));
         this.init(true).then(() => {
-            (0, types_1.log)("power", "Power[" + type + "] created and started");
+            (0, logger_1.log)("power", "Power[" + type + "] created and started");
         });
     }
     //
@@ -76,46 +76,6 @@ class PowerBase extends base_1.Base {
             return this.init(false);
         });
     }
-    //////////////
-    // http get //
-    //////////////
-    get(host, path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let timer;
-            let httpReq;
-            return new Promise((resolve, reject) => {
-                try {
-                    timer = setTimeout(() => {
-                        if (httpReq) {
-                            httpReq.destroy();
-                        }
-                        reject("Request to " + host + path + " timed out");
-                    }, 4000);
-                    httpReq = http.get({ host, path }, (response) => {
-                        let str = '';
-                        // another chunk of data has been received, so append it to `str`
-                        response.on('data', (chunk) => {
-                            str += chunk;
-                        });
-                        // the whole response has been received, 
-                        // stop the timet and resolve the promise with ithe collected result
-                        response.on('end', () => {
-                            if (timer)
-                                clearTimeout(timer);
-                            resolve(str);
-                        });
-                    }).on('error', (e) => {
-                        (0, types_1.err)("power", "http.get failed with " + JSON.stringify(e));
-                        reject(e);
-                    });
-                }
-                catch (error) {
-                    (0, types_1.err)("power", "http.get failed with " + JSON.stringify(error));
-                    reject(error);
-                }
-            });
-        });
-    }
     evalPower(exp) {
         var _a, _b, _c, _d, _e, _f;
         let parsed = exp.split(/(\+|-)/);
@@ -126,7 +86,7 @@ class PowerBase extends base_1.Base {
             else if (parsed[i] === "+")
                 result += (_f = (_e = this.channels[parseInt(parsed[i + 1]) || 0]) === null || _e === void 0 ? void 0 : _e.power) !== null && _f !== void 0 ? _f : 0;
         }
-        (0, types_1.debug)("power", "evalPower: " + exp + " -> " + parsed + " = " + result);
+        (0, logger_1.debug)("power", "evalPower: " + exp + " -> " + parsed + " = " + result);
         return result;
     }
     //////////////////////////////////////////////
@@ -138,16 +98,16 @@ class PowerBase extends base_1.Base {
             this.bindings.forEach(b => {
                 const power = this.evalPower(b.channel);
                 if ((!isNaN(power)) && (isNaN(b.power) || (Math.abs(b.power - power) > Math.abs(b.power * 0.1)))) {
-                    (0, types_1.debug)("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * 0.1));
+                    (0, logger_1.debug)("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * 0.1));
                     this.applyBinding(b, power)
                         .then(value => {
                         b.power = value;
                         // debug("homebridge", "set unit " + b.name + " to " + value);
                     })
-                        .catch((e) => (0, types_1.err)(this.type, e));
+                        .catch((e) => (0, logger_1.err)(this.type, e));
                 }
                 else {
-                    (0, types_1.debug)("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * 0.1));
+                    (0, logger_1.debug)("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + " > threshold: " + Math.abs(b.power * 0.1));
                 }
             });
         }
@@ -170,7 +130,7 @@ class PowerBase extends base_1.Base {
     /////////////////////
     applyRules() {
         if (this.realtimeCounter % 30 === 0) {
-            (0, types_1.log)("power", this.type + " > processRealTime: totalPower = " + this.realtime.totalPower +
+            (0, logger_1.log)("power", this.type + " > processRealTime: totalPower = " + this.realtime.totalPower +
                 ", export = " + this.realtime.totalExportEnergy +
                 ", import = " + this.realtime.totalImportEnergy);
         }
@@ -188,7 +148,7 @@ class PowerBase extends base_1.Base {
                     // calc fake power usage
                     power = this.production - this.consumption;
                 }
-                (0, types_1.debug)("power", "checking " + rule.type + "-rule with channel = " + rule.channel + " = " + power + "W");
+                (0, logger_1.debug)("power", "checking " + rule.type + "-rule with channel = " + rule.channel + " = " + power + "W");
                 this.checkPowerRule(power, rule);
             });
         }
@@ -208,7 +168,7 @@ class PowerBase extends base_1.Base {
         }
         rule.power = power;
         if (newCurrent != rule.current) {
-            (0, types_1.debug)("power", "triggered rule for channel: " + rule.channel + ", power = " + power +
+            (0, logger_1.debug)("power", "triggered rule for channel: " + rule.channel + ", power = " + power +
                 ", low: " + rule.low + ", high: " + rule.high +
                 ", current: " + rule.current + " -> new: " + newCurrent);
             // should be done after successful applyCommand...
@@ -216,13 +176,13 @@ class PowerBase extends base_1.Base {
             if (newCurrent < rule.actions.length) {
                 this.applyCommand(rule.actions[newCurrent])
                     .then((val) => {
-                    (0, types_1.debug)("power", "## sent command -> " + rule.type +
+                    (0, logger_1.debug)("power", "## sent command -> " + rule.type +
                         ", power = " + power + ", channel = " + rule.channel +
                         " -> current = " + newCurrent +
                         " (unit: " + rule.actions[newCurrent].name + ", value: " + rule.actions[newCurrent].value + ")");
                     rule.current = newCurrent;
                 })
-                    .catch((e) => (0, types_1.err)(this.type, e.message));
+                    .catch((e) => (0, logger_1.err)(this.type, e.message));
             }
         }
     }
@@ -244,7 +204,7 @@ class PowerBase extends base_1.Base {
         // sanitize and copy all rules into the config
         this.config.rules = [];
         this.rules.forEach(r => this.config.rules.push(types_1.Sanitizers.ruleConfig(r)));
-        (0, types_1.debug)("power", "config.rules = " + JSON.stringify(this.config.rules));
+        (0, logger_1.debug)("power", "config.rules = " + JSON.stringify(this.config.rules));
         this.writeConfig();
     }
     newRule() {
@@ -272,7 +232,7 @@ class PowerBase extends base_1.Base {
         this.bindings.sort((a, b) => parseInt(a.channel) - parseInt(b.channel));
         // sanitize and copy all rules into the config
         this.config.bindings = this.bindings.map(b => types_1.Sanitizers.bindingConfig(b));
-        (0, types_1.debug)("power", "config.bindings = " + JSON.stringify(this.config.bindings));
+        (0, logger_1.debug)("power", "config.bindings = " + JSON.stringify(this.config.bindings));
         this.writeConfig();
     }
     newBinding() {

package/server/powerbase.ts

@@ -1,9 +1,8 @@
 import { System } from "../duotecno/system";
-import { PowerBaseConfig, Rule, Binding, Sanitizers, Boundaries, Action, kEmptyBinding, kEmptyRule, err, debug, log  } from "../duotecno/types";
+import { PowerBaseConfig, Rule, Binding, Sanitizers, Boundaries, Action, kEmptyBinding, kEmptyRule  } from "../duotecno/types";
+import { err, debug, log } from "../duotecno/logger";
 import { Base } from "./base";
 import { Context } from "./webapp";
-import * as http from "http";
-import { captureRejections } from "events";
 
 // Power base class
 //  used by Smappee, Shelly PM, P1 Meter, ...
@@ -33,8 +32,8 @@ export class PowerBase extends Base {
 
 
 
-  constructor(type: String, system: System, dev = false) {
-    super(type + (dev ? "-dev" : ""));
+  constructor(type: string, system: System) {
+    super(type);
     // called by Base: this.readConfig();
     
     this.system = system;
@@ -92,51 +91,6 @@ export class PowerBase extends Base {
     return this.init(false);
   }
 
-
-  //////////////
-  // http get //
-  //////////////
-  async get(host: string, path: string): Promise<string> {
-    let timer;
-    let httpReq: http.ClientRequest;
-    return new Promise<any>((resolve, reject) => {
-      try {
-        timer = setTimeout(() => { 
-          if (httpReq) {
-            httpReq.destroy();
-          }
-          reject("Request to " + host + path + " timed out"); 
-        }, 4000);
-
-        httpReq = http.get({ host, path }, (response) => {
-          let str = '';
-        
-          // another chunk of data has been received, so append it to `str`
-          response.on('data', (chunk) => {
-            str += chunk;
-          });
-        
-          // the whole response has been received, 
-          // stop the timet and resolve the promise with ithe collected result
-          response.on('end', () => {
-            if (timer)
-              clearTimeout(timer);
-            resolve(str);
-          });
-
-        }).on('error', (e) => {
-          err("power", "http.get failed with " + JSON.stringify(e));
-          reject(e);
-        });
-
-      } catch(error) {
-        err("power", "http.get failed with " + JSON.stringify(error));
-        reject(error);
-      }
-    });
-  }
-
-
   evalPower(exp: string): number {
     let parsed = exp.split(/(\+|-)/);
     let result = this.channels[parseInt(parsed[0])||0]?.power ?? 0;

package/server/shelly.js

@@ -13,10 +13,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shelly = void 0;
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const powerbase_1 = require("./powerbase");
 class Shelly extends powerbase_1.PowerBase {
-    constructor(system, dev = false) {
+    constructor(system) {
         super("p1", system);
         this.timer = null;
         // init is called by super
@@ -37,12 +37,12 @@ class Shelly extends powerbase_1.PowerBase {
     // }
     subscribe() {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, types_1.log)("shelly", "connecting to Shelly: " + this.config.address);
+            (0, logger_1.log)("shelly", "connecting to Shelly: " + this.config.address);
             if (this.config.address) {
                 this.timer = setInterval(() => {
                     this.realtimeCounter++;
                     // fetch data from API
-                    (0, types_1.debug)("shelly", "call shelly API");
+                    (0, logger_1.debug)("shelly", "call shelly API");
                     // call process/bindings/rules
                     this.applyBindings();
                     this.applyRules();

package/server/shelly.ts

@@ -3,7 +3,8 @@
 //
 
 import { System } from "../duotecno/system";
-import { debug, log, P1Config } from "../duotecno/types";
+import { P1Config } from "../duotecno/types";
+import { debug, log } from "../duotecno/logger";
 import { PowerBase } from "./powerbase";
 
 
@@ -13,7 +14,7 @@ export class Shelly extends PowerBase {
   timer: NodeJS.Timer;
 
 
-  constructor(system: System, dev = false) {
+  constructor(system: System) {
     super("p1", system);
     
     this.timer = null;

package/server/smappee.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Smappee = void 0;
 const mqtt = require("mqtt");
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const powerbase_1 = require("./powerbase");
 // Smappee MQTT implementation
 // Johan Coppieters, Jan 2019.
@@ -26,8 +27,8 @@ const powerbase_1 = require("./powerbase");
 //
 // see smappee.json for output
 class Smappee extends powerbase_1.PowerBase {
-    constructor(system, dev = false) {
-        super("smappee", system, dev);
+    constructor(system) {
+        super("smappee", system);
         this.client = null;
         // init is called by super
     }
@@ -80,15 +81,15 @@ class Smappee extends powerbase_1.PowerBase {
                     try {
                         const client = mqtt.connect('mqtt:' + this.config.address);
                         this.client = client;
-                        (0, types_1.log)("smappee", "connecting to " + 'mqtt:' + this.config.address);
+                        (0, logger_1.log)("smappee", "connecting to " + 'mqtt:' + this.config.address);
                         client.on('connect', () => {
                             client.subscribe('servicelocation/' + this.config.uid + '/#', (error) => {
                                 if (error) {
-                                    (0, types_1.err)("smappee", error.message);
+                                    (0, logger_1.err)("smappee", error.message);
                                     reject();
                                 }
                                 else {
-                                    (0, types_1.log)("smappee", "subscribed to " + 'servicelocation/' + this.config.uid + "/# -- all messages");
+                                    (0, logger_1.log)("smappee", "subscribed to " + 'servicelocation/' + this.config.uid + "/# -- all messages");
                                     resolve();
                                 }
                             });
@@ -112,7 +113,7 @@ class Smappee extends powerbase_1.PowerBase {
                                 }
                             }
                             catch (error) {
-                                (0, types_1.err)("smappee", "Error converting incoming : " + topic + " -> " + JSON.stringify(error) + " -> " + buffer.toString());
+                                (0, logger_1.err)("smappee", "Error converting incoming : " + topic + " -> " + JSON.stringify(error) + " -> " + buffer.toString());
                             }
                         });
                     }
@@ -147,7 +148,7 @@ class Smappee extends powerbase_1.PowerBase {
                 return new Promise((resolve, reject) => {
                     try {
                         this.client.end(true, () => {
-                            (0, types_1.log)("smappee", "unsubscribed from the MQTT stream");
+                            (0, logger_1.log)("smappee", "unsubscribed from the MQTT stream");
                             resolve();
                         });
                     }
@@ -265,7 +266,7 @@ class Smappee extends powerbase_1.PowerBase {
         if (!this.plugs[plugNr])
             this.plugs[plugNr] = this.emptyPlug(plugNr);
         if (this.plugs[plugNr].value != newState) {
-            (0, types_1.debug)("smappee", "doPlug, plugNr = " + plugNr + ", received: " + message.value + ", current: " + this.plugs[plugNr].value);
+            (0, logger_1.debug)("smappee", "doPlug, plugNr = " + plugNr + ", received: " + message.value + ", current: " + this.plugs[plugNr].value);
             this.plugs[plugNr].value = newState;
             // send status change to system
             this.system.emitter.emit('plug', types_1.SwitchType.kSmappee, plugNr, newState);

package/server/smappee.ts

@@ -2,7 +2,8 @@ import * as mqtt from "mqtt";
 import { MqttClient } from "mqtt";
 
 import { System } from "../duotecno/system";
-import { debug, err, log, SmappeeConfig, SwitchType } from "../duotecno/types";
+import { SmappeeConfig, SwitchType } from "../duotecno/types";
+import { debug, err, log } from "../duotecno/logger";
 import { PowerBase } from "./powerbase";
 import { Context } from "./webapp";
 
@@ -27,8 +28,8 @@ export class Smappee extends PowerBase {
   plugs: { [nodeId: number]: { value: boolean, name: string } };
 
 
-  constructor(system: System, dev = false) {
-    super("smappee", system, dev);
+  constructor(system: System) {
+    super("smappee", system);
 
     this.client = null;
     // init is called by super