matterbridge-roborock-vacuum-plugin 1.0.8-rc06 → 1.0.8-rc08

package/README.md

@@ -74,11 +74,14 @@ To get the **DUID** for your devices, you have two options:
 
 ---
 
-**➡️ [See Supported & Tested Roborock Devices](./README_SUPPORTED.md)**
 
-> 📋 **Apple Home ↔️ Roborock Clean Mode Mapping:**  
-> For a detailed table of how Apple Home clean modes map to Roborock settings, see  
-> 👉 [Apple Home ↔️ Roborock Clean Mode Mapping](./README_CLEANMODE.md)
+### ➡️ [See Supported & Tested Roborock Devices](./README_SUPPORTED.md)
+
+
+📋 **Apple Home ↔️ Roborock Clean Mode Mapping:**  
+For a detailed table of how Apple Home clean modes map to Roborock settings, see  👉 [Apple Home ↔️ Roborock Clean Mode Mapping](./README_CLEANMODE.md)
+
+---
 
 ### 📦 Prerequisites
 

package/dist/behaviors/roborock.vacuum/default/initalData.js

@@ -19,8 +19,8 @@ export function getDefaultSupportedRunModes() {
         },
     ];
 }
-export function getDefaultSupportedCleanModes() {
-    return [
+export function getDefaultSupportedCleanModes(enableExperimentalFeature) {
+    const result = [
         {
             label: RvcCleanModeDisplayMap[5],
             mode: 5,
@@ -96,12 +96,18 @@ export function getDefaultSupportedCleanModes() {
             mode: 69,
             modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Quick }],
         },
-        {
-            label: RvcCleanModeDisplayMap[99],
-            mode: 99,
-            modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Vacation }],
-        },
     ];
+    if (enableExperimentalFeature?.advancedFeature?.useVacationModeToSendVacuumToDock ?? false) {
+        return [
+            ...result,
+            {
+                label: RvcCleanModeDisplayMap[99],
+                mode: 99,
+                modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Vacation }],
+            },
+        ];
+    }
+    return result;
 }
 export function getDefaultOperationalStates() {
     return [

package/dist/behaviors/roborock.vacuum/smart/initalData.js

@@ -1,7 +1,7 @@
 import { RvcCleanMode } from 'matterbridge/matter/clusters';
 import { RvcCleanMode as RvcCleanModeDisplayMap } from './smart.js';
 import { getDefaultSupportedCleanModes } from '../default/initalData.js';
-export function getSupportedCleanModesSmart() {
+export function getSupportedCleanModesSmart(enableExperimentalFeature) {
     return [
         {
             label: RvcCleanModeDisplayMap[4],
@@ -13,6 +13,6 @@ export function getSupportedCleanModesSmart() {
             mode: 5,
             modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Day }],
         },
-        ...getDefaultSupportedCleanModes().filter((x) => x.mode !== 4 && x.mode !== 5),
+        ...getDefaultSupportedCleanModes(enableExperimentalFeature).filter((x) => x.mode !== 4 && x.mode !== 5),
     ];
 }

package/dist/behaviors/roborock.vacuum/smart/smart.js

@@ -51,7 +51,7 @@ export function setCommandHandlerSmart(duid, handler, logger, roborockService, c
                 break;
             }
             case 'Go Vacation': {
-                logger.notice('DefaultBehavior-GoHome');
+                logger.notice('BehaviorSmart-GoHome');
                 await roborockService.stopAndGoHome(duid);
                 break;
             }

package/dist/initialData/getSupportedCleanModes.js

@@ -1,17 +1,17 @@
 import { getSupportedCleanModesSmart } from '../behaviors/roborock.vacuum/smart/initalData.js';
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
-export function getSupportedCleanModes(model, forceRunAtDefault) {
-    if (forceRunAtDefault) {
-        return getDefaultSupportedCleanModes();
+export function getSupportedCleanModes(model, enableExperimentalFeature) {
+    if (enableExperimentalFeature?.advancedFeature?.forceRunAtDefault ?? false) {
+        return getDefaultSupportedCleanModes(enableExperimentalFeature);
     }
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
-            return getSupportedCleanModesSmart();
+            return getSupportedCleanModesSmart(enableExperimentalFeature);
         case DeviceModel.S7_MAXV:
         case DeviceModel.S8_PRO_ULTRA:
         case DeviceModel.S6_PURE:
         default:
-            return getDefaultSupportedCleanModes();
+            return getDefaultSupportedCleanModes(enableExperimentalFeature);
     }
 }

package/dist/model/DockingStationStatus.js

@@ -15,6 +15,9 @@ export function parseDockingStationStatus(dss) {
     };
 }
 export function hasDockingStationError(status) {
+    if (!status) {
+        return false;
+    }
     return (status.cleanFluidStatus === DockingStationStatusType.Error ||
         status.waterBoxFilterStatus === DockingStationStatusType.Error ||
         status.dustBagStatus === DockingStationStatusType.Error ||

package/dist/platform.js

@@ -113,7 +113,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
             routineAsRoom = getSupportedScenes(vacuum.scenes, this.log);
             this.roborockService.setSupportedScenes(vacuum.duid, routineAsRoom);
         }
-        this.robot = new RoborockVacuumCleaner(username, vacuum, roomMap, routineAsRoom, this.enableExperimentalFeature?.advancedFeature?.forceRunAtDefault ?? false, this.log);
+        this.robot = new RoborockVacuumCleaner(username, vacuum, roomMap, routineAsRoom, this.enableExperimentalFeature, this.log);
         this.robot.configurateHandler(behaviorHandler);
         this.log.info('vacuum:', debugStringify(vacuum));
         this.setSelectDevice(this.robot.serialNumber ?? '', this.robot.deviceName ?? '', undefined, 'hub');

package/dist/platformRunner.js

@@ -159,7 +159,10 @@ export class PlatformRunner {
                     }
                     const operationalStateId = state_to_matter_operational_status(status);
                     if (operationalStateId) {
-                        platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+                        const dssHasError = hasDockingStationError(platform.robot?.dockStationStatus);
+                        if (!(dssHasError && self.triggerDssError())) {
+                            platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+                        }
                     }
                     break;
                 }
@@ -211,18 +214,27 @@ export class PlatformRunner {
         });
     }
     async processAdditionalProps(robot, message) {
+        const dssStatus = this.getDssStatus(message);
+        if (dssStatus) {
+            this.triggerDssError();
+        }
+    }
+    getDssStatus(message) {
         const platform = this.platform;
+        const robot = platform.robot;
         if (platform.enableExperimentalFeature &&
             platform.enableExperimentalFeature.enableExperimentalFeature &&
             platform.enableExperimentalFeature.advancedFeature.includeDockStationStatus &&
             message.dss !== undefined) {
             const dss = parseDockingStationStatus(message.dss);
-            this.platform.log.debug('DockingStationStatus:', debugStringify(dss));
-            const currentOperationState = robot.getAttribute(RvcOperationalState.Cluster.id, 'operationalState');
-            if (dss && hasDockingStationError(dss) && currentOperationState !== RvcOperationalState.OperationalState.Running) {
-                robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', RvcOperationalState.OperationalState.Error, platform.log);
+            if (dss && robot) {
+                robot.dockStationStatus = dss;
+            }
+            if (dss && hasDockingStationError(dss)) {
+                return RvcOperationalState.OperationalState.Error;
             }
         }
+        return undefined;
     }
     isStatusUpdate(result) {
         return (Array.isArray(result) &&
@@ -262,11 +274,27 @@ export class PlatformRunner {
         }
         const operationalStateId = state_to_matter_operational_status(state);
         if (operationalStateId) {
-            this.platform.log.debug(`updateFromHomeData-OperationalState: ${RvcOperationalState.OperationalState[operationalStateId]}`);
-            platform.robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+            const dssHasError = hasDockingStationError(platform.robot?.dockStationStatus);
+            this.platform.log.debug(`dssHasError: ${dssHasError}, dockStationStatus: ${debugStringify(platform.robot?.dockStationStatus ?? {})}`);
+            if (!(dssHasError && this.triggerDssError())) {
+                this.platform.log.debug(`updateFromHomeData-OperationalState: ${RvcOperationalState.OperationalState[operationalStateId]}`);
+                platform.robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+            }
         }
         if (batteryLevel) {
             platform.robot.updateAttribute(PowerSource.Cluster.id, 'batChargeState', getBatteryState(state, batteryLevel), platform.log);
         }
     }
+    triggerDssError() {
+        const platform = this.platform;
+        const currentOperationState = platform?.robot?.getAttribute(RvcOperationalState.Cluster.id, 'operationalState');
+        if (currentOperationState === RvcOperationalState.OperationalState.Error) {
+            return true;
+        }
+        if (currentOperationState === RvcOperationalState.OperationalState.Docked) {
+            platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', RvcOperationalState.OperationalState.Error, platform.log);
+            return true;
+        }
+        return false;
+    }
 }

package/dist/roborockCommunication/broadcast/client/LocalNetworkClient.js

@@ -56,7 +56,7 @@ export class LocalNetworkClient extends AbstractClient {
         await this.connectionListeners.onConnected();
     }
     async onDisconnect() {
-        this.logger.info('Socket has disconnected.');
+        this.logger.notice('LocalNetworkClient: Socket has disconnected.');
         this.connected = false;
         if (this.socket) {
             this.socket.destroy();
@@ -68,7 +68,7 @@ export class LocalNetworkClient extends AbstractClient {
         await this.connectionListeners.onDisconnected();
     }
     async onError(result) {
-        this.logger.error('Socket connection error: ' + result);
+        this.logger.error('LocalNetworkClient: Socket connection error: ' + result);
         this.connected = false;
         if (this.socket) {
             this.socket.destroy();

package/dist/roborockService.js

@@ -158,7 +158,7 @@ export default class RoborockService {
                 await this.messageProcessor.getDeviceStatus(device.duid).then((response) => {
                     if (self.deviceNotify) {
                         const message = { duid: device.duid, ...response.errorStatus, ...response.message };
-                        self.logger.debug('Device status update xxx', debugStringify(message));
+                        self.logger.debug('Device status update', debugStringify(message));
                         self.deviceNotify(NotifyMessageTypes.LocalMessage, message);
                     }
                 });
@@ -332,16 +332,21 @@ export default class RoborockService {
                 this.logger.debug('initializing the local connection for this client towards ' + this.ip);
                 this.localClient = this.messageClient.registerClient(device.duid, this.ip);
                 this.localClient.connect();
-                while (!this.localClient.isConnected()) {
+                let count = 0;
+                while (!this.localClient.isConnected() && count < 20) {
+                    this.logger.debug('Keep waiting for local client to connect');
+                    count++;
                     await this.sleep(500);
                 }
+                if (!this.localClient.isConnected()) {
+                    throw new Error('Local client did not connect after 10 attempts, something is wrong');
+                }
                 this.logger.debug('LocalClient connected');
             }
         }
         catch (error) {
             this.logger.error('Error requesting network info', error);
         }
-        this.logger.debug('Local client connected');
     }
     sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));

package/dist/rvc.js

@@ -6,12 +6,13 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
     device;
     rrHomeId;
     roomInfo;
-    constructor(username, device, roomMap, routineAsRoom, forceRunAtDefault, log) {
-        const cleanModes = getSupportedCleanModes(device.data.model, forceRunAtDefault);
+    dockStationStatus;
+    constructor(username, device, roomMap, routineAsRoom, enableExperimentalFeature, log) {
+        const cleanModes = getSupportedCleanModes(device.data.model, enableExperimentalFeature);
         const supportedRunModes = getSupportedRunModes();
         const supportedAreas = [...getSupportedAreas(device.rooms, roomMap, log), ...routineAsRoom];
         const deviceName = `${device.name}-${device.duid}`.replace(/\s+/g, '');
-        log.debug(`Creating RoborockVacuumCleaner for device: ${deviceName}, model: ${device.data.model}, forceRunAtDefault: ${forceRunAtDefault}`);
+        log.debug(`Creating RoborockVacuumCleaner for device: ${deviceName}, model: ${device.data.model}, forceRunAtDefault: ${enableExperimentalFeature?.advancedFeature?.forceRunAtDefault}`);
         log.debug(`Supported Clean Modes: ${JSON.stringify(cleanModes)}`);
         log.debug(`Supported Run Modes: ${JSON.stringify(supportedRunModes)}`);
         super(deviceName, device.duid, supportedRunModes[0].mode, supportedRunModes, cleanModes[0].mode, cleanModes, undefined, undefined, RvcOperationalState.OperationalState.Docked, getOperationalStates(), supportedAreas, undefined, supportedAreas[0].areaId);

package/matterbridge-roborock-vacuum-plugin.config.json

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.0.8-rc06",
+  "version": "1.0.8-rc08",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,
@@ -10,7 +10,8 @@
     "advancedFeature": {
       "showRoutinesAsRooms": false,
       "includeDockStationStatus": false,
-      "forceRunAtDefault": false
+      "forceRunAtDefault": false,
+      "useVacationModeToSendVacuumToDock": false
     },
     "cleanModeSettings": {
       "enableCleanModeMapping": false,

package/matterbridge-roborock-vacuum-plugin.schema.json

@@ -1,6 +1,6 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc06 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc08 by https://github.com/RinDevJunior",
   "type": "object",
   "required": ["username", "password"],
   "properties": {
@@ -79,6 +79,11 @@
                     "title": "Force Run At Default Implementation",
                     "type": "boolean",
                     "default": false
+                  },
+                  "useVacationModeToSendVacuumToDock": {
+                    "title": "Use Vacation Mode To Send Vacuum To Dock",
+                    "type": "boolean",
+                    "default": false
                   }
                 }
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
-  "version": "1.0.8-rc06",
+  "version": "1.0.8-rc08",
   "description": "Matterbridge Roborock Vacuum Plugin",
   "author": "https://github.com/RinDevJunior",
   "license": "MIT",

package/src/behaviors/roborock.vacuum/default/initalData.ts

@@ -1,5 +1,6 @@
 import { RvcCleanMode, RvcOperationalState, RvcRunMode } from 'matterbridge/matter/clusters';
 import { RvcCleanMode as RvcCleanModeDisplayMap } from './default.js';
+import { ExperimentalFeatureSetting } from '../../../model/ExperimentalFeatureSetting.js';
 
 export function getDefaultSupportedRunModes(): RvcRunMode.ModeOption[] {
   return [
@@ -21,8 +22,8 @@ export function getDefaultSupportedRunModes(): RvcRunMode.ModeOption[] {
   ];
 }
 
-export function getDefaultSupportedCleanModes(): RvcCleanMode.ModeOption[] {
-  return [
+export function getDefaultSupportedCleanModes(enableExperimentalFeature: ExperimentalFeatureSetting | undefined): RvcCleanMode.ModeOption[] {
+  const result = [
     {
       label: RvcCleanModeDisplayMap[5],
       mode: 5,
@@ -101,13 +102,20 @@ export function getDefaultSupportedCleanModes(): RvcCleanMode.ModeOption[] {
       mode: 69,
       modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Quick }],
     },
-
-    {
-      label: RvcCleanModeDisplayMap[99],
-      mode: 99,
-      modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Vacation }],
-    },
   ];
+
+  if (enableExperimentalFeature?.advancedFeature?.useVacationModeToSendVacuumToDock ?? false) {
+    return [
+      ...result,
+      {
+        label: RvcCleanModeDisplayMap[99],
+        mode: 99,
+        modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Vacation }],
+      },
+    ];
+  }
+
+  return result;
 }
 
 export function getDefaultOperationalStates(): RvcOperationalState.OperationalStateStruct[] {

package/src/behaviors/roborock.vacuum/smart/initalData.ts

@@ -1,8 +1,9 @@
 import { RvcCleanMode } from 'matterbridge/matter/clusters';
 import { RvcCleanMode as RvcCleanModeDisplayMap } from './smart.js';
 import { getDefaultSupportedCleanModes } from '../default/initalData.js';
+import { ExperimentalFeatureSetting } from '../../../model/ExperimentalFeatureSetting.js';
 
-export function getSupportedCleanModesSmart(): RvcCleanMode.ModeOption[] {
+export function getSupportedCleanModesSmart(enableExperimentalFeature: ExperimentalFeatureSetting | undefined): RvcCleanMode.ModeOption[] {
   return [
     {
       label: RvcCleanModeDisplayMap[4],
@@ -14,6 +15,6 @@ export function getSupportedCleanModesSmart(): RvcCleanMode.ModeOption[] {
       mode: 5,
       modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Day }],
     },
-    ...getDefaultSupportedCleanModes().filter((x) => x.mode !== 4 && x.mode !== 5), // Exclude modes 4 and 5 which are already defined
+    ...getDefaultSupportedCleanModes(enableExperimentalFeature).filter((x) => x.mode !== 4 && x.mode !== 5), // Exclude modes 4 and 5 which are already defined
   ];
 }

package/src/behaviors/roborock.vacuum/smart/smart.ts

@@ -83,7 +83,7 @@ export function setCommandHandlerSmart(
       }
 
       case 'Go Vacation': {
-        logger.notice('DefaultBehavior-GoHome');
+        logger.notice('BehaviorSmart-GoHome');
         await roborockService.stopAndGoHome(duid);
         break;
       }

package/src/initialData/getSupportedCleanModes.ts

@@ -2,20 +2,21 @@ import { RvcCleanMode } from 'matterbridge/matter/clusters';
 import { getSupportedCleanModesSmart } from '../behaviors/roborock.vacuum/smart/initalData.js';
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
+import { ExperimentalFeatureSetting } from '../model/ExperimentalFeatureSetting.js';
 
-export function getSupportedCleanModes(model: string, forceRunAtDefault: boolean): RvcCleanMode.ModeOption[] {
-  if (forceRunAtDefault) {
-    return getDefaultSupportedCleanModes();
+export function getSupportedCleanModes(model: string, enableExperimentalFeature: ExperimentalFeatureSetting | undefined): RvcCleanMode.ModeOption[] {
+  if (enableExperimentalFeature?.advancedFeature?.forceRunAtDefault ?? false) {
+    return getDefaultSupportedCleanModes(enableExperimentalFeature);
   }
 
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
-      return getSupportedCleanModesSmart();
+      return getSupportedCleanModesSmart(enableExperimentalFeature);
 
     case DeviceModel.S7_MAXV:
     case DeviceModel.S8_PRO_ULTRA:
     case DeviceModel.S6_PURE:
     default:
-      return getDefaultSupportedCleanModes();
+      return getDefaultSupportedCleanModes(enableExperimentalFeature);
   }
 }

package/src/model/DockingStationStatus.ts

@@ -25,7 +25,11 @@ export function parseDockingStationStatus(dss: number): DockingStationStatus {
   };
 }
 
-export function hasDockingStationError(status: DockingStationStatus): boolean {
+export function hasDockingStationError(status: DockingStationStatus | undefined): boolean {
+  if (!status) {
+    return false;
+  }
+
   return (
     status.cleanFluidStatus === DockingStationStatusType.Error ||
     status.waterBoxFilterStatus === DockingStationStatusType.Error ||

package/src/model/ExperimentalFeatureSetting.ts

@@ -4,6 +4,7 @@ export interface ExperimentalFeatureSetting {
     showRoutinesAsRoom: boolean;
     includeDockStationStatus: boolean;
     forceRunAtDefault: boolean;
+    useVacationModeToSendVacuumToDock: boolean;
   };
   cleanModeSettings: CleanModeSettings;
 }

package/src/platform.ts

@@ -162,7 +162,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
       this.roborockService.setSupportedScenes(vacuum.duid, routineAsRoom);
     }
 
-    this.robot = new RoborockVacuumCleaner(username, vacuum, roomMap, routineAsRoom, this.enableExperimentalFeature?.advancedFeature?.forceRunAtDefault ?? false, this.log);
+    this.robot = new RoborockVacuumCleaner(username, vacuum, roomMap, routineAsRoom, this.enableExperimentalFeature, this.log);
     this.robot.configurateHandler(behaviorHandler);
 
     this.log.info('vacuum:', debugStringify(vacuum));

package/src/platformRunner.ts

@@ -192,7 +192,10 @@ export class PlatformRunner {
 
           const operationalStateId = state_to_matter_operational_status(status);
           if (operationalStateId) {
-            platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+            const dssHasError = hasDockingStationError(platform.robot?.dockStationStatus);
+            if (!(dssHasError && self.triggerDssError())) {
+              platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+            }
           }
           break;
         }
@@ -254,7 +257,15 @@ export class PlatformRunner {
 
   private async processAdditionalProps(robot: RoborockVacuumCleaner, message: CloudMessageResult): Promise<void> {
     // dss -> DockingStationStatus
+    const dssStatus = this.getDssStatus(message);
+    if (dssStatus) {
+      this.triggerDssError();
+    }
+  }
+
+  private getDssStatus(message: CloudMessageResult): RvcOperationalState.OperationalState | undefined {
     const platform = this.platform;
+    const robot = platform.robot;
     if (
       platform.enableExperimentalFeature &&
       platform.enableExperimentalFeature.enableExperimentalFeature &&
@@ -262,15 +273,15 @@ export class PlatformRunner {
       message.dss !== undefined
     ) {
       const dss = parseDockingStationStatus(message.dss);
-      this.platform.log.debug('DockingStationStatus:', debugStringify(dss));
-
-      const currentOperationState = robot.getAttribute(RvcOperationalState.Cluster.id, 'operationalState') as RvcOperationalState.OperationalState;
+      if (dss && robot) {
+        robot.dockStationStatus = dss;
+      }
 
-      // Only update docking station status if it is not running
-      if (dss && hasDockingStationError(dss) && currentOperationState !== RvcOperationalState.OperationalState.Running) {
-        robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', RvcOperationalState.OperationalState.Error, platform.log);
+      if (dss && hasDockingStationError(dss)) {
+        return RvcOperationalState.OperationalState.Error;
       }
     }
+    return undefined;
   }
 
   private isStatusUpdate(result: unknown): boolean {
@@ -317,13 +328,33 @@ export class PlatformRunner {
     }
 
     const operationalStateId = state_to_matter_operational_status(state);
+
     if (operationalStateId) {
-      this.platform.log.debug(`updateFromHomeData-OperationalState: ${RvcOperationalState.OperationalState[operationalStateId]}`);
-      platform.robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+      const dssHasError = hasDockingStationError(platform.robot?.dockStationStatus);
+      this.platform.log.debug(`dssHasError: ${dssHasError}, dockStationStatus: ${debugStringify(platform.robot?.dockStationStatus ?? {})}`);
+      if (!(dssHasError && this.triggerDssError())) {
+        this.platform.log.debug(`updateFromHomeData-OperationalState: ${RvcOperationalState.OperationalState[operationalStateId]}`);
+        platform.robot.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', operationalStateId, platform.log);
+      }
     }
 
     if (batteryLevel) {
       platform.robot.updateAttribute(PowerSource.Cluster.id, 'batChargeState', getBatteryState(state, batteryLevel), platform.log);
     }
   }
+
+  private triggerDssError(): boolean {
+    const platform = this.platform;
+    const currentOperationState = platform?.robot?.getAttribute(RvcOperationalState.Cluster.id, 'operationalState') as RvcOperationalState.OperationalState;
+    if (currentOperationState === RvcOperationalState.OperationalState.Error) {
+      return true;
+    }
+
+    if (currentOperationState === RvcOperationalState.OperationalState.Docked) {
+      platform.robot?.updateAttribute(RvcOperationalState.Cluster.id, 'operationalState', RvcOperationalState.OperationalState.Error, platform.log);
+      return true;
+    }
+
+    return false;
+  }
 }

package/src/roborockCommunication/broadcast/client/LocalNetworkClient.ts

@@ -67,7 +67,7 @@ export class LocalNetworkClient extends AbstractClient {
   }
 
   private async onDisconnect(): Promise<void> {
-    this.logger.info('Socket has disconnected.');
+    this.logger.notice('LocalNetworkClient: Socket has disconnected.');
     this.connected = false;
 
     if (this.socket) {
@@ -82,7 +82,7 @@ export class LocalNetworkClient extends AbstractClient {
   }
 
   private async onError(result: Error): Promise<void> {
-    this.logger.error('Socket connection error: ' + result);
+    this.logger.error('LocalNetworkClient: Socket connection error: ' + result);
     this.connected = false;
 
     if (this.socket) {

package/src/roborockService.ts

@@ -29,6 +29,7 @@ import type {
   DeviceStatusNotify,
 } from './roborockCommunication/index.js';
 import { ServiceArea } from 'matterbridge/matter/clusters';
+import { LocalNetworkClient } from './roborockCommunication/broadcast/client/LocalNetworkClient.js';
 export type Factory<A, T> = (logger: AnsiLogger, arg: A) => T;
 
 export default class RoborockService {
@@ -227,7 +228,7 @@ export default class RoborockService {
         await this.messageProcessor.getDeviceStatus(device.duid).then((response: DeviceStatus) => {
           if (self.deviceNotify) {
             const message: DeviceStatusNotify = { duid: device.duid, ...response.errorStatus, ...response.message } as DeviceStatusNotify;
-            self.logger.debug('Device status update xxx', debugStringify(message));
+            self.logger.debug('Device status update', debugStringify(message));
             self.deviceNotify(NotifyMessageTypes.LocalMessage, message);
           }
         });
@@ -431,19 +432,25 @@ export default class RoborockService {
 
       if (this.ip) {
         this.logger.debug('initializing the local connection for this client towards ' + this.ip);
-        this.localClient = this.messageClient.registerClient(device.duid, this.ip);
+        this.localClient = this.messageClient.registerClient(device.duid, this.ip) as LocalNetworkClient;
         this.localClient.connect();
 
-        while (!this.localClient.isConnected()) {
+        let count = 0;
+        while (!this.localClient.isConnected() && count < 20) {
+          this.logger.debug('Keep waiting for local client to connect');
+          count++;
           await this.sleep(500);
         }
+
+        if (!this.localClient.isConnected()) {
+          throw new Error('Local client did not connect after 10 attempts, something is wrong');
+        }
+
         this.logger.debug('LocalClient connected');
       }
     } catch (error) {
       this.logger.error('Error requesting network info', error);
     }
-
-    this.logger.debug('Local client connected');
   }
 
   private sleep(ms: number): Promise<void> {

package/src/rvc.ts

@@ -5,20 +5,32 @@ import { getOperationalStates, getSupportedAreas, getSupportedCleanModes, getSup
 import { AnsiLogger } from 'matterbridge/logger';
 import { BehaviorFactoryResult } from './behaviorFactory.js';
 import { ModeBase, RvcOperationalState, ServiceArea } from 'matterbridge/matter/clusters';
+import { ExperimentalFeatureSetting } from './model/ExperimentalFeatureSetting.js';
+import { DockingStationStatus } from './model/DockingStationStatus.js';
 
 export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
   username: string | undefined;
   device: Device;
   rrHomeId: number;
   roomInfo: RoomMap | undefined;
+  dockStationStatus: DockingStationStatus | undefined;
 
-  constructor(username: string, device: Device, roomMap: RoomMap, routineAsRoom: ServiceArea.Area[], forceRunAtDefault: boolean, log: AnsiLogger) {
-    const cleanModes = getSupportedCleanModes(device.data.model, forceRunAtDefault);
+  constructor(
+    username: string,
+    device: Device,
+    roomMap: RoomMap,
+    routineAsRoom: ServiceArea.Area[],
+    enableExperimentalFeature: ExperimentalFeatureSetting | undefined,
+    log: AnsiLogger,
+  ) {
+    const cleanModes = getSupportedCleanModes(device.data.model, enableExperimentalFeature);
     const supportedRunModes = getSupportedRunModes();
     const supportedAreas = [...getSupportedAreas(device.rooms, roomMap, log), ...routineAsRoom];
     const deviceName = `${device.name}-${device.duid}`.replace(/\s+/g, '');
 
-    log.debug(`Creating RoborockVacuumCleaner for device: ${deviceName}, model: ${device.data.model}, forceRunAtDefault: ${forceRunAtDefault}`);
+    log.debug(
+      `Creating RoborockVacuumCleaner for device: ${deviceName}, model: ${device.data.model}, forceRunAtDefault: ${enableExperimentalFeature?.advancedFeature?.forceRunAtDefault}`,
+    );
     log.debug(`Supported Clean Modes: ${JSON.stringify(cleanModes)}`);
     log.debug(`Supported Run Modes: ${JSON.stringify(supportedRunModes)}`);