@riddix/hamh 2.1.0-alpha.647 → 2.1.0-alpha.649

package/README.md

@@ -37,7 +37,7 @@ of port forwarding etc.
 
 | Channel | Branch | Current Version | Description |
 |---------|--------|-----------------|-------------|
-| **Stable** | `main` | v2.0.42 | Production-ready, recommended for most users |
+| **Stable** | `main` | v2.0.43 | 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,23 @@ of port forwarding etc.
 ## 🎉 What's New
 
 <details>
-<summary><strong>📦 Stable Features (v2.0.42)</strong> - Click to expand</summary>
+<summary><strong>📦 Stable Features (v2.0.43)</strong> - Click to expand</summary>
 
-**New in v2.0.42 (hotfix release):**
+**New in v2.0.43:**
+
+- 🤖 Vacuum `currentArea` updates when cleaning is started outside HAMH ([#281](https://github.com/RiDDiX/home-assistant-matter-hub/issues/281))
+- 📡 Sensor reactors mark themselves offline when HA disconnects, so updates reach controllers on reconnect ([#327](https://github.com/RiDDiX/home-assistant-matter-hub/issues/327))
+- 🪟 Lift+tilt window coverings pick a valid Matter Type ([#323](https://github.com/RiDDiX/home-assistant-matter-hub/issues/323))
+- 🪟 Cover `device_class=window` maps to Rollershade ([#312](https://github.com/RiDDiX/home-assistant-matter-hub/issues/312))
+- 🧹 UWANT and Xiaomi sweep/mop labels recognised, mop usage routed via `mode.vacuum_mop` ([#322](https://github.com/RiDDiX/home-assistant-matter-hub/issues/322))
+- 🤖 Vacuum identify falls back to a sibling identify button when `vacuum.locate` is unsupported ([#320](https://github.com/RiDDiX/home-assistant-matter-hub/issues/320))
+- ❄️ HA-auto AC `systemMode` stays put when `hvac_action` is idle, ha-auto-only ACs no longer expose Matter Auto ([#309](https://github.com/RiDDiX/home-assistant-matter-hub/issues/309))
+- 🌡️ Climate setpoints snap to the entity `target_temp_step` ([#321](https://github.com/RiDDiX/home-assistant-matter-hub/issues/321))
+- 🛰️ matter.js controller traffic captured in `/api/logs`
+- 🇯🇵 Japanese translation by [@kimera257](https://github.com/kimera257) ([#325](https://github.com/RiDDiX/home-assistant-matter-hub/pull/325))
+- 📝 Docs note for the iPhone-only stuck-on-updating vacuum workaround ([#287](https://github.com/RiDDiX/home-assistant-matter-hub/issues/287))
+
+**Previously 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))
@@ -134,7 +148,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.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.
+**Alpha is currently level with Stable (v2.0.43).** All alpha work up to the latest pre-release has been promoted into v2.0.43. New alpha work continues from the next pre-release tag onward and will appear here as development progresses.
 
 </details>
 

package/dist/backend/cli.js

@@ -146813,6 +146813,12 @@ var init_bridge_config_schema = __esm({
           description: "Workaround for Alexa resetting light brightness to 100% after subscription renewal. When enabled, the bridge ignores brightness commands that set lights to 100% within 200ms of a turn-on command for the same light. WARNING: breaks Apple Home's 'set room to 100%' Siri commands, which use the same on() + moveToLevel(254) pattern. Only enable on Alexa-only bridges.",
           type: "boolean",
           default: false
+        },
+        useHaRegistrySerial: {
+          title: "Use HA Registry Serial Number",
+          description: "Fall back to the Home Assistant device registry serial_number when no per-entity customSerialNumber is configured. Default off because changing serialNumber after commissioning can confuse controllers. A per-entity customSerialNumber still takes precedence.",
+          type: "boolean",
+          default: false
         }
       }
     };
@@ -148842,6 +148848,7 @@ function entityMappingApi(mappingStorage) {
       customProductName: body.customProductName,
       customVendorName: body.customVendorName,
       customSerialNumber: body.customSerialNumber,
+      customVendorId: body.customVendorId,
       disabled: body.disabled,
       filterLifeEntity: body.filterLifeEntity,
       cleaningModeEntity: body.cleaningModeEntity,
@@ -153329,6 +153336,7 @@ var EntityMappingStorage = class extends Service {
       customProductName: request.customProductName?.trim() || void 0,
       customVendorName: request.customVendorName?.trim() || void 0,
       customSerialNumber: request.customSerialNumber?.trim() || void 0,
+      customVendorId: sanitizeVendorId(request.customVendorId),
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
@@ -153353,7 +153361,7 @@ var EntityMappingStorage = class extends Service {
       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.disableClimateFanControl && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.customVendorId === void 0 && 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);
@@ -153373,6 +153381,16 @@ var EntityMappingStorage = class extends Service {
     await this.persist();
   }
 };
+function sanitizeVendorId(value) {
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  const n = typeof value === "string" ? Number(value) : value;
+  if (typeof n !== "number" || !Number.isInteger(n) || n < 1 || n > 65534) {
+    return void 0;
+  }
+  return n;
+}
 
 // src/services/storage/lock-credential-storage.ts
 init_service();
@@ -165393,7 +165411,8 @@ var ServerModeServerNode = class extends ServerNode {
   async updateDeviceIdentity(entityId, device, mapping, friendlyName) {
     const nodeLabel = trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "...");
     const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? trimToLength(sanitizeMatterString(nodeLabel ?? ""), 32, "...") ?? void 0 : void 0;
-    const rawSerial = trimToLength(mapping?.customSerialNumber, 32, "...");
+    const registrySerial = this.featureFlags?.useHaRegistrySerial ? trimToLength(device?.serial_number, 32, "...") : void 0;
+    const rawSerial = trimToLength(mapping?.customSerialNumber, 32, "...") ?? registrySerial;
     const serialNumber = rawSerial && this.serialNumberSuffix ? trimToLength(`${rawSerial}${this.serialNumberSuffix}`, 32, "...") : rawSerial;
     const basicInformation = dropUndefined({
       vendorName: trimToLength(mapping?.customVendorName, 32, "...") ?? trimToLength(device?.manufacturer, 32, "..."),
@@ -168415,10 +168434,13 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const nodeLabel = ellipse(32, homeAssistant.state.customName) ?? ellipse(32, registryName) ?? ellipse(32, entity.state?.attributes?.friendly_name) ?? ellipse(32, entity.entity_id);
     const productNameFromNodeLabel = featureFlags?.productNameFromNodeLabel === true ? ellipse(32, sanitizeMatterString(nodeLabel ?? "")) ?? void 0 : void 0;
     const serialNumberSuffix = this.env.get(BridgeDataProvider).serialNumberSuffix;
-    const rawSerial = ellipse(32, mapping?.customSerialNumber) ?? hash(32, entity.entity_id);
+    const registrySerial = featureFlags?.useHaRegistrySerial ? ellipse(32, device?.serial_number) : void 0;
+    const rawSerial = ellipse(32, mapping?.customSerialNumber) ?? registrySerial ?? hash(32, entity.entity_id);
     const serialNumber = serialNumberSuffix ? ellipse(32, `${rawSerial}${serialNumberSuffix}`) : rawSerial;
+    const customVendorId = mapping?.customVendorId;
+    const vendorId3 = isValidVendorId(customVendorId) ? customVendorId : basicInformation.vendorId;
     applyPatchState(this.state, {
-      vendorId: VendorId(basicInformation.vendorId),
+      vendorId: VendorId(vendorId3),
       vendorName: ellipse(32, mapping?.customVendorName) ?? ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
       productName: ellipse(32, mapping?.customProductName) ?? productNameFromNodeLabel ?? ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
       productLabel: ellipse(64, device?.model) ?? hash(64, basicInformation.productLabel),
@@ -168443,6 +168465,9 @@ function hash(maxLength, value) {
   const suffix = crypto6.createHash("md5").update(value ?? "").digest("hex").substring(0, hashLength);
   return trimToLength(value, maxLength, suffix);
 }
+function isValidVendorId(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 1 && value <= 65534;
+}
 
 // src/matter/behaviors/electrical-energy-measurement-server.ts
 init_esm();
@@ -177002,26 +177027,22 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         );
         return;
       }
-      if (s.activeAreas.length === 0) {
-        this.logShortCircuitOnce(
-          "no-active-areas",
-          `currentRoom sensor: activeAreas empty while cleaning, sensor=${currentRoomEntityId} state="${roomState.state}"`
-        );
-        return;
-      }
       const serviceArea = this.agent.get(ServiceAreaBehavior);
+      const externalSession = s.activeAreas.length === 0;
+      const supportedAreaIds = serviceArea.state.supportedAreas.map(
+        (a) => a.areaId
+      );
+      const isAllowedArea = (id) => externalSession ? supportedAreaIds.includes(id) : s.activeAreas.includes(id);
       const sensorAttrs = roomState.attributes;
       const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
-      if (segmentId != null) {
-        if (s.activeAreas.includes(segmentId)) {
-          matchedAreaId = segmentId;
-        }
+      if (segmentId != null && isAllowedArea(segmentId)) {
+        matchedAreaId = segmentId;
       }
       if (matchedAreaId === null && segmentId != null) {
         for (const area of serviceArea.state.supportedAreas) {
-          if (s.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
+          if (isAllowedArea(area.areaId) && area.areaId % 1e4 === segmentId) {
             matchedAreaId = area.areaId;
             break;
           }
@@ -177031,7 +177052,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
         );
-        if (area && s.activeAreas.includes(area.areaId)) {
+        if (area && isAllowedArea(area.areaId)) {
           matchedAreaId = area.areaId;
         }
       }