matterbridge 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.2] - 2024-03-26
+
+### Added
+
+- [MatterbridgeDevice]: Added Cluster DoorLock and command handler.
+
+## [1.2.1] - 2024-03-25
+
+### Added
+
+- [frontend]: Remove plugin from frontend.
+- [frontend]: Add plugin from frontend.
+- [workflow]: All packages now have a workflow on GitHub.
+- [frontend]: Frontend got updated to 0.8.4.
+
+### Fixed
+
+- [frontend]: Fixed the restart needed message.
+- [matterbridge]: Fixed the delay of loading from the cli.
+- [matterbridge]: Fixed the count of devices removed.
+
 ## [1.2.0] - 2024-03-23
 
 ### Breaking change on plugin default entry point and platform constructor!

package/README.md

@@ -2,6 +2,8 @@
 
 [![npm version](https://img.shields.io/npm/v/matterbridge.svg)](https://www.npmjs.com/package/matterbridge)
 [![npm downloads](https://img.shields.io/npm/dt/matterbridge.svg)](https://www.npmjs.com/package/matterbridge)
+![Node.js CI](https://github.com/Luligu/matterbridge/actions/workflows/build.yml/badge.svg)
+
 
 [![power by](https://img.shields.io/badge/powered%20by-matter--history-blue)](https://www.npmjs.com/package/matter-history)
 [![power by](https://img.shields.io/badge/powered%20by-node--ansi--logger-blue)](https://www.npmjs.com/package/node-ansi-logger)
@@ -33,12 +35,12 @@ A special thank to Apollon77 for his incredible work.
 Follow these steps to install Matterbridge:
 
 on Windows:
-``` powershell
+```
 npm install -g matterbridge
 ```
 
 on Linux (you need the necessary permissions):
-``` bash
+```
 sudo npm install -g matterbridge
 ```
 
@@ -46,6 +48,7 @@ Test the installation with:
 ```
 matterbridge -bridge
 ```
+
 Now it is possible to open the frontend at the link provided (default: http://localhost:3000)
 
 ## Usage
@@ -87,10 +90,10 @@ matterbridge -childbridge -frontend [port number]
 ```
 
 Home page:
-![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20home%20page.png)
+![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20home.jpg)
 
 Devices page:
-![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20devices%20page.png)
+![See the screenshot here](https://github.com/Luligu/matterbridge/blob/main/Screenshot%20devices.jpg)
 
 ## Plugins
 
@@ -130,6 +133,10 @@ Matterbridge can run as many plugins as you want.
 
 [Room plugin with history](https://github.com/Luligu/matterbridge-eve-room)
 
+### Production-level plugins
+
+[zigbee2mqtt](https://github.com/Luligu/matterbridge-zigbee2mqtt)
+
 ## How to install and register a production-level plugin (from npm)
 
 To install i.e. https://github.com/Luligu/matterbridge-zigbee2mqtt
@@ -148,7 +155,7 @@ sudo npm install -g matterbridge-zigbee2mqtt
 matterbridge -add matterbridge-zigbee2mqtt
 ```
 
-## How to install and register a plugin for development (from git)
+## How to install and register a plugin for development (from github)
 
 To install i.e. https://github.com/Luligu/matterbridge-example-accessory-platform
 
@@ -162,15 +169,16 @@ On linux:
 cd ~/Matterbridge
 ```
 
-then
+then clone the plugin
 
 ```
 git clone https://github.com/Luligu/matterbridge-example-accessory-platform
 cd matterbridge-example-accessory-platform
 npm install
+npm run build
 ```
 
-Then add the plugin to Matterbridge
+then add the plugin to Matterbridge
 ```
 matterbridge -add .\
 ```
@@ -221,7 +229,8 @@ The plugin name.
 The plugin platform type.
 
 ### config: object
-The plugin config (loaded before onStart() is called and saved after onShutdown() is called).
+The plugin config (loaded before the platform constructor is called and saved after onShutdown() is called).
+Here you can store your plugin configuration (see matterbridge-zigbee2mqtt for example)
 
 ### async onStart(reason?: string)
 The method onStart() is where you have to create your MatterbridgeDevice and add all needed clusters and command handlers. 
@@ -253,3 +262,37 @@ It can be useful to call this method from onShutdown() if you don't want to keep
 
 ## MatterbridgeDevice api
 
+
+# Contribution Guidelines
+
+Thank you for your interest in contributing to my project! 
+
+I warmly welcome contributions to this project! Whether it's reporting bugs, proposing new features, updating documentation, or writing code, your help is greatly appreciated.
+
+## Getting Started
+
+- Fork this repository to your own GitHub account and clone it to your local device.
+- Make the necessary changes and test them out
+- Commit your changes and push to your forked repository
+
+## Submitting Changes
+
+- Create a new pull request from my repository and I'll be glad to check it out
+- Be sure to follow the existing code style
+- Add unit tests for any new or changed functionality if possible
+- In your pull request, do describe what your changes do and how they work
+
+## Code of Conduct
+
+We believe in a welcoming and respectful community for all. Please make sure to follow our [Code of Conduct](LINK_TO_CODE_OF_CONDUCT) in all your interactions with the project.
+
+## Support
+
+If you find this project helpful and you wish to support the ongoing development, you can do so by buying me a coffee. 
+Click on the badge below to get started:
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+Thank you for your support!

package/dist/matterbridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"matterbridge.d.ts","sourceRoot":"","sources":["../src/matterbridge.ts"],"names":[],"mappings":"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"}

package/dist/matterbridge.js

@@ -31,11 +31,11 @@ import express from 'express';
 import os from 'os';
 import path from 'path';
 import { CommissioningController, CommissioningServer, MatterServer } from '@project-chip/matter-node.js';
-import { BasicInformationCluster, BridgedDeviceBasicInformationCluster, ClusterServer } from '@project-chip/matter-node.js/cluster';
+import { BasicInformationCluster, BridgedDeviceBasicInformationCluster, ClusterServer, GeneralCommissioning, PowerSourceCluster, ThreadNetworkDiagnosticsCluster, } from '@project-chip/matter-node.js/cluster';
 import { DeviceTypeId, VendorId } from '@project-chip/matter-node.js/datatype';
-import { Aggregator, DeviceTypes } from '@project-chip/matter-node.js/device';
+import { Aggregator, DeviceTypes, NodeStateInformation } from '@project-chip/matter-node.js/device';
 import { Format, Level, Logger } from '@project-chip/matter-node.js/log';
-import { QrCodeSchema } from '@project-chip/matter-node.js/schema';
+import { ManualPairingCodeCodec, QrCodeSchema } from '@project-chip/matter-node.js/schema';
 import { StorageBackendDisk, StorageBackendJsonFile, StorageManager } from '@project-chip/matter-node.js/storage';
 import { requireMinNodeVersion, getParameter, getIntParameter, hasParameter } from '@project-chip/matter-node.js/util';
 import { CryptoNode } from '@project-chip/matter-node.js/crypto';
@@ -109,15 +109,11 @@ export class Matterbridge extends EventEmitter {
     static async loadInstance(initialize = false) {
         if (!Matterbridge.instance) {
             // eslint-disable-next-line no-console
-            console.log('Matterbridge instance does not exists');
+            console.log(wr + 'Matterbridge instance does not exists!', initialize ? 'Initializing...' : 'Not initializing...', rs);
             Matterbridge.instance = new Matterbridge();
             if (initialize)
                 await Matterbridge.instance.initialize();
         }
-        else {
-            // eslint-disable-next-line no-console
-            console.log('Matterbridge instance already exists');
-        }
         return Matterbridge.instance;
     }
     /**
@@ -152,28 +148,19 @@ export class Matterbridge extends EventEmitter {
       - disable [plugin name]: disable the globally installed plugin with the given name\n`);
             process.exit(0);
         }
-        // set Matterbridge logger
+        // Set Matterbridge logger
         if (hasParameter('debug'))
             this.debugEnabled = true;
         this.log = new AnsiLogger({ logName: 'Matterbridge', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logDebug: this.debugEnabled });
         this.log.debug('Matterbridge is starting...');
-        // log system info and create .matterbridge directory
-        await this.logNodeAndSystemInfo();
-        this.log.info(
-        // eslint-disable-next-line max-len
-        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
-        // check node version and throw error
-        requireMinNodeVersion(18);
-        // register SIGINT SIGTERM signal handlers
-        this.registerSignalHandlers();
-        // set matter.js logger level and format
-        Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
-        Logger.format = Format.ANSI;
         // Initialize NodeStorage
+        this.homeDirectory = os.homedir();
+        this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         this.log.debug('Creating node storage manager');
         this.nodeStorage = new NodeStorageManager({ dir: path.join(this.matterbridgeDirectory, 'storage'), logging: false });
         this.log.debug('Creating node storage context for matterbridge');
         this.nodeContext = await this.nodeStorage.createStorage('matterbridge');
+        // Get the plugins from node storage
         this.registeredPlugins = await this.nodeContext.get('plugins', []);
         for (const plugin of this.registeredPlugins) {
             this.log.debug(`Creating node storage context for plugin ${plugin.name}`);
@@ -185,6 +172,43 @@ export class Matterbridge extends EventEmitter {
             await plugin.nodeContext.set('description', plugin.description);
             await plugin.nodeContext.set('author', plugin.author);
         }
+        if (hasParameter('logstorage')) {
+            await this.nodeContext.logStorage();
+            for (const plugin of this.registeredPlugins) {
+                await plugin.nodeContext?.logStorage();
+            }
+        }
+        // Log system info and create .matterbridge directory
+        await this.logNodeAndSystemInfo();
+        this.log.info(
+        // eslint-disable-next-line max-len
+        `Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
+        // Check node version and throw error
+        requireMinNodeVersion(18);
+        // Register SIGINT SIGTERM signal handlers
+        this.registerSignalHandlers();
+        // Set matter.js logger level and format
+        Logger.defaultLogLevel = this.debugEnabled ? Level.DEBUG : Level.INFO;
+        Logger.format = Format.ANSI;
+        // Initialize NodeStorage
+        /*
+        this.log.debug('Creating node storage manager');
+        this.nodeStorage = new NodeStorageManager({ dir: path.join(this.matterbridgeDirectory, 'storage'), logging: false });
+        this.log.debug('Creating node storage context for matterbridge');
+        this.nodeContext = await this.nodeStorage.createStorage('matterbridge');
+        // Get the plugins from node storage
+        this.registeredPlugins = await this.nodeContext.get<RegisteredPlugin[]>('plugins', []);
+        for (const plugin of this.registeredPlugins) {
+          this.log.debug(`Creating node storage context for plugin ${plugin.name}`);
+          plugin.nodeContext = await this.nodeStorage.createStorage(plugin.name);
+          await plugin.nodeContext.set<string>('name', plugin.name);
+          await plugin.nodeContext.set<string>('type', plugin.type);
+          await plugin.nodeContext.set<string>('path', plugin.path);
+          await plugin.nodeContext.set<string>('version', plugin.version);
+          await plugin.nodeContext.set<string>('description', plugin.description);
+          await plugin.nodeContext.set<string>('author', plugin.author);
+        }
+        */
         // Parse command line
         this.parseCommandLine();
     }
@@ -475,10 +499,16 @@ export class Matterbridge extends EventEmitter {
             process.removeAllListeners('SIGTERM');
             // Calling the shutdown functions with a reason
             for (const plugin of this.registeredPlugins) {
+                if (!plugin.enabled)
+                    continue;
+                this.log.info(`*Shutting down plugin ${plg}${plugin.name}${nf}`);
                 if (plugin.platform) {
                     await plugin.platform.onShutdown('Matterbridge is closing: ' + message);
                     await this.savePluginConfig(plugin);
                 }
+                else {
+                    this.log.warn(`Plugin ${plg}${plugin.name}${er} platform not found`);
+                }
             }
             // Set reachability to false
             /*
@@ -491,7 +521,6 @@ export class Matterbridge extends EventEmitter {
               }
               this.log.debug(`*-- device: ${dev}${registeredDevice.device.name}${db} plugin ${plg}${registeredDevice.plugin}${db} type ${GREEN}${plugin.type}${db}`);
               if (this.bridgeMode === 'bridge') registeredDevice.device.setBridgedDeviceReachability(false);
-              if (this.bridgeMode === 'childbridge' && plugin.type === 'DynamicPlatform') plugin.aggregator?.removeBridgedDevice(registeredDevice.device);
               if (this.bridgeMode === 'childbridge') plugin.commissioningServer?.setReachability(false);
               if (this.bridgeMode === 'childbridge' && plugin.type === 'AccessoryPlatform') this.setReachableAttribute(registeredDevice.device, false);
               if (this.bridgeMode === 'childbridge' && plugin.type === 'DynamicPlatform') registeredDevice.device.setBridgedDeviceReachability(false);
@@ -599,7 +628,7 @@ export class Matterbridge extends EventEmitter {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered device ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered device (${plugin.registeredDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
     }
     /**
@@ -635,7 +664,7 @@ export class Matterbridge extends EventEmitter {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered bridged device ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered bridged device (${plugin.registeredDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
     }
     /**
@@ -661,7 +690,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         if (this.bridgeMode === 'childbridge' && !plugin.connected) {
-            this.log.warn(`Not removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) plugin ${plg}${pluginName}${wr} not connected`);
+            this.log.warn(`Removing bridged device ${dev}${device.deviceName}${wr} (${dev}${device.name}${wr}) plugin ${plg}${pluginName}${wr} not connected`);
             return;
         }
         // Register and add the device to matterbridge aggregator in bridge mode
@@ -673,11 +702,11 @@ export class Matterbridge extends EventEmitter {
                     return;
                 }
             });
+            this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.deviceName}${nf} (${dev}${device.name}${nf}) for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
@@ -1073,6 +1102,11 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         if (this.bridgeMode === 'controller') {
+            if (!this.mattercontrollerContext) {
+                this.log.error('No matter controller context initialized');
+                await this.cleanup('No matter controller context initialized');
+                return;
+            }
             this.log.info('Creating matter commissioning controller');
             this.commissioningController = new CommissioningController({
                 autoConnect: false,
@@ -1082,15 +1116,124 @@ export class Matterbridge extends EventEmitter {
             this.log.info('Starting matter server');
             await this.matterServer.start();
             this.log.info('Matter server started');
+            if (hasParameter('pairingcode')) {
+                const pairingCode = getParameter('pairingcode');
+                const ip = this.mattercontrollerContext.has('ip') ? this.mattercontrollerContext.get('ip') : undefined;
+                const port = this.mattercontrollerContext.has('port') ? this.mattercontrollerContext.get('port') : undefined;
+                let longDiscriminator, setupPin, shortDiscriminator;
+                if (pairingCode !== undefined) {
+                    const pairingCodeCodec = ManualPairingCodeCodec.decode(pairingCode);
+                    shortDiscriminator = pairingCodeCodec.shortDiscriminator;
+                    longDiscriminator = undefined;
+                    setupPin = pairingCodeCodec.passcode;
+                    this.log.info(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
+                }
+                else {
+                    longDiscriminator = this.mattercontrollerContext.get('longDiscriminator', 3840);
+                    if (longDiscriminator > 4095)
+                        throw new Error('Discriminator value must be less than 4096');
+                    setupPin = this.mattercontrollerContext.get('pin', 20202021);
+                }
+                if ((shortDiscriminator === undefined && longDiscriminator === undefined) || setupPin === undefined) {
+                    throw new Error('Please specify the longDiscriminator of the device to commission with -longDiscriminator or provide a valid passcode with -passcode');
+                }
+                const commissioningOptions = {
+                    regulatoryLocation: GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor,
+                    regulatoryCountryCode: 'XX',
+                };
+                const options = {
+                    commissioning: commissioningOptions,
+                    discovery: {
+                        knownAddress: ip !== undefined && port !== undefined ? { ip, port, type: 'udp' } : undefined,
+                        identifierData: longDiscriminator !== undefined ? { longDiscriminator } : shortDiscriminator !== undefined ? { shortDiscriminator } : {},
+                    },
+                    passcode: setupPin,
+                };
+                //this.log.info(`Commissioning ... ${JSON.stringify(options)}`);
+                this.log.info('Commissioning ...', options);
+                const nodeId = await this.commissioningController.commissionNode(options);
+                this.mattercontrollerContext.set('nodeId', nodeId.nodeId);
+                this.log.info(`Commissioning successfully done with nodeId: ${nodeId.nodeId}`);
+                // eslint-disable-next-line no-console
+                this.log.info('ActiveSessionInformation:', this.commissioningController.getActiveSessionInformation());
+            } // (hasParameter('pairingcode'))
             if (hasParameter('discover')) {
                 //const discover = await this.commissioningController.discoverCommissionableDevices({ productId: 0x8000, deviceType: 0xfff1 });
                 //console.log(discover);
             }
-            this.log.info(`Commissioning controller is already commisioned: ${this.commissioningController.isCommissioned()}`);
-            const nodes = this.commissioningController.getCommissionedNodes();
-            nodes.forEach(async (nodeId) => {
-                this.log.warn(`Connecting to commissioned node: ${nodeId}`);
-            });
+            const nodeIds = this.commissioningController.getCommissionedNodes();
+            this.log.info(`***Commissioning controller has ${nodeIds.length} nodes commisioned: ${this.commissioningController.isCommissioned()}`);
+            for (const nodeId of nodeIds) {
+                this.log.info(`***Connecting to commissioned node: ${nodeId}`);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const node = await this.commissioningController.connectNode(nodeId, {
+                    attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) => this.log.info(`***mattributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Logger.toJSON(value)}`),
+                    eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) => this.log.info(`***eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Logger.toJSON(events)}`),
+                    stateInformationCallback: (peerNodeId, info) => {
+                        switch (info) {
+                            case NodeStateInformation.Connected:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} connected`);
+                                break;
+                            case NodeStateInformation.Disconnected:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} disconnected`);
+                                break;
+                            case NodeStateInformation.Reconnecting:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} reconnecting`);
+                                break;
+                            case NodeStateInformation.WaitingForDeviceDiscovery:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} waiting for device discovery`);
+                                break;
+                            case NodeStateInformation.StructureChanged:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} structure changed`);
+                                break;
+                            case NodeStateInformation.Decommissioned:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} decommissioned`);
+                                break;
+                            default:
+                                this.log.info(`***stateInformationCallback ${peerNodeId}: Node ${nodeId} NodeStateInformation.${info}`);
+                                break;
+                        }
+                    },
+                });
+                node.logStructure();
+                // Get the interaction client
+                const interactionClient = await node.getInteractionClient();
+                let cluster;
+                let attributes;
+                // Log BasicInformationCluster
+                cluster = BasicInformationCluster;
+                attributes = await interactionClient.getMultipleAttributes({
+                    attributes: [{ clusterId: cluster.id }],
+                });
+                this.log.warn(`Cluster: ${cluster.name} attributes:`);
+                attributes.forEach((attribute) => {
+                    this.log.info(
+                    // eslint-disable-next-line max-len
+                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+                });
+                // Log PowerSourceCluster
+                cluster = PowerSourceCluster;
+                attributes = await interactionClient.getMultipleAttributes({
+                    attributes: [{ clusterId: cluster.id }],
+                });
+                this.log.warn(`Cluster: ${cluster.name} attributes:`);
+                attributes.forEach((attribute) => {
+                    this.log.info(
+                    // eslint-disable-next-line max-len
+                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+                });
+                // Log ThreadNetworkDiagnostics
+                cluster = ThreadNetworkDiagnosticsCluster;
+                attributes = await interactionClient.getMultipleAttributes({
+                    attributes: [{ clusterId: cluster.id }],
+                });
+                this.log.warn(`Cluster: ${cluster.name} attributes:`);
+                attributes.forEach((attribute) => {
+                    this.log.info(
+                    // eslint-disable-next-line max-len
+                    `- endpoint: ${attribute.path.endpointId} clusterId: ${attribute.path.clusterId} id: ${attribute.path.attributeId} name: ${attribute.path.attributeName}: ${typeof attribute.value === 'object' ? stringify(attribute.value) : attribute.value}`);
+                });
+            }
         }
         if (this.bridgeMode === 'bridge') {
             // Plugins are loaded by loadPlugin on startup and plugin.loaded is set to true
@@ -1643,9 +1786,24 @@ export class Matterbridge extends EventEmitter {
         this.matterbridgeInformation.rootDirectory = this.rootDirectory;
         this.log.debug(`Root Directory: ${this.rootDirectory}`);
         // Global node_modules directory
+        /*
         this.globalModulesDirectory = await this.getGlobalNodeModules();
         this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
         this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
+        */
+        if (this.nodeContext)
+            this.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
+        this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
+        this.getGlobalNodeModules()
+            .then(async (globalModulesDirectory) => {
+            this.globalModulesDirectory = globalModulesDirectory;
+            this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
+            this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
+            await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
+        })
+            .catch((error) => {
+            this.log.error(`Error getting global node_modules directory: ${error}`);
+        });
         // Create the data directory .matterbridge in the home directory
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
@@ -1699,12 +1857,28 @@ export class Matterbridge extends EventEmitter {
         this.matterbridgeVersion = packageJson.version;
         this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeVersion;
         this.log.debug(`Matterbridge Version: ${this.matterbridgeVersion}`);
+        // Matterbridge latest version
+        /*
         this.matterbridgeLatestVersion = await this.getLatestVersion('matterbridge');
         this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeLatestVersion;
         this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
-        if (this.matterbridgeVersion !== this.matterbridgeLatestVersion) {
-            this.log.warn(`Matterbridge is out of date. Current version: ${this.matterbridgeVersion}, Latest version: ${this.matterbridgeLatestVersion}`);
-        }
+        */
+        if (this.nodeContext)
+            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', '');
+        this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
+        this.getLatestVersion('matterbridge')
+            .then(async (matterbridgeLatestVersion) => {
+            this.matterbridgeLatestVersion = matterbridgeLatestVersion;
+            this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeLatestVersion;
+            this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
+            await this.nodeContext?.set('matterbridgeLatestVersion', this.matterbridgeLatestVersion);
+            if (this.matterbridgeVersion !== this.matterbridgeLatestVersion) {
+                this.log.warn(`Matterbridge is out of date. Current version: ${this.matterbridgeVersion}, Latest version: ${this.matterbridgeLatestVersion}`);
+            }
+        })
+            .catch((error) => {
+            this.log.error(`Error getting Matterbridge latest version: ${error}`);
+        });
         // Current working directory
         const currentDir = process.cwd();
         this.log.debug(`Current Working Directory: ${currentDir}`);
@@ -1876,7 +2050,7 @@ export class Matterbridge extends EventEmitter {
         // Endpoint to receive commands
         this.expressApp.post('/api/command/:command/:param', async (req, res) => {
             const command = req.params.command;
-            const param = req.params.param;
+            let param = req.params.param;
             this.log.debug(`The frontend sent /api/command/${command}/${param}`);
             if (!command) {
                 res.status(400).json({ error: 'No command provided' });
@@ -1912,9 +2086,55 @@ export class Matterbridge extends EventEmitter {
             if (command === 'update') {
                 this.log.warn(`The /api/command/${command} is not yet implemented`);
             }
-            // Handle the command addplugin from Header
+            // Handle the command addplugin from Home C:\Users\lligu\GitHub\matterbridge-example-accessory-platform
             if (command === 'addplugin') {
-                this.log.warn(`The /api/command/${command}/${param} is not yet implemented`);
+                param = param.replace(/\*/g, '\\');
+                if (this.registeredPlugins.find((plugin) => plugin.name === param)) {
+                    this.log.warn(`Plugin ${plg}${param}${wr} already added to matterbridge`);
+                    res.json({ message: 'Command received' });
+                    return;
+                }
+                const packageJsonPath = await this.resolvePluginName(param);
+                if (!packageJsonPath) {
+                    this.log.error(`Error resolving plugin ${plg}${param}${er}`);
+                    res.json({ message: 'Command received' });
+                    return;
+                }
+                this.log.debug(`Loading plugin from ${plg}${packageJsonPath}${db}`);
+                try {
+                    // Load the package.json of the plugin
+                    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+                    const plugin = { path: packageJsonPath, type: '', name: packageJson.name, version: packageJson.version, description: packageJson.description, author: packageJson.author, enabled: true };
+                    if (await this.loadPlugin(plugin)) {
+                        this.registeredPlugins.push(plugin);
+                        await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                        this.log.info(`Plugin ${plg}${packageJsonPath}${nf} type ${plugin.type} added to matterbridge. Restart required.`);
+                    }
+                    else {
+                        this.log.error(`Error adding plugin ${plg}${packageJsonPath}${er}`);
+                    }
+                }
+                catch (error) {
+                    this.log.error(`Error adding plugin ${plg}${packageJsonPath}${er}`);
+                    res.json({ message: 'Command received' });
+                    return;
+                }
+            }
+            // Handle the command removeplugin from Home
+            if (command === 'removeplugin') {
+                const index = this.registeredPlugins.findIndex((registeredPlugin) => registeredPlugin.name === param);
+                if (index !== -1) {
+                    if (this.registeredPlugins[index].platform) {
+                        await this.registeredPlugins[index].platform?.onShutdown('The plugin has been removed.');
+                        await this.savePluginConfig(this.registeredPlugins[index]);
+                    }
+                    this.registeredPlugins.splice(index, 1);
+                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    this.log.info(`Plugin ${plg}${param}${nf} removed from matterbridge`);
+                }
+                else {
+                    this.log.warn(`Plugin ${plg}${param}${wr} not registered in matterbridge`);
+                }
             }
             // Handle the command enableplugin from Home
             if (command === 'enableplugin') {
@@ -1977,10 +2197,12 @@ export class Matterbridge extends EventEmitter {
                 attributes += `Position: ${clusterServer.getCurrentPositionAttribute()} `;
             if (clusterServer.name === 'WindowCovering')
                 attributes += `Cover position: ${clusterServer.attributes.currentPositionLiftPercent100ths.getLocal() / 100}% `;
+            if (clusterServer.name === 'DoorLock')
+                attributes += `State: ${clusterServer.attributes.lockState.getLocal() === 1 ? 'Locked' : 'Not locked'} `;
             if (clusterServer.name === 'LevelControl')
                 attributes += `Level: ${clusterServer.getCurrentLevelAttribute()}% `;
             if (clusterServer.name === 'ColorControl')
-                attributes += `Hue: ${clusterServer.getCurrentHueAttribute()} Saturation: ${clusterServer.getCurrentSaturationAttribute()}% `;
+                attributes += `Hue: ${Math.round(clusterServer.getCurrentHueAttribute())} Saturation: ${Math.round(clusterServer.getCurrentSaturationAttribute())}% `;
             if (clusterServer.name === 'BooleanState')
                 attributes += `Contact: ${clusterServer.getStateValueAttribute()} `;
             if (clusterServer.name === 'OccupancySensing')