matterbridge-roborock-vacuum-plugin 1.1.0-rc02 → 1.1.0-rc03

package/dist/initialData/getSupportedAreas.js

@@ -1,4 +1,5 @@
 import { debugStringify } from 'matterbridge/logger';
+import { randomInt } from 'node:crypto';
 export function getSupportedAreas(rooms, roomMap, log) {
     log?.debug('getSupportedAreas', debugStringify(rooms));
     log?.debug('getSupportedAreas', roomMap ? debugStringify(roomMap) : 'undefined');
@@ -25,7 +26,7 @@ export function getSupportedAreas(rooms, roomMap, log) {
             mapId: null,
             areaInfo: {
                 locationInfo: {
-                    locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
+                    locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`,
                     floorNumber: null,
                     areaType: null,
                 },

package/dist/platform.js

@@ -68,8 +68,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         if (this.config.whiteList.length > 0) {
             const whiteList = (this.config.whiteList ?? []);
             for (const item of whiteList) {
-                const duid = item.split('-')[1];
-                const vacuum = devices.find((d) => d.duid == duid);
+                const duid = item.split('-')[1].trim();
+                const vacuum = devices.find((d) => d.duid === duid);
                 if (vacuum) {
                     vacuums.push(vacuum);
                 }
@@ -134,7 +134,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         const roomMap = await this.platformRunner.getRoomMapFromDevice(vacuum);
         this.log.debug('Initializing - roomMap: ', debugStringify(roomMap));
         const behaviorHandler = configurateBehavior(vacuum.data.model, vacuum.duid, this.roborockService, this.cleanModeSettings, this.enableExperimentalFeature?.advancedFeature?.forceRunAtDefault ?? false, this.log);
-        this.roborockService.setSupportedAreas(vacuum.duid, getSupportedAreas(vacuum.rooms, roomMap, this.log));
+        const supportedAreas = getSupportedAreas(vacuum.rooms, roomMap, this.log);
+        this.roborockService.setSupportedAreas(vacuum.duid, supportedAreas);
         let routineAsRoom = [];
         if (this.enableExperimentalFeature?.enableExperimentalFeature && this.enableExperimentalFeature.advancedFeature?.showRoutinesAsRoom) {
             routineAsRoom = getSupportedScenes(vacuum.scenes, this.log);

package/dist/rvc.js

@@ -14,6 +14,7 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
         log.debug(`Creating RoborockVacuumCleaner for device: ${deviceName}, model: ${device.data.model}, forceRunAtDefault: ${enableExperimentalFeature?.advancedFeature?.forceRunAtDefault}`);
         log.debug(`Supported Clean Modes: ${JSON.stringify(cleanModes)}`);
         log.debug(`Supported Run Modes: ${JSON.stringify(supportedRunModes)}`);
+        log.debug(`Supported Areas: ${JSON.stringify(supportedAreas)}`);
         const bridgeMode = enableExperimentalFeature?.advancedFeature.enableServerMode ? 'server' : undefined;
         super(deviceName, device.duid, bridgeMode, supportedRunModes[0].mode, supportedRunModes, cleanModes[0].mode, cleanModes, undefined, undefined, RvcOperationalState.OperationalState.Docked, getOperationalStates(), supportedAreas, undefined, supportedAreas[0].areaId);
         this.username = username;

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

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

package/package.json

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

package/src/initialData/getSupportedAreas.ts

@@ -2,6 +2,7 @@ import { AnsiLogger, debugStringify } from 'matterbridge/logger';
 import { ServiceArea } from 'matterbridge/matter/clusters';
 import RoomMap from '../model/RoomMap.js';
 import { Room } from '../roborockCommunication/Zmodel/room.js';
+import { randomInt } from 'node:crypto';
 
 export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, log?: AnsiLogger): ServiceArea.Area[] {
   log?.debug('getSupportedAreas', debugStringify(rooms));
@@ -31,7 +32,7 @@ export function getSupportedAreas(rooms: Room[], roomMap: RoomMap | undefined, l
       mapId: null,
       areaInfo: {
         locationInfo: {
-          locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? 'Unknown Room',
+          locationName: room.displayName ?? rooms.find((r) => r.id == room.globalId)?.name ?? `Unknown Room ${randomInt(1000, 9999)}`,
           floorNumber: null,
           areaType: null,
         },

package/src/platform.ts

@@ -96,8 +96,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     if ((this.config.whiteList as string[]).length > 0) {
       const whiteList = (this.config.whiteList ?? []) as string[];
       for (const item of whiteList) {
-        const duid = item.split('-')[1];
-        const vacuum = devices.find((d) => d.duid == duid);
+        const duid = item.split('-')[1].trim();
+        const vacuum = devices.find((d) => d.duid === duid);
         if (vacuum) {
           vacuums.push(vacuum);
         }
@@ -114,6 +114,15 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     if (!this.enableExperimentalFeature || !this.enableExperimentalFeature.advancedFeature.enableServerMode) {
       vacuums = [vacuums[0]]; // If server mode is not enabled, only use the first vacuum
     }
+    // else {
+    //   const cloned = JSON.parse(JSON.stringify(vacuums[0])) as Device;
+    //   cloned.name = `${cloned.name} Clone`;
+    //   cloned.serialNumber = `${cloned.serialNumber}-clone`;
+
+    //   vacuums = [...vacuums, cloned]; // If server mode is enabled, add the first vacuum again to ensure it is always included
+    // }
+
+    // this.log.error('Initializing - vacuums: ', debugStringify(vacuums));
 
     for (const vacuum of vacuums) {
       await this.roborockService.initializeMessageClient(username, vacuum, userData);
@@ -192,7 +201,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
       this.log,
     );
 
-    this.roborockService.setSupportedAreas(vacuum.duid, getSupportedAreas(vacuum.rooms, roomMap, this.log));
+    const supportedAreas = getSupportedAreas(vacuum.rooms, roomMap, this.log);
+    this.roborockService.setSupportedAreas(vacuum.duid, supportedAreas);
 
     let routineAsRoom: ServiceArea.Area[] = [];
     if (this.enableExperimentalFeature?.enableExperimentalFeature && this.enableExperimentalFeature.advancedFeature?.showRoutinesAsRoom) {

package/src/rvc.ts

@@ -32,6 +32,7 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
     );
     log.debug(`Supported Clean Modes: ${JSON.stringify(cleanModes)}`);
     log.debug(`Supported Run Modes: ${JSON.stringify(supportedRunModes)}`);
+    log.debug(`Supported Areas: ${JSON.stringify(supportedAreas)}`);
 
     const bridgeMode = enableExperimentalFeature?.advancedFeature.enableServerMode ? 'server' : undefined;
     super(

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

@@ -51,4 +51,31 @@ describe('getSupportedAreas', () => {
 
     expect(result.length).toEqual(8);
   });
+
+  it('returns default area when rooms and roomMap are empty', () => {
+    const result = getSupportedAreas(
+      [
+        { id: 11453731, name: 'Living room' },
+        { id: 11453727, name: 'Kitchen' },
+        { id: 11453415, name: 'Bathroom' },
+        { id: 11453409, name: 'Emile’s Room' },
+        { id: 11453404, name: 'Nadia’s Room' },
+        { id: 11453398, name: 'Hallway' },
+        { id: 11453391, name: 'Dining room' },
+        { id: 11453384, name: 'Outside' },
+      ],
+      {
+        rooms: [
+          { id: 16, globalId: 2775739, displayName: undefined },
+          { id: 17, globalId: 991195, displayName: undefined },
+          { id: 18, globalId: 991187, displayName: undefined },
+          { id: 19, globalId: 991185, displayName: undefined },
+          { id: 20, globalId: 991190, displayName: undefined },
+        ],
+      } as RoomMap,
+      mockLogger as any,
+    );
+
+    expect(result.length).toEqual(5);
+  });
 });