@riddix/hamh 2.1.0-alpha.470 → 2.1.0-alpha.472

package/dist/backend/cli.js

@@ -166688,13 +166688,15 @@ var FanControlServerBase = class extends FeaturedBase4 {
       return;
     }
     if (onOff && this.lastNonZeroPercent > 0) {
-      try {
-        applyPatchState(this.state, {
-          percentSetting: this.lastNonZeroPercent,
-          ...this.features.multiSpeed && this.lastNonZeroSpeed > 0 ? { speedSetting: this.lastNonZeroSpeed } : {}
-        });
-      } catch {
-      }
+      this.agent.asLocalActor(() => {
+        try {
+          applyPatchState(this.state, {
+            percentSetting: this.lastNonZeroPercent,
+            ...this.features.multiSpeed && this.lastNonZeroSpeed > 0 ? { speedSetting: this.lastNonZeroSpeed } : {}
+          });
+        } catch {
+        }
+      });
     }
   }
   // Cross-cluster sync: keep OnOff in sync with FanControl per Matter spec
@@ -166796,25 +166798,35 @@ var FanOnOffServer = OnOffServer2({
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 var logger162 = Logger.get("ComposedAirPurifierEndpoint");
-var temperatureConfig = {
-  getValue(entity, agent) {
-    const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
-    const state = entity.state;
-    const attributes7 = entity.attributes;
-    const temperature3 = state == null || Number.isNaN(+state) ? null : +state;
-    if (temperature3 == null) return void 0;
-    return Temperature.withUnit(
-      temperature3,
-      attributes7.unit_of_measurement ?? fallbackUnit
-    );
-  }
-};
-var humidityConfig = {
-  getValue({ state }) {
-    if (state == null || Number.isNaN(+state)) return null;
-    return +state;
-  }
-};
+function createTemperatureConfig(temperatureEntityId) {
+  return {
+    getValue(_entity, agent) {
+      const stateProvider = agent.env.get(EntityStateProvider);
+      const tempState = stateProvider.getState(temperatureEntityId);
+      if (!tempState) return void 0;
+      const temperature3 = Number.parseFloat(tempState.state);
+      if (Number.isNaN(temperature3)) return void 0;
+      const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
+      const attrs = tempState.attributes;
+      return Temperature.withUnit(
+        temperature3,
+        attrs.unit_of_measurement ?? fallbackUnit
+      );
+    }
+  };
+}
+function createHumidityConfig(humidityEntityId) {
+  return {
+    getValue(_entity, agent) {
+      const stateProvider = agent.env.get(EntityStateProvider);
+      const humState = stateProvider.getState(humidityEntityId);
+      if (!humState) return null;
+      const humidity = Number.parseFloat(humState.state);
+      if (Number.isNaN(humidity)) return null;
+      return humidity;
+    }
+  };
+}
 var batteryConfig = {
   getBatteryPercent: (_entity, agent) => {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
@@ -166827,16 +166839,6 @@ var batteryConfig = {
     return null;
   }
 };
-var TemperatureSubType = TemperatureSensorDevice.with(
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig)
-);
-var HumiditySubType = HumiditySensorDevice.with(
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  HumidityMeasurementServer(humidityConfig)
-);
 function createEndpointId2(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
@@ -166856,9 +166858,9 @@ function buildEntityPayload(registry2, entityId) {
 var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends Endpoint {
   entityId;
   mappedEntityIds;
-  subEndpoints = /* @__PURE__ */ new Map();
+  trackedEntityIds;
   lastStates = /* @__PURE__ */ new Map();
-  debouncedUpdates = /* @__PURE__ */ new Map();
+  debouncedFlush;
   static async create(config10) {
     const { registry: registry2, primaryEntityId } = config10;
     const primaryPayload = buildEntityPayload(registry2, primaryEntityId);
@@ -166897,6 +166899,20 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     if (hasFilterLife) {
       parentType = parentType.with(AirPurifierHepaFilterMonitoringServer);
     }
+    if (config10.temperatureEntityId) {
+      parentType = parentType.with(
+        TemperatureMeasurementServer2(
+          createTemperatureConfig(config10.temperatureEntityId)
+        )
+      );
+    }
+    if (config10.humidityEntityId) {
+      parentType = parentType.with(
+        HumidityMeasurementServer(
+          createHumidityConfig(config10.humidityEntityId)
+        )
+      );
+    }
     const mapping = {
       entityId: primaryEntityId,
       ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {},
@@ -166914,37 +166930,6 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       );
     }
     const endpointId = createEndpointId2(primaryEntityId, config10.customName);
-    const parts = [];
-    const subEndpointMap = /* @__PURE__ */ new Map();
-    if (config10.temperatureEntityId) {
-      const tempPayload = buildEntityPayload(
-        registry2,
-        config10.temperatureEntityId
-      );
-      if (tempPayload) {
-        const tempSub = new Endpoint(
-          TemperatureSubType.set({
-            homeAssistantEntity: { entity: tempPayload }
-          }),
-          { id: `${endpointId}_temp` }
-        );
-        parts.push(tempSub);
-        subEndpointMap.set(config10.temperatureEntityId, tempSub);
-      }
-    }
-    if (config10.humidityEntityId) {
-      const humPayload = buildEntityPayload(registry2, config10.humidityEntityId);
-      if (humPayload) {
-        const humSub = new Endpoint(
-          HumiditySubType.set({
-            homeAssistantEntity: { entity: humPayload }
-          }),
-          { id: `${endpointId}_humidity` }
-        );
-        parts.push(humSub);
-        subEndpointMap.set(config10.humidityEntityId, humSub);
-      }
-    }
     const parentTypeWithState = parentType.set({
       homeAssistantEntity: {
         entity: primaryPayload,
@@ -166952,14 +166937,17 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
         mapping
       }
     });
-    const mappedIds = [...subEndpointMap.keys()];
+    const trackedEntityIds = [primaryEntityId];
+    if (config10.temperatureEntityId)
+      trackedEntityIds.push(config10.temperatureEntityId);
+    if (config10.humidityEntityId) trackedEntityIds.push(config10.humidityEntityId);
+    const mappedIds = trackedEntityIds.filter((id) => id !== primaryEntityId);
     const endpoint = new _ComposedAirPurifierEndpoint(
       parentTypeWithState,
       primaryEntityId,
       endpointId,
-      parts,
-      mappedIds,
-      subEndpointMap
+      trackedEntityIds,
+      mappedIds
     );
     const clusterLabels = [
       "AirPurifier",
@@ -166970,47 +166958,46 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     logger162.info(`Created air purifier ${primaryEntityId}: ${clusterLabels}`);
     return endpoint;
   }
-  constructor(type, entityId, id, parts, mappedEntityIds, subEndpoints) {
-    super(type, { id, parts });
+  constructor(type, entityId, id, trackedEntityIds, mappedEntityIds) {
+    super(type, { id });
     this.entityId = entityId;
+    this.trackedEntityIds = trackedEntityIds;
     this.mappedEntityIds = mappedEntityIds;
-    this.subEndpoints = subEndpoints;
   }
   async updateStates(states) {
-    this.scheduleUpdate(this, this.entityId, states);
-    for (const [entityId, sub] of this.subEndpoints) {
-      this.scheduleUpdate(sub, entityId, states);
+    let anyChanged = false;
+    for (const entityId of this.trackedEntityIds) {
+      const state = states[entityId];
+      if (!state) continue;
+      const stateJson = JSON.stringify({
+        s: state.state,
+        a: state.attributes
+      });
+      if (this.lastStates.get(entityId) !== stateJson) {
+        this.lastStates.set(entityId, stateJson);
+        anyChanged = true;
+      }
     }
-  }
-  scheduleUpdate(endpoint, entityId, states) {
-    const state = states[entityId];
-    if (!state) return;
-    const key = endpoint === this ? `_parent_:${entityId}` : entityId;
-    const stateJson = JSON.stringify({
-      s: state.state,
-      a: state.attributes
-    });
-    if (this.lastStates.get(key) === stateJson) return;
-    this.lastStates.set(key, stateJson);
-    let debouncedFn = this.debouncedUpdates.get(key);
-    if (!debouncedFn) {
-      debouncedFn = debounce2(
-        (ep, s) => this.flushUpdate(ep, s),
+    if (!anyChanged) return;
+    const primaryState = states[this.entityId];
+    if (!primaryState) return;
+    if (!this.debouncedFlush) {
+      this.debouncedFlush = debounce2(
+        (s) => this.flushUpdate(s),
         50
       );
-      this.debouncedUpdates.set(key, debouncedFn);
     }
-    debouncedFn(endpoint, state);
+    this.debouncedFlush(primaryState);
   }
-  async flushUpdate(endpoint, state) {
+  async flushUpdate(state) {
     try {
-      await endpoint.construction.ready;
+      await this.construction.ready;
     } catch {
       return;
     }
     try {
-      const current = endpoint.stateOf(HomeAssistantEntityBehavior).entity;
-      await endpoint.setStateOf(HomeAssistantEntityBehavior, {
+      const current = this.stateOf(HomeAssistantEntityBehavior).entity;
+      await this.setStateOf(HomeAssistantEntityBehavior, {
         entity: { ...current, state: { ...state } }
       });
     } catch (error) {
@@ -167027,9 +167014,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     }
   }
   async delete() {
-    for (const fn of this.debouncedUpdates.values()) {
-      fn.clear();
-    }
+    this.debouncedFlush?.clear();
     await super.delete();
   }
 };
@@ -167114,7 +167099,7 @@ function PressureMeasurementServer2(config10) {
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
 var logger164 = Logger.get("ComposedSensorEndpoint");
-var temperatureConfig2 = {
+var temperatureConfig = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -167127,7 +167112,7 @@ var temperatureConfig2 = {
     );
   }
 };
-var humidityConfig2 = {
+var humidityConfig = {
   getValue({ state }) {
     if (state == null || Number.isNaN(+state)) return null;
     return +state;
@@ -167154,15 +167139,15 @@ var batteryConfig2 = {
     return null;
   }
 };
-var TemperatureSubType2 = TemperatureSensorDevice.with(
+var TemperatureSubType = TemperatureSensorDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig2)
+  TemperatureMeasurementServer2(temperatureConfig)
 );
-var HumiditySubType2 = HumiditySensorDevice.with(
+var HumiditySubType = HumiditySensorDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  HumidityMeasurementServer(humidityConfig2)
+  HumidityMeasurementServer(humidityConfig)
 );
 var PressureSubType = PressureSensorDevice.with(
   IdentifyServer2,
@@ -167218,7 +167203,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     const endpointId = createEndpointId3(primaryEntityId, config10.customName);
     const parts = [];
     const tempSub = new Endpoint(
-      TemperatureSubType2.set({
+      TemperatureSubType.set({
         homeAssistantEntity: { entity: primaryPayload }
       }),
       { id: `${endpointId}_temp` }
@@ -167229,7 +167214,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
       const humPayload = buildEntityPayload2(registry2, config10.humidityEntityId);
       if (humPayload) {
         humSub = new Endpoint(
-          HumiditySubType2.set({
+          HumiditySubType.set({
             homeAssistantEntity: { entity: humPayload }
           }),
           { id: `${endpointId}_humidity` }
@@ -168069,7 +168054,7 @@ var ClimateFanControlServer = FanControlServer2(config3).with(
 );
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-humidity-measurement-server.ts
-var humidityConfig3 = {
+var humidityConfig2 = {
   getValue(entity) {
     const attributes7 = entity.attributes;
     const humidity = attributes7.current_humidity;
@@ -168079,7 +168064,7 @@ var humidityConfig3 = {
     return +humidity;
   }
 };
-var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig3);
+var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig2);
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-on-off-server.ts
 var ClimateOnOffServer = OnOffServer2({
@@ -173128,7 +173113,7 @@ var Pm25SensorType = AirQualitySensorDevice.with(
 
 // src/matter/endpoints/legacy/sensor/devices/temperature-humidity-sensor.ts
 init_home_assistant_entity_behavior();
-var temperatureConfig3 = {
+var temperatureConfig2 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -173143,7 +173128,7 @@ var temperatureConfig3 = {
     );
   }
 };
-var humidityConfig4 = {
+var humidityConfig3 = {
   getValue(_entity, agent) {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const humidityEntity = homeAssistant.state.mapping?.humidityEntity;
@@ -173193,38 +173178,38 @@ var TemperatureHumiditySensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
-  HumidityMeasurementServer(humidityConfig4)
+  TemperatureMeasurementServer2(temperatureConfig2),
+  HumidityMeasurementServer(humidityConfig3)
 );
 var TemperatureHumiditySensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
-  HumidityMeasurementServer(humidityConfig4),
+  TemperatureMeasurementServer2(temperatureConfig2),
+  HumidityMeasurementServer(humidityConfig3),
   PowerSourceServer2(batteryConfig4)
 );
 var TemperatureHumidityPressureSensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
-  HumidityMeasurementServer(humidityConfig4),
+  TemperatureMeasurementServer2(temperatureConfig2),
+  HumidityMeasurementServer(humidityConfig3),
   PressureMeasurementServer2(pressureConfig2)
 );
 var TemperatureHumidityPressureSensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig3),
-  HumidityMeasurementServer(humidityConfig4),
+  TemperatureMeasurementServer2(temperatureConfig2),
+  HumidityMeasurementServer(humidityConfig3),
   PressureMeasurementServer2(pressureConfig2),
   PowerSourceServer2(batteryConfig4)
 );
 
 // src/matter/endpoints/legacy/sensor/devices/temperature-pressure-sensor.ts
 init_home_assistant_entity_behavior();
-var temperatureConfig4 = {
+var temperatureConfig3 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
     const state = entity.state;
@@ -173275,14 +173260,14 @@ var TemperaturePressureSensorType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig4),
+  TemperatureMeasurementServer2(temperatureConfig3),
   PressureMeasurementServer2(pressureConfig3)
 );
 var TemperaturePressureSensorWithBatteryType = TemperatureSensorDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
-  TemperatureMeasurementServer2(temperatureConfig4),
+  TemperatureMeasurementServer2(temperatureConfig3),
   PressureMeasurementServer2(pressureConfig3),
   PowerSourceServer2(batteryConfig5)
 );