@riddix/hamh 2.1.0-alpha.843 → 2.1.0-alpha.845

package/README.md

@@ -37,7 +37,7 @@ of port forwarding etc.
 
 | Channel | Branch | Current Version | Description |
 |---------|--------|-----------------|-------------|
-| **Stable** | `main` | v2.0.51 | Production-ready, recommended for most users |
+| **Stable** | `main` | v2.0.52 | Production-ready, recommended for most users |
 | **Alpha** | `alpha` | v2.1.0-alpha.x (next) | Currently level with Stable; next pre-release lands here first |
 | **Testing** | `testing` | v4.1.0-testing.x | ⚠️ **Highly unstable!** Experimental features, may break |
 
@@ -61,9 +61,13 @@ Re-assign the affected devices to their rooms after they reconnect. See the [doc
 ## 🎉 What's New
 
 <details>
-<summary><strong>📦 Stable Features (v2.0.51)</strong> - Click to expand</summary>
+<summary><strong>📦 Stable Features (v2.0.52)</strong> - Click to expand</summary>
 
-**New in v2.0.51:**
+**New in v2.0.52 (hotfix release):**
+
+- 🔌 The plugins page no longer fails with a 500 when a server mode bridge exists ([#430](https://github.com/RiDDiX/home-assistant-matter-hub/issues/430))
+
+**Previously in v2.0.51:**
 
 - 🐕 **Opt-in wedge watchdog**: rotates a controller session that keeps acking but stops talking at the interaction layer, the automated "Play Sound" fix for stuck Apple devices ([#287](https://github.com/RiDDiX/home-assistant-matter-hub/issues/287), [#428](https://github.com/RiDDiX/home-assistant-matter-hub/issues/428))
 - 🧹 **Clean up orphaned records**: bridge menu action with a dry-run preview that removes identity and mapping leftovers of entities deleted from HA (7 day tombstone guards against false positives)
@@ -266,7 +270,7 @@ Re-assign the affected devices to their rooms after they reconnect. See the [doc
 <details>
 <summary><strong>🧪 Alpha Features (v2.1.0-alpha.x)</strong> - Click to expand</summary>
 
-**Alpha is currently level with Stable (v2.0.51).** All alpha work up to the latest pre-release has been promoted into v2.0.51. New alpha work continues from the next pre-release tag onward and will appear here as development progresses.
+**Alpha is currently level with Stable (v2.0.52).** All alpha work up to the latest pre-release has been promoted into v2.0.52. New alpha work continues from the next pre-release tag onward and will appear here as development progresses.
 
 </details>
 

package/dist/backend/cli.js

@@ -133183,7 +133183,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     fanWindPresets: config11.fanWindPresets,
                     fanRestoreSpeedOnPowerOn: config11.fanRestoreSpeedOnPowerOn,
                     composedEntities: config11.composedEntities,
-                    disableMomentaryFlip: config11.disableMomentaryFlip
+                    disableMomentaryFlip: config11.disableMomentaryFlip,
+                    vacuumAscendingRoomOrder: config11.vacuumAscendingRoomOrder
                   });
                   mappingsRestored++;
                 }
@@ -133346,7 +133347,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   customFanSpeedTags: config11.customFanSpeedTags,
                   fanWindPresets: config11.fanWindPresets,
                   composedEntities: config11.composedEntities,
-                  disableMomentaryFlip: config11.disableMomentaryFlip
+                  disableMomentaryFlip: config11.disableMomentaryFlip,
+                  vacuumAscendingRoomOrder: config11.vacuumAscendingRoomOrder
                 });
                 mappingsRestored++;
               }
@@ -134195,6 +134197,7 @@ function entityMappingApi(mappingStorage, identityStorage) {
       fanRestoreSpeedOnPowerOn: body.fanRestoreSpeedOnPowerOn,
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
+      vacuumAscendingRoomOrder: body.vacuumAscendingRoomOrder,
       disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
@@ -134704,7 +134707,8 @@ function configToProfileEntry(config11) {
     climateKeepModeOnIdle: config11.climateKeepModeOnIdle,
     climateExposeFan: config11.climateExposeFan,
     climateAutoMode: config11.climateAutoMode,
-    disableMomentaryFlip: config11.disableMomentaryFlip
+    disableMomentaryFlip: config11.disableMomentaryFlip,
+    vacuumAscendingRoomOrder: config11.vacuumAscendingRoomOrder
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -134845,7 +134849,8 @@ function mappingProfileApi(mappingStorage) {
           climateKeepModeOnIdle: entry.climateKeepModeOnIdle,
           climateExposeFan: entry.climateExposeFan,
           climateAutoMode: entry.climateAutoMode,
-          disableMomentaryFlip: entry.disableMomentaryFlip
+          disableMomentaryFlip: entry.disableMomentaryFlip,
+          vacuumAscendingRoomOrder: entry.vacuumAscendingRoomOrder
         });
         applied++;
       } catch (e) {
@@ -136243,6 +136248,9 @@ function runDiagnostics(mdnsInterface, mdnsIpv4) {
 import * as nodePath from "node:path";
 import express14 from "express";
 
+// src/plugins/builtin/names.ts
+var BUILTIN_PLUGIN_NAMES = ["camera"];
+
 // src/plugins/plugin-installer.ts
 init_esm();
 import { execFile } from "node:child_process";
@@ -136614,6 +136622,17 @@ var BLOCKED_PREFIXES = [
   "/boot",
   "/root"
 ];
+function packageBaseName(spec) {
+  const name = spec.trim();
+  const at = name.startsWith("@") ? name.lastIndexOf("@") : name.indexOf("@");
+  return at > 0 ? name.slice(0, at) : name;
+}
+function builtinPluginName(requested) {
+  const wanted = requested.trim().toLowerCase();
+  return BUILTIN_PLUGIN_NAMES.find(
+    (name) => name.trim().toLowerCase() === wanted
+  );
+}
 function pluginApi(bridgeService, storageLocation) {
   const router = express14.Router();
   const installer = new PluginInstaller(storageLocation);
@@ -136721,6 +136740,14 @@ function pluginApi(bridgeService, storageLocation) {
       res.status(400).json({ error: "packageName is required" });
       return;
     }
+    const baseName = packageBaseName(packageName);
+    const builtin = builtinPluginName(baseName);
+    if (builtin) {
+      res.status(400).json({
+        error: `"${builtin}" is built in and needs no installation. Enable and configure it on the plugins page.`
+      });
+      return;
+    }
     try {
       const result = await installer.install(packageName);
       if (!result.success) {
@@ -136730,10 +136757,10 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
-      registry3.add(packageName, config11 ?? {});
+      registry3.add(baseName, config11 ?? {});
       res.json({
         success: true,
-        packageName,
+        packageName: baseName,
         version: result.version,
         message: "Plugin installed. Restart the bridge to load it."
       });
@@ -136798,6 +136825,13 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
+      const reservedUpload = builtinPluginName(result.packageName);
+      if (reservedUpload) {
+        res.status(400).json({
+          error: `"${reservedUpload}" is built in and needs no installation. Enable and configure it on the plugins page.`
+        });
+        return;
+      }
       registry3.add(result.packageName, {});
       res.json({
         success: true,
@@ -136831,6 +136865,13 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
+      const reservedLocal = builtinPluginName(result.packageName);
+      if (reservedLocal) {
+        res.status(400).json({
+          error: `"${reservedLocal}" is built in and needs no installation. Enable and configure it on the plugins page.`
+        });
+        return;
+      }
       registry3.add(result.packageName, {});
       res.json({
         success: true,
@@ -139564,6 +139605,7 @@ var EntityMappingStorage = class extends Service {
       fanRestoreSpeedOnPowerOn: request.fanRestoreSpeedOnPowerOn || void 0,
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
+      vacuumAscendingRoomOrder: request.vacuumAscendingRoomOrder || void 0,
       disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
@@ -139581,7 +139623,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.voltageEntity && !config11.currentEntity && !config11.batteryPowerEntity && !config11.batteryEnergyEntity && !config11.chargingSwitchEntity && !config11.currentLimitEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
+    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.voltageEntity && !config11.currentEntity && !config11.batteryPowerEntity && !config11.batteryEnergyEntity && !config11.chargingSwitchEntity && !config11.currentLimitEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.vacuumAscendingRoomOrder && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -159131,7 +159173,7 @@ var DefaultPowerSourceServer = PowerSourceServer2(defaultBatteryConfig);
 
 // src/matter/behaviors/power-topology-server.ts
 var HaPowerTopologyServer = PowerTopologyServer.with(
-  PowerTopology3.Feature.NodeTopology
+  PowerTopology3.Feature.TreeTopology
 );
 
 // src/matter/behaviors/temperature-measurement-server.ts
@@ -165085,6 +165127,23 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       }
     }
   }
+  /**
+   * Snapshot the controller selection in the order the vacuum will actually
+   * clean it. Roborock-class devices clean a batch of segments in ascending
+   * id order and ignore the order they were dispatched in, so tracking has
+   * to follow that instead of the tap order (#368).
+   */
+  orderSelectedAreas(selectedAreas) {
+    const areas = [...selectedAreas];
+    try {
+      const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+      if (mapping?.vacuumAscendingRoomOrder) {
+        areas.sort((a, b) => a - b);
+      }
+    } catch {
+    }
+    return areas;
+  }
   /** Read the cumulative cleaned-area sensor (m2), or null if not configured. */
   readCleanedAreaSqm() {
     try {
@@ -165274,7 +165333,10 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       try {
         const serviceArea = this.agent.get(ServiceAreaBehavior);
         if (serviceArea.state.selectedAreas?.length > 0) {
-          s.activeAreas = [...serviceArea.state.selectedAreas];
+          s.activeAreas = this.orderSelectedAreas(
+            serviceArea.state.selectedAreas
+          );
+          serviceArea.state.selectedAreas = [...s.activeAreas];
           s.completedAreas.clear();
           s.lastCurrentArea = null;
           s.loggedShortCircuits.clear();
@@ -165313,7 +165375,10 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         try {
           const serviceArea = this.agent.get(ServiceAreaBehavior);
           if (serviceArea.state.selectedAreas?.length > 0) {
-            s.activeAreas = [...serviceArea.state.selectedAreas];
+            s.activeAreas = this.orderSelectedAreas(
+              serviceArea.state.selectedAreas
+            );
+            serviceArea.state.selectedAreas = [...s.activeAreas];
             s.completedAreas.clear();
             s.lastCurrentArea = null;
             s.loggedShortCircuits.clear();
@@ -167989,7 +168054,8 @@ var ElectricalMeterType = ElectricalMeterDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   PowerServer,
-  EnergyServer
+  EnergyServer,
+  HaPowerTopologyServer
 );
 
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
@@ -168257,6 +168323,8 @@ var EnergyEvseBase = EnergyEvseDevice.with(
   // ElectricalSensor device type.
   PowerServer,
   EnergyServer,
+  // ElectricalSensor requires PowerTopology; matter.js does not enforce it.
+  HaPowerTopologyServer,
   DescriptorServer
 ).set({
   descriptor: {
@@ -169992,7 +170060,16 @@ init_esm();
 
 // src/matter/behaviors/service-area-server.ts
 init_esm();
+init_home_assistant_entity_behavior();
 var logger234 = Logger.get("ServiceAreaServer");
+function orderSelection(areas, agent) {
+  try {
+    const ascending = agent?.get(HomeAssistantEntityBehavior).state.mapping?.vacuumAscendingRoomOrder === true;
+    return ascending ? [...areas].sort((a, b) => a - b) : areas;
+  } catch {
+    return areas;
+  }
+}
 var ServiceAreaWithProgress = ServiceAreaBehavior.with(
   ServiceArea3.Feature.ProgressReporting
 );
@@ -170002,7 +170079,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
     logger234.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
-    const uniqueAreas = [...new Set(newAreas)];
+    const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
     const supportedAreaIds = this.state.supportedAreas.map((a) => a.areaId);
     const invalidAreas = uniqueAreas.filter(
       (id) => !supportedAreaIds.includes(id)
@@ -170061,7 +170138,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
     logger234.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
-    const uniqueAreas = [...new Set(newAreas)];
+    const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
     const supportedAreaIds = this.state.supportedAreas.map((a) => a.areaId);
     const invalidAreas = uniqueAreas.filter(
       (id) => !supportedAreaIds.includes(id)
@@ -173885,6 +173962,11 @@ var CameraPlugin = class {
   }
 };
 
+// src/plugins/builtin/index.ts
+var BUILTIN_PLUGINS = [
+  CameraPlugin
+];
+
 // src/services/bridges/bridge-endpoint-manager.ts
 init_diagnostic_event_bus();
 
@@ -174341,10 +174423,16 @@ var BridgeEndpointManager = class extends Service {
   // matter.js instance and can hand over live EndpointTypes.
   async registerBuiltInPlugins() {
     if (!this.pluginManager) return;
-    try {
-      await this.pluginManager.registerBuiltIn(new CameraPlugin());
-    } catch (e) {
-      this.log.warn("Failed to register built-in camera plugin:", e);
+    for (const Plugin of BUILTIN_PLUGINS) {
+      const plugin = new Plugin();
+      try {
+        await this.pluginManager.registerBuiltIn(plugin);
+      } catch (e) {
+        this.log.warn(
+          `Failed to register built-in plugin "${plugin.name}":`,
+          e
+        );
+      }
     }
   }
   async loadRegisteredPlugins() {