@riddix/hamh 2.1.0-alpha.382 → 2.1.0-alpha.384

package/dist/backend/cli.js

@@ -171718,20 +171718,33 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         statusText: `Unsupported mode: ${newMode}`
       };
     }
-    if (isRoomMode(newMode) && this.state.config.cleanRoom) {
-      homeAssistant.callAction(
-        this.state.config.cleanRoom(newMode, this.agent)
-      );
-      return {
-        status: ModeBase3.ModeChangeStatus.Success,
-        statusText: "Starting room cleaning"
-      };
+    if (isRoomMode(newMode)) {
+      try {
+        const serviceArea = this.agent.get(ServiceAreaBehavior);
+        if (serviceArea.state.selectedAreas?.length > 0) {
+          homeAssistant.callAction(this.state.config.start(void 0, this.agent));
+          return {
+            status: ModeBase3.ModeChangeStatus.Success,
+            statusText: "Starting room cleaning"
+          };
+        }
+      } catch {
+      }
+      if (this.state.config.cleanRoom) {
+        homeAssistant.callAction(
+          this.state.config.cleanRoom(newMode, this.agent)
+        );
+        return {
+          status: ModeBase3.ModeChangeStatus.Success,
+          statusText: "Starting room cleaning"
+        };
+      }
     }
     switch (newMode) {
-      case 2 /* Cleaning */:
+      case 1 /* Cleaning */:
         homeAssistant.callAction(this.state.config.start(void 0, this.agent));
         break;
-      case 1 /* Idle */:
+      case 0 /* Idle */:
         homeAssistant.callAction(
           this.state.config.returnToBase(void 0, this.agent)
         );
@@ -171756,19 +171769,19 @@ function RvcRunModeServer2(config10, initialState) {
   const defaultModes = [
     {
       label: "Idle",
-      mode: 1 /* Idle */,
+      mode: 0 /* Idle */,
       modeTags: [{ value: RvcRunMode3.ModeTag.Idle }]
     },
     {
       label: "Cleaning",
-      mode: 2 /* Cleaning */,
+      mode: 1 /* Cleaning */,
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     }
   ];
   return RvcRunModeServerBase.set({
     config: config10,
     supportedModes: initialState?.supportedModes ?? defaultModes,
-    currentMode: initialState?.currentMode ?? 1 /* Idle */
+    currentMode: initialState?.currentMode ?? 0 /* Idle */
   });
 }
 
@@ -172132,12 +172145,12 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false) {
   const modes = [
     {
       label: "Idle",
-      mode: 1 /* Idle */,
+      mode: 0 /* Idle */,
       modeTags: [{ value: RvcRunMode3.ModeTag.Idle }]
     },
     {
       label: "Cleaning",
-      mode: 2 /* Cleaning */,
+      mode: 1 /* Cleaning */,
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     }
   ];
@@ -172195,7 +172208,7 @@ var vacuumRvcRunModeConfig = {
     logger180.debug(
       `Vacuum state: "${state}", isCleaning: ${isCleaning}, currentMode: ${isCleaning ? "Cleaning" : "Idle"}`
     );
-    return isCleaning ? 2 /* Cleaning */ : 1 /* Idle */;
+    return isCleaning ? 1 /* Cleaning */ : 0 /* Idle */;
   },
   getSupportedModes: (entity) => {
     const attributes7 = entity.attributes;
@@ -172453,14 +172466,14 @@ function createVacuumRvcRunModeServer(attributes7, includeUnnamedRooms = false)
   }
   return RvcRunModeServer2(vacuumRvcRunModeConfig, {
     supportedModes,
-    currentMode: 1 /* Idle */
+    currentMode: 0 /* Idle */
   });
 }
 var VacuumRvcRunModeServer = RvcRunModeServer2(vacuumRvcRunModeConfig);
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-on-off-server.ts
 var VacuumOnOffServer = OnOffServer2({
-  isOn: (_, agent) => agent.get(VacuumRvcRunModeServer).state.currentMode === 2 /* Cleaning */,
+  isOn: (_, agent) => agent.get(VacuumRvcRunModeServer).state.currentMode === 1 /* Cleaning */,
   turnOn: () => ({ action: "vacuum.start" }),
   turnOff: () => ({ action: "vacuum.return_to_base" })
 }).with();
@@ -172597,10 +172610,10 @@ function RvcCleanModeServer2(config10, initialState) {
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-clean-mode-server.ts
 var logger182 = Logger.get("VacuumRvcCleanModeServer");
-var MODE_VACUUM = 1;
-var MODE_VACUUM_AND_MOP = 2;
-var MODE_MOP = 3;
-var MODE_VACUUM_THEN_MOP = 7;
+var MODE_VACUUM = 0;
+var MODE_VACUUM_AND_MOP = 1;
+var MODE_MOP = 2;
+var MODE_VACUUM_THEN_MOP = 3;
 var FAN_SPEED_MODE_BASE = 10;
 var MOP_INTENSITY_MODE_BASE = 50;
 function isFanSpeedMode(mode) {