@riddix/hamh 2.1.0-alpha.413 → 2.1.0-alpha.415

package/dist/backend/cli.js

@@ -172691,7 +172691,7 @@ function createCustomServiceAreaServer(customAreas) {
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger181 = Logger.get("VacuumRvcRunModeServer");
-function buildSupportedModes2(attributes7, includeUnnamedRooms = false) {
+function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAreas) {
   const modes = [
     {
       label: "Idle",
@@ -172704,22 +172704,37 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false) {
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     }
   ];
-  const rooms = parseVacuumRooms(attributes7, includeUnnamedRooms);
-  rooms.sort((a, b) => a.name.localeCompare(b.name));
-  for (const room of rooms) {
-    const modeValue = getRoomModeValue(room);
-    if (modeValue > 255) continue;
-    modes.push({
-      label: room.name,
-      mode: modeValue,
-      modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
-    });
+  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 }]
+      });
+    }
+  } else {
+    const rooms = parseVacuumRooms(attributes7, includeUnnamedRooms);
+    rooms.sort((a, b) => a.name.localeCompare(b.name));
+    for (const room of rooms) {
+      const modeValue = getRoomModeValue(room);
+      if (modeValue > 255) continue;
+      modes.push({
+        label: room.name,
+        mode: modeValue,
+        modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
+      });
+    }
   }
   return modes;
 }
 function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, serviceArea) {
-  serviceArea.state.selectedAreas = [];
   const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
+  serviceArea.state.selectedAreas = [];
   if (matched.length === 0) {
     logger181.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
@@ -172768,8 +172783,8 @@ var vacuumRvcRunModeConfig = {
   start: (_, agent) => {
     try {
       const serviceArea = agent.get(ServiceAreaBehavior);
-      const selectedAreas = serviceArea.state.selectedAreas;
-      if (selectedAreas && selectedAreas.length > 0) {
+      const selectedAreas = [...serviceArea.state.selectedAreas];
+      if (selectedAreas.length > 0) {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
         const entity = homeAssistant.entity;
         const attributes7 = entity.state.attributes;
@@ -172898,22 +172913,15 @@ var vacuumRvcRunModeConfig = {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const entity = homeAssistant.entity;
     const attributes7 = entity.state.attributes;
-    const rooms = parseVacuumRooms(attributes7);
-    const numericIdFromMode = getRoomIdFromMode(roomMode);
-    logger181.info(
-      `cleanRoom called: roomMode=${roomMode}, numericIdFromMode=${numericIdFromMode}`
-    );
-    logger181.info(
-      `Available rooms: ${JSON.stringify(rooms.map((r) => ({ id: r.id, name: r.name, modeValue: getRoomModeValue(r) })))}`
-    );
-    const room = rooms.find((r) => getRoomModeValue(r) === roomMode);
-    logger181.info(
-      `Found room by mode match: ${room ? `${room.name} (id=${room.id})` : "none"}`
-    );
+    logger181.info(`cleanRoom called: roomMode=${roomMode}`);
     const customAreas = homeAssistant.state.mapping?.customServiceAreas;
-    if (customAreas && customAreas.length > 0 && room) {
-      const area = customAreas.find((a) => a.name === room.name);
-      if (area) {
+    if (customAreas && customAreas.length > 0) {
+      const sorted = [...customAreas].sort(
+        (a, b) => a.name.localeCompare(b.name)
+      );
+      const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
+      if (areaIndex >= 0 && areaIndex < sorted.length) {
+        const area = sorted[areaIndex];
         logger181.info(
           `cleanRoom: custom service area "${area.name}" \u2192 ${area.service}`
         );
@@ -172924,6 +172932,12 @@ var vacuumRvcRunModeConfig = {
         };
       }
     }
+    const rooms = parseVacuumRooms(attributes7);
+    const numericIdFromMode = getRoomIdFromMode(roomMode);
+    logger181.info(
+      `cleanRoom: numericIdFromMode=${numericIdFromMode}, available rooms: ${JSON.stringify(rooms.map((r) => ({ id: r.id, name: r.name, modeValue: getRoomModeValue(r) })))}`
+    );
+    const room = rooms.find((r) => getRoomModeValue(r) === roomMode);
     if (room) {
       const commandId3 = room.originalId ?? room.id;
       const vacuumEntityId = entity.entity_id;
@@ -172992,11 +173006,15 @@ var vacuumRvcRunModeConfig = {
     return { action: "vacuum.start" };
   }
 };
-function createVacuumRvcRunModeServer(attributes7, includeUnnamedRooms = false) {
+function createVacuumRvcRunModeServer(attributes7, includeUnnamedRooms = false, customAreas) {
   const allRooms = parseVacuumRooms(attributes7, true);
   const rooms = includeUnnamedRooms ? allRooms : parseVacuumRooms(attributes7, false);
   const filteredCount = allRooms.length - rooms.length;
-  const supportedModes = buildSupportedModes2(attributes7, includeUnnamedRooms);
+  const supportedModes = buildSupportedModes2(
+    attributes7,
+    includeUnnamedRooms,
+    customAreas
+  );
   logger181.info(
     `Creating VacuumRvcRunModeServer with ${rooms.length} rooms, ${supportedModes.length} total modes`
   );
@@ -173994,11 +174012,16 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
   }
   const entityId = homeAssistantEntity.entity.entity_id;
   const attributes7 = homeAssistantEntity.entity.state.attributes;
+  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   logger186.info(
     `Creating vacuum endpoint for ${entityId}, mapping: ${JSON.stringify(homeAssistantEntity.mapping ?? "none")}`
   );
   let device = VacuumEndpointType.with(
-    createVacuumRvcRunModeServer(attributes7)
+    createVacuumRvcRunModeServer(
+      attributes7,
+      false,
+      customAreas && customAreas.length > 0 ? customAreas : void 0
+    )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
     logger186.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
@@ -174007,7 +174030,6 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
   if (!minimalClusters) {
     device = device.with(VacuumPowerSourceServer);
   }
-  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
   logger186.info(