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

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' },
+          ],
+        },
       ],
     });
 
@@ -81,8 +114,115 @@ describe('PlatformRunner.getRoomMapFromDevice', () => {
     platform.roborockService.getMapInformation.mockResolvedValue(mapInfo);
 
     const result = await getRoomMapFromDevice(device as any, platform);
+    expect(result).toBeInstanceOf(RoomMap);
+    expect(result.rooms.length).toEqual(4);
+
+    platform.enableExperimentalFeature = {
+      enableExperimentalFeature: true,
+      advancedFeature: {
+        enableMultipleMap: true,
+      },
+    };
+
+    const result1 = await getRoomMapFromDevice(device as any, platform);
+    expect(result1).toBeInstanceOf(RoomMap);
+    expect(result1.rooms.length).toEqual(8);
+  });
+
+  it('returns RoomMap with empty roomData from getMapInformation if available', async () => {
+    const device = {
+      duid: 'duid1',
+      rooms: [
+        { id: 1, name: 'Kitchen' },
+        { id: 2, name: 'Study' },
+        { id: 3, name: 'Living room' },
+        { id: 4, name: 'Bedroom' },
+      ],
+    };
+
+    const mapInfo = new MapInfo({
+      max_multi_map: 4,
+      max_bak_map: 0,
+      multi_map_count: 1,
+      map_info: [
+        {
+          mapFlag: 0,
+          add_time: 1753731408,
+          length: 0,
+          name: '',
+          bak_maps: [],
+        },
+      ],
+    });
+
+    platform.roborockService.getRoomMappings.mockResolvedValue(undefined);
+    platform.roborockService.getMapInformation.mockResolvedValue(mapInfo);
+
+    const result = await getRoomMapFromDevice(device as any, platform);
+    expect(result).toBeInstanceOf(RoomMap);
+    expect(result.rooms.length).toEqual(0);
+
+    platform.enableExperimentalFeature = {
+      enableExperimentalFeature: true,
+      advancedFeature: {
+        enableMultipleMap: true,
+      },
+    };
+
+    const result1 = await getRoomMapFromDevice(device as any, platform);
+    expect(result1).toBeInstanceOf(RoomMap);
+    expect(result1.rooms.length).toEqual(0);
+  });
 
+  it('returns RoomMap with roomData from getMapInformation if available', async () => {
+    const device = {
+      duid: 'duid1',
+      rooms: [
+        { id: 1, name: 'Kitchen' },
+        { id: 2, name: 'Study' },
+        { id: 3, name: 'Living room' },
+        { id: 4, name: 'Bedroom' },
+      ],
+    };
+
+    const mapInfo = new MapInfo({
+      max_multi_map: 4,
+      max_bak_map: 0,
+      multi_map_count: 1,
+      map_info: [
+        {
+          mapFlag: 0,
+          add_time: 1753731408,
+          length: 0,
+          name: '',
+          bak_maps: [],
+        },
+      ],
+    });
+
+    const roomData = [
+      [1, '11100845', 14],
+      [2, '11100849', 9],
+      [3, '11100842', 6],
+      [4, '11100847', 1],
+    ];
+
+    platform.roborockService.getRoomMappings.mockResolvedValue(roomData);
+    platform.roborockService.getMapInformation.mockResolvedValue(mapInfo);
+
+    const result = await getRoomMapFromDevice(device as any, platform);
     expect(result).toBeInstanceOf(RoomMap);
     expect(result.rooms.length).toEqual(4);
+
+    platform.enableExperimentalFeature = {
+      enableExperimentalFeature: true,
+      advancedFeature: {
+        enableMultipleMap: true,
+      },
+    };
+
+    const result1 = await getRoomMapFromDevice(device as any, platform);
+    expect(result1).toBeInstanceOf(RoomMap);
+    expect(result1.rooms.length).toEqual(4);
   });
 });

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

@@ -3,6 +3,7 @@ import { ServiceArea } from 'matterbridge/matter/clusters';
 import RoborockService from '../roborockService';
 import { MessageProcessor } from '../roborockCommunication/broadcast/messageProcessor';
 import { Device, MultipleMap, RequestMessage } from '../roborockCommunication';
+import { RoomIndexMap } from '../model/roomIndexMap';
 
 describe('RoborockService - startClean', () => {
   let roborockService: RoborockService;
@@ -55,7 +56,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(),
     };
@@ -272,7 +283,17 @@ describe('RoborockService - basic setters/getters', () => {
   });
 
   it('setSelectedAreas should set selected areas', () => {
+    roborockService.setSupportedAreaIndexMap(
+      'duid',
+      new RoomIndexMap(
+        new Map([
+          [1, { roomId: 1, mapId: 0 }],
+          [2, { roomId: 2, mapId: 1 }],
+        ]),
+      ),
+    );
     roborockService.setSelectedAreas('duid', [1, 2]);
+
     expect(roborockService['selectedAreas'].get('duid')).toEqual([1, 2]);
     expect(mockLogger.debug).toHaveBeenCalledWith('RoborockService - setSelectedAreas', [1, 2]);
   });

package/web-for-testing/package-lock.json

@@ -12,7 +12,7 @@
                 "binary-parser": "^2.2.1",
                 "ejs": "^3.1.10",
                 "express": "^5.1.0",
-                "matterbridge": "^3.1.4",
+                "matterbridge": "^3.1.8",
                 "node-ansi-logger": "^3.0.1"
             },
             "devDependencies": {
@@ -2351,9 +2351,9 @@
             "license": "MIT"
         },
         "node_modules/matterbridge": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/matterbridge/-/matterbridge-3.1.4.tgz",
-            "integrity": "sha512-r9Bhy+YMzeneR0hihEeKn4BpFSVJ7oXuKDVLpWPz4fN/51ziBkKIGRARJLPY5HEwHlvUbf9oU3Z4fkQhq70O7w==",
+            "version": "3.1.8",
+            "resolved": "https://registry.npmjs.org/matterbridge/-/matterbridge-3.1.8.tgz",
+            "integrity": "sha512-KYGSw088++v8UBr2+iCewrfuNGbZpr9AzhbNbVpaXGzGkxaonUQ7397ZQ4MRMTmdpsEteOJb4Hcx4IJtXUuZdA==",
             "hasShrinkwrap": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2361,13 +2361,15 @@
                 "archiver": "7.0.1",
                 "express": "5.1.0",
                 "glob": "11.0.3",
-                "multer": "2.0.1",
+                "multer": "2.0.2",
                 "node-ansi-logger": "3.1.1",
                 "node-persist-manager": "2.0.0",
                 "ws": "8.18.3"
             },
             "bin": {
-                "matterbridge": "bin/matterbridge.js"
+                "matterbridge": "bin/matterbridge.js",
+                "mb_coap": "bin/mb_coap.js",
+                "mb_mdns": "bin/mb_mdns.js"
             },
             "engines": {
                 "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
@@ -2499,9 +2501,9 @@
             }
         },
         "node_modules/matterbridge/node_modules/@noble/curves": {
-            "version": "1.9.2",
-            "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.2.tgz",
-            "integrity": "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g==",
+            "version": "1.9.4",
+            "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.4.tgz",
+            "integrity": "sha512-2bKONnuM53lINoDrSmK8qP8W271ms7pygDhZt4SiLOoLwBtoHqeCFi6RG42V8zd3mLHuJFhU/Bmaqo4nX0/kBw==",
             "license": "MIT",
             "dependencies": {
                 "@noble/hashes": "1.8.0"
@@ -3627,9 +3629,9 @@
             "license": "MIT"
         },
         "node_modules/matterbridge/node_modules/multer": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
-            "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+            "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
             "license": "MIT",
             "dependencies": {
                 "append-field": "^1.0.0",

package/web-for-testing/package.json

@@ -21,7 +21,7 @@
         "binary-parser": "^2.2.1",
         "ejs": "^3.1.10",
         "express": "^5.1.0",
-        "matterbridge": "^3.1.4",
+        "matterbridge": "^3.1.8",
         "node-ansi-logger": "^3.0.1"
     },
     "devDependencies": {

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

@@ -1,10 +0,0 @@
-import { UserData } from './ext/roborockCommunication/index.js';
-
-export function getAccountStore(): Map<string, UserData> {
-  const accountStore = new Map<string, UserData>();
-
-  // Initialize with a default user data if needed
-  // accountStore.set('defaultUser', new UserData());
-
-  return accountStore;
-}