matterbridge-roborock-vacuum-plugin 1.0.7-rc01 → 1.0.7-rc03

package/README.md

@@ -42,13 +42,23 @@
 ---
 ### 🆔 How to Get Your DUID
 
-To get the **DUID** for your devices. Follow the steps below to retrieve it:
+To get the **DUID** for your devices, you have two options:
 
+**Option 1: From Matterbridge Logs**
 1. **Start Matterbridge** with the plugin enabled.
 2. **Watch the Docker console logs directly** (not the Matterbridge UI logs, as they may be truncated).
 3. Look for the log message that says:
    ```text
    Initializing - devices: [...]
+   ```
+
+**Option 2: From the Roborock App**
+1. Open the **Roborock app** on your phone.
+2. Go to your **Device**.
+3. Tap **Settings** > **Product Info**.
+4. Find the **DID** field. The value will look like `rr_xxxxxxx`.
+5. **Remove the `rr_` prefix** from the DID value. The remaining string is your DUID.
+
 ---
 ### 🚧 Project Status
 

package/dist/behaviorFactory.js

@@ -2,6 +2,7 @@ import { BehaviorDeviceGeneric } from './behaviors/BehaviorDeviceGeneric.js';
 import { setCommandHandlerA187 } from './behaviors/roborock.vacuum/QREVO_EDGE_5V1/a187.js';
 import { setDefaultCommandHandler } from './behaviors/roborock.vacuum/default/default.js';
 import { DeviceModel } from './roborockCommunication/Zmodel/deviceModel.js';
+import { setCommandHandlerA27 } from './behaviors/roborock.vacuum/S7_MAXV/a27.js';
 export function configurateBehavior(model, duid, roborockService, logger) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1: {
@@ -9,6 +10,11 @@ export function configurateBehavior(model, duid, roborockService, logger) {
             setCommandHandlerA187(duid, deviceHandler, logger, roborockService);
             return deviceHandler;
         }
+        case DeviceModel.S7_MAXV: {
+            const deviceHandler = new BehaviorDeviceGeneric(logger);
+            setCommandHandlerA27(duid, deviceHandler, logger, roborockService);
+            return deviceHandler;
+        }
         default: {
             const deviceHandler = new BehaviorDeviceGeneric(logger);
             setDefaultCommandHandler(duid, deviceHandler, logger, roborockService);

package/dist/behaviors/roborock.vacuum/S7_MAXV/a27.js

@@ -0,0 +1,97 @@
+import { debugStringify } from 'matterbridge/logger';
+import { BehaviorRoborock } from '../../BehaviorDeviceGeneric.js';
+export class BehaviorA27 extends BehaviorRoborock {
+}
+export var BehaviorRoborockA27;
+(function (BehaviorRoborockA27) {
+    class State {
+        device;
+    }
+    BehaviorRoborockA27.State = State;
+})(BehaviorRoborockA27 || (BehaviorRoborockA27 = {}));
+export var VacuumSuctionPowerA27;
+(function (VacuumSuctionPowerA27) {
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Quiet"] = 101] = "Quiet";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Balanced"] = 102] = "Balanced";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Turbo"] = 103] = "Turbo";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Max"] = 104] = "Max";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Off"] = 105] = "Off";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["Custom"] = 106] = "Custom";
+    VacuumSuctionPowerA27[VacuumSuctionPowerA27["MaxPlus"] = 108] = "MaxPlus";
+})(VacuumSuctionPowerA27 || (VacuumSuctionPowerA27 = {}));
+export var MopWaterFlowA27;
+(function (MopWaterFlowA27) {
+    MopWaterFlowA27[MopWaterFlowA27["Off"] = 200] = "Off";
+    MopWaterFlowA27[MopWaterFlowA27["Low"] = 201] = "Low";
+    MopWaterFlowA27[MopWaterFlowA27["Medium"] = 202] = "Medium";
+    MopWaterFlowA27[MopWaterFlowA27["High"] = 203] = "High";
+    MopWaterFlowA27[MopWaterFlowA27["Custom"] = 204] = "Custom";
+})(MopWaterFlowA27 || (MopWaterFlowA27 = {}));
+export var MopRouteA27;
+(function (MopRouteA27) {
+    MopRouteA27[MopRouteA27["Standard"] = 300] = "Standard";
+    MopRouteA27[MopRouteA27["Deep"] = 301] = "Deep";
+    MopRouteA27[MopRouteA27["Custom"] = 302] = "Custom";
+    MopRouteA27[MopRouteA27["DeepPlus"] = 303] = "DeepPlus";
+    MopRouteA27[MopRouteA27["Fast"] = 304] = "Fast";
+})(MopRouteA27 || (MopRouteA27 = {}));
+const RvcRunMode = {
+    [1]: 'Idle',
+    [2]: 'Cleaning',
+    [3]: 'Mapping',
+};
+const RvcCleanMode = {
+    [5]: 'Mop',
+    [6]: 'Vacuum',
+    [7]: 'Vac & Mop',
+    [8]: 'Custom',
+};
+const CleanSetting = {
+    [5]: { suctionPower: VacuumSuctionPowerA27.Off, waterFlow: MopWaterFlowA27.Medium, mopRoute: MopRouteA27.Custom },
+    [6]: { suctionPower: VacuumSuctionPowerA27.Balanced, waterFlow: MopWaterFlowA27.Off, mopRoute: MopRouteA27.Custom },
+    [7]: { suctionPower: VacuumSuctionPowerA27.Balanced, waterFlow: MopWaterFlowA27.Medium, mopRoute: MopRouteA27.Custom },
+    [8]: { suctionPower: VacuumSuctionPowerA27.Custom, waterFlow: MopWaterFlowA27.Custom, mopRoute: MopRouteA27.Custom },
+};
+export function setCommandHandlerA27(duid, handler, logger, roborockService) {
+    handler.setCommandHandler('changeToMode', async (newMode) => {
+        const activity = RvcRunMode[newMode] || RvcCleanMode[newMode];
+        switch (activity) {
+            case 'Cleaning': {
+                logger.notice('BehaviorA27-ChangeRunMode to: ', activity);
+                await roborockService.startClean(duid);
+                return;
+            }
+            case 'Mop':
+            case 'Vacuum':
+            case 'Vac & Mop':
+            case 'Custom': {
+                const setting = CleanSetting[newMode];
+                logger.notice(`BehaviorA27-ChangeCleanMode to: ${activity}, code: ${debugStringify(setting)}`);
+                return;
+            }
+            default:
+                logger.notice('BehaviorA27-changeToMode-Unknown: ', newMode);
+                return;
+        }
+    });
+    handler.setCommandHandler('selectAreas', async (newAreas) => {
+        logger.notice(`BehaviorA27-selectAreas: ${newAreas}`);
+        roborockService.setSelectedAreas(duid, newAreas ?? []);
+    });
+    handler.setCommandHandler('pause', async () => {
+        logger.notice('BehaviorA27-Pause');
+        await roborockService.pauseClean(duid);
+    });
+    handler.setCommandHandler('resume', async () => {
+        logger.notice('BehaviorA27-Resume');
+        await roborockService.resumeClean(duid);
+    });
+    handler.setCommandHandler('goHome', async () => {
+        logger.notice('BehaviorA27-GoHome');
+        await roborockService.stopAndGoHome(duid);
+    });
+    handler.setCommandHandler('PlaySoundToLocate', async (identifyTime) => {
+        logger.notice('BehaviorA27-PlaySoundToLocate');
+        await roborockService.playSoundToLocate(duid);
+    });
+}

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

@@ -0,0 +1,76 @@
+import { RvcCleanMode, RvcOperationalState, RvcRunMode } from 'matterbridge/matter/clusters';
+export function getSupportedRunModesA27() {
+    return [
+        {
+            label: 'Idle',
+            mode: 1,
+            modeTags: [{ value: RvcRunMode.ModeTag.Idle }],
+        },
+        {
+            label: 'Cleaning',
+            mode: 2,
+            modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }],
+        },
+        {
+            label: 'Mapping',
+            mode: 3,
+            modeTags: [{ value: RvcRunMode.ModeTag.Mapping }],
+        },
+    ];
+}
+export function getSupportedCleanModesA27() {
+    return [
+        {
+            label: 'Mop',
+            mode: 5,
+            modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Auto }],
+        },
+        {
+            label: 'Vacuum',
+            mode: 6,
+            modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Auto }],
+        },
+        {
+            label: 'Mop & Vacuum',
+            mode: 7,
+            modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.DeepClean }],
+        },
+        {
+            label: 'Custom',
+            mode: 8,
+            modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Quick }],
+        },
+    ];
+}
+export function getOperationalStatesA27() {
+    return [
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Stopped,
+            operationalStateLabel: 'Stopped',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Running,
+            operationalStateLabel: 'Running',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Paused,
+            operationalStateLabel: 'Paused',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Error,
+            operationalStateLabel: 'Error',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.SeekingCharger,
+            operationalStateLabel: 'SeekingCharger',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Charging,
+            operationalStateLabel: 'Charging',
+        },
+        {
+            operationalStateId: RvcOperationalState.OperationalState.Docked,
+            operationalStateLabel: 'Docked',
+        },
+    ];
+}

package/dist/behaviors/roborock.vacuum/S7_MAXV/runtimes.js

@@ -0,0 +1,33 @@
+import { MopWaterFlowA27, VacuumSuctionPowerA27 } from './a27.js';
+export function getCurrentCleanModeA27(fan_power, water_box_mode) {
+    if (!fan_power || !water_box_mode)
+        return undefined;
+    if (fan_power == VacuumSuctionPowerA27.Custom || water_box_mode == MopWaterFlowA27.Custom)
+        return 8;
+    if (fan_power == VacuumSuctionPowerA27.Off)
+        return 5;
+    if (water_box_mode == MopWaterFlowA27.Off)
+        return 6;
+    else
+        return 7;
+}
+export function getCurrentCleanModeFromFanPowerA27(fan_power) {
+    if (!fan_power)
+        return undefined;
+    if (fan_power == VacuumSuctionPowerA27.Custom)
+        return 8;
+    if (fan_power == VacuumSuctionPowerA27.Off)
+        return 5;
+    else
+        return undefined;
+}
+export function getCurrentCleanModeFromWaterBoxModeA27(water_box_mode) {
+    if (!water_box_mode)
+        return undefined;
+    if (water_box_mode == MopWaterFlowA27.Custom)
+        return 8;
+    if (water_box_mode == MopWaterFlowA27.Off)
+        return 6;
+    else
+        return undefined;
+}

package/dist/initialData/getOperationalStates.js

@@ -3,10 +3,13 @@ import { getOperationalStatesA187 } from '../behaviors/roborock.vacuum/QREVO_EDG
 import { getDefaultOperationalStates } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { VacuumErrorCode } from '../roborockCommunication/Zenum/vacuumAndDockErrorCode.js';
+import { getOperationalStatesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 export function getOperationalStates(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
             return getOperationalStatesA187();
+        case DeviceModel.S7_MAXV:
+            return getOperationalStatesA27();
         default:
             return getDefaultOperationalStates();
     }

package/dist/initialData/getSupportedAreas.js

@@ -19,13 +19,13 @@ export function getSupportedAreas(rooms, roomMap, log) {
             },
         ];
     }
-    const supportedAreas = rooms.map((room, index) => {
+    const supportedAreas = roomMap.rooms.map((room, index) => {
         return {
-            areaId: roomMap.getRoomId(room.id) ?? index + 1,
+            areaId: room.id,
             mapId: null,
             areaInfo: {
                 locationInfo: {
-                    locationName: room.name,
+                    locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
                     floorNumber: null,
                     areaType: null,
                 },
@@ -37,7 +37,7 @@ export function getSupportedAreas(rooms, roomMap, log) {
     return duplicated
         ? [
             {
-                areaId: 1,
+                areaId: 2,
                 mapId: null,
                 areaInfo: {
                     locationInfo: {

package/dist/initialData/getSupportedCleanModes.js

@@ -1,10 +1,13 @@
 import { getSupportedCleanModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/initalData.js';
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
+import { getSupportedCleanModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 export function getSupportedCleanModes(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
             return getSupportedCleanModesA187();
+        case DeviceModel.S7_MAXV:
+            return getSupportedCleanModesA27();
         default:
             return getDefaultSupportedCleanModes();
     }

package/dist/initialData/getSupportedRunModes.js

@@ -1,6 +1,7 @@
 import { getSupportedRunModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/initalData.js';
 import { getDefaultSupportedRunModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
+import { getSupportedRunModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 export function getRunningMode(model, modeTag) {
     if (!model || !modeTag)
         return null;
@@ -12,6 +13,8 @@ export function getSupportedRunModes(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
             return getSupportedRunModesA187();
+        case DeviceModel.S7_MAXV:
+            return getSupportedRunModesA27();
         default:
             return getDefaultSupportedRunModes();
     }

package/dist/model/RoomMap.js

@@ -9,10 +9,4 @@ export default class RoomMap {
             };
         });
     }
-    getGlobalId(id) {
-        return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
-    }
-    getRoomId(globalId) {
-        return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
-    }
 }

package/dist/platform.js

@@ -73,13 +73,14 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         let vacuum = undefined;
         if (this.config.whiteList.length > 0) {
             const firstDUID = this.config.whiteList[0];
-            vacuum = devices.find((d) => d.duid == firstDUID);
+            const duid = firstDUID.split('-')[1];
+            vacuum = devices.find((d) => d.duid == duid);
         }
         else {
             vacuum = devices.find((d) => isSupportedDevice(d.data.model));
         }
         if (!vacuum) {
-            this.log.error('Initializing: No supported devices found');
+            this.log.error('Initializing: No device found');
             return;
         }
         await this.roborockService.initializeMessageClient(username, vacuum, userData);

package/dist/rvc.js

@@ -10,7 +10,8 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
         const cleanModes = getSupportedCleanModes(device.data.model);
         const supportedRunModes = getSupportedRunModes(device.data.model);
         const supportedAreas = getSupportedAreas(device.rooms, roomMap, log);
-        super(device.name, device.duid, supportedRunModes[0].mode, supportedRunModes, cleanModes[0].mode, cleanModes, undefined, undefined, RvcOperationalState.OperationalState.Docked, getOperationalStates(device.data.model), supportedAreas, undefined, supportedAreas[0].areaId);
+        const deviceName = `${device.name}-${device.duid}`.replace(/\s+/g, '');
+        super(deviceName, device.duid, supportedRunModes[0].mode, supportedRunModes, cleanModes[0].mode, cleanModes, undefined, undefined, RvcOperationalState.OperationalState.Docked, getOperationalStates(device.data.model), supportedAreas, undefined, supportedAreas[0].areaId);
         this.username = username;
         this.device = device;
         this.rrHomeId = device.rrHomeId;

package/dist/share/runtimeHelper.js

@@ -1,10 +1,14 @@
 import { getCurrentCleanModeA187, getCurrentCleanModeFromFanPowerA187, getCurrentCleanModeFromWaterBoxModeA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/runtimes.js';
+import { getCurrentCleanModeA27, getCurrentCleanModeFromFanPowerA27, getCurrentCleanModeFromWaterBoxModeA27 } from '../behaviors/roborock.vacuum/S7_MAXV/runtimes.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 export function getCurrentCleanModeFunc(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1: {
             return getCurrentCleanModeA187;
         }
+        case DeviceModel.S7_MAXV: {
+            return getCurrentCleanModeA27;
+        }
         default:
             return (_, __) => undefined;
     }
@@ -14,6 +18,9 @@ export function getCurrentCleanModeFromFanPowerFunc(model) {
         case DeviceModel.QREVO_EDGE_5V1: {
             return getCurrentCleanModeFromFanPowerA187;
         }
+        case DeviceModel.S7_MAXV: {
+            return getCurrentCleanModeFromFanPowerA27;
+        }
         default:
             return (_) => undefined;
     }
@@ -23,6 +30,9 @@ export function getCurrentCleanModeFromWaterBoxModeFunc(model) {
         case DeviceModel.QREVO_EDGE_5V1: {
             return getCurrentCleanModeFromWaterBoxModeA187;
         }
+        case DeviceModel.S7_MAXV: {
+            return getCurrentCleanModeFromWaterBoxModeA27;
+        }
         default:
             return (_) => undefined;
     }

package/jest.config.js

@@ -0,0 +1,19 @@
+export default {
+    testEnvironment: 'node',
+    extensionsToTreatAsEsm: ['.ts'],
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.js$': '$1',
+    },
+    transform: {
+        '^.+\\.ts$': [
+            'ts-jest',
+            {
+                useESM: true,
+                tsconfig: 'tsconfig.jest.json',
+            },
+        ],
+    },
+    transformIgnorePatterns: ['/node_modules/'],
+    testPathIgnorePatterns: ['/node_modules/', '/dist/', '/frontend/'],
+    coveragePathIgnorePatterns: ['/node_modules/', '/dist/', '/frontend/', '/src/mock/'],
+};

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.0.7-rc01",
+  "version": "1.0.7-rc03",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,

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

@@ -1,6 +1,6 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.7-rc01 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.7-rc03 by https://github.com/RinDevJunior",
   "type": "object",
   "required": [],
   "properties": {

package/package.json

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

package/src/behaviorFactory.ts

@@ -4,6 +4,7 @@ import { EndpointCommandsA187, setCommandHandlerA187 } from './behaviors/roboroc
 import RoborockService from './roborockService.js';
 import { DefaultEndpointCommands, setDefaultCommandHandler } from './behaviors/roborock.vacuum/default/default.js';
 import { DeviceModel } from './roborockCommunication/Zmodel/deviceModel.js';
+import { EndpointCommandsA27, setCommandHandlerA27 } from './behaviors/roborock.vacuum/S7_MAXV/a27.js';
 
 export type BehaviorFactoryResult = BehaviorDeviceGeneric<DefaultEndpointCommands> | BehaviorDeviceGeneric<EndpointCommandsA187>;
 
@@ -15,6 +16,12 @@ export function configurateBehavior(model: string, duid: string, roborockService
       return deviceHandler;
     }
 
+    case DeviceModel.S7_MAXV: {
+      const deviceHandler = new BehaviorDeviceGeneric<EndpointCommandsA27>(logger);
+      setCommandHandlerA27(duid, deviceHandler, logger, roborockService);
+      return deviceHandler;
+    }
+
     default: {
       const deviceHandler = new BehaviorDeviceGeneric<DefaultEndpointCommands>(logger);
       setDefaultCommandHandler(duid, deviceHandler, logger, roborockService);

package/src/behaviors/roborock.vacuum/S7_MAXV/a27.ts

@@ -0,0 +1,121 @@
+import { MaybePromise } from 'matterbridge/matter';
+import { AnsiLogger, debugStringify } from 'matterbridge/logger';
+import { BehaviorDeviceGeneric, BehaviorRoborock, DeviceCommands } from '../../BehaviorDeviceGeneric.js';
+import RoborockService from '../../../roborockService.js';
+
+export interface EndpointCommandsA27 extends DeviceCommands {
+  selectAreas: (newAreas: any) => MaybePromise;
+  changeToMode: (newMode: number) => MaybePromise;
+  pause: () => MaybePromise;
+  resume: () => MaybePromise;
+  goHome: () => MaybePromise;
+  PlaySoundToLocate: (identifyTime: number) => MaybePromise;
+}
+
+export class BehaviorA27 extends BehaviorRoborock {
+  declare state: BehaviorRoborockA27.State;
+}
+
+export namespace BehaviorRoborockA27 {
+  export class State {
+    device!: BehaviorDeviceGeneric<EndpointCommandsA27>;
+  }
+}
+
+//suction_power
+export enum VacuumSuctionPowerA27 {
+  Quiet = 101,
+  Balanced = 102,
+  Turbo = 103,
+  Max = 104,
+  Off = 105,
+  Custom = 106,
+  MaxPlus = 108,
+}
+
+//water_box_mode
+export enum MopWaterFlowA27 {
+  Off = 200,
+  Low = 201,
+  Medium = 202,
+  High = 203,
+  Custom = 204,
+}
+
+//set_mop_mode
+export enum MopRouteA27 {
+  Standard = 300,
+  Deep = 301,
+  Custom = 302,
+  DeepPlus = 303,
+  Fast = 304,
+}
+
+const RvcRunMode: Record<number, string> = {
+  [1]: 'Idle', //DO NOT HANDLE HERE,
+  [2]: 'Cleaning',
+  [3]: 'Mapping',
+};
+const RvcCleanMode: Record<number, string> = {
+  [5]: 'Mop',
+  [6]: 'Vacuum',
+  [7]: 'Vac & Mop',
+  [8]: 'Custom',
+};
+
+const CleanSetting: Record<number, { suctionPower: number; waterFlow: number; mopRoute: number }> = {
+  [5]: { suctionPower: VacuumSuctionPowerA27.Off, waterFlow: MopWaterFlowA27.Medium, mopRoute: MopRouteA27.Custom }, //'Mop'
+  [6]: { suctionPower: VacuumSuctionPowerA27.Balanced, waterFlow: MopWaterFlowA27.Off, mopRoute: MopRouteA27.Custom }, //'Vacuum'
+  [7]: { suctionPower: VacuumSuctionPowerA27.Balanced, waterFlow: MopWaterFlowA27.Medium, mopRoute: MopRouteA27.Custom }, //'Vac & Mop'
+  [8]: { suctionPower: VacuumSuctionPowerA27.Custom, waterFlow: MopWaterFlowA27.Custom, mopRoute: MopRouteA27.Custom }, // 'Custom'
+};
+
+export function setCommandHandlerA27(duid: string, handler: BehaviorDeviceGeneric<DeviceCommands>, logger: AnsiLogger, roborockService: RoborockService): void {
+  handler.setCommandHandler('changeToMode', async (newMode: number) => {
+    const activity = RvcRunMode[newMode] || RvcCleanMode[newMode];
+    switch (activity) {
+      case 'Cleaning': {
+        logger.notice('BehaviorA27-ChangeRunMode to: ', activity);
+        await roborockService.startClean(duid);
+        return;
+      }
+      case 'Mop':
+      case 'Vacuum':
+      case 'Vac & Mop':
+      case 'Custom': {
+        const setting = CleanSetting[newMode];
+        logger.notice(`BehaviorA27-ChangeCleanMode to: ${activity}, code: ${debugStringify(setting)}`);
+        //await roborockService.changeCleanMode(duid, setting);
+        return;
+      }
+      default:
+        logger.notice('BehaviorA27-changeToMode-Unknown: ', newMode);
+        return;
+    }
+  });
+
+  handler.setCommandHandler('selectAreas', async (newAreas: number[]) => {
+    logger.notice(`BehaviorA27-selectAreas: ${newAreas}`);
+    roborockService.setSelectedAreas(duid, newAreas ?? []);
+  });
+
+  handler.setCommandHandler('pause', async () => {
+    logger.notice('BehaviorA27-Pause');
+    await roborockService.pauseClean(duid);
+  });
+
+  handler.setCommandHandler('resume', async () => {
+    logger.notice('BehaviorA27-Resume');
+    await roborockService.resumeClean(duid);
+  });
+
+  handler.setCommandHandler('goHome', async () => {
+    logger.notice('BehaviorA27-GoHome');
+    await roborockService.stopAndGoHome(duid);
+  });
+
+  handler.setCommandHandler('PlaySoundToLocate', async (identifyTime: number) => {
+    logger.notice('BehaviorA27-PlaySoundToLocate');
+    await roborockService.playSoundToLocate(duid);
+  });
+}

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

@@ -0,0 +1,80 @@
+import { RvcCleanMode, RvcOperationalState, RvcRunMode } from 'matterbridge/matter/clusters';
+
+export function getSupportedRunModesA27(): RvcRunMode.ModeOption[] {
+  return [
+    {
+      label: 'Idle',
+      mode: 1,
+      modeTags: [{ value: RvcRunMode.ModeTag.Idle }],
+    },
+    {
+      label: 'Cleaning',
+      mode: 2,
+      modeTags: [{ value: RvcRunMode.ModeTag.Cleaning }],
+    },
+    {
+      label: 'Mapping',
+      mode: 3,
+      modeTags: [{ value: RvcRunMode.ModeTag.Mapping }],
+    },
+  ];
+}
+
+export function getSupportedCleanModesA27(): RvcCleanMode.ModeOption[] {
+  return [
+    {
+      label: 'Mop',
+      mode: 5,
+      modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Auto }],
+    },
+    {
+      label: 'Vacuum',
+      mode: 6,
+      modeTags: [{ value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Auto }],
+    },
+    {
+      label: 'Mop & Vacuum',
+      mode: 7,
+      modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.DeepClean }],
+    },
+
+    {
+      label: 'Custom',
+      mode: 8,
+      modeTags: [{ value: RvcCleanMode.ModeTag.Mop }, { value: RvcCleanMode.ModeTag.Vacuum }, { value: RvcCleanMode.ModeTag.Quick }],
+    },
+  ];
+}
+
+export function getOperationalStatesA27(): RvcOperationalState.OperationalStateStruct[] {
+  return [
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Stopped,
+      operationalStateLabel: 'Stopped',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Running,
+      operationalStateLabel: 'Running',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Paused,
+      operationalStateLabel: 'Paused',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Error,
+      operationalStateLabel: 'Error',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.SeekingCharger,
+      operationalStateLabel: 'SeekingCharger',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Charging,
+      operationalStateLabel: 'Charging',
+    },
+    {
+      operationalStateId: RvcOperationalState.OperationalState.Docked,
+      operationalStateLabel: 'Docked',
+    },
+  ];
+}

package/src/behaviors/roborock.vacuum/S7_MAXV/runtimes.ts

@@ -0,0 +1,26 @@
+import { MopWaterFlowA27, VacuumSuctionPowerA27 } from './a27.js';
+
+export function getCurrentCleanModeA27(fan_power: number | undefined, water_box_mode: number | undefined): number | undefined {
+  if (!fan_power || !water_box_mode) return undefined;
+  if (fan_power == VacuumSuctionPowerA27.Custom || water_box_mode == MopWaterFlowA27.Custom) return 8; // 'Custom',
+  if (fan_power == VacuumSuctionPowerA27.Off) return 5; // 'Mop',
+  if (water_box_mode == MopWaterFlowA27.Off)
+    return 6; // 'Vacuum',
+  else return 7; //Vac & Mop
+}
+
+export function getCurrentCleanModeFromFanPowerA27(fan_power: number | undefined): number | undefined {
+  if (!fan_power) return undefined;
+  if (fan_power == VacuumSuctionPowerA27.Custom) return 8; // 'Custom',
+  if (fan_power == VacuumSuctionPowerA27.Off)
+    return 5; // 'Mop',
+  else return undefined;
+}
+
+export function getCurrentCleanModeFromWaterBoxModeA27(water_box_mode: number | undefined): number | undefined {
+  if (!water_box_mode) return undefined;
+  if (water_box_mode == MopWaterFlowA27.Custom) return 8; // 'Custom',
+  if (water_box_mode == MopWaterFlowA27.Off)
+    return 6; // 'Vacuum',
+  else return undefined;
+}

package/src/initialData/getOperationalStates.ts

@@ -3,11 +3,14 @@ import { getOperationalStatesA187 } from '../behaviors/roborock.vacuum/QREVO_EDG
 import { getDefaultOperationalStates } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { VacuumErrorCode } from '../roborockCommunication/Zenum/vacuumAndDockErrorCode.js';
+import { getOperationalStatesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 
 export function getOperationalStates(model: string): RvcOperationalState.OperationalStateStruct[] {
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
       return getOperationalStatesA187();
+    case DeviceModel.S7_MAXV:
+      return getOperationalStatesA27();
     default:
       return getDefaultOperationalStates();
   }

package/src/initialData/getSupportedAreas.test.ts

@@ -0,0 +1,55 @@
+import { getSupportedAreas } from '../initialData/getSupportedAreas';
+import RoomMap from '../model/RoomMap';
+import { jest } from '@jest/globals';
+
+const mockLogger = {
+  debug: jest.fn(),
+  error: jest.fn(),
+};
+
+describe('getSupportedAreas', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns default area when rooms and roomMap are empty', () => {
+    const result = getSupportedAreas(
+      [
+        { id: 2775739, name: 'Garage' },
+        { id: 1474466, name: 'Outside' },
+        { id: 1459590, name: 'AAA room' },
+        { id: 1459587, name: 'BBB’s Room' },
+        { id: 1459580, name: 'CCC’s room' },
+        { id: 1458155, name: 'Dining room' },
+        { id: 1457889, name: 'Bathroom' },
+        { id: 1457888, name: 'Living room' },
+        { id: 991195, name: 'Downstairs Bathroom' },
+        { id: 991190, name: 'Garage Entryway' },
+        { id: 991187, name: 'TV Room' },
+        { id: 991185, name: 'Bedroom' },
+        { id: 612205, name: 'DDD’s Room' },
+        { id: 612204, name: 'Upstairs Bathroom' },
+        { id: 612202, name: 'Hallway' },
+        { id: 612200, name: 'EEE Room' },
+        { id: 609148, name: 'Dining Room' },
+        { id: 609146, name: 'Kitchen' },
+        { id: 609145, name: 'Living Room' },
+      ],
+      {
+        rooms: [
+          { id: 16, globalId: 609146, displayName: 'Kitchen' },
+          { id: 17, globalId: 1457889, displayName: 'Bathroom' },
+          { id: 18, globalId: 612202, displayName: 'Hallway' },
+          { id: 19, globalId: 1458155, displayName: 'Dining room' },
+          { id: 20, globalId: 1457888, displayName: 'Living room' },
+          { id: 21, globalId: 1459580, displayName: 'BBB’s room' },
+          { id: 22, globalId: 612205, displayName: 'CCC’s Room' },
+          { id: 23, globalId: 1474466, displayName: 'Outside' },
+        ],
+      } as RoomMap,
+      mockLogger as any,
+    );
+
+    expect(result.length).toEqual(8);
+  });
+});

package/src/initialData/getSupportedAreas.ts

@@ -3,23 +3,6 @@ import { ServiceArea } from 'matterbridge/matter/clusters';
 import RoomMap from '../model/RoomMap.js';
 import { Room } from '../roborockCommunication/Zmodel/room.js';
 
-/*
-rooms = [
-  { id: 123456, name: 'Study' },
-  { id: 123457, name: 'Bedroom' },
-  { id: 123458, name: 'Kitchen' },
-  { id: 123459, name: 'Living room' }
-]
-roomMap = {
-  rooms: [
-    { id: 1, globalId: "123456", displayName: undefined },
-    { id: 2, globalId: "123457", displayName: undefined },
-    { id: 3, globalId: "123458", displayName: undefined },
-    { id: 4, globalId: "123459", displayName: undefined },
-  ],
-};
-*/
-
 export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, log?: AnsiLogger): ServiceArea.Area[] {
   log?.debug('getSupportedAreas', debugStringify(rooms));
   log?.debug('getSupportedAreas', roomMap ? debugStringify(roomMap) : 'undefined');
@@ -42,13 +25,13 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
     ];
   }
 
-  const supportedAreas: ServiceArea.Area[] = rooms.map((room, index) => {
+  const supportedAreas: ServiceArea.Area[] = roomMap.rooms.map((room, index) => {
     return {
-      areaId: roomMap.getRoomId(room.id) ?? index + 1,
+      areaId: room.id,
       mapId: null,
       areaInfo: {
         locationInfo: {
-          locationName: room.name,
+          locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
           floorNumber: null,
           areaType: null,
         },
@@ -62,7 +45,7 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
   return duplicated
     ? [
         {
-          areaId: 1,
+          areaId: 2,
           mapId: null,
           areaInfo: {
             locationInfo: {

package/src/initialData/getSupportedCleanModes.ts

@@ -2,11 +2,14 @@ import { RvcCleanMode } from 'matterbridge/matter/clusters';
 import { getSupportedCleanModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/initalData.js';
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
+import { getSupportedCleanModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 
 export function getSupportedCleanModes(model: string): RvcCleanMode.ModeOption[] {
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
       return getSupportedCleanModesA187();
+    case DeviceModel.S7_MAXV:
+      return getSupportedCleanModesA27();
     default:
       return getDefaultSupportedCleanModes();
   }

package/src/initialData/getSupportedRunModes.ts

@@ -2,6 +2,7 @@ import { RvcRunMode } from 'matterbridge/matter/clusters';
 import { getSupportedRunModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/initalData.js';
 import { getDefaultSupportedRunModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
+import { getSupportedRunModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
 
 export function getRunningMode(model: string | undefined, modeTag: RvcRunMode.ModeTag | undefined): number | null {
   if (!model || !modeTag) return null;
@@ -15,6 +16,8 @@ export function getSupportedRunModes(model: string): RvcRunMode.ModeOption[] {
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
       return getSupportedRunModesA187();
+    case DeviceModel.S7_MAXV:
+      return getSupportedRunModesA27();
     default:
       return getDefaultSupportedRunModes();
   }

package/src/model/RoomMap.ts

@@ -34,11 +34,11 @@ export default class RoomMap {
     });
   }
 
-  getGlobalId(id: number): number | undefined {
-    return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
-  }
+  // getGlobalId(id: number): number | undefined {
+  //   return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
+  // }
 
-  getRoomId(globalId: number): number | undefined {
-    return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
-  }
+  // getRoomId(globalId: number): number | undefined {
+  //   return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
+  // }
 }

package/src/platform.ts

@@ -97,13 +97,14 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     let vacuum: Device | undefined = undefined;
     if ((this.config.whiteList as string[]).length > 0) {
       const firstDUID = (this.config.whiteList as string[])[0];
-      vacuum = devices.find((d) => d.duid == firstDUID);
+      const duid = firstDUID.split('-')[1];
+      vacuum = devices.find((d) => d.duid == duid);
     } else {
       vacuum = devices.find((d) => isSupportedDevice(d.data.model));
     }
 
     if (!vacuum) {
-      this.log.error('Initializing: No supported devices found');
+      this.log.error('Initializing: No device found');
       return;
     }
     await this.roborockService.initializeMessageClient(username, vacuum, userData);

package/src/rvc.ts

@@ -16,8 +16,9 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
     const cleanModes = getSupportedCleanModes(device.data.model);
     const supportedRunModes = getSupportedRunModes(device.data.model);
     const supportedAreas = getSupportedAreas(device.rooms, roomMap, log);
+    const deviceName = `${device.name}-${device.duid}`.replace(/\s+/g, '');
     super(
-      device.name, //name
+      deviceName, //name
       device.duid, //serial
       supportedRunModes[0].mode, //currentRunMode
       supportedRunModes, //supportedRunModes

package/src/share/runtimeHelper.ts

@@ -1,4 +1,5 @@
 import { getCurrentCleanModeA187, getCurrentCleanModeFromFanPowerA187, getCurrentCleanModeFromWaterBoxModeA187 } from '../behaviors/roborock.vacuum/QREVO_EDGE_5V1/runtimes.js';
+import { getCurrentCleanModeA27, getCurrentCleanModeFromFanPowerA27, getCurrentCleanModeFromWaterBoxModeA27 } from '../behaviors/roborock.vacuum/S7_MAXV/runtimes.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 
 export type CleanModeFunc1 = (fan_power: number | undefined, water_box_mode: number | undefined) => number | undefined;
@@ -9,6 +10,9 @@ export function getCurrentCleanModeFunc(model: string): CleanModeFunc1 {
     case DeviceModel.QREVO_EDGE_5V1: {
       return getCurrentCleanModeA187;
     }
+    case DeviceModel.S7_MAXV: {
+      return getCurrentCleanModeA27;
+    }
     default:
       return (_, __) => undefined;
   }
@@ -19,6 +23,9 @@ export function getCurrentCleanModeFromFanPowerFunc(model: string): CleanModeFun
     case DeviceModel.QREVO_EDGE_5V1: {
       return getCurrentCleanModeFromFanPowerA187;
     }
+    case DeviceModel.S7_MAXV: {
+      return getCurrentCleanModeFromFanPowerA27;
+    }
     default:
       return (_) => undefined;
   }
@@ -29,6 +36,9 @@ export function getCurrentCleanModeFromWaterBoxModeFunc(model: string): CleanMod
     case DeviceModel.QREVO_EDGE_5V1: {
       return getCurrentCleanModeFromWaterBoxModeA187;
     }
+    case DeviceModel.S7_MAXV: {
+      return getCurrentCleanModeFromWaterBoxModeA27;
+    }
     default:
       return (_) => undefined;
   }

package/tsconfig.jest.json

@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        // enable isolatedModules just for ts-jest
+        "isolatedModules": true
+    },
+    "include": [
+        "**/*.spec.ts",
+        "**/*.test.ts",
+        "**/__test__/*"
+    ]
+}