matterbridge-roborock-vacuum-plugin 1.1.0-rc10 → 1.1.0-rc12

package/dist/initialData/getSupportedAreas.js

@@ -4,7 +4,12 @@ export function getSupportedAreas(rooms, roomMap, log) {
     log?.debug('getSupportedAreas', debugStringify(rooms));
     log?.debug('getSupportedAreas', roomMap ? debugStringify(roomMap) : 'undefined');
     if (!rooms || rooms.length === 0 || !roomMap?.rooms || roomMap.rooms.length == 0) {
-        log?.error('No rooms found');
+        if (!rooms || rooms.length === 0) {
+            log?.error('No rooms found');
+        }
+        if (!roomMap || !roomMap.rooms || roomMap.rooms.length == 0) {
+            log?.error('No room map found');
+        }
         return [
             {
                 areaId: 1,

package/dist/platform.js

@@ -26,8 +26,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     rrHomeId;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.1.5')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.1.5". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.1.6')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.1.6". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
         }
         this.log.info('Initializing platform:', this.config.name);
         if (config.whiteList === undefined)
@@ -140,7 +140,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
             if (!configurateSuccess.get(duid)) {
                 continue;
             }
-            await this.roborockService.activateDeviceNotify(robot.device);
+            this.roborockService.activateDeviceNotify(robot.device);
         }
         await this.platformRunner?.requestHomeData();
         this.log.info('onConfigurateDevice finished');
@@ -157,6 +157,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
             return false;
         }
         if (vacuum.rooms === undefined || vacuum.rooms.length === 0) {
+            this.log.error(`Fetching map information for device: ${vacuum.name} (${vacuum.duid}) to get rooms`);
             const map_info = await this.roborockService.getMapInformation(vacuum.duid);
             const rooms = map_info?.maps?.[0]?.rooms ?? [];
             vacuum.rooms = rooms;
@@ -196,7 +197,4 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         this.log.logLevel = logLevel;
         return Promise.resolve();
     }
-    sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
 }

package/dist/platformRunner.js

@@ -35,9 +35,19 @@ export class PlatformRunner {
     async getRoomMapFromDevice(device) {
         const platform = this.platform;
         const rooms = device?.rooms ?? [];
+        platform.log.error(`getRoomMapFromDevice: ${debugStringify(rooms)}`);
         if (device && platform.roborockService) {
             const roomData = await platform.roborockService.getRoomMappings(device.duid);
-            return new RoomMap(roomData ?? [], rooms);
+            if (roomData !== undefined && roomData.length > 0) {
+                platform.log.error(`getRoomMapFromDevice - roomData: ${debugStringify(roomData ?? [])}`);
+                return new RoomMap(roomData ?? [], rooms);
+            }
+            const mapInfo = await platform.roborockService.getMapInformation(device.duid);
+            if (mapInfo && mapInfo.maps && mapInfo.maps.length > 0) {
+                platform.log.error(`getRoomMapFromDevice - mapInfo: ${debugStringify(mapInfo.maps)}`);
+                const roomDataMap = mapInfo.maps[0].rooms.map((r) => [r.id, parseInt(r.name)]);
+                return new RoomMap(roomDataMap, rooms);
+            }
         }
         return new RoomMap([], rooms);
     }
@@ -53,8 +63,18 @@ export class PlatformRunner {
         const rooms = robot.device.rooms ?? [];
         if (robot.roomInfo === undefined) {
             const roomData = await platform.roborockService.getRoomMappings(robot.device.duid);
-            robot.roomInfo = new RoomMap(roomData ?? [], rooms);
-            return robot.roomInfo;
+            if (roomData !== undefined && roomData.length > 0) {
+                robot.roomInfo = new RoomMap(roomData ?? [], rooms);
+                return robot.roomInfo;
+            }
+        }
+        if (robot.roomInfo === undefined) {
+            const mapInfo = await platform.roborockService.getMapInformation(robot.device.duid);
+            if (mapInfo && mapInfo.maps && mapInfo.maps.length > 0) {
+                platform.log.error(`getRoomMap - mapInfo: ${debugStringify(mapInfo.maps)}`);
+                const roomDataMap = mapInfo.maps[0].rooms.map((r) => [r.id, parseInt(r.name)]);
+                robot.roomInfo = new RoomMap(roomDataMap, rooms);
+            }
         }
         return robot.roomInfo;
     }
@@ -109,13 +129,20 @@ export class PlatformRunner {
                     if (state) {
                         robot.updateAttribute(RvcRunMode.Cluster.id, 'currentMode', getRunningMode(state), platform.log);
                     }
-                    const currentRoom = data.cleaning_info?.segment_id ?? -1;
                     const currentMappedAreas = this.platform.roborockService?.getSupportedAreas(duid);
+                    const roomMap = await this.getRoomMap(duid);
+                    const targetRoom = data.cleaning_info?.target_segment_id ?? -1;
+                    const isTargetMappedArea = currentMappedAreas?.some((x) => x.areaId == targetRoom);
+                    if (targetRoom !== -1 && isTargetMappedArea) {
+                        this.platform.log.debug(`RoomMap: ${roomMap ? debugStringify(roomMap) : 'undefined'}`);
+                        this.platform.log.debug(`TargetRoom: ${targetRoom}, room name: ${roomMap?.rooms.find((x) => x.id === targetRoom)?.displayName ?? 'unknown'}`);
+                        robot.updateAttribute(ServiceArea.Cluster.id, 'currentArea', targetRoom, platform.log);
+                    }
+                    const currentRoom = data.cleaning_info?.segment_id ?? -1;
                     const isMappedArea = currentMappedAreas?.some((x) => x.areaId == currentRoom);
                     if (currentRoom !== -1 && isMappedArea) {
-                        const roomMap = await this.getRoomMap(duid);
                         this.platform.log.debug(`RoomMap: ${roomMap ? debugStringify(roomMap) : 'undefined'}`);
-                        this.platform.log.debug('CurrentRoom:', currentRoom);
+                        this.platform.log.debug(`CurrentRoom: ${currentRoom}, room name: ${roomMap?.rooms.find((x) => x.id === currentRoom)?.displayName ?? 'unknown'}`);
                         robot.updateAttribute(ServiceArea.Cluster.id, 'currentArea', currentRoom, platform.log);
                     }
                     if (data.battery) {

package/dist/roborockCommunication/RESTAPI/roborockIoTApi.js

@@ -81,4 +81,15 @@ export class RoborockIoTApi {
             return undefined;
         }
     }
+    async getCustom(url) {
+        const result = await this.api.get(url);
+        const apiResponse = result.data;
+        if (apiResponse.result) {
+            return apiResponse.result;
+        }
+        else {
+            this.logger.error('Failed to execute scene');
+            return undefined;
+        }
+    }
 }

package/dist/roborockCommunication/Zmodel/mapInfo.js

@@ -6,12 +6,14 @@ export class MapInfo {
             this.maps.push({
                 id: map.mapFlag,
                 name: decodeComponent(map.name)?.toLowerCase(),
-                rooms: map.rooms.map((room) => {
-                    return {
-                        id: room.iot_name_id,
-                        name: room.iot_name,
-                    };
-                }),
+                rooms: map.rooms && map.rooms.length > 0
+                    ? map.rooms.map((room) => {
+                        return {
+                            id: room.id,
+                            name: room.iot_name_id,
+                        };
+                    })
+                    : [],
             });
         });
     }

package/dist/roborockCommunication/broadcast/abstractClient.js

@@ -29,8 +29,15 @@ export class AbstractClient {
     }
     async get(duid, request) {
         return new Promise((resolve, reject) => {
-            this.syncMessageListener.waitFor(request.messageId, (response) => resolve(response), reject);
+            this.syncMessageListener.waitFor(request.messageId, request, (response) => resolve(response), reject);
             this.send(duid, request);
+        })
+            .then((result) => {
+            return result;
+        })
+            .catch((error) => {
+            this.logger.error(error.message);
+            return undefined;
         });
     }
     registerDevice(duid, localKey, pv) {

package/dist/roborockCommunication/broadcast/listener/implementation/connectionStateListener.js

@@ -21,7 +21,9 @@ export class ConnectionStateListener {
         }
         if (this.client.retryCount > 10) {
             this.logger.error(`Device with DUID ${duid} has exceeded retry limit, not re-registering.`);
-            this.changeToSecureConnection(duid);
+            if (this.changeToSecureConnection) {
+                this.changeToSecureConnection(duid);
+            }
             return;
         }
         this.client.retryCount++;

package/dist/roborockCommunication/broadcast/listener/implementation/syncMessageListener.js

@@ -1,3 +1,4 @@
+import { debugStringify } from 'matterbridge/logger';
 import { Protocol } from '../../model/protocol.js';
 export class SyncMessageListener {
     pending = new Map();
@@ -5,11 +6,11 @@ export class SyncMessageListener {
     constructor(logger) {
         this.logger = logger;
     }
-    waitFor(messageId, resolve, reject) {
+    waitFor(messageId, request, resolve, reject) {
         this.pending.set(messageId, resolve);
         setTimeout(() => {
             this.pending.delete(messageId);
-            reject();
+            reject(new Error(`Message timeout for messageId: ${messageId}, request: ${debugStringify(request)}`));
         }, 10000);
     }
     async onMessage(message) {

package/dist/roborockCommunication/broadcast/messageProcessor.js

@@ -25,12 +25,15 @@ export class MessageProcessor {
     async getDeviceStatus(duid) {
         const request = new RequestMessage({ method: 'get_status' });
         const response = await this.client.get(duid, request);
-        this.logger?.debug('Device status: ', debugStringify(response));
-        return new DeviceStatus(response);
+        if (response) {
+            this.logger?.debug('Device status: ', debugStringify(response));
+            return new DeviceStatus(response);
+        }
+        return undefined;
     }
     async getRooms(duid, rooms) {
         const request = new RequestMessage({ method: 'get_room_mapping' });
-        return this.client.get(duid, request).then((response) => new RoomInfo(rooms, response));
+        return this.client.get(duid, request).then((response) => new RoomInfo(rooms, response ?? []));
     }
     async gotoDock(duid) {
         const request = new RequestMessage({ method: 'app_charge' });

package/dist/roborockCommunication/helper/messageDeserializer.js

@@ -8,6 +8,7 @@ export class MessageDeserializer {
     context;
     messageParser;
     logger;
+    supportedVersions = ['1.0', 'A01', 'B01'];
     constructor(context, logger) {
         this.context = context;
         this.logger = logger;
@@ -28,7 +29,7 @@ export class MessageDeserializer {
     }
     deserialize(duid, message) {
         const version = message.toString('latin1', 0, 3);
-        if (version !== '1.0' && version !== 'A01') {
+        if (!this.supportedVersions.includes(version)) {
             throw new Error('unknown protocol version ' + version);
         }
         const crc32 = CRC32.buf(message.subarray(0, message.length - 4)) >>> 0;
@@ -52,6 +53,11 @@ export class MessageDeserializer {
             const decipher = crypto.createDecipheriv('aes-128-cbc', localKey, iv);
             data.payload = Buffer.concat([decipher.update(data.payload), decipher.final()]);
         }
+        else if (version == 'B01') {
+            const iv = CryptoUtils.md5hex(data.random.toString(16).padStart(8, '0') + '5wwh9ikChRjASpMU8cxg7o1d2E').substring(9, 25);
+            const decipher = crypto.createDecipheriv('aes-128-cbc', localKey, iv);
+            data.payload = Buffer.concat([decipher.update(data.payload), decipher.final()]);
+        }
         if (data.protocol == Protocol.map_response) {
             return new ResponseMessage(duid, { dps: { id: 0, result: null } });
         }

package/dist/roborockCommunication/helper/messageSerializer.js

@@ -54,6 +54,12 @@ export class MessageSerializer {
             const cipher = crypto.createCipheriv('aes-128-cbc', encoder.encode(localKey), iv);
             encrypted = Buffer.concat([cipher.update(payload), cipher.final()]);
         }
+        else if (version == 'B01') {
+            const encoder = new TextEncoder();
+            const iv = CryptoUtils.md5hex(this.random.toString(16).padStart(8, '0') + '5wwh9ikChRjASpMU8cxg7o1d2E').substring(9, 25);
+            const cipher = crypto.createCipheriv('aes-128-cbc', encoder.encode(localKey), iv);
+            encrypted = Buffer.concat([cipher.update(payload), cipher.final()]);
+        }
         else {
             throw new Error('unable to build the message: unsupported protocol version: ' + version);
         }

package/dist/roborockService.js

@@ -15,12 +15,14 @@ export default class RoborockService {
     messageProcessorMap = new Map();
     ipMap = new Map();
     localClientMap = new Map();
+    mqttAlwaysOnDevices = new Map();
     clientManager;
     refreshInterval;
     requestDeviceStatusInterval;
     supportedAreas = new Map();
     supportedRoutines = new Map();
     selectedAreas = new Map();
+    vacuumNeedAPIV3 = ['roborock.vacuum.ss07'];
     constructor(authenticateApiSupplier = (logger) => new RoborockAuthenticateApi(logger), iotApiSupplier = (logger, ud) => new RoborockIoTApi(ud, logger), refreshInterval, clientManager, logger) {
         this.logger = logger;
         this.loginApi = authenticateApiSupplier(logger);
@@ -77,7 +79,8 @@ export default class RoborockService {
         this.logger.debug('RoborockService - getMapInformation', duid);
         assert(this.messageClient !== undefined);
         return this.messageClient.get(duid, new RequestMessage({ method: 'get_multi_maps_list' })).then((response) => {
-            return new MapInfo(response[0]);
+            this.logger.debug('RoborockService - getMapInformation response', debugStringify(response ?? []));
+            return response ? new MapInfo(response[0]) : undefined;
         });
     }
     async changeCleanMode(duid, { suctionPower, waterFlow, distance_off, mopRoute }) {
@@ -147,6 +150,17 @@ export default class RoborockService {
     async customSend(duid, request) {
         return this.getMessageProcessor(duid)?.sendCustomMessage(duid, request);
     }
+    async getCustomAPI(url) {
+        this.logger.debug('RoborockService - getCustomAPI', url);
+        assert(this.iotApi !== undefined);
+        try {
+            return await this.iotApi.getCustom(url);
+        }
+        catch (error) {
+            this.logger.error(`Failed to get custom API with url ${url}: ${error ? debugStringify(error) : 'undefined'}`);
+            return { result: undefined, error: `Failed to get custom API with url ${url}` };
+        }
+    }
     stopService() {
         if (this.messageClient) {
             this.messageClient.disconnect();
@@ -175,14 +189,14 @@ export default class RoborockService {
     setDeviceNotify(callback) {
         this.deviceNotify = callback;
     }
-    async activateDeviceNotify(device) {
+    activateDeviceNotify(device) {
         const self = this;
         this.logger.debug('Requesting device info for device', device.duid);
         const messageProcessor = this.getMessageProcessor(device.duid);
         this.requestDeviceStatusInterval = setInterval(async () => {
             if (messageProcessor) {
                 await messageProcessor.getDeviceStatus(device.duid).then((response) => {
-                    if (self.deviceNotify) {
+                    if (self.deviceNotify && response) {
                         const message = { duid: device.duid, ...response.errorStatus, ...response.message };
                         self.logger.debug('Device status update', debugStringify(message));
                         self.deviceNotify(NotifyMessageTypes.LocalMessage, message);
@@ -208,6 +222,15 @@ export default class RoborockService {
         const scenes = (await this.iotApi.getScenes(homeDetails.rrHomeId)) ?? [];
         const products = new Map();
         homeData.products.forEach((p) => products.set(p.id, p.model));
+        if (homeData.products.some((p) => this.vacuumNeedAPIV3.includes(p.model))) {
+            this.logger.debug('Using v3 API for home data retrieval');
+            const homeDataV3 = await this.iotApi.getHomev3(homeDetails.rrHomeId);
+            if (!homeDataV3) {
+                throw new Error('Failed to retrieve the home data from v3 API');
+            }
+            homeData.devices = [...homeData.devices, ...homeDataV3.devices.filter((d) => !homeData.devices.some((x) => x.duid === d.duid))];
+            homeData.receivedDevices = [...homeData.receivedDevices, ...homeDataV3.receivedDevices.filter((d) => !homeData.receivedDevices.some((x) => x.duid === d.duid))];
+        }
         if (homeData.rooms.length === 0) {
             const homeDataV2 = await this.iotApi.getHomev2(homeDetails.rrHomeId);
             if (homeDataV2 && homeDataV2.rooms && homeDataV2.rooms.length > 0) {
@@ -259,6 +282,18 @@ export default class RoborockService {
         const products = new Map();
         homeData.products.forEach((p) => products.set(p.id, p.model));
         const devices = homeData.devices.length > 0 ? homeData.devices : homeData.receivedDevices;
+        if (homeData.rooms.length === 0) {
+            const homeDataV3 = await this.iotApi.getHomev3(homeid);
+            if (homeDataV3 && homeDataV3.rooms && homeDataV3.rooms.length > 0) {
+                homeData.rooms = homeDataV3.rooms;
+            }
+            else {
+                const homeDataV1 = await this.iotApi.getHome(homeid);
+                if (homeDataV1 && homeDataV1.rooms && homeDataV1.rooms.length > 0) {
+                    homeData.rooms = homeDataV1.rooms;
+                }
+            }
+        }
         const dvs = devices.map((device) => {
             return {
                 ...device,
@@ -297,9 +332,9 @@ export default class RoborockService {
     getRoomMappings(duid) {
         if (!this.messageClient) {
             this.logger.warn('messageClient not initialized. Waititing for next execution');
-            return undefined;
+            return Promise.resolve(undefined);
         }
-        return this.messageClient.get(duid, new RequestMessage({ method: 'get_room_mapping' }));
+        return this.messageClient.get(duid, new RequestMessage({ method: 'get_room_mapping', secure: this.isRequestSecure(duid) }));
     }
     async initializeMessageClient(username, device, userdata) {
         if (this.clientManager === undefined) {
@@ -351,6 +386,15 @@ export default class RoborockService {
             },
         });
         this.messageProcessorMap.set(device.duid, messageProcessor);
+        this.logger.debug('Checking if device supports local connection', device.pv, device.data.model, device.duid);
+        if (device.pv === 'B01') {
+            this.logger.warn('Device does not support local connection', device.duid);
+            this.mqttAlwaysOnDevices.set(device.duid, true);
+            return true;
+        }
+        else {
+            this.mqttAlwaysOnDevices.set(device.duid, false);
+        }
         this.logger.debug('Local device', device.duid);
         let localIp = this.ipMap.get(device.duid);
         try {
@@ -389,7 +433,7 @@ export default class RoborockService {
         return true;
     }
     onLocalClientDisconnect(duid) {
-        this.logger.debug('Local client disconnected for device', duid);
+        this.mqttAlwaysOnDevices.set(duid, true);
     }
     sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));
@@ -399,4 +443,7 @@ export default class RoborockService {
         this.iotApi = this.iotApiFactory(this.logger, userdata);
         return userdata;
     }
+    isRequestSecure(duid) {
+        return this.mqttAlwaysOnDevices.get(duid) ?? false;
+    }
 }

package/eslint.config.js

@@ -9,7 +9,7 @@ import eslintPluginN from 'eslint-plugin-n';
 export default [
   {
     name: 'global ignores',
-    ignores: ['dist/', 'build/', 'node_modules/', 'coverage/', 'frontend/', 'rock-s0/', 'webui/', 'exampleData/', '.shouldnotcommit/'],
+    ignores: ['dist/', 'build/', 'node_modules/', 'coverage/', 'frontend/', 'rock-s0/', 'webui/', 'exampleData/', '.shouldnotcommit/', 'web-for-testing/'],
   },
   eslint.configs.recommended,
   ...tseslint.configs.strict,

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.0-rc10",
+  "version": "1.1.0-rc12",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,
@@ -37,4 +37,4 @@
   "debug": true,
   "unregisterOnShutdown": false,
   "enableExperimentalFeature": false
-}
+}

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

@@ -1,8 +1,11 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.0-rc10 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.0-rc12 by https://github.com/RinDevJunior",
   "type": "object",
-  "required": ["username", "password"],
+  "required": [
+    "username",
+    "password"
+  ],
   "properties": {
     "name": {
       "description": "Plugin name",
@@ -57,7 +60,9 @@
                 "const": true
               }
             },
-            "required": ["enableExperimentalFeature"]
+            "required": [
+              "enableExperimentalFeature"
+            ]
           },
           "then": {
             "properties": {
@@ -114,7 +119,9 @@
                           "const": true
                         }
                       },
-                      "required": ["enableCleanModeMapping"]
+                      "required": [
+                        "enableCleanModeMapping"
+                      ]
                     },
                     "then": {
                       "properties": {
@@ -159,7 +166,9 @@
                                     "default": 25
                                   }
                                 },
-                                "required": ["distanceOff"]
+                                "required": [
+                                  "distanceOff"
+                                ]
                               }
                             }
                           ]
@@ -196,7 +205,9 @@
                                     "default": 25
                                   }
                                 },
-                                "required": ["distanceOff"]
+                                "required": [
+                                  "distanceOff"
+                                ]
                               }
                             }
                           ]
@@ -226,20 +237,36 @@
     "fanMode": {
       "type": "string",
       "description": "Suction power mode to use (e.g., 'Quiet', 'Balanced', 'Turbo', 'Max', 'MaxPlus').",
-      "enum": ["Quiet", "Balanced", "Turbo", "Max", "MaxPlus"],
+      "enum": [
+        "Quiet",
+        "Balanced",
+        "Turbo",
+        "Max",
+        "MaxPlus"
+      ],
       "default": "Balanced"
     },
     "waterFlowMode": {
       "type": "string",
       "description": "Water flow mode to use (e.g., 'Low', 'Medium', 'High', 'CustomizeWithDistanceOff').",
-      "enum": ["Low", "Medium", "High", "CustomizeWithDistanceOff"],
+      "enum": [
+        "Low",
+        "Medium",
+        "High",
+        "CustomizeWithDistanceOff"
+      ],
       "default": "Medium"
     },
     "mopRouteMode": {
       "type": "string",
       "description": "Mop route intensity to use (e.g., 'Standard', 'Deep', 'DeepPlus', 'Fast').",
-      "enum": ["Standard", "Deep", "DeepPlus", "Fast"],
+      "enum": [
+        "Standard",
+        "Deep",
+        "DeepPlus",
+        "Fast"
+      ],
       "default": "Standard"
     }
   }
-}
+}

package/package.json

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

package/src/initialData/getSupportedAreas.ts

@@ -9,7 +9,14 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
   log?.debug('getSupportedAreas', roomMap ? debugStringify(roomMap) : 'undefined');
 
   if (!rooms || rooms.length === 0 || !roomMap?.rooms || roomMap.rooms.length == 0) {
-    log?.error('No rooms found');
+    if (!rooms || rooms.length === 0) {
+      log?.error('No rooms found');
+    }
+
+    if (!roomMap || !roomMap.rooms || roomMap.rooms.length == 0) {
+      log?.error('No room map found');
+    }
+
     return [
       {
         areaId: 1,

package/src/platform.ts

@@ -32,9 +32,9 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     super(matterbridge, log, config);
 
     // Verify that Matterbridge is the correct version
-    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.1.5')) {
+    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.1.6')) {
       throw new Error(
-        `This plugin requires Matterbridge version >= "3.1.5". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
+        `This plugin requires Matterbridge version >= "3.1.6". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
       );
     }
     this.log.info('Initializing platform:', this.config.name);
@@ -199,7 +199,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
       if (!configurateSuccess.get(duid)) {
         continue;
       }
-      await this.roborockService.activateDeviceNotify(robot.device);
+      this.roborockService.activateDeviceNotify(robot.device);
     }
 
     await this.platformRunner?.requestHomeData();
@@ -224,6 +224,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     }
 
     if (vacuum.rooms === undefined || vacuum.rooms.length === 0) {
+      this.log.error(`Fetching map information for device: ${vacuum.name} (${vacuum.duid}) to get rooms`);
       const map_info = await this.roborockService.getMapInformation(vacuum.duid);
       const rooms = map_info?.maps?.[0]?.rooms ?? [];
       vacuum.rooms = rooms;
@@ -279,8 +280,4 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     this.log.logLevel = logLevel;
     return Promise.resolve();
   }
-
-  private sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-  }
 }