homebridge-securitysystem 10.0.0-beta.2 → 10.0.0-beta.4

package/dist/conditions/already-triggered-condition.d.ts

@@ -6,5 +6,5 @@ import { Condition } from './condition.js';
  */
 export declare class AlreadyTriggeredCondition extends Condition {
     readonly name = "already-triggered";
-    evaluate({ state, value }: ConditionContext): boolean;
+    evaluate({ state, value, log }: ConditionContext): boolean;
 }

package/dist/conditions/already-triggered-condition.js

@@ -6,11 +6,15 @@ import { Condition } from './condition.js';
  */
 export class AlreadyTriggeredCondition extends Condition {
     name = 'already-triggered';
-    evaluate({ state, value }) {
+    evaluate({ state, value, log }) {
         if (!value) {
             return false;
         }
-        return state.currentState === SecurityState.TRIGGERED;
+        const blocked = state.currentState === SecurityState.TRIGGERED;
+        if (blocked) {
+            log.warn('Security System (Already triggered): alarm is already active');
+        }
+        return blocked;
     }
 }
 //# sourceMappingURL=already-triggered-condition.js.map

package/dist/conditions/already-triggered-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"already-triggered-condition.js","sourceRoot":"","sources":["../../src/conditions/already-triggered-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,SAAS;IAC7C,IAAI,GAAG,mBAAmB,CAAC;IAEpC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAoB;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,SAAS,CAAC;IACxD,CAAC;CACF"}
+{"version":3,"file":"already-triggered-condition.js","sourceRoot":"","sources":["../../src/conditions/already-triggered-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,SAAS;IAC7C,IAAI,GAAG,mBAAmB,CAAC;IAEpC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAoB;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,SAAS,CAAC;QAC/D,IAAI,OAAO,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/conditions/arming-in-progress-condition.d.ts

@@ -6,5 +6,5 @@ import { Condition } from './condition.js';
  */
 export declare class ArmingInProgressCondition extends Condition {
     readonly name = "arming-in-progress";
-    evaluate({ state, value }: ConditionContext): boolean;
+    evaluate({ state, value, log }: ConditionContext): boolean;
 }

package/dist/conditions/arming-in-progress-condition.js

@@ -5,11 +5,15 @@ import { Condition } from './condition.js';
  */
 export class ArmingInProgressCondition extends Condition {
     name = 'arming-in-progress';
-    evaluate({ state, value }) {
+    evaluate({ state, value, log }) {
         if (!value) {
             return false;
         }
-        return state.isArming;
+        if (state.isArming) {
+            log.warn('Trip Switch (Still arming): arm delay countdown is still in progress');
+            return true;
+        }
+        return false;
     }
 }
 //# sourceMappingURL=arming-in-progress-condition.js.map

package/dist/conditions/arming-in-progress-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"arming-in-progress-condition.js","sourceRoot":"","sources":["../../src/conditions/arming-in-progress-condition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,SAAS;IAC7C,IAAI,GAAG,oBAAoB,CAAC;IAErC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAoB;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC;CACF"}
+{"version":3,"file":"arming-in-progress-condition.js","sourceRoot":"","sources":["../../src/conditions/arming-in-progress-condition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,SAAS;IAC7C,IAAI,GAAG,oBAAoB,CAAC;IAErC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAoB;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;YACjF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/dist/conditions/double-knock-condition.d.ts

@@ -10,13 +10,15 @@ import { Condition } from './condition.js';
  */
 export declare class DoubleKnockCondition extends Condition {
     private readonly onFirstKnock;
+    private readonly onCancelTimer;
     readonly name = "double-knock";
     /**
      * @param onFirstKnock Called when the first knock is detected.
      *   The callback receives the window duration in seconds and a reset function
      *   to invoke when the window expires.
+     * @param onCancelTimer Called on the second knock to cancel the running window timer.
      */
-    constructor(onFirstKnock: (seconds: number, onExpire: () => void) => void);
-    evaluate({ state, options, value, origin }: ConditionContext): boolean;
+    constructor(onFirstKnock: (seconds: number, onExpire: () => void) => void, onCancelTimer: () => void);
+    evaluate({ state, options, value, origin, log }: ConditionContext): boolean;
     private resolveWindow;
 }

package/dist/conditions/double-knock-condition.js

@@ -12,17 +12,20 @@ import { Condition } from './condition.js';
  */
 export class DoubleKnockCondition extends Condition {
     onFirstKnock;
+    onCancelTimer;
     name = 'double-knock';
     /**
      * @param onFirstKnock Called when the first knock is detected.
      *   The callback receives the window duration in seconds and a reset function
      *   to invoke when the window expires.
+     * @param onCancelTimer Called on the second knock to cancel the running window timer.
      */
-    constructor(onFirstKnock) {
+    constructor(onFirstKnock, onCancelTimer) {
         super();
         this.onFirstKnock = onFirstKnock;
+        this.onCancelTimer = onCancelTimer;
     }
-    evaluate({ state, options, value, origin }) {
+    evaluate({ state, options, value, origin, log }) {
         if (!value || !options.doubleKnock) {
             return false;
         }
@@ -37,12 +40,9 @@ export class DoubleKnockCondition extends Condition {
             return false;
         }
         if (state.isKnocked) {
-            // Second knock — clear the flag and allow through.
+            // Second knock — clear the flag and cancel the window timer, then allow through.
             state.isKnocked = false;
-            if (state.doubleKnockTimeout !== null) {
-                clearTimeout(state.doubleKnockTimeout);
-                state.doubleKnockTimeout = null;
-            }
+            this.onCancelTimer();
             return false;
         }
         // First knock — block and schedule expiry.
@@ -50,8 +50,9 @@ export class DoubleKnockCondition extends Condition {
         const seconds = this.resolveWindow(state.currentState, options);
         this.onFirstKnock(seconds, () => {
             state.isKnocked = false;
-            state.doubleKnockTimeout = null;
+            log.info('Trip Switch (Reset): double-knock window expired without second activation');
         });
+        log.warn('Trip Switch (Knock): double-knock is required, waiting for second activation');
         return true;
     }
     resolveWindow(currentState, options) {

package/dist/conditions/double-knock-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"double-knock-condition.js","sourceRoot":"","sources":["../../src/conditions/double-knock-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAS9B;IARV,IAAI,GAAG,cAAc,CAAC;IAE/B;;;;OAIG;IACH,YACmB,YAA6D;QAE9E,KAAK,EAAE,CAAC;QAFS,iBAAY,GAAZ,YAAY,CAAiD;IAGhF,CAAC;IAED,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAoB;QAC1D,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,MAAM,KAAK,UAAU,CAAC,eAAe,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,mDAAmD;YACnD,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,IAAI,KAAK,CAAC,kBAAkB,KAAK,IAAI,EAAE,CAAC;gBACtC,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACvC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAClC,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,2CAA2C;QAC3C,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE;YAC9B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CACnB,YAA2B,EAC3B,OAAoC;QAEpC,IAAI,YAAY,KAAK,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACnF,OAAO,OAAO,CAAC,sBAAsB,CAAC;QACxC,CAAC;QACD,IAAI,YAAY,KAAK,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACnF,OAAO,OAAO,CAAC,sBAAsB,CAAC;QACxC,CAAC;QACD,IAAI,YAAY,KAAK,aAAa,CAAC,KAAK,IAAI,OAAO,CAAC,uBAAuB,KAAK,IAAI,EAAE,CAAC;YACrF,OAAO,OAAO,CAAC,uBAAuB,CAAC;QACzC,CAAC;QACD,OAAO,OAAO,CAAC,kBAAkB,CAAC;IACpC,CAAC;CACF"}
+{"version":3,"file":"double-knock-condition.js","sourceRoot":"","sources":["../../src/conditions/double-knock-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAU9B;IACA;IAVV,IAAI,GAAG,cAAc,CAAC;IAE/B;;;;;OAKG;IACH,YACmB,YAA6D,EAC7D,aAAyB;QAE1C,KAAK,EAAE,CAAC;QAHS,iBAAY,GAAZ,YAAY,CAAiD;QAC7D,kBAAa,GAAb,aAAa,CAAY;IAG5C,CAAC;IAED,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAoB;QAC/D,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,MAAM,KAAK,UAAU,CAAC,eAAe,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,iFAAiF;YACjF,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,2CAA2C;QAC3C,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEhE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE;YAC9B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CACnB,YAA2B,EAC3B,OAAoC;QAEpC,IAAI,YAAY,KAAK,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACnF,OAAO,OAAO,CAAC,sBAAsB,CAAC;QACxC,CAAC;QACD,IAAI,YAAY,KAAK,aAAa,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACnF,OAAO,OAAO,CAAC,sBAAsB,CAAC;QACxC,CAAC;QACD,IAAI,YAAY,KAAK,aAAa,CAAC,KAAK,IAAI,OAAO,CAAC,uBAAuB,KAAK,IAAI,EAAE,CAAC;YACrF,OAAO,OAAO,CAAC,uBAAuB,CAAC;QACzC,CAAC;QACD,OAAO,OAAO,CAAC,kBAAkB,CAAC;IACpC,CAAC;CACF"}

package/dist/conditions/not-armed-condition.d.ts

@@ -6,5 +6,5 @@ import { Condition } from './condition.js';
  */
 export declare class NotArmedCondition extends Condition {
     readonly name = "not-armed";
-    evaluate({ state, options, value, origin }: ConditionContext): boolean;
+    evaluate({ state, options, value, origin, log }: ConditionContext): boolean;
 }

package/dist/conditions/not-armed-condition.js

@@ -7,14 +7,18 @@ import { Condition } from './condition.js';
  */
 export class NotArmedCondition extends Condition {
     name = 'not-armed';
-    evaluate({ state, options, value, origin }) {
+    evaluate({ state, options, value, origin, log }) {
         if (!value) {
             return false;
         }
         const isDisarmed = state.currentState === SecurityState.OFF;
         const isNotOverridingOff = !options.overrideOff;
         const isNotOverrideSwitch = origin !== OriginType.OVERRIDE_SWITCH;
-        return isDisarmed && isNotOverridingOff && isNotOverrideSwitch;
+        const blocked = isDisarmed && isNotOverridingOff && isNotOverrideSwitch;
+        if (blocked) {
+            log.warn('Trip Switch (Not armed): system is disarmed and override is not enabled');
+        }
+        return blocked;
     }
 }
 //# sourceMappingURL=not-armed-condition.js.map

package/dist/conditions/not-armed-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"not-armed-condition.js","sourceRoot":"","sources":["../../src/conditions/not-armed-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IACrC,IAAI,GAAG,WAAW,CAAC;IAE5B,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAoB;QAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,GAAG,CAAC;QAC5D,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;QAChD,MAAM,mBAAmB,GAAG,MAAM,KAAK,UAAU,CAAC,eAAe,CAAC;QAElE,OAAO,UAAU,IAAI,kBAAkB,IAAI,mBAAmB,CAAC;IACjE,CAAC;CACF"}
+{"version":3,"file":"not-armed-condition.js","sourceRoot":"","sources":["../../src/conditions/not-armed-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IACrC,IAAI,GAAG,WAAW,CAAC;IAE5B,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAoB;QAC/D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,KAAK,aAAa,CAAC,GAAG,CAAC;QAC5D,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;QAChD,MAAM,mBAAmB,GAAG,MAAM,KAAK,UAAU,CAAC,eAAe,CAAC;QAElE,MAAM,OAAO,GAAG,UAAU,IAAI,kBAAkB,IAAI,mBAAmB,CAAC;QACxE,IAAI,OAAO,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/conditions/trigger-already-running-condition.d.ts

@@ -0,0 +1,10 @@
+import type { ConditionContext } from '../interfaces/condition-context-interface.js';
+import { Condition } from './condition.js';
+/**
+ * Blocks a trip activation when the trigger-delay countdown is already running.
+ * Prevents stacking multiple trigger events during the pre-alarm window.
+ */
+export declare class TriggerAlreadyRunningCondition extends Condition {
+    readonly name = "trigger-already-running";
+    evaluate({ state, value, log }: ConditionContext): boolean;
+}

package/dist/conditions/trigger-already-running-condition.js

@@ -0,0 +1,19 @@
+import { Condition } from './condition.js';
+/**
+ * Blocks a trip activation when the trigger-delay countdown is already running.
+ * Prevents stacking multiple trigger events during the pre-alarm window.
+ */
+export class TriggerAlreadyRunningCondition extends Condition {
+    name = 'trigger-already-running';
+    evaluate({ state, value, log }) {
+        if (!value) {
+            return false;
+        }
+        if (state.isTripping) {
+            log.warn('Security System (Already tripped): trigger delay countdown is already running');
+            return true;
+        }
+        return false;
+    }
+}
+//# sourceMappingURL=trigger-already-running-condition.js.map

package/dist/conditions/trigger-already-running-condition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trigger-already-running-condition.js","sourceRoot":"","sources":["../../src/conditions/trigger-already-running-condition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,MAAM,OAAO,8BAA+B,SAAQ,SAAS;IAClD,IAAI,GAAG,yBAAyB,CAAC;IAE1C,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAoB;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;YAC1F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/dist/handlers/state-handler.d.ts

@@ -8,10 +8,13 @@ import type { SecuritySystemOptions } from '../interfaces/options-interface.js';
 import type { EventBusService } from '../services/event-bus-service.js';
 import type { StorageService } from '../services/storage-service.js';
 import type { AudioService } from '../services/audio-service.js';
-import type { TripHandler } from './trip-handler.js';
-import type { SwitchHandler } from './switch-handler.js';
 import type { SensorHandler } from './sensor-handler.js';
-/** Manages the core security-system state machine: arming, triggering, and resetting. */
+import type { TimerManager } from '../timers/timer-manager.js';
+/**
+ * Manages the core security-system state machine: arming, triggering, and resetting.
+ * Cross-handler side effects are signalled via the event bus so that this class has
+ * no direct dependencies on TripHandler or SwitchHandler.
+ */
 export declare class StateHandler {
     private readonly services;
     private readonly state;
@@ -21,15 +24,17 @@ export declare class StateHandler {
     private readonly bus;
     private readonly storageService;
     private readonly audio;
-    private tripHandler;
-    private switchHandler;
-    private sensorHandler;
-    constructor(services: ServiceRegistry, state: SystemState, options: SecuritySystemOptions, Characteristic: CharacteristicConstructor, log: Logging, bus: EventBusService, storageService: StorageService, audio: AudioService);
-    setHandlers(trip: TripHandler, sw: SwitchHandler, sensor: SensorHandler): void;
+    private readonly timers;
+    private readonly sensorHandler;
+    constructor(services: ServiceRegistry, state: SystemState, options: SecuritySystemOptions, Characteristic: CharacteristicConstructor, log: Logging, bus: EventBusService, storageService: StorageService, audio: AudioService, timers: TimerManager, sensorHandler: SensorHandler);
     setCurrentState(state: SecurityState, origin: OriginType): void;
     updateTargetState(state: SecurityState, origin: OriginType, delay: number): boolean;
-    getArmingSeconds(state: SecurityState): number;
+    getArmingSeconds(targetState: SecurityState): number;
     resetTimers(): void;
+    /** Returns true while the trigger delay is counting down (trip switch is active). */
+    isTripping(): boolean;
+    /** Checks whether arming is currently blocked by an arming-lock switch. */
+    isArmingLocked(targetState: SecurityState): boolean;
     getAvailableTargetStates(): SecurityState[];
     logMode(type: string, state: SecurityState | string): void;
     private isBadTargetState;

package/dist/handlers/state-handler.js

@@ -3,7 +3,12 @@ import { OriginType } from '../types/origin-type.js';
 import { stateToMode, capitalise } from '../utils/state-util.js';
 import { modeToState } from '../utils/state-util.js';
 import { EventType } from '../types/event-type.js';
-/** Manages the core security-system state machine: arming, triggering, and resetting. */
+import { getArmingSeconds } from '../utils/arming-util.js';
+/**
+ * Manages the core security-system state machine: arming, triggering, and resetting.
+ * Cross-handler side effects are signalled via the event bus so that this class has
+ * no direct dependencies on TripHandler or SwitchHandler.
+ */
 export class StateHandler {
     services;
     state;
@@ -13,10 +18,9 @@ export class StateHandler {
     bus;
     storageService;
     audio;
-    tripHandler;
-    switchHandler;
+    timers;
     sensorHandler;
-    constructor(services, state, options, Characteristic, log, bus, storageService, audio) {
+    constructor(services, state, options, Characteristic, log, bus, storageService, audio, timers, sensorHandler) {
         this.services = services;
         this.state = state;
         this.options = options;
@@ -25,11 +29,8 @@ export class StateHandler {
         this.bus = bus;
         this.storageService = storageService;
         this.audio = audio;
-    }
-    setHandlers(trip, sw, sensor) {
-        this.tripHandler = trip;
-        this.switchHandler = sw;
-        this.sensorHandler = sensor;
+        this.timers = timers;
+        this.sensorHandler = sensorHandler;
     }
     // ── Public API ─────────────────────────────────────────────────────────────
     setCurrentState(state, origin) {
@@ -67,66 +68,36 @@ export class StateHandler {
         this.state.isArming = true;
         this.handleArmingState();
         this.log.info(`Arm delay (${armSeconds}s)`);
-        this.state.armTimeout = setTimeout(() => {
-            this.state.armTimeout = null;
+        this.timers.setArmTimer(armSeconds * 1000, () => {
             this.state.isArming = false;
             this.setCurrentState(state, origin);
-        }, armSeconds * 1000);
+        });
         return true;
     }
-    getArmingSeconds(state) {
-        const isTriggered = this.state.currentState === SecurityState.TRIGGERED;
-        const isOff = state === SecurityState.OFF;
-        if (isTriggered || isOff) {
-            return 0;
-        }
-        if (state === SecurityState.HOME && this.options.homeArmSeconds !== null) {
-            return this.options.homeArmSeconds;
-        }
-        if (state === SecurityState.AWAY && this.options.awayArmSeconds !== null) {
-            return this.options.awayArmSeconds;
-        }
-        if (state === SecurityState.NIGHT && this.options.nightArmSeconds !== null) {
-            return this.options.nightArmSeconds;
-        }
-        return this.options.armSeconds;
+    getArmingSeconds(targetState) {
+        return getArmingSeconds(this.state, this.options, targetState);
     }
     resetTimers() {
-        if (this.state.triggerTimeout) {
-            clearTimeout(this.state.triggerTimeout);
-            this.state.triggerTimeout = null;
-            this.log.debug('Trigger timeout (Cleared)');
-        }
-        if (this.state.armTimeout) {
-            clearTimeout(this.state.armTimeout);
-            this.state.armTimeout = null;
-            this.log.debug('Arming timeout (Cleared)');
-        }
-        if (this.state.triggeredMotionSensorInterval) {
-            clearInterval(this.state.triggeredMotionSensorInterval);
-            this.state.triggeredMotionSensorInterval = null;
-            this.log.debug('Triggered interval (Cleared)');
-        }
-        if (this.state.trippedMotionSensorInterval) {
-            clearInterval(this.state.trippedMotionSensorInterval);
-            this.state.trippedMotionSensorInterval = null;
-            this.log.debug('Tripped interval (Cleared)');
-        }
-        if (this.state.doubleKnockTimeout) {
-            clearTimeout(this.state.doubleKnockTimeout);
-            this.state.doubleKnockTimeout = null;
-            this.log.debug('Double-knock timeout (Cleared)');
-        }
-        if (this.state.pauseTimeout) {
-            clearTimeout(this.state.pauseTimeout);
-            this.state.pauseTimeout = null;
-            this.log.debug('Pause timeout (Cleared)');
-        }
-        if (this.state.resetTimeout) {
-            clearTimeout(this.state.resetTimeout);
-            this.state.resetTimeout = null;
-            this.log.debug('Reset timeout (Cleared)');
+        this.timers.clearAll();
+    }
+    /** Returns true while the trigger delay is counting down (trip switch is active). */
+    isTripping() {
+        return this.state.isTripping;
+    }
+    /** Checks whether arming is currently blocked by an arming-lock switch. */
+    isArmingLocked(targetState) {
+        if (this.services.armingLockSwitchService.getCharacteristic(this.Characteristic.On).value) {
+            return true;
         }
+        const modeMap = {
+            [SecurityState.HOME]: 'armingLockHomeSwitchService',
+            [SecurityState.AWAY]: 'armingLockAwaySwitchService',
+            [SecurityState.NIGHT]: 'armingLockNightSwitchService',
+        };
+        const svcKey = modeMap[targetState];
+        return svcKey
+            ? Boolean(this.services[svcKey].getCharacteristic(this.Characteristic.On).value)
+            : false;
     }
     getAvailableTargetStates() {
         const all = [SecurityState.HOME, SecurityState.AWAY, SecurityState.NIGHT, SecurityState.OFF];
@@ -150,7 +121,7 @@ export class StateHandler {
             return true;
         }
         const hasLock = this.options.armingLockSwitch || this.options.armingLockSwitches;
-        if (state !== SecurityState.OFF && hasLock && this.switchHandler.isArmingLocked(state)) {
+        if (state !== SecurityState.OFF && hasLock && this.isArmingLocked(state)) {
             this.log.warn('Arming lock (Not allowed)');
             return true;
         }
@@ -158,10 +129,11 @@ export class StateHandler {
     }
     handleTargetStateChange(origin) {
         this.resetTimers();
-        this.tripHandler.resetTripSwitches();
+        // Notify handlers to reset their displayed state (bus is synchronous).
+        this.bus.emit(EventType.RESET_TRIP_SWITCHES, {});
         this.sensorHandler.resetTrippedMotionSensor();
-        this.switchHandler.resetModeSwitches();
-        this.switchHandler.updateModeSwitches();
+        this.bus.emit(EventType.RESET_MODE_SWITCHES, {});
+        this.bus.emit(EventType.UPDATE_MODE_SWITCHES, {});
         this.bus.emit(EventType.TARGET_CHANGED, { state: this.state.targetState, origin });
         if (this.state.currentState === SecurityState.TRIGGERED) {
             this.sensorHandler.pulseResetMotionSensor();
@@ -175,19 +147,16 @@ export class StateHandler {
                 return;
             }
         }
-        this.tripHandler.resetTripSwitches();
+        // Notify TripHandler to reset trip switches on any state change.
+        this.bus.emit(EventType.RESET_TRIP_SWITCHES, {});
         this.bus.emit(EventType.CURRENT_CHANGED, { state: this.state.currentState, origin });
     }
     handleTriggeredState() {
-        if (this.state.trippedMotionSensorInterval) {
-            clearInterval(this.state.trippedMotionSensorInterval);
-            this.state.trippedMotionSensorInterval = null;
-        }
+        this.timers.clearTrippedInterval();
         if (this.options.triggeredMotionSensor) {
-            this.state.triggeredMotionSensorInterval = setInterval(() => this.sensorHandler.pulseTriggeredMotionSensor(), this.options.triggeredMotionSensorSeconds * 1000);
+            this.timers.setTriggeredInterval(this.options.triggeredMotionSensorSeconds * 1000, () => this.sensorHandler.pulseTriggeredMotionSensor());
         }
-        this.state.resetTimeout = setTimeout(() => {
-            this.state.resetTimeout = null;
+        this.timers.setResetTimer(this.options.resetMinutes * 60 * 1000, () => {
             this.log.info('Reset (Finished)');
             this.sensorHandler.pulseResetMotionSensor();
             if (this.options.resetOffFlow) {
@@ -196,7 +165,7 @@ export class StateHandler {
             else {
                 this.setCurrentState(this.state.targetState, OriginType.EXTERNAL);
             }
-        }, this.options.resetMinutes * 60 * 1000);
+        });
     }
     handleArmingState() {
         this.sensorHandler.updateArmingMotionSensor(true);

package/dist/handlers/state-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-handler.js","sourceRoot":"","sources":["../../src/handlers/state-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state-handler.js","sourceRoot":"","sources":["../../src/handlers/state-handler.ts"],"names":[],"mappings":"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"}

package/dist/handlers/switch-handler.d.ts

@@ -5,22 +5,29 @@ import type { ServiceRegistry } from '../interfaces/service-registry-interface.j
 import type { SystemState } from '../interfaces/system-state-interface.js';
 import type { SecuritySystemOptions } from '../interfaces/options-interface.js';
 import type { StateHandler } from './state-handler.js';
-/** Handles all mode switches, arming-lock switches, and the pause/extended switches. */
+import type { TimerManager } from '../timers/timer-manager.js';
+import type { EventBusService } from '../services/event-bus-service.js';
+/**
+ * Handles all mode switches and the pause/extended switches.
+ * Calls StateHandler directly (one-way dependency — no cycle).
+ * Subscribes to bus events emitted by StateHandler to reset its own display state.
+ */
 export declare class SwitchHandler {
     private readonly services;
     private readonly state;
     private readonly options;
     private readonly Characteristic;
     private readonly log;
-    private stateHandler;
-    constructor(services: ServiceRegistry, state: SystemState, options: SecuritySystemOptions, Characteristic: CharacteristicConstructor, log: Logging);
-    setStateHandler(handler: StateHandler): void;
+    private readonly timers;
+    private readonly stateHandler;
+    constructor(services: ServiceRegistry, state: SystemState, options: SecuritySystemOptions, Characteristic: CharacteristicConstructor, log: Logging, timers: TimerManager, stateHandler: StateHandler);
+    /** Register bus listeners so StateHandler can signal display resets without importing this class. */
+    subscribeToStateEvents(bus: EventBusService): void;
     setModeSwitch(mode: SecurityState, value: boolean): number | null;
     setModeOffSwitch(value: boolean): number | null;
     setModeAwayExtendedSwitch(value: boolean): number | null;
     setModePauseSwitch(value: boolean): number | null;
     updateArmingLock(mode: string, value: boolean): boolean;
-    isArmingLocked(targetState: SecurityState): boolean;
     resetModeSwitches(): void;
     updateModeSwitches(): void;
     private logArmingLock;

package/dist/handlers/switch-handler.js

@@ -2,23 +2,33 @@ import { SecurityState } from '../types/security-state-type.js';
 import { HK_NOT_ALLOWED_IN_CURRENT_STATE } from '../constants/homekit-constant.js';
 import { OriginType } from '../types/origin-type.js';
 import { capitalise } from '../utils/state-util.js';
-/** Handles all mode switches, arming-lock switches, and the pause/extended switches. */
+import { EventType } from '../types/event-type.js';
+/**
+ * Handles all mode switches and the pause/extended switches.
+ * Calls StateHandler directly (one-way dependency — no cycle).
+ * Subscribes to bus events emitted by StateHandler to reset its own display state.
+ */
 export class SwitchHandler {
     services;
     state;
     options;
     Characteristic;
     log;
+    timers;
     stateHandler;
-    constructor(services, state, options, Characteristic, log) {
+    constructor(services, state, options, Characteristic, log, timers, stateHandler) {
         this.services = services;
         this.state = state;
         this.options = options;
         this.Characteristic = Characteristic;
         this.log = log;
+        this.timers = timers;
+        this.stateHandler = stateHandler;
     }
-    setStateHandler(handler) {
-        this.stateHandler = handler;
+    /** Register bus listeners so StateHandler can signal display resets without importing this class. */
+    subscribeToStateEvents(bus) {
+        bus.on(EventType.RESET_MODE_SWITCHES, () => this.resetModeSwitches());
+        bus.on(EventType.UPDATE_MODE_SWITCHES, () => this.updateModeSwitches());
     }
     // ── Mode switches ──────────────────────────────────────────────────────────
     setModeSwitch(mode, value) {
@@ -58,19 +68,16 @@ export class SwitchHandler {
             this.state.pausedCurrentState = this.state.currentState;
             this.stateHandler.updateTargetState(SecurityState.OFF, OriginType.INTERNAL, 0);
             if (this.options.pauseMinutes !== 0) {
-                this.state.pauseTimeout = setTimeout(() => {
+                this.timers.setPauseTimer(this.options.pauseMinutes * 60 * 1000, () => {
                     this.log.info('Mode pause (Finished)');
                     const prev = this.state.pausedCurrentState ?? this.state.defaultState;
                     this.stateHandler.updateTargetState(prev, OriginType.INTERNAL, this.stateHandler.getArmingSeconds(prev));
-                }, this.options.pauseMinutes * 60 * 1000);
+                });
             }
         }
         else {
             this.log.info('Mode pause (Cancelled)');
-            if (this.state.pauseTimeout !== null) {
-                clearTimeout(this.state.pauseTimeout);
-                this.state.pauseTimeout = null;
-            }
+            this.timers.clearPauseTimer();
             const prev = this.state.pausedCurrentState ?? this.state.defaultState;
             this.stateHandler.updateTargetState(prev, OriginType.INTERNAL, this.stateHandler.getArmingSeconds(prev));
         }
@@ -93,18 +100,6 @@ export class SwitchHandler {
         this.services[key].getCharacteristic(this.Characteristic.On).updateValue(value);
         return true;
     }
-    isArmingLocked(targetState) {
-        if (this.services.armingLockSwitchService.getCharacteristic(this.Characteristic.On).value) {
-            return true;
-        }
-        const modeMap = {
-            [SecurityState.HOME]: 'armingLockHomeSwitchService',
-            [SecurityState.AWAY]: 'armingLockAwaySwitchService',
-            [SecurityState.NIGHT]: 'armingLockNightSwitchService',
-        };
-        const svcKey = modeMap[targetState];
-        return svcKey ? Boolean(this.services[svcKey].getCharacteristic(this.Characteristic.On).value) : false;
-    }
     // ── Mode switch display ────────────────────────────────────────────────────
     resetModeSwitches() {
         const switches = [