@riddix/hamh 2.1.0-alpha.503 → 2.1.0-alpha.505

package/dist/backend/cli.js

@@ -147774,7 +147774,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     powerEntity: config10.powerEntity,
                     energyEntity: config10.energyEntity,
                     suctionLevelEntity: config10.suctionLevelEntity,
-                    mopIntensityEntity: config10.mopIntensityEntity
+                    mopIntensityEntity: config10.mopIntensityEntity,
+                    valetudoIdentifier: config10.valetudoIdentifier
                   });
                   mappingsRestored++;
                 }
@@ -148669,7 +148670,8 @@ function entityMappingApi(mappingStorage) {
       suctionLevelEntity: body.suctionLevelEntity,
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
-      customFanSpeedTags: body.customFanSpeedTags
+      customFanSpeedTags: body.customFanSpeedTags,
+      valetudoIdentifier: body.valetudoIdentifier
     };
     const config10 = await mappingStorage.setMapping(request);
     res.status(200).json(config10);
@@ -149129,7 +149131,8 @@ function configToProfileEntry(config10) {
     suctionLevelEntity: config10.suctionLevelEntity,
     mopIntensityEntity: config10.mopIntensityEntity,
     customServiceAreas: config10.customServiceAreas,
-    customFanSpeedTags: config10.customFanSpeedTags
+    customFanSpeedTags: config10.customFanSpeedTags,
+    valetudoIdentifier: config10.valetudoIdentifier
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149247,7 +149250,8 @@ function mappingProfileApi(mappingStorage) {
           suctionLevelEntity: entry.suctionLevelEntity,
           mopIntensityEntity: entry.mopIntensityEntity,
           customServiceAreas: entry.customServiceAreas,
-          customFanSpeedTags: entry.customFanSpeedTags
+          customFanSpeedTags: entry.customFanSpeedTags,
+          valetudoIdentifier: entry.valetudoIdentifier
         });
         applied++;
       } catch (e) {
@@ -152681,9 +152685,10 @@ var EntityMappingStorage = class extends Service {
       customServiceAreas: request.customServiceAreas?.filter(
         (a) => a.name?.trim() && a.service?.trim()
       ) ?? void 0,
-      customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0
+      customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
+      valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !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)) {
+    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !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.valetudoIdentifier) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -175848,6 +175853,26 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger191 = Logger.get("VacuumRvcRunModeServer");
+function buildValetudoSegmentAction(vacuumEntityId, segmentIds, valetudoIdentifier) {
+  const identifier = valetudoIdentifier || vacuumEntityId.replace(/^vacuum\.valetudo_/, "");
+  const topic = `valetudo/${identifier}/MapSegmentationCapability/clean/set`;
+  logger191.info(
+    `Valetudo: mqtt.publish to ${topic}, segments: ${segmentIds.join(", ")}`
+  );
+  return {
+    action: "mqtt.publish",
+    target: false,
+    data: {
+      topic,
+      payload: JSON.stringify({
+        action: "start_segment_action",
+        segment_ids: segmentIds.map(String),
+        iterations: 1,
+        customOrder: true
+      })
+    }
+  };
+}
 function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAreas) {
   const modes = [
     {
@@ -176006,6 +176031,15 @@ var vacuumRvcRunModeConfig = {
             };
           }
         }
+        const vacuumEntityId = homeAssistant.entityId;
+        if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
+          serviceArea.state.selectedAreas = [];
+          return buildValetudoSegmentAction(
+            vacuumEntityId,
+            selectedAreas,
+            homeAssistant.state.mapping?.valetudoIdentifier
+          );
+        }
         const rooms = parseVacuumRooms(attributes7);
         const roomIds = [];
         let targetMapName;
@@ -176023,25 +176057,6 @@ var vacuumRvcRunModeConfig = {
             `Starting cleaning with selected areas: ${roomIds.join(", ")}`
           );
           serviceArea.state.selectedAreas = [];
-          const vacuumEntityId = homeAssistant.entityId;
-          if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-            const identifier = vacuumEntityId.replace(/^vacuum\.valetudo_/, "");
-            logger191.info(
-              `Valetudo vacuum: Using mqtt.publish segment_cleanup for rooms: ${roomIds.join(", ")}`
-            );
-            return {
-              action: "mqtt.publish",
-              target: false,
-              data: {
-                topic: `valetudo/${identifier}/MapSegmentationCapability/clean/set`,
-                payload: JSON.stringify({
-                  segment_ids: roomIds.map(String),
-                  iterations: 1,
-                  customOrder: true
-                })
-              }
-            };
-          }
           if (isDreameVacuum(attributes7)) {
             if (targetMapName) {
               const vacName = vacuumEntityId.replace("vacuum.", "");
@@ -176146,6 +176161,15 @@ var vacuumRvcRunModeConfig = {
         };
       }
     }
+    const vacuumEntityId = entity.entity_id;
+    if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
+      const segmentId = getRoomIdFromMode(roomMode);
+      return buildValetudoSegmentAction(
+        vacuumEntityId,
+        [segmentId],
+        homeAssistant.state.mapping?.valetudoIdentifier
+      );
+    }
     const rooms = parseVacuumRooms(attributes7);
     const numericIdFromMode = getRoomIdFromMode(roomMode);
     logger191.info(
@@ -176154,25 +176178,6 @@ var vacuumRvcRunModeConfig = {
     const room = rooms.find((r) => getRoomModeValue(r) === roomMode);
     if (room) {
       const commandId3 = room.originalId ?? room.id;
-      const vacuumEntityId = entity.entity_id;
-      if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-        const identifier = vacuumEntityId.replace(/^vacuum\.valetudo_/, "");
-        logger191.info(
-          `Valetudo vacuum: Using mqtt.publish segment_cleanup for room ${room.name} (id: ${commandId3})`
-        );
-        return {
-          action: "mqtt.publish",
-          target: false,
-          data: {
-            topic: `valetudo/${identifier}/MapSegmentationCapability/clean/set`,
-            payload: JSON.stringify({
-              segment_ids: [String(commandId3)],
-              iterations: 1,
-              customOrder: true
-            })
-          }
-        };
-      }
       if (isDreameVacuum(attributes7)) {
         if (room.mapName) {
           const vacuumName = vacuumEntityId.replace("vacuum.", "");