matterbridge 3.1.2-dev-20250706-6c6481e → 3.1.2-dev-20250708-167e3ae

package/CHANGELOG.md

@@ -8,16 +8,17 @@ 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.2] - 2025-07-??
+## [3.1.2] - 2025-07-06
 
 ### Development Breaking Changes
 
 - [exports]: The single devices (i.e. Rvc, Evse etc...) are only exported from `matterbridge/devices`. Please update your imports to use the new export path. Refer to the [documentation](README-DEV.md) for details on imports.
-- [MatterbridgeEndpoint]: Added the mode property: `server` will make the device indipendent from its plugin. It has its own server node: QRCode, Fabrics and Sessions are visible in the Devices section of the Home page. This is a workaround for the Rvc Apple issue. With mode=server the Rvc (like any other device) can be paired directly to the controller like a native not bridged Matter device.
+- [MatterbridgeEndpoint]: Added the mode property: `server` will make the device indipendent from its plugin. It has its own server node: QRCode, Fabrics and Sessions are visible in the Devices section of the Home page. This is a workaround for the Rvc Apple issue. With mode=server the Rvc (like any other device) can be paired directly to the controller like a native not bridged Matter device. Refer to the [documentation](README-DEV.md) for details on using mode.
+- [RoboticVacuumCleaner]: The signature of the constructor has changed to add the mode property. Mode `server` will make the device indipendent from its plugin. It has its own server node: QRCode, Fabrics and Sessions are visible in the Devices section of the Home page. This is a workaround for the Rvc Apple issue. With mode=server the Rvc (like any other device) can be paired directly to the controller like a native not bridged Matter device. Refer to the [documentation](README-DEV.md) for details on using mode.
 
 ### Added
 
-- [test]: Improved test units on Frontend class and all Matterbridge classes (coverage 94%).
+- [test]: Improved test units on Frontend class (coverage 97%).
 
 ### Changed
 

package/README-DEV.md

@@ -272,7 +272,7 @@ You create a Matter device with a new instance of MatterbridgeEndpoint(definitio
 - @param {boolean} [debug] - Debug flag.
 
 ```typescript
-    const device = new MatterbridgeEndpoint([contactSensor, powerSource], { id: 'EntryDoor', mode: 'server' })
+    const device = new MatterbridgeEndpoint([contactSensor, powerSource], { id: 'EntryDoor' })
       .createDefaultIdentifyClusterServer()
       .createDefaultBasicInformationClusterServer('My entry door', '0123456789')
       .createDefaultBooleanStateClusterServer(true)
@@ -282,14 +282,22 @@ You create a Matter device with a new instance of MatterbridgeEndpoint(definitio
 
 In the above example we create a contact sensor device type with also a power source device type feature replaceble battery.
 
-The mode=`server` property of MatterbridgeEndpointOptions, allows to create an independent (not bridged) Matter device with its server node. In this case the bridge mode is not relevant.
-
-The mode=`matter` property of MatterbridgeEndpointOptions, allows to create a (not bridged) Matter device that is added to the Matterbridge server node alongside the aggregator.
-
 All device types are defined in src\matterbridgeDeviceTypes.ts and taken from the 'Matter-1.4-Device-Library-Specification.pdf'.
 
 All default cluster helpers are available as methods of MatterbridgeEndpoint.
 
+## MatterbridgeEndpointOptions
+
+```typescript
+    const robot = new RoboticVacuumCleaner('Robot Vacuum', 'RVC1238777820', 'server');
+```
+
+In the above example we create a Rvc device type with its own server node.
+
+The mode=`server` property of MatterbridgeEndpointOptions, allows to create an independent (not bridged) Matter device with its server node. In this case the bridge mode is not relevant.
+
+The mode=`matter` property of MatterbridgeEndpointOptions, allows to create a (not bridged) Matter device that is added to the Matterbridge server node alongside the aggregator.
+
 # Contribution Guidelines
 
 Thank you for your interest in contributing to my project!

package/dist/frontend.js

@@ -622,7 +622,7 @@ export class Frontend extends EventEmitter {
         }
     }
     getMatterDataFromDevice(device) {
-        if (device.mode === 'server' && device.serverNode && device.serverContext) {
+        if (device.mode === 'server' && device.serverNode) {
             return {
                 commissioned: device.serverNode.state.commissioning.commissioned,
                 qrPairingCode: device.serverNode.state.commissioning.pairingCodes.qrPairingCode,
@@ -1514,6 +1514,7 @@ export class Frontend extends EventEmitter {
                         if (!restartRequired)
                             this.wssSendRefreshRequired('pluginsRestart');
                         this.wssSendRestartRequired(false);
+                        client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
                     }
                     else {
                         this.log.error(`SelectDevice: select ${select} not supported`);
@@ -1560,6 +1561,7 @@ export class Frontend extends EventEmitter {
                         if (!restartRequired)
                             this.wssSendRefreshRequired('pluginsRestart');
                         this.wssSendRestartRequired(false);
+                        client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true }));
                     }
                     else {
                         this.log.error(`SelectDevice: select ${select} not supported`);

package/dist/matterbridge.js

@@ -1054,7 +1054,6 @@ export class Matterbridge extends EventEmitter {
                 if (device.mode === 'server' && device.serverNode) {
                     await this.stopServerNode(device.serverNode);
                     device.serverNode = undefined;
-                    device.serverContext = undefined;
                 }
             }
             this.log.notice('Stopped matter server nodes');
@@ -1153,8 +1152,8 @@ export class Matterbridge extends EventEmitter {
     async createDeviceServerNode(plugin, device) {
         if (device.mode === 'server' && !device.serverNode && device.deviceType && device.deviceName && device.vendorId && device.vendorName && device.productId && device.productName) {
             this.log.debug(`Creating device ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} server node...`);
-            device.serverContext = await this.createServerNodeContext(device.deviceName.replace(/[ .]/g, ''), device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
-            device.serverNode = await this.createServerNode(device.serverContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
+            const context = await this.createServerNodeContext(device.deviceName.replace(/[ .]/g, ''), device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
+            device.serverNode = await this.createServerNode(context, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
             this.log.debug(`Adding ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} to server node...`);
             await device.serverNode.add(device);
             this.log.debug(`Added ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} to server node`);
@@ -1911,8 +1910,11 @@ export class Matterbridge extends EventEmitter {
             case 5264:
                 vendorName = '(Shelly)';
                 break;
+            case 0x1488:
+                vendorName = '(ShortcutLabsFlic)';
+                break;
             case 65521:
-                vendorName = '(MatterServer)';
+                vendorName = '(MatterTest)';
                 break;
         }
         return vendorName;

package/dist/matterbridgeEndpoint.js

@@ -1,4 +1,4 @@
-import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, UINT16_MAX, UINT32_MAX, VendorId, } from '@matter/main';
+import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, UINT16_MAX, UINT32_MAX, VendorId } from '@matter/main';
 import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
 import { PowerSource } from '@matter/main/clusters/power-source';
@@ -68,7 +68,6 @@ export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
     mode = undefined;
-    serverContext;
     serverNode;
     log;
     plugin = undefined;
@@ -409,47 +408,47 @@ export class MatterbridgeEndpoint extends Endpoint {
     }
     createDefaultPowerSourceWiredClusterServer(wiredCurrentType = PowerSource.WiredCurrentType.Ac) {
         this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Wired), {
-            wiredCurrentType,
-            description: wiredCurrentType === PowerSource.WiredCurrentType.Ac ? 'AC Power' : 'DC Power',
             status: PowerSource.PowerSourceStatus.Active,
             order: 0,
+            description: wiredCurrentType === PowerSource.WiredCurrentType.Ac ? 'AC Power' : 'DC Power',
             endpointList: [],
+            wiredCurrentType,
         });
         return this;
     }
-    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplacementDescription = 'Battery type', batQuantity = 1) {
+    createDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplacementDescription = 'Battery type', batQuantity = 1, batReplaceability = PowerSource.BatReplaceability.UserReplaceable) {
         this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Replaceable), {
             status: PowerSource.PowerSourceStatus.Active,
             order: 0,
             description: 'Primary battery',
+            endpointList: [],
             batVoltage,
             batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
             batChargeLevel,
             batReplacementNeeded: false,
-            batReplaceability: PowerSource.BatReplaceability.UserReplaceable,
+            batReplaceability,
             activeBatFaults: undefined,
             batReplacementDescription,
             batQuantity,
-            endpointList: [],
         });
         return this;
     }
-    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500) {
+    createDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining = 100, batChargeLevel = PowerSource.BatChargeLevel.Ok, batVoltage = 1500, batReplaceability = PowerSource.BatReplaceability.Unspecified) {
         this.behaviors.require(PowerSourceServer.with(PowerSource.Feature.Battery, PowerSource.Feature.Rechargeable), {
             status: PowerSource.PowerSourceStatus.Active,
             order: 0,
             description: 'Primary battery',
+            endpointList: [],
             batVoltage,
             batPercentRemaining: Math.min(Math.max(batPercentRemaining * 2, 0), 200),
             batTimeRemaining: null,
             batChargeLevel,
             batReplacementNeeded: false,
-            batReplaceability: PowerSource.BatReplaceability.Unspecified,
+            batReplaceability,
             batPresent: true,
             activeBatFaults: [],
             batChargeState: PowerSource.BatChargeState.IsNotCharging,
             batFunctionalWhileCharging: true,
-            endpointList: [],
         });
         return this;
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.1.2-dev-20250706-6c6481e",
+  "version": "3.1.2-dev-20250708-167e3ae",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.1.2-dev-20250706-6c6481e",
+      "version": "3.1.2-dev-20250708-167e3ae",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.1.2-dev-20250706-6c6481e",
+  "version": "3.1.2-dev-20250708-167e3ae",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",