@riddix/hamh 2.1.0-alpha.450 → 2.1.0-alpha.452

package/dist/backend/cli.js

@@ -165874,10 +165874,254 @@ function transactionIsOffline(context) {
 
 // src/matter/behaviors/fan-control-server.ts
 init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/on-off-server.ts
+init_esm();
+init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/level-control-server.ts
+init_esm();
+init_home_assistant_entity_behavior();
+var lastTurnOnTimestamps = /* @__PURE__ */ new Map();
+var optimisticLevelState = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS = 3e3;
+var OPTIMISTIC_TOLERANCE = 5;
+function notifyLightTurnedOn(entityId) {
+  lastTurnOnTimestamps.set(entityId, Date.now());
+}
+var logger158 = Logger.get("LevelControlServer");
+var FeaturedBase3 = LevelControlServer.with("OnOff", "Lighting");
+var LevelControlServerBase = class extends FeaturedBase3 {
+  pendingTransitionTime;
+  async initialize() {
+    if (this.state.currentLevel == null) {
+      this.state.currentLevel = 1;
+    }
+    if (this.state.minLevel == null) {
+      this.state.minLevel = 1;
+    }
+    if (this.state.maxLevel == null) {
+      this.state.maxLevel = 254;
+    }
+    this.state.onLevel = null;
+    logger158.debug(`initialize: calling super.initialize()`);
+    try {
+      await super.initialize();
+      logger158.debug(`initialize: super.initialize() completed successfully`);
+    } catch (error) {
+      logger158.error(`initialize: super.initialize() FAILED:`, error);
+      throw error;
+    }
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update(entity) {
+    if (!entity.state) {
+      return;
+    }
+    const { state } = entity;
+    const config10 = this.state.config;
+    const minLevel = 1;
+    const maxLevel = 254;
+    const levelRange = maxLevel - minLevel;
+    const currentLevelPercent = config10.getValuePercent(state, this.agent);
+    let currentLevel = currentLevelPercent != null ? Math.round(currentLevelPercent * levelRange + minLevel) : null;
+    if (currentLevel != null) {
+      currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
+    }
+    const optimistic = optimisticLevelState.get(entity.entity_id);
+    if (optimistic != null && currentLevel != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS) {
+        optimisticLevelState.delete(entity.entity_id);
+      } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE) {
+        optimisticLevelState.delete(entity.entity_id);
+      } else {
+        currentLevel = null;
+      }
+    }
+    applyPatchState(this.state, {
+      minLevel,
+      maxLevel,
+      ...currentLevel != null ? { currentLevel } : {}
+    });
+  }
+  // Fix for Google Home (#41): it sends moveToLevel/moveToLevelWithOnOff/step commands
+  // with transitionTime as null or completely omitted. The TLV schema is patched at startup
+  // (see patch-level-control-tlv.ts) to accept omitted fields. Here we default to 0 (instant).
+  async moveToLevel(request) {
+    if (request.transitionTime == null) {
+      request.transitionTime = 0;
+    }
+    this.pendingTransitionTime = request.transitionTime;
+    return super.moveToLevel(request);
+  }
+  async moveToLevelWithOnOff(request) {
+    if (request.transitionTime == null) {
+      request.transitionTime = 0;
+    }
+    this.pendingTransitionTime = request.transitionTime;
+    return super.moveToLevelWithOnOff(request);
+  }
+  step(request) {
+    if (request.transitionTime == null) {
+      request.transitionTime = 0;
+    }
+    return super.step(request);
+  }
+  stepWithOnOff(request) {
+    if (request.transitionTime == null) {
+      request.transitionTime = 0;
+    }
+    return super.stepWithOnOff(request);
+  }
+  moveToLevelLogic(level) {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const config10 = this.state.config;
+    const entityId = homeAssistant.entity.entity_id;
+    const levelRange = this.maxLevel - this.minLevel;
+    const levelPercent = (level - this.minLevel) / levelRange;
+    const lastTurnOn = lastTurnOnTimestamps.get(entityId);
+    const timeSinceTurnOn = lastTurnOn ? Date.now() - lastTurnOn : Infinity;
+    const isMaxBrightness = level >= this.maxLevel;
+    if (isMaxBrightness && timeSinceTurnOn < 200) {
+      logger158.debug(
+        `[${entityId}] Ignoring moveToLevel(${level}) - Alexa brightness reset detected (${timeSinceTurnOn}ms after turn-on)`
+      );
+      return;
+    }
+    const current = config10.getValuePercent(
+      homeAssistant.entity.state,
+      this.agent
+    );
+    if (levelPercent === current) {
+      return;
+    }
+    const action = config10.moveToLevelPercent(levelPercent, this.agent);
+    const transitionTimeTenths = this.pendingTransitionTime;
+    this.pendingTransitionTime = void 0;
+    if (transitionTimeTenths && transitionTimeTenths > 0) {
+      action.data = {
+        ...action.data,
+        transition: transitionTimeTenths / 10
+      };
+    }
+    this.state.currentLevel = level;
+    optimisticLevelState.set(entityId, {
+      expectedLevel: level,
+      timestamp: Date.now()
+    });
+    homeAssistant.callAction(action);
+  }
+};
+((LevelControlServerBase2) => {
+  class State extends FeaturedBase3.State {
+    config;
+  }
+  LevelControlServerBase2.State = State;
+})(LevelControlServerBase || (LevelControlServerBase = {}));
+function LevelControlServer2(config10) {
+  return LevelControlServerBase.set({
+    options: { executeIfOff: true },
+    config: config10
+  });
+}
+
+// src/matter/behaviors/on-off-server.ts
+var logger159 = Logger.get("OnOffServer");
+var optimisticOnOffState = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
+var OnOffServerBase = class extends OnOffServer {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update({ state }) {
+    const onOff = this.isOn(state);
+    const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
+    const optimistic = optimisticOnOffState.get(entityId);
+    if (optimistic != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
+        optimisticOnOffState.delete(entityId);
+      } else if (onOff === optimistic.expectedOnOff) {
+        optimisticOnOffState.delete(entityId);
+      } else {
+        return;
+      }
+    }
+    applyPatchState(this.state, { onOff });
+  }
+  isOn(entity) {
+    return this.state.config?.isOn?.(entity, this.agent) ?? (this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state !== "off");
+  }
+  on() {
+    const { turnOn, turnOff } = this.state.config;
+    if (turnOn === null) {
+      setTimeout(this.callback(this.autoReset), 1e3);
+      return;
+    }
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const action = turnOn?.(void 0, this.agent) ?? {
+      action: "homeassistant.turn_on"
+    };
+    logger159.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
+    notifyLightTurnedOn(homeAssistant.entityId);
+    applyPatchState(this.state, { onOff: true });
+    optimisticOnOffState.set(homeAssistant.entityId, {
+      expectedOnOff: true,
+      timestamp: Date.now()
+    });
+    homeAssistant.callAction(action);
+    if (turnOff === null) {
+      setTimeout(this.callback(this.autoReset), 1e3);
+    }
+  }
+  off() {
+    const { turnOff } = this.state.config;
+    if (turnOff === null) {
+      setTimeout(this.callback(this.autoReset), 1e3);
+      return;
+    }
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const action = turnOff?.(void 0, this.agent) ?? {
+      action: "homeassistant.turn_off"
+    };
+    logger159.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
+    applyPatchState(this.state, { onOff: false });
+    optimisticOnOffState.set(homeAssistant.entityId, {
+      expectedOnOff: false,
+      timestamp: Date.now()
+    });
+    homeAssistant.callAction(action);
+  }
+  autoReset() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+  }
+};
+((OnOffServerBase2) => {
+  class State extends OnOffServer.State {
+    config;
+  }
+  OnOffServerBase2.State = State;
+})(OnOffServerBase || (OnOffServerBase = {}));
+function OnOffServer2(config10 = {}) {
+  return OnOffServerBase.set({ config: config10 });
+}
+function setOptimisticOnOff(entityId, expectedOnOff) {
+  optimisticOnOffState.set(entityId, {
+    expectedOnOff,
+    timestamp: Date.now()
+  });
+}
+
+// src/matter/behaviors/fan-control-server.ts
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
-var FeaturedBase3 = FanControlServer.with(
+var FeaturedBase4 = FanControlServer.with(
   "Step",
   "MultiSpeed",
   "AirflowDirection",
@@ -165891,7 +166135,7 @@ var FeaturedBase3 = FanControlServer.with(
   rockSupport: { rockUpDown: true },
   windSupport: { naturalWind: true, sleepWind: true }
 });
-var FanControlServerBase = class extends FeaturedBase3 {
+var FanControlServerBase = class extends FeaturedBase4 {
   async initialize() {
     if (this.features.multiSpeed) {
       if (this.state.speedMax == null || this.state.speedMax < minSpeedMax) {
@@ -166024,6 +166268,7 @@ var FanControlServerBase = class extends FeaturedBase3 {
     if (!homeAssistant.isAvailable) {
       return;
     }
+    this.syncOnOff(percentSetting !== 0);
     if (percentSetting === 0) {
       homeAssistant.callAction(this.state.config.turnOff(void 0, this.agent));
     } else {
@@ -166064,6 +166309,7 @@ var FanControlServerBase = class extends FeaturedBase3 {
       }
       const targetFanMode = FanMode.create(fanMode, this.state.fanModeSequence);
       if (targetFanMode.mode === FanControl3.FanMode.Auto) {
+        this.syncOnOff(true);
         homeAssistant.callAction(
           this.state.config.setAutoMode(void 0, this.agent)
         );
@@ -166093,6 +166339,7 @@ var FanControlServerBase = class extends FeaturedBase3 {
       homeAssistant.entity.state,
       this.agent
     );
+    this.syncOnOff(percentage !== 0);
     if (percentage === 0) {
       homeAssistant.callAction(config10.turnOff(void 0, this.agent));
     } else if (supportsPercentage) {
@@ -166177,6 +166424,18 @@ var FanControlServerBase = class extends FeaturedBase3 {
       homeAssistant.callAction(this.state.config.setWindMode(mode, this.agent));
     });
   }
+  // Cross-cluster sync: keep OnOff in sync with FanControl per Matter spec
+  // §4.4.6.6.1. matter.js does not implement this automatically.
+  syncOnOff(on) {
+    try {
+      if (!this.agent.has(OnOffBehavior)) return;
+      const onOffState = this.agent.get(OnOffBehavior).state;
+      applyPatchState(onOffState, { onOff: on });
+      const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
+      setOptimisticOnOff(entityId, on);
+    } catch {
+    }
+  }
   mapWindModeToSetting(mode) {
     return {
       naturalWind: mode === "natural",
@@ -166185,7 +166444,7 @@ var FanControlServerBase = class extends FeaturedBase3 {
   }
 };
 ((FanControlServerBase2) => {
-  class State extends FeaturedBase3.State {
+  class State extends FeaturedBase4.State {
     config;
   }
   FanControlServerBase2.State = State;
@@ -166253,222 +166512,6 @@ var fanControlConfig = {
 };
 var FanFanControlServer = FanControlServer2(fanControlConfig);
 
-// src/matter/behaviors/on-off-server.ts
-init_esm();
-init_home_assistant_entity_behavior();
-
-// src/matter/behaviors/level-control-server.ts
-init_esm();
-init_home_assistant_entity_behavior();
-var lastTurnOnTimestamps = /* @__PURE__ */ new Map();
-var optimisticLevelState = /* @__PURE__ */ new Map();
-var OPTIMISTIC_TIMEOUT_MS = 3e3;
-var OPTIMISTIC_TOLERANCE = 5;
-function notifyLightTurnedOn(entityId) {
-  lastTurnOnTimestamps.set(entityId, Date.now());
-}
-var logger158 = Logger.get("LevelControlServer");
-var FeaturedBase4 = LevelControlServer.with("OnOff", "Lighting");
-var LevelControlServerBase = class extends FeaturedBase4 {
-  pendingTransitionTime;
-  async initialize() {
-    if (this.state.currentLevel == null) {
-      this.state.currentLevel = 1;
-    }
-    if (this.state.minLevel == null) {
-      this.state.minLevel = 1;
-    }
-    if (this.state.maxLevel == null) {
-      this.state.maxLevel = 254;
-    }
-    this.state.onLevel = null;
-    logger158.debug(`initialize: calling super.initialize()`);
-    try {
-      await super.initialize();
-      logger158.debug(`initialize: super.initialize() completed successfully`);
-    } catch (error) {
-      logger158.error(`initialize: super.initialize() FAILED:`, error);
-      throw error;
-    }
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
-  }
-  update(entity) {
-    if (!entity.state) {
-      return;
-    }
-    const { state } = entity;
-    const config10 = this.state.config;
-    const minLevel = 1;
-    const maxLevel = 254;
-    const levelRange = maxLevel - minLevel;
-    const currentLevelPercent = config10.getValuePercent(state, this.agent);
-    let currentLevel = currentLevelPercent != null ? Math.round(currentLevelPercent * levelRange + minLevel) : null;
-    if (currentLevel != null) {
-      currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
-    }
-    const optimistic = optimisticLevelState.get(entity.entity_id);
-    if (optimistic != null && currentLevel != null) {
-      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS) {
-        optimisticLevelState.delete(entity.entity_id);
-      } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE) {
-        optimisticLevelState.delete(entity.entity_id);
-      } else {
-        currentLevel = null;
-      }
-    }
-    applyPatchState(this.state, {
-      minLevel,
-      maxLevel,
-      ...currentLevel != null ? { currentLevel } : {}
-    });
-  }
-  // Fix for Google Home (#41): it sends moveToLevel/moveToLevelWithOnOff/step commands
-  // with transitionTime as null or completely omitted. The TLV schema is patched at startup
-  // (see patch-level-control-tlv.ts) to accept omitted fields. Here we default to 0 (instant).
-  async moveToLevel(request) {
-    if (request.transitionTime == null) {
-      request.transitionTime = 0;
-    }
-    this.pendingTransitionTime = request.transitionTime;
-    return super.moveToLevel(request);
-  }
-  async moveToLevelWithOnOff(request) {
-    if (request.transitionTime == null) {
-      request.transitionTime = 0;
-    }
-    this.pendingTransitionTime = request.transitionTime;
-    return super.moveToLevelWithOnOff(request);
-  }
-  step(request) {
-    if (request.transitionTime == null) {
-      request.transitionTime = 0;
-    }
-    return super.step(request);
-  }
-  stepWithOnOff(request) {
-    if (request.transitionTime == null) {
-      request.transitionTime = 0;
-    }
-    return super.stepWithOnOff(request);
-  }
-  moveToLevelLogic(level) {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const config10 = this.state.config;
-    const entityId = homeAssistant.entity.entity_id;
-    const levelRange = this.maxLevel - this.minLevel;
-    const levelPercent = (level - this.minLevel) / levelRange;
-    const lastTurnOn = lastTurnOnTimestamps.get(entityId);
-    const timeSinceTurnOn = lastTurnOn ? Date.now() - lastTurnOn : Infinity;
-    const isMaxBrightness = level >= this.maxLevel;
-    if (isMaxBrightness && timeSinceTurnOn < 200) {
-      logger158.debug(
-        `[${entityId}] Ignoring moveToLevel(${level}) - Alexa brightness reset detected (${timeSinceTurnOn}ms after turn-on)`
-      );
-      return;
-    }
-    const current = config10.getValuePercent(
-      homeAssistant.entity.state,
-      this.agent
-    );
-    if (levelPercent === current) {
-      return;
-    }
-    const action = config10.moveToLevelPercent(levelPercent, this.agent);
-    const transitionTimeTenths = this.pendingTransitionTime;
-    this.pendingTransitionTime = void 0;
-    if (transitionTimeTenths && transitionTimeTenths > 0) {
-      action.data = {
-        ...action.data,
-        transition: transitionTimeTenths / 10
-      };
-    }
-    this.state.currentLevel = level;
-    optimisticLevelState.set(entityId, {
-      expectedLevel: level,
-      timestamp: Date.now()
-    });
-    homeAssistant.callAction(action);
-  }
-};
-((LevelControlServerBase2) => {
-  class State extends FeaturedBase4.State {
-    config;
-  }
-  LevelControlServerBase2.State = State;
-})(LevelControlServerBase || (LevelControlServerBase = {}));
-function LevelControlServer2(config10) {
-  return LevelControlServerBase.set({
-    options: { executeIfOff: true },
-    config: config10
-  });
-}
-
-// src/matter/behaviors/on-off-server.ts
-var logger159 = Logger.get("OnOffServer");
-var OnOffServerBase = class extends OnOffServer {
-  async initialize() {
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
-  }
-  update({ state }) {
-    applyPatchState(this.state, {
-      onOff: this.isOn(state)
-    });
-  }
-  isOn(entity) {
-    return this.state.config?.isOn?.(entity, this.agent) ?? (this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state !== "off");
-  }
-  on() {
-    const { turnOn, turnOff } = this.state.config;
-    if (turnOn === null) {
-      setTimeout(this.callback(this.autoReset), 1e3);
-      return;
-    }
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const action = turnOn?.(void 0, this.agent) ?? {
-      action: "homeassistant.turn_on"
-    };
-    logger159.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
-    notifyLightTurnedOn(homeAssistant.entityId);
-    applyPatchState(this.state, { onOff: true });
-    homeAssistant.callAction(action);
-    if (turnOff === null) {
-      setTimeout(this.callback(this.autoReset), 1e3);
-    }
-  }
-  off() {
-    const { turnOff } = this.state.config;
-    if (turnOff === null) {
-      setTimeout(this.callback(this.autoReset), 1e3);
-      return;
-    }
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const action = turnOff?.(void 0, this.agent) ?? {
-      action: "homeassistant.turn_off"
-    };
-    logger159.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
-    applyPatchState(this.state, { onOff: false });
-    homeAssistant.callAction(action);
-  }
-  autoReset() {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-  }
-};
-((OnOffServerBase2) => {
-  class State extends OnOffServer.State {
-    config;
-  }
-  OnOffServerBase2.State = State;
-})(OnOffServerBase || (OnOffServerBase = {}));
-function OnOffServer2(config10 = {}) {
-  return OnOffServerBase.set({ config: config10 });
-}
-
 // src/matter/endpoints/legacy/fan/behaviors/fan-on-off-server.ts
 var FanOnOffServer = OnOffServer2({
   turnOn: () => ({ action: "fan.turn_on" }),
@@ -169488,7 +169531,7 @@ init_nodejs();
 init_home_assistant_entity_behavior();
 var logger170 = Logger.get("ColorControlServer");
 var optimisticColorState = /* @__PURE__ */ new Map();
-var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
+var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
 var OPTIMISTIC_TOLERANCE2 = 5;
 var pendingColorStaging = /* @__PURE__ */ new Map();
 function consumePendingColorStaging(entityId) {
@@ -169578,7 +169621,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
     let skipColorTemp = false;
     let skipHueSat = false;
     if (optimistic != null) {
-      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS3) {
         optimisticColorState.delete(entity.entity_id);
       } else {
         if (optimistic.colorTemperatureMireds != null && currentMireds != null) {
@@ -171012,7 +171055,7 @@ init_esm();
 init_home_assistant_entity_behavior();
 var logger175 = Logger.get("SpeakerLevelControlServer");
 var optimisticLevelState2 = /* @__PURE__ */ new Map();
-var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
+var OPTIMISTIC_TIMEOUT_MS4 = 3e3;
 var OPTIMISTIC_TOLERANCE3 = 5;
 var FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
@@ -171051,7 +171094,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     );
     const optimistic = optimisticLevelState2.get(entity.entity_id);
     if (optimistic != null && currentLevel != null) {
-      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS3) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS4) {
         optimisticLevelState2.delete(entity.entity_id);
       } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE3) {
         optimisticLevelState2.delete(entity.entity_id);