matterbridge 3.1.3-dev-20250712-616f7ed → 3.1.3-dev-20250714-c9b85b3

package/CHANGELOG.md

@@ -8,7 +8,7 @@ If you like this project and find it useful, please consider giving it a star on
   <img src="bmc-button.svg" alt="Buy me a coffee" width="120">
 </a>
 
-## [3.1.3] - 2025-07-11
+## [3.1.3] - 2025-07-13
 
 ### Development Breaking Changes
 
@@ -27,6 +27,12 @@ If you like this project and find it useful, please consider giving it a star on
 
 - [package]: Updated dependencies.
 - [vendorId]: Added Shortcut Labs Flic (0x1488).
+- [server]: Refactored serverNode event handlers and types.
+- [matterbridge]: Removed duplicated properties.
+
+### Fixed
+
+- [shutdown]: Fixed error messages from frontend when Matterbridge is shutting down.
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">

package/README.md

@@ -376,6 +376,14 @@ AEG RX 9 / Electrolux Pure i9 robot vacuum plugin for Matterbridge.
 
 A Matterbridge plugin for Airthings air quality monitors via the Airthings Consumer API.
 
+### [Daikin AC](https://github.com/andrasg/matterbridge-daikin-ac)
+
+The plugin uses local connection to Daikin Wifi modules. The plugin does not work with Daikin cloud (Onecta) connected devices.
+
+### [Roborock](https://github.com/RinDevJunior/matterbridge-roborock-vacuum-plugin)
+
+Matterbridge Roborock Platform Plugin is a dynamic platform plugin for Matterbridge that integrates Roborock vacuums into the Matter ecosystem, enabling control via Apple Home and other Matter-compatible apps.
+
 ## How to install and add a plugin with the frontend (best option)
 
 Just open the frontend on the link provided in the log, select a plugin and click install.

package/dist/frontend.js

@@ -572,6 +572,7 @@ export class Frontend extends EventEmitter {
         this.matterbridge.systemInformation.heapUsed = this.formatMemoryUsage(process.memoryUsage().heapUsed);
         this.matterbridge.matterbridgeInformation.bridgeMode = this.matterbridge.bridgeMode;
         this.matterbridge.matterbridgeInformation.restartMode = this.matterbridge.restartMode;
+        this.matterbridge.matterbridgeInformation.profile = this.matterbridge.profile;
         this.matterbridge.matterbridgeInformation.loggerLevel = this.matterbridge.log.logLevel;
         this.matterbridge.matterbridgeInformation.matterLoggerLevel = Logger.defaultLogLevel;
         this.matterbridge.matterbridgeInformation.mattermdnsinterface = this.matterbridge.mdnsInterface;
@@ -580,12 +581,13 @@ export class Frontend extends EventEmitter {
         this.matterbridge.matterbridgeInformation.matterPort = (await this.matterbridge.nodeContext?.get('matterport', 5540)) ?? 5540;
         this.matterbridge.matterbridgeInformation.matterDiscriminator = await this.matterbridge.nodeContext?.get('matterdiscriminator');
         this.matterbridge.matterbridgeInformation.matterPasscode = await this.matterbridge.nodeContext?.get('matterpasscode');
-        this.matterbridge.matterbridgeInformation.matterbridgePaired = this.matterbridge.matterbridgePaired;
-        this.matterbridge.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridge.matterbridgeQrPairingCode;
-        this.matterbridge.matterbridgeInformation.matterbridgeManualPairingCode = this.matterbridge.matterbridgeManualPairingCode;
-        this.matterbridge.matterbridgeInformation.matterbridgeFabricInformations = this.matterbridge.matterbridgeFabricInformations;
-        this.matterbridge.matterbridgeInformation.matterbridgeSessionInformations = this.matterbridge.matterbridgeSessionInformations;
-        this.matterbridge.matterbridgeInformation.profile = this.matterbridge.profile;
+        if (this.matterbridge.bridgeMode === 'bridge' && this.matterbridge.serverNode) {
+            this.matterbridge.matterbridgeInformation.matterbridgePaired = this.matterbridge.serverNode.state.commissioning.commissioned;
+            this.matterbridge.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.qrPairingCode;
+            this.matterbridge.matterbridgeInformation.matterbridgeManualPairingCode = this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : this.matterbridge.serverNode.state.commissioning.pairingCodes.manualPairingCode;
+            this.matterbridge.matterbridgeInformation.matterbridgeFabricInformations = this.matterbridge.sanitizeFabricInformations(Object.values(this.matterbridge.serverNode.state.commissioning.fabrics));
+            this.matterbridge.matterbridgeInformation.matterbridgeSessionInformations = this.matterbridge.sanitizeSessionInformation(Object.values(this.matterbridge.serverNode.state.sessions.sessions));
+        }
         return { systemInformation: this.matterbridge.systemInformation, matterbridgeInformation: this.matterbridge.matterbridgeInformation };
     }
     getReachability(device) {
@@ -748,6 +750,8 @@ export class Frontend extends EventEmitter {
         return attributes.trimStart().trimEnd();
     }
     getBaseRegisteredPlugins() {
+        if (this.matterbridge.hasCleanupStarted)
+            return [];
         const baseRegisteredPlugins = [];
         for (const plugin of this.matterbridge.plugins) {
             baseRegisteredPlugins.push({
@@ -769,23 +773,25 @@ export class Frontend extends EventEmitter {
                 loaded: plugin.loaded,
                 started: plugin.started,
                 configured: plugin.configured,
-                paired: plugin.paired,
                 restartRequired: plugin.restartRequired,
-                fabricInformations: plugin.fabricInformations,
-                sessionInformations: plugin.sessionInformations,
                 registeredDevices: plugin.registeredDevices,
                 addedDevices: plugin.addedDevices,
-                qrPairingCode: plugin.qrPairingCode,
-                manualPairingCode: plugin.manualPairingCode,
                 configJson: plugin.configJson,
                 schemaJson: plugin.schemaJson,
                 hasWhiteList: plugin.configJson?.whiteList !== undefined,
                 hasBlackList: plugin.configJson?.blackList !== undefined,
+                paired: plugin.serverNode?.state.commissioning.commissioned,
+                qrPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode?.state.commissioning.pairingCodes.qrPairingCode,
+                manualPairingCode: this.matterbridge.matterbridgeInformation.matterbridgeEndAdvertise ? undefined : plugin.serverNode?.state.commissioning.pairingCodes.manualPairingCode,
+                fabricInformations: plugin.serverNode ? this.matterbridge.sanitizeFabricInformations(Object.values(plugin.serverNode?.state.commissioning.fabrics)) : undefined,
+                sessionInformations: plugin.serverNode ? this.matterbridge.sanitizeSessionInformation(Object.values(plugin.serverNode?.state.sessions.sessions)) : undefined,
             });
         }
         return baseRegisteredPlugins;
     }
     async getDevices(pluginName) {
+        if (this.matterbridge.hasCleanupStarted)
+            return [];
         const devices = [];
         for (const device of this.matterbridge.devices.array()) {
             if (pluginName && pluginName !== device.plugin)
@@ -1165,8 +1171,6 @@ export class Frontend extends EventEmitter {
             else if (data.method === '/api/advertise') {
                 const pairingCodes = await this.matterbridge.advertiseServerNode(this.matterbridge.serverNode);
                 this.matterbridge.matterbridgeInformation.matterbridgeAdvertise = true;
-                this.matterbridge.matterbridgeQrPairingCode = pairingCodes?.qrPairingCode;
-                this.matterbridge.matterbridgeManualPairingCode = pairingCodes?.manualPairingCode;
                 this.wssSendRefreshRequired('matterbridgeAdvertise');
                 this.wssSendSnackbarMessage(`Started fabrics share`, 0);
                 client.send(JSON.stringify({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, response: pairingCodes, success: true }));

package/dist/matterbridge.js

@@ -57,6 +57,7 @@ export class Matterbridge extends EventEmitter {
         matterbridgeSessionInformations: [],
         matterbridgePaired: false,
         matterbridgeAdvertise: false,
+        matterbridgeEndAdvertise: false,
         bridgeMode: '',
         restartMode: '',
         virtualMode: 'outlet',
@@ -87,11 +88,6 @@ export class Matterbridge extends EventEmitter {
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
     matterbridgeDevVersion = '';
-    matterbridgeQrPairingCode;
-    matterbridgeManualPairingCode;
-    matterbridgeFabricInformations;
-    matterbridgeSessionInformations;
-    matterbridgePaired;
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
@@ -306,6 +302,19 @@ export class Matterbridge extends EventEmitter {
                 this.discriminator = pairingFileJson.discriminator;
                 this.log.info(`Pairing file ${CYAN}${pairingFilePath}${nf} found. Using passcode ${CYAN}${this.passcode}${nf} and discriminator ${CYAN}${this.discriminator}${nf} from pairing file.`);
             }
+            if (pairingFileJson.privateKey && pairingFileJson.certificate && pairingFileJson.intermediateCertificate && pairingFileJson.declaration) {
+                const hexStringToUint8Array = (hexString) => {
+                    const matches = hexString.match(/.{1,2}/g);
+                    return matches ? new Uint8Array(matches.map((byte) => parseInt(byte, 16))) : new Uint8Array();
+                };
+                this.certification = {
+                    privateKey: hexStringToUint8Array(pairingFileJson.privateKey),
+                    certificate: hexStringToUint8Array(pairingFileJson.certificate),
+                    intermediateCertificate: hexStringToUint8Array(pairingFileJson.intermediateCertificate),
+                    declaration: hexStringToUint8Array(pairingFileJson.declaration),
+                };
+                this.log.info(`Pairing file ${CYAN}${pairingFilePath}${nf} found. Using privateKey, certificate, intermediateCertificate and declaration from pairing file.`);
+            }
         }
         catch (error) {
             this.log.debug(`Pairing file ${CYAN}${pairingFilePath}${db} not found: ${error instanceof Error ? error.message : error}`);
@@ -581,11 +590,11 @@ export class Matterbridge extends EventEmitter {
             let index = 0;
             for (const plugin of this.plugins) {
                 if (index !== this.plugins.length - 1) {
-                    this.log.info(`├─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}enabled ${plugin.paired ? GREEN : RED}paired${nf}`);
+                    this.log.info(`├─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}enabled${nf}`);
                     this.log.info(`│ └─ entry ${UNDERLINE}${db}${plugin.path}${UNDERLINEOFF}${db}`);
                 }
                 else {
-                    this.log.info(`└─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}enabled ${plugin.paired ? GREEN : RED}paired${nf}`);
+                    this.log.info(`└─┬─ plugin ${plg}${plugin.name}${nf}: "${plg}${BRIGHT}${plugin.description}${RESET}${nf}" type: ${typ}${plugin.type}${nf} ${plugin.enabled ? GREEN : RED}enabled${nf}`);
                     this.log.info(`  └─ entry ${UNDERLINE}${db}${plugin.path}${UNDERLINEOFF}${db}`);
                 }
                 index++;
@@ -739,8 +748,6 @@ export class Matterbridge extends EventEmitter {
             plugin.configured = false;
             plugin.registeredDevices = undefined;
             plugin.addedDevices = undefined;
-            plugin.qrPairingCode = undefined;
-            plugin.manualPairingCode = undefined;
             this.plugins.load(plugin, true, 'Matterbridge is starting');
         }
         this.frontend.wssSendRefreshRequired('plugins');
@@ -1172,7 +1179,7 @@ export class Matterbridge extends EventEmitter {
                 await this.startServerNode(plugin.serverNode);
         }
     }
-    async createDynamicPlugin(plugin, start = false) {
+    async createDynamicPlugin(plugin) {
         if (!plugin.locked) {
             plugin.locked = true;
             plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', bridge.code, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, plugin.description);
@@ -1180,8 +1187,6 @@ export class Matterbridge extends EventEmitter {
             plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
             plugin.serialNumber = await plugin.storageContext.get('serialNumber', '');
             await plugin.serverNode.add(plugin.aggregatorNode);
-            if (start)
-                await this.startServerNode(plugin.serverNode);
         }
     }
     async startBridge() {
@@ -1293,6 +1298,7 @@ export class Matterbridge extends EventEmitter {
                 return;
             clearInterval(this.startMatterInterval);
             this.startMatterInterval = undefined;
+            await new Promise((resolve) => setTimeout(resolve, 1000));
             this.log.debug('Cleared startMatterInterval interval in childbridge mode');
             this.configureTimeout = setTimeout(async () => {
                 for (const plugin of this.plugins) {
@@ -1455,73 +1461,25 @@ export class Matterbridge extends EventEmitter {
                 reachable: true,
             },
         });
-        const sanitizeFabrics = (fabrics, resetSessions = false) => {
-            const sanitizedFabrics = this.sanitizeFabricInformations(Array.from(Object.values(fabrics)));
-            this.log.info(`Fabrics: ${debugStringify(sanitizedFabrics)}`);
-            if (this.bridgeMode === 'bridge') {
-                this.matterbridgeFabricInformations = sanitizedFabrics;
-                if (resetSessions)
-                    this.matterbridgeSessionInformations = undefined;
-                this.matterbridgePaired = true;
-            }
-            if (this.bridgeMode === 'childbridge') {
-                const plugin = this.plugins.get(storeId);
-                if (plugin) {
-                    plugin.fabricInformations = sanitizedFabrics;
-                    if (resetSessions)
-                        plugin.sessionInformations = undefined;
-                    plugin.paired = true;
-                }
-            }
-        };
         serverNode.lifecycle.commissioned.on(() => {
             this.log.notice(`Server node for ${storeId} was initially commissioned successfully!`);
             clearTimeout(this.endAdvertiseTimeout);
         });
-        serverNode.lifecycle.decommissioned.on(() => this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`));
+        serverNode.lifecycle.decommissioned.on(() => {
+            this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`);
+            clearTimeout(this.endAdvertiseTimeout);
+        });
         serverNode.lifecycle.online.on(async () => {
             this.log.notice(`Server node for ${storeId} is online`);
             if (!serverNode.lifecycle.isCommissioned) {
                 this.log.notice(`Server node for ${storeId} is not commissioned. Pair to commission ...`);
                 const { qrPairingCode, manualPairingCode } = serverNode.state.commissioning.pairingCodes;
-                if (this.bridgeMode === 'bridge') {
-                    this.matterbridgeQrPairingCode = qrPairingCode;
-                    this.matterbridgeManualPairingCode = manualPairingCode;
-                    this.matterbridgeFabricInformations = undefined;
-                    this.matterbridgeSessionInformations = undefined;
-                    this.matterbridgePaired = false;
-                    this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
-                    this.log.notice(`Manual pairing code: ${manualPairingCode}`);
-                    if (this.matterStorageService) {
-                        const storageManager = await this.matterStorageService.open(storeId);
-                        const storageContext = storageManager.createContext('persist');
-                        await storageContext.set('qrPairingCode', qrPairingCode);
-                        await storageContext.set('manualPairingCode', manualPairingCode);
-                    }
-                }
-                if (this.bridgeMode === 'childbridge') {
-                    const plugin = this.plugins.get(storeId);
-                    if (plugin) {
-                        plugin.qrPairingCode = qrPairingCode;
-                        plugin.manualPairingCode = manualPairingCode;
-                        plugin.fabricInformations = undefined;
-                        plugin.sessionInformations = undefined;
-                        plugin.paired = false;
-                        this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
-                        this.log.notice(`Manual pairing code: ${manualPairingCode}`);
-                        if (this.matterStorageService) {
-                            const storageManager = await this.matterStorageService.open(storeId);
-                            const storageContext = storageManager.createContext('persist');
-                            await storageContext.set('qrPairingCode', qrPairingCode);
-                            await storageContext.set('manualPairingCode', manualPairingCode);
-                        }
-                    }
-                }
+                this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
+                this.log.notice(`Manual pairing code: ${manualPairingCode}`);
                 this.startEndAdvertiseTimer(serverNode);
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);
-                sanitizeFabrics(serverNode.state.commissioning.fabrics, true);
             }
             this.frontend.wssSendRefreshRequired('plugins');
             this.frontend.wssSendRefreshRequired('settings');
@@ -1530,23 +1488,7 @@ export class Matterbridge extends EventEmitter {
         });
         serverNode.lifecycle.offline.on(() => {
             this.log.notice(`Server node for ${storeId} is offline`);
-            if (this.bridgeMode === 'bridge') {
-                this.matterbridgeQrPairingCode = undefined;
-                this.matterbridgeManualPairingCode = undefined;
-                this.matterbridgeFabricInformations = undefined;
-                this.matterbridgeSessionInformations = undefined;
-                this.matterbridgePaired = undefined;
-            }
-            if (this.bridgeMode === 'childbridge') {
-                const plugin = this.plugins.get(storeId);
-                if (plugin) {
-                    plugin.qrPairingCode = undefined;
-                    plugin.manualPairingCode = undefined;
-                    plugin.fabricInformations = undefined;
-                    plugin.sessionInformations = undefined;
-                    plugin.paired = undefined;
-                }
-            }
+            this.matterbridgeInformation.matterbridgeEndAdvertise = true;
             this.frontend.wssSendRefreshRequired('plugins');
             this.frontend.wssSendRefreshRequired('settings');
             this.frontend.wssSendSnackbarMessage(`${storeId} is offline`, 5, 'warning');
@@ -1566,35 +1508,18 @@ export class Matterbridge extends EventEmitter {
                     break;
             }
             this.log.notice(`Commissioned fabric index ${fabricIndex} ${action} on server node for ${storeId}: ${debugStringify(serverNode.state.commissioning.fabrics[fabricIndex])}`);
-            sanitizeFabrics(serverNode.state.commissioning.fabrics);
             this.frontend.wssSendRefreshRequired('fabrics');
         });
-        const sanitizeSessions = (sessions) => {
-            const sanitizedSessions = this.sanitizeSessionInformation(sessions);
-            this.log.debug(`Sessions: ${debugStringify(sanitizedSessions)}`);
-            if (this.bridgeMode === 'bridge') {
-                this.matterbridgeSessionInformations = sanitizedSessions;
-            }
-            if (this.bridgeMode === 'childbridge') {
-                const plugin = this.plugins.get(storeId);
-                if (plugin) {
-                    plugin.sessionInformations = sanitizedSessions;
-                }
-            }
-        };
         serverNode.events.sessions.opened.on((session) => {
             this.log.notice(`Session opened on server node for ${storeId}: ${debugStringify(session)}`);
-            sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
             this.frontend.wssSendRefreshRequired('sessions');
         });
         serverNode.events.sessions.closed.on((session) => {
             this.log.notice(`Session closed on server node for ${storeId}: ${debugStringify(session)}`);
-            sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
             this.frontend.wssSendRefreshRequired('sessions');
         });
         serverNode.events.sessions.subscriptionsChanged.on((session) => {
             this.log.notice(`Session subscriptions changed on server node for ${storeId}: ${debugStringify(session)}`);
-            sanitizeSessions(Object.values(serverNode.state.sessions.sessions));
             this.frontend.wssSendRefreshRequired('sessions');
         });
         this.log.info(`Created server node for ${storeId}`);
@@ -1609,17 +1534,7 @@ export class Matterbridge extends EventEmitter {
         this.endAdvertiseTimeout = setTimeout(() => {
             if (matterServerNode.lifecycle.isCommissioned)
                 return;
-            if (this.bridgeMode === 'bridge') {
-                this.matterbridgeQrPairingCode = undefined;
-                this.matterbridgeManualPairingCode = undefined;
-            }
-            if (this.bridgeMode === 'childbridge') {
-                const plugin = this.plugins.get(matterServerNode.id);
-                if (plugin) {
-                    plugin.qrPairingCode = undefined;
-                    plugin.manualPairingCode = undefined;
-                }
-            }
+            this.matterbridgeInformation.matterbridgeEndAdvertise = true;
             this.frontend.wssSendRefreshRequired('plugins');
             this.frontend.wssSendRefreshRequired('settings');
             this.frontend.wssSendRefreshRequired('fabrics');

package/dist/pluginManager.js

@@ -72,8 +72,6 @@ export class PluginManager extends EventEmitter {
                 description: plugin.description,
                 author: plugin.author,
                 enabled: plugin.enabled,
-                qrPairingCode: plugin.qrPairingCode,
-                manualPairingCode: plugin.manualPairingCode,
             });
         }
         await this.nodeContext.set('plugins', plugins);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.1.3-dev-20250712-616f7ed",
+  "version": "3.1.3-dev-20250714-c9b85b3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.1.3-dev-20250712-616f7ed",
+      "version": "3.1.3-dev-20250714-c9b85b3",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.1.3-dev-20250712-616f7ed",
+  "version": "3.1.3-dev-20250714-c9b85b3",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",