matterbridge 3.1.5-dev-20250718-054cd80 → 3.1.5-dev-20250720-5a0b41e

package/CHANGELOG.md

@@ -8,22 +8,21 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
-## [3.1.5] - 2025-07-??
+## [3.1.5] - 2025-07-19
 
 ### Added
 
 - [error]: Added error logging functions and corresponding tests.
-- [frontend]: Improved test units on Matterbridge class (total coverage 99%).
+- [matterbridge]: Improved test units on Matterbridge class (total coverage 99%).
+- [rvc] Add RVC SupportedMaps Attribute from ServiceArea cluster. Thanks Ludovic BOUÉ (https://github.com/Luligu/matterbridge/pull/355).
 
 ### Changed
 
-- [matterbridge]: Refactored initialization of DeviceManager and PluginManager
-- [pluginManager]: Refactored PluginManager removing unused install/uninstall methods
+- [matterbridge]: Refactored initialization of DeviceManager and PluginManager.
+- [pluginManager]: Refactored PluginManager removing unused install/uninstall methods.
 - [pluginManager]: Added loading of default plugin config when a plugin is added the first time. It must be a file in the package root named '[PLUGIN-NAME].config.json'.
 - [readme-dev]: Added [documentation](README-DEV.md) for default plugin config and schema files.
 
-### Fixed
-
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
 </a>

package/dist/devices/roboticVacuumCleaner.js

@@ -1,3 +1,4 @@
+import { AreaNamespaceTag } from '@matter/main';
 import { RvcRunModeServer } from '@matter/main/behaviors/rvc-run-mode';
 import { RvcOperationalStateServer } from '@matter/main/behaviors/rvc-operational-state';
 import { RvcCleanModeServer } from '@matter/main/behaviors/rvc-clean-mode';
@@ -5,13 +6,14 @@ import { PowerSource } from '@matter/main/clusters/power-source';
 import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
 import { RvcCleanMode } from '@matter/main/clusters/rvc-clean-mode';
 import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
+import { ServiceArea } from '@matter/main/clusters/service-area';
 import { ModeBase } from '@matter/main/clusters/mode-base';
 import { OperationalState } from '@matter/main/clusters/operational-state';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { powerSource, roboticVacuumCleaner } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeServer, MatterbridgeServiceAreaServer } from '../matterbridgeBehaviors.js';
 export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
-    constructor(name, serial, mode = undefined, currentRunMode, supportedRunModes, currentCleanMode, supportedCleanModes, currentPhase = null, phaseList = null, operationalState, operationalStateList, supportedAreas, selectedAreas, currentArea) {
+    constructor(name, serial, mode = undefined, currentRunMode, supportedRunModes, currentCleanMode, supportedCleanModes, currentPhase = null, phaseList = null, operationalState, operationalStateList, supportedAreas, selectedAreas, currentArea, supportedMaps) {
         super([roboticVacuumCleaner, powerSource], { uniqueStorageKey: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}`, mode }, true);
         this.createDefaultIdentifyClusterServer()
             .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge Robot Vacuum Cleaner')
@@ -19,7 +21,7 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
             .createDefaultRvcRunModeClusterServer(currentRunMode, supportedRunModes)
             .createDefaultRvcCleanModeClusterServer(currentCleanMode, supportedCleanModes)
             .createDefaultRvcOperationalStateClusterServer(phaseList, currentPhase, operationalStateList, operationalState)
-            .createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea);
+            .createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea, supportedMaps);
     }
     createDefaultRvcRunModeClusterServer(currentMode, supportedModes) {
         this.behaviors.require(MatterbridgeRvcRunModeServer, {
@@ -44,32 +46,33 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
         });
         return this;
     }
-    createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea) {
-        this.behaviors.require(MatterbridgeServiceAreaServer, {
+    createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea, supportedMaps) {
+        this.behaviors.require(MatterbridgeServiceAreaServer.with(ServiceArea.Feature.Maps), {
             supportedAreas: supportedAreas ?? [
                 {
                     areaId: 1,
                     mapId: null,
-                    areaInfo: { locationInfo: { locationName: 'Living', floorNumber: null, areaType: null }, landmarkInfo: null },
+                    areaInfo: { locationInfo: { locationName: 'Living', floorNumber: 0, areaType: AreaNamespaceTag.LivingRoom.tag }, landmarkInfo: null },
                 },
                 {
                     areaId: 2,
                     mapId: null,
-                    areaInfo: { locationInfo: { locationName: 'Kitchen', floorNumber: null, areaType: null }, landmarkInfo: null },
+                    areaInfo: { locationInfo: { locationName: 'Kitchen', floorNumber: 0, areaType: AreaNamespaceTag.Kitchen.tag }, landmarkInfo: null },
                 },
                 {
                     areaId: 3,
                     mapId: null,
-                    areaInfo: { locationInfo: { locationName: 'Bedroom', floorNumber: null, areaType: null }, landmarkInfo: null },
+                    areaInfo: { locationInfo: { locationName: 'Bedroom', floorNumber: 1, areaType: AreaNamespaceTag.Bedroom.tag }, landmarkInfo: null },
                 },
                 {
                     areaId: 4,
                     mapId: null,
-                    areaInfo: { locationInfo: { locationName: 'Bathroom', floorNumber: null, areaType: null }, landmarkInfo: null },
+                    areaInfo: { locationInfo: { locationName: 'Bathroom', floorNumber: 1, areaType: AreaNamespaceTag.Bathroom.tag }, landmarkInfo: null },
                 },
             ],
             selectedAreas: selectedAreas ?? [],
             currentArea: currentArea ?? 1,
+            supportedMaps: supportedMaps ?? [],
             estimatedEndTime: null,
         });
         return this;

package/dist/frontend.js

@@ -615,7 +615,7 @@ export class Frontend extends EventEmitter {
         this.matterbridge.matterbridgeInformation.matterPort = (await this.matterbridge.nodeContext?.get('matterport', 5540)) ?? 5540;
         this.matterbridge.matterbridgeInformation.matterDiscriminator = await this.matterbridge.nodeContext?.get('matterdiscriminator');
         this.matterbridge.matterbridgeInformation.matterPasscode = await this.matterbridge.nodeContext?.get('matterpasscode');
-        if (this.matterbridge.bridgeMode === 'bridge' && this.matterbridge.serverNode) {
+        if (this.matterbridge.bridgeMode === 'bridge' && this.matterbridge.serverNode && !this.matterbridge.hasCleanupStarted) {
             this.matterbridge.matterbridgeInformation.matterbridgePaired = this.matterbridge.serverNode.state.commissioning.commissioned;
             this.matterbridge.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.qrPairingCode;
             this.matterbridge.matterbridgeInformation.matterbridgeManualPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.manualPairingCode;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.1.5-dev-20250718-054cd80",
+  "version": "3.1.5-dev-20250720-5a0b41e",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.1.5-dev-20250718-054cd80",
+      "version": "3.1.5-dev-20250720-5a0b41e",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.1.5-dev-20250718-054cd80",
+  "version": "3.1.5-dev-20250720-5a0b41e",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",