homebridge-smartsystem 7.0.1 → 7.0.3

package/duotecno/types.ts

@@ -251,6 +251,10 @@ export interface Switch extends UnitDef {
   value?: number | boolean | string;
   nomacro: string;
   nostop: string;
+  
+  // Track last sent status to prevent duplicate action to be triggered
+  lastSentStatus?: number | boolean;
+  lastSentValue?: number | boolean | string;
 }
 
 export const kEmptySwitch: Switch = {

package/package.json

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

@@ -1125,6 +1125,18 @@ class SmartApp extends webapp_1.WebApp {
             (0, logger_1.err)("smartapp", "Don't have unit for switch: " + swtch.unitname);
         }
         else {
+            // Check if state has actually changed (to prevent duplicate notifications/actions)
+            // Exception: Moods should always execute even if state hasn't changed (they are actions, not states)
+            const currentStatus = !!swtch.unit.status;
+            const currentValue = +swtch.unit.value;
+            const isMood = (swtch.unit.type === types_1.UnitType.kMood);
+            if (!isMood &&
+                swtch.lastSentStatus === currentStatus &&
+                swtch.lastSentValue === currentValue) {
+                (0, logger_1.debug)("smartapp", "Switch state unchanged (status=" + currentStatus + ", value=" + currentValue + "), skipping action for " + swtch.name);
+                return;
+            }
+            // Dispatch to appropriate handler
             if ((swtch.type === types_1.SwitchType.kSmappee) && (this.power.smappee)) {
                 this.power.smappee.setPlug(parseInt(swtch.plug), swtch.unit.value);
             }
@@ -1152,6 +1164,9 @@ class SmartApp extends webapp_1.WebApp {
             else {
                 (0, logger_1.err)("smartapp", "Don't know how to set a switch of type " + swtch.type);
             }
+            // Remember the state we just sent (for all switch types, including moods)
+            swtch.lastSentStatus = currentStatus;
+            swtch.lastSentValue = currentValue;
         }
     }
     ///////////

package/server/smartapp.ts

@@ -9,7 +9,7 @@
 // v2.0: mar/apr 2020
 
 import { Context, HttpResponse, WebApp } from "./webapp";
-import { Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings, Link, LinkType, kEmptyLink, Device, kEmptyDevice, PowerSource } from "../duotecno/types";
+import { Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings, Link, LinkType, kEmptyLink, Device, kEmptyDevice, PowerSource, UnitType } from "../duotecno/types";
 import { log, debug, err } from "../duotecno/logger";
 import { System } from "../duotecno/system";
 import { Node, Unit } from "../duotecno/protocol";
@@ -1237,6 +1237,20 @@ export class SmartApp extends WebApp {
       err("smartapp", "Don't have unit for switch: "+swtch.unitname);
 
     } else {
+      // Check if state has actually changed (to prevent duplicate notifications/actions)
+      // Exception: Moods should always execute even if state hasn't changed (they are actions, not states)
+      const currentStatus = !!swtch.unit.status;
+      const currentValue = +swtch.unit.value;
+      const isMood = (swtch.unit.type === UnitType.kMood);
+      
+      if (!isMood && 
+          swtch.lastSentStatus === currentStatus && 
+          swtch.lastSentValue === currentValue) {
+        debug("smartapp", "Switch state unchanged (status=" + currentStatus + ", value=" + currentValue + "), skipping action for " + swtch.name);
+        return;
+      }
+
+      // Dispatch to appropriate handler
       if ((swtch.type === SwitchType.kSmappee) && (this.power.smappee)) {
         this.power.smappee.setPlug(parseInt(swtch.plug), swtch.unit.value);
 
@@ -1264,6 +1278,10 @@ export class SmartApp extends WebApp {
       } else {
         err("smartapp", "Don't know how to set a switch of type " + swtch.type);
       }
+      
+      // Remember the state we just sent (for all switch types, including moods)
+      swtch.lastSentStatus = currentStatus;
+      swtch.lastSentValue = currentValue;
     }
   }