matterbridge 3.0.8-dev-20250624-5abb0bb → 3.0.8-dev-20250625-61b3769

package/dist/frontend.js

@@ -769,7 +769,7 @@ export class Frontend {
         this.matterbridge.devices.forEach(async (device) => {
             if (pluginName && pluginName !== device.plugin)
                 return;
-            if (!device.plugin || !device.name || !device.deviceName || !device.serialNumber || !device.uniqueId || !device.lifecycle.isReady)
+            if (!device.plugin || !device.deviceType || !device.name || !device.deviceName || !device.serialNumber || !device.uniqueId || !device.lifecycle.isReady)
                 return;
             const cluster = this.getClusterTextFromDevice(device);
             devices.push({

package/dist/matterbridge.js

@@ -198,12 +198,18 @@ export class Matterbridge extends EventEmitter {
             if (this.serverNode)
                 servers.push(this.serverNode);
         }
-        if (this.bridgeMode === 'childbridge') {
+        if (this.bridgeMode === 'childbridge' && this.plugins !== undefined) {
             for (const plugin of this.plugins.array()) {
                 if (plugin.serverNode)
                     servers.push(plugin.serverNode);
             }
         }
+        if (this.devices !== undefined) {
+            for (const device of this.devices.array()) {
+                if (device.serverMode === 'server' && device.serverNode)
+                    servers.push(device.serverNode);
+            }
+        }
         await Promise.resolve();
         await this.cleanup('destroying instance...', false);
         this.log.info(`Dispose ${servers.length} MdnsService...`);
@@ -1075,6 +1081,12 @@ export class Matterbridge extends EventEmitter {
                     }
                 }
             }
+            for (const device of this.devices.array()) {
+                if (device.serverMode === 'server' && device.serverNode) {
+                    await this.stopServerNode(device.serverNode);
+                    device.serverNode = undefined;
+                }
+            }
             this.log.notice('Stopped matter server nodes');
             if (message === 'shutting down with reset...') {
                 this.log.info('Resetting Matterbridge commissioning information...');
@@ -1168,8 +1180,18 @@ export class Matterbridge extends EventEmitter {
             this.log.debug('Cleanup already started...');
         }
     }
+    async createDeviceServerNode(plugin, device) {
+        if (device.serverMode === 'server' && !device.serverNode && device.deviceType && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
+            this.log.debug(`Creating device ${plg}${plugin.name}${db}:${dev}${device.deviceName}${db} server node...`);
+            const storageContext = 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(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 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, start = false) {
-        if (!plugin.locked && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
+        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);
@@ -1233,6 +1255,12 @@ export class Matterbridge extends EventEmitter {
             this.startMatterInterval = undefined;
             this.log.debug('Cleared startMatterInterval interval for Matterbridge');
             this.startServerNode(this.serverNode);
+            for (const device of this.devices.array()) {
+                if (device.serverMode === 'server' && device.serverNode) {
+                    this.log.debug(`Starting server node for device ${dev}${device.deviceName}${db} in server mode...`);
+                    await this.startServerNode(device.serverNode);
+                }
+            }
             this.configureTimeout = setTimeout(async () => {
                 for (const plugin of this.plugins) {
                     if (!plugin.enabled || !plugin.loaded || !plugin.started || plugin.error)
@@ -1312,7 +1340,7 @@ export class Matterbridge extends EventEmitter {
                 }
                 this.frontend.wssSendRefreshRequired('plugins');
             }, 30 * 1000);
-            for (const plugin of this.plugins) {
+            for (const plugin of this.plugins.array()) {
                 if (!plugin.enabled || plugin.error)
                     continue;
                 if (plugin.type !== 'DynamicPlatform' && (!plugin.addedDevices || plugin.addedDevices === 0)) {
@@ -1339,6 +1367,12 @@ export class Matterbridge extends EventEmitter {
                     this.frontend.wssSendRefreshRequired('reachability');
                 }, 60 * 1000);
             }
+            for (const device of this.devices.array()) {
+                if (device.serverMode === 'server' && device.serverNode) {
+                    this.log.debug(`***Starting server node for device ${plg}${device.deviceName}${db} in server mode...`);
+                    await this.startServerNode(device.serverNode);
+                }
+            }
         }, 1000);
     }
     async startController() {
@@ -1668,22 +1702,52 @@ export class Matterbridge extends EventEmitter {
             this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) plugin ${plg}${pluginName}${er} not found`);
             return;
         }
-        if (this.bridgeMode === 'bridge') {
-            this.log.debug(`Adding bridged endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge aggregator node`);
-            if (!this.aggregatorNode) {
-                this.log.error('Aggregator node not found for Matterbridge');
-                return;
-            }
+        if (device.serverMode === 'server') {
             try {
-                await this.aggregatorNode.add(device);
+                this.log.debug(`Creating server node for device ${dev}${device.deviceName}${db} of plugin ${plg}${plugin.name}${db}...`);
+                await this.createDeviceServerNode(plugin, device);
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : error;
                 const errorInspect = inspect(error, { depth: 10 });
-                this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) for plugin ${plg}${pluginName}${er}: ${errorMessage}\nstack: ${errorInspect}`);
+                this.log.error(`Error creating server node for device ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) of plugin ${plg}${pluginName}${er}: ${errorMessage}\nstack: ${errorInspect}`);
                 return;
             }
         }
+        else if (this.bridgeMode === 'bridge') {
+            if (device.serverMode === 'matter') {
+                this.log.debug(`Adding matter endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge server node...`);
+                if (!this.serverNode) {
+                    this.log.error('Server node not found for Matterbridge');
+                    return;
+                }
+                try {
+                    await this.serverNode.add(device);
+                }
+                catch (error) {
+                    const errorMessage = error instanceof Error ? error.message : error;
+                    const errorInspect = inspect(error, { depth: 10 });
+                    this.log.error(`Error adding matter endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) for plugin ${plg}${pluginName}${er}: ${errorMessage}\nstack: ${errorInspect}`);
+                    return;
+                }
+            }
+            else {
+                this.log.debug(`Adding bridged endpoint ${plg}${pluginName}${db}:${dev}${device.deviceName}${db} to Matterbridge aggregator node`);
+                if (!this.aggregatorNode) {
+                    this.log.error('Aggregator node not found for Matterbridge');
+                    return;
+                }
+                try {
+                    await this.aggregatorNode.add(device);
+                }
+                catch (error) {
+                    const errorMessage = error instanceof Error ? error.message : error;
+                    const errorInspect = inspect(error, { depth: 10 });
+                    this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) for plugin ${plg}${pluginName}${er}: ${errorMessage}\nstack: ${errorInspect}`);
+                    return;
+                }
+            }
+        }
         else if (this.bridgeMode === 'childbridge') {
             if (plugin.type === 'AccessoryPlatform') {
                 try {
@@ -1706,11 +1770,18 @@ export class Matterbridge extends EventEmitter {
                     this.log.debug(`Adding bridged endpoint ${dev}${device.deviceName}${db} for DynamicPlatform plugin ${plg}${plugin.name}${db} aggregator node`);
                     await this.createDynamicPlugin(plugin);
                     await waiter(`createDynamicPlugin(${plugin.name})`, () => plugin.serverNode?.hasParts === true);
+                    if (!plugin.serverNode) {
+                        this.log.error(`Server node not found for plugin ${plg}${plugin.name}${er}`);
+                        return;
+                    }
                     if (!plugin.aggregatorNode) {
                         this.log.error(`Aggregator node not found for plugin ${plg}${plugin.name}${er}`);
                         return;
                     }
-                    await plugin.aggregatorNode.add(device);
+                    if (device.serverMode === 'matter')
+                        await plugin.serverNode.add(device);
+                    else
+                        await plugin.aggregatorNode.add(device);
                 }
                 catch (error) {
                     const errorMessage = error instanceof Error ? error.message : error;

package/dist/matterbridgeEndpoint.js

@@ -68,6 +68,8 @@ import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequire
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
     static logLevel = "info";
+    serverMode = undefined;
+    serverNode;
     log;
     plugin = undefined;
     configUrl = undefined;
@@ -83,9 +85,8 @@ export class MatterbridgeEndpoint extends Endpoint {
     hardwareVersion = undefined;
     hardwareVersionString = undefined;
     productUrl = 'https://www.npmjs.com/package/matterbridge';
-    serverNode;
     name = undefined;
-    deviceType;
+    deviceType = undefined;
     uniqueStorageKey = undefined;
     tagList = undefined;
     deviceTypes = new Map();

package/dist/pluginManager.js

@@ -1,11 +1,13 @@
+import EventEmitter from 'node:events';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, BLUE, db, er, nf, nt, rs, wr } from 'node-ansi-logger';
 import { plg, typ } from './matterbridgeTypes.js';
-export class PluginManager {
+export class PluginManager extends EventEmitter {
     _plugins = new Map();
     nodeContext;
     matterbridge;
     log;
     constructor(matterbridge) {
+        super();
         this.matterbridge = matterbridge;
         this.nodeContext = matterbridge.nodeContext;
         this.log = new AnsiLogger({ logName: 'PluginManager', logTimestampFormat: 4, logLevel: matterbridge.log.logLevel });
@@ -319,6 +321,7 @@ export class PluginManager {
             plugin.enabled = true;
             this.log.info(`Enabled plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('enabled', plugin.name);
             return plugin;
         }
         catch (err) {
@@ -352,6 +355,7 @@ export class PluginManager {
             plugin.enabled = false;
             this.log.info(`Disabled plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('disabled', plugin.name);
             return plugin;
         }
         catch (err) {
@@ -385,6 +389,7 @@ export class PluginManager {
             this._plugins.delete(packageJson.name);
             this.log.info(`Removed plugin ${plg}${plugin.name}${nf}`);
             await this.saveToStorage();
+            this.emit('removed', plugin.name);
             return plugin;
         }
         catch (err) {
@@ -419,6 +424,7 @@ export class PluginManager {
             this.log.info(`Added plugin ${plg}${packageJson.name}${nf}`);
             await this.saveToStorage();
             const plugin = this._plugins.get(packageJson.name);
+            this.emit('added', packageJson.name);
             return plugin || null;
         }
         catch (err) {
@@ -529,6 +535,7 @@ export class PluginManager {
                 plugin.addedDevices = 0;
                 await this.saveToStorage();
                 this.log.notice(`Loaded plugin ${plg}${plugin.name}${nt} type ${typ}${platform.type}${nt} (entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
+                this.emit('loaded', plugin.name);
                 if (start)
                     await this.start(plugin, message, false);
                 if (configure)
@@ -565,6 +572,7 @@ export class PluginManager {
             this.log.notice(`Started plugin ${plg}${plugin.name}${nt} type ${typ}${plugin.type}${nt}`);
             plugin.started = true;
             await this.saveConfigFromPlugin(plugin);
+            this.emit('started', plugin.name);
             if (configure)
                 await this.configure(plugin);
             return plugin;
@@ -597,6 +605,7 @@ export class PluginManager {
             await plugin.platform.onConfigure();
             this.log.notice(`Configured plugin ${plg}${plugin.name}${nt} type ${typ}${plugin.type}${nt}`);
             plugin.configured = true;
+            this.emit('configured', plugin.name);
             return plugin;
         }
         catch (err) {
@@ -640,6 +649,7 @@ export class PluginManager {
             plugin.registeredDevices = undefined;
             plugin.addedDevices = undefined;
             this.log.notice(`Shutdown of plugin ${plg}${plugin.name}${nt} completed`);
+            this.emit('shutdown', plugin.name);
             return plugin;
         }
         catch (err) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.0.8-dev-20250624-5abb0bb",
+  "version": "3.0.8-dev-20250625-61b3769",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.8-dev-20250624-5abb0bb",
+      "version": "3.0.8-dev-20250625-61b3769",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.14.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.8-dev-20250624-5abb0bb",
+  "version": "3.0.8-dev-20250625-61b3769",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",