homebridge-smartsystem 6.1.2 → 6.1.5

package/README.md

@@ -248,10 +248,13 @@ switch =>
  - 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...
-
+ ## v6.1.x - 21-07-2022 - P1 release
+ - 0: implemented P1 power meter telegram
+ - 1: bugfixes, timeout mgt, etc...
+ - 2: try fixing logfunction errors
+ - 3: reverting to console.log
+ - 4: errors when starting power mgrs from platform.ts
+ - 5: v6.1.3 changes were gone... restored them.
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/config.p1.json

@@ -1,6 +1,6 @@
 {
-  "rules": [
-  ],
-  "address": "192.168.0.186",
-  "debug": false
+  "rules": [],
+  "address": "192.168.0.214",
+  "debug": false,
+  "bindings": []
 }

package/duotecno/types.js

@@ -102,15 +102,15 @@ exports.logSettings = {
     "*": LogLevel.log,
     "master": LogLevel.log,
     "protocol": LogLevel.noLog,
-    "webapp": LogLevel.debug,
-    "p1": LogLevel.debug,
+    "webapp": LogLevel.log,
+    "p1": LogLevel.log,
     "power": LogLevel.noLog
 };
 // can be overriden with server log function
 exports.logFunction = console.log;
 function setLogFunction(F) {
-    console.log(">>>>>>>>> changing logfunction to: " + F.name + " <<<<<<<<<<");
-    exports.logFunction = (m) => { F(m); };
+    console.log(">>>>>>>>> NOT changing logfunction to: " + F.name + " <<<<<<<<<<");
+    // logFunction = (m) => { F(m) }; 
 }
 exports.setLogFunction = setLogFunction;
 function err(type, message) {

package/duotecno/types.ts

@@ -53,16 +53,16 @@ export const logSettings = {
   "*": LogLevel.log,
   "master": LogLevel.log,
   "protocol": LogLevel.noLog,
-  "webapp": LogLevel.debug,
-  "p1": LogLevel.debug,
+  "webapp": LogLevel.log,
+  "p1": LogLevel.log,
   "power": LogLevel.noLog
 }
 
 // can be overriden with server log function
 export let logFunction = console.log;
 export function setLogFunction(F) { 
-  console.log(">>>>>>>>> changing logfunction to: " + F.name + " <<<<<<<<<<");
-  logFunction = (m) => { F(m) }; 
+  console.log(">>>>>>>>> NOT changing logfunction to: " + F.name + " <<<<<<<<<<");
+  // logFunction = (m) => { F(m) }; 
 }
 
 export function err(type: string, message: string | object) {

package/package.json

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

package/server/base.js

@@ -5,7 +5,8 @@ const fs = require("fs");
 const types_1 = require("../duotecno/types");
 const fs_1 = require("fs");
 const os_1 = require("os");
-const kConfigFiles = (0, os_1.homedir)() + "/duotecno";
+const isMac = ((0, os_1.platform)() === "darwin");
+const kConfigFiles = (isMac) ? (__dirname + "/..") : ((0, os_1.homedir)() + "/duotecno");
 if (!(0, fs_1.existsSync)(kConfigFiles))
     (0, fs_1.mkdirSync)(kConfigFiles);
 ///////////////

package/server/base.ts

@@ -1,12 +1,12 @@
 import * as fs from 'fs';
-import { Protocol } from "../duotecno/protocol";
-import { debug, err, log, LogFunction, LogLevel, logSettings, now, Sanitizers } from "../duotecno/types";
+import { debug, err, log, LogFunction, LogLevel, logSettings, Sanitizers } from "../duotecno/types";
 
 
 import { existsSync, mkdirSync } from "fs";
-import { homedir } from "os";
+import { homedir, platform } from "os";
 
-const kConfigFiles = homedir() + "/duotecno";
+const isMac = (platform() === "darwin");
+const kConfigFiles = (isMac) ? (__dirname+"/..") : (homedir() + "/duotecno");
 if (! existsSync(kConfigFiles)) mkdirSync(kConfigFiles);
 
 

package/server/p1.js

@@ -79,8 +79,7 @@ class P1 extends powerbase_1.PowerBase {
                     const value = V[1].substring(0, V[1].length - 1); // remove last ")"
                     const VU = value.split("*"); // split "value*unit"
                     return { key, value: VU[0], unit: VU[1] };
-                }).forEach(R => result[R.key] = { value: parseFloat(R.value), unit: R.unit
-                });
+                }).forEach(R => result[R.key] = { value: parseFloat(R.value), unit: R.unit });
                 return result;
             }
             catch (error) {
@@ -90,42 +89,45 @@ class P1 extends powerbase_1.PowerBase {
         });
     }
     consume(data) {
-        this.voltages = [data['32.7.0'].value, data['52.7.0'].value, data['72.7.0'].value];
-        this.realtime = { totalPower: data['1.7.0'].value * 1000,
-            totalReactivePower: data['2.7.0'].value * 1000,
-            totalExportEnergy: data['2.8.1'].value + data['2.8.2'].value,
-            totalImportEnergy: data['1.8.1'].value + data['1.8.2'].value,
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        if (!data['32.7.0'])
+            return;
+        this.voltages = [(_a = data['32.7.0']) === null || _a === void 0 ? void 0 : _a.value, (_b = data['52.7.0']) === null || _b === void 0 ? void 0 : _b.value, (_c = data['72.7.0']) === null || _c === void 0 ? void 0 : _c.value];
+        this.realtime = { totalPower: ((_d = data['1.7.0']) === null || _d === void 0 ? void 0 : _d.value) * 1000,
+            totalReactivePower: ((_e = data['2.7.0']) === null || _e === void 0 ? void 0 : _e.value) * 1000,
+            totalExportEnergy: ((_f = data['2.8.1']) === null || _f === void 0 ? void 0 : _f.value) + ((_g = data['2.8.2']) === null || _g === void 0 ? void 0 : _g.value),
+            totalImportEnergy: ((_h = data['1.8.1']) === null || _h === void 0 ? void 0 : _h.value) + ((_j = data['1.8.2']) === null || _j === void 0 ? void 0 : _j.value),
             monitorStatus: 0, utcTimeStamp: new Date().getTime() };
         this.channels = {
             0: {
                 name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION",
-                power: data['22.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                power: ((_k = data['22.7.0']) === null || _k === void 0 ? void 0 : _k.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             1: {
                 name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION",
-                power: data['42.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                power: ((_l = data['42.7.0']) === null || _l === void 0 ? void 0 : _l.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             2: {
                 name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION",
-                power: data['62.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                power: ((_m = data['62.7.0']) === null || _m === void 0 ? void 0 : _m.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             3: {
                 name: "Grid L1", type: "CT", flow: "CONSUMPTION",
-                power: data['21.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
-                current: data['31.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""
+                power: ((_o = data['21.7.0']) === null || _o === void 0 ? void 0 : _o.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                current: (_p = data['31.7.0']) === null || _p === void 0 ? void 0 : _p.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             4: {
                 name: "Grid L2", type: "CT", flow: "CONSUMPTION",
-                power: data['41.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
-                current: data['51.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""
+                power: ((_q = data['41.7.0']) === null || _q === void 0 ? void 0 : _q.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                current: (_r = data['51.7.0']) === null || _r === void 0 ? void 0 : _r.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             5: {
                 name: "Grid L3", type: "CT", flow: "CONSUMPTION",
-                power: data['61.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
-                current: data['71.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""
+                power: ((_s = data['61.7.0']) === null || _s === void 0 ? void 0 : _s.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                current: (_t = data['71.7.0']) === null || _t === void 0 ? void 0 : _t.value, apparentPower: 0, cosPhi: 0, formula: ""
             }
         };
         // console.log(data);

package/server/p1.ts

@@ -167,8 +167,8 @@ export class P1 extends PowerBase {
 
         return { key, value: VU[0], unit: VU[1]};
       }).forEach(R => 
-        result[R.key] = {value: parseFloat(R.value), unit: R.unit
-      });
+        result[R.key] = {value: parseFloat(R.value), unit: R.unit}
+      );
 
       return result;
 
@@ -179,38 +179,40 @@ export class P1 extends PowerBase {
   }
 
   consume(data: P1Data) {
-    this.voltages = [data['32.7.0'].value, data['52.7.0'].value, data['72.7.0'].value];
-    this.realtime = { totalPower: data['1.7.0'].value * 1000, 
-                      totalReactivePower: data['2.7.0'].value * 1000, 
-                      totalExportEnergy: data['2.8.1'].value + data['2.8.2'].value, 
-                      totalImportEnergy: data['1.8.1'].value + data['1.8.2'].value,
+    if (! data['32.7.0']) return;
+    
+    this.voltages = [data['32.7.0']?.value, data['52.7.0']?.value, data['72.7.0']?.value];
+    this.realtime = { totalPower: data['1.7.0']?.value * 1000, 
+                      totalReactivePower: data['2.7.0']?.value * 1000, 
+                      totalExportEnergy: data['2.8.1']?.value + data['2.8.2']?.value, 
+                      totalImportEnergy: data['1.8.1']?.value + data['1.8.2']?.value,
                       monitorStatus: 0, utcTimeStamp: new Date().getTime() };
 
     this.channels = { 
       0: {
         name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION",
-        power: data['22.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+        power: data['22.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
         current: 0, apparentPower: 0, cosPhi: 0, formula: ""},
       1: {
         name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION",
-        power: data['42.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+        power: data['42.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
         current: 0, apparentPower: 0, cosPhi: 0, formula: ""},
       2: {
         name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION",
-        power: data['62.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+        power: data['62.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
         current: 0, apparentPower: 0, cosPhi: 0, formula: ""},
       3: {
         name: "Grid L1", type: "CT", flow: "CONSUMPTION",
-        power: data['21.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
-        current: data['31.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""},
+        power: data['21.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+        current: data['31.7.0']?.value, apparentPower: 0, cosPhi: 0, formula: ""},
       4: {
         name: "Grid L2", type: "CT", flow: "CONSUMPTION",
-        power: data['41.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
-        current: data['51.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""},
+        power: data['41.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+        current: data['51.7.0']?.value, apparentPower: 0, cosPhi: 0, formula: ""},
       5: {
         name: "Grid L3", type: "CT", flow: "CONSUMPTION",
-        power: data['61.7.0'].value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
-        current: data['71.7.0'].value, apparentPower: 0, cosPhi: 0, formula: ""} 
+        power: data['61.7.0']?.value * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+        current: data['71.7.0']?.value, apparentPower: 0, cosPhi: 0, formula: ""} 
     };
     // console.log(data);
 

package/server/platform.js

@@ -26,6 +26,7 @@ const socapp_1 = require("./socapp");
 const door_1 = require("../accessories/door");
 const lock_1 = require("../accessories/lock");
 const p1_1 = require("./p1");
+const shelly_1 = require("./shelly");
 class Platform extends base_1.Base {
     constructor(logger, config, api) {
         // set debug to true for new config files
@@ -64,9 +65,10 @@ class Platform extends base_1.Base {
             return;
         }
         // start power managers
+        this.power = {};
         this.startPower("smappee", smappee_1.Smappee);
         this.startPower("p1", p1_1.P1);
-        // this.startPower("shelly", Shelly);
+        this.startPower("shelly", shelly_1.Shelly);
         // startup a smartApp if configured -> only on Raspberry's
         if (this.config.smartapp) {
             try {

package/server/platform.ts

@@ -68,9 +68,10 @@ export class Platform extends Base {
     }
 
     // start power managers
+    this.power = {};
     this.startPower("smappee", Smappee);
     this.startPower("p1", P1);
-    // this.startPower("shelly", Shelly);
+    this.startPower("shelly", Shelly);
 
 
     // startup a smartApp if configured -> only on Raspberry's