matterbridge 1.3.9 → 1.3.10

package/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 
 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.
 
+## [1.3.10] - 2024-07-05
+
+### Added
+
+- [fabrics]: Added fabricInfo to matterbridge in bridge mode and to the plugins in childbridge mode.
+- [sessions]: Added sessionInfo to matterbridge in bridge mode and to the plugins in childbridge mode.
+- [frontend]: Added fabricInfo in bridge mode and in childbridge mode instead of QRCode if already paired.
+- [frontend]: Added sessionInfo in bridge mode and in childbridge mode instead of QRCode if already paired.
+- [matterbridge]: Added parsePlugin to load the updated data from the plugin even when is disabled.
+- [matterbridge]: Added an automatic plugin reinstall from npm when the plugin is not found. (e.g. when the docker image is updated and the plugin is not an official plugin)
+
+### Changed
+
+- [dependencies]: Update dependencies.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.3.9] - 2024-07-02
 
 ### Fixed

package/__mocks__/@project-chip/matter-node.js/util.js

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2022-2024 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ValidationError } from '@project-chip/matter.js/common';
+import { execSync } from 'child_process';
+function getParameter(name) {
+  const commandArguments = process.argv.slice(2);
+  let markerIndex = commandArguments.indexOf(`-${name}`);
+  if (markerIndex === -1) markerIndex = commandArguments.indexOf(`--${name}`);
+  if (markerIndex === -1 || markerIndex + 1 === commandArguments.length) return void 0;
+  return commandArguments[markerIndex + 1];
+}
+function hasParameter(name) {
+  const commandArguments = process.argv.slice(2);
+  let markerIncluded = commandArguments.includes(`-${name}`);
+  if (!markerIncluded) markerIncluded = commandArguments.includes(`--${name}`);
+  return markerIncluded;
+}
+function getIntParameter(name) {
+  const value = getParameter(name);
+  if (value === void 0) return void 0;
+  const intValue = parseInt(value, 10);
+  if (isNaN(intValue)) throw new ValidationError(`Invalid value for parameter ${name}: ${value} is not a number`);
+  return intValue;
+}
+function commandExecutor(scriptParamName) {
+  const script = getParameter(scriptParamName);
+  if (script === void 0) return void 0;
+  // eslint-disable-next-line no-console
+  return () => console.log(`${scriptParamName}: ${execSync(script).toString().slice(0, -1)}`);
+}
+function requireMinNodeVersion(minVersion) {
+  const version = process.versions.node;
+  const versionMajor = parseInt(version.split('.')[0]);
+  if (versionMajor < minVersion) throw new MatterError(`Node version ${versionMajor} is not supported. Please upgrade to ${minVersion} or above.`);
+}
+export { commandExecutor, getIntParameter, getParameter, hasParameter, requireMinNodeVersion };
+export * from '@project-chip/matter.js/util';
+// # sourceMappingURL=CommandLine.js.map

package/dist/matterbridge.d.ts

@@ -25,9 +25,9 @@ import EventEmitter from 'events';
 import { MatterbridgeDevice } from './matterbridgeDevice.js';
 import { MatterbridgePlatform, PlatformConfig, PlatformSchema } from './matterbridgePlatform.js';
 import { CommissioningServer } from '@project-chip/matter-node.js';
+import { FabricIndex, VendorId } from '@project-chip/matter-node.js/datatype';
 import { Aggregator } from '@project-chip/matter-node.js/device';
 import { StorageContext } from '@project-chip/matter-node.js/storage';
-import { ExposedFabricInformation } from '@project-chip/matter-node.js/fabric';
 export interface RegisteredPlugin extends BaseRegisteredPlugin {
     nodeContext?: NodeStorage;
     storageContext?: StorageContext;
@@ -52,7 +52,8 @@ export interface BaseRegisteredPlugin {
     configured?: boolean;
     paired?: boolean;
     connected?: boolean;
-    fabricInfo?: ExposedFabricInformation[];
+    fabricInformations?: SanitizedExposedFabricInformation[];
+    sessionInformations?: SanitizedSessionInformation[];
     registeredDevices?: number;
     addedDevices?: number;
     qrPairingCode?: string;
@@ -84,13 +85,34 @@ interface MatterbridgeInformation {
     globalModulesDirectory: string;
     matterbridgeVersion: string;
     matterbridgeLatestVersion: string;
-    matterbridgeFabricInfo: ExposedFabricInformation[];
+    matterbridgeFabricInformations: SanitizedExposedFabricInformation[];
+    matterbridgeSessionInformations: SanitizedSessionInformation[];
     matterbridgePaired: boolean;
     matterbridgeConnected: boolean;
     bridgeMode: string;
     restartMode: string;
     debugEnabled: boolean;
 }
+interface SanitizedExposedFabricInformation {
+    fabricIndex: FabricIndex;
+    fabricId: string;
+    nodeId: string;
+    rootNodeId: string;
+    rootVendorId: VendorId;
+    rootVendorName: string;
+    label: string;
+}
+interface SanitizedSessionInformation {
+    name: string;
+    nodeId: string;
+    peerNodeId: string;
+    fabric?: SanitizedExposedFabricInformation;
+    isPeerActive: boolean;
+    secure: boolean;
+    lastInteractionTimestamp?: number;
+    lastActiveTimestamp?: number;
+    numberOfActiveSubscriptions: number;
+}
 /**
  * Represents the Matterbridge application.
  */
@@ -104,9 +126,10 @@ export declare class Matterbridge extends EventEmitter {
     globalModulesDirectory: string;
     matterbridgeVersion: string;
     matterbridgeLatestVersion: string;
-    matterbridgeFabricInfo: ExposedFabricInformation[];
+    matterbridgeFabricInformations: SanitizedExposedFabricInformation[];
     matterbridgePaired: boolean;
     matterbridgeConnected: boolean;
+    matterbridgeSessionInformations: SanitizedSessionInformation[];
     private checkUpdateInterval?;
     bridgeMode: 'bridge' | 'childbridge' | 'controller' | '';
     restartMode: 'service' | 'docker' | '';
@@ -143,6 +166,12 @@ export declare class Matterbridge extends EventEmitter {
      * @returns The loaded Matterbridge instance.
      */
     static loadInstance(initialize?: boolean): Promise<Matterbridge>;
+    /**
+     * Call shutdownProcess.
+     * @deprecated This method is deprecated and is only used for jest.
+     *
+     */
+    destroyInstance(): Promise<void>;
     /**
      * Initializes the Matterbridge instance as extension for zigbee2mqtt.
      * @deprecated This method is deprecated and will be removed in a future version.
@@ -181,8 +210,8 @@ export declare class Matterbridge extends EventEmitter {
      * @returns {Promise<void>} A promise that resolves when the command line arguments have been processed.
      */
     private parseCommandLine;
-    savePluginsToStorage(): Promise<void>;
-    loadPluginsFromStorage(): Promise<void>;
+    private savePluginsToStorage;
+    private loadPluginsFromStorage;
     /**
      * Resolves the name of a plugin by loading and parsing its package.json file.
      * @param pluginPath - The path to the plugin or the path to the plugin's package.json file.
@@ -330,6 +359,12 @@ export declare class Matterbridge extends EventEmitter {
      * @returns {Promise<void>} A promise that resolves when the plugin is configured successfully, or rejects with an error if configuration fails.
      */
     private configurePlugin;
+    /**
+     * Loads and parse the plugin package.json and returns it.
+     * @param plugin - The plugin to load the package from.
+     * @returns A Promise that resolves to the package.json object or undefined if the package.json could not be loaded.
+     */
+    private parsePlugin;
     /**
      * Loads a plugin and returns the corresponding MatterbridgePlatform instance.
      * @param plugin - The plugin to load.
@@ -396,6 +431,20 @@ export declare class Matterbridge extends EventEmitter {
      * @returns {Promise<void>} - A promise that resolves when the QR code is shown.
      */
     private showCommissioningQRCode;
+    /**
+     * Sanitizes the fabric information by converting bigint properties to string cause res..
+     *
+     * @param fabricInfo - The array of exposed fabric information objects.
+     * @returns An array of sanitized exposed fabric information objects.
+     */
+    private sanitizeFabricInformations;
+    /**
+     * Sanitizes the session information by converting bigint properties to string.
+     *
+     * @param sessionInfo - The array of session information objects.
+     * @returns An array of sanitized session information objects.
+     */
+    private sanitizeSessionInformation;
     /**
      * Finds a plugin by its name.
      *

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

@@ -79,7 +79,8 @@ export class Matterbridge extends EventEmitter {
         globalModulesDirectory: '',
         matterbridgeVersion: '',
         matterbridgeLatestVersion: '',
-        matterbridgeFabricInfo: [],
+        matterbridgeFabricInformations: [],
+        matterbridgeSessionInformations: [],
         matterbridgePaired: false,
         matterbridgeConnected: false,
         bridgeMode: '',
@@ -93,9 +94,10 @@ export class Matterbridge extends EventEmitter {
     globalModulesDirectory = '';
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
-    matterbridgeFabricInfo = [];
+    matterbridgeFabricInformations = [];
     matterbridgePaired = false;
     matterbridgeConnected = false;
+    matterbridgeSessionInformations = [];
     checkUpdateInterval; // = 24 * 60 * 60 * 1000; // 24 hours
     bridgeMode = '';
     restartMode = '';
@@ -147,6 +149,14 @@ export class Matterbridge extends EventEmitter {
         }
         return Matterbridge.instance;
     }
+    /**
+     * Call shutdownProcess.
+     * @deprecated This method is deprecated and is only used for jest.
+     *
+     */
+    async destroyInstance() {
+        await this.shutdownProcess();
+    }
     /**
      * Initializes the Matterbridge instance as extension for zigbee2mqtt.
      * @deprecated This method is deprecated and will be removed in a future version.
@@ -273,7 +283,7 @@ export class Matterbridge extends EventEmitter {
       - reset:                 remove the commissioning for Matterbridge (bridge mode). Shutdown Matterbridge before using it!
       - factoryreset:          remove all commissioning information and reset all internal storages. Shutdown Matterbridge before using it!
       - list:                  list the registered plugins
-      - loginterfaces:         log the network interfaces
+      - loginterfaces:         log the network interfaces (usefull for finding the name of the interface to use with -mdnsinterface option)
       - logstorage:            log the node storage
       - ssl:                   enable SSL for the frontend and WebSockerServer (certificates in .matterbridge/certs directory cert.pem, key.pem and ca.pem (optional))
       - add [plugin path]:     register the plugin from the given absolute or relative path
@@ -316,6 +326,27 @@ export class Matterbridge extends EventEmitter {
         // Get the plugins from node storage and create the plugin node storage contexts
         this.registeredPlugins = await this.nodeContext.get('plugins', []);
         for (const plugin of this.registeredPlugins) {
+            const packageJson = await this.parsePlugin(plugin);
+            if (packageJson) {
+                // Update the plugin information
+                plugin.name = packageJson.name;
+                plugin.version = packageJson.version;
+                plugin.description = packageJson.description;
+                plugin.author = packageJson.author;
+            }
+            else {
+                this.log.info(`Error parsing plugin ${plg}${plugin.name}${nf}. Trying to reinstall it from npm.`);
+                try {
+                    await this.spawnCommand('npm', ['install', '-g', plugin.name]);
+                    this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
+                    plugin.error = false;
+                }
+                catch (error) {
+                    plugin.error = true;
+                    plugin.enabled = false;
+                    this.log.error(`Error installing plugin ${plg}${plugin.name}${er}. The plugin is disabled.`);
+                }
+            }
             this.log.debug(`Creating node storage context for plugin ${plugin.name}`);
             plugin.nodeContext = await this.nodeStorage.createStorage(plugin.name);
             await plugin.nodeContext.set('name', plugin.name);
@@ -328,7 +359,7 @@ export class Matterbridge extends EventEmitter {
         // Log system info and create .matterbridge directory
         await this.logNodeAndSystemInfo();
         this.log.info(`Matterbridge version ${this.matterbridgeVersion} mode ${hasParameter('bridge') ? 'bridge' : ''}${hasParameter('childbridge') ? 'childbridge' : ''}${hasParameter('controller') ? 'controller' : ''} ` +
-            `${this.restartMode !== '' ? 'restart mode ' + this.restartMode + ' ' : ''}running on ${this.systemInformation.osType} ${this.systemInformation.osRelease} ${this.systemInformation.osPlatform} ${this.systemInformation.osArch}`);
+            `${this.restartMode !== '' ? 'restart mode ' + this.restartMode + ' ' : ''}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
@@ -477,7 +508,8 @@ export class Matterbridge extends EventEmitter {
             process.exit(0);
         }
         // Initialize frontend
-        await this.initializeFrontend(getIntParameter('frontend'));
+        if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
+            await this.initializeFrontend(getIntParameter('frontend'));
         // Check each 60 minutes the latest versions
         this.checkUpdateInterval = setInterval(() => {
             this.getMatterbridgeLatestVersion();
@@ -527,6 +559,14 @@ export class Matterbridge extends EventEmitter {
             for (const plugin of this.registeredPlugins) {
                 plugin.configJson = await this.loadPluginConfig(plugin);
                 plugin.schemaJson = await this.loadPluginSchema(plugin);
+                // Check if the plugin is available
+                if (!(await this.resolvePluginName(plugin.path))) {
+                    this.log.error(`Plugin ${plg}${plugin.name}${er} not found. Disabling it.`);
+                    plugin.enabled = false;
+                    plugin.error = true;
+                    continue;
+                }
+                // Check if the plugin has a new version
                 this.getPluginLatestVersion(plugin);
                 if (!plugin.enabled) {
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
@@ -560,6 +600,14 @@ export class Matterbridge extends EventEmitter {
             for (const plugin of this.registeredPlugins) {
                 plugin.configJson = await this.loadPluginConfig(plugin);
                 plugin.schemaJson = await this.loadPluginSchema(plugin);
+                // Check if the plugin is available
+                if (!(await this.resolvePluginName(plugin.path))) {
+                    this.log.error(`Plugin ${plg}${plugin.name}${er} not found. Disabling it.`);
+                    plugin.enabled = false;
+                    plugin.error = true;
+                    continue;
+                }
+                // Check if the plugin has a new version
                 this.getPluginLatestVersion(plugin);
                 if (!plugin.enabled) {
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
@@ -912,7 +960,7 @@ export class Matterbridge extends EventEmitter {
                 });
                 this.webSocketServer = undefined;
             }
-            setTimeout(async () => {
+            const clenupTimeout1 = setTimeout(async () => {
                 // Closing matter
                 await this.stopMatter();
                 // Closing storage
@@ -943,7 +991,7 @@ export class Matterbridge extends EventEmitter {
                 this.registeredPlugins = [];
                 this.registeredDevices = [];
                 this.log.info('Waiting for matter to deliver last messages...');
-                setTimeout(async () => {
+                const clenupTimeout2 = setTimeout(async () => {
                     if (restart) {
                         if (message === 'updating...') {
                             this.log.info('Cleanup completed. Updating...');
@@ -977,7 +1025,9 @@ export class Matterbridge extends EventEmitter {
                         this.emit('shutdown');
                     }
                 }, 2 * 1000);
+                clenupTimeout2.unref();
             }, 3 * 1000);
+            clenupTimeout1.unref();
         }
     }
     /**
@@ -1460,6 +1510,23 @@ export class Matterbridge extends EventEmitter {
             return Promise.resolve();
         }
     }
+    /**
+     * Loads and parse the plugin package.json and returns it.
+     * @param plugin - The plugin to load the package from.
+     * @returns A Promise that resolves to the package.json object or undefined if the package.json could not be loaded.
+     */
+    async parsePlugin(plugin) {
+        this.log.debug(`Parsing package.json of plugin ${plg}${plugin.name}${nf} type ${typ}${plugin.type}${nf}`);
+        try {
+            const packageJson = JSON.parse(await fs.readFile(plugin.path, 'utf8'));
+            return packageJson;
+        }
+        catch (err) {
+            this.log.error(`Failed to parse plugin ${plg}${plugin.name}${er} package.json: ${err}`);
+            plugin.error = true;
+            return undefined;
+        }
+    }
     /**
      * Loads a plugin and returns the corresponding MatterbridgePlatform instance.
      * @param plugin - The plugin to load.
@@ -1944,12 +2011,21 @@ export class Matterbridge extends EventEmitter {
             const QrCode = new QrCodeSchema();
             this.log.info(`***The commissioning server on port ${commissioningServer.getPort()} for ${plg}${pluginName}${nf} is not commissioned. Pair it scanning the QR code:\n\n` +
                 `${QrCode.encode(qrPairingCode)}\n${plg}${pluginName}${nf}\n\nqrPairingCode: ${qrPairingCode}\n\nManual pairing code: ${manualPairingCode}\n`);
+            if (pluginName === 'Matterbridge') {
+                this.matterbridgeFabricInformations = [];
+                this.matterbridgeSessionInformations = [];
+                this.matterbridgePaired = false;
+                this.matterbridgeConnected = false;
+            }
             if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
                     plugin.qrPairingCode = qrPairingCode;
                     plugin.manualPairingCode = manualPairingCode;
+                    plugin.fabricInformations = [];
+                    plugin.sessionInformations = [];
                     plugin.paired = false;
+                    plugin.connected = false;
                 }
             }
             await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
@@ -1963,19 +2039,71 @@ export class Matterbridge extends EventEmitter {
                 this.log.info(`- fabric index ${zb}${info.fabricIndex}${nf} id ${zb}${info.fabricId}${nf} vendor ${zb}${info.rootVendorId}${nf} ${this.getVendorIdName(info.rootVendorId)} ${info.label}`);
             });
             if (pluginName === 'Matterbridge') {
-                this.matterbridgeFabricInfo = fabricInfo;
+                this.matterbridgeFabricInformations = this.sanitizeFabricInformations(fabricInfo);
+                this.matterbridgeSessionInformations = [];
                 this.matterbridgePaired = true;
             }
             if (pluginName !== 'Matterbridge') {
                 const plugin = this.findPlugin(pluginName);
                 if (plugin) {
-                    plugin.fabricInfo = fabricInfo;
+                    plugin.fabricInformations = this.sanitizeFabricInformations(fabricInfo);
+                    plugin.sessionInformations = [];
                     plugin.paired = true;
                 }
             }
             await this.nodeContext?.set('plugins', await this.getBaseRegisteredPlugins());
         }
     }
+    /**
+     * Sanitizes the fabric information by converting bigint properties to string cause res..
+     *
+     * @param fabricInfo - The array of exposed fabric information objects.
+     * @returns An array of sanitized exposed fabric information objects.
+     */
+    sanitizeFabricInformations(fabricInfo) {
+        return fabricInfo.map((info) => {
+            return {
+                fabricIndex: info.fabricIndex,
+                fabricId: info.fabricId.toString(),
+                nodeId: info.nodeId.toString(),
+                rootNodeId: info.rootNodeId.toString(),
+                rootVendorId: info.rootVendorId,
+                rootVendorName: this.getVendorIdName(info.rootVendorId),
+                label: info.label,
+            };
+        });
+    }
+    /**
+     * Sanitizes the session information by converting bigint properties to string.
+     *
+     * @param sessionInfo - The array of session information objects.
+     * @returns An array of sanitized session information objects.
+     */
+    sanitizeSessionInformation(sessionInfo) {
+        return sessionInfo.map((info) => {
+            return {
+                name: info.name,
+                nodeId: info.nodeId.toString(),
+                peerNodeId: info.peerNodeId.toString(),
+                fabric: info.fabric
+                    ? {
+                        fabricIndex: info.fabric.fabricIndex,
+                        fabricId: info.fabric.fabricId.toString(),
+                        nodeId: info.fabric.nodeId.toString(),
+                        rootNodeId: info.fabric.rootNodeId.toString(),
+                        rootVendorId: info.fabric.rootVendorId,
+                        rootVendorName: this.getVendorIdName(info.fabric.rootVendorId),
+                        label: info.fabric.label,
+                    }
+                    : undefined,
+                isPeerActive: info.isPeerActive,
+                secure: info.secure,
+                lastInteractionTimestamp: info.lastInteractionTimestamp,
+                lastActiveTimestamp: info.lastActiveTimestamp,
+                numberOfActiveSubscriptions: info.numberOfActiveSubscriptions,
+            };
+        });
+    }
     /**
      * Finds a plugin by its name.
      *
@@ -2062,6 +2190,9 @@ export class Matterbridge extends EventEmitter {
             case 4742:
                 vendorName = '(eWeLink)';
                 break;
+            case 65521:
+                vendorName = '(PythonMatterServer)';
+                break;
             default:
                 vendorName = '(unknown)';
                 break;
@@ -2118,9 +2249,9 @@ export class Matterbridge extends EventEmitter {
                 reachable: true,
             },
             activeSessionsChangedCallback: (fabricIndex) => {
-                const info = commissioningServer.getActiveSessionInformation(fabricIndex);
+                const sessionInformations = commissioningServer.getActiveSessionInformation(fabricIndex);
                 let connected = false;
-                info.forEach((session) => {
+                sessionInformations.forEach((session) => {
                     this.log.info(`*Active session changed on fabric ${zb}${fabricIndex}${nf} id ${zb}${session.fabric?.fabricId}${nf} vendor ${zb}${session.fabric?.rootVendorId}${nf} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} for ${plg}${pluginName}${nf}`, debugStringify(session));
                     if (session.isPeerActive === true && session.secure === true && session.numberOfActiveSubscriptions >= 1) {
                         this.log.info(`*Controller ${zb}${session.fabric?.rootVendorId}${nf} ${this.getVendorIdName(session.fabric?.rootVendorId)} ${session.fabric?.label} connected to ${plg}${pluginName}${nf} on session ${session.name}`);
@@ -2131,12 +2262,14 @@ export class Matterbridge extends EventEmitter {
                     if (this.bridgeMode === 'bridge') {
                         this.matterbridgePaired = true;
                         this.matterbridgeConnected = true;
+                        this.matterbridgeSessionInformations = this.sanitizeSessionInformation(sessionInformations);
                     }
                     if (this.bridgeMode === 'childbridge') {
                         const plugin = this.findPlugin(pluginName);
                         if (plugin) {
                             plugin.paired = true;
                             plugin.connected = true;
+                            plugin.sessionInformations = this.sanitizeSessionInformation(sessionInformations);
                         }
                     }
                     setTimeout(() => {
@@ -2179,7 +2312,8 @@ export class Matterbridge extends EventEmitter {
                     await commissioningServer.factoryReset();
                     if (pluginName === 'Matterbridge') {
                         await this.matterbridgeContext?.clearAll();
-                        this.matterbridgeFabricInfo = [];
+                        this.matterbridgeFabricInformations = [];
+                        this.matterbridgeSessionInformations = [];
                         this.matterbridgePaired = false;
                         this.matterbridgeConnected = false;
                     }
@@ -2187,14 +2321,29 @@ export class Matterbridge extends EventEmitter {
                         for (const plugin of this.registeredPlugins) {
                             if (plugin.name === pluginName) {
                                 await plugin.platform?.onShutdown('Commissioning removed by the controller');
-                                plugin.fabricInfo = [];
+                                plugin.fabricInformations = [];
+                                plugin.sessionInformations = [];
                                 plugin.paired = false;
                                 plugin.connected = false;
                                 await plugin.storageContext?.clearAll();
                             }
                         }
                     }
-                    this.log.warn(`*Restart to activate the pairing for ${plg}${pluginName}${wr}`);
+                    this.log.warn(`*Restart to activate the pairing for ${plg}${pluginName}${wr}.`);
+                }
+                else {
+                    const fabricInfo = commissioningServer.getCommissionedFabricInformation();
+                    if (pluginName === 'Matterbridge') {
+                        this.matterbridgeFabricInformations = this.sanitizeFabricInformations(fabricInfo);
+                        this.matterbridgePaired = true;
+                    }
+                    else {
+                        const plugin = this.findPlugin(pluginName);
+                        if (plugin) {
+                            plugin.fabricInformations = this.sanitizeFabricInformations(fabricInfo);
+                            plugin.paired = true;
+                        }
+                    }
                 }
             },
         });
@@ -2549,7 +2698,8 @@ export class Matterbridge extends EventEmitter {
                 configured: plugin.configured,
                 paired: plugin.paired,
                 connected: plugin.connected,
-                // fabricInfo: plugin.fabricInfo,
+                fabricInformations: plugin.fabricInformations,
+                sessionInformations: plugin.sessionInformations,
                 registeredDevices: plugin.registeredDevices,
                 addedDevices: plugin.addedDevices,
                 qrPairingCode: plugin.qrPairingCode,
@@ -2773,43 +2923,6 @@ export class Matterbridge extends EventEmitter {
         this.webSocketServer.on('error', (ws, error) => {
             this.log.error(`WebSocketServer error: ${error}`);
         });
-        /*
-        // Create a WebSocket server
-        const wssPort = 8284;
-        const wssHost = `ws://${this.systemInformation.ipv4Address}:${wssPort}`;
-        this.webSocketServer = new WebSocketServer({ port: wssPort, host: this.systemInformation.ipv4Address });
-        this.log.debug(`WebSocket server created on ${UNDERLINE}${wssHost}${UNDERLINEOFF}${rs}`);
-    
-        this.webSocketServer.on('listening', () => {
-          this.log.info(`WebSocketServer is listening on ${UNDERLINE}${wssHost}${UNDERLINEOFF}${rs}`);
-          return;
-        });
-        */
-        /*
-        // Serve React build directory
-        this.expressApp = express();
-        this.expressApp.use(express.static(path.join(this.rootDirectory, 'frontend/build')));
-    
-        // Listen on HTTP
-        this.expressServer = this.expressApp.listen(port, () => {
-          this.log.info(`The frontend is listening on ${UNDERLINE}http://${this.systemInformation.ipv4Address}:${port}${UNDERLINEOFF}${rs}`);
-          this.log.debug(`The frontend is listening on ${UNDERLINE}http://[${this.systemInformation.ipv6Address}]:${port}${UNDERLINEOFF}${rs}`);
-        });
-    
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        this.expressServer.on('error', (error: any) => {
-          this.log.error(`Frontend error listening on ${UNDERLINE}http://${this.systemInformation.ipv4Address}:${port}${UNDERLINEOFF}${rs}`);
-          switch (error.code) {
-            case 'EACCES':
-              this.log.error(`Port ${port} requires elevated privileges`);
-              break;
-            case 'EADDRINUSE':
-              this.log.error(`Port ${port} is already in use`);
-              break;
-          }
-          process.exit(1);
-        });
-        */
         // Endpoint to validate login code
         this.expressApp.post('/api/login', express.json(), async (req, res) => {
             const { password } = req.body;
@@ -2858,7 +2971,8 @@ export class Matterbridge extends EventEmitter {
             this.matterbridgeInformation.debugEnabled = this.debugEnabled;
             this.matterbridgeInformation.matterbridgePaired = this.matterbridgePaired;
             this.matterbridgeInformation.matterbridgeConnected = this.matterbridgeConnected;
-            // this.matterbridgeInformation.matterbridgeFabricInfo = this.matterbridgeFabricInfo;
+            this.matterbridgeInformation.matterbridgeFabricInformations = this.matterbridgeFabricInformations;
+            this.matterbridgeInformation.matterbridgeSessionInformations = this.matterbridgeSessionInformations;
             const response = { wssHost, qrPairingCode, manualPairingCode, systemInformation: this.systemInformation, matterbridgeInformation: this.matterbridgeInformation };
             // this.log.debug('Response:', debugStringify(response));
             res.json(response);