@matterbridge/core 3.6.0 → 3.6.1-dev-20260309-6341dee

package/dist/cli.d.ts

@@ -1,4 +1,5 @@
-import { Inspector, Tracker } from '@matterbridge/utils';
+import { Inspector } from '@matterbridge/utils/inspector';
+import { Tracker } from '@matterbridge/utils/tracker';
 import type { Matterbridge } from './matterbridge.js';
 export declare let instance: Matterbridge | undefined;
 export declare const tracker: Tracker;

package/dist/cli.js

@@ -1,11 +1,17 @@
 if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mCli loaded.\u001B[40;0m');
-import { formatBytes, formatUptime, hasAnyParameter, hasParameter, inspectError, Inspector, Tracker } from '@matterbridge/utils';
+import { ThreadsManager } from '@matterbridge/thread/manager';
+import { hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
+import { inspectError } from '@matterbridge/utils/error';
+import { formatBytes, formatUptime } from '@matterbridge/utils/format';
+import { Inspector } from '@matterbridge/utils/inspector';
+import { Tracker } from '@matterbridge/utils/tracker';
 import { AnsiLogger } from 'node-ansi-logger';
 import { cliEmitter } from './cliEmitter.js';
 export let instance;
 export const tracker = new Tracker('Cli', false, false);
 export const inspector = new Inspector('Cli', false, false);
+const manager = new ThreadsManager();
 if (process.argv.includes('--no-ansi') || process.argv.includes('-no-ansi'))
     process.env.NO_COLOR = '1';
 const log = new AnsiLogger({ logName: 'Cli', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
@@ -59,6 +65,7 @@ async function shutdown() {
     if (hasParameter('inspect'))
         await stopInspector();
     stopCpuMemoryCheck();
+    manager.destroy();
     cliEmitter.emit('shutdown');
     process.exit(0);
 }

package/dist/cliHistory.js

@@ -3,7 +3,7 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
 import { writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { Tracker } from '@matterbridge/utils';
+import { Tracker } from '@matterbridge/utils/tracker';
 export function generateHistoryPage(options = {}) {
     const pageTitle = options.pageTitle ?? 'Matterbridge CPU & Memory History';
     const hostname = options.hostname ?? os.hostname();

package/dist/deviceManager.js

@@ -1,8 +1,8 @@
 if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mDevice Manager loaded.\u001B[40;0m');
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { dev } from '@matterbridge/types';
-import { hasParameter } from '@matterbridge/utils';
+import { hasParameter } from '@matterbridge/utils/cli';
 import { AnsiLogger, BLUE, CYAN, db, debugStringify, er } from 'node-ansi-logger';
 export function toBaseDevice(device) {
     return {

package/dist/frontend.js

@@ -9,9 +9,14 @@ import { BridgedDeviceBasicInformation } from '@matter/types/clusters/bridged-de
 import { PowerSource } from '@matter/types/clusters/power-source';
 import { CommissioningOptions } from '@matter/types/commissioning';
 import { FabricIndex } from '@matter/types/datatype';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, } from '@matterbridge/types';
-import { createZip, formatBytes, formatPercent, formatUptime, getParameter, hasParameter, inspectError, isValidArray, isValidBoolean, isValidNumber, isValidObject, isValidString, wait, withTimeout, } from '@matterbridge/utils';
+import { getParameter, hasParameter } from '@matterbridge/utils/cli';
+import { inspectError } from '@matterbridge/utils/error';
+import { formatBytes, formatPercent, formatUptime } from '@matterbridge/utils/format';
+import { isValidArray, isValidBoolean, isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
+import { wait, withTimeout } from '@matterbridge/utils/wait';
+import { createZip } from '@matterbridge/utils/zip';
 import { AnsiLogger, CYAN, db, debugStringify, er, nf, nt, rs, stringify, UNDERLINE, UNDERLINEOFF, YELLOW } from 'node-ansi-logger';
 import { cliEmitter, lastOsCpuUsage, lastProcessCpuUsage } from './cliEmitter.js';
 import { generateHistoryPage } from './cliHistory.js';
@@ -1429,8 +1434,7 @@ export class Frontend extends EventEmitter {
                 }
             }
             else if (data.method === '/api/checkupdates') {
-                const { createESMWorker } = await import('@matterbridge/thread');
-                createESMWorker('CheckUpdates', this.matterbridge.resolveWorkerDistFilePath('workerCheckUpdates.js'));
+                this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'CheckUpdates' } });
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
             else if (data.method === '/api/shellysysupdate') {

package/dist/helpers.d.ts

@@ -1,5 +1,5 @@
 import { Endpoint } from '@matter/node';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
-import { Matterbridge } from './matterbridge.js';
+import type { Matterbridge } from './matterbridge.js';
 export declare function addVirtualDevice(aggregatorEndpoint: Endpoint<AggregatorEndpoint>, name: string, type: 'light' | 'outlet' | 'switch' | 'mounted_switch', callback: () => Promise<void>): Promise<Endpoint>;
 export declare function addVirtualDevices(matterbridge: Matterbridge, aggregatorEndpoint: Endpoint<AggregatorEndpoint>): Promise<void>;

package/dist/helpers.js

@@ -12,7 +12,7 @@ import { OnOffPlugInUnitDevice } from '@matter/node/devices/on-off-plug-in-unit'
 import { Identify } from '@matter/types/clusters/identify';
 import { OnOff } from '@matter/types/clusters/on-off';
 import { VendorId } from '@matter/types/datatype';
-import { hasParameter } from '@matterbridge/utils';
+import { hasParameter } from '@matterbridge/utils/cli';
 export async function addVirtualDevice(aggregatorEndpoint, name, type, callback) {
     let deviceType;
     switch (type) {

package/dist/jestutils/jestHelpers.d.ts

@@ -5,7 +5,7 @@ import { AggregatorEndpoint } from '@matter/node/endpoints';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { LevelControl } from '@matter/types/clusters/level-control';
 import { DeviceTypeId } from '@matter/types/datatype';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { AnsiLogger } from 'node-ansi-logger';
 import { DeviceManager } from '../deviceManager.js';
 import { Frontend } from '../frontend.js';

package/dist/jestutils/jestHelpers.js

@@ -7,7 +7,7 @@ import { AggregatorEndpoint } from '@matter/node/endpoints';
 import { MdnsService } from '@matter/protocol';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { MATTER_STORAGE_NAME, NODE_STORAGE_DIR } from '@matterbridge/types';
 import { AnsiLogger, er, rs, UNDERLINE, UNDERLINEOFF } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
@@ -76,7 +76,7 @@ export async function setupTest(name, debug = false) {
     expect(typeof name).toBe('string');
     expect(name.length).toBeGreaterThanOrEqual(4);
     NAME = name;
-    HOMEDIR = path.join('jest', name);
+    HOMEDIR = path.join('.cache', 'jest', name);
     rmSync(HOMEDIR, { recursive: true, force: true });
     const { jest } = await import('@jest/globals');
     loggerDebugSpy = jest.spyOn(AnsiLogger.prototype, 'debug');
@@ -182,10 +182,10 @@ export async function startMatterbridge(bridgeMode = 'bridge', frontendPort = 82
     expect(matterbridge.initialized).toBeTruthy();
     expect(matterbridge.log).toBeDefined();
     expect(matterbridge.rootDirectory).toBe(path.resolve('./'));
-    expect(matterbridge.homeDirectory).toBe(path.join('jest', NAME));
-    expect(matterbridge.matterbridgeDirectory).toBe(path.join('jest', NAME, '.matterbridge'));
-    expect(matterbridge.matterbridgePluginDirectory).toBe(path.join('jest', NAME, 'Matterbridge'));
-    expect(matterbridge.matterbridgeCertDirectory).toBe(path.join('jest', NAME, '.mattercert'));
+    expect(matterbridge.homeDirectory).toBe(path.join(HOMEDIR));
+    expect(matterbridge.matterbridgeDirectory).toBe(path.join(HOMEDIR, '.matterbridge'));
+    expect(matterbridge.matterbridgePluginDirectory).toBe(path.join(HOMEDIR, 'Matterbridge'));
+    expect(matterbridge.matterbridgeCertDirectory).toBe(path.join(HOMEDIR, '.mattercert'));
     expect(plugins).toBeDefined();
     expect(plugins.size).toBe(pluginSize);
     expect(devices).toBeDefined();
@@ -255,13 +255,13 @@ export async function createMatterbridgeEnvironment(name, createOnly = false) {
     matterbridge = await Matterbridge.loadInstance(false);
     expect(matterbridge).toBeDefined();
     expect(matterbridge).toBeInstanceOf(Matterbridge);
-    matterbridge.matterbridgeVersion = '3.6.0';
+    matterbridge.matterbridgeVersion = '3.6.1';
     matterbridge.bridgeMode = 'bridge';
-    matterbridge.rootDirectory = path.join('jest', name);
-    matterbridge.homeDirectory = path.join('jest', name);
-    matterbridge.matterbridgeDirectory = path.join('jest', name, '.matterbridge');
-    matterbridge.matterbridgePluginDirectory = path.join('jest', name, 'Matterbridge');
-    matterbridge.matterbridgeCertDirectory = path.join('jest', name, '.mattercert');
+    matterbridge.rootDirectory = path.join(HOMEDIR);
+    matterbridge.homeDirectory = path.join(HOMEDIR);
+    matterbridge.matterbridgeDirectory = path.join(HOMEDIR, '.matterbridge');
+    matterbridge.matterbridgePluginDirectory = path.join(HOMEDIR, 'Matterbridge');
+    matterbridge.matterbridgeCertDirectory = path.join(HOMEDIR, '.mattercert');
     matterbridge.log.logLevel = "debug";
     frontend = matterbridge.frontend;
     plugins = matterbridge.plugins;
@@ -387,11 +387,11 @@ export function createTestEnvironment(name, createOnly = false) {
     expect(typeof name).toBe('string');
     expect(name.length).toBeGreaterThanOrEqual(4);
     log = new AnsiLogger({ logName: name, logTimestampFormat: 4, logLevel: "debug" });
-    rmSync(path.join('jest', name), { recursive: true, force: true });
+    rmSync(path.join(HOMEDIR), { recursive: true, force: true });
     environment = Environment.default;
     environment.vars.set('log.level', MatterLogLevel.DEBUG);
     environment.vars.set('log.format', MatterLogFormat.ANSI);
-    environment.vars.set('path.root', path.join('jest', name, '.matterbridge', MATTER_STORAGE_NAME));
+    environment.vars.set('path.root', path.join(HOMEDIR, '.matterbridge', MATTER_STORAGE_NAME));
     environment.vars.set('runtime.signals', false);
     environment.vars.set('runtime.exitcode', false);
     if (createOnly)

package/dist/matterNode.js

@@ -9,9 +9,13 @@ import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/brid
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { MdnsService } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from '@matterbridge/types';
-import { copyDirectory, getIntParameter, getParameter, hasParameter, inspectError, isValidNumber, isValidString, parseVersionString, wait, withTimeout } from '@matterbridge/utils';
+import { getIntParameter, getParameter, hasParameter } from '@matterbridge/utils/cli';
+import { copyDirectory } from '@matterbridge/utils/copy-dir';
+import { inspectError } from '@matterbridge/utils/error';
+import { isValidNumber, isValidString, parseVersionString } from '@matterbridge/utils/validate';
+import { wait, withTimeout } from '@matterbridge/utils/wait';
 import { AnsiLogger, BLUE, CYAN, db, debugStringify, er, nf, or, zb } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
 import { toBaseDevice } from './deviceManager.js';

package/dist/matterbridge.d.ts

@@ -2,7 +2,7 @@ import '@matter/nodejs';
 import EventEmitter from 'node:events';
 import { StorageContext, StorageManager, StorageService } from '@matter/general';
 import { Endpoint, ServerNode } from '@matter/node';
-import { AggregatorEndpoint } from '@matter/node/endpoints';
+import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { DeviceCertification } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
 import type { ApiMatter, MaybePromise, PlatformMatterbridge, SharedMatterbridge, SystemInformation } from '@matterbridge/types';

package/dist/matterbridge.js

@@ -10,12 +10,17 @@ import { inspect } from 'node:util';
 import { Crypto, Environment, LogFormat as MatterLogFormat, Logger, LogLevel as MatterLogLevel, StorageService, UINT16_MAX, UINT32_MAX, } from '@matter/general';
 import { Endpoint, NetworkClient, ServerNode } from '@matter/node';
 import { BasicInformationClient, BasicInformationServer } from '@matter/node/behaviors/basic-information';
-import { AggregatorEndpoint } from '@matter/node/endpoints';
+import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { PaseClient, Read, Subscribe } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from '@matterbridge/types';
-import { copyDirectory, createDirectory, excludedInterfaceNamePattern, formatBytes, formatPercent, formatUptime, getIntParameter, getParameter, hasParameter, isValidNumber, isValidObject, isValidString, parseVersionString, } from '@matterbridge/utils';
+import { getIntParameter, getParameter, hasParameter } from '@matterbridge/utils/cli';
+import { copyDirectory } from '@matterbridge/utils/copy-dir';
+import { createDirectory } from '@matterbridge/utils/create-dir';
+import { formatBytes, formatPercent, formatUptime } from '@matterbridge/utils/format';
+import { excludedInterfaceNamePattern } from '@matterbridge/utils/network';
+import { isValidNumber, isValidObject, isValidString, parseVersionString } from '@matterbridge/utils/validate';
 import { AnsiLogger, BLUE, BRIGHT, CYAN, db, debugStringify, er, GREEN, nf, nt, or, RED, RESET, rs, UNDERLINE, UNDERLINEOFF, wr, zb, } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
 import { DeviceManager } from './deviceManager.js';
@@ -353,7 +358,7 @@ export class Matterbridge extends EventEmitter {
                 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 { hexToBuffer } = await import('@matterbridge/utils');
+                const { hexToBuffer } = await import('@matterbridge/utils/hex');
                 this.certification = {
                     privateKey: hexToBuffer(pairingFileJson.privateKey),
                     certificate: hexToBuffer(pairingFileJson.certificate),
@@ -401,6 +406,7 @@ export class Matterbridge extends EventEmitter {
         this.logLevel = this.log.logLevel;
         this.frontend.logLevel = this.log.logLevel;
         MatterbridgeEndpoint.logLevel = this.log.logLevel;
+        this.server.request({ type: 'set_log_level', params: { logLevel: this.log.logLevel }, dst: 'all', src: 'matterbridge' });
         if (hasParameter('filelogger') || (await this.nodeContext.get('matterbridgeFileLog', false))) {
             AnsiLogger.setGlobalLogfile(path.join(this.matterbridgeDirectory, MATTERBRIDGE_LOGGER_FILE), this.log.logLevel, true);
             this.fileLogger = true;
@@ -637,7 +643,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
         if (hasParameter('loginterfaces')) {
-            const { logInterfaces } = await import('@matterbridge/utils');
+            const { logInterfaces } = await import('@matterbridge/utils/network');
             logInterfaces();
             this.shutdown = true;
             return;
@@ -725,18 +731,15 @@ export class Matterbridge extends EventEmitter {
         }
         clearTimeout(this.systemCheckTimeout);
         this.systemCheckTimeout = setTimeout(async () => {
-            const { createESMWorker } = await import('@matterbridge/thread');
-            createESMWorker('SystemCheck', this.resolveWorkerDistFilePath('workerSystemCheck.js'));
+            this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'SystemCheck' } });
         }, 120 * 1000).unref();
         clearTimeout(this.checkUpdateTimeout);
         this.checkUpdateTimeout = setTimeout(async () => {
-            const { createESMWorker } = await import('@matterbridge/thread');
-            createESMWorker('CheckUpdates', this.resolveWorkerDistFilePath('workerCheckUpdates.js'));
+            this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'CheckUpdates' } });
         }, 300 * 1000).unref();
         clearInterval(this.checkUpdateInterval);
         this.checkUpdateInterval = setInterval(async () => {
-            const { createESMWorker } = await import('@matterbridge/thread');
-            createESMWorker('CheckUpdates', this.resolveWorkerDistFilePath('workerCheckUpdates.js'));
+            this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'CheckUpdates' } });
         }, 12 * 60 * 60 * 1000).unref();
         if (hasParameter('test')) {
             this.bridgeMode = 'bridge';
@@ -752,13 +755,13 @@ export class Matterbridge extends EventEmitter {
             await this.nodeContext?.set('bridgeMode', 'bridge');
         }
         if (hasParameter('delay') && os.uptime() <= 60 * 5) {
-            const { wait } = await import('@matterbridge/utils');
+            const { wait } = await import('@matterbridge/utils/wait');
             const delay = getIntParameter('delay') || 120;
             this.log.warn('Delay switch found with system uptime less then 5 minutes. Waiting for ' + delay + ' seconds before starting matterbridge...');
             await wait(delay * 1000, 'Race condition delay', true);
         }
         if (hasParameter('fixed_delay')) {
-            const { wait } = await import('@matterbridge/utils');
+            const { wait } = await import('@matterbridge/utils/wait');
             const delay = getIntParameter('fixed_delay') || 120;
             this.log.warn('Fixed delay switch found. Waiting for ' + delay + ' seconds before starting matterbridge...');
             await wait(delay * 1000, 'Fixed race condition delay', true);
@@ -926,7 +929,7 @@ export class Matterbridge extends EventEmitter {
         if (this.globalModulesDirectory === '') {
             this.log.debug(`Getting global node_modules directory...`);
             try {
-                const { getGlobalNodeModules } = await import('@matterbridge/utils');
+                const { getGlobalNodeModules } = await import('@matterbridge/utils/npm-prefix');
                 this.globalModulesDirectory = await getGlobalNodeModules();
                 this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
                 await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
@@ -936,8 +939,7 @@ export class Matterbridge extends EventEmitter {
             }
         }
         else {
-            const { createESMWorker } = await import('@matterbridge/thread');
-            createESMWorker('NpmGlobalPrefix', this.resolveWorkerDistFilePath('workerGlobalPrefix.js'));
+            this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'GlobalPrefix' } });
         }
         this.log.debug(`Reading matterbridge package.json...`);
         const packageJson = JSON.parse(await fs.promises.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
@@ -1035,7 +1037,7 @@ export class Matterbridge extends EventEmitter {
         await this.cleanup('updating...', false);
     }
     async unregisterAndShutdownProcess(timeout = 1000) {
-        const { wait } = await import('@matterbridge/utils');
+        const { wait } = await import('@matterbridge/utils/wait');
         this.log.info('Unregistering all devices and shutting down...');
         if (this.serverNode)
             await this.serverNode.setStateOf(BasicInformationServer, { configurationVersion: this.serverNode.state.basicInformation.configurationVersion + 1 });
@@ -1107,7 +1109,7 @@ export class Matterbridge extends EventEmitter {
             }
             this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
             if (pause > 0) {
-                const { wait } = await import('@matterbridge/utils');
+                const { wait } = await import('@matterbridge/utils/wait');
                 this.log.debug(`Waiting ${pause}ms for the MessageExchange to finish...`);
                 await wait(pause, `Waiting ${pause}ms for the MessageExchange to finish...`, false);
             }
@@ -1174,20 +1176,22 @@ export class Matterbridge extends EventEmitter {
                 catch {
                 }
             }
-            this.log.debug(`Cleaning matter storage context for ${GREEN}Matterbridge${db}...`);
-            unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'sessions.resumptionRecords'), this.log);
-            unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'root.subscriptions.subscriptions'), this.log);
-            for (const plugin of this.plugins.array()) {
-                this.log.debug(`Cleaning matter storage context for plugin ${plg}${plugin.name}${db}...`);
-                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'sessions.resumptionRecords'), this.log);
-                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'root.subscriptions.subscriptions'), this.log);
-            }
-            for (const device of this.devices.array().filter((d) => d.mode === 'server')) {
-                if (!device.deviceName)
-                    continue;
-                this.log.debug(`Cleaning matter storage context for server node device ${dev}${device.deviceName}${db}...`);
-                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'sessions.resumptionRecords'), this.log);
-                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'root.subscriptions.subscriptions'), this.log);
+            if (getParameter('reset-sessions')) {
+                this.log.debug(`Cleaning matter storage context for ${GREEN}Matterbridge${db}...`);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'sessions.resumptionRecords'), this.log);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, 'Matterbridge', 'root.subscriptions.subscriptions'), this.log);
+                for (const plugin of this.plugins.array()) {
+                    this.log.debug(`Cleaning matter storage context for plugin ${plg}${plugin.name}${db}...`);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'sessions.resumptionRecords'), this.log);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, plugin.name, 'root.subscriptions.subscriptions'), this.log);
+                }
+                for (const device of this.devices.array().filter((d) => d.mode === 'server')) {
+                    if (!device.deviceName)
+                        continue;
+                    this.log.debug(`Cleaning matter storage context for server node device ${dev}${device.deviceName}${db}...`);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'sessions.resumptionRecords'), this.log);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME, device.deviceName.replace(/[ .]/g, ''), 'root.subscriptions.subscriptions'), this.log);
+                }
             }
             await this.frontend.stop();
             this.frontend.destroy();
@@ -1363,7 +1367,7 @@ export class Matterbridge extends EventEmitter {
     async startChildbridge(delay = 1000) {
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
-        const { wait } = await import('@matterbridge/utils');
+        const { wait } = await import('@matterbridge/utils/wait');
         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...');
@@ -1947,7 +1951,7 @@ export class Matterbridge extends EventEmitter {
         await matterServerNode.start();
     }
     async stopServerNode(matterServerNode, timeout = 10000) {
-        const { withTimeout } = await import('@matterbridge/utils');
+        const { withTimeout } = await import('@matterbridge/utils/wait');
         if (!matterServerNode)
             return;
         this.log.notice(`Closing ${matterServerNode.id} server node`);
@@ -2006,7 +2010,7 @@ export class Matterbridge extends EventEmitter {
         }
     }
     async addBridgedEndpoint(pluginName, device) {
-        const { waiter } = await import('@matterbridge/utils');
+        const { waiter } = await import('@matterbridge/utils/wait');
         const plugin = this.plugins.get(pluginName);
         if (!plugin) {
             this.log.error(`Error adding bridged endpoint ${dev}${device.deviceName}${er} (${zb}${device.id}${er}) plugin ${plg}${pluginName}${er} not found`);
@@ -2147,7 +2151,7 @@ export class Matterbridge extends EventEmitter {
         this.devices.remove(device);
     }
     async removeAllBridgedEndpoints(pluginName, delay = 0) {
-        const { wait } = await import('@matterbridge/utils');
+        const { wait } = await import('@matterbridge/utils/wait');
         this.log.debug(`Removing all bridged endpoints for plugin ${plg}${pluginName}${db}${delay > 0 ? ` with delay ${delay} ms` : ''}`);
         for (const device of this.devices.array().filter((device) => device.plugin === pluginName)) {
             await this.removeBridgedEndpoint(pluginName, device);

package/dist/matterbridgeEndpoint.js

@@ -59,7 +59,8 @@ import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/the
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
 import { VendorId } from '@matter/types/datatype';
-import { inspectError, isValidNumber, isValidObject, isValidString } from '@matterbridge/utils';
+import { inspectError } from '@matterbridge/utils/error';
+import { isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { AnsiLogger, CYAN, db, debugStringify, hk, or, YELLOW, zb } from 'node-ansi-logger';
 import { MatterbridgeActivatedCarbonFilterMonitoringServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeEnhancedColorControlServer, MatterbridgeFanControlServer, MatterbridgeHepaFilterMonitoringServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftTiltWindowCoveringServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgePresetThermostatServer, MatterbridgeServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeSwitchServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';

package/dist/matterbridgeEndpointHelpers.js

@@ -79,7 +79,9 @@ import { UserLabel } from '@matter/types/clusters/user-label';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import { WindowCovering } from '@matter/types/clusters/window-covering';
 import { MeasurementType } from '@matter/types/globals';
-import { deepCopy, deepEqual, isValidArray } from '@matterbridge/utils';
+import { deepCopy } from '@matterbridge/utils/deep-copy';
+import { deepEqual } from '@matterbridge/utils/deep-equal';
+import { isValidArray } from '@matterbridge/utils/validate';
 import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from 'node-ansi-logger';
 import { MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDeviceEnergyManagementModeServer, MatterbridgeDeviceEnergyManagementServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeLiftWindowCoveringServer, MatterbridgeModeSelectServer, MatterbridgeOnOffServer, MatterbridgeOperationalStateServer, MatterbridgePowerSourceServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, } from './matterbridgeBehaviors.js';
 export function capitalizeFirstLetter(name) {

package/dist/matterbridgePlatform.js

@@ -3,8 +3,9 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
 import path from 'node:path';
 import { BridgedDeviceBasicInformation } from '@matter/types/clusters/bridged-device-basic-information';
 import { Descriptor } from '@matter/types/clusters/descriptor';
-import { BroadcastServer } from '@matterbridge/thread';
-import { hasParameter, isValidArray, isValidObject, isValidString } from '@matterbridge/utils';
+import { BroadcastServer } from '@matterbridge/thread/server';
+import { hasParameter } from '@matterbridge/utils/cli';
+import { isValidArray, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { CYAN, db, er, nf, wr } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';

package/dist/pluginManager.js

@@ -1,9 +1,10 @@
 if (process.argv.includes('--loader') || process.argv.includes('-loader'))
     console.log('\u001B[32mPlugin Manager loaded.\u001B[40;0m');
 import EventEmitter from 'node:events';
-import { BroadcastServer } from '@matterbridge/thread';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { plg, typ } from '@matterbridge/types';
-import { hasParameter, inspectError, logError } from '@matterbridge/utils';
+import { hasParameter } from '@matterbridge/utils/cli';
+import { inspectError, logError } from '@matterbridge/utils/error';
 import { AnsiLogger, BLUE, CYAN, db, debugStringify, er, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr } from 'node-ansi-logger';
 import { isMatterbridgeAccessoryPlatform } from './matterbridgeAccessoryPlatform.js';
 import { isMatterbridgeDynamicPlatform } from './matterbridgeDynamicPlatform.js';

package/dist/spawn.js

@@ -1,10 +1,10 @@
-import { BroadcastServer } from '@matterbridge/thread';
-import { hasParameter } from '@matterbridge/utils';
+import { BroadcastServer } from '@matterbridge/thread/server';
+import { hasParameter } from '@matterbridge/utils/cli';
 import { AnsiLogger } from 'node-ansi-logger';
 export async function spawnCommand(command, args, packageCommand, packageName) {
     const { spawn } = await import('node:child_process');
-    const debug = hasParameter('debug') || hasParameter('verbose');
-    const verbose = hasParameter('verbose');
+    const debug = hasParameter('debug') || hasParameter('verbose') || hasParameter('debug-spawn') || hasParameter('verbose-spawn');
+    const verbose = hasParameter('verbose') || hasParameter('verbose-spawn');
     const log = new AnsiLogger({ logName: 'Spawn', logTimestampFormat: 4, logLevel: debug ? "debug" : "info" });
     const server = new BroadcastServer('spawn', log);
     const sendLog = (name, message) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.6.0",
+  "version": "3.6.1-dev-20260309-6341dee",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -122,14 +122,14 @@
   ],
   "dependencies": {
     "@matter/main": "0.16.10",
-    "@matterbridge/dgram": "3.6.0",
-    "@matterbridge/thread": "3.6.0",
-    "@matterbridge/types": "3.6.0",
-    "@matterbridge/utils": "3.6.0",
+    "@matterbridge/dgram": "3.6.1-dev-20260309-6341dee",
+    "@matterbridge/thread": "3.6.1-dev-20260309-6341dee",
+    "@matterbridge/types": "3.6.1-dev-20260309-6341dee",
+    "@matterbridge/utils": "3.6.1-dev-20260309-6341dee",
     "archiver": "7.0.1",
     "express": "5.2.1",
     "glob": "13.0.6",
-    "multer": "2.1.0",
+    "multer": "2.1.1",
     "node-ansi-logger": "3.2.0",
     "node-persist-manager": "2.0.1",
     "ws": "8.19.0"