@riddix/hamh 2.1.0-alpha.439 → 2.1.0-alpha.441

package/dist/backend/cli.js

@@ -165933,12 +165933,8 @@ var FanControlServerBase = class extends FeaturedBase3 {
       return;
     }
     this.agent.asLocalActor(() => {
-      const percentSetting = Math.floor(speed / this.state.speedMax * 100);
-      this.targetPercentSettingChanged(
-        percentSetting,
-        this.state.percentSetting,
-        context
-      );
+      const percentage = Math.floor(speed / this.state.speedMax * 100);
+      this.applyPercentageAction(percentage);
     });
   }
   targetFanModeChanged(fanMode, _oldValue, context) {
@@ -165951,16 +165947,12 @@ var FanControlServerBase = class extends FeaturedBase3 {
         return;
       }
       const targetFanMode = FanMode.create(fanMode, this.state.fanModeSequence);
-      const config10 = this.state.config;
       if (targetFanMode.mode === FanControl3.FanMode.Auto) {
-        homeAssistant.callAction(config10.setAutoMode(void 0, this.agent));
-      } else {
-        const percentage = targetFanMode.speedPercent();
-        this.targetPercentSettingChanged(
-          percentage,
-          this.state.percentSetting,
-          context
+        homeAssistant.callAction(
+          this.state.config.setAutoMode(void 0, this.agent)
         );
+      } else {
+        this.applyPercentageAction(targetFanMode.speedPercent());
       }
     });
   }
@@ -165972,45 +165964,48 @@ var FanControlServerBase = class extends FeaturedBase3 {
       return;
     }
     this.agent.asLocalActor(() => {
-      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-      if (!homeAssistant.isAvailable) {
-        return;
-      }
-      const config10 = this.state.config;
-      const supportsPercentage = config10.supportsPercentage(
+      this.applyPercentageAction(percentage);
+    });
+  }
+  applyPercentageAction(percentage) {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    if (!homeAssistant.isAvailable) {
+      return;
+    }
+    const config10 = this.state.config;
+    const supportsPercentage = config10.supportsPercentage(
+      homeAssistant.entity.state,
+      this.agent
+    );
+    if (percentage === 0) {
+      homeAssistant.callAction(config10.turnOff(void 0, this.agent));
+    } else if (supportsPercentage) {
+      const stepSize = config10.getStepSize(
         homeAssistant.entity.state,
         this.agent
       );
-      if (percentage === 0) {
-        homeAssistant.callAction(config10.turnOff(void 0, this.agent));
-      } else if (supportsPercentage) {
-        const stepSize = config10.getStepSize(
-          homeAssistant.entity.state,
-          this.agent
-        );
-        const roundedPercentage = stepSize && stepSize > 0 ? Math.round(percentage / stepSize) * stepSize : percentage;
-        const clampedPercentage = Math.max(
-          stepSize ?? 1,
-          Math.min(100, roundedPercentage)
+      const roundedPercentage = stepSize && stepSize > 0 ? Math.round(percentage / stepSize) * stepSize : percentage;
+      const clampedPercentage = Math.max(
+        stepSize ?? 1,
+        Math.min(100, roundedPercentage)
+      );
+      homeAssistant.callAction(config10.turnOn(clampedPercentage, this.agent));
+    } else {
+      const presetModes = config10.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
+      const speedPresets = presetModes.filter(
+        (m) => m.toLowerCase() !== "auto"
+      );
+      if (speedPresets.length > 0) {
+        const presetIndex = Math.min(
+          Math.floor(percentage / 100 * speedPresets.length),
+          speedPresets.length - 1
         );
-        homeAssistant.callAction(config10.turnOn(clampedPercentage, this.agent));
-      } else {
-        const presetModes = config10.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
-        const speedPresets = presetModes.filter(
-          (m) => m.toLowerCase() !== "auto"
+        const targetPreset = speedPresets[presetIndex];
+        homeAssistant.callAction(
+          config10.setPresetMode(targetPreset, this.agent)
         );
-        if (speedPresets.length > 0) {
-          const presetIndex = Math.min(
-            Math.floor(percentage / 100 * speedPresets.length),
-            speedPresets.length - 1
-          );
-          const targetPreset = speedPresets[presetIndex];
-          homeAssistant.callAction(
-            config10.setPresetMode(targetPreset, this.agent)
-          );
-        }
       }
-    });
+    }
   }
   targetAirflowDirectionChanged(airflowDirection, _oldValue, context) {
     if (transactionIsOffline(context)) {
@@ -166150,6 +166145,8 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var lastTurnOnTimestamps = /* @__PURE__ */ new Map();
+var optimisticLevelTimestamps = /* @__PURE__ */ new Map();
+var OPTIMISTIC_LEVEL_COOLDOWN_MS = 2e3;
 function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, Date.now());
 }
@@ -166194,6 +166191,11 @@ var LevelControlServerBase = class extends FeaturedBase4 {
     if (currentLevel != null) {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
+    const lastOptimistic = optimisticLevelTimestamps.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS;
+    if (inCooldown && currentLevel != null) {
+      currentLevel = null;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
@@ -166261,6 +166263,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
       };
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps.set(entityId, Date.now());
     homeAssistant.callAction(action);
   }
 };
@@ -169349,6 +169352,8 @@ init_nodejs();
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
 var logger170 = Logger.get("ColorControlServer");
+var optimisticColorTimestamps = /* @__PURE__ */ new Map();
+var OPTIMISTIC_COLOR_COOLDOWN_MS = 2e3;
 var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation");
 var ColorControlServerBase = class extends FeaturedBase7 {
   pendingTransitionTime;
@@ -169427,6 +169432,8 @@ var ColorControlServerBase = class extends FeaturedBase7 {
     const newColorMode = this.getColorModeFromFeatures(
       config10.getCurrentMode(entity.state, this.agent)
     );
+    const lastOptimistic = optimisticColorTimestamps.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_COLOR_COOLDOWN_MS;
     if (this.features.colorTemperature) {
       const existingMireds = this.state.colorTemperatureMireds;
       if (existingMireds != null) {
@@ -169451,12 +169458,12 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       applyPatchState(this.state, {
         coupleColorTempToLevelMinMireds: minMireds,
         startUpColorTemperatureMireds: startUpMireds,
-        colorTemperatureMireds: effectiveMireds
+        ...inCooldown ? {} : { colorTemperatureMireds: effectiveMireds }
       });
     }
     applyPatchState(this.state, {
-      colorMode: newColorMode,
-      ...this.features.hueSaturation ? {
+      ...inCooldown ? {} : { colorMode: newColorMode },
+      ...this.features.hueSaturation && !inCooldown ? {
         currentHue: hue,
         currentSaturation: saturation
       } : {}
@@ -169483,6 +169490,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       colorTemperatureMireds: targetMireds,
       colorMode: ColorControl3.ColorMode.ColorTemperatureMireds
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   moveToHueLogic(targetHue) {
@@ -169513,6 +169521,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       currentSaturation: targetSaturation,
       colorMode: ColorControl3.ColorMode.CurrentHueAndCurrentSaturation
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   applyTransition(action) {
@@ -170816,6 +170825,8 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var logger175 = Logger.get("SpeakerLevelControlServer");
+var optimisticLevelTimestamps2 = /* @__PURE__ */ new Map();
+var OPTIMISTIC_LEVEL_COOLDOWN_MS2 = 2e3;
 var FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
@@ -170851,10 +170862,15 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     logger175.debug(
       `[${entityId}] Volume update: HA=${currentLevelPercent != null ? Math.round(currentLevelPercent * 100) : "null"}% -> currentLevel=${currentLevel}`
     );
+    const lastOptimistic = optimisticLevelTimestamps2.get(entity.entity_id);
+    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS2;
+    if (inCooldown && currentLevel != null) {
+      currentLevel = null;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
-      currentLevel
+      ...currentLevel != null ? { currentLevel } : {}
     });
   }
   async moveToLevel(request) {
@@ -170897,6 +170913,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       return;
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps2.set(entityId, Date.now());
     homeAssistant.callAction(
       config10.moveToLevelPercent(levelPercent, this.agent)
     );