@matterbridge/core 3.9.2-dev-20260620-2b9580a → 3.9.2-dev-20260622-2bad6bf

package/dist/backendWsServer.d.ts

@@ -1,5 +1,5 @@
 import type { EndpointNumber } from '@matter/types/datatype';
-import type { ApiMatter, RefreshRequiredChanged, SharedMatterbridge, WsMessageBroadcast } from '@matterbridge/types';
+import type { ApiMatter, BridgeStatus, PluginStatusUpdate, RefreshRequiredChanged, SharedMatterbridge, WsMessageBroadcast } from '@matterbridge/types';
 import { WebSocketServer } from 'ws';
 import type { Backend } from './backend.js';
 export declare class BackendWsServer {
@@ -27,6 +27,8 @@ export declare class BackendWsServer {
     wssSendRestartNotRequired(snackbar?: boolean): void;
     wssSendUpdateRequired(version: string, devVersion?: boolean): void;
     wssSendPluginUpdateRequired(plugin: string, version: string, devVersion?: boolean): void;
+    wssSendPluginStatusUpdate(plugin: string, status: PluginStatusUpdate): void;
+    wssSendMatterbridgeStatusUpdate(status: BridgeStatus): void;
     wssSendCpuUpdate(cpuUsage: number, processCpuUsage: number): void;
     wssSendMemoryUpdate(totalMemory: string, freeMemory: string, rss: string, heapTotal: string, heapUsed: string, external: string, arrayBuffers: string): void;
     wssSendUptimeUpdate(systemUptime: string, processUptime: string): void;

package/dist/backendWsServer.js

@@ -236,16 +236,30 @@ export class BackendWsServer {
         if (!this.hasActiveClients())
             return;
         if (this.verbose)
-            this.log.debug('Sending an update required message to all connected clients');
+            this.log.debug('Sending a matterbridge version update required message to all connected clients');
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'update_required', success: true, response: { version, devVersion } });
     }
     wssSendPluginUpdateRequired(plugin, version, devVersion = false) {
         if (!this.hasActiveClients())
             return;
         if (this.verbose)
-            this.log.debug('Sending a plugin update required message to all connected clients');
+            this.log.debug('Sending a plugin version update required message to all connected clients');
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'plugin_update_required', success: true, response: { plugin, version, devVersion } });
     }
+    wssSendPluginStatusUpdate(plugin, status) {
+        if (!this.hasActiveClients())
+            return;
+        if (this.verbose)
+            this.log.debug('Sending a plugin status update message to all connected clients');
+        this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'plugin_status_update', success: true, response: { plugin, status } });
+    }
+    wssSendMatterbridgeStatusUpdate(status) {
+        if (!this.hasActiveClients())
+            return;
+        if (this.verbose)
+            this.log.debug('Sending a matterbridge status update message to all connected clients');
+        this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'matterbridge_status_update', success: true, response: { status } });
+    }
     wssSendCpuUpdate(cpuUsage, processCpuUsage) {
         if (!this.hasActiveClients())
             return;

package/dist/frontend.d.ts

@@ -1,6 +1,6 @@
 import EventEmitter from 'node:events';
 import { type EndpointNumber } from '@matter/types/datatype';
-import type { ApiClusters, ApiDevice, ApiMatter, ApiPlugin, ApiSettings, RefreshRequiredChanged, WsMessageBroadcast } from '@matterbridge/types';
+import type { ApiClusters, ApiDevice, ApiMatter, ApiPlugin, ApiSettings, BridgeStatus, PluginStatusUpdate, RefreshRequiredChanged, WsMessageBroadcast } from '@matterbridge/types';
 import { LogLevel } from 'node-ansi-logger';
 import type { Matterbridge } from './matterbridge.js';
 interface FrontendEvents {
@@ -59,6 +59,8 @@ export declare class Frontend extends EventEmitter<FrontendEvents> {
     wssSendRestartNotRequired(snackbar?: boolean): void;
     wssSendUpdateRequired(version: string, devVersion?: boolean): void;
     wssSendPluginUpdateRequired(plugin: string, version: string, devVersion?: boolean): void;
+    wssSendPluginStatusUpdate(plugin: string, status: PluginStatusUpdate): void;
+    wssSendMatterbridgeStatusUpdate(status: BridgeStatus): void;
     wssSendCpuUpdate(cpuUsage: number, processCpuUsage: number): void;
     wssSendMemoryUpdate(totalMemory: string, freeMemory: string, rss: string, heapTotal: string, heapUsed: string, external: string, arrayBuffers: string): void;
     wssSendUptimeUpdate(systemUptime: string, processUptime: string): void;

package/dist/frontend.js

@@ -100,10 +100,22 @@ export class Frontend extends EventEmitter {
                     this.wssSendPluginUpdateRequired(msg.params.plugin, msg.params.version, msg.params.devVersion);
                     this.server.respond({ ...msg, result: { success: true } });
                     break;
+                case 'frontend_pluginstatusupdate':
+                    this.wssSendPluginStatusUpdate(msg.params.plugin, msg.params.status);
+                    this.server.respond({ ...msg, result: { success: true } });
+                    break;
+                case 'frontend_matterbridgestatusupdate':
+                    this.wssSendMatterbridgeStatusUpdate(msg.params.status);
+                    this.server.respond({ ...msg, result: { success: true } });
+                    break;
                 case 'frontend_snackbarmessage':
                     this.wssSendSnackbarMessage(msg.params.message, msg.params.timeout, msg.params.severity);
                     this.server.respond({ ...msg, result: { success: true } });
                     break;
+                case 'frontend_closesnackbarmessage':
+                    this.wssSendCloseSnackbarMessage(msg.params.message);
+                    this.server.respond({ ...msg, result: { success: true } });
+                    break;
                 case 'frontend_attributechanged':
                     this.wssSendAttributeChangedMessage(msg.params.plugin, msg.params.serialNumber, msg.params.uniqueId, msg.params.number, msg.params.id, msg.params.cluster, msg.params.attribute, msg.params.value);
                     this.server.respond({ ...msg, result: { success: true } });
@@ -935,6 +947,7 @@ export class Frontend extends EventEmitter {
             bridgeMode: this.matterbridge.bridgeMode,
             restartMode: this.matterbridge.restartMode,
             virtualMode: this.matterbridge.virtualMode,
+            bridgeStatus: this.matterbridge.bridgeStatus,
             profile: this.matterbridge.profile,
             loggerLevel: this.matterbridge.logLevel,
             fileLogger: this.matterbridge.fileLogger,
@@ -2120,16 +2133,28 @@ export class Frontend extends EventEmitter {
     wssSendUpdateRequired(version, devVersion = false) {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
-        this.log.debug('Sending an update required message to all connected clients');
+        this.log.debug('Sending a matterbridge version update required message to all connected clients');
         this.updateRequired = true;
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'update_required', success: true, response: { version, devVersion } });
     }
     wssSendPluginUpdateRequired(plugin, version, devVersion = false) {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
-        this.log.debug('Sending a plugin update required message to all connected clients');
+        this.log.debug('Sending a plugin version update required message to all connected clients');
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'plugin_update_required', success: true, response: { plugin, version, devVersion } });
     }
+    wssSendPluginStatusUpdate(plugin, status) {
+        if (!this.listening || this.webSocketServer?.clients.size === 0)
+            return;
+        this.log.debug('Sending a plugin status update message to all connected clients');
+        this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'plugin_status_update', success: true, response: { plugin, status } });
+    }
+    wssSendMatterbridgeStatusUpdate(status) {
+        if (!this.listening || this.webSocketServer?.clients.size === 0)
+            return;
+        this.log.debug('Sending a matterbridge status update message to all connected clients');
+        this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'matterbridge_status_update', success: true, response: { status } });
+    }
     wssSendCpuUpdate(cpuUsage, processCpuUsage) {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;

package/dist/helpers.js

@@ -61,7 +61,7 @@ export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
     if (matterbridge.virtualMode !== 'disabled' && matterbridge.bridgeMode === 'bridge' && aggregatorEndpoint) {
         matterbridge.log.notice(`Creating virtual devices for Matterbridge server node...`);
         await addVirtualDevice(aggregatorEndpoint, 'Restart Matterbridge', matterbridge.virtualMode, async () => {
-            if (matterbridge.restartMode === '')
+            if (matterbridge.restartMode === 'none')
                 await matterbridge.restartProcess();
             else
                 await matterbridge.shutdownProcess();

package/dist/matterbridge.d.ts

@@ -5,7 +5,7 @@ import { Endpoint, ServerNode } from '@matter/node';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { type DeviceCertification } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
-import type { ApiMatter, ApiSettings, MaybePromise, PlatformMatterbridge, SharedMatterbridge, SystemInformation } from '@matterbridge/types';
+import type { ApiMatter, ApiSettings, BridgeMode, BridgeStatus, MaybePromise, PlatformMatterbridge, RestartMode, SharedMatterbridge, SystemInformation, VirtualMode } from '@matterbridge/types';
 import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { type NodeStorage, NodeStorageManager } from 'node-persist-manager';
 import { DeviceManager } from './deviceManager.js';
@@ -50,9 +50,10 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     dockerVersion: string | undefined;
     dockerLatestVersion: string | undefined;
     dockerDevVersion: string | undefined;
-    bridgeMode: 'bridge' | 'childbridge' | 'controller' | '';
-    restartMode: 'service' | 'docker' | '';
-    virtualMode: 'disabled' | 'outlet' | 'light' | 'switch' | 'mounted_switch';
+    bridgeMode: BridgeMode;
+    restartMode: RestartMode;
+    virtualMode: VirtualMode;
+    bridgeStatus: BridgeStatus;
     readonly profile: string | undefined;
     readonly log: AnsiLogger;
     logLevel: LogLevel;
@@ -84,6 +85,7 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     private readonly environment;
     matterStorageService: StorageService | undefined;
     matterStorageManager: StorageManager | undefined;
+    private serverNodeStorageManagers;
     matterbridgeContext: StorageContext | undefined;
     controllerContext: StorageContext | undefined;
     mdnsInterface: string | undefined;
@@ -135,6 +137,7 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     shutdownProcessAndReset(): Promise<void>;
     shutdownProcessAndFactoryReset(): Promise<void>;
     private cleanup;
+    private sendPluginStatusUpdate;
     private startBridge;
     private startChildbridge;
     private startController;

package/dist/matterbridge.js

@@ -72,9 +72,10 @@ export class Matterbridge extends EventEmitter {
     dockerVersion;
     dockerLatestVersion;
     dockerDevVersion;
-    bridgeMode = '';
-    restartMode = '';
+    bridgeMode = 'none';
+    restartMode = 'none';
     virtualMode = 'outlet';
+    bridgeStatus = 'inactive';
     profile = getParameter('profile');
     log = new AnsiLogger({
         logName: 'Matterbridge',
@@ -116,6 +117,7 @@ export class Matterbridge extends EventEmitter {
     environment = Environment.default;
     matterStorageService;
     matterStorageManager;
+    serverNodeStorageManagers = new Map();
     matterbridgeContext;
     controllerContext;
     mdnsInterface;
@@ -230,6 +232,7 @@ export class Matterbridge extends EventEmitter {
                 bridgeMode: this.bridgeMode,
                 restartMode: this.restartMode,
                 virtualMode: this.virtualMode,
+                bridgeStatus: this.bridgeStatus,
                 profile: this.profile,
                 readOnly: hasParameter('readonly'),
                 shellyBoard: false,
@@ -344,7 +347,7 @@ export class Matterbridge extends EventEmitter {
                         const packageName = msg.result.packageName.replace(/@.*$/, '');
                         if (packageName === 'matterbridge') {
                             this.log.info('Matterbridge has been updated. Full restart required.');
-                            if (this.restartMode !== '')
+                            if (this.restartMode !== 'none')
                                 await this.cleanup('updating...', false);
                         }
                     }
@@ -732,7 +735,7 @@ export class Matterbridge extends EventEmitter {
             (hasParameter('bridge') || (!hasParameter('childbridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'bridge') ? 'mode bridge ' : '') +
             (hasParameter('childbridge') || (!hasParameter('bridge') && (await this.nodeContext?.get('bridgeMode', '')) === 'childbridge') ? 'mode childbridge ' : '') +
             (hasParameter('controller') ? 'mode controller ' : '') +
-            (this.restartMode === '' ? '' : 'restart mode ' + this.restartMode + ' ') +
+            (this.restartMode === 'none' ? '' : 'restart mode ' + this.restartMode + ' ') +
             'running on ' + this.systemInformation.osType + ' (v.' + this.systemInformation.osRelease + ') platform ' + this.systemInformation.osPlatform + ' arch ' + this.systemInformation.osArch);
         const minNodeVersion = 20;
         const nodeVersion = process.versions.node;
@@ -829,6 +832,7 @@ export class Matterbridge extends EventEmitter {
                 const storageContext = storageManager?.createContext('persist');
                 await storageContext?.set('serialNumber', this.aggregatorSerialNumber);
                 await storageContext?.set('uniqueId', this.aggregatorUniqueId);
+                await storageManager.close();
             }
         }
         catch (error) {
@@ -853,6 +857,7 @@ export class Matterbridge extends EventEmitter {
                     await matterStorageManager.createContext('root')?.clearAll();
                     await matterStorageManager.createContext('sessions')?.clearAll();
                     await matterStorageManager.createContext('persist')?.clearAll();
+                    await matterStorageManager.close();
                     this.log.notice(`Reset commissioning for plugin ${plg}${plugin.name}${nt} done! Remove the device from the controller.`);
                 }
                 else {
@@ -1206,6 +1211,7 @@ export class Matterbridge extends EventEmitter {
             this.emit('cleanup_started');
             this.hasCleanupStarted = true;
             this.log.info(message);
+            this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'stopping') } });
             if (this.startMatterInterval) {
                 clearInterval(this.startMatterInterval);
                 this.startMatterInterval = undefined;
@@ -1296,6 +1302,7 @@ export class Matterbridge extends EventEmitter {
                         await storageManager?.createContext('fabrics')?.clearAll();
                         await storageManager?.createContext('root')?.clearAll();
                         await storageManager?.createContext('sessions')?.clearAll();
+                        await storageManager?.close();
                     }
                 }
                 for (const device of this.devices.array()) {
@@ -1306,6 +1313,7 @@ export class Matterbridge extends EventEmitter {
                         await storageManager?.createContext('fabrics')?.clearAll();
                         await storageManager?.createContext('root')?.clearAll();
                         await storageManager?.createContext('sessions')?.clearAll();
+                        await storageManager?.close();
                     }
                 }
                 this.log.info('Matter storage reset done! Remove the bridge from the controller.');
@@ -1354,6 +1362,7 @@ export class Matterbridge extends EventEmitter {
                     unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, device.deviceName.replace(/[ .]/g, ''), 'root.subscriptions.subscriptions'), this.log);
                 }
             }
+            this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'stopped') } });
             await this.frontend.stop();
             this.frontend.destroy();
             this.plugins.destroy();
@@ -1442,16 +1451,36 @@ export class Matterbridge extends EventEmitter {
                 this.log.debug('Cleanup already started...');
         }
     }
+    sendPluginStatusUpdate(plugin) {
+        this.server.request({
+            type: 'frontend_pluginstatusupdate',
+            src: 'matterbridge',
+            dst: 'frontend',
+            params: {
+                plugin: plugin.name,
+                status: {
+                    locked: plugin.locked,
+                    error: plugin.error,
+                    enabled: plugin.enabled,
+                    loaded: plugin.loaded,
+                    started: plugin.started,
+                    configured: plugin.configured,
+                    registeredDevices: plugin.registeredDevices,
+                },
+            },
+        });
+    }
     async startBridge() {
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
         if (!this.matterbridgeContext)
             throw new Error('No storage context initialized');
+        this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'starting') } });
         this.serverNode = await this.createServerNode(this.matterbridgeContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
         this.aggregatorNode = await this.createAggregatorNode(this.matterbridgeContext);
         await this.serverNode.add(this.aggregatorNode);
         await addVirtualDevices(this, this.aggregatorNode);
-        await this.startPlugins();
+        await this.startPlugins(false, true);
         this.log.debug('Starting start matter interval in bridge mode...');
         this.frontend.wssSendSnackbarMessage(`The bridge is starting...`, 0, 'info');
         let failCount = 0;
@@ -1459,7 +1488,6 @@ export class Matterbridge extends EventEmitter {
             void (async () => {
                 if (failCount && failCount % 10 === 0) {
                     this.frontend.wssSendSnackbarMessage(`The bridge is still starting...`, 10, 'info');
-                    this.frontend.wssSendRefreshRequired('plugins');
                 }
                 for (const plugin of this.plugins) {
                     if (!plugin.enabled)
@@ -1475,8 +1503,10 @@ export class Matterbridge extends EventEmitter {
                         this.frontend.wssSendSnackbarMessage(`The bridge is offline. Startup halted due to plugin errors.`, 0, 'error');
                         this.frontend.wssSendRefreshRequired('plugins');
                         this.frontend.wssSendCloseSnackbarMessage(`The bridge is starting...`);
+                        this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'error') } });
                         return;
                     }
+                    this.sendPluginStatusUpdate(plugin);
                     if (!plugin.loaded || !plugin.started) {
                         this.log.debug(`Waiting (failSafeCount=${failCount}/${this.failCountLimit}) in startMatterInterval interval for plugin ${plg}${plugin.name}${db} loaded: ${plugin.loaded} started: ${plugin.started}...`);
                         failCount++;
@@ -1512,20 +1542,20 @@ export class Matterbridge extends EventEmitter {
                                 plugin.error = true;
                                 this.log.error(`Error configuring plugin ${plg}${plugin.name}${er}`, error);
                             }
+                            this.sendPluginStatusUpdate(plugin);
                         }
-                        this.frontend.wssSendRefreshRequired('plugins');
                     })();
                 }, 30 * 1000).unref();
                 this.reachabilityTimeout = setTimeout(() => {
                     this.log.info(`Setting reachability to true for ${plg}Matterbridge${db}`);
                     if (this.aggregatorNode)
-                        fireAndForget(this.setAggregatorReachability(this.aggregatorNode, true), this.log, `Set aggregator node reachability for Matterbridge`);
+                        fireAndForget(this.setAggregatorReachability(this.aggregatorNode, true), this.log, `Failed to set aggregator node reachability for Matterbridge`);
                 }, 60 * 1000).unref();
                 this.emit('bridge_started');
                 this.log.notice('Matterbridge bridge started successfully');
-                this.frontend.wssSendRefreshRequired('settings');
-                this.frontend.wssSendRefreshRequired('plugins');
-                this.frontend.wssSendCloseSnackbarMessage(`The bridge is starting...`);
+                this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'started') } });
+                this.server.request({ type: 'frontend_refreshrequired', src: 'matterbridge', dst: 'frontend', params: { changed: 'plugins' } });
+                this.server.request({ type: 'frontend_closesnackbarmessage', src: 'matterbridge', dst: 'frontend', params: { message: `The bridge is starting...` } });
             })();
         }, Number(process.env['MATTERBRIDGE_START_MATTER_INTERVAL_MS']) || this.startMatterIntervalMs);
     }
@@ -1533,6 +1563,7 @@ export class Matterbridge extends EventEmitter {
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
         const { wait } = await import('@matterbridge/utils/wait');
+        this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'starting') } });
         this.log.debug('Loading all plugins in childbridge mode...');
         await this.startPlugins(true, false);
         this.log.debug('Creating server nodes for DynamicPlatform plugins and starting all plugins in childbridge mode...');
@@ -1548,7 +1579,6 @@ export class Matterbridge extends EventEmitter {
             void (async () => {
                 if (failCount && failCount % 10 === 0) {
                     this.frontend.wssSendSnackbarMessage(`The bridge is still starting...`, 10, 'info');
-                    this.frontend.wssSendRefreshRequired('plugins');
                 }
                 let allStarted = true;
                 for (const plugin of this.plugins.array()) {
@@ -1565,8 +1595,10 @@ export class Matterbridge extends EventEmitter {
                         this.frontend.wssSendSnackbarMessage(`The bridge is offline. Startup halted due to plugin errors.`, 0, 'error');
                         this.frontend.wssSendRefreshRequired('plugins');
                         this.frontend.wssSendCloseSnackbarMessage(`The bridge is starting...`);
+                        this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'error') } });
                         return;
                     }
+                    this.sendPluginStatusUpdate(plugin);
                     this.log.debug(`Checking plugin ${plg}${plugin.name}${db} to start matter in childbridge mode...`);
                     if (!plugin.loaded || !plugin.started) {
                         allStarted = false;
@@ -1600,8 +1632,8 @@ export class Matterbridge extends EventEmitter {
                                 plugin.error = true;
                                 this.log.error(`Error configuring plugin ${plg}${plugin.name}${er}`, error);
                             }
+                            this.sendPluginStatusUpdate(plugin);
                         }
-                        this.frontend.wssSendRefreshRequired('plugins');
                     })();
                 }, 30 * 1000).unref();
                 for (const plugin of this.plugins.array()) {
@@ -1638,9 +1670,9 @@ export class Matterbridge extends EventEmitter {
                 }
                 this.emit('childbridge_started');
                 this.log.notice('Matterbridge childbridge started successfully');
-                this.frontend.wssSendRefreshRequired('settings');
-                this.frontend.wssSendRefreshRequired('plugins');
-                this.frontend.wssSendCloseSnackbarMessage(`The bridge is starting...`);
+                this.server.request({ type: 'frontend_matterbridgestatusupdate', src: 'matterbridge', dst: 'frontend', params: { status: (this.bridgeStatus = 'started') } });
+                this.server.request({ type: 'frontend_refreshrequired', src: 'matterbridge', dst: 'frontend', params: { changed: 'plugins' } });
+                this.server.request({ type: 'frontend_closesnackbarmessage', src: 'matterbridge', dst: 'frontend', params: { message: `The bridge is starting...` } });
             })();
         }, Number(process.env['MATTERBRIDGE_START_MATTER_INTERVAL_MS']) || this.startMatterIntervalMs);
     }
@@ -1670,6 +1702,11 @@ export class Matterbridge extends EventEmitter {
     async stopMatterStorage() {
         this.log.info('Closing matter node storage...');
         await this.matterStorageManager?.close();
+        for (const [storeId, storageManager] of this.serverNodeStorageManagers) {
+            this.log.debug(`Closing server node storage context manager for ${plg}${storeId}${db}...`);
+            await storageManager.close();
+        }
+        this.serverNodeStorageManagers.clear();
         this.matterStorageService = undefined;
         this.matterStorageManager = undefined;
         this.matterbridgeContext = undefined;
@@ -1683,6 +1720,8 @@ export class Matterbridge extends EventEmitter {
         this.log.info(`Creating server node storage context "${storeId}.persist" for ${storeId}...`);
         await createDirectory(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, storeId), `Matter node storage directory for ${storeId}`, this.log);
         const storageManager = await this.matterStorageService.open(storeId);
+        await this.serverNodeStorageManagers.get(storeId)?.close();
+        this.serverNodeStorageManagers.set(storeId, storageManager);
         const storageContext = storageManager.createContext('persist');
         const random = randomBytes(8).toString('hex');
         await storageContext.set('storeId', storeId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.9.2-dev-20260620-2b9580a",
+  "version": "3.9.2-dev-20260622-2bad6bf",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -129,11 +129,11 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@matter/main": "0.17.3",
-    "@matterbridge/dgram": "3.9.2-dev-20260620-2b9580a",
-    "@matterbridge/thread": "3.9.2-dev-20260620-2b9580a",
-    "@matterbridge/types": "3.9.2-dev-20260620-2b9580a",
-    "@matterbridge/utils": "3.9.2-dev-20260620-2b9580a",
+    "@matter/main": "0.17.4-alpha.0-20260621-81ba50a6a",
+    "@matterbridge/dgram": "3.9.2-dev-20260622-2bad6bf",
+    "@matterbridge/thread": "3.9.2-dev-20260622-2bad6bf",
+    "@matterbridge/types": "3.9.2-dev-20260622-2bad6bf",
+    "@matterbridge/utils": "3.9.2-dev-20260622-2bad6bf",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",