@riddix/hamh 2.1.0-alpha.646 → 2.1.0-alpha.648

package/dist/backend/cli.js

@@ -177002,26 +177002,22 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         );
         return;
       }
-      if (s.activeAreas.length === 0) {
-        this.logShortCircuitOnce(
-          "no-active-areas",
-          `currentRoom sensor: activeAreas empty while cleaning, sensor=${currentRoomEntityId} state="${roomState.state}"`
-        );
-        return;
-      }
       const serviceArea = this.agent.get(ServiceAreaBehavior);
+      const externalSession = s.activeAreas.length === 0;
+      const supportedAreaIds = serviceArea.state.supportedAreas.map(
+        (a) => a.areaId
+      );
+      const isAllowedArea = (id) => externalSession ? supportedAreaIds.includes(id) : s.activeAreas.includes(id);
       const sensorAttrs = roomState.attributes;
       const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
-      if (segmentId != null) {
-        if (s.activeAreas.includes(segmentId)) {
-          matchedAreaId = segmentId;
-        }
+      if (segmentId != null && isAllowedArea(segmentId)) {
+        matchedAreaId = segmentId;
       }
       if (matchedAreaId === null && segmentId != null) {
         for (const area of serviceArea.state.supportedAreas) {
-          if (s.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
+          if (isAllowedArea(area.areaId) && area.areaId % 1e4 === segmentId) {
             matchedAreaId = area.areaId;
             break;
           }
@@ -177031,7 +177027,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
         );
-        if (area && s.activeAreas.includes(area.areaId)) {
+        if (area && isAllowedArea(area.areaId)) {
           matchedAreaId = area.areaId;
         }
       }