@riddix/hamh 2.1.0-alpha.734 → 2.1.0-alpha.736

package/dist/backend/cli.js

@@ -124663,8 +124663,8 @@ var init_bridge_config_schema = __esm({
           default: false
         },
         serverMode: {
-          title: "Server Mode (for Robot Vacuums)",
-          description: "Expose the device as a standalone Matter device instead of a bridged device. This is required for Apple Home to properly support Siri voice commands for Robot Vacuums. IMPORTANT: Only ONE device should be in this bridge when server mode is enabled.",
+          title: "Server Mode (standalone device)",
+          description: "Expose the entity as a standalone Matter device instead of a bridged device. Works for any supported device type, e.g. robot vacuums need it for Apple Home Siri voice commands. IMPORTANT: Only ONE device should be in this bridge when server mode is enabled.",
           type: "boolean",
           default: false
         },
@@ -124822,7 +124822,10 @@ var init_create_bridge_request_schema = __esm({
   "../common/dist/schemas/create-bridge-request-schema.js"() {
     "use strict";
     init_bridge_config_schema();
-    createBridgeRequestSchema = bridgeConfigSchema;
+    createBridgeRequestSchema = {
+      ...bridgeConfigSchema,
+      required: ["name", "filter"]
+    };
   }
 });
 
@@ -126800,6 +126803,7 @@ function entityMappingApi(mappingStorage) {
       customFanSpeedTags: body.customFanSpeedTags,
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
+      disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       coverSliderDebounceMs: body.coverSliderDebounceMs,
@@ -130501,11 +130505,13 @@ var BridgeService = class extends Service {
     return this.bridges.find((bridge) => bridge.id === id);
   }
   async create(request) {
-    if (this.portUsed(request.port)) {
-      throw new Error(`Port already in use: ${request.port}`);
+    const port = request.port ?? this.getNextAvailablePort();
+    if (this.portUsed(port)) {
+      throw new Error(`Port already in use: ${port}`);
     }
     const bridge = await this.addBridge({
       ...request,
+      port,
       id: crypto3.randomUUID().replace(/-/g, ""),
       basicInformation: this.props.basicInformation
     });
@@ -131420,6 +131426,7 @@ var EntityMappingStorage = class extends Service {
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
+      disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
@@ -131430,7 +131437,7 @@ var EntityMappingStorage = class extends Service {
       climateAutoMode: request.climateAutoMode || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? 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.roomEntities && !config11.disableLockPin && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 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.roomEntities && !config11.disableLockPin && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -159128,7 +159135,7 @@ function buildValetudoSegmentAction(vacuumEntityId, segmentIds, valetudoIdentifi
     }
   };
 }
-function buildSupportedModes2(attributes8, includeUnnamedRooms = false, customAreas) {
+function buildSupportedModes2(attributes8, includeUnnamedRooms = false, customAreas, disableRoomModes = false) {
   const modes = [
     {
       label: "Idle",
@@ -159142,17 +159149,19 @@ function buildSupportedModes2(attributes8, includeUnnamedRooms = false, customAr
     }
   ];
   if (customAreas && customAreas.length > 0) {
-    const sorted = [...customAreas].sort(
-      (a, b) => a.name.localeCompare(b.name)
-    );
-    for (let i = 0; i < sorted.length; i++) {
-      const modeValue = ROOM_MODE_BASE2 + i + 1;
-      if (modeValue > 255) continue;
-      modes.push({
-        label: sorted[i].name,
-        mode: modeValue,
-        modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
-      });
+    if (!disableRoomModes) {
+      const sorted = [...customAreas].sort(
+        (a, b) => a.name.localeCompare(b.name)
+      );
+      for (let i = 0; i < sorted.length; i++) {
+        const modeValue = ROOM_MODE_BASE2 + i + 1;
+        if (modeValue > 255) continue;
+        modes.push({
+          label: sorted[i].name,
+          mode: modeValue,
+          modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
+        });
+      }
     }
   } else {
     const rooms = parseVacuumRooms(attributes8, includeUnnamedRooms);
@@ -159285,11 +159294,13 @@ var vacuumRvcRunModeConfig = {
   },
   getSupportedModes: (entity, agent) => {
     const attributes8 = entity.attributes;
-    const customAreas = agent.get(HomeAssistantEntityBehavior).state.mapping?.customServiceAreas;
+    const mapping = agent.get(HomeAssistantEntityBehavior).state.mapping;
+    const customAreas = mapping?.customServiceAreas;
     return buildSupportedModes2(
       attributes8,
       false,
-      customAreas && customAreas.length > 0 ? customAreas : void 0
+      customAreas && customAreas.length > 0 ? customAreas : void 0,
+      mapping?.disableCustomAreaRoomModes
     );
   },
   // biome-ignore lint/suspicious/noConfusingVoidType: Required by ValueSetter<void> interface
@@ -159546,14 +159557,15 @@ var vacuumRvcRunModeConfig = {
     return { action: "vacuum.start" };
   }
 };
-function createVacuumRvcRunModeServer(attributes8, includeUnnamedRooms = false, customAreas) {
+function createVacuumRvcRunModeServer(attributes8, includeUnnamedRooms = false, customAreas, disableRoomModes = false) {
   const allRooms = parseVacuumRooms(attributes8, true);
   const rooms = includeUnnamedRooms ? allRooms : parseVacuumRooms(attributes8, false);
   const filteredCount = allRooms.length - rooms.length;
   const supportedModes = buildSupportedModes2(
     attributes8,
     includeUnnamedRooms,
-    customAreas
+    customAreas,
+    disableRoomModes
   );
   logger220.info(
     `Creating VacuumRvcRunModeServer with ${rooms.length} rooms, ${supportedModes.length} total modes`
@@ -160606,7 +160618,8 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
     cleanAreaRooms && cleanAreaRooms.length > 0 ? createCleanAreaRvcRunModeServer(cleanAreaRooms) : createVacuumRvcRunModeServer(
       attributes8,
       false,
-      customAreas && customAreas.length > 0 ? customAreas : void 0
+      customAreas && customAreas.length > 0 ? customAreas : void 0,
+      homeAssistantEntity.mapping?.disableCustomAreaRoomModes
     )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
@@ -163799,7 +163812,8 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
     cleanAreaRooms && cleanAreaRooms.length > 0 ? createCleanAreaRvcRunModeServer(cleanAreaRooms) : createVacuumRvcRunModeServer(
       attributes8,
       false,
-      customAreas && customAreas.length > 0 ? customAreas : void 0
+      customAreas && customAreas.length > 0 ? customAreas : void 0,
+      homeAssistantEntity.mapping?.disableCustomAreaRoomModes
     )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
@@ -164096,20 +164110,20 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
 
 // src/services/bridges/server-mode-endpoint-manager.ts
 var ServerModeEndpointManager = class extends Service {
-  constructor(serverNode, client, registry2, mappingStorage, bridgeId, log) {
+  constructor(serverNode, client, registry2, mappingStorage, dataProvider, log) {
     super("ServerModeEndpointManager");
     this.serverNode = serverNode;
     this.client = client;
     this.registry = registry2;
     this.mappingStorage = mappingStorage;
-    this.bridgeId = bridgeId;
+    this.dataProvider = dataProvider;
     this.log = log;
   }
   serverNode;
   client;
   registry;
   mappingStorage;
-  bridgeId;
+  dataProvider;
   log;
   entityIds = [];
   unsubscribe;
@@ -164126,7 +164140,7 @@ var ServerModeEndpointManager = class extends Service {
     return this.deviceEndpoint;
   }
   getEntityMapping(entityId) {
-    return this.mappingStorage.getMapping(this.bridgeId, entityId);
+    return this.mappingStorage.getMapping(this.dataProvider.id, entityId);
   }
   computeMappingFingerprint(mapping) {
     if (!mapping) return "";
@@ -164177,6 +164191,10 @@ var ServerModeEndpointManager = class extends Service {
     this.entityIds = this.registry.entityIds;
     if (this.entityIds.length === 0) {
       this.log.warn("Server mode bridge has no entities configured");
+      this._failedEntities.push({
+        entityId: this.dataProvider.filter?.include?.[0]?.value ?? "(no entity configured)",
+        reason: "No Home Assistant entity matched this bridge's filter. Check for typos or renamed/removed entities."
+      });
       return;
     }
     if (this.entityIds.length > 1) {
@@ -164197,6 +164215,10 @@ var ServerModeEndpointManager = class extends Service {
       this.log.warn(
         `The only entity in server mode bridge is disabled: ${entityId}`
       );
+      this._failedEntities.push({
+        entityId,
+        reason: "The configured entity is disabled for this bridge."
+      });
       return;
     }
     const currentFp = this.computeMappingFingerprint(mapping);
@@ -164277,9 +164299,10 @@ var ServerModeEndpointManager = class extends Service {
       const reason = e instanceof Error ? e.message : String(e);
       this.log.error(`Failed to create server mode device ${entityId}:`, e);
       this._failedEntities.push({ entityId, reason });
-    }
-    if (this.unsubscribe) {
-      this.startObserving();
+    } finally {
+      if (this.unsubscribe) {
+        this.startObserving();
+      }
     }
   }
   async updateStates(states) {
@@ -164473,7 +164496,7 @@ var BridgeEnvironmentFactory = class extends BridgeFactory {
       await env.load(HomeAssistantClient),
       env.get(BridgeRegistry),
       await env.load(EntityMappingStorage),
-      dataProvider.id,
+      dataProvider,
       loggerService.get("ServerModeEndpointManager")
     );
     class ServerModeBridgeWithEnvironment extends ServerModeBridge {