matterbridge-roborock-vacuum-plugin 1.0.7-rc01 → 1.0.7-rc02

package/dist/initialData/getSupportedAreas.js

@@ -19,13 +19,13 @@ export function getSupportedAreas(rooms, roomMap, log) {
             },
         ];
     }
-    const supportedAreas = rooms.map((room, index) => {
+    const supportedAreas = roomMap.rooms.map((room, index) => {
         return {
-            areaId: roomMap.getRoomId(room.id) ?? index + 1,
+            areaId: room.id,
             mapId: null,
             areaInfo: {
                 locationInfo: {
-                    locationName: room.name,
+                    locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
                     floorNumber: null,
                     areaType: null,
                 },
@@ -37,7 +37,7 @@ export function getSupportedAreas(rooms, roomMap, log) {
     return duplicated
         ? [
             {
-                areaId: 1,
+                areaId: 2,
                 mapId: null,
                 areaInfo: {
                     locationInfo: {

package/dist/model/RoomMap.js

@@ -9,10 +9,4 @@ export default class RoomMap {
             };
         });
     }
-    getGlobalId(id) {
-        return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
-    }
-    getRoomId(globalId) {
-        return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
-    }
 }

package/dist/platform.js

@@ -19,6 +19,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     platformRunner;
     devices;
     serialNumber;
+    whiteList;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
         if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.4')) {
@@ -31,6 +32,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
             config.blackList = [];
         if (config.enableExperimentalFeature === undefined)
             config.enableExperimentalFeature = false;
+        this.whiteList = config.whiteList;
+        config.whiteList = [];
         this.clientManager = new ClientManager(this.log);
         this.devices = new Map();
     }
@@ -71,8 +74,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         const devices = await this.roborockService.listDevices(username);
         this.log.notice('Initializing - devices: ', debugStringify(devices));
         let vacuum = undefined;
-        if (this.config.whiteList.length > 0) {
-            const firstDUID = this.config.whiteList[0];
+        if (this.whiteList.length > 0) {
+            const firstDUID = this.whiteList[0];
             vacuum = devices.find((d) => d.duid == firstDUID);
         }
         else {

package/jest.config.js

@@ -0,0 +1,19 @@
+export default {
+    testEnvironment: 'node',
+    extensionsToTreatAsEsm: ['.ts'],
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.js$': '$1',
+    },
+    transform: {
+        '^.+\\.ts$': [
+            'ts-jest',
+            {
+                useESM: true,
+                tsconfig: 'tsconfig.jest.json',
+            },
+        ],
+    },
+    transformIgnorePatterns: ['/node_modules/'],
+    testPathIgnorePatterns: ['/node_modules/', '/dist/', '/frontend/'],
+    coveragePathIgnorePatterns: ['/node_modules/', '/dist/', '/frontend/', '/src/mock/'],
+};

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.0.7-rc01",
+  "version": "1.0.7-rc02",
   "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.0.7-rc01 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.7-rc02 by https://github.com/RinDevJunior",
   "type": "object",
   "required": [],
   "properties": {

package/package.json

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

package/src/initialData/getSupportedAreas.test.ts

@@ -0,0 +1,55 @@
+import { getSupportedAreas } from '../initialData/getSupportedAreas';
+import RoomMap from '../model/RoomMap';
+import { jest } from '@jest/globals';
+
+const mockLogger = {
+  debug: jest.fn(),
+  error: jest.fn(),
+};
+
+describe('getSupportedAreas', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns default area when rooms and roomMap are empty', () => {
+    const result = getSupportedAreas(
+      [
+        { id: 2775739, name: 'Garage' },
+        { id: 1474466, name: 'Outside' },
+        { id: 1459590, name: 'AAA room' },
+        { id: 1459587, name: 'BBB’s Room' },
+        { id: 1459580, name: 'CCC’s room' },
+        { id: 1458155, name: 'Dining room' },
+        { id: 1457889, name: 'Bathroom' },
+        { id: 1457888, name: 'Living room' },
+        { id: 991195, name: 'Downstairs Bathroom' },
+        { id: 991190, name: 'Garage Entryway' },
+        { id: 991187, name: 'TV Room' },
+        { id: 991185, name: 'Bedroom' },
+        { id: 612205, name: 'DDD’s Room' },
+        { id: 612204, name: 'Upstairs Bathroom' },
+        { id: 612202, name: 'Hallway' },
+        { id: 612200, name: 'EEE Room' },
+        { id: 609148, name: 'Dining Room' },
+        { id: 609146, name: 'Kitchen' },
+        { id: 609145, name: 'Living Room' },
+      ],
+      {
+        rooms: [
+          { id: 16, globalId: 609146, displayName: 'Kitchen' },
+          { id: 17, globalId: 1457889, displayName: 'Bathroom' },
+          { id: 18, globalId: 612202, displayName: 'Hallway' },
+          { id: 19, globalId: 1458155, displayName: 'Dining room' },
+          { id: 20, globalId: 1457888, displayName: 'Living room' },
+          { id: 21, globalId: 1459580, displayName: 'BBB’s room' },
+          { id: 22, globalId: 612205, displayName: 'CCC’s Room' },
+          { id: 23, globalId: 1474466, displayName: 'Outside' },
+        ],
+      } as RoomMap,
+      mockLogger as any,
+    );
+
+    expect(result.length).toEqual(8);
+  });
+});

package/src/initialData/getSupportedAreas.ts

@@ -3,23 +3,6 @@ import { ServiceArea } from 'matterbridge/matter/clusters';
 import RoomMap from '../model/RoomMap.js';
 import { Room } from '../roborockCommunication/Zmodel/room.js';
 
-/*
-rooms = [
-  { id: 123456, name: 'Study' },
-  { id: 123457, name: 'Bedroom' },
-  { id: 123458, name: 'Kitchen' },
-  { id: 123459, name: 'Living room' }
-]
-roomMap = {
-  rooms: [
-    { id: 1, globalId: "123456", displayName: undefined },
-    { id: 2, globalId: "123457", displayName: undefined },
-    { id: 3, globalId: "123458", displayName: undefined },
-    { id: 4, globalId: "123459", displayName: undefined },
-  ],
-};
-*/
-
 export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, log?: AnsiLogger): ServiceArea.Area[] {
   log?.debug('getSupportedAreas', debugStringify(rooms));
   log?.debug('getSupportedAreas', roomMap ? debugStringify(roomMap) : 'undefined');
@@ -42,13 +25,13 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
     ];
   }
 
-  const supportedAreas: ServiceArea.Area[] = rooms.map((room, index) => {
+  const supportedAreas: ServiceArea.Area[] = roomMap.rooms.map((room, index) => {
     return {
-      areaId: roomMap.getRoomId(room.id) ?? index + 1,
+      areaId: room.id,
       mapId: null,
       areaInfo: {
         locationInfo: {
-          locationName: room.name,
+          locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
           floorNumber: null,
           areaType: null,
         },
@@ -62,7 +45,7 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
   return duplicated
     ? [
         {
-          areaId: 1,
+          areaId: 2,
           mapId: null,
           areaInfo: {
             locationInfo: {

package/src/model/RoomMap.ts

@@ -34,11 +34,11 @@ export default class RoomMap {
     });
   }
 
-  getGlobalId(id: number): number | undefined {
-    return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
-  }
+  // getGlobalId(id: number): number | undefined {
+  //   return this.rooms.find((r) => Number(r.id) == Number(id))?.globalId;
+  // }
 
-  getRoomId(globalId: number): number | undefined {
-    return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
-  }
+  // getRoomId(globalId: number): number | undefined {
+  //   return this.rooms.find((r) => Number(r.globalId) == Number(globalId))?.id;
+  // }
 }

package/src/platform.ts

@@ -21,6 +21,7 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
   platformRunner: PlatformRunner | undefined;
   devices: Map<string, Device>;
   serialNumber: string | undefined;
+  whiteList: string[];
 
   constructor(matterbridge: Matterbridge, log: AnsiLogger, config: PlatformConfig) {
     super(matterbridge, log, config);
@@ -35,6 +36,10 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     if (config.whiteList === undefined) config.whiteList = [];
     if (config.blackList === undefined) config.blackList = [];
     if (config.enableExperimentalFeature === undefined) config.enableExperimentalFeature = false;
+    this.whiteList = config.whiteList as string[];
+
+    //reset default whitelist
+    config.whiteList = [];
 
     this.clientManager = new ClientManager(this.log);
     this.devices = new Map<string, Device>();
@@ -95,8 +100,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     this.log.notice('Initializing - devices: ', debugStringify(devices));
 
     let vacuum: Device | undefined = undefined;
-    if ((this.config.whiteList as string[]).length > 0) {
-      const firstDUID = (this.config.whiteList as string[])[0];
+    if (this.whiteList.length > 0) {
+      const firstDUID = this.whiteList[0];
       vacuum = devices.find((d) => d.duid == firstDUID);
     } else {
       vacuum = devices.find((d) => isSupportedDevice(d.data.model));

package/tsconfig.jest.json

@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        // enable isolatedModules just for ts-jest
+        "isolatedModules": true
+    },
+    "include": [
+        "**/*.spec.ts",
+        "**/*.test.ts",
+        "**/__test__/*"
+    ]
+}