homebridge-smartsystem 7.1.6 → 7.1.7

package/package.json

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

@@ -832,22 +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()));
-            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);
+            (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}`);
@@ -858,16 +845,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);
+            (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}`);
@@ -878,22 +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()));
-            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);
+            (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}`);