homebridge-smartsystem 7.1.5 → 7.1.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "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

@@ -761,8 +761,12 @@ class SmartApp extends webapp_1.WebApp {
     sendDeviceList(ws) {
         const devices = this.getDeviceList();
         if (ws.readyState === WebSocket.OPEN) {
-            (0, logger_1.debug)("smartapp", devices);
-            ws.send(JSON.stringify(devices));
+            const json = JSON.stringify(devices);
+            (0, logger_1.log)("smartapp", "sendDeviceList -> " + json);
+            ws.send(json);
+        }
+        else {
+            (0, logger_1.log)("smartapp", "sendDeviceList -> WebSocket not open (state=" + ws.readyState + ")");
         }
     }
     getDeviceList() {
@@ -772,6 +776,7 @@ 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;
@@ -810,6 +815,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}`);
             return {
                 id: device.id,
                 name: device.name,
@@ -826,16 +832,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()));
-            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) {
-                    totalPower += binding.value;
-                }
-            }
-            return totalPower;
+            const power = this.power.smappee.evalPower(channel);
+            (0, logger_1.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}`);
@@ -846,12 +845,9 @@ class SmartApp extends webapp_1.WebApp {
         if (!this.power.p1)
             return null;
         try {
-            // P1 meter typically has single power value
-            const binding = this.power.p1.bindings.find(b => b.channel === channel);
-            if (binding && binding.value !== undefined) {
-                return binding.value;
-            }
-            return null;
+            const power = this.power.p1.evalPower(channel);
+            (0, logger_1.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}`);
@@ -862,16 +858,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()));
-            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) {
-                    totalPower += binding.value;
-                }
-            }
-            return totalPower;
+            const power = this.power.shelly.evalPower(channel);
+            (0, logger_1.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}`);
@@ -880,6 +869,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));
             if (!Array.isArray(data)) {
                 (0, logger_1.err)("smartapp", "WebSocket message must be an array");
                 return;
@@ -887,6 +877,7 @@ 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);
                 }
             }