@riddix/hamh 2.1.0-alpha.615 → 2.1.0-alpha.616

package/dist/backend/cli.js

@@ -11896,7 +11896,7 @@ var init_ServerAddress = __esm({
         return Diagnostic.squash(...diagnostic);
       }
       ServerAddress2.diagnosticFor = diagnosticFor;
-      function isEqual(a, b) {
+      function isEqual2(a, b) {
         if (a.type !== b.type) {
           return false;
         }
@@ -11908,7 +11908,7 @@ var init_ServerAddress = __esm({
         }
         return false;
       }
-      ServerAddress2.isEqual = isEqual;
+      ServerAddress2.isEqual = isEqual2;
       function healthOf(health) {
         if (health.unhealthyAt === void 0) {
           return health;
@@ -146105,6 +146105,7 @@ var init_clusters2 = __esm({
       ClusterId3["bridgedDeviceBasicInformation"] = "bridgedDeviceBasicInformation";
       ClusterId3["airQuality"] = "airQuality";
       ClusterId3["booleanState"] = "booleanState";
+      ClusterId3["booleanStateConfiguration"] = "booleanStateConfiguration";
       ClusterId3["carbonDioxideConcentrationMeasurement"] = "carbonDioxideConcentrationMeasurement";
       ClusterId3["carbonMonoxideConcentrationMeasurement"] = "carbonMonoxideConcentrationMeasurement";
       ClusterId3["colorControl"] = "colorControl";
@@ -147038,10 +147039,13 @@ var init_color_converter = __esm({
       }
       /**
        * Convert Color Tempareture from Mireds to Kelvin
-       * @param temperatureMireds Temperature in Mireds
-       * @return Temperature in Kelvin
+       * @param temperatureMireds Temperature in Mireds (must be finite and > 0)
+       * @return Temperature in Kelvin, or null if the input is 0 / negative / non-finite
        */
       static temperatureMiredsToKelvin(temperatureMireds) {
+        if (!Number.isFinite(temperatureMireds) || temperatureMireds <= 0) {
+          return null;
+        }
         return 1e6 / temperatureMireds;
       }
       /**
@@ -152332,23 +152336,30 @@ var BridgeService = class extends Service {
     }
   }
   async stopAll() {
-    for (const bridge of this.bridges) {
-      try {
-        await bridge.stop();
-        this.onBridgeChanged?.(bridge.id);
-      } catch (e) {
-        this.log.error(`Failed to stop bridge ${bridge.id}:`, e);
-      }
-    }
+    await Promise.all(
+      this.bridges.map(async (bridge) => {
+        try {
+          await bridge.stop();
+          this.onBridgeChanged?.(bridge.id);
+        } catch (e) {
+          this.log.error(`Failed to stop bridge ${bridge.id}:`, e);
+        }
+      })
+    );
   }
   async restartAll() {
-    for (const bridge of this.bridges) {
-      try {
-        await bridge.stop();
-      } catch (e) {
-        this.log.error(`Failed to stop bridge ${bridge.id} during restart:`, e);
-      }
-    }
+    await Promise.all(
+      this.bridges.map(async (bridge) => {
+        try {
+          await bridge.stop();
+        } catch (e) {
+          this.log.error(
+            `Failed to stop bridge ${bridge.id} during restart:`,
+            e
+          );
+        }
+      })
+    );
     const sortedBridges = [...this.bridges].sort((a, b) => {
       const priorityA = a.data.priority ?? 100;
       const priorityB = b.data.priority ?? 100;
@@ -152769,19 +152780,15 @@ var HomeAssistantRegistry = class extends Service {
         }
       });
     }
-    const entityRegistry = await getRegistry(connection);
-    const statesList = await getStates(connection);
-    const deviceRegistry = await getDeviceRegistry(connection);
-    let labels = [];
-    try {
-      labels = await getLabelRegistry(connection);
-    } catch {
-    }
-    let areas = [];
-    try {
-      areas = await getAreaRegistry(connection);
-    } catch {
-    }
+    const [entityRegistry, statesList, deviceRegistry, labels, areas] = await Promise.all([
+      getRegistry(connection),
+      getStates(connection),
+      getDeviceRegistry(connection),
+      getLabelRegistry(connection).catch(() => []),
+      getAreaRegistry(connection).catch(
+        () => []
+      )
+    ]);
     const hash2 = createHash("md5");
     for (const e of entityRegistry) {
       hash2.update(
@@ -168081,6 +168088,7 @@ init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
 import debounce5 from "debounce";
+import { isEqual } from "lodash-es";
 
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
@@ -170505,13 +170513,15 @@ var ContactSensorType = ContactSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  BooleanStateServer2({ inverted: true })
+  BooleanStateServer2({ inverted: true }),
+  BooleanStateConfigurationServer
 );
 var ContactSensorWithBatteryType = ContactSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   BooleanStateServer2({ inverted: true }),
+  BooleanStateConfigurationServer,
   PowerSourceServer2({
     getBatteryPercent: (entity, agent) => {
       const homeAssistant = agent.get(HomeAssistantEntityBehavior);
@@ -170717,7 +170727,8 @@ var RainSensorType = RainSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  BooleanStateServer2()
+  BooleanStateServer2(),
+  BooleanStateConfigurationServer
 );
 
 // ../../node_modules/.pnpm/@matter+main@0.16.11/node_modules/@matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js
@@ -170807,7 +170818,8 @@ var WaterFreezeDetectorType = WaterFreezeDetectorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  BooleanStateServer2()
+  BooleanStateServer2(),
+  BooleanStateConfigurationServer
 );
 
 // src/matter/endpoints/legacy/binary-sensor/water-leak-detector.ts
@@ -170816,7 +170828,8 @@ var WaterLeakDetectorType = WaterLeakDetectorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  BooleanStateServer2()
+  BooleanStateServer2(),
+  BooleanStateConfigurationServer
 );
 
 // src/matter/endpoints/legacy/binary-sensor/index.ts
@@ -171450,6 +171463,8 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           default:
             return allOff;
         }
+      default:
+        return allOff;
     }
   }
   clampControlSequence(value) {
@@ -171621,7 +171636,10 @@ var hvacActionToRunningMode = {
   [ClimateHvacAction.preheating]: Thermostat3.ThermostatRunningMode.Heat,
   [ClimateHvacAction.defrosting]: Thermostat3.ThermostatRunningMode.Heat,
   [ClimateHvacAction.heating]: Thermostat3.ThermostatRunningMode.Heat,
-  [ClimateHvacAction.drying]: Thermostat3.ThermostatRunningMode.Heat,
+  // Drying has no dedicated Matter RunningMode; reporting Heat made Apple
+  // Home display "Heating to …" during dehumidification. Off is neutral and
+  // getRunningState() downgrades it to FanOnly/Dry via systemMode.
+  [ClimateHvacAction.drying]: Thermostat3.ThermostatRunningMode.Off,
   [ClimateHvacAction.cooling]: Thermostat3.ThermostatRunningMode.Cool,
   [ClimateHvacAction.fan]: Thermostat3.ThermostatRunningMode.Off,
   [ClimateHvacAction.idle]: Thermostat3.ThermostatRunningMode.Off,
@@ -172242,7 +172260,7 @@ function WindowCoveringServer2(config10) {
 }
 
 // src/matter/endpoints/legacy/cover/behaviors/cover-position-utils.ts
-function adjustPositionForReading(position, flags2, matterSemantics) {
+function adjustPosition(position, flags2, matterSemantics) {
   if (position == null) {
     return null;
   }
@@ -172255,18 +172273,11 @@ function adjustPositionForReading(position, flags2, matterSemantics) {
   }
   return position;
 }
+function adjustPositionForReading(position, flags2, matterSemantics) {
+  return adjustPosition(position, flags2, matterSemantics);
+}
 function adjustPositionForWriting(position, flags2, matterSemantics) {
-  if (position == null) {
-    return null;
-  }
-  const skipInversion = flags2?.coverDoNotInvertPercentage === true || flags2?.coverUseHomeAssistantPercentage === true || matterSemantics;
-  if (flags2?.coverSwapOpenClose === true && !skipInversion) {
-    return position;
-  }
-  if (!skipInversion) {
-    return 100 - position;
-  }
-  return position;
+  return adjustPosition(position, flags2, matterSemantics);
 }
 
 // src/matter/endpoints/legacy/cover/behaviors/cover-window-covering-server.ts
@@ -172808,12 +172819,16 @@ function FanDevice2(homeAssistantEntity) {
       IdentifyServer2,
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
+      GroupsServer,
+      ScenesManagementServer,
       FanOnOffServer,
       DefaultPowerSourceServer
     ) : OnOffPlugInUnitDevice.with(
       IdentifyServer2,
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
+      GroupsServer,
+      ScenesManagementServer,
       FanOnOffServer
     );
     return onOffDevice.set({ homeAssistantEntity });
@@ -172842,6 +172857,7 @@ function FanDevice2(homeAssistantEntity) {
     IdentifyServer2,
     BasicInformationServer2,
     HomeAssistantEntityBehavior,
+    GroupsServer,
     FanOnOffServer,
     FanFanControlServer.with(...features2),
     DefaultPowerSourceServer
@@ -172849,6 +172865,7 @@ function FanDevice2(homeAssistantEntity) {
     IdentifyServer2,
     BasicInformationServer2,
     HomeAssistantEntityBehavior,
+    GroupsServer,
     FanOnOffServer,
     FanFanControlServer.with(...features2)
   );
@@ -173161,9 +173178,12 @@ var ColorControlServerBase = class extends FeaturedBase7 {
         ...skipColorTemp ? {} : { colorTemperatureMireds: effectiveMireds }
       });
     }
+    const writingHueSat = this.features.hueSaturation && !skipHueSat;
+    const writingColorTemp = !skipColorTemp && newColorMode === ColorControl3.ColorMode.ColorTemperatureMireds;
+    const shouldPublishColorMode = writingHueSat && newColorMode !== ColorControl3.ColorMode.ColorTemperatureMireds || writingColorTemp;
     applyPatchState(this.state, {
-      ...skipColorTemp && skipHueSat ? {} : { colorMode: newColorMode },
-      ...this.features.hueSaturation && !skipHueSat ? {
+      ...shouldPublishColorMode ? { colorMode: newColorMode } : {},
+      ...writingHueSat ? {
         currentHue: hue,
         currentSaturation: saturation
       } : {}
@@ -173181,6 +173201,9 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       this.agent
     );
     const targetKelvin = ColorConverter.temperatureMiredsToKelvin(targetMireds);
+    if (targetKelvin == null) {
+      return;
+    }
     if (currentKelvin === targetKelvin) {
       return;
     }
@@ -173368,6 +173391,8 @@ var ColorTemperatureLightType = ColorTemperatureLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer,
   LightLevelControlServer,
   LightColorControlServer.with("ColorTemperature")
@@ -173379,6 +173404,8 @@ var DimmableLightType = DimmableLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer,
   LightLevelControlServer
 );
@@ -173386,6 +173413,8 @@ var DimmableLightWithBatteryType = DimmableLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer,
   LightLevelControlServer,
   DefaultPowerSourceServer
@@ -173406,6 +173435,8 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
       IdentifyServer2,
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
+      GroupsServer,
+      ScenesManagementServer,
       LightOnOffServer,
       LightLevelControlServer,
       LightColorControlServer.with(...features2),
@@ -173416,6 +173447,8 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
     IdentifyServer2,
     BasicInformationServer2,
     HomeAssistantEntityBehavior,
+    GroupsServer,
+    ScenesManagementServer,
     LightOnOffServer,
     LightLevelControlServer,
     LightColorControlServer.with(...features2)
@@ -173428,12 +173461,16 @@ var OnOffLightType = OnOffLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer
 );
 var OnOffLightWithBatteryType = OnOffLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer,
   DefaultPowerSourceServer
 );
@@ -176477,6 +176514,8 @@ var DimmablePlugInUnitType = DimmablePlugInUnitDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   LightOnOffServer,
   LightLevelControlServer
 );
@@ -176488,12 +176527,16 @@ var SwitchEndpointType = OnOffPlugInUnitDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   SwitchOnOffServer
 );
 var SwitchWithBatteryEndpointType = OnOffPlugInUnitDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
+  GroupsServer,
+  ScenesManagementServer,
   SwitchOnOffServer,
   DefaultPowerSourceServer
 );
@@ -179762,7 +179805,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
     const mappedChanged = this.hasMappedEntityChanged(states);
-    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
+    if (!mappedChanged && state.state === this.lastState?.state && isEqual(state.attributes, this.lastState?.attributes)) {
       return;
     }
     if (mappedChanged) {