homebridge-smartsystem 7.1.6 → 7.1.8

package/package.json

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

package/server/smartapp.js

@@ -762,11 +762,11 @@ class SmartApp extends webapp_1.WebApp {
         const devices = this.getDeviceList();
         if (ws.readyState === WebSocket.OPEN) {
             const json = JSON.stringify(devices);
-            (0, logger_1.log)("smartapp", "sendDeviceList -> " + json);
+            (0, logger_1.debug)("smartapp", "sendDeviceList -> " + json);
             ws.send(json);
         }
         else {
-            (0, logger_1.log)("smartapp", "sendDeviceList -> WebSocket not open (state=" + ws.readyState + ")");
+            (0, logger_1.err)("smartapp", "sendDeviceList -> WebSocket not open (state=" + ws.readyState + ")");
         }
     }
     getDeviceList() {
@@ -776,7 +776,6 @@ class SmartApp extends webapp_1.WebApp {
             if (device.unit) {
                 relayState = device.unit.status > 0;
             }
-            (0, logger_1.log)("smartapp", `getDeviceList: device "${device.name}" (id=${device.id}) powerSource=${device.powerSource} powerChannel="${device.powerChannel}" relay=${relayState}`);
             // Get power measurements based on power source
             let power = 0;
             let energy = 0;
@@ -815,7 +814,7 @@ class SmartApp extends webapp_1.WebApp {
                 power = relayState ? (device.estimatedPower || 0) : 0;
                 measured = false;
             }
-            (0, logger_1.log)("smartapp", `getDeviceList: -> power=${power} measured=${measured}`);
+            (0, logger_1.debug)("smartapp", `getDeviceList: device "${device.name}" (id=${device.id}) powerSource=${device.powerSource} powerChannel="${device.powerChannel}" relay=${relayState} power=${power} measured=${measured}`);
             return {
                 id: device.id,
                 name: device.name,
@@ -832,22 +831,9 @@ class SmartApp extends webapp_1.WebApp {
         if (!this.power.smappee)
             return null;
         try {
-            // Channel format could be "0", "0+1", "0+1+2", etc.
-            const channels = channel.split('+').map(c => parseInt(c.trim()));
-            const available = this.power.smappee.bindings.map(b => `ch=${b.channel}(${b.value})`).join(', ');
-            (0, logger_1.log)("smartapp", `getPowerFromSmappee: looking for channel(s) [${channels}], available bindings: [${available}]`);
-            let totalPower = 0;
-            for (const ch of channels) {
-                const binding = this.power.smappee.bindings.find(b => b.channel === ch.toString());
-                if (binding && binding.value !== undefined) {
-                    (0, logger_1.log)("smartapp", `getPowerFromSmappee: matched ch=${ch} -> value=${binding.value}`);
-                    totalPower += binding.value;
-                }
-                else {
-                    (0, logger_1.log)("smartapp", `getPowerFromSmappee: no match for ch=${ch}`);
-                }
-            }
-            return totalPower;
+            const power = this.power.smappee.evalPower(channel);
+            //log("smartapp", `getPowerFromSmappee: channel="${channel}" -> power=${power}`);
+            return power;
         }
         catch (e) {
             (0, logger_1.err)("smartapp", `Error getting Smappee power for channel ${channel}: ${e.message}`);
@@ -858,16 +844,9 @@ class SmartApp extends webapp_1.WebApp {
         if (!this.power.p1)
             return null;
         try {
-            // P1 meter typically has single power value
-            const available = this.power.p1.bindings.map(b => `ch=${b.channel}(${b.value})`).join(', ');
-            (0, logger_1.log)("smartapp", `getPowerFromP1: looking for channel "${channel}", available bindings: [${available}]`);
-            const binding = this.power.p1.bindings.find(b => b.channel === channel);
-            if (binding && binding.value !== undefined) {
-                (0, logger_1.log)("smartapp", `getPowerFromP1: matched ch=${channel} -> value=${binding.value}`);
-                return binding.value;
-            }
-            (0, logger_1.log)("smartapp", `getPowerFromP1: no match for channel "${channel}"`);
-            return null;
+            const power = this.power.p1.evalPower(channel);
+            //log("smartapp", `getPowerFromP1: channel="${channel}" -> power=${power}`);
+            return power;
         }
         catch (e) {
             (0, logger_1.err)("smartapp", `Error getting P1 power for channel ${channel}: ${e.message}`);
@@ -878,22 +857,9 @@ class SmartApp extends webapp_1.WebApp {
         if (!this.power.shelly)
             return null;
         try {
-            // Shelly channel format similar to Smappee
-            const channels = channel.split('+').map(c => parseInt(c.trim()));
-            const available = this.power.shelly.bindings.map(b => `ch=${b.channel}(${b.value})`).join(', ');
-            (0, logger_1.log)("smartapp", `getPowerFromShelly: looking for channel(s) [${channels}], available bindings: [${available}]`);
-            let totalPower = 0;
-            for (const ch of channels) {
-                const binding = this.power.shelly.bindings.find(b => b.channel === ch.toString());
-                if (binding && binding.value !== undefined) {
-                    (0, logger_1.log)("smartapp", `getPowerFromShelly: matched ch=${ch} -> value=${binding.value}`);
-                    totalPower += binding.value;
-                }
-                else {
-                    (0, logger_1.log)("smartapp", `getPowerFromShelly: no match for ch=${ch}`);
-                }
-            }
-            return totalPower;
+            const power = this.power.shelly.evalPower(channel);
+            //log("smartapp", `getPowerFromShelly: channel="${channel}" -> power=${power}`);
+            return power;
         }
         catch (e) {
             (0, logger_1.err)("smartapp", `Error getting Shelly power for channel ${channel}: ${e.message}`);
@@ -902,7 +868,7 @@ class SmartApp extends webapp_1.WebApp {
     }
     handleDeviceMessage(ws, data) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, logger_1.log)("smartapp", "handleDeviceMessage: received -> " + JSON.stringify(data));
+            //log("smartapp", "handleDeviceMessage: received -> " + JSON.stringify(data));
             if (!Array.isArray(data)) {
                 (0, logger_1.err)("smartapp", "WebSocket message must be an array");
                 return;
@@ -910,7 +876,6 @@ class SmartApp extends webapp_1.WebApp {
             // Process relay control commands if any
             for (const cmd of data) {
                 if (cmd.id && cmd.relay !== undefined) {
-                    (0, logger_1.log)("smartapp", `handleDeviceMessage: relay command id=${cmd.id} state=${cmd.relay}`);
                     yield this.setDeviceRelay(cmd.id, cmd.relay);
                 }
             }
@@ -923,7 +888,6 @@ class SmartApp extends webapp_1.WebApp {
             // Convert ID to node/unit (id = node * 256 + unit)
             const node = Math.floor(id / 256);
             const unit = id % 256;
-            (0, logger_1.log)("smartapp", `Setting device ${id} (node=${node}, unit=${unit}) to ${state}`);
             // Get the first master
             const master = this.system.masters[0];
             if (!master) {
@@ -942,6 +906,7 @@ class SmartApp extends webapp_1.WebApp {
                 return;
             }
             // Set the unit state
+            (0, logger_1.debug)("smartapp", `Setting device ${id} (node=${node}, unit=${unit}) to ${state}`);
             yield master.setUnitStatus(unitObj, state);
         });
     }