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

package/src/tests/helper.test.ts

@@ -35,55 +35,55 @@ describe('getRoomMapFromDevice', () => {
     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);
+  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);
+    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);
-  //   });
+    // 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 = {

package/src/tests/initialData/getSupportedAreas.test.ts

@@ -1,9 +1,11 @@
 import { getSupportedAreas } from '../../initialData/getSupportedAreas';
-import RoomMap from '../../model/RoomMap';
+import { RoomMap } from '../../model/RoomMap';
+import { Room } from '../../roborockCommunication/Zmodel/room';
 
 const mockLogger = {
   debug: jest.fn(),
   error: jest.fn(),
+  notice: jest.fn(),
 };
 
 describe('getSupportedAreas', () => {
@@ -12,7 +14,7 @@ describe('getSupportedAreas', () => {
   });
 
   it('returns default area when rooms and roomMap are empty', () => {
-    const result = getSupportedAreas(
+    const { supportedAreas } = getSupportedAreas(
       [
         { id: 2775739, name: 'Garage' },
         { id: 1474466, name: 'Outside' },
@@ -46,14 +48,15 @@ describe('getSupportedAreas', () => {
           { id: 23, globalId: 1474466, displayName: 'Outside' },
         ],
       } as RoomMap,
+      false, // enableMultipleMap
       mockLogger as any,
     );
 
-    expect(result.length).toEqual(8);
+    expect(supportedAreas.length).toEqual(8);
   });
 
   it('returns default area when rooms and roomMap are empty', () => {
-    const result = getSupportedAreas(
+    const { supportedAreas } = getSupportedAreas(
       [
         { id: 11453731, name: 'Living room' },
         { id: 11453727, name: 'Kitchen' },
@@ -73,14 +76,15 @@ describe('getSupportedAreas', () => {
           { id: 20, globalId: 991190, displayName: undefined },
         ],
       } as RoomMap,
+      false, // enableMultipleMap
       mockLogger as any,
     );
 
-    expect(result.length).toEqual(5);
+    expect(supportedAreas.length).toEqual(5);
   });
 
   it('returns default area when rooms and roomMap are empty', () => {
-    const result = getSupportedAreas(
+    const { supportedAreas } = getSupportedAreas(
       [
         { id: 11453731, name: 'Living room' },
         { id: 11453727, name: 'Kitchen' },
@@ -100,9 +104,78 @@ describe('getSupportedAreas', () => {
           { id: 20, globalId: 991190, displayName: undefined },
         ],
       } as RoomMap,
+      false, // enableMultipleMap
       mockLogger as any,
     );
 
-    expect(result.length).toEqual(5);
+    expect(supportedAreas.length).toEqual(5);
+  });
+
+  it('returns default area when rooms and roomMap are empty', () => {
+    const vacuumRooms: Room[] = [
+      { id: 11100845, name: 'Kitchen' },
+      { id: 11100849, name: 'Study' },
+      { id: 11100842, name: 'Living room' },
+      { id: 11100847, name: 'Bedroom' },
+      { id: 12461114, name: 'Guest bedroom' },
+      { id: 12461109, name: 'Master bedroom' },
+      { id: 12461111, name: 'Balcony' },
+    ];
+    const roomMap: RoomMap = {
+      rooms: [
+        { id: 16, globalId: 2775739, displayName: undefined, alternativeId: '161' },
+        { id: 17, globalId: 991195, displayName: undefined, alternativeId: '171' },
+        { id: 18, globalId: 991187, displayName: undefined, alternativeId: '181' },
+        { id: 19, globalId: 991185, displayName: undefined, alternativeId: '191' },
+        { id: 20, globalId: 991190, displayName: undefined, alternativeId: '201' },
+      ],
+    };
+    const { supportedAreas } = getSupportedAreas(vacuumRooms, roomMap, false, mockLogger as any);
+
+    expect(supportedAreas.length).toEqual(5);
+  });
+
+  it('returns default area when rooms and roomMap are empty', () => {
+    const vacuumRooms: Room[] = [
+      { id: 11100845, name: 'Kitchen' },
+      { id: 11100849, name: 'Study' },
+      { id: 11100842, name: 'Living room' },
+      { id: 11100847, name: 'Bedroom' },
+      { id: 11100842, name: 'Living room' },
+      { id: 12461114, name: 'Guest bedroom' },
+      { id: 12461109, name: 'Master bedroom' },
+      { id: 12461111, name: 'Balcony' },
+    ];
+    const roomMap: RoomMap = {
+      rooms: [
+        { id: 1, globalId: 11100845, displayName: 'Kitchen', alternativeId: '114', mapId: 0 },
+        { id: 2, globalId: 11100849, displayName: 'Study', alternativeId: '29', mapId: 0 },
+        { id: 3, globalId: 11100842, displayName: 'Living room', alternativeId: '36', mapId: 0 },
+        { id: 4, globalId: 11100847, displayName: 'Bedroom', alternativeId: '41', mapId: 0 },
+        { id: 1, globalId: 11100842, displayName: 'Living room', alternativeId: '16', mapId: 1 },
+        { id: 2, globalId: 12461114, displayName: 'Guest bedroom', alternativeId: '23', mapId: 1 },
+        { id: 3, globalId: 12461109, displayName: 'Master bedroom', alternativeId: '32', mapId: 1 },
+        { id: 4, globalId: 12461111, displayName: 'Balcony', alternativeId: '47', mapId: 1 },
+      ],
+      mapInfo: [
+        {
+          id: 0,
+          name: 'First Map',
+        },
+        {
+          id: 1,
+          name: 'Second Map',
+        },
+      ],
+    };
+
+    const mockLogger1 = {
+      debug: jest.fn(),
+      notice: jest.fn(),
+      error: jest.fn(),
+    };
+    const { supportedAreas, supportedMaps } = getSupportedAreas(vacuumRooms, roomMap, true, mockLogger1 as any);
+    expect(supportedAreas.length).toEqual(8);
+    expect(supportedMaps.length).toEqual(2);
   });
 });

package/src/tests/platformRunner2.test.ts

@@ -114,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(7);
+    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/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;
@@ -282,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;
-}