matterbridge-roborock-vacuum-plugin 1.1.0-rc11 → 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)
@@ -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;

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/Zmodel/mapInfo.js

@@ -9,8 +9,8 @@ export class MapInfo {
                 rooms: map.rooms && map.rooms.length > 0
                     ? map.rooms.map((room) => {
                         return {
-                            id: room.iot_name_id,
-                            name: room.iot_name,
+                            id: room.id,
+                            name: room.iot_name_id,
                         };
                     })
                     : [],

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/roborockService.js

@@ -260,7 +260,6 @@ export default class RoborockService {
                     model: homeData.products.find((p) => p.id === device.productId)?.model,
                     category: homeData.products.find((p) => p.id === device.productId)?.category,
                     batteryLevel: device.deviceStatus?.[Protocol.battery] ?? 100,
-                    schema: homeData.products.find((p) => p.id === device.productId)?.schema,
                 },
                 store: {
                     username: username,
@@ -308,7 +307,6 @@ export default class RoborockService {
                     model: homeData.products.find((p) => p.id === device.productId)?.model,
                     category: homeData.products.find((p) => p.id === device.productId)?.category,
                     batteryLevel: device.deviceStatus?.[Protocol.battery] ?? 100,
-                    schema: homeData.products.find((p) => p.id === device.productId)?.schema,
                 },
                 store: {
                     userData: this.userdata,

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.0-rc11",
+  "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-rc11 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-rc11",
+  "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);
@@ -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;

package/src/platformRunner.ts

@@ -44,11 +44,23 @@ export class PlatformRunner {
   public async getRoomMapFromDevice(device: Device): Promise<RoomMap> {
     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)] as [number, number]);
+        return new RoomMap(roomDataMap, rooms);
+      }
     }
+
     return new RoomMap([], rooms);
   }
 
@@ -67,8 +79,20 @@ export class PlatformRunner {
     // if (platform.robot?.device === undefined || platform.roborockService === undefined) return undefined;
     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)] as [number, number]);
+        robot.roomInfo = new RoomMap(roomDataMap, rooms);
+      }
     }
 
     return robot.roomInfo;
@@ -144,14 +168,22 @@ export class PlatformRunner {
             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 isMappedArea = currentMappedAreas?.some((x) => x.areaId == currentRoom);
+          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);
           }
 

package/src/roborockCommunication/Zmodel/device.ts

@@ -36,7 +36,6 @@ export interface Device {
     model: string;
     category: string;
     batteryLevel: number;
-    // schema: DeviceSchema[];
   };
 
   scenes: Scene[];

package/src/roborockCommunication/Zmodel/mapInfo.ts

@@ -15,9 +15,9 @@ export class MapInfo {
           map.rooms && map.rooms.length > 0
             ? map.rooms.map((room: RoomInformation) => {
                 return {
-                  id: room.iot_name_id,
-                  name: room.iot_name,
-                } as unknown as Room;
+                  id: room.id,
+                  name: room.iot_name_id,
+                } as Room;
               })
             : [],
       });

package/src/roborockCommunication/broadcast/listener/implementation/connectionStateListener.ts

@@ -29,7 +29,9 @@ export class ConnectionStateListener implements AbstractConnectionListener {
 
     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;
     }
 

package/src/roborockService.ts

@@ -340,7 +340,6 @@ export default class RoborockService {
           model: homeData.products.find((p) => p.id === device.productId)?.model,
           category: homeData.products.find((p) => p.id === device.productId)?.category,
           batteryLevel: device.deviceStatus?.[Protocol.battery] ?? 100,
-          schema: homeData.products.find((p) => p.id === device.productId)?.schema,
         },
 
         store: {
@@ -394,7 +393,6 @@ export default class RoborockService {
           model: homeData.products.find((p) => p.id === device.productId)?.model,
           category: homeData.products.find((p) => p.id === device.productId)?.category,
           batteryLevel: device.deviceStatus?.[Protocol.battery] ?? 100,
-          schema: homeData.products.find((p) => p.id === device.productId)?.schema,
         },
 
         store: {
@@ -427,7 +425,6 @@ export default class RoborockService {
       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) }));
   }
 

package/web-for-testing/src/accountStore.ts

@@ -1,3 +1,5 @@
+import { UserData } from './ext/roborockCommunication/index.js';
+
 export function getAccountStore(): Map<string, UserData> {
   const accountStore = new Map<string, UserData>();