@riddix/hamh 2.1.0-alpha.511 → 2.1.0-alpha.513

package/dist/backend/cli.js

@@ -147766,6 +147766,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     disabled: config10.disabled,
                     filterLifeEntity: config10.filterLifeEntity,
                     cleaningModeEntity: config10.cleaningModeEntity,
+                    temperatureEntity: config10.temperatureEntity,
                     humidityEntity: config10.humidityEntity,
                     pressureEntity: config10.pressureEntity,
                     batteryEntity: config10.batteryEntity,
@@ -148661,6 +148662,7 @@ function entityMappingApi(mappingStorage) {
       disabled: body.disabled,
       filterLifeEntity: body.filterLifeEntity,
       cleaningModeEntity: body.cleaningModeEntity,
+      temperatureEntity: body.temperatureEntity,
       humidityEntity: body.humidityEntity,
       pressureEntity: body.pressureEntity,
       batteryEntity: body.batteryEntity,
@@ -149123,6 +149125,7 @@ function configToProfileEntry(config10) {
     disabled: config10.disabled,
     filterLifeEntity: config10.filterLifeEntity,
     cleaningModeEntity: config10.cleaningModeEntity,
+    temperatureEntity: config10.temperatureEntity,
     humidityEntity: config10.humidityEntity,
     pressureEntity: config10.pressureEntity,
     batteryEntity: config10.batteryEntity,
@@ -149243,6 +149246,7 @@ function mappingProfileApi(mappingStorage) {
           disabled: entry.disabled,
           filterLifeEntity: entry.filterLifeEntity,
           cleaningModeEntity: entry.cleaningModeEntity,
+          temperatureEntity: entry.temperatureEntity,
           humidityEntity: entry.humidityEntity,
           pressureEntity: entry.pressureEntity,
           batteryEntity: entry.batteryEntity,
@@ -152677,6 +152681,7 @@ var EntityMappingStorage = class extends Service {
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
+      temperatureEntity: request.temperatureEntity?.trim() || void 0,
       humidityEntity: request.humidityEntity?.trim() || void 0,
       batteryEntity: request.batteryEntity?.trim() || void 0,
       roomEntities: roomEntities.length > 0 ? roomEntities : void 0,
@@ -152693,7 +152698,7 @@ var EntityMappingStorage = class extends Service {
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.valetudoIdentifier && !config10.coverSwapOpenClose) {
+    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.valetudoIdentifier && !config10.coverSwapOpenClose) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -170053,7 +170058,8 @@ var ThermostatServerBase = class extends FullFeaturedBase {
     logger174.debug(
       `update: limits heat=[${minHeatLimit}, ${maxHeatLimit}], cool=[${minCoolLimit}, ${maxCoolLimit}], systemMode=${systemMode}, runningMode=${runningMode}`
     );
-    const controlSequence = config10.getControlSequence(entity.state, this.agent);
+    let controlSequence = config10.getControlSequence(entity.state, this.agent);
+    controlSequence = this.clampControlSequence(controlSequence);
     this.internal.controlSequenceOfOperation = controlSequence;
     applyPatchState(this.state, {
       ...this.features.heating ? {
@@ -170308,6 +170314,26 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         }
     }
   }
+  clampControlSequence(value) {
+    const hasHeat = this.features.heating;
+    const hasCool = this.features.cooling;
+    const needsHeat = value === Thermostat3.ControlSequenceOfOperation.HeatingOnly || value === Thermostat3.ControlSequenceOfOperation.HeatingWithReheat;
+    const needsCool = value === Thermostat3.ControlSequenceOfOperation.CoolingOnly || value === Thermostat3.ControlSequenceOfOperation.CoolingWithReheat;
+    const needsBoth = value === Thermostat3.ControlSequenceOfOperation.CoolingAndHeating || value === Thermostat3.ControlSequenceOfOperation.CoolingAndHeatingWithReheat;
+    if (needsHeat && !hasHeat) {
+      return Thermostat3.ControlSequenceOfOperation.CoolingOnly;
+    }
+    if (needsCool && !hasCool) {
+      return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
+    }
+    if (needsBoth && !hasHeat) {
+      return Thermostat3.ControlSequenceOfOperation.CoolingOnly;
+    }
+    if (needsBoth && !hasCool) {
+      return Thermostat3.ControlSequenceOfOperation.HeatingOnly;
+    }
+    return value;
+  }
   clampSetpoint(value, min, max, type) {
     const effectiveMin = min ?? 0;
     const effectiveMax = max ?? 5e3;
@@ -170556,7 +170582,7 @@ var config4 = {
       (m) => m === ClimateHvacMode.cool || m === ClimateHvacMode.heat_cool
     );
     const hasHeating = modes.some(
-      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.heat_cool || m === ClimateHvacMode.auto
+      (m) => m === ClimateHvacMode.heat || m === ClimateHvacMode.heat_cool
     );
     if (hasCooling && hasHeating) {
       const hasAutoMode = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
@@ -177974,13 +178000,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         return composed;
       }
       const resolvedMatterType = mapping?.matterDeviceType ?? (entityId.startsWith("fan.") ? "fan" : void 0);
-      if (resolvedMatterType === "air_purifier" && entity.device_id) {
-        const temperatureEntityId = registry2.findTemperatureEntityForDevice(
-          entity.device_id
-        );
-        const humidityEntityId = registry2.findHumidityEntityForDevice(
-          entity.device_id
-        );
+      if (resolvedMatterType === "air_purifier") {
+        const temperatureEntityId = effectiveMapping?.temperatureEntity || (entity.device_id ? registry2.findTemperatureEntityForDevice(entity.device_id) : void 0);
+        const humidityEntityId = effectiveMapping?.humidityEntity || (entity.device_id ? registry2.findHumidityEntityForDevice(entity.device_id) : void 0);
         if (temperatureEntityId || humidityEntityId) {
           const composedAreaName = registry2.getAreaName(entityId);
           const composed = await ComposedAirPurifierEndpoint.create({
@@ -178590,11 +178612,8 @@ var BridgeEndpointManager = class extends Service {
         const matterType = m?.matterDeviceType ?? "fan";
         if (matterType !== "air_purifier") continue;
         const ent = this.registry.entity(eid);
-        if (!ent?.device_id) continue;
-        const tempId = this.registry.findTemperatureEntityForDevice(
-          ent.device_id
-        );
-        const humId = this.registry.findHumidityEntityForDevice(ent.device_id);
+        const tempId = m?.temperatureEntity || (ent?.device_id ? this.registry.findTemperatureEntityForDevice(ent.device_id) : void 0);
+        const humId = m?.humidityEntity || (ent?.device_id ? this.registry.findHumidityEntityForDevice(ent.device_id) : void 0);
         if (tempId) this.registry.markComposedSubEntityUsed(tempId);
         if (humId) this.registry.markComposedSubEntityUsed(humId);
       }