homebridge-smartsystem 7.1.12 → 7.1.15

package/duotecno/master.js

@@ -452,7 +452,7 @@ class Master extends base_1.Base {
         const value = protocol_1.Protocol.makeSigned(message, 4);
         if ((register >= 0) && (register < 1024)) {
             this.registers[register] = value;
-            this.log("receiveRegister(" + register + ") = " + value);
+            this.log(`<<< receiveRegister: register ${register} = ${value} (stored in master.registers[${register}])`);
         }
         else {
             this.err("Received register out of bound: " + register);
@@ -773,12 +773,14 @@ class Master extends base_1.Base {
     }
     setRegisterValue(register, value) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.log(`### setRegisterValue called: register=${register}, value=${value}, protocol=${this.protocol}`);
             if (this.protocol >= 209) {
+                this.log(`### Sending register update to ${this.getAddress()}: register ${register} = ${value}`);
                 yield this.send(protocol_1.Protocol.buildRegister(register, value));
-                this.info("set register: " + register + ", to: " + value);
+                this.log(`### Register ${register} set to ${value} successfully`);
             }
             else {
-                this.err("FC_REGISTERMAP not available before protocol v2.09");
+                this.err(`### FC_REGISTERMAP not available before protocol v2.09 (current protocol: ${this.protocol})`);
             }
         });
     }

package/package.json

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

package/server/base.js

@@ -13,6 +13,7 @@ class Base {
             this.config = config;
         else
             this.readConfig();
+        this.debug = (!!this.config.debug) || false;
         if (this.debug)
             logger_1.logSettings[this.type] = logger_1.LogLevel.debug;
         else if (logger_1.logSettings[this.type] == logger_1.LogLevel.debug)

package/server/powerbase.js

@@ -22,6 +22,12 @@ class PowerBase extends base_1.Base {
     constructor(type, system) {
         super(type);
         // called by Base: this.readConfig();
+        // Also enable "power" logger when debug is on (in addition to the specific type logger)
+        if (this.debug) {
+            const { logSettings, LogLevel } = require("../duotecno/logger");
+            logSettings["power"] = LogLevel.debug;
+            (0, logger_1.log)("power", `Debug logging enabled for power/${type}`);
+        }
         this.system = system;
         // will grow when we encounter one in the mqtt stream or if we receive a config message
         this.switches = {};
@@ -112,39 +118,50 @@ class PowerBase extends base_1.Base {
     }
     applyBindings() {
         if (this.realtimeCounter % 2 === 0) {
+            (0, logger_1.log)("power", `*** applyBindings: processing ${this.bindings.length} bindings ***`);
             // for all bindings
-            this.bindings.forEach(b => {
+            this.bindings.forEach((b, idx) => {
+                var _a;
                 const power = this.evalPower(b.channel);
-                (0, logger_1.debug)("power", `Binding channel=${b.channel}, register=${b.register}, current_value=${b.value}, calculated_power=${power}`);
-                if (this.significant(power, b.value)) {
-                    (0, logger_1.debug)("power", "APPLY to " + b.channel + " = " + b.value + " -> " + power + " for " + b.register +
-                        "): difference: " + Math.abs(b.value - power) +
-                        " > threshold: 5% =" + Math.abs(b.value * 0.05) + " > threshold: 2% =" + Math.abs(b.value * 0.02));
+                const currentValue = (_a = b.value) !== null && _a !== void 0 ? _a : NaN;
+                (0, logger_1.log)("power", `[Binding ${idx}] channel=${b.channel}, register=${b.register}, master=${b.masterAddress}:${b.masterPort}, current_value=${currentValue}, calculated_power=${power}`);
+                if (this.significant(power, currentValue)) {
+                    (0, logger_1.log)("power", `[Binding ${idx}] SIGNIFICANT CHANGE - APPLYING to register ${b.register}: ${currentValue} -> ${power}W (diff: ${Math.abs(currentValue - power)}W)`);
                     this.applyBinding(b, power)
                         .then(power => {
                         b.value = power;
-                        (0, logger_1.debug)("power", "set register " + b.register + " to " + power);
+                        (0, logger_1.log)("power", `[Binding ${idx}] SUCCESS - set register ${b.register} to ${power}W`);
                     })
-                        .catch((e) => (0, logger_1.err)(this.type, e.message || e));
+                        .catch((e) => {
+                        (0, logger_1.err)(this.type, `[Binding ${idx}] ERROR: ${e.message || e}`);
+                        (0, logger_1.log)("power", `[Binding ${idx}] Failed to set register ${b.register}: ${e.message || e}`);
+                    });
                 }
                 else {
-                    (0, logger_1.debug)("power", "NOT significant for " + b.channel + " = " + b.value + " -> " + power + " for register " + b.register +
-                        ": difference: " + Math.abs(b.value - power) +
-                        " <= threshold: 5% =" + Math.abs(b.value * 0.05) + " or 2% =" + Math.abs(b.value * 0.02));
+                    (0, logger_1.debug)("power", `[Binding ${idx}] NOT significant for channel ${b.channel} -> register ${b.register}: ${currentValue}W -> ${power}W (diff: ${Math.abs(currentValue - power)}W, threshold: ${currentValue < 1000 ? '5%=' + Math.abs(currentValue * 0.05) : '2%=' + Math.abs(currentValue * 0.02)}W)`);
                 }
             });
         }
     }
     applyBinding(binding, value) {
         return __awaiter(this, void 0, void 0, function* () {
+            (0, logger_1.log)("power", `>>> applyBinding: looking for master ${binding.masterAddress}:${binding.masterPort}`);
             const master = this.system.findMaster(binding.masterAddress, binding.masterPort);
             if (master) {
+                (0, logger_1.log)("power", `>>> applyBinding: MASTER FOUND (${master.getName()}), calling setRegisterValue(${binding.register}, ${value})`);
                 yield master.setRegisterValue(binding.register, value);
+                (0, logger_1.log)("power", `>>> applyBinding: setRegisterValue completed successfully for register ${binding.register}`);
                 return value;
             }
             else if ((!binding.masterAddress) || (binding.register)) {
-                throw new Error("***** MASTER NOT FOUND for binding for value " + value + " to " + binding.masterAddress + ":" + binding.masterPort + " - register = " + binding.register + " *****");
-            } // else empty binding -> no error 
+                const errMsg = "***** MASTER NOT FOUND for binding for value " + value + " to " + binding.masterAddress + ":" + binding.masterPort + " - register = " + binding.register + " *****";
+                (0, logger_1.log)("power", errMsg);
+                throw new Error(errMsg);
+            }
+            else {
+                (0, logger_1.log)("power", `>>> applyBinding: empty binding (no master or register), skipping`);
+                return value;
+            }
         });
     }
     /////////////////////