@riddix/hamh 2.1.0-alpha.385 → 2.1.0-alpha.387

package/dist/backend/cli.js

@@ -165580,19 +165580,20 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
   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(entityId) === stateJson) return;
-    this.lastStates.set(entityId, stateJson);
-    let debouncedFn = this.debouncedUpdates.get(entityId);
+    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),
         50
       );
-      this.debouncedUpdates.set(entityId, debouncedFn);
+      this.debouncedUpdates.set(key, debouncedFn);
     }
     debouncedFn(endpoint, state);
   }
@@ -166589,6 +166590,32 @@ var AlarmPanelEndpointType = ModeSelectDevice.with(
   HomeAssistantEntityBehavior,
   AlarmModeServer
 );
+var AlarmOnOffServer = OnOffServer2({
+  isOn: (entityState, agent) => {
+    return agent.get(HomeAssistantEntityBehavior).isAvailable && entityState.state !== "disarmed";
+  },
+  turnOn: (_, agent) => {
+    const ha = agent.get(HomeAssistantEntityBehavior);
+    const features2 = ha.entity.state.attributes.supported_features ?? 0;
+    if (features2 & FEATURE_ARM_AWAY)
+      return { action: "alarm_control_panel.alarm_arm_away" };
+    if (features2 & FEATURE_ARM_HOME)
+      return { action: "alarm_control_panel.alarm_arm_home" };
+    if (features2 & FEATURE_ARM_NIGHT)
+      return { action: "alarm_control_panel.alarm_arm_night" };
+    return { action: "alarm_control_panel.alarm_arm_away" };
+  },
+  turnOff: () => ({ action: "alarm_control_panel.alarm_disarm" })
+});
+var AlarmOnOffEndpointType = OnOffPlugInUnitDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  AlarmOnOffServer
+);
+function AlarmOnOffDevice(homeAssistantEntity) {
+  return AlarmOnOffEndpointType.set({ homeAssistantEntity });
+}
 function AlarmControlPanelDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
   const modes = getAlarmModes(attrs);
@@ -167726,10 +167753,6 @@ var config4 = {
     if (systemMode === Thermostat3.SystemMode.Auto) {
       const modes = attributes4(entity).hvac_modes ?? [];
       if (isHeatCoolOnly(modes)) {
-        const action2 = attributes4(entity).hvac_action;
-        if (action2 === ClimateHvacAction.cooling) {
-          return Thermostat3.SystemMode.Cool;
-        }
         return Thermostat3.SystemMode.Heat;
       }
       const hasHeatCool = modes.includes(ClimateHvacMode.heat_cool);
@@ -167759,15 +167782,15 @@ var config4 = {
     if (!action) {
       return Thermostat3.ThermostatRunningMode.Off;
     }
-    return hvacActionToRunningMode[action] ?? Thermostat3.ThermostatRunningMode.Off;
+    const runningMode = hvacActionToRunningMode[action] ?? Thermostat3.ThermostatRunningMode.Off;
+    if (runningMode === Thermostat3.ThermostatRunningMode.Cool && isHeatCoolOnly(attributes4(entity).hvac_modes ?? [])) {
+      return Thermostat3.ThermostatRunningMode.Heat;
+    }
+    return runningMode;
   },
   getControlSequence: (entity) => {
     const modes = attributes4(entity).hvac_modes ?? [];
     if (isHeatCoolOnly(modes)) {
-      const action = attributes4(entity).hvac_action;
-      if (action === ClimateHvacAction.cooling) {
-        return Thermostat3.ControlSequenceOfOperation.CoolingOnly;
-      }
       return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
     }
     const hasCooling = modes.some(
@@ -167895,9 +167918,8 @@ function ClimateDevice(homeAssistantEntity) {
   const hasBatteryAttr = attributes7.battery_level != null || attributes7.battery != null;
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasBattery = hasBatteryAttr || hasBatteryEntity;
-  const supportsCooling = coolingModes.some(
-    (mode) => attributes7.hvac_modes.includes(mode)
-  );
+  const heatCoolOnly = attributes7.hvac_modes.includes(ClimateHvacMode.heat_cool) && !attributes7.hvac_modes.includes(ClimateHvacMode.heat) && !attributes7.hvac_modes.includes(ClimateHvacMode.cool);
+  const supportsCooling = heatCoolOnly ? false : coolingModes.some((mode) => attributes7.hvac_modes.includes(mode));
   const hasExplicitHeating = heatingModes.some(
     (mode) => attributes7.hvac_modes.includes(mode)
   );
@@ -171519,6 +171541,9 @@ var TemperaturePressureSensorWithBatteryType = TemperatureSensorDevice.with(
 );
 
 // src/matter/endpoints/legacy/sensor/index.ts
+var tempDt = { deviceType: DeviceTypeId(770), revision: 2 };
+var humidityDt = { deviceType: DeviceTypeId(775), revision: 2 };
+var pressureDt = { deviceType: DeviceTypeId(773), revision: 2 };
 function SensorDevice(homeAssistantEntity) {
   const attributes7 = homeAssistantEntity.entity.state.attributes;
   const deviceClass = attributes7.device_class;
@@ -171529,29 +171554,39 @@ function SensorDevice(homeAssistantEntity) {
     const hasBattery = !!mapping?.batteryEntity;
     if (hasHumidity && hasPressure && hasBattery) {
       return TemperatureHumidityPressureSensorWithBatteryType.set({
-        homeAssistantEntity
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, humidityDt, pressureDt] }
       });
     }
     if (hasHumidity && hasPressure) {
       return TemperatureHumidityPressureSensorType.set({
-        homeAssistantEntity
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, humidityDt, pressureDt] }
       });
     }
     if (hasHumidity && hasBattery) {
       return TemperatureHumiditySensorWithBatteryType.set({
-        homeAssistantEntity
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, humidityDt] }
       });
     }
     if (hasHumidity) {
-      return TemperatureHumiditySensorType.set({ homeAssistantEntity });
+      return TemperatureHumiditySensorType.set({
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, humidityDt] }
+      });
     }
     if (hasPressure && hasBattery) {
       return TemperaturePressureSensorWithBatteryType.set({
-        homeAssistantEntity
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, pressureDt] }
       });
     }
     if (hasPressure) {
-      return TemperaturePressureSensorType.set({ homeAssistantEntity });
+      return TemperaturePressureSensorType.set({
+        homeAssistantEntity,
+        descriptor: { deviceTypeList: [tempDt, pressureDt] }
+      });
     }
     if (hasBattery) {
       return TemperatureSensorWithBatteryType.set({ homeAssistantEntity });
@@ -173769,7 +173804,13 @@ var matterDeviceTypeFactories = {
   extended_color_light: (ha) => ExtendedColorLightType(true, true).set({
     homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
   }),
-  on_off_plugin_unit: SwitchDevice,
+  on_off_plugin_unit: (ha) => {
+    const domain = ha.entity.entity_id.split(".")[0];
+    if (domain === "alarm_control_panel") {
+      return AlarmOnOffDevice(ha);
+    }
+    return SwitchDevice(ha);
+  },
   on_off_switch: SwitchDevice,
   door_lock: LockDevice,
   window_covering: CoverDevice,