@riddix/hamh 2.0.41 → 2.0.42

package/README.md

@@ -37,7 +37,7 @@ of port forwarding etc.
 
 | Channel | Branch | Current Version | Description |
 |---------|--------|-----------------|-------------|
-| **Stable** | `main` | v2.0.41 | Production-ready, recommended for most users |
+| **Stable** | `main` | v2.0.42 | Production-ready, recommended for most users |
 | **Alpha** | `alpha` | v2.1.0-alpha.x | Pre-release with new features, for early adopters |
 | **Testing** | `testing` | v4.1.0-testing.x | ⚠️ **Highly unstable!** Experimental features, may break |
 
@@ -52,9 +52,16 @@ of port forwarding etc.
 ## 🎉 What's New
 
 <details>
-<summary><strong>📦 Stable Features (v2.0.41)</strong> - Click to expand</summary>
+<summary><strong>📦 Stable Features (v2.0.42)</strong> - Click to expand</summary>
 
-**New in v2.0.41:**
+**New in v2.0.42 (hotfix release):**
+
+- 🇯🇵 Aqara bridge registration no longer stalls — root `softwareVersionString` now matches the numeric `softwareVersion` ([#316](https://github.com/RiDDiX/home-assistant-matter-hub/issues/316))
+- ❄️ Climate `auto` mode is clamped to `heat`/`cool` on devices without an `AutoMode` base ([#319](https://github.com/RiDDiX/home-assistant-matter-hub/issues/319))
+- 🌀 Per-entity `disableClimateFanControl` mapping flag — falls back to `ThermostatDevice` when controllers like Aqara don't recognise `RoomAirConditioner` (`0x0072`) ([#318](https://github.com/RiDDiX/home-assistant-matter-hub/issues/318))
+- 🗺️ Vacuum service area `selectedAreas` is kept after dispatch instead of being cleared
+
+**Previously in v2.0.41:**
 
 | Feature | Description |
 |---------|-------------|
@@ -127,7 +134,7 @@ of port forwarding etc.
 <details>
 <summary><strong>🧪 Alpha Features (v2.1.0-alpha.x)</strong> - Click to expand</summary>
 
-**Alpha is currently level with Stable (v2.0.41).** All alpha work from the v2.1.0-alpha.601 line through v2.1.0-alpha.626 has been promoted into v2.0.41. New alpha work continues from `v2.1.0-alpha.627` onward and will appear here as development progresses.
+**Alpha is currently level with Stable (v2.0.42).** All alpha work through `v2.1.0-alpha.633` has been promoted into v2.0.42. New alpha work continues from `v2.1.0-alpha.634` onward and will appear here as development progresses.
 
 </details>
 

package/dist/backend/cli.js

@@ -147874,6 +147874,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     valetudoIdentifier: config10.valetudoIdentifier,
                     coverSwapOpenClose: config10.coverSwapOpenClose,
                     disableClimateOnOff: config10.disableClimateOnOff,
+                    disableClimateFanControl: config10.disableClimateFanControl,
                     customServiceAreas: config10.customServiceAreas,
                     customFanSpeedTags: config10.customFanSpeedTags,
                     composedEntities: config10.composedEntities
@@ -148020,6 +148021,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   valetudoIdentifier: config10.valetudoIdentifier,
                   coverSwapOpenClose: config10.coverSwapOpenClose,
                   disableClimateOnOff: config10.disableClimateOnOff,
+                  disableClimateFanControl: config10.disableClimateFanControl,
                   customServiceAreas: config10.customServiceAreas,
                   customFanSpeedTags: config10.customFanSpeedTags,
                   composedEntities: config10.composedEntities
@@ -148840,6 +148842,7 @@ function entityMappingApi(mappingStorage) {
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       disableClimateOnOff: body.disableClimateOnOff,
+      disableClimateFanControl: body.disableClimateFanControl,
       composedEntities: body.composedEntities
     };
     const config10 = await mappingStorage.setMapping(request);
@@ -149303,7 +149306,8 @@ function configToProfileEntry(config10) {
     customFanSpeedTags: config10.customFanSpeedTags,
     valetudoIdentifier: config10.valetudoIdentifier,
     coverSwapOpenClose: config10.coverSwapOpenClose,
-    disableClimateOnOff: config10.disableClimateOnOff
+    disableClimateOnOff: config10.disableClimateOnOff,
+    disableClimateFanControl: config10.disableClimateFanControl
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149425,7 +149429,8 @@ function mappingProfileApi(mappingStorage) {
           customFanSpeedTags: entry.customFanSpeedTags,
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
-          disableClimateOnOff: entry.disableClimateOnOff
+          disableClimateOnOff: entry.disableClimateOnOff,
+          disableClimateFanControl: entry.disableClimateFanControl
         });
         applied++;
       } catch (e) {
@@ -153295,9 +153300,10 @@ var EntityMappingStorage = class extends Service {
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       disableClimateOnOff: request.disableClimateOnOff || void 0,
+      disableClimateFanControl: request.disableClimateFanControl || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && 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.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.disableClimateOnOff && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && 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.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.disableClimateOnOff && !config10.disableClimateFanControl && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -167516,7 +167522,9 @@ function createBridgeServerConfig(data) {
       hardwareVersion: data.basicInformation.hardwareVersion,
       softwareVersion: data.basicInformation.softwareVersion,
       hardwareVersionString: data.basicInformation.hardwareVersionString,
-      softwareVersionString: data.basicInformation.softwareVersionString ?? String(data.basicInformation.softwareVersion),
+      // Keep the root string aligned with the numeric softwareVersion. Aqara
+      // stalls bridge registration when the two diverge (#316).
+      softwareVersionString: String(data.basicInformation.softwareVersion),
       ...data.countryCode ? { location: data.countryCode } : {}
     },
     subscriptions: {
@@ -171745,7 +171753,9 @@ var config4 = {
         const direction = getHeatCoolOnlyDirection(entity, agent);
         return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
       }
-      const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) || modes.includes(ClimateHvacMode.auto);
+      const hasCoolCapability = modes.includes(ClimateHvacMode.cool) || modes.includes(ClimateHvacMode.heat_cool);
+      const hasHeatCapability = modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.heat_cool);
+      const hasMatterAuto = (modes.includes(ClimateHvacMode.heat_cool) || modes.includes(ClimateHvacMode.auto)) && hasCoolCapability && hasHeatCapability;
       if (hasMatterAuto) {
         return systemMode;
       }
@@ -171917,10 +171927,7 @@ function ClimateDevice(homeAssistantEntity) {
   }
   const supportsHumidity = attributes7.current_humidity != null || testBit(supportedFeatures, ClimateDeviceFeature.TARGET_HUMIDITY);
   const supportsOnOff = testBit(supportedFeatures, ClimateDeviceFeature.TURN_ON) && testBit(supportedFeatures, ClimateDeviceFeature.TURN_OFF) && homeAssistantEntity.mapping?.disableClimateOnOff !== true;
-  const supportsFanMode = testBit(
-    supportedFeatures,
-    ClimateDeviceFeature.FAN_MODE
-  );
+  const supportsFanMode = testBit(supportedFeatures, ClimateDeviceFeature.FAN_MODE) && homeAssistantEntity.mapping?.disableClimateFanControl !== true;
   const initialState = {
     // Pass actual current_temperature for initial state.
     // If unavailable (null/undefined), update() will fall back to the
@@ -177608,9 +177615,8 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAr
   }
   return modes;
 }
-function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, serviceArea) {
+function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant) {
   const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
-  serviceArea.state.selectedAreas = [];
   if (matched.length === 0) {
     logger194.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
@@ -177680,14 +177686,12 @@ var vacuumRvcRunModeConfig = {
           return handleCustomServiceAreas(
             selectedAreas,
             customAreas,
-            homeAssistant,
-            serviceArea
+            homeAssistant
           );
         }
         const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
         if (cleanAreaRooms && cleanAreaRooms.length > 0) {
           const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
-          serviceArea.state.selectedAreas = [];
           if (haAreaIds.length > 0) {
             logger194.info(
               `CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`
@@ -177713,7 +177717,6 @@ var vacuumRvcRunModeConfig = {
             logger194.info(
               `Roborock: Pressing button entities for selected rooms: ${buttonEntityIds.join(", ")}`
             );
-            serviceArea.state.selectedAreas = [];
             for (let i = 1; i < buttonEntityIds.length; i++) {
               homeAssistant.callAction({
                 action: "button.press",
@@ -177728,7 +177731,6 @@ var vacuumRvcRunModeConfig = {
         }
         const vacuumEntityId = homeAssistant.entityId;
         if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-          serviceArea.state.selectedAreas = [];
           return buildValetudoSegmentAction(
             vacuumEntityId,
             selectedAreas,
@@ -177751,7 +177753,6 @@ var vacuumRvcRunModeConfig = {
           logger194.info(
             `Starting cleaning with selected areas: ${roomIds.join(", ")}`
           );
-          serviceArea.state.selectedAreas = [];
           if (isDreameVacuum(attributes7)) {
             if (targetMapName) {
               const vacName = vacuumEntityId.replace("vacuum.", "");