matterbridge 3.0.8-dev-20250622-9a6255a → 3.0.8-dev-20250625-61b3769

package/CHANGELOG.md

@@ -16,7 +16,7 @@ If you like this project and find it useful, please consider giving it a star on
 
 - [DevContainer]: Added support for the **Matterbridge Dev Container** with an optimized named volume for `node_modules`.
 - [GitHub]: Added GitHub issue templates for bug reports and feature requests.
-- [Systemd]: Added a systemd service file for Matterbridge.
+- [Systemd]: Added a systemd service file for Matterbridge in the systemd directory.
 - [ESLint]: Refactored ESLint configuration for TypeScript and improved plugin integration.
 - [ESLint]: Added the plugins `eslint-plugin-promise`, `eslint-plugin-jsdoc`, and `@vitest/eslint-plugin`.
 - [Vitest]: Added Vitest for TypeScript project testing. It will replace Jest, which does not work correctly with ESM module mocks.
@@ -24,8 +24,10 @@ If you like this project and find it useful, please consider giving it a star on
 
 ### Changed
 
-- [package]: Updated dependencies and refactored scripts.
+- [package]: Updated package to Automator v. 2.0.0.
+- [package]: Updated dependencies.
 - [storage]: Bumped `node-storage-manager` to 2.0.0.
+- [logger]: Bumped `node-ansi-logger` to 3.1.1.
 
 ### Fixed
 

package/README-DEV.md

@@ -18,13 +18,13 @@
 
 The easiest way is to clone the [Matterbridge Plugin Template](https://github.com/Luligu/matterbridge-plugin-template) that has **Dev Container support for instant development environment** and all tools and extensions (like Node.js, npm, TypeScript, ESLint, Prettier, Jest and Vitest) already loaded and configured.
 
-Then change the name (keep matterbridge- at the beginning of the name), version, description, author, homepage, repository, bugs and funding in the package.json.
+After you clone it locally, change the name (keep always matterbridge- at the beginning of the name), version, description, author, homepage, repository, bugs and funding in the package.json.
 
-It is possible to add two custom properties to the package.json: **help** and **changelog** with a url that will be used in the frontend instead of the default (/blob/main/README.md and /blob/main/CHANGELOG.md).
+It is also possible to add two custom properties to the package.json: **help** and **changelog** with a url that will be used in the frontend instead of the default (/blob/main/README.md and /blob/main/CHANGELOG.md).
 
 Add your plugin logic in module.ts.
 
-The Matterbridge Plugin Template has an already configured Jest / Vitest test unit (coverage 100%) that you can expand while you add your own plugin logic.
+The Matterbridge Plugin Template has an already configured Jest / Vitest test unit (with 100% coverage) that you can expand while you add your own plugin logic.
 
 It also has a workflow configured to run on push and pull request that build, lint and test the plugin on node 20, 22 and 24 with ubuntu, macOS and windows.
 
@@ -80,13 +80,13 @@ Matterbridge exports from:
 
 - All matter.js types.
 
-### WARNING \***\*\*\*\*\***
+### \***\*\*\*\*\*** WARNING \***\*\*\*\*\***
 
 A plugin must never install or import from `@matter` or `@project-chip` directly (neither as a dependency, devDependency, nor peerDependency), as this leads to a second instance of `matter.js`, causing instability and unpredictable errors such as "The only instance is Endpoint".
 
 Additionally, when Matterbridge updates the `matter.js` version, it should be consistent across all plugins.
 
-### WARNING \***\*\*\*\*\***
+### \***\*\*\*\*\*** WARNING \***\*\*\*\*\***
 
 A plugin must never install Matterbridge (neither as a dependency, devDependency, nor peerDependency).
 
@@ -100,9 +100,25 @@ Matterbridge must be linked to the plugin in development only. At runtime the pl
 }
 ```
 
-If you don't use Dev Container from the Matterbridge Plugin Template, on the machine you use for development of your plugin, you need to clone matterbridge, built it locally and link it globally (npm link from the matterbridge package root).
+If you don't use Dev Container from the Matterbridge Plugin Template, on the host you use for the development of your plugin, you need to clone matterbridge, built it locally and link it globally (npm link from the matterbridge package root).
+
+```bash
+git clone https://github.com/Luligu/matterbridge.git
+cd matterbridge
+npm install
+npm run build
+npm link
+```
+
+If you want to develop a plugin using the dev branch of matterbridge (I suggest you do it).
 
-If you want to develop a plugin using the dev branch of matterbridge (I suggest you do it), you have to clone the dev branch of matterbridge, build it locally and link it (npm run deepCleanBuild does all necessary steps).
+```bash
+git clone -b dev https://github.com/Luligu/matterbridge.git
+cd matterbridge
+npm install
+npm run build
+npm link
+```
 
 Always keep your local instance of matterbridge up to date.
 
@@ -116,19 +132,19 @@ To install i.e. https://github.com/Luligu/matterbridge-example-accessory-platfor
 
 On windows:
 
-```
+```powershell
 cd $HOME\Matterbridge
 ```
 
 On linux or macOS:
 
-```
+```bash
 cd ~/Matterbridge
 ```
 
 then clone the plugin
 
-```
+```bash
 git clone https://github.com/Luligu/matterbridge-example-accessory-platform
 cd matterbridge-example-accessory-platform
 npm install
@@ -138,7 +154,7 @@ npm run build
 
 then add the plugin to Matterbridge
 
-```
+```bash
 matterbridge -add .
 ```
 

package/README.md

@@ -15,25 +15,25 @@
 
 Matterbridge is a Matter plugin manager.
 
-It allows you to have all your Matter devices up and running in a couple of minutes without
-having to deal with the pairing process of each single device.
+It allows you to have all your Matter devices up and running in a couple of minutes without having to deal with the pairing process for each individual device.
 
-The developer just focuses on the device development extending the provided classes.
+Developers can focus solely on device development by extending the provided classes.
 
-Just pair Matterbridge once, and it will load all your registered plugins.
+Simply pair Matterbridge once, and it will load all your registered plugins.
 
-This project aims to allow the porting of homebridge plugins to matterbridge plugins without recoding everything ([Development](README-DEV.md)).
+This project aims to enable porting Homebridge plugins to Matterbridge plugins without having to recode everything ([Development](README-DEV.md)).
 
-It creates a device to pair in any ecosystem like Apple Home, Google Home, Amazon Alexa, Home Assistant or
-any other ecosystem supporting Matter.
+The easiest way to start create a new plugin is to clone the [Matterbridge Plugin Template](https://github.com/Luligu/matterbridge-plugin-template) which has **Dev Container support for instant development environment** and all tools and extensions (like Node.js, npm, TypeScript, ESLint, Prettier, Jest and Vitest) already loaded and configured.
+
+Matterbridge creates a device that can be paired with any ecosystem, such as Apple Home, Google Home, Amazon Alexa, Home Assistant, or any other platform supporting Matter.
 
 You don't need a hub or a dedicated new machine.
 
-No complex setup just copy paste the installation scripts.
+No complex setup: just copy paste the installation scripts.
 
-Matterbridge is light weight and run also on slow Linux machine with 512MB of memory.
+Matterbridge is lightweight and also runs on slow Linux machines with as little as 512MB of memory.
 
-It runs perfectly on macOS and Windows too.
+It also runs perfectly on macOS and Windows.
 
 If you like this project and find it useful, please consider giving it a star on GitHub at https://github.com/Luligu/matterbridge and sponsoring it.
 
@@ -45,7 +45,7 @@ If you like this project and find it useful, please consider giving it a star on
 
 The project is build on top of https://github.com/project-chip/matter.js.
 
-A special thank to Apollon77 for his incredible work.
+A special thanks to Apollon77 for his incredible work.
 
 ## Discord
 

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-20250622-9a6255a",
+  "version": "3.0.8-dev-20250625-61b3769",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.8-dev-20250622-9a6255a",
+      "version": "3.0.8-dev-20250625-61b3769",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.14.0",
@@ -14,7 +14,7 @@
         "express": "5.1.0",
         "glob": "11.0.3",
         "multer": "2.0.1",
-        "node-ansi-logger": "3.0.1",
+        "node-ansi-logger": "3.1.1",
         "node-persist-manager": "2.0.0",
         "ws": "8.18.2"
       },
@@ -1349,12 +1349,13 @@
       }
     },
     "node_modules/node-ansi-logger": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/node-ansi-logger/-/node-ansi-logger-3.0.1.tgz",
-      "integrity": "sha512-Nx7nkO6Sby8Eti1UFFdff3gImEC35izuvf+aRFh3mrDZ8hgXM/cZdflkpDMnDdxnabYl91LVi4RhB/dm5Yk9iA==",
-      "license": "MIT",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/node-ansi-logger/-/node-ansi-logger-3.1.1.tgz",
+      "integrity": "sha512-tFeCSxwiRg5XaNda5nC27alzraZP76nLtUk1JDZqb9byhW4WYaSGL7/lmxFHEI16gypQDMEYljuF+wcG+cPPHw==",
+      "hasShrinkwrap": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
       },
       "funding": {
         "type": "buymeacoffee",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.8-dev-20250622-9a6255a",
+  "version": "3.0.8-dev-20250625-61b3769",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -103,7 +103,7 @@
     "express": "5.1.0",
     "glob": "11.0.3",
     "multer": "2.0.1",
-    "node-ansi-logger": "3.0.1",
+    "node-ansi-logger": "3.1.1",
     "node-persist-manager": "2.0.0",
     "ws": "8.18.2"
   }