matterbridge 1.1.9 → 1.1.10

package/CHANGELOG.md

@@ -2,11 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.10] - 2024-03-15
+
+### Added
+
+- [matterbridge]: added unregisterAllDevices() to the platforms 
+- [matterbridge]: added unregisterDevice(device: MatterbridgeDevice) to the platforms
+- [frontend]: Enable and disable plugin are now available. Restart Matteerbridge after.
+- [frontend]: Frontend got updated to 0.8.2.
+
 ## [1.1.9] - 2024-03-15
 
 ### Added
 
+- [frontend]: Selecting a plugin in the home page show the corresponding QR code.
 - [frontend]: Settings page now controll the global logger level.
+- [frontend]: Restart from the header is available.
 - [frontend]: Frontend got updated to 0.8.1.
 
 ## [1.1.8] - 2024-03-15

package/README.md

@@ -174,21 +174,37 @@ The easiest way is to clone:
 
 Then change the name, version, description and author in the package.json.
 
-Add your plugin logic in platform.ts:
+Add your plugin logic in platform.ts.
 
-### onStart(reason?: string)
+## MatterbridgeDynamicPlatform and MatterbridgeAccessoryPlatform api
+
+### async onStart(reason?: string)
 The method onStart() is where you have to create your MatterbridgeDevice and add all needed clusters and command handlers. 
 
 The MatterbridgeDevice class has the create cluster methods already done and all command handlers needed (see plugin examples).
 
 The method is called when Matterbridge load the plugin.
 
-### onConfigure()
+### async onConfigure()
 The method onConfigure() is where you can configure or initialize your device. 
 
 The method is called when the platform is commissioned.
 
-### onShutdown(reason?: string)
+### async onShutdown(reason?: string)
 The method onShutdown() is where you have to eventually cleanup some resources. 
 
 The method is called when Matterbridge is shutting down.
+
+### async registerDevice(device: MatterbridgeDevice)
+After you created your device, add it to the platform.
+
+### async unregisterDevice(device: MatterbridgeDevice)
+You can unregister one or more device.
+
+### async unregisterAllDevices()
+You can unregister all devices you added.
+
+It can me be useful to call this method from onShutdown if you don't want to keep all the devices.
+
+## MatterbridgeDevice api
+

package/dist/cli.js

@@ -21,17 +21,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. *
  */
+/* eslint-disable no-console */
+//import wtf from 'wtfnode';
 import { Matterbridge } from './matterbridge.js';
+let instance;
 async function main() {
-    // eslint-disable-next-line no-console
     console.log('CLI: Matterbridge.loadInstance() called');
-    await Matterbridge.loadInstance(true);
-    // eslint-disable-next-line no-console
+    instance = await Matterbridge.loadInstance(true);
+    registerHandlers();
     console.log('CLI: Matterbridge.loadInstance() exited');
 }
+function registerHandlers() {
+    instance.on('shutdown', async () => shutdown());
+    instance.on('restart', async () => restart());
+}
+async function shutdown() {
+    console.log('CLI: received shutdown event, exiting...');
+    //wtf.dump();
+    process.exit(0);
+}
+async function restart() {
+    console.log('CLI: received restart event, loading...');
+    //wtf.dump();
+    instance = await Matterbridge.loadInstance(true);
+    registerHandlers();
+}
 process.title = 'matterbridge';
 main().catch((error) => {
-    // eslint-disable-next-line no-console
     console.error(`CLI: Matterbridge.loadInstance() failed with error: ${error}`);
 });
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACvD,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC;AAED,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC;AAE/B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,sCAAsC;IACtC,OAAO,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,+BAA+B;AAC/B,4BAA4B;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,IAAI,QAAkC,CAAC;AAEvC,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACvD,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjD,gBAAgB,EAAE,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,gBAAgB;IACvB,QAAS,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,QAAS,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,QAAQ;IACrB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IACxD,aAAa;IACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,OAAO;IACpB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACvD,aAAa;IACb,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjD,gBAAgB,EAAE,CAAC;AACrB,CAAC;AAED,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC;AAE/B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC"}

package/dist/matterbridge.d.ts

@@ -20,7 +20,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. *
  */
+/// <reference types="node" resolution-mode="require"/>
 import { MatterbridgeDevice } from './matterbridgeDevice.js';
+import EventEmitter from 'events';
 interface SystemInformation {
     ipv4Address: string;
     ipv6Address: string;
@@ -37,7 +39,7 @@ interface SystemInformation {
 /**
  * Represents the Matterbridge application.
  */
-export declare class Matterbridge {
+export declare class Matterbridge extends EventEmitter {
     systemInformation: SystemInformation;
     homeDirectory: string;
     rootDirectory: string;
@@ -82,6 +84,13 @@ export declare class Matterbridge {
      * @returns A Promise that resolves when the initialization is complete.
      */
     initialize(): Promise<void>;
+    /**
+     * Spawns a child process with the given command and arguments.
+     * @param command - The command to execute.
+     * @param args - The arguments to pass to the command (default: []).
+     * @returns A promise that resolves when the child process exits successfully, or rejects if there is an error.
+     */
+    private spawnCommand;
     /**
      * Parses the command line arguments and performs the corresponding actions.
      * @private
@@ -131,6 +140,14 @@ export declare class Matterbridge {
      * @returns {Promise<void>} - A promise that resolves when the storage process is started.
      */
     addBridgedDevice(pluginName: string, device: MatterbridgeDevice): Promise<void>;
+    removeBridgedDevice(pluginName: string, device: MatterbridgeDevice): Promise<void>;
+    /**
+     * Removes all bridged devices associated with a specific plugin.
+     *
+     * @param pluginName - The name of the plugin.
+     * @returns A promise that resolves when all devices have been removed.
+     */
+    removeAllBridgedDevices(pluginName: string): Promise<void>;
     /**
      * Starts the storage process based on the specified storage type and name.
      * @param {string} storageType - The type of storage to start (e.g., 'disk', 'json').
@@ -241,6 +258,11 @@ export declare class Matterbridge {
      * @returns A Promise that resolves to the latest version of the package.
      */
     private getLatestVersion;
+    /**
+     * Retrieves the path to the global Node.js modules directory.
+     * @returns A promise that resolves to the path of the global Node.js modules directory.
+     */
+    private getGlobalNodeModules;
     /**
      * Logs the node and system information.
      */

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

@@ -25,7 +25,8 @@ import { NodeStorageManager } from 'node-persist-manager';
 import { AnsiLogger, BRIGHT, RESET, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, stringify, er, nf, rs, wr } from 'node-ansi-logger';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { promises as fs } from 'fs';
-import { exec, execSync } from 'child_process';
+import { exec, spawn } from 'child_process';
+import EventEmitter from 'events';
 import express from 'express';
 import os from 'os';
 import path from 'path';
@@ -44,7 +45,7 @@ const typ = '\u001B[38;5;207m';
 /**
  * Represents the Matterbridge application.
  */
-export class Matterbridge {
+export class Matterbridge extends EventEmitter {
     systemInformation = {
         ipv4Address: '',
         ipv6Address: '',
@@ -84,6 +85,7 @@ export class Matterbridge {
     commissioningController;
     static instance;
     constructor() {
+        super();
         // We load asyncronously
     }
     /**
@@ -116,6 +118,10 @@ export class Matterbridge {
      * @returns A Promise that resolves when the initialization is complete.
      */
     async initialize() {
+        /*
+        const wtf = await import('wtfnode');
+        wtf.dump();
+        */
         // Display the help
         if (hasParameter('help')) {
             // eslint-disable-next-line no-console
@@ -173,6 +179,43 @@ export class Matterbridge {
         // Parse command line
         this.parseCommandLine();
     }
+    /**
+     * Spawns a child process with the given command and arguments.
+     * @param command - The command to execute.
+     * @param args - The arguments to pass to the command (default: []).
+     * @returns A promise that resolves when the child process exits successfully, or rejects if there is an error.
+     */
+    async spawnCommand(command, args = []) {
+        /*
+        npm > npm.cmd on windows
+        */
+        return new Promise((resolve, reject) => {
+            const childProcess = spawn(command, args, {
+                stdio: 'inherit',
+            });
+            childProcess.on('error', (err) => {
+                this.log.error(`Failed to start child process: ${err.message}`);
+                reject(err); // Reject the promise on error
+            });
+            childProcess.on('close', (code) => {
+                if (code === 0) {
+                    this.log.info(`Child process stdio streams have closed with code ${code}`);
+                    resolve();
+                }
+                else {
+                    this.log.error(`Child process stdio streams have closed with code ${code}`);
+                    reject(new Error(`Process exited with code ${code}`));
+                }
+            });
+            // The 'exit' event might be redundant here since 'close' is also being handled
+            childProcess.on('exit', (code, signal) => {
+                this.log.info(`Child process exited with code ${code} and signal ${signal}`);
+            });
+            childProcess.on('disconnect', () => {
+                this.log.info('Child process has been disconnected from the parent');
+            });
+        });
+    }
     /**
      * Parses the command line arguments and performs the corresponding actions.
      * @private
@@ -191,26 +234,31 @@ export class Matterbridge {
                     this.log.info(`│ └─ ${db}${plugin.path}${db}`);
                 }
             });
+            this.emit('shutdown');
             process.exit(0);
         }
         if (getParameter('add')) {
             this.log.debug(`Registering plugin ${getParameter('add')}`);
             await this.executeCommandLine(getParameter('add'), 'add');
+            this.emit('shutdown');
             process.exit(0);
         }
         if (getParameter('remove')) {
             this.log.debug(`Unregistering plugin ${getParameter('remove')}`);
             await this.executeCommandLine(getParameter('remove'), 'remove');
+            this.emit('shutdown');
             process.exit(0);
         }
         if (getParameter('enable')) {
             this.log.debug(`Enable plugin ${getParameter('enable')}`);
             await this.executeCommandLine(getParameter('enable'), 'enable');
+            this.emit('shutdown');
             process.exit(0);
         }
         if (getParameter('disable')) {
             this.log.debug(`Disable plugin ${getParameter('disable')}`);
             await this.executeCommandLine(getParameter('disable'), 'disable');
+            this.emit('shutdown');
             process.exit(0);
         }
         // Start the storage (we need it now for frontend and later for matterbridge)
@@ -228,8 +276,10 @@ export class Matterbridge {
             this.bridgeMode = 'bridge';
             MatterbridgeDevice.bridgeMode = 'bridge';
             for (const plugin of this.registeredPlugins) {
-                if (!plugin.enabled)
+                if (!plugin.enabled) {
+                    this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
                     continue;
+                }
                 plugin.loaded = false;
                 plugin.started = false;
                 plugin.configured = false;
@@ -244,8 +294,10 @@ export class Matterbridge {
             this.bridgeMode = 'childbridge';
             MatterbridgeDevice.bridgeMode = 'childbridge';
             for (const plugin of this.registeredPlugins) {
-                if (!plugin.enabled)
+                if (!plugin.enabled) {
+                    this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
                     continue;
+                }
                 plugin.loaded = false;
                 plugin.started = false;
                 plugin.configured = false;
@@ -384,7 +436,7 @@ export class Matterbridge {
     async restartProcess() {
         //this.log.info('Restarting still not implemented');
         //return;
-        await this.cleanup('Matterbridge is restarting...', true);
+        await this.cleanup('restarting...', true);
         this.hasCleanupStarted = false;
     }
     /**
@@ -429,7 +481,7 @@ export class Matterbridge {
                 this.expressApp.removeAllListeners();
                 this.expressApp = undefined;
             }
-            setTimeout(async () => {
+            const cleanupTimeout1 = setTimeout(async () => {
                 // Closing matter
                 await this.stopMatter();
                 // Closing storage
@@ -453,15 +505,21 @@ export class Matterbridge {
                 }
                 this.registeredPlugins = [];
                 this.registeredDevices = [];
-                setTimeout(async () => {
-                    this.log.info('Cleanup completed.');
-                    //if (restart) console.log(this);
-                    if (restart)
-                        await this.initialize();
-                    else
-                        process.exit(0);
+                const cleanupTimeout2 = setTimeout(async () => {
+                    if (restart) {
+                        this.log.info('Cleanup completed. Restarting...');
+                        Matterbridge.instance = undefined;
+                        this.emit('restart');
+                    }
+                    else {
+                        this.log.info('Cleanup completed. Shutting down...');
+                        Matterbridge.instance = undefined;
+                        this.emit('shutdown');
+                    }
                 }, 2 * 1000);
+                cleanupTimeout2.unref();
             }, 3 * 1000);
+            cleanupTimeout1.unref();
         }
     }
     /**
@@ -486,14 +544,14 @@ export class Matterbridge {
      */
     async addDevice(pluginName, device) {
         if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Adding device ${dev}${device.name}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            this.log.error(`Adding device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
             return;
         }
-        this.log.debug(`Adding device ${dev}${device.name}${db} for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Adding device ${dev}${device.name}-${device.deviceName}${db} for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
-            this.log.error(`Error adding device ${dev}${device.name}${er} plugin ${plg}${pluginName}${er} not found`);
+            this.log.error(`Error adding device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
             return;
         }
         // Register and add the device to matterbridge aggregator in bridge mode
@@ -504,14 +562,14 @@ export class Matterbridge {
                 plugin.registeredDevices++;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices++;
-            this.log.info(`Added and registered device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Added and registered device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered device ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered device ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
         }
     }
     /**
@@ -522,14 +580,14 @@ export class Matterbridge {
      */
     async addBridgedDevice(pluginName, device) {
         if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
-            this.log.error(`Adding bridged device ${dev}${device.name}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            this.log.error(`Adding bridged device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
             return;
         }
-        this.log.debug(`Adding bridged device ${db}${device.name}${nf} for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Adding bridged device ${db}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${db}`);
         // Check if the plugin is registered
         const plugin = this.registeredPlugins.find((plugin) => plugin.name === pluginName);
         if (!plugin) {
-            this.log.error(`Error adding bridged device ${dev}${device.name}${er} plugin ${plg}${pluginName}${er} not found`);
+            this.log.error(`Error adding bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
             return;
         }
         // Register and add the device to matterbridge aggregator in bridge mode
@@ -540,14 +598,92 @@ export class Matterbridge {
                 plugin.registeredDevices++;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices++;
-            this.log.info(`Added and registered bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Added and registered bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
         }
         // Only register the device in childbridge mode
         if (this.bridgeMode === 'childbridge') {
             this.registeredDevices.push({ plugin: pluginName, device, added: false });
             if (plugin.registeredDevices !== undefined)
                 plugin.registeredDevices++;
-            this.log.info(`Registered bridged device ${dev}${device.name}${nf} for plugin ${plg}${pluginName}${nf}`);
+            this.log.info(`Registered bridged device ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+        }
+    }
+    async removeBridgedDevice(pluginName, device) {
+        if (this.bridgeMode === 'bridge' && !this.matterAggregator) {
+            this.log.error(`Removing bridged device ${dev}${device.name}-${device.deviceName}${er} for plugin ${plg}${pluginName}${er} error: matterAggregator not found`);
+            return;
+        }
+        this.log.debug(`Removing bridged device ${db}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${db}`);
+        // Check if the plugin is registered
+        const plugin = this.findPlugin(pluginName);
+        if (!plugin) {
+            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not found`);
+            return;
+        }
+        if (this.bridgeMode === 'childbridge' && !plugin.aggregator) {
+            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} aggregator not found`);
+            return;
+        }
+        if (this.bridgeMode === 'childbridge' && !plugin.connected) {
+            this.log.error(`Error removing bridged device ${dev}${device.name}-${device.deviceName}${er} plugin ${plg}${pluginName}${er} not connected`);
+            return;
+        }
+        // Register and add the device to matterbridge aggregator in bridge mode
+        if (this.bridgeMode === 'bridge') {
+            this.matterAggregator.removeBridgedDevice(device);
+            this.registeredDevices.forEach((registeredDevice, index) => {
+                if (registeredDevice.device === device) {
+                    this.registeredDevices.splice(index, 1);
+                    return;
+                }
+            });
+            if (plugin.registeredDevices !== undefined)
+                plugin.registeredDevices--;
+            if (plugin.addedDevices !== undefined)
+                plugin.addedDevices--;
+            this.log.info(`Rmoved bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+        }
+        // Only register the device in childbridge mode
+        if (this.bridgeMode === 'childbridge') {
+            if (plugin.type === 'AccessoryPlatform') {
+                this.log.warn(`Removing bridged device ${dev}${device.name}-${device.deviceName}${wr} for plugin ${plg}${pluginName}${wr} error: AccessoryPlatform not supported in childbridge mode`);
+            }
+            else if (plugin.type === 'DynamicPlatform') {
+                this.registeredDevices.forEach((registeredDevice, index) => {
+                    if (registeredDevice.device === device) {
+                        this.registeredDevices.splice(index, 1);
+                        return;
+                    }
+                });
+                plugin.aggregator.removeBridgedDevice(device);
+            }
+            if (plugin.registeredDevices !== undefined)
+                plugin.registeredDevices--;
+            if (plugin.addedDevices !== undefined)
+                plugin.addedDevices--;
+            this.log.info(`Removed bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${device.name}-${device.deviceName}${nf} for plugin ${plg}${pluginName}${nf}`);
+        }
+    }
+    /**
+     * Removes all bridged devices associated with a specific plugin.
+     *
+     * @param pluginName - The name of the plugin.
+     * @returns A promise that resolves when all devices have been removed.
+     */
+    async removeAllBridgedDevices(pluginName) {
+        const plugin = this.findPlugin(pluginName);
+        if (this.bridgeMode === 'childbridge' && plugin?.type === 'AccessoryPlatform') {
+            this.log.warn(`Removing devices for plugin ${plg}${pluginName}${wr} error: AccessoryPlatform not supported in childbridge mode`);
+            return;
+        }
+        const devicesToRemove = [];
+        for (const registeredDevice of this.registeredDevices) {
+            if (registeredDevice.plugin === pluginName) {
+                devicesToRemove.push(registeredDevice);
+            }
+        }
+        for (const registeredDevice of devicesToRemove) {
+            this.removeBridgedDevice(pluginName, registeredDevice.device);
         }
     }
     /**
@@ -846,10 +982,6 @@ export class Matterbridge {
                             .forEach((registeredDevice) => {
                             if (!plugin.storageContext)
                                 plugin.storageContext = this.importCommissioningServerContext(plugin.name, registeredDevice.device);
-                            if (!plugin.storageContext) {
-                                this.log.error(`Error importing storage context for plugin ${plg}${plugin.name}${er}`);
-                                return;
-                            }
                             if (!plugin.commissioningServer)
                                 plugin.commissioningServer = this.createCommisioningServer(plugin.storageContext, plugin.name);
                             this.log.debug(`Adding device ${dev}${registeredDevice.device.name}${db} to commissioning server for plugin ${plg}${plugin.name}${db}`);
@@ -860,10 +992,6 @@ export class Matterbridge {
                     }
                     if (plugin.type === 'DynamicPlatform') {
                         plugin.storageContext = this.createCommissioningServerContext(plugin.name, 'Matterbridge Dynamic Platform', DeviceTypes.AGGREGATOR.code, 0xfff1, 'Matterbridge', 0x8000, 'Dynamic Platform');
-                        if (!plugin.storageContext) {
-                            this.log.error(`Error creating storage context for plugin ${plg}${plugin.name}${er}`);
-                            return;
-                        }
                         plugin.commissioningServer = this.createCommisioningServer(plugin.storageContext, plugin.name);
                         this.log.debug(`Creating aggregator for plugin ${plg}${plugin.name}${db}`);
                         plugin.aggregator = this.createMatterAggregator(plugin.storageContext); // Generate serialNumber and uniqueId
@@ -1130,7 +1258,7 @@ export class Matterbridge {
                             if (plugin && plugin.type === 'DynamicPlatform' && plugin.configured !== true) {
                                 for (const registeredDevice of this.registeredDevices) {
                                     if (registeredDevice.plugin === name) {
-                                        this.log.info(`Adding bridged device ${dev}${registeredDevice.device.name}${nf} to aggregator for plugin ${plg}${plugin.name}${db}`);
+                                        this.log.info(`Adding bridged device ${dev}${registeredDevice.device.name}-${registeredDevice.device.deviceName}${nf} to aggregator for plugin ${plg}${plugin.name}${db}`);
                                         if (!plugin.aggregator) {
                                             this.log.error(`****Aggregator not found for plugin ${plg}${plugin.name}${er}`);
                                             continue;
@@ -1138,7 +1266,9 @@ export class Matterbridge {
                                         plugin.aggregator.addBridgedDevice(registeredDevice.device);
                                         if (plugin.addedDevices !== undefined)
                                             plugin.addedDevices++;
-                                        this.log.info(`Added bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${registeredDevice.device.name}${nf} for plugin ${plg}${plugin.name}${nf}`);
+                                        this.log.info(
+                                        // eslint-disable-next-line max-len
+                                        `Added bridged device(${plugin.registeredDevices}/${plugin.addedDevices}) ${dev}${registeredDevice.device.name}-${registeredDevice.device.deviceName}${nf} for plugin ${plg}${plugin.name}${nf}`);
                                         registeredDevice.added = true;
                                     }
                                 }
@@ -1244,6 +1374,22 @@ export class Matterbridge {
             });
         });
     }
+    /**
+     * Retrieves the path to the global Node.js modules directory.
+     * @returns A promise that resolves to the path of the global Node.js modules directory.
+     */
+    async getGlobalNodeModules() {
+        return new Promise((resolve, reject) => {
+            exec('npm root -g', (error, stdout) => {
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve(stdout.trim());
+                }
+            });
+        });
+    }
     /**
      * Logs the node and system information.
      */
@@ -1304,7 +1450,7 @@ export class Matterbridge {
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
         this.log.debug(`Root Directory: ${this.rootDirectory}`);
         // Global node_modules directory
-        this.globalModulesDir = execSync('npm root -g').toString().trim();
+        this.globalModulesDir = await this.getGlobalNodeModules();
         this.log.debug(`Global node_modules Directory: ${this.globalModulesDir}`);
         // Create the data directory .matterbridge in the home directory
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
@@ -1513,7 +1659,7 @@ export class Matterbridge {
             res.json(data);
         });
         // Endpoint to receive commands
-        this.expressApp.post('/api/command/:command/:param', (req, res) => {
+        this.expressApp.post('/api/command/:command/:param', async (req, res) => {
             const command = req.params.command;
             const param = req.params.param;
             this.log.debug(`The frontend sent /api/command/${command}/${param}`);
@@ -1522,7 +1668,7 @@ export class Matterbridge {
                 return;
             }
             this.log.info(`***Received command: ${command}:${param}`);
-            // Handle the command debugLevel
+            // Handle the command debugLevel from Settings
             if (command === 'setloglevel') {
                 if (param === 'Debug') {
                     this.log.setLogDebug(true);
@@ -1543,10 +1689,44 @@ export class Matterbridge {
                     plugin.platform?.log.setLogDebug(this.debugEnabled);
                 });
             }
-            // Handle the command debugLevel
+            // Handle the command debugLevel from Header
             if (command === 'restart') {
                 this.restartProcess();
             }
+            // Handle the command update from Header
+            if (command === 'update') {
+                this.log.warn(`The /api/command/${command} is not yet implemented`);
+            }
+            // Handle the command addplugin from Header
+            if (command === 'addplugin') {
+                this.log.warn(`The /api/command/${command}/${param} is not yet implemented`);
+            }
+            // Handle the command enableplugin from Home
+            if (command === 'enableplugin') {
+                const plugin = this.findPlugin(param);
+                if (plugin) {
+                    plugin.enabled = true;
+                    plugin.loaded = undefined;
+                    plugin.started = undefined;
+                    plugin.configured = undefined;
+                    plugin.connected = undefined;
+                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    this.log.info(`Enabled plugin ${plg}${param}${nf}`);
+                }
+            }
+            // Handle the command disableplugin from Home
+            if (command === 'disableplugin') {
+                const plugin = this.findPlugin(param);
+                if (plugin) {
+                    plugin.enabled = false;
+                    plugin.loaded = undefined;
+                    plugin.started = undefined;
+                    plugin.configured = undefined;
+                    plugin.connected = undefined;
+                    await this.nodeContext?.set('plugins', this.getBaseRegisteredPlugins());
+                    this.log.info(`Disabled plugin ${plg}${param}${nf}`);
+                }
+            }
             res.json({ message: 'Command received' });
         });
         // Fallback for routing