@riddix/hamh 2.1.0-alpha.733 → 2.1.0-alpha.735

package/dist/backend/cli.js

@@ -126800,6 +126800,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,
@@ -131420,6 +131421,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 +131432,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);
@@ -158400,6 +158402,9 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         cleaned,
         ordered
       );
+      logger217.debug(
+        `cleanedArea: raw=${raw} baseline=${s.cleanedAreaBaseline} cleaned=${cleaned} sizes=[${ordered.map((o) => `${o.areaId}:${o.sizeSqm}`).join(",")}] -> current=${currentArea} completed=[${completed.join(",")}]`
+      );
       for (const id of completed) {
         s.completedAreas.add(id);
       }
@@ -159125,7 +159130,7 @@ function buildValetudoSegmentAction(vacuumEntityId, segmentIds, valetudoIdentifi
     }
   };
 }
-function buildSupportedModes2(attributes8, includeUnnamedRooms = false, customAreas) {
+function buildSupportedModes2(attributes8, includeUnnamedRooms = false, customAreas, disableRoomModes = false) {
   const modes = [
     {
       label: "Idle",
@@ -159139,17 +159144,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);
@@ -159282,11 +159289,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
@@ -159543,14 +159552,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`
@@ -160603,7 +160613,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) {
@@ -163796,7 +163807,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) {