homebridge-smartsystem 6.3.1 → 6.3.3

package/README.md

@@ -278,6 +278,8 @@ Homebridge UI version
 
  ### v6.3.x - 23-09-2022 - Shelly PM release
  - 1: first test 1 PM
+ - 2: logging now more according to debug true/false in the config file
+ - 3: power bindings now when: 5% change < 1000W, 2% change > 1000W
  
 
 ## Hardware 

package/config.json

@@ -2,6 +2,7 @@
   "manufacturer": "Duotecno-Coppieterscc",
   "platform": "DuotecnoPlatform",
   "smappee": {
+    "debug": false,
     "rules": [
       {
         "type": "sun",
@@ -140,7 +141,6 @@
     ],
     "address": "192.168.0.186",
     "uid": "57e3e0d8-bb05-4b04-8662-1a9871998f3f",
-    "debug": false,
     "bindings": [
       {
         "logicalNodeAddress": 252,
@@ -189,6 +189,7 @@
     ]
   },
   "p1": {
+    "debug": false,
     "rules": [
       {
         "type": "power",
@@ -250,6 +251,7 @@
     "address": "192.168.0.207"
   },
   "shelly": {
+    "debug": false,
     "address": "192.168.0.95",
     "addresses": "192.168.0.95,192.168.0.95",
     "rules": [],
@@ -378,6 +380,54 @@
       }
     ],
     "cunits": [
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 102,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "<Solar Panels",
+        "displayName": "<Solar Panels",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 103,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Cars",
+        "displayName": ">Cars",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 100,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Grid",
+        "displayName": ">Grid",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 101,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": ">Swimmingpool",
+        "displayName": ">Swimmingpool",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 3,
         "logicalAddress": 4,

package/duotecno/logger.js

@@ -18,7 +18,7 @@ exports.logSettings = {
     "protocol": LogLevel.noLog,
     "webapp": LogLevel.log,
     "p1": LogLevel.log,
-    "shelly": LogLevel.debug,
+    "shelly": LogLevel.log,
     "power": LogLevel.log,
     "smartapp": LogLevel.log
 };

package/duotecno/logger.ts

@@ -13,7 +13,7 @@ export const logSettings = {
   "protocol": LogLevel.noLog,
   "webapp": LogLevel.log,
   "p1": LogLevel.log,
-  "shelly": LogLevel.debug,
+  "shelly": LogLevel.log,
   "power": LogLevel.log,
   "smartapp": LogLevel.log
 };

package/duotecno/types.js

@@ -254,6 +254,7 @@ exports.Sanitizers = {
     powerbase: function (config) {
         if (!config)
             config = {};
+        config.debug = config.debug || false;
         config.rules = config.rules || [];
         config.rules = config.rules.map(sw => exports.Sanitizers.ruleConfig(sw));
         config.bindings = config.bindings || [];
@@ -269,10 +270,14 @@ exports.Sanitizers = {
         return cfg;
     },
     p1: function (config) {
-        config = exports.Sanitizers.powerbase(config);
-        return config;
+        if (!config)
+            config = {};
+        const cfg = exports.Sanitizers.powerbase(config);
+        return cfg;
     },
     shelly: function (config) {
+        if (!config)
+            config = {};
         const cfg = exports.Sanitizers.powerbase(config);
         cfg.addresses = (config === null || config === void 0 ? void 0 : config.addresses) || "";
         return cfg;
@@ -325,6 +330,9 @@ exports.Sanitizers = {
         b.power = binding.power || NaN;
         return b;
     },
+    //////////////
+    // Duotecno //
+    //////////////
     masterConfig: function (config) {
         config = (config) ? Object.assign({}, config) : {};
         config.name = config.name || "IP Master";

package/duotecno/types.ts

@@ -259,6 +259,13 @@ export interface SmartAppConfig extends BaseConfig {
   switches: Array<Switch>;
 }
 
+/////////////////////
+// Smartapp config //
+/////////////////////
+export interface BaseConfig {
+  debug?: boolean;
+}
+
 ///////////
 // Power //
 ///////////
@@ -292,9 +299,7 @@ export interface Bridge {
   pin: string         // "577-02-003"
 };
 
-export interface BaseConfig {
-  debug?: boolean;
-}
+
 export interface PlatformConfig extends BaseConfig {
   manufacturer: string;
   platform: string;
@@ -429,6 +434,7 @@ export const Sanitizers = {
 
   powerbase: function(config: PowerBaseConfig): PowerBaseConfig {
     if (!config) config = <PowerBaseConfig>{};
+    config.debug = config.debug || false;
 
     config.rules = config.rules || [];
     config.rules = config.rules.map(sw => Sanitizers.ruleConfig(sw));
@@ -442,19 +448,21 @@ export const Sanitizers = {
 
   smappee: function(config: SmappeeConfig): SmappeeConfig {
     if (!config) config = <SmappeeConfig>{};
-
     const cfg = <SmappeeConfig> Sanitizers.powerbase(config);
 
     cfg.uid = config.uid || "--none--";
     return cfg;
   },
   p1: function(config: P1Config): P1Config {
-    config = Sanitizers.powerbase(config);
+    if (!config) config = <P1Config>{};
+    const cfg = Sanitizers.powerbase(config);
 
-    return config;
+    return cfg;
   },
   shelly: function(config: ShellyConfig): ShellyConfig {
+    if (!config) config = <ShellyConfig>{};
     const cfg = <ShellyConfig> Sanitizers.powerbase(config);
+    
     cfg.addresses = config?.addresses || "";
     return cfg;
   },
@@ -511,6 +519,9 @@ export const Sanitizers = {
     return b;
   },
 
+  //////////////
+  // Duotecno //
+  //////////////
   masterConfig: function(config?: MasterConfig): MasterConfig {
     config = (config) ? {...config} : <MasterConfig>{};
 

package/package.json

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

package/server/base.js

@@ -14,7 +14,9 @@ class Base {
         else
             this.readConfig();
         if (this.debug)
-            logger_1.logSettings["system"] = logger_1.LogLevel.debug;
+            logger_1.logSettings[this.type] = logger_1.LogLevel.debug;
+        else if (logger_1.logSettings[this.type] == logger_1.LogLevel.debug)
+            logger_1.logSettings[this.type] = logger_1.LogLevel.log;
         (0, logger_1.debug)("system", "==== read config -> " + JSON.stringify(this.config));
     }
     //////////////////

package/server/base.ts

@@ -21,7 +21,9 @@ export class Base {
       this.readConfig();
       
     if (this.debug)
-      logSettings["system"] = LogLevel.debug;
+      logSettings[this.type] = LogLevel.debug;
+    else if (logSettings[this.type] == LogLevel.debug)
+      logSettings[this.type] = LogLevel.log;
 
     debug("system", "==== read config -> " + JSON.stringify(this.config))
   }

package/server/powerbase.js

@@ -94,22 +94,40 @@ class PowerBase extends base_1.Base {
     //////////////////////////////////////////////
     // Bindings to Duotecno virtual temp sensor //
     //////////////////////////////////////////////
+    significant(current, previous) {
+        // no values yet -> don't update
+        if (isNaN(current))
+            return false;
+        // no previous value -> always update
+        if (isNaN(previous))
+            return true;
+        // less than 1000W -> update on: difference > 5% previous
+        if (current < 1000)
+            return Math.abs(previous - current) > (previous * 0.05);
+        // more than 1000W -> update on: difference > 2% previous
+        if (current >= 1000)
+            return Math.abs(previous - current) > (previous * 0.02);
+        return false;
+    }
     applyBindings() {
         if (this.realtimeCounter % 2 === 0) {
             // for all bindings
             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 * kPercentChange)))) {
-                    (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 * kPercentChange));
+                if (this.significant(power, b.power)) {
+                    (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: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
                     this.applyBinding(b, power)
                         .then(value => {
                         b.power = value;
-                        // debug("homebridge", "set unit " + b.name + " to " + value);
+                        // debug("power", "set unit " + b.name + " to " + value);
                     })
-                        .catch((e) => (0, logger_1.err)(this.type, e));
-                }
-                else {
-                    (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 * kPercentChange));
+                        .catch((e) => (0, logger_1.err)(this.type, e.message || e));
+                    // } else {
+                    // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
+                    //                " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
+                    //                " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
                 }
             });
         }
@@ -122,8 +140,8 @@ class PowerBase extends base_1.Base {
                     yield unit.setSensorValue(Math.abs(value));
                 return value;
             }
-            else {
-                throw new Error("***** UNIT NOT FOUND for binding (" + value + ") " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
+            else if ((binding.logicalNodeAddress != 0) || (binding.logicalAddress != 0)) {
+                throw new Error("***** UNIT NOT FOUND for binding value " + value + " to " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
             }
         });
     }
@@ -131,10 +149,10 @@ class PowerBase extends base_1.Base {
     // Rules execution //
     /////////////////////
     applyRules() {
-        if (this.realtimeCounter % 30 === 0) {
-            (0, logger_1.log)("power", this.type + " > processRealTime: totalPower = " + this.realtime.totalPower +
-                ", export = " + this.realtime.totalExportEnergy +
-                ", import = " + this.realtime.totalImportEnergy);
+        if (this.realtimeCounter % 60 === 0) {
+            (0, logger_1.log)("power", this.type + " > RealTime totals: Power = " + this.realtime.totalPower +
+                ", Export = " + this.realtime.totalExportEnergy +
+                ", Import = " + this.realtime.totalImportEnergy);
         }
         if (this.realtimeCounter % 5 === 0) {
             // for all rules
@@ -144,7 +162,6 @@ class PowerBase extends base_1.Base {
                 if (rule.type === "power") {
                     // add all channels this rule refers to
                     power = this.evalPower(rule.channel);
-                    // power = rule.channel.split("+").reduce((acc, cur) => acc + this.channels[parseInt(cur)]?.power ?? 0, 0);
                 }
                 else if (rule.type === "sun") {
                     // calc fake power usage
@@ -191,10 +208,12 @@ class PowerBase extends base_1.Base {
     applyCommand(action) {
         return __awaiter(this, void 0, void 0, function* () {
             const unit = this.system.findUnit(this.system.findMaster(action.masterAddress, action.masterPort), action.logicalNodeAddress, action.logicalAddress);
-            if (unit)
+            if (unit) {
                 yield unit.setState(action.value);
-            else
-                throw new Error("***** UNIT NOT FOUND for action (" + action.value + ") " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+            }
+            else if ((action.logicalNodeAddress != 0) || (action.logicalAddress != 0)) {
+                throw new Error("***** UNIT NOT FOUND for action for value " + action.value + " to " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+            }
         });
     }
     //

package/server/powerbase.ts

@@ -1,6 +1,6 @@
 import { System } from "../duotecno/system";
 import { PowerBaseConfig, Rule, Binding, Sanitizers, Boundaries, Action, kEmptyBinding, kEmptyRule  } from "../duotecno/types";
-import { err, debug, log } from "../duotecno/logger";
+import { err, debug, log, logSettings, LogLevel } from "../duotecno/logger";
 import { Base } from "./base";
 import { Context } from "./webapp";
 
@@ -89,7 +89,7 @@ export class PowerBase extends Base {
   async updateConfig(config: any) {
     if (config.address)
       this.config.address = config.address;
-      
+
     this.writeConfig();
 
     return this.init(false);
@@ -111,36 +111,61 @@ export class PowerBase extends Base {
   //////////////////////////////////////////////
   // Bindings to Duotecno virtual temp sensor //
   //////////////////////////////////////////////
+  significant(current: number, previous: number): boolean {
+    // no values yet -> don't update
+    if (isNaN(current))
+      return false;
+    
+    // no previous value -> always update
+    if (isNaN(previous))
+      return true;
+
+    // less than 1000W -> update on: difference > 5% previous
+    if (current < 1000)
+      return Math.abs(previous - current) > (previous * 0.05);
+
+    // more than 1000W -> update on: difference > 2% previous
+    if (current >= 1000)
+      return Math.abs(previous - current) > (previous * 0.02);
+
+    return false;
+  }
+
   applyBindings() {
     if (this.realtimeCounter % 2 === 0) {
       // for all bindings
       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 * kPercentChange)))) {
-          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 * kPercentChange))
+        if (this.significant(power, b.power)) {
+          debug("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
+                         " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
+                         " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
           this.applyBinding(b, power)
             .then(value => {
               b.power = value;
-              // debug("homebridge", "set unit " + b.name + " to " + value);
+              // debug("power", "set unit " + b.name + " to " + value);
             })
-            .catch((e) => err(this.type, e));
+            .catch((e) => err(this.type, e.message || e));
 
-        } else {
-          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 * kPercentChange))
+        // } else {
+          // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
+          //                " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
+          //                " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
         }
       });
     }
   }
 
   async applyBinding(binding: Binding, value: number): Promise<number> {
-    const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), binding.logicalNodeAddress, binding.logicalAddress);
+    const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), 
+                                      binding.logicalNodeAddress, binding.logicalAddress);
     if (unit) {
       if (!isNaN(value))
         await unit.setSensorValue(Math.abs(value));
       return value;
 
-    } else {
-      throw new Error("***** UNIT NOT FOUND for binding (" + value + ") " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
+    } else if ((binding.logicalNodeAddress != 0) || (binding.logicalAddress != 0)) {
+      throw new Error("***** UNIT NOT FOUND for binding value " + value + " to " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
     }
   }
 
@@ -149,10 +174,10 @@ export class PowerBase extends Base {
   // Rules execution //
   /////////////////////
   applyRules() {
-    if (this.realtimeCounter % 30 === 0) {
-      log("power", this.type +  " > processRealTime: totalPower = " + this.realtime.totalPower + 
-      ", export = " + this.realtime.totalExportEnergy + 
-      ", import = " + this.realtime.totalImportEnergy);
+    if (this.realtimeCounter % 60 === 0) {
+      log("power", this.type +  " > RealTime totals: Power = " + this.realtime.totalPower + 
+                                ", Export = " + this.realtime.totalExportEnergy + 
+                                ", Import = " + this.realtime.totalImportEnergy);
     }
 
     if (this.realtimeCounter % 5 === 0) {
@@ -164,7 +189,6 @@ export class PowerBase extends Base {
         if (rule.type === "power") {
           // add all channels this rule refers to
           power = this.evalPower(rule.channel);
-          // power = rule.channel.split("+").reduce((acc, cur) => acc + this.channels[parseInt(cur)]?.power ?? 0, 0);
 
         } else if (rule.type === "sun") {
           // calc fake power usage
@@ -201,11 +225,12 @@ export class PowerBase extends Base {
       rule.current = newCurrent;
       if (newCurrent < rule.actions.length) {
         this.applyCommand(rule.actions[newCurrent])
-          .then((val) => {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;})
+          .then((val) => { 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) => err(this.type, e.message));
       }
     }
@@ -213,10 +238,12 @@ export class PowerBase extends Base {
 
   async applyCommand(action: Action) {
     const unit = this.system.findUnit(this.system.findMaster(action.masterAddress, action.masterPort), action.logicalNodeAddress, action.logicalAddress);
-    if (unit)
+    if (unit) {
       await unit.setState(action.value);
-    else
-      throw new Error("***** UNIT NOT FOUND for action (" + action.value + ") " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+
+    } else if ((action.logicalNodeAddress != 0) || (action.logicalAddress != 0)) {
+      throw new Error("***** UNIT NOT FOUND for action for value " + action.value + " to " + action.masterAddress + " - " + action.logicalNodeAddress + ";" + action.logicalAddress + " *****");
+    }
   }
 
   //

package/server/shelly.js

@@ -167,7 +167,7 @@ class Shelly extends powerbase_1.PowerBase {
                 return true;
             }
             catch (error) {
-                (0, logger_1.err)("shelly", error.message);
+                (0, logger_1.err)("shelly", error.message || error);
                 return false;
             }
         });

package/server/shelly.ts

@@ -182,7 +182,7 @@ export class Shelly extends PowerBase {
       return true;
 
     } catch(error) {
-      err("shelly", error.message);
+      err("shelly", error.message || error);
       return false;
     }
   }