matterbridge 3.3.0-dev-20251002-bbaa166 → 3.3.0-dev-20251003-626ea2f

package/CHANGELOG.md

@@ -25,12 +25,13 @@ Advantages:
 
 ## [3.3.0] - Not released
 
-### Development Breaking Changes
+### Development Breaking Changes Notice
 
+- [matterbridge]: Now, internal use only properties are private readonly and internal use only methods are private.
 - [platform]: Now, internal use only properties are private readonly and internal use only methods are private.
 - [platform]: The signature of the matterbridge param in the platform constructor has changed from Matterbridge to `PlatformMatterbridge` which has only the appropriate readonly properties from matterbridge.
 
-This change, necessary to achieve plugin isolation, will require all plugins to be adapted in two steps.
+This change, necessary to achieve plugin isolation, will require all plugins to be updated in two steps.
 
 1. `After` matterbridge `3.3.0` is published as latest:
 
@@ -89,7 +90,6 @@ In this phase (matterbridge `3.4.x`) all plugins will not build and will not run
 - [matterbridge]: Added RvcRunMode to frontend state update.
 - [matterbridge]: Added RvcCleanMode to frontend state update.
 - [matterbridge]: Added RvcOperationalState to frontend state update.
-- [matterbridge]: Added RvcOperationalState to frontend state update.
 - [matterbridge]: Added ServiceArea to frontend state update.
 - [matterbridge]: Added ModeSelect to frontend state update.
 

package/dist/frontend.js

@@ -359,12 +359,12 @@ export class Frontend extends EventEmitter {
                     serverNodes.push(this.matterbridge.serverNode);
             }
             else if (this.matterbridge.bridgeMode === 'childbridge') {
-                for (const plugin of this.matterbridge.getPlugins()) {
+                for (const plugin of this.matterbridge.plugins.array()) {
                     if (plugin.serverNode)
                         serverNodes.push(plugin.serverNode);
                 }
             }
-            for (const device of this.matterbridge.getDevices()) {
+            for (const device of this.matterbridge.devices.array()) {
                 if (device.serverNode)
                     serverNodes.push(device.serverNode);
             }
@@ -1291,7 +1291,8 @@ export class Frontend extends EventEmitter {
                 if (data.params.id === 'Matterbridge')
                     serverNode = this.matterbridge.serverNode;
                 else
-                    serverNode = this.matterbridge.getPlugins().find((p) => p.serverNode && p.serverNode.id === localData.params.id)?.serverNode || this.matterbridge.getDevices().find((d) => d.serverNode && d.serverNode.id === localData.params.id)?.serverNode;
+                    serverNode =
+                        this.matterbridge.plugins.array().find((p) => p.serverNode && p.serverNode.id === localData.params.id)?.serverNode || this.matterbridge.devices.array().find((d) => d.serverNode && d.serverNode.id === localData.params.id)?.serverNode;
                 if (!serverNode) {
                     sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: `Unknown server node id ${localData.params.id} in /api/matter` });
                     return;

package/dist/matterbridge.js

@@ -136,12 +136,6 @@ export class Matterbridge extends EventEmitter {
         super();
         this.log.logNameColor = '\x1b[38;5;115m';
     }
-    getDevices() {
-        return this.devices.array();
-    }
-    getPlugins() {
-        return this.plugins.array();
-    }
     async setLogLevel(logLevel) {
         if (this.log)
             this.log.logLevel = logLevel;
@@ -553,8 +547,8 @@ export class Matterbridge extends EventEmitter {
       --childbridge:           start Matterbridge in childbridge mode
       --port [port]:           start the commissioning server on the given port (default 5540)
       --mdnsinterface [name]:  set the interface to use for the matter server mdnsInterface (default all interfaces)
-      --ipv4address [address]: set the ipv4 interface address to use for the matter listener (default all interfaces)
-      --ipv6address [address]: set the ipv6 interface address to use for the matter listener (default all interfaces)
+      --ipv4address [address]: set the ipv4 interface address to use for the matter listener (default all addresses)
+      --ipv6address [address]: set the ipv6 interface address to use for the matter listener (default all addresses)
       --frontend [port]:       start the frontend on the given port (default 8283)
       --logger:                set the matterbridge logger level: debug | info | notice | warn | error | fatal (default info)
       --filelogger             enable the matterbridge file logger (matterbridge.log)
@@ -1023,8 +1017,10 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
-            this.log.debug('Waiting for the MessageExchange to finish...');
-            await wait(timeout, 'Waiting for the MessageExchange to finish...', true);
+            if (timeout > 0) {
+                this.log.debug(`Waiting ${timeout}ms for the MessageExchange to finish...`);
+                await wait(timeout, `Waiting ${timeout}ms for the MessageExchange to finish...`, true);
+            }
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
                     await this.stopServerNode(this.serverNode);
@@ -1146,36 +1142,10 @@ export class Matterbridge extends EventEmitter {
             this.emit('cleanup_completed');
         }
         else {
-            this.log.debug('Cleanup already started...');
-        }
-    }
-    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...`);
-            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`);
-        }
-    }
-    async createAccessoryPlugin(plugin, device) {
-        if (!plugin.locked && device.deviceType && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
-            plugin.locked = true;
-            plugin.device = device;
-            plugin.storageContext = await this.createServerNodeContext(plugin.name, device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
-            plugin.serverNode = await this.createServerNode(plugin.storageContext, 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 ${plg}${plugin.name}${db} server node`);
-            await plugin.serverNode.add(device);
-        }
-    }
-    async createDynamicPlugin(plugin) {
-        if (!plugin.locked) {
-            plugin.locked = true;
-            plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, plugin.description);
-            plugin.serverNode = await this.createServerNode(plugin.storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
-            plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
-            await plugin.serverNode.add(plugin.aggregatorNode);
+            if (!this.initialized)
+                this.log.debug('Cleanup with instance not initialized...');
+            if (this.hasCleanupStarted)
+                this.log.debug('Cleanup already started...');
         }
     }
     async startBridge() {
@@ -1572,6 +1542,39 @@ export class Matterbridge extends EventEmitter {
         this.log.info(`Created ${await storageContext.get('storeId')} aggregator`);
         return aggregatorNode;
     }
+    async createAccessoryPlugin(plugin, device) {
+        if (!plugin.locked && device.deviceType && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
+            plugin.locked = true;
+            plugin.device = device;
+            this.log.debug(`Creating accessory plugin ${plg}${plugin.name}${db} server node...`);
+            plugin.storageContext = await this.createServerNodeContext(plugin.name, device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
+            plugin.serverNode = await this.createServerNode(plugin.storageContext, 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 ${plg}${plugin.name}${db} server node...`);
+            await plugin.serverNode.add(device);
+        }
+    }
+    async createDynamicPlugin(plugin) {
+        if (!plugin.locked) {
+            plugin.locked = true;
+            this.log.debug(`Creating dynamic plugin ${plg}${plugin.name}${db} server node...`);
+            plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, plugin.description);
+            plugin.serverNode = await this.createServerNode(plugin.storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
+            this.log.debug(`Creating dynamic plugin ${plg}${plugin.name}${db} aggregator node...`);
+            plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
+            this.log.debug(`Adding dynamic plugin ${plg}${plugin.name}${db} aggregator node...`);
+            await plugin.serverNode.add(plugin.aggregatorNode);
+        }
+    }
+    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...`);
+            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`);
+        }
+    }
     async addBridgedEndpoint(pluginName, device) {
         const plugin = this.plugins.get(pluginName);
         if (!plugin) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.3.0-dev-20251002-bbaa166",
+  "version": "3.3.0-dev-20251003-626ea2f",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.3.0-dev-20251002-bbaa166",
+      "version": "3.3.0-dev-20251003-626ea2f",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.3.0-dev-20251002-bbaa166",
+  "version": "3.3.0-dev-20251003-626ea2f",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",