homebridge-smartsystem 6.2.5 → 6.3.1

package/server/p1.js

@@ -92,48 +92,48 @@ class P1 extends powerbase_1.PowerBase {
         });
     }
     consume(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         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: ((_k = data['22.7.0']) === null || _k === void 0 ? void 0 : _k.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION", voltage: (_a = data['32.7.0']) === null || _a === void 0 ? void 0 : _a.value,
+                power: ((_b = data['22.7.0']) === null || _b === void 0 ? void 0 : _b.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             1: {
-                name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION",
-                power: ((_l = data['42.7.0']) === null || _l === void 0 ? void 0 : _l.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION", voltage: (_c = data['52.7.0']) === null || _c === void 0 ? void 0 : _c.value,
+                power: ((_d = data['42.7.0']) === null || _d === void 0 ? void 0 : _d.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             2: {
-                name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION",
-                power: ((_m = data['62.7.0']) === null || _m === void 0 ? void 0 : _m.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION", voltage: (_e = data['72.7.0']) === null || _e === void 0 ? void 0 : _e.value,
+                power: ((_f = data['62.7.0']) === null || _f === void 0 ? void 0 : _f.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
                 current: 0, apparentPower: 0, cosPhi: 0, formula: ""
             },
             3: {
-                name: "Grid L1", type: "CT", flow: "CONSUMPTION",
-                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: ""
+                name: "Grid L1", type: "CT", flow: "CONSUMPTION", voltage: (_g = data['32.7.0']) === null || _g === void 0 ? void 0 : _g.value,
+                power: ((_h = data['21.7.0']) === null || _h === void 0 ? void 0 : _h.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 0,
+                current: (_j = data['31.7.0']) === null || _j === void 0 ? void 0 : _j.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             4: {
-                name: "Grid L2", type: "CT", flow: "CONSUMPTION",
-                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: ""
+                name: "Grid L2", type: "CT", flow: "CONSUMPTION", voltage: (_k = data['52.7.0']) === null || _k === void 0 ? void 0 : _k.value,
+                power: ((_l = data['41.7.0']) === null || _l === void 0 ? void 0 : _l.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 1,
+                current: (_m = data['51.7.0']) === null || _m === void 0 ? void 0 : _m.value, apparentPower: 0, cosPhi: 0, formula: ""
             },
             5: {
-                name: "Grid L3", type: "CT", flow: "CONSUMPTION",
-                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: ""
+                name: "Grid L3", type: "CT", flow: "CONSUMPTION", voltage: (_o = data['72.7.0']) === null || _o === void 0 ? void 0 : _o.value,
+                power: ((_p = data['61.7.0']) === null || _p === void 0 ? void 0 : _p.value) * 1000, exportEnergy: 0, importEnergy: 0, phaseId: 2,
+                current: (_q = data['71.7.0']) === null || _q === void 0 ? void 0 : _q.value, apparentPower: 0, cosPhi: 0, formula: ""
             }
         };
         // console.log(data);
+        this.voltages = [(_r = data['32.7.0']) === null || _r === void 0 ? void 0 : _r.value, (_s = data['52.7.0']) === null || _s === void 0 ? void 0 : _s.value, (_t = data['72.7.0']) === null || _t === void 0 ? void 0 : _t.value];
+        this.realtime = { totalPower: ((_u = data['1.7.0']) === null || _u === void 0 ? void 0 : _u.value) * 1000,
+            totalReactivePower: ((_v = data['2.7.0']) === null || _v === void 0 ? void 0 : _v.value) * 1000,
+            totalExportEnergy: ((_w = data['2.8.1']) === null || _w === void 0 ? void 0 : _w.value) + ((_x = data['2.8.2']) === null || _x === void 0 ? void 0 : _x.value),
+            totalImportEnergy: ((_y = data['1.8.1']) === null || _y === void 0 ? void 0 : _y.value) + ((_z = data['1.8.2']) === null || _z === void 0 ? void 0 : _z.value),
+            monitorStatus: 0, utcTimeStamp: new Date().getTime() };
         this.production = this.realtime.totalPower;
         this.consumption = this.realtime.totalReactivePower;
     }

package/server/p1.ts

@@ -182,43 +182,45 @@ export class P1 extends PowerBase {
 
   consume(data: P1Data) {
     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",
+        name: "Zonnepanelen L1", type: "CT", flow: "PRODUCTION", voltage: data['32.7.0']?.value,
         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",
+        name: "Zonnepanelen L2", type: "CT", flow: "PRODUCTION", voltage: data['52.7.0']?.value,
         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",
+        name: "Zonnepanelen L3", type: "CT", flow: "PRODUCTION", voltage: data['72.7.0']?.value,
         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",
+        name: "Grid L1", type: "CT", flow: "CONSUMPTION", voltage: data['32.7.0']?.value,
         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",
+        name: "Grid L2", type: "CT", flow: "CONSUMPTION", voltage: data['52.7.0']?.value,
         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",
+        name: "Grid L3", type: "CT", flow: "CONSUMPTION", voltage: data['72.7.0']?.value,
         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);
 
+    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.production = this.realtime.totalPower;
     this.consumption = this.realtime.totalReactivePower;
+
+
   }
 }

package/server/powerbase.js

@@ -17,6 +17,7 @@ const base_1 = require("./base");
 //  used by Smappee, Shelly PM, P1 Meter, ...
 // Johan Coppieters, Jul 2022.
 //
+const kPercentChange = 0.05;
 class PowerBase extends base_1.Base {
     constructor(type, system) {
         super(type);
@@ -71,7 +72,8 @@ class PowerBase extends base_1.Base {
     //
     updateConfig(config) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.config.address = config.address;
+            if (config.address)
+                this.config.address = config.address;
             this.writeConfig();
             return this.init(false);
         });
@@ -97,8 +99,8 @@ class PowerBase extends base_1.Base {
             // 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 * 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));
+                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));
                     this.applyBinding(b, power)
                         .then(value => {
                         b.power = value;
@@ -107,7 +109,7 @@ class PowerBase extends base_1.Base {
                         .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 * 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 * kPercentChange));
                 }
             });
         }

package/server/powerbase.ts

@@ -9,6 +9,8 @@ import { Context } from "./webapp";
 // Johan Coppieters, Jul 2022.
 //
 
+const kPercentChange = 0.05;
+
 
 export class PowerBase extends Base {
   system: System;
@@ -26,7 +28,7 @@ export class PowerBase extends Base {
               totalExportEnergy: number, totalImportEnergy: number,
               monitorStatus: number, utcTimeStamp: number }
   channels: { [publishIndex: number]: {
-    name: string, type: string, flow: string,
+    name: string, type: string, flow: string, voltage: number,
     power: number, exportEnergy: number, importEnergy: number, phaseId: number,
     current: number, apparentPower: number, cosPhi: number, formula: string} };
 
@@ -85,7 +87,9 @@ export class PowerBase extends Base {
   // config mgt
   //
   async updateConfig(config: any) {
-    this.config.address = config.address;
+    if (config.address)
+      this.config.address = config.address;
+      
     this.writeConfig();
 
     return this.init(false);
@@ -112,8 +116,8 @@ export class PowerBase extends Base {
       // 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 * 0.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))
+        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))
           this.applyBinding(b, power)
             .then(value => {
               b.power = value;
@@ -122,7 +126,7 @@ export class PowerBase extends Base {
             .catch((e) => err(this.type, 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 * 0.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))
         }
       });
     }

package/server/shelly.js

@@ -15,10 +15,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shelly = void 0;
 const logger_1 = require("../duotecno/logger");
 const powerbase_1 = require("./powerbase");
+const api_1 = require("../duotecno/api");
+const HTTPstatus = {
+    "wifi_sta": {
+        "connected": true,
+        "ssid": "Tele Coppieters",
+        "ip": "192.168.0.95",
+        "rssi": -73
+    },
+    "cloud": {
+        "enabled": true,
+        "connected": true
+    },
+    "mqtt": {
+        "connected": false
+    },
+    "time": "18:17",
+    "unixtime": 1663863464,
+    "serial": 7,
+    "has_update": true,
+    "mac": "C45BBE7928B9",
+    "cfg_changed_cnt": 1,
+    "actions_stats": { "skipped": 0 },
+    "relays": [{ "ison": true, "has_timer": false, "timer_started": 0, "timer_duration": 0, "timer_remaining": 0, "overpower": false, "is_valid": true, "source": "http" }],
+    "emeters": [
+        { "power": 10.66, "pf": 1.00, "current": 0.08, "voltage": 232.06, "is_valid": true, "total": 5.3, "total_returned": 0.0 },
+        { "power": 0.00, "pf": 0.00, "current": 0.01, "voltage": 232.06, "is_valid": true, "total": 0.0, "total_returned": 0.0 },
+        { "power": 0.00, "pf": 0.00, "current": 0.01, "voltage": 232.05, "is_valid": true, "total": 0.0, "total_returned": 0.0 }
+    ],
+    "total_power": 10.66,
+    "fs_mounted": true,
+    "update": { "status": "pending", "has_update": true, "new_version": "20220830-080542/v1.12-3EM-gcf4f7c2", "old_version": "20220209-094824/v1.11.8-g8c7bb8d" },
+    "ram_total": 49440,
+    "ram_free": 30960,
+    "fs_size": 233681,
+    "fs_free": 156875,
+    "uptime": 1364
+};
+const HttpEMeter0 = {
+    "power": 10.95,
+    "pf": 1.00,
+    "current": 0.08,
+    "voltage": 231.21,
+    "is_valid": true,
+    "total": 7.2,
+    "total_returned": 0.0
+};
 class Shelly extends powerbase_1.PowerBase {
     constructor(system) {
-        super("p1", system);
+        super("shelly", system);
         this.timer = null;
+        this.meters = [];
+        this.nrPhases = 0;
         // init is called by super
     }
     //
@@ -31,22 +79,43 @@ class Shelly extends powerbase_1.PowerBase {
     //
     // config mgt
     //
-    // async updateConfig(config: any) {
-    //   // nothing special... for now
-    //   return super.updateConfig(config);
-    // }
+    updateConfig(config) {
+        const _super = Object.create(null, {
+            updateConfig: { get: () => super.updateConfig }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            this.config.addresses = config.addresses;
+            return _super.updateConfig.call(this, config);
+        });
+    }
     subscribe() {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, logger_1.log)("shelly", "connecting to Shelly: " + this.config.address);
+            const kInterval = 5;
             if (this.config.address) {
-                this.timer = setInterval(() => {
-                    this.realtimeCounter++;
-                    // fetch data from API
-                    (0, logger_1.debug)("shelly", "call shelly API");
+                yield this.getDeviceConfig(this.config.address, true);
+            }
+            if (this.config.addresses) {
+                const list = this.config.addresses.split(",");
+                for (let inx in list) {
+                    const phases = (this.config.address) ? false : (inx == "0");
+                    yield this.getDeviceConfig(list[inx], phases);
+                }
+            }
+            (0, logger_1.debug)("shelly", "meters: " + JSON.stringify(this.meters));
+            if (this.meters.length) {
+                this.timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                    this.realtimeCounter += kInterval;
+                    // fetch data
+                    const ok = yield this.fetchData();
+                    if (ok)
+                        this.consume();
                     // call process/bindings/rules
                     this.applyBindings();
                     this.applyRules();
-                }, 5000);
+                }), kInterval * 1000);
+            }
+            else {
+                (0, logger_1.log)("shelly", "No Shelly PM devices configured");
             }
         });
     }
@@ -58,6 +127,70 @@ class Shelly extends powerbase_1.PowerBase {
             }
         });
     }
+    getDeviceConfig(address, phases) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // debug("shelly", "fetching from " + address + "/status");
+                const res = yield (0, api_1.get)(address, 80, "/status", undefined);
+                (0, logger_1.debug)("shelly", "received status from " + address + " -> " + res);
+                const status = JSON.parse(res);
+                // enrich meter with its address and index + add to the global meter list
+                status.emeters.forEach((m, inx) => {
+                    m.index = inx; // index with this PM device
+                    m.phase = phases;
+                    if (phases) {
+                        m.phaseNr = this.nrPhases;
+                        this.nrPhases++;
+                    }
+                    else {
+                        m.phaseNr = -1;
+                    }
+                    m.address = address;
+                    this.meters.push(m);
+                });
+            }
+            catch (error) {
+                (0, logger_1.err)("shelly", error.message);
+            }
+        });
+    }
+    fetchData() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                for (let meter in this.meters) {
+                    // debug("shelly", "fetching from " + this.config.address + "/emeter/" + meter);
+                    const res = yield (0, api_1.get)(this.meters[meter].address, 80, "/emeter/" + this.meters[meter].index, undefined);
+                    (0, logger_1.debug)("shelly", "received meter: " + meter + " -> " + res);
+                    this.meters[meter] = Object.assign(Object.assign({}, this.meters[meter]), JSON.parse(res));
+                }
+                ;
+                return true;
+            }
+            catch (error) {
+                (0, logger_1.err)("shelly", error.message);
+                return false;
+            }
+        });
+    }
+    consume() {
+        // copy this.meters into the powerbase structures
+        this.meters.forEach((meter, inx) => {
+            this.channels[inx] = {
+                name: "Meter " + (inx + 1), type: "CT", flow: "PRODUCTION",
+                power: meter.power, exportEnergy: meter.total_returned, importEnergy: meter.total, phaseId: meter.phaseNr,
+                current: meter.power / meter.voltage, apparentPower: 0, cosPhi: 0, formula: "", voltage: meter.voltage
+            };
+        });
+        this.voltages = [0, 0, 0];
+        this.meters.filter(m => m.phase).forEach(m => this.voltages[m.phaseNr] = m.voltage);
+        this.realtime = { totalPower: this.meters.reduce((prev, curr) => curr.power + prev, 0),
+            totalReactivePower: 0,
+            totalExportEnergy: this.meters.reduce((prev, curr) => curr.total_returned + prev, 0),
+            totalImportEnergy: this.meters.reduce((prev, curr) => curr.total + prev, 0),
+            monitorStatus: 0, utcTimeStamp: new Date().getTime() };
+        this.production = this.realtime.totalPower;
+        this.consumption = this.realtime.totalReactivePower;
+    }
 }
 exports.Shelly = Shelly;
 //# sourceMappingURL=shelly.js.map

package/server/shelly.ts

@@ -3,21 +3,86 @@
 //
 
 import { System } from "../duotecno/system";
-import { P1Config } from "../duotecno/types";
-import { debug, log } from "../duotecno/logger";
+import { ShellyConfig } from "../duotecno/types";
+import { debug, err, log } from "../duotecno/logger";
 import { PowerBase } from "./powerbase";
+import { get } from "../duotecno/api";
 
 
+const HTTPstatus = { 
+  "wifi_sta": { 
+    "connected": true, 
+    "ssid": "Tele Coppieters", 
+    "ip": "192.168.0.95", 
+    "rssi": -73 
+  }, 
+  "cloud": { 
+    "enabled": true, 
+    "connected": true 
+  }, 
+  "mqtt": { 
+    "connected": false 
+  }, 
+  "time": "18:17", 
+  "unixtime": 1663863464, 
+  "serial": 7, 
+  "has_update": true,
+   "mac": "C45BBE7928B9", 
+   "cfg_changed_cnt": 1, 
+   "actions_stats": { "skipped": 0 }, 
+   "relays": [{ "ison": true, "has_timer": false, "timer_started": 0, "timer_duration": 0, "timer_remaining": 0, "overpower": false, "is_valid": true, "source": "http" }], 
+   "emeters": [
+    { "power": 10.66, "pf": 1.00, "current": 0.08, "voltage": 232.06, "is_valid": true, "total": 5.3, "total_returned": 0.0 }, 
+    { "power": 0.00, "pf": 0.00, "current": 0.01, "voltage": 232.06, "is_valid": true, "total": 0.0, "total_returned": 0.0 }, 
+    { "power": 0.00, "pf": 0.00, "current": 0.01, "voltage": 232.05, "is_valid": true, "total": 0.0, "total_returned": 0.0 }
+   ], 
+   "total_power": 10.66, 
+   "fs_mounted": true, 
+   "update": { "status": "pending", "has_update": true, "new_version": "20220830-080542/v1.12-3EM-gcf4f7c2", "old_version": "20220209-094824/v1.11.8-g8c7bb8d" }, 
+   "ram_total": 49440, 
+   "ram_free": 30960, 
+   "fs_size": 233681, 
+   "fs_free": 156875, 
+   "uptime": 1364 
+  };
+
+  const HttpEMeter0 =  {
+    "power":10.95,
+    "pf":1.00,
+    "current":0.08,
+    "voltage":231.21,
+    "is_valid":true,
+    "total":7.2,
+    "total_returned":0.0
+  };
+
+interface Meter {
+  address: string;
+  index: number;
+  phase: boolean;
+  phaseNr: number;
+  power: number;
+  pf: number;
+  current: number;
+  voltage: number;
+  is_valid: boolean;
+  total: number;
+  total_returned: number;
+}
 
 export class Shelly extends PowerBase {
-  config: P1Config; // redefine
+  config: ShellyConfig; // redefine
   timer: NodeJS.Timer;
 
+  meters: Array<Meter>;
+  nrPhases: number;
 
   constructor(system: System) {
-    super("p1", system);
+    super("shelly", system);
     
     this.timer = null;
+    this.meters = [];
+    this.nrPhases = 0;
     // init is called by super
   }
 
@@ -33,26 +98,43 @@ export class Shelly extends PowerBase {
   //
   // config mgt
   //
-  // async updateConfig(config: any) {
-  //   // nothing special... for now
-  //   return super.updateConfig(config);
-  // }
+  async updateConfig(config: any) {
+    this.config.addresses = config.addresses;
+    return super.updateConfig(config);
+  }
 
   
   async subscribe() {
-    log("shelly", "connecting to Shelly: " + this.config.address);
- 
+    const kInterval = 5;
+
     if (this.config.address) {
-      this.timer = setInterval(() => {
-        this.realtimeCounter++;
+      await this.getDeviceConfig(this.config.address, true);
+    }
+    if (this.config.addresses) {
+      const list = this.config.addresses.split(",");
+      for (let inx in list) {
+        const phases = (this.config.address) ? false : (inx == "0");
+        await this.getDeviceConfig(list[inx], phases);
+      }
+    }
+    debug("shelly", "meters: " + JSON.stringify(this.meters));
+
+    if (this.meters.length) {
+      this.timer = setInterval(async () => {
+        this.realtimeCounter += kInterval;
 
-        // fetch data from API
-        debug("shelly", "call shelly API");
+        // fetch data
+        const ok = await this.fetchData();
+        if (ok)
+          this.consume();
 
         // call process/bindings/rules
         this.applyBindings();
         this.applyRules();
-      }, 5000);
+      }, kInterval * 1000);
+
+    } else {
+      log("shelly", "No Shelly PM devices configured");
     }
   }
 
@@ -63,4 +145,68 @@ export class Shelly extends PowerBase {
     }
   }
 
+  async getDeviceConfig(address: string, phases: boolean) {
+    try {
+      // debug("shelly", "fetching from " + address + "/status");
+      const res = await get(address, 80, "/status", undefined);
+      debug("shelly", "received status from " + address + " -> " + res);
+      const status = JSON.parse(res);
+
+      // enrich meter with its address and index + add to the global meter list
+      status.emeters.forEach((m, inx) => {
+        m.index = inx; // index with this PM device
+        m.phase = phases;
+        if (phases) {
+          m.phaseNr = this.nrPhases;
+          this.nrPhases++;
+        } else {
+          m.phaseNr = -1;
+        }
+        m.address = address;
+        this.meters.push(m);
+      });
+
+    } catch(error) {
+      err("shelly", error.message)
+    }
+  }
+
+  async fetchData(): Promise<boolean> {
+    try {
+      for (let meter in this.meters) {
+        // debug("shelly", "fetching from " + this.config.address + "/emeter/" + meter);
+        const res = await get(this.meters[meter].address, 80, "/emeter/"+this.meters[meter].index, undefined);
+        debug("shelly", "received meter: " + meter + " -> " + res);
+        this.meters[meter] = {... this.meters[meter], ...JSON.parse(res)};
+      };
+      return true;
+
+    } catch(error) {
+      err("shelly", error.message);
+      return false;
+    }
+  }
+
+  consume() {
+    // copy this.meters into the powerbase structures
+    this.meters.forEach((meter, inx) => {
+      this.channels[inx] = {
+        name: "Meter " + (inx+1), type: "CT", flow: "PRODUCTION",
+        power: meter.power, exportEnergy: meter.total_returned, importEnergy: meter.total, phaseId: meter.phaseNr,
+        current: meter.power / meter.voltage, apparentPower: 0, cosPhi: 0, formula: "", voltage: meter.voltage}
+    });
+
+    this.voltages = [0,0,0];
+    this.meters.filter(m => m.phase).forEach(m => this.voltages[m.phaseNr] = m.voltage);
+
+    this.realtime = { totalPower: this.meters.reduce((prev, curr) => curr.power + prev, 0), 
+                      totalReactivePower: 0, 
+                      totalExportEnergy: this.meters.reduce((prev, curr) => curr.total_returned + prev, 0), 
+                      totalImportEnergy: this.meters.reduce((prev, curr) => curr.total + prev, 0),
+                      monitorStatus: 0, utcTimeStamp: new Date().getTime() };
+                      
+    this.production = this.realtime.totalPower;
+    this.consumption = this.realtime.totalReactivePower;
+  }
+
 }

package/server/smappee.js

@@ -213,6 +213,9 @@ class Smappee extends powerbase_1.PowerBase {
             this.realtime = { totalPower: message.totalPower, totalReactivePower: message.totalReactivePower,
                 totalExportEnergy: message.totalExportEnergy, totalImportEnergy: message.totalImportEnergy,
                 monitorStatus: message.monitorStatus, utcTimeStamp: message.utcTimeStamp };
+            message.voltages.forEach(v => {
+                this.voltages[v.phaseId] = v.voltage;
+            });
             message.channelPowers.forEach(p => {
                 const inx = p.publishIndex;
                 if (!this.channels[inx]) {
@@ -223,14 +226,12 @@ class Smappee extends powerbase_1.PowerBase {
                 this.channels[inx].exportEnergy = p.exportEnergy;
                 this.channels[inx].importEnergy = p.importEnergy;
                 this.channels[inx].phaseId = p.phaseId;
+                this.channels[inx].voltage = this.voltages[p.phaseId] || 0;
                 this.channels[inx].current = p.current;
                 this.channels[inx].apparentPower = p.apparentPower;
                 this.channels[inx].cosPhi = p.cosPhi;
                 this.channels[inx].formula = p.formula;
             });
-            message.voltages.forEach(v => {
-                this.voltages[v.phaseId] = v.voltage;
-            });
             this.calcProducAndConsumption(message);
         }
         // check rules