matterbridge-roborock-vacuum-plugin 1.1.0-rc15 → 1.1.0-rc16

package/.github/workflows/build.yml

@@ -1,6 +1,10 @@
 name: Build, lint and test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   publish:

package/.github/workflows/coverage.yml

@@ -1,6 +1,10 @@
 name: Analyze code coverage
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - dev
 
 jobs:
   publish:

package/CHANGELOG.md

@@ -0,0 +1,62 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+---
+
+## [1.1.0-rc15] - 2025-07-26
+### Changed
+- Refactor codebase.
+- Correct LocalNetworkClient connecting process.
+- Update and fix unit tests.
+- Various lint fixes.
+
+## [1.1.0-rc14] - 2025-07-26
+### Added
+- Initialize sync device status via MQTT.
+
+## [1.1.0-rc13] - 2025-07-25
+### Added
+- More unit tests.
+- Increased unit test coverage.
+
+### Fixed
+- Several bugs related to socket connection issues.
+- Improve reconnect logic and cleaning status reporting.
+
+## [1.1.0-rc11] - 2025-07-22
+### Fixed
+- Unable to get room from `get_room_mapping`.
+- Can not get room from `get_multi_maps_list`.
+
+## [1.1.0-rc10] - 2025-07-22
+### Fixed
+- Stop retrying to connect socket when exceeding retry count.
+- Lint and unit test updates.
+
+## [1.1.0-rc09] - 2025-07-20
+### Fixed
+- Do not re-connect MQTT unnecessarily.
+- Reconnect when socket or MQTT is unexpectedly disconnected.
+
+### Enhanced
+- Save user data for subsequent logins.
+- Unit test improvements.
+
+## [1.1.0-rc07] - 2025-07-17
+### Changed
+- Enable server mode fixes.
+- Improved error logging when plugin can't connect to device.
+
+## [1.1.0-rc06] - 2025-07-16
+### Fixed
+- Can not start plugin when server mode is disabled.
+
+## [1.1.0-rc04] - 2025-07-16
+### Added
+- Unit tests.
+- GitHub Actions improvements.
+
+---
+
+**Note:** This changelog includes only the most recent 30 commits. For the full commit history, view more on [GitHub](https://github.com/RinDevJunior/matterbridge-roborock-vacuum-plugin/commits?sort=updated&direction=desc).

package/dist/helper.js

@@ -43,9 +43,9 @@ export async function getRoomMap(duid, platform) {
     }
     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.iot_name_id), r.tag]);
+        if (mapInfo && mapInfo.allRooms && mapInfo.allRooms.length > 0) {
+            platform.log.error(`getRoomMap - mapInfo: ${debugStringify(mapInfo.allRooms)}`);
+            const roomDataMap = mapInfo.allRooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag]);
             robot.roomInfo = new RoomMap(roomDataMap, rooms);
         }
     }
@@ -54,7 +54,7 @@ export async function getRoomMap(duid, platform) {
 export async function getRoomMapFromDevice(device, platform) {
     const rooms = device?.rooms ?? [];
     platform.log.notice('-------------------------------------------0--------------------------------------------------------');
-    platform.log.notice(`getRoomMapFromDevice: ${debugStringify(rooms)}`);
+    platform.log.notice(`getRoomMapFromDevice - device.rooms: ${debugStringify(rooms)}`);
     if (device && platform.roborockService) {
         const roomData = await platform.roborockService.getRoomMappings(device.duid);
         if (roomData !== undefined && roomData.length > 0) {
@@ -66,8 +66,8 @@ export async function getRoomMapFromDevice(device, platform) {
         }
         const mapInfo = await platform.roborockService.getMapInformation(device.duid);
         platform.log.notice(`getRoomMapFromDevice - mapInfo: ${mapInfo ? debugStringify(mapInfo) : 'undefined'}`);
-        if (mapInfo && mapInfo.maps && mapInfo.maps.length > 0) {
-            const roomDataMap = mapInfo.maps[0].rooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag]);
+        if (mapInfo && mapInfo.allRooms && mapInfo.allRooms.length > 0) {
+            const roomDataMap = mapInfo.allRooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag]);
             const roomMap = new RoomMap(roomDataMap, rooms);
             platform.log.notice(`getRoomMapFromDevice - roomMap: ${debugStringify(roomMap)}`);
             platform.log.notice('-------------------------------------------2--------------------------------------------------------');

package/dist/initialData/getSupportedAreas.js

@@ -3,11 +3,13 @@ import { randomInt } from 'node:crypto';
 export function getSupportedAreas(vacuumRooms, roomMap, log) {
     log?.debug('getSupportedAreas-vacuum room', debugStringify(vacuumRooms));
     log?.debug('getSupportedAreas-roomMap', roomMap ? debugStringify(roomMap) : 'undefined');
-    if (!vacuumRooms || vacuumRooms.length === 0 || !roomMap?.rooms || roomMap.rooms.length == 0) {
-        if (!vacuumRooms || vacuumRooms.length === 0) {
+    const noVacuumRooms = !vacuumRooms || vacuumRooms.length === 0;
+    const noRoomMap = !roomMap?.rooms || roomMap.rooms.length === 0;
+    if (noVacuumRooms || noRoomMap) {
+        if (noVacuumRooms) {
             log?.error('No rooms found');
         }
-        if (!roomMap || !roomMap.rooms || roomMap.rooms.length == 0) {
+        if (noRoomMap) {
             log?.error('No room map found');
         }
         return [
@@ -26,12 +28,13 @@ export function getSupportedAreas(vacuumRooms, roomMap, log) {
         ];
     }
     const supportedAreas = roomMap.rooms.map((room) => {
+        const locationName = room.displayName ?? vacuumRooms.find((r) => r.id === room.globalId || r.id === room.id)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`;
         return {
             areaId: room.id,
             mapId: null,
             areaInfo: {
                 locationInfo: {
-                    locationName: room.displayName ?? vacuumRooms.find((r) => r.id == room.globalId || r.id == room.id)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`,
+                    locationName,
                     floorNumber: null,
                     areaType: null,
                 },
@@ -41,8 +44,8 @@ export function getSupportedAreas(vacuumRooms, roomMap, log) {
     });
     log?.debug('getSupportedAreas - supportedAreas', debugStringify(supportedAreas));
     const duplicated = findDuplicatedAreaIds(supportedAreas, log);
-    return duplicated
-        ? [
+    if (duplicated) {
+        return [
             {
                 areaId: 2,
                 mapId: null,
@@ -55,8 +58,9 @@ export function getSupportedAreas(vacuumRooms, roomMap, log) {
                     landmarkInfo: null,
                 },
             },
-        ]
-        : supportedAreas;
+        ];
+    }
+    return supportedAreas;
 }
 function findDuplicatedAreaIds(areas, log) {
     const seen = new Set();

package/dist/model/RoomMap.js

@@ -1,12 +1,13 @@
 export class RoomMap {
-    rooms = [];
+    rooms;
     constructor(roomData, rooms) {
-        this.rooms = roomData.map((entry) => {
+        this.rooms = roomData.map(([id, globalId, altId]) => {
+            const room = rooms.find((r) => Number(r.id) === Number(globalId) || Number(r.id) === Number(id));
             return {
-                id: entry[0],
-                globalId: Number(entry[1]),
-                displayName: rooms.find((r) => Number(r.id) == Number(entry[1]))?.name,
-                alternativeId: `${entry[0]}${entry[2]}`,
+                id,
+                globalId: globalId !== undefined ? Number(globalId) : undefined,
+                displayName: room?.name,
+                alternativeId: `${id}${altId}`,
             };
         });
     }

package/dist/platform.js

@@ -159,8 +159,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         if (vacuum.rooms === undefined || vacuum.rooms.length === 0) {
             this.log.notice(`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.map((room) => ({ id: room.id, name: room.displayName }));
+            const rooms = map_info?.allRooms ?? [];
+            vacuum.rooms = rooms.map((room) => ({ id: room.globalId, name: room.displayName }));
         }
         const roomMap = await getRoomMapFromDevice(vacuum, this);
         this.log.debug('Initializing - roomMap: ', debugStringify(roomMap));

package/dist/platformRunner.js

@@ -1,11 +1,12 @@
 import { RvcRunMode, PowerSource, ServiceArea, RvcOperationalState, RvcCleanMode } from 'matterbridge/matter/clusters';
-import { getRoomMap, getVacuumProperty, isStatusUpdate } from './helper.js';
+import { getRoomMap, getRoomMapFromDevice, getVacuumProperty, isStatusUpdate } from './helper.js';
 import { getRunningMode } from './initialData/getSupportedRunModes.js';
 import { state_to_matter_operational_status, state_to_matter_state } from './share/function.js';
-import { getBatteryState, getBatteryStatus, getOperationalErrorState } from './initialData/index.js';
+import { getBatteryState, getBatteryStatus, getOperationalErrorState, getSupportedAreas } from './initialData/index.js';
 import { NotifyMessageTypes } from './notifyMessageTypes.js';
 import { Protocol } from './roborockCommunication/broadcast/model/protocol.js';
 import { hasDockingStationError, parseDockingStationStatus } from './model/DockingStationStatus.js';
+import { AdditionalPropCode } from './roborockCommunication/index.js';
 import { OperationStatusCode } from './roborockCommunication/Zenum/operationStatusCode.js';
 import { getCurrentCleanModeFunc } from './share/runtimeHelper.js';
 import { debugStringify } from 'matterbridge/logger';
@@ -217,7 +218,25 @@ export class PlatformRunner {
                     });
                     break;
                 }
-                case Protocol.additional_props:
+                case Protocol.additional_props: {
+                    platform.log.notice(`Received additional properties for robot ${duid}: ${debugStringify(data)}`);
+                    const propCode = data.dps[Protocol.additional_props];
+                    platform.log.debug(`DPS for additional properties: ${propCode}, AdditionalPropCode: ${AdditionalPropCode[propCode]}`);
+                    if (propCode === AdditionalPropCode.map_change) {
+                        platform.log.notice('------------------------ get roomData ----------------------------');
+                        const roomMap = await getRoomMapFromDevice(robot.device, platform);
+                        platform.log.notice('------------------------ Room map updated ------------------------');
+                        const supportedAreas = getSupportedAreas(robot.device.rooms, roomMap, platform.log);
+                        platform.log.notice(`Supported areas: ${debugStringify(supportedAreas)}`);
+                        platform.log.notice('------------------------ Supported areas updated ------------------');
+                        platform.roborockService?.setSupportedAreas(duid, supportedAreas);
+                        platform.roborockService?.setSelectedAreas(duid, []);
+                        robot.updateAttribute(ServiceArea.Cluster.id, 'supportedAreas', supportedAreas, platform.log);
+                        robot.updateAttribute(ServiceArea.Cluster.id, 'selectedAreas', [], platform.log);
+                        robot.updateAttribute(ServiceArea.Cluster.id, 'currentArea', null, platform.log);
+                    }
+                    break;
+                }
                 case Protocol.back_type: {
                     break;
                 }

package/dist/roborockCommunication/Zenum/additionalPropCode.js

@@ -0,0 +1,4 @@
+export var AdditionalPropCode;
+(function (AdditionalPropCode) {
+    AdditionalPropCode[AdditionalPropCode["map_change"] = 4] = "map_change";
+})(AdditionalPropCode || (AdditionalPropCode = {}));

package/dist/roborockCommunication/Zmodel/mapInfo.js

@@ -1,28 +1,30 @@
 import decodeComponent from '../helper/nameDecoder.js';
 export class MapInfo {
     maps = [];
+    allRooms = [];
     constructor(multimap) {
-        multimap.map_info.forEach((map) => {
-            this.maps.push({
-                id: map.mapFlag,
-                name: decodeComponent(map.name)?.toLowerCase(),
-                rooms: map.rooms && map.rooms.length > 0
-                    ? map.rooms.map((room) => {
-                        return {
-                            id: room.id,
-                            iot_name_id: room.iot_name_id,
-                            tag: room.tag,
-                            displayName: room.iot_name,
-                        };
-                    })
-                    : [],
-            });
+        this.maps = multimap.map_info.map((mapInfo) => {
+            const rooms = mapInfo.rooms.map((room) => ({
+                id: room.id,
+                globalId: parseInt(room.iot_name_id),
+                iot_name_id: room.iot_name_id,
+                tag: room.tag,
+                displayName: room.iot_name,
+                mapId: mapInfo.mapFlag,
+            }));
+            this.allRooms.push(...rooms);
+            return {
+                id: mapInfo.mapFlag,
+                name: decodeComponent(mapInfo.name),
+                rooms,
+            };
         });
+        this.allRooms = this.allRooms.filter((room, index, self) => index === self.findIndex((r) => r.globalId === room.globalId));
     }
     getById(id) {
         return this.maps.find((m) => m.id === id)?.name;
     }
     getByName(name) {
-        return this.maps.find((m) => m.name === name.toLowerCase())?.id;
+        return this.maps.find((m) => m.name?.toLowerCase() === name.toLowerCase())?.id;
     }
 }

package/dist/roborockCommunication/broadcast/messageProcessor.js

@@ -1,5 +1,4 @@
 import { debugStringify } from 'matterbridge/logger';
-import { RoomInfo } from '../Zmodel/roomInfo.js';
 import { SimpleMessageListener } from './listener/index.js';
 import { RequestMessage } from './model/requestMessage.js';
 import { DeviceStatus } from '../Zmodel/deviceStatus.js';
@@ -40,9 +39,9 @@ export class MessageProcessor {
         }
         return undefined;
     }
-    async getRooms(duid, rooms) {
+    async getRooms(duid) {
         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);
     }
     async gotoDock(duid) {
         const request = new RequestMessage({ method: 'app_charge' });

package/dist/roborockCommunication/index.js

@@ -8,4 +8,5 @@ export { ClientRouter } from './broadcast/clientRouter.js';
 export { DeviceStatus } from './Zmodel/deviceStatus.js';
 export { ResponseMessage } from './broadcast/model/responseMessage.js';
 export { MapInfo } from './Zmodel/mapInfo.js';
+export { AdditionalPropCode } from './Zenum/additionalPropCode.js';
 export { Scene } from './Zmodel/scene.js';

package/dist/roborockService.js

@@ -351,7 +351,7 @@ export default class RoborockService {
         assert(this.iotApi !== undefined);
         return this.iotApi.startScene(sceneId);
     }
-    getRoomMappings(duid) {
+    async getRoomMappings(duid) {
         if (!this.messageClient) {
             this.logger.warn('messageClient not initialized. Waititing for next execution');
             return Promise.resolve(undefined);

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.0-rc15",
+  "version": "1.1.0-rc16",
   "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.1.0-rc15 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.0-rc16 by https://github.com/RinDevJunior",
   "type": "object",
   "required": ["username", "password"],
   "properties": {

package/package.json

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

package/src/helper.ts

@@ -47,7 +47,6 @@ export async function getRoomMap(duid: string, platform: RoborockMatterbridgePla
   if (platform.roborockService === undefined) return undefined;
 
   const rooms = robot.device.rooms ?? [];
-  // if (platform.robot?.device === undefined || platform.roborockService === undefined) return undefined;
   if (robot.roomInfo === undefined) {
     const roomData = await platform.roborockService.getRoomMappings(robot.device.duid);
     if (roomData !== undefined && roomData.length > 0) {
@@ -58,10 +57,10 @@ export async function getRoomMap(duid: string, platform: RoborockMatterbridgePla
 
   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)}`);
+    if (mapInfo && mapInfo.allRooms && mapInfo.allRooms.length > 0) {
+      platform.log.error(`getRoomMap - mapInfo: ${debugStringify(mapInfo.allRooms)}`);
 
-      const roomDataMap = mapInfo.maps[0].rooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag] as [number, number, number]);
+      const roomDataMap = mapInfo.allRooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag] as [number, number, number]);
       robot.roomInfo = new RoomMap(roomDataMap, rooms);
     }
   }
@@ -73,7 +72,7 @@ export async function getRoomMapFromDevice(device: Device, platform: RoborockMat
   const rooms = device?.rooms ?? [];
 
   platform.log.notice('-------------------------------------------0--------------------------------------------------------');
-  platform.log.notice(`getRoomMapFromDevice: ${debugStringify(rooms)}`);
+  platform.log.notice(`getRoomMapFromDevice - device.rooms: ${debugStringify(rooms)}`);
 
   if (device && platform.roborockService) {
     const roomData = await platform.roborockService.getRoomMappings(device.duid);
@@ -90,8 +89,8 @@ export async function getRoomMapFromDevice(device: Device, platform: RoborockMat
     const mapInfo = await platform.roborockService.getMapInformation(device.duid);
     platform.log.notice(`getRoomMapFromDevice - mapInfo: ${mapInfo ? debugStringify(mapInfo) : 'undefined'}`);
 
-    if (mapInfo && mapInfo.maps && mapInfo.maps.length > 0) {
-      const roomDataMap = mapInfo.maps[0].rooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag] as [number, number, number]);
+    if (mapInfo && mapInfo.allRooms && mapInfo.allRooms.length > 0) {
+      const roomDataMap = mapInfo.allRooms.map((r) => [r.id, parseInt(r.iot_name_id), r.tag] as [number, number, number]);
 
       const roomMap = new RoomMap(roomDataMap, rooms);
 

package/src/initialData/getSupportedAreas.ts

@@ -8,15 +8,16 @@ export function getSupportedAreas(vacuumRooms: Room[], roomMap: RoomMap | undefi
   log?.debug('getSupportedAreas-vacuum room', debugStringify(vacuumRooms));
   log?.debug('getSupportedAreas-roomMap', roomMap ? debugStringify(roomMap) : 'undefined');
 
-  if (!vacuumRooms || vacuumRooms.length === 0 || !roomMap?.rooms || roomMap.rooms.length == 0) {
-    if (!vacuumRooms || vacuumRooms.length === 0) {
+  const noVacuumRooms = !vacuumRooms || vacuumRooms.length === 0;
+  const noRoomMap = !roomMap?.rooms || roomMap.rooms.length === 0;
+
+  if (noVacuumRooms || noRoomMap) {
+    if (noVacuumRooms) {
       log?.error('No rooms found');
     }
-
-    if (!roomMap || !roomMap.rooms || roomMap.rooms.length == 0) {
+    if (noRoomMap) {
       log?.error('No room map found');
     }
-
     return [
       {
         areaId: 1,
@@ -34,12 +35,14 @@ export function getSupportedAreas(vacuumRooms: Room[], roomMap: RoomMap | undefi
   }
 
   const supportedAreas: ServiceArea.Area[] = roomMap.rooms.map((room) => {
+    const locationName = room.displayName ?? vacuumRooms.find((r) => r.id === room.globalId || r.id === room.id)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`;
+
     return {
       areaId: room.id,
       mapId: null,
       areaInfo: {
         locationInfo: {
-          locationName: room.displayName ?? vacuumRooms.find((r) => r.id == room.globalId || r.id == room.id)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`,
+          locationName,
           floorNumber: null,
           areaType: null,
         },
@@ -52,27 +55,30 @@ export function getSupportedAreas(vacuumRooms: Room[], roomMap: RoomMap | undefi
 
   const duplicated = findDuplicatedAreaIds(supportedAreas, log);
 
-  return duplicated
-    ? [
-        {
-          areaId: 2,
-          mapId: null,
-          areaInfo: {
-            locationInfo: {
-              locationName: 'Unknown',
-              floorNumber: null,
-              areaType: null,
-            },
-            landmarkInfo: null,
+  if (duplicated) {
+    return [
+      {
+        areaId: 2,
+        mapId: null,
+        areaInfo: {
+          locationInfo: {
+            locationName: 'Unknown',
+            floorNumber: null,
+            areaType: null,
           },
+          landmarkInfo: null,
         },
-      ]
-    : supportedAreas;
+      },
+    ];
+  }
+
+  return supportedAreas;
 }
 
 function findDuplicatedAreaIds(areas: ServiceArea.Area[], log?: AnsiLogger): boolean {
   const seen = new Set<number>();
   const duplicates: number[] = [];
+
   for (const area of areas) {
     if (seen.has(area.areaId)) {
       duplicates.push(area.areaId);
@@ -80,9 +86,11 @@ function findDuplicatedAreaIds(areas: ServiceArea.Area[], log?: AnsiLogger): boo
       seen.add(area.areaId);
     }
   }
+
   if (duplicates.length > 0 && log) {
     const duplicated = areas.filter((x) => duplicates.includes(x.areaId));
     log.error(`Duplicated areaId(s) found: ${debugStringify(duplicated)}`);
   }
+
   return duplicates.length > 0;
 }

package/src/model/RoomMap.ts

@@ -17,30 +17,34 @@ roomMap = {
 
 import { Room } from '../roborockCommunication/Zmodel/room.js';
 
+export interface RoomMapEntry {
+  id: number;
+  globalId: number | undefined;
+  displayName?: string;
+  alternativeId: string;
+}
+
 export class RoomMap {
-  readonly rooms: {
-    id: number;
-    globalId: number | undefined;
-    displayName: string | undefined;
-    alternativeId: string;
-  }[] = [];
+  readonly rooms: RoomMapEntry[];
 
   constructor(roomData: number[][], rooms: Room[]) {
-    this.rooms = roomData.map((entry) => {
+    this.rooms = roomData.map(([id, globalId, altId]) => {
+      const room = rooms.find((r) => Number(r.id) === Number(globalId) || Number(r.id) === Number(id));
       return {
-        id: entry[0],
-        globalId: Number(entry[1]),
-        displayName: rooms.find((r) => Number(r.id) == Number(entry[1]))?.name,
-        alternativeId: `${entry[0]}${entry[2]}`,
+        id,
+        globalId: globalId !== undefined ? Number(globalId) : undefined,
+        displayName: room?.name,
+        alternativeId: `${id}${altId}`,
       };
     });
   }
 
+  // Optionally, add utility methods for clarity
   // getGlobalId(id: number): number | undefined {
-  //   return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
+  //   return this.rooms.find((r) => r.id === id)?.globalId;
   // }
 
   // getRoomId(globalId: number): number | undefined {
-  //   return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
+  //   return this.rooms.find((r) => r.globalId === globalId)?.id;
   // }
 }

package/src/platform.ts

@@ -227,8 +227,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     if (vacuum.rooms === undefined || vacuum.rooms.length === 0) {
       this.log.notice(`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.map((room) => ({ id: room.id, name: room.displayName }) as Room);
+      const rooms = map_info?.allRooms ?? [];
+      vacuum.rooms = rooms.map((room) => ({ id: room.globalId, name: room.displayName }) as Room);
     }
 
     const roomMap = await getRoomMapFromDevice(vacuum, this);

package/src/platformRunner.ts

@@ -1,17 +1,17 @@
 import { RvcRunMode, PowerSource, ServiceArea, RvcOperationalState, RvcCleanMode } from 'matterbridge/matter/clusters';
-import { getRoomMap, getVacuumProperty, isStatusUpdate } from './helper.js';
+import { getRoomMap, getRoomMapFromDevice, getVacuumProperty, isStatusUpdate } from './helper.js';
 import { getRunningMode } from './initialData/getSupportedRunModes.js';
 import { CloudMessageModel } from './model/CloudMessageModel.js';
 import { RoborockMatterbridgePlatform } from './platform.js';
 import { state_to_matter_operational_status, state_to_matter_state } from './share/function.js';
-import { getBatteryState, getBatteryStatus, getOperationalErrorState } from './initialData/index.js';
+import { getBatteryState, getBatteryStatus, getOperationalErrorState, getSupportedAreas } from './initialData/index.js';
 import { NotifyMessageTypes } from './notifyMessageTypes.js';
 import { CloudMessageResult } from './roborockCommunication/Zmodel/messageResult.js';
 import { Protocol } from './roborockCommunication/broadcast/model/protocol.js';
 import { DpsPayload } from './roborockCommunication/broadcast/model/dps.js';
 import { RoborockVacuumCleaner } from './rvc.js';
 import { hasDockingStationError, parseDockingStationStatus } from './model/DockingStationStatus.js';
-import { BatteryMessage, Device, DeviceErrorMessage, DeviceStatusNotify, Home } from './roborockCommunication/index.js';
+import { AdditionalPropCode, BatteryMessage, Device, DeviceErrorMessage, DeviceStatusNotify, Home } from './roborockCommunication/index.js';
 import { OperationStatusCode } from './roborockCommunication/Zenum/operationStatusCode.js';
 import { getCurrentCleanModeFunc } from './share/runtimeHelper.js';
 import { debugStringify } from 'matterbridge/logger';
@@ -280,7 +280,30 @@ export class PlatformRunner {
           });
           break; // Do nothing, handled in local message
         }
-        case Protocol.additional_props:
+        case Protocol.additional_props: {
+          platform.log.notice(`Received additional properties for robot ${duid}: ${debugStringify(data)}`);
+          const propCode = data.dps[Protocol.additional_props] as number;
+          platform.log.debug(`DPS for additional properties: ${propCode}, AdditionalPropCode: ${AdditionalPropCode[propCode]}`);
+
+          if (propCode === AdditionalPropCode.map_change) {
+            platform.log.notice('------------------------ get roomData ----------------------------');
+
+            const roomMap = await getRoomMapFromDevice(robot.device, platform);
+
+            platform.log.notice('------------------------ Room map updated ------------------------');
+            const supportedAreas = getSupportedAreas(robot.device.rooms, roomMap, platform.log);
+
+            platform.log.notice(`Supported areas: ${debugStringify(supportedAreas)}`);
+            platform.log.notice('------------------------ Supported areas updated ------------------');
+
+            platform.roborockService?.setSupportedAreas(duid, supportedAreas);
+            platform.roborockService?.setSelectedAreas(duid, []);
+            robot.updateAttribute(ServiceArea.Cluster.id, 'supportedAreas', supportedAreas, platform.log);
+            robot.updateAttribute(ServiceArea.Cluster.id, 'selectedAreas', [], platform.log);
+            robot.updateAttribute(ServiceArea.Cluster.id, 'currentArea', null, platform.log);
+          }
+          break;
+        }
         case Protocol.back_type: {
           // TODO: check if this is needed
           break;

package/src/roborockCommunication/Zenum/additionalPropCode.ts

@@ -0,0 +1,3 @@
+export enum AdditionalPropCode {
+  map_change = 4,
+}

package/src/roborockCommunication/Zmodel/map.ts

@@ -1,4 +1,4 @@
-export interface Map {
+export interface MapInformation {
   mapFlag: number;
   add_time: number;
   length: number;

package/src/roborockCommunication/Zmodel/mapInfo.ts

@@ -2,27 +2,45 @@ import decodeComponent from '../helper/nameDecoder.js';
 import { RoomInformation } from './map.js';
 import type { MultipleMap } from './multipleMap.js';
 
+export interface MapRoom {
+  id: number;
+  iot_name_id: string;
+  tag: number;
+  globalId?: number;
+  displayName: string;
+  mapId?: number;
+}
+
+export interface MapEntry {
+  id: number;
+  name: string | undefined;
+  rooms: MapRoom[];
+}
+
 export class MapInfo {
-  readonly maps: { id: number; name: string | undefined; rooms: { id: number; iot_name_id: string; tag: number; displayName: string }[] }[] = [];
+  public readonly maps: MapEntry[] = [];
+  public readonly allRooms: MapRoom[] = [];
 
   constructor(multimap: MultipleMap) {
-    multimap.map_info.forEach((map) => {
-      this.maps.push({
-        id: map.mapFlag,
-        name: decodeComponent(map.name)?.toLowerCase(),
-        rooms:
-          map.rooms && map.rooms.length > 0
-            ? map.rooms.map((room: RoomInformation) => {
-                return {
-                  id: room.id,
-                  iot_name_id: room.iot_name_id,
-                  tag: room.tag,
-                  displayName: room.iot_name,
-                };
-              })
-            : [],
-      });
+    this.maps = multimap.map_info.map((mapInfo) => {
+      const rooms: MapRoom[] = mapInfo.rooms.map((room: RoomInformation) => ({
+        id: room.id,
+        globalId: parseInt(room.iot_name_id),
+        iot_name_id: room.iot_name_id,
+        tag: room.tag,
+        displayName: room.iot_name,
+        mapId: mapInfo.mapFlag,
+      }));
+
+      this.allRooms.push(...rooms);
+      return {
+        id: mapInfo.mapFlag,
+        name: decodeComponent(mapInfo.name),
+        rooms,
+      };
     });
+
+    this.allRooms = this.allRooms.filter((room, index, self) => index === self.findIndex((r) => r.globalId === room.globalId));
   }
 
   getById(id: number): string | undefined {
@@ -30,6 +48,6 @@ export class MapInfo {
   }
 
   getByName(name: string): number | undefined {
-    return this.maps.find((m) => m.name === name.toLowerCase())?.id;
+    return this.maps.find((m) => m.name?.toLowerCase() === name.toLowerCase())?.id;
   }
 }

package/src/roborockCommunication/Zmodel/multipleMap.ts

@@ -1,8 +1,8 @@
-import { Map } from './map.js';
+import { MapInformation } from './map.js';
 
 export interface MultipleMap {
   max_multi_map: number;
   max_bak_map: number;
   multi_map_count: number;
-  map_info: Map[];
+  map_info: MapInformation[];
 }

package/src/roborockCommunication/broadcast/messageProcessor.ts

@@ -1,11 +1,9 @@
 import { AnsiLogger, debugStringify } from 'matterbridge/logger';
 import { CloudMessageResult } from '../Zmodel/messageResult.js';
-import { RoomInfo } from '../Zmodel/roomInfo.js';
 import { AbstractMessageHandler } from './listener/abstractMessageHandler.js';
 import { SimpleMessageListener } from './listener/index.js';
 import { RequestMessage } from './model/requestMessage.js';
 import { DeviceStatus } from '../Zmodel/deviceStatus.js';
-import { Room } from '../Zmodel/room.js';
 import { Client } from './client.js';
 import { NetworkInfo } from '../Zmodel/networkInfo.js';
 
@@ -58,9 +56,9 @@ export class MessageProcessor {
     return undefined;
   }
 
-  public async getRooms(duid: string, rooms: Room[]): Promise<RoomInfo> {
+  public async getRooms(duid: string): Promise<number[][] | undefined> {
     const request = new RequestMessage({ method: 'get_room_mapping' });
-    return this.client.get<number[][] | undefined>(duid, request).then((response) => new RoomInfo(rooms, response ?? []));
+    return this.client.get<number[][] | undefined>(duid, request); // .then((response) => new RoomInfo(rooms, response ?? []));
   }
 
   public async gotoDock(duid: string): Promise<void> {

package/src/roborockCommunication/index.ts

@@ -8,6 +8,7 @@ export { ClientRouter } from './broadcast/clientRouter.js';
 export { DeviceStatus } from './Zmodel/deviceStatus.js';
 export { ResponseMessage } from './broadcast/model/responseMessage.js';
 export { MapInfo } from './Zmodel/mapInfo.js';
+export { AdditionalPropCode } from './Zenum/additionalPropCode.js';
 
 export { Scene } from './Zmodel/scene.js';
 

package/src/roborockService.ts

@@ -375,6 +375,7 @@ export default class RoborockService {
         },
       };
     }) as Device[];
+
     return result;
   }
 
@@ -444,12 +445,14 @@ export default class RoborockService {
     return this.iotApi.startScene(sceneId);
   }
 
-  public getRoomMappings(duid: string): Promise<number[][] | undefined> {
+  public async getRoomMappings(duid: string): Promise<number[][] | undefined> {
     if (!this.messageClient) {
       this.logger.warn('messageClient not initialized. Waititing for next execution');
       return Promise.resolve(undefined);
     }
     return this.messageClient.get(duid, new RequestMessage({ method: 'get_room_mapping', secure: this.isRequestSecure(duid) }));
+
+    // return await this.getMessageProcessor(duid)?.getRooms(duid);
   }
 
   public async initializeMessageClient(username: string, device: Device, userdata: UserData): Promise<void> {

package/src/tests/helper.test.ts

@@ -0,0 +1,113 @@
+import { getRoomMapFromDevice } from '../helper';
+import { RoomMap } from '../model/RoomMap';
+
+// Mocks
+// const mockLog = {
+//   notice: (message: string, ...arg: unknown[]) => console.log('NOTICE:', message, ...arg),
+//   error: (message: string, ...arg: unknown[]) => console.error('ERROR:', message, ...arg),
+//   debug: (message: string, ...arg: unknown[]) => console.debug('DEBUG:', message, ...arg),
+//   info: (message: string, ...arg: unknown[]) => console.info('INFO:', message, ...arg),
+//   warn: (message: string, ...arg: unknown[]) => console.warn('WARN:', message, ...arg),
+//   verbose: (message: string, ...arg: unknown[]) => console.log('VERBOSE:', message, ...arg),
+// };
+
+const mockLog = {
+  notice: jest.fn(),
+  error: jest.fn(),
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  verbose: jest.fn(),
+};
+
+const mockRoborockService = {
+  getRoomMappings: jest.fn(),
+  getMapInformation: jest.fn(),
+};
+
+const mockPlatform = {
+  log: mockLog,
+  roborockService: mockRoborockService,
+};
+
+describe('getRoomMapFromDevice', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  //   it('returns RoomMap from getRoomMappings if available', async () => {
+  //     const device = {
+  //       duid: '123',
+  //       rooms: [
+  //         {
+  //           'id': 12461114,
+  //           'name': 'Guest bedroom',
+  //         },
+  //         {
+  //           'id': 12461111,
+  //           'name': 'Balcony',
+  //         },
+  //         {
+  //           'id': 12461109,
+  //           'name': 'Master bedroom',
+  //         },
+  //         {
+  //           'id': 11100849,
+  //           'name': 'Study',
+  //         },
+  //         {
+  //           'id': 11100847,
+  //           'name': 'Bedroom',
+  //         },
+  //         {
+  //           'id': 11100845,
+  //           'name': 'Kitchen',
+  //         },
+  //         {
+  //           'id': 11100842,
+  //           'name': 'Living room',
+  //         },
+  //       ],
+  //     };
+  //     mockRoborockService.getRoomMappings.mockResolvedValue([
+  //       [1, '11100842', 6],
+  //       [2, '12461114', 3],
+  //       [3, '12461109', 2],
+  //       [4, '12461111', 7],
+  //     ]);
+  //     mockRoborockService.getMapInformation.mockResolvedValue(undefined);
+
+  //     const result = await getRoomMapFromDevice(device as any, mockPlatform as any);
+
+  //     //console.log('Result:', result);
+  //     expect(result).toBeInstanceOf(RoomMap);
+  //     expect(mockRoborockService.getRoomMappings).toHaveBeenCalledWith('123');
+  //     expect(result.rooms.length).toBeGreaterThan(0);
+  //   });
+
+  it('returns RoomMap from getRoomMappings if available', async () => {
+    const device = {
+      duid: '123',
+      rooms: [
+        { id: 1, name: 'Kitchen' },
+        { id: 2, name: 'Study' },
+        { id: 3, name: 'Living room' },
+        { id: 4, name: 'Bedroom' },
+      ],
+    };
+    mockRoborockService.getRoomMappings.mockResolvedValue([
+      [1, '11100845', 14],
+      [2, '11100849', 9],
+      [3, '11100842', 6],
+      [4, '11100847', 1],
+    ]);
+    mockRoborockService.getMapInformation.mockResolvedValue(undefined);
+
+    const result = await getRoomMapFromDevice(device as any, mockPlatform as any);
+
+    // console.log('Result:', result);
+    expect(result).toBeInstanceOf(RoomMap);
+    expect(mockRoborockService.getRoomMappings).toHaveBeenCalledWith('123');
+    expect(result.rooms.length).toBeGreaterThan(0);
+  });
+});

package/src/tests/platformRunner2.test.ts

@@ -63,17 +63,50 @@ describe('PlatformRunner.getRoomMapFromDevice', () => {
       map_info: [
         {
           mapFlag: 0,
-          add_time: 1753281130,
-          length: 0,
-          name: '',
-          bak_maps: [{ mapFlag: 4, add_time: 1753187168 }],
+          add_time: 1753511673,
+          length: 9,
+          name: 'First Map',
+          bak_maps: [{ mapFlag: 4, add_time: 1753578164 }],
           rooms: [
             { id: 1, tag: 14, iot_name_id: '11100845', iot_name: 'Kitchen' },
             { id: 2, tag: 9, iot_name_id: '11100849', iot_name: 'Study' },
-            { id: 3, tag: 6, iot_name_id: '11100842', iot_name: 'Living room' },
+            {
+              id: 3,
+              tag: 6,
+              iot_name_id: '11100842',
+              iot_name: 'Living room',
+            },
             { id: 4, tag: 1, iot_name_id: '11100847', iot_name: 'Bedroom' },
           ],
         },
+        {
+          mapFlag: 1,
+          add_time: 1753579596,
+          length: 10,
+          name: 'Second Map',
+          bak_maps: [{ mapFlag: 5, add_time: 1753578579 }],
+          rooms: [
+            {
+              id: 1,
+              tag: 6,
+              iot_name_id: '11100842',
+              iot_name: 'Living room',
+            },
+            {
+              id: 2,
+              tag: 3,
+              iot_name_id: '12461114',
+              iot_name: 'Guest bedroom',
+            },
+            {
+              id: 3,
+              tag: 2,
+              iot_name_id: '12461109',
+              iot_name: 'Master bedroom',
+            },
+            { id: 4, tag: 7, iot_name_id: '12461111', iot_name: 'Balcony' },
+          ],
+        },
       ],
     });
 
@@ -83,6 +116,6 @@ describe('PlatformRunner.getRoomMapFromDevice', () => {
     const result = await getRoomMapFromDevice(device as any, platform);
 
     expect(result).toBeInstanceOf(RoomMap);
-    expect(result.rooms.length).toEqual(4);
+    expect(result.rooms.length).toEqual(7);
   });
 });

package/src/tests/platformRunner3.test.ts

@@ -0,0 +1,54 @@
+import { PlatformRunner } from '../platformRunner';
+import { NotifyMessageTypes } from '../notifyMessageTypes';
+import { RoborockMatterbridgePlatform } from '../platform';
+import { RoborockVacuumCleaner } from '../rvc';
+import * as initialDataIndex from '../initialData/index';
+
+const getOperationalErrorState = jest.fn().mockReturnValue(2);
+
+jest.mock('./src/initialData/index', () => ({
+  ...initialDataIndex,
+  getOperationalErrorState,
+}));
+
+describe('PlatformRunner.updateRobot', () => {
+  let platform: RoborockMatterbridgePlatform;
+  let runner: PlatformRunner;
+  let robotMock: any;
+
+  beforeEach(() => {
+    robotMock = {
+      updateAttribute: jest.fn(),
+      getAttribute: jest.fn(),
+      device: {
+        data: { model: 'test-model' },
+        duid: '123456',
+        rooms: [],
+      },
+      serialNumber: '123456',
+      dockStationStatus: undefined,
+      roomInfo: undefined,
+    };
+
+    const robots = new Map<string, RoborockVacuumCleaner>();
+    robots.set('123456', robotMock);
+
+    platform = {
+      robots: robots,
+      log: {
+        error: jest.fn(),
+        debug: jest.fn(),
+        notice: jest.fn(),
+      },
+      enableExperimentalFeature: undefined,
+    } as unknown as RoborockMatterbridgePlatform;
+
+    runner = new PlatformRunner(platform);
+  });
+
+  it('should handle unknown message types gracefully', async () => {
+    const mapUpdated = { duid: '123456', dps: { 128: 4 } };
+    await runner['updateFromMQTTMessage'](NotifyMessageTypes.CloudMessage, mapUpdated, '123456');
+    expect(platform.log.notice).toHaveBeenCalled();
+  });
+});

package/src/tests/roborockCommunication/broadcast/messageProcessor.test.ts

@@ -1,6 +1,5 @@
 import { MessageProcessor } from '../../../roborockCommunication/broadcast/messageProcessor';
 import { DeviceStatus } from '../../../roborockCommunication/Zmodel/deviceStatus';
-import { RoomInfo } from '../../../roborockCommunication/Zmodel/roomInfo';
 
 describe('MessageProcessor', () => {
   let mockClient: any;
@@ -51,13 +50,9 @@ describe('MessageProcessor', () => {
   });
 
   it('getRooms should return RoomInfo', async () => {
-    const rooms = [
-      { id: 1, name: 'Room1' },
-      { id: 2, name: 'Room2' },
-    ];
     mockClient.get.mockResolvedValue([[1, 2]]);
-    const result = await processor.getRooms('duid', rooms);
-    expect(result).toBeInstanceOf(RoomInfo);
+    const result = await processor.getRooms('duid');
+    expect(result).not.toBeUndefined();
   });
 
   it('gotoDock should call client.send', async () => {

package/src/tests/roborockService.test.ts

@@ -55,7 +55,17 @@ describe('RoborockService - startClean', () => {
   });
 
   it('should return MapInfo if response contains maps', async () => {
-    const mapData = [{ map_info: [{}] }] as MultipleMap[];
+    const mapData = [
+      {
+        map_info: [
+          {
+            rooms: [{ id: 1, iot_name_id: 'room1', tag: 0, iot_name: 'Living Room' }],
+            mapFlag: 1,
+            name: 'Living Room Map',
+          },
+        ],
+      },
+    ] as MultipleMap[];
     mockMessageClient = {
       get: jest.fn(),
     };