@matterbridge/core 3.7.2-dev-20260330-bb55c39 → 3.7.2-dev-20260402-c12a10e

package/dist/frontend.js

@@ -1,5 +1,3 @@
-if (process.argv.includes('--loader') || process.argv.includes('-loader'))
-    console.log('\u001B[32mFrontend loaded.\u001B[40;0m');
 import EventEmitter from 'node:events';
 import os from 'node:os';
 import path from 'node:path';
@@ -10,7 +8,7 @@ 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/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 { MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, } from '@matterbridge/types';
 import { getParameter, hasParameter } from '@matterbridge/utils/cli';
 import { inspectError } from '@matterbridge/utils/error';
 import { formatBytes, formatPercent, formatUptime } from '@matterbridge/utils/format';
@@ -20,6 +18,8 @@ import { AnsiLogger, CYAN, db, debugStringify, er, nf, nt, rs, stringify, UNDERL
 import { cliEmitter, lastOsCpuUsage, lastProcessCpuUsage } from './cliEmitter.js';
 import { generateHistoryPage } from './cliHistory.js';
 import { capitalizeFirstLetter, getAttribute } from './matterbridgeEndpointHelpers.js';
+if (hasParameter('loader'))
+    console.log('\u001B[32mFrontend loaded.\u001B[40;0m');
 export class Frontend extends EventEmitter {
     matterbridge;
     log;
@@ -35,6 +35,13 @@ export class Frontend extends EventEmitter {
     serverFetchTimeout = 2000;
     debug = hasParameter('debug') || hasParameter('verbose');
     verbose = hasParameter('verbose');
+    readOnly = hasParameter('readonly') || hasParameter('shelly');
+    shellyBoard = hasParameter('shelly');
+    shellySysUpdate = false;
+    shellyMainUpdate = false;
+    restartRequired = false;
+    fixedRestartRequired = false;
+    updateRequired = false;
     constructor(matterbridge) {
         super();
         this.matterbridge = matterbridge;
@@ -45,13 +52,13 @@ export class Frontend extends EventEmitter {
             logLevel: hasParameter('debug') ? "debug" : "info",
         });
         this.server = new BroadcastServer('frontend', this.log);
-        this.server.on('broadcast_message', this.msgHandler.bind(this));
+        this.server.on('broadcast_message', this.broadcastMsgHandler.bind(this));
     }
     destroy() {
-        this.server.off('broadcast_message', this.msgHandler.bind(this));
+        this.server.off('broadcast_message', this.broadcastMsgHandler.bind(this));
         this.server.close();
     }
-    async msgHandler(msg) {
+    async broadcastMsgHandler(msg) {
         if (this.server.isWorkerRequest(msg)) {
             if (this.verbose)
                 this.log.debug(`Received broadcast request ${CYAN}${msg.type}${db} from ${CYAN}${msg.src}${db}: ${debugStringify(msg)}${db}`);
@@ -116,6 +123,8 @@ export class Frontend extends EventEmitter {
                     if (msg.result && msg.result.packageCommand === 'install') {
                         this.wssSendCloseSnackbarMessage(`Installing package ${msg.result.packageName}...`);
                         if (msg.result.success) {
+                            this.restartRequired = true;
+                            this.fixedRestartRequired = true;
                             this.wssSendRestartRequired(true, true);
                             this.wssSendSnackbarMessage(`Installed package ${msg.result.packageName}`, 5, 'success');
                         }
@@ -126,6 +135,8 @@ export class Frontend extends EventEmitter {
                     if (msg.result && msg.result.packageCommand === 'uninstall') {
                         this.wssSendCloseSnackbarMessage(`Uninstalling package ${msg.result.packageName}...`);
                         if (msg.result.success) {
+                            this.restartRequired = true;
+                            this.fixedRestartRequired = true;
                             this.wssSendRestartRequired(true, true);
                             this.wssSendSnackbarMessage(`Uninstalled package ${msg.result.packageName}`, 5, 'success');
                         }
@@ -486,23 +497,23 @@ export class Frontend extends EventEmitter {
             };
             res.status(200).json(memoryReport);
         });
-        this.expressApp.get('/api/settings', express.json(), async (req, res) => {
+        this.expressApp.get('/api/settings', async (req, res) => {
             this.log.debug('The frontend sent /api/settings');
             if (!this.validateReq(req, res))
                 return;
-            res.json(await this.getApiSettings());
+            res.json(this.getApiSettings());
         });
         this.expressApp.get('/api/plugins', async (req, res) => {
             this.log.debug('The frontend sent /api/plugins');
             if (!this.validateReq(req, res))
                 return;
-            res.json(this.matterbridge.hasCleanupStarted ? [] : this.getPlugins());
+            res.json(this.getApiPlugins());
         });
         this.expressApp.get('/api/devices', async (req, res) => {
             this.log.debug('The frontend sent /api/devices');
             if (!this.validateReq(req, res))
                 return;
-            res.json(this.matterbridge.hasCleanupStarted ? [] : this.getDevices());
+            res.json(this.getApiDevices());
         });
         this.expressApp.get('/api/view-mblog', async (req, res) => {
             this.log.debug('The frontend sent /api/view-mblog');
@@ -699,14 +710,14 @@ export class Frontend extends EventEmitter {
             this.log.debug('The frontend sent /api/download-mjstorage');
             if (!this.validateReq(req, res))
                 return;
-            res.download(path.join(os.tmpdir(), `matterbridge.${MATTER_STORAGE_NAME}.zip`), `matterbridge.${MATTER_STORAGE_NAME}.zip`, (error) => {
+            res.download(path.join(os.tmpdir(), `matterbridge.${MATTER_STORAGE_DIR}.zip`), `matterbridge.${MATTER_STORAGE_DIR}.zip`, (error) => {
                 this.wssSendCloseSnackbarMessage('Creating matter storage backup...');
                 if (error) {
-                    this.log.error(`Error downloading the matter storage matterbridge.${MATTER_STORAGE_NAME}.zip: ${error instanceof Error ? error.message : error}`);
+                    this.log.error(`Error downloading the matter storage matterbridge.${MATTER_STORAGE_DIR}.zip: ${error instanceof Error ? error.message : error}`);
                     res.status(500).send('Error downloading the matter storage zip file');
                 }
                 else {
-                    this.log.debug(`Matter storage matterbridge.${MATTER_STORAGE_NAME}.zip downloaded successfully`);
+                    this.log.debug(`Matter storage matterbridge.${MATTER_STORAGE_DIR}.zip downloaded successfully`);
                 }
             });
         });
@@ -842,7 +853,7 @@ export class Frontend extends EventEmitter {
         }
         this.log.debug('Frontend stopped successfully');
     }
-    async getApiSettings() {
+    getApiSettings() {
         this.matterbridge.systemInformation.totalMemory = formatBytes(os.totalmem());
         this.matterbridge.systemInformation.freeMemory = formatBytes(os.freemem());
         this.matterbridge.systemInformation.systemUptime = formatUptime(os.uptime());
@@ -863,31 +874,31 @@ export class Frontend extends EventEmitter {
             matterbridgeLatestVersion: this.matterbridge.matterbridgeLatestVersion,
             matterbridgeDevVersion: this.matterbridge.matterbridgeDevVersion,
             frontendVersion: this.matterbridge.frontendVersion,
-            dockerDev: undefined,
-            dockerVersion: undefined,
-            dockerLatestVersion: undefined,
-            dockerDevVersion: undefined,
+            dockerDev: this.matterbridge.dockerDev,
+            dockerVersion: this.matterbridge.dockerVersion,
+            dockerLatestVersion: this.matterbridge.dockerLatestVersion,
+            dockerDevVersion: this.matterbridge.dockerDevVersion,
             bridgeMode: this.matterbridge.bridgeMode,
             restartMode: this.matterbridge.restartMode,
             virtualMode: this.matterbridge.virtualMode,
             profile: this.matterbridge.profile,
-            readOnly: this.matterbridge.readOnly,
-            shellyBoard: this.matterbridge.shellyBoard,
-            shellySysUpdate: this.matterbridge.shellySysUpdate,
-            shellyMainUpdate: this.matterbridge.shellyMainUpdate,
-            loggerLevel: await this.matterbridge.getLogLevel(),
+            loggerLevel: this.matterbridge.logLevel,
             fileLogger: this.matterbridge.fileLogger,
-            matterLoggerLevel: Logger.level,
+            matterLoggerLevel: this.matterbridge.matterLogLevel,
             matterFileLogger: this.matterbridge.matterFileLogger,
             matterMdnsInterface: this.matterbridge.mdnsInterface,
             matterIpv4Address: this.matterbridge.ipv4Address,
             matterIpv6Address: this.matterbridge.ipv6Address,
-            matterPort: (await this.matterbridge.nodeContext?.get('matterport', 5540)) ?? 5540,
-            matterDiscriminator: await this.matterbridge.nodeContext?.get('matterdiscriminator'),
-            matterPasscode: await this.matterbridge.nodeContext?.get('matterpasscode'),
-            restartRequired: this.matterbridge.restartRequired,
-            fixedRestartRequired: this.matterbridge.fixedRestartRequired,
-            updateRequired: this.matterbridge.updateRequired,
+            matterPort: this.matterbridge.port || 5540,
+            matterDiscriminator: this.matterbridge.discriminator,
+            matterPasscode: this.matterbridge.passcode,
+            readOnly: this.readOnly,
+            shellyBoard: this.shellyBoard,
+            shellySysUpdate: this.shellySysUpdate,
+            shellyMainUpdate: this.shellyMainUpdate,
+            restartRequired: this.restartRequired,
+            fixedRestartRequired: this.fixedRestartRequired,
+            updateRequired: this.updateRequired,
         };
         return { systemInformation: this.matterbridge.systemInformation, matterbridgeInformation: info };
     }
@@ -1065,7 +1076,7 @@ export class Frontend extends EventEmitter {
         });
         return attributes.trimStart().trimEnd();
     }
-    getPlugins() {
+    getApiPlugins() {
         if (this.matterbridge.hasCleanupStarted)
             return [];
         const plugins = [];
@@ -1100,7 +1111,7 @@ export class Frontend extends EventEmitter {
         }
         return plugins;
     }
-    getDevices(pluginName) {
+    getApiDevices(pluginName) {
         if (this.matterbridge.hasCleanupStarted)
             return [];
         const devices = [];
@@ -1488,7 +1499,7 @@ export class Frontend extends EventEmitter {
             else if (data.method === '/api/create-matter-storage-backup') {
                 this.wssSendSnackbarMessage('Creating matter storage backup...', 0);
                 this.log.notice(`Creating matter storage backup...`);
-                this.zip('zip', path.join(os.tmpdir(), `matterbridge.${MATTER_STORAGE_NAME}.zip`), [path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_NAME)], '');
+                this.zip('zip', path.join(os.tmpdir(), `matterbridge.${MATTER_STORAGE_DIR}.zip`), [path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_DIR)], '');
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
             }
             else if (data.method === '/api/create-plugin-backup') {
@@ -1580,14 +1591,13 @@ export class Frontend extends EventEmitter {
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: matter });
             }
             else if (data.method === '/api/settings') {
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: await this.getApiSettings() });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: this.getApiSettings() });
             }
             else if (data.method === '/api/plugins') {
-                const plugins = this.matterbridge.hasCleanupStarted ? [] : this.getPlugins();
-                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: plugins });
+                sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: this.getApiPlugins() });
             }
             else if (data.method === '/api/devices') {
-                const devices = this.matterbridge.hasCleanupStarted ? [] : this.getDevices(isValidString(data.params.pluginName) ? data.params.pluginName : undefined);
+                const devices = this.getApiDevices(isValidString(data.params.pluginName) ? data.params.pluginName : undefined);
                 sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true, response: devices });
             }
             else if (data.method === '/api/clusters') {
@@ -2033,8 +2043,8 @@ export class Frontend extends EventEmitter {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
         this.log.debug('Sending a restart required message to all connected clients');
-        this.matterbridge.restartRequired = true;
-        this.matterbridge.fixedRestartRequired = fixed;
+        this.restartRequired = true;
+        this.fixedRestartRequired = fixed;
         if (snackbar === true)
             this.wssSendSnackbarMessage(`Restart required`, 0);
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'restart_required', success: true, response: { fixed } });
@@ -2043,7 +2053,7 @@ export class Frontend extends EventEmitter {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
         this.log.debug('Sending a restart not required message to all connected clients');
-        this.matterbridge.restartRequired = false;
+        this.restartRequired = false;
         if (snackbar === true)
             this.wssSendCloseSnackbarMessage(`Restart required`);
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'restart_not_required', success: true });
@@ -2052,7 +2062,7 @@ export class Frontend extends EventEmitter {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
         this.log.debug('Sending an update required message to all connected clients');
-        this.matterbridge.updateRequired = true;
+        this.updateRequired = true;
         this.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'update_required', success: true, response: { devVersion } });
     }
     wssSendCpuUpdate(cpuUsage, processCpuUsage) {
@@ -2119,7 +2129,7 @@ export class Frontend extends EventEmitter {
         if (!this.listening || this.webSocketServer?.clients.size === 0)
             return;
         const stringifiedMsg = JSON.stringify(msg);
-        if (msg.method !== 'log')
+        if (!['log', 'cpu_update', 'memory_update', 'uptime_update'].includes(msg.method))
             this.log.debug(`Sending a broadcast message: ${debugStringify(msg)}`);
         this.webSocketServer?.clients.forEach((client) => {
             if (client.readyState === client.OPEN) {

package/dist/helpers.js

@@ -74,11 +74,6 @@ export async function addVirtualDevice(aggregatorEndpoint, name, type, callback)
 }
 export async function addVirtualDevices(matterbridge, aggregatorEndpoint) {
     if (hasParameter('experimental') && matterbridge.bridgeMode === 'bridge' && aggregatorEndpoint) {
-        const lockPin = new MatterbridgeEndpoint(doorLockDevice, { id: 'door_lock_pin' });
-        lockPin.createDefaultBridgedDeviceBasicInformationClusterServer('Matterbridge Pin Lock', 'sn_system_lock', 0xfff1, 'Matterbridge', 'Matterbridge Virtual Device', 20000, '2.0.0');
-        lockPin.createPinDoorLockClusterServer();
-        lockPin.addRequiredClusterServers();
-        await aggregatorEndpoint.add(lockPin);
         const lockUserPin = new MatterbridgeEndpoint(doorLockDevice, { id: 'door_lock_user_pin' });
         lockUserPin.createDefaultBridgedDeviceBasicInformationClusterServer('Matterbridge User Pin Lock', 'sn_system_lock', 0xfff1, 'Matterbridge', 'Matterbridge Virtual Device', 20000, '2.0.0');
         lockUserPin.createUserPinDoorLockClusterServer();

package/dist/jestutils/jestHelpers.d.ts

@@ -83,7 +83,7 @@ export declare function createTestEnvironment(name: string, createOnly?: boolean
 export declare function destroyTestEnvironment(createOnly?: boolean): Promise<void>;
 export declare function flushAsync(ticks?: number, microTurns?: number, pause?: number): Promise<void>;
 export declare function logKeepAlives(log?: AnsiLogger): number;
-export declare function flushAllEndpointNumberPersistence(targetServer: ServerNode, rounds?: number): Promise<void>;
+export declare function flushAllEndpointNumberPersistence(targetServer: ServerNode, rounds?: number, pause?: number): Promise<void>;
 export declare function assertAllEndpointNumbersPersisted(targetServer: ServerNode): Promise<number>;
 export declare function closeServerNodeStores(targetServer?: ServerNode): Promise<void>;
 export declare function startServerNode(name: string, port: number, deviceType?: DeviceTypeId, createOnly?: boolean): Promise<[ServerNode<ServerNode.RootEndpoint>, Endpoint<AggregatorEndpoint>]>;

package/dist/jestutils/jestHelpers.js

@@ -8,7 +8,7 @@ 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/server';
-import { MATTER_STORAGE_NAME, NODE_STORAGE_DIR } from '@matterbridge/types';
+import { MATTER_STORAGE_DIR, NODE_STORAGE_DIR } from '@matterbridge/types';
 import { AnsiLogger, er, rs, UNDERLINE, UNDERLINEOFF } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
 import { Frontend } from '../frontend.js';
@@ -162,7 +162,7 @@ export async function startMatterbridge(bridgeMode = 'bridge', frontendPort = 82
     process.env['MATTERBRIDGE_START_MATTER_INTERVAL_MS'] = '100';
     process.env['MATTERBRIDGE_PAUSE_MATTER_INTERVAL_MS'] = '100';
     process.argv.length = 0;
-    process.argv.push(...originalProcessArgv, '-novirtual', '-debug', '-verbose', '-logger', 'debug', '-matterlogger', 'debug', bridgeMode === '' ? '-test' : '-' + bridgeMode, '-homedir', HOMEDIR, '-frontend', frontendPort.toString(), '-port', matterPort.toString(), '-passcode', passcode.toString(), '-discriminator', discriminator.toString());
+    process.argv.push(...originalProcessArgv, '--novirtual', '--debug', '--verbose', '--logger', 'debug', '--matterlogger', 'debug', bridgeMode === '' ? '--test' : '--' + bridgeMode, '--homedir', HOMEDIR, '--frontend', frontendPort.toString(), '--port', matterPort.toString(), '--passcode', passcode.toString(), '--discriminator', discriminator.toString());
     expect(Matterbridge.instance).toBeUndefined();
     matterbridge = await Matterbridge.loadInstance(true);
     expect(matterbridge.environment).toBeDefined();
@@ -198,7 +198,7 @@ export async function startMatterbridge(bridgeMode = 'bridge', frontendPort = 82
     expect(frontend.webSocketServer).toBeDefined();
     expect(matterbridge.nodeStorage).toBeDefined();
     expect(matterbridge.nodeContext).toBeDefined();
-    expect(Environment.default.vars.get('path.root')).toBe(path.join(matterbridge.matterbridgeDirectory, MATTER_STORAGE_NAME));
+    expect(Environment.default.vars.get('path.root')).toBe(path.join(matterbridge.matterbridgeDirectory, MATTER_STORAGE_DIR));
     expect(matterbridge.matterStorageService).toBeDefined();
     expect(matterbridge.matterStorageManager).toBeDefined();
     expect(matterbridge.matterbridgeContext).toBeDefined();
@@ -391,7 +391,7 @@ export function createTestEnvironment(name, createOnly = false) {
     environment = Environment.default;
     environment.vars.set('log.level', MatterLogLevel.DEBUG);
     environment.vars.set('log.format', MatterLogFormat.ANSI);
-    environment.vars.set('path.root', path.join(HOMEDIR, '.matterbridge', MATTER_STORAGE_NAME));
+    environment.vars.set('path.root', path.join(HOMEDIR, '.matterbridge', MATTER_STORAGE_DIR));
     environment.vars.set('runtime.signals', false);
     environment.vars.set('runtime.exitcode', false);
     if (createOnly)
@@ -442,13 +442,20 @@ export function logKeepAlives(log) {
     }
     return summary.handles.length + summary.requests.length;
 }
-export async function flushAllEndpointNumberPersistence(targetServer, rounds = 2) {
+export async function flushAllEndpointNumberPersistence(targetServer, rounds = 3, pause = 10) {
     const nodeStore = targetServer.env.get(ServerNodeStore);
     for (let i = 0; i < rounds; i++) {
-        await new Promise((resolve) => setImmediate(resolve));
+        await flushAsync(undefined, undefined, pause);
         await nodeStore.endpointStores.close();
     }
 }
+function getOwningServerNode(owner) {
+    let current = owner;
+    while (current.owner) {
+        current = current.owner;
+    }
+    return current;
+}
 function collectAllEndpoints(root) {
     const list = [];
     const walk = (ep) => {
@@ -569,7 +576,8 @@ export async function addDevice(owner, device, pause = 10) {
     expect(owner.lifecycle.isReady).toBeTruthy();
     expect(owner.construction.status).toBe(Lifecycle.Status.Active);
     expect(owner.lifecycle.isPartsReady).toBeTruthy();
-    await flushAsync(undefined, undefined, pause);
+    const targetServer = getOwningServerNode(owner);
+    await flushAllEndpointNumberPersistence(targetServer, 3, pause);
     try {
         await owner.add(device);
     }
@@ -587,7 +595,7 @@ export async function addDevice(owner, device, pause = 10) {
     expect(device.lifecycle.hasId).toBeTruthy();
     expect(device.lifecycle.hasNumber).toBeTruthy();
     expect(device.construction.status).toBe(Lifecycle.Status.Active);
-    await flushAsync(undefined, undefined, pause);
+    await flushAllEndpointNumberPersistence(targetServer, 3, pause);
     return true;
 }
 export async function deleteDevice(owner, device, pause = 10) {
@@ -596,6 +604,8 @@ export async function deleteDevice(owner, device, pause = 10) {
     expect(owner.lifecycle.isReady).toBeTruthy();
     expect(owner.construction.status).toBe(Lifecycle.Status.Active);
     expect(owner.lifecycle.isPartsReady).toBeTruthy();
+    const targetServer = getOwningServerNode(owner);
+    await flushAllEndpointNumberPersistence(targetServer, 3, pause);
     try {
         await device.delete();
     }
@@ -612,7 +622,7 @@ export async function deleteDevice(owner, device, pause = 10) {
     expect(device.lifecycle.hasId).toBeTruthy();
     expect(device.lifecycle.hasNumber).toBeTruthy();
     expect(device.construction.status).toBe(Lifecycle.Status.Destroyed);
-    await flushAsync(undefined, undefined, pause);
+    await flushAllEndpointNumberPersistence(targetServer, 3, pause);
     return true;
 }
 export function getMoveToLevelRequest(level, transitionTime, executeIfOff) {

package/dist/matterNode.js

@@ -10,7 +10,7 @@ import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { MdnsService } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types';
 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 { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from '@matterbridge/types';
 import { getIntParameter, getParameter, hasParameter } from '@matterbridge/utils/cli';
 import { copyDirectory } from '@matterbridge/utils/copy-dir';
 import { inspectError } from '@matterbridge/utils/error';
@@ -78,8 +78,8 @@ export class MatterNode extends EventEmitter {
         if (this.verbose)
             this.log.debug(`PluginManager is ready`);
         this.environment.vars.set('log.level', MatterLogLevel.DEBUG);
-        this.environment.vars.set('log.format', MatterLogFormat.ANSI);
-        this.environment.vars.set('path.root', path.join(matterbridge.matterbridgeDirectory, MATTER_STORAGE_NAME));
+        this.environment.vars.set('log.format', hasParameter('no-ansi') || process.env.NO_COLOR === '1' ? MatterLogFormat.PLAIN : MatterLogFormat.ANSI);
+        this.environment.vars.set('path.root', path.join(matterbridge.matterbridgeDirectory, MATTER_STORAGE_DIR));
         this.environment.vars.set('runtime.signals', false);
         this.environment.vars.set('runtime.exitcode', false);
         if (this.verbose)
@@ -280,17 +280,27 @@ export class MatterNode extends EventEmitter {
             this.matterLog.logFilePath = path.join(this.matterbridge.matterbridgeDirectory, MATTER_LOGGER_FILE);
         }
         return (text, message) => {
-            const logger = text.slice(44, 44 + 20).trim();
-            const msg = text.slice(65);
-            this.matterLog.logName = logger;
-            this.matterLog.log(MatterLogLevel.names[message.level], msg);
+            try {
+                let msg;
+                if (Logger.format === MatterLogFormat.ANSI) {
+                    msg = text.slice(65);
+                }
+                else {
+                    msg = text.split(message.facility)[1]?.trim();
+                }
+                this.matterLog.logName = message.facility;
+                this.matterLog.log(MatterLogLevel.names[message.level], msg);
+            }
+            catch (_error) {
+                this.log.debug(`Error parsing matter log message facility ${message.facility}`);
+            }
         };
     }
     async startMatterStorage() {
         this.log.info(`Starting matter node storage...`);
         this.matterStorageService = this.environment.get(StorageService);
         this.log.info(`Started matter node storage in ${CYAN}${this.matterStorageService.location}${nf}`);
-        await this.backupMatterStorage(path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_NAME), path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_NAME + '.backup'));
+        await this.backupMatterStorage(path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_DIR), path.join(this.matterbridge.matterbridgeDirectory, MATTER_STORAGE_DIR + '.backup'));
     }
     async backupMatterStorage(storageName, backupName) {
         this.log.info(`Creating matter node storage backup from ${CYAN}${storageName}${nf} to ${CYAN}${backupName}${nf}...`);

package/dist/matterbridge.d.ts

@@ -59,13 +59,6 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     readonly matterLog: AnsiLogger;
     matterLogLevel: LogLevel;
     matterFileLogger: boolean;
-    readonly readOnly: boolean;
-    readonly shellyBoard: boolean;
-    shellySysUpdate: boolean;
-    shellyMainUpdate: boolean;
-    restartRequired: boolean;
-    fixedRestartRequired: boolean;
-    updateRequired: boolean;
     readonly plugins: PluginManager;
     readonly devices: DeviceManager;
     readonly frontend: Frontend;

package/dist/matterbridge.js

@@ -14,7 +14,7 @@ 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/server';
-import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from '@matterbridge/types';
+import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from '@matterbridge/types';
 import { wait } from '@matterbridge/utils';
 import { getIntParameter, getParameter, hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
 import { copyDirectory } from '@matterbridge/utils/copy-dir';
@@ -90,13 +90,6 @@ export class Matterbridge extends EventEmitter {
     });
     matterLogLevel = this.matterLog.logLevel;
     matterFileLogger = false;
-    readOnly = hasParameter('readonly') || hasParameter('shelly');
-    shellyBoard = hasParameter('shelly');
-    shellySysUpdate = false;
-    shellyMainUpdate = false;
-    restartRequired = false;
-    fixedRestartRequired = false;
-    updateRequired = false;
     plugins = new PluginManager(this);
     devices = new DeviceManager();
     frontend = new Frontend(this);
@@ -207,8 +200,6 @@ export class Matterbridge extends EventEmitter {
             port: this.port,
             discriminator: this.discriminator,
             passcode: this.passcode,
-            shellySysUpdate: this.shellySysUpdate,
-            shellyMainUpdate: this.shellyMainUpdate,
         };
     }
     async msgHandler(msg) {
@@ -245,14 +236,6 @@ export class Matterbridge extends EventEmitter {
                     await this.nodeContext?.set('globalModulesDirectory', msg.params.prefix);
                     this.server.respond({ ...msg, result: { success: true } });
                     break;
-                case 'matterbridge_shelly_sys_update':
-                    this.shellySysUpdate = true;
-                    this.server.respond({ ...msg, result: { success: true } });
-                    break;
-                case 'matterbridge_shelly_main_update':
-                    this.shellyMainUpdate = true;
-                    this.server.respond({ ...msg, result: { success: true } });
-                    break;
                 case 'matterbridge_platform':
                     this.server.respond({ ...msg, result: { data: this.getPlatformMatterbridge(), success: true } });
                     break;
@@ -306,8 +289,6 @@ export class Matterbridge extends EventEmitter {
             switch (msg.type) {
                 case 'manager_spawn_response':
                     if (msg.result && msg.result.success && msg.result.packageCommand === 'install') {
-                        this.restartRequired = true;
-                        this.fixedRestartRequired = true;
                         const packageName = msg.result.packageName.replace(/@.*$/, '');
                         if (packageName === 'matterbridge') {
                             this.log.info('Matterbridge has been updated. Full restart required.');
@@ -349,7 +330,7 @@ export class Matterbridge extends EventEmitter {
         this.rootDirectory = currentFileDirectory.includes(path.join('packages', 'core')) ? path.resolve(currentFileDirectory, '../', '../', '../') : path.resolve(currentFileDirectory, '../', '../', '..', '../');
         this.environment.vars.set('log.level', MatterLogLevel.DEBUG);
         this.environment.vars.set('log.format', hasParameter('no-ansi') || process.env.NO_COLOR === '1' ? MatterLogFormat.PLAIN : MatterLogFormat.ANSI);
-        this.environment.vars.set('path.root', path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME));
+        this.environment.vars.set('path.root', path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR));
         this.environment.vars.set('runtime.signals', false);
         this.environment.vars.set('runtime.exitcode', false);
         this.registerProcessHandlers();
@@ -1053,28 +1034,19 @@ export class Matterbridge extends EventEmitter {
             this.matterLog.logFilePath = path.join(this.matterbridgeDirectory, MATTER_LOGGER_FILE);
         }
         return (text, message) => {
-            const logger = text.slice(44, 44 + 20).trim();
-            const msg = text.slice(65);
-            this.matterLog.logName = logger;
-            switch (message.level) {
-                case MatterLogLevel.DEBUG:
-                    this.matterLog.log("debug", msg);
-                    break;
-                case MatterLogLevel.INFO:
-                    this.matterLog.log("info", msg);
-                    break;
-                case MatterLogLevel.NOTICE:
-                    this.matterLog.log("notice", msg);
-                    break;
-                case MatterLogLevel.WARN:
-                    this.matterLog.log("warn", msg);
-                    break;
-                case MatterLogLevel.ERROR:
-                    this.matterLog.log("error", msg);
-                    break;
-                case MatterLogLevel.FATAL:
-                    this.matterLog.log("fatal", msg);
-                    break;
+            try {
+                let msg;
+                if (Logger.format === MatterLogFormat.ANSI) {
+                    msg = text.slice(65);
+                }
+                else {
+                    msg = text.split(message.facility)[1]?.trim();
+                }
+                this.matterLog.logName = message.facility;
+                this.matterLog.log(MatterLogLevel.names[message.level], msg);
+            }
+            catch (_error) {
+                this.log.debug(`Error parsing matter log message facility ${message.facility}`);
             }
         };
     }
@@ -1266,19 +1238,19 @@ export class Matterbridge extends EventEmitter {
             }
             if (hasParameter('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);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, 'Matterbridge', 'sessions.resumptionRecords'), this.log);
+                unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, '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);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, plugin.name, 'sessions.resumptionRecords'), this.log);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, 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);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, device.deviceName.replace(/[ .]/g, ''), 'sessions.resumptionRecords'), this.log);
+                    unlinkSafe(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, device.deviceName.replace(/[ .]/g, ''), 'root.subscriptions.subscriptions'), this.log);
                 }
             }
             await this.frontend.stop();
@@ -1308,10 +1280,10 @@ export class Matterbridge extends EventEmitter {
             this.devices.clear();
             if (message === 'shutting down with factory reset...') {
                 try {
-                    const dir = path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME);
+                    const dir = path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR);
                     this.log.info(`Removing matter storage directory: ${dir}`);
                     await fs.promises.rm(dir, { recursive: true });
-                    const backup = path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME + '.backup');
+                    const backup = path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR + '.backup');
                     this.log.info(`Removing matter storage backup directory: ${backup}`);
                     await fs.promises.rm(backup, { recursive: true });
                 }
@@ -1831,7 +1803,7 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Matter node storage manager "Matterbridge" created');
         this.matterbridgeContext = await this.createServerNodeContext('Matterbridge', 'Matterbridge', this.aggregatorDeviceType, this.aggregatorVendorId, this.aggregatorVendorName, this.aggregatorProductId, this.aggregatorProductName, this.aggregatorSerialNumber, this.aggregatorUniqueId);
         this.log.info('Matter node storage started');
-        await this.backupMatterStorage(path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME), path.join(this.matterbridgeDirectory, MATTER_STORAGE_NAME + '.backup'));
+        await this.backupMatterStorage(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR), path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR + '.backup'));
     }
     async backupMatterStorage(storageName, backupName) {
         this.log.info('Creating matter node storage backup...');

package/dist/matterbridgeEndpoint.d.ts

@@ -24,7 +24,7 @@ import { ClusterId, EndpointNumber } from '@matter/types/datatype';
 import { Semtag } from '@matter/types/globals';
 import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
-import { CommandHandler, CommandHandlerData, CommandHandlerFunction, CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
+import { CommandHandler, CommandHandlerData, CommandHandlerExecutionResult, CommandHandlerFunction, CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
 import { MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint } from './matterbridgeEndpointTypes.js';
 type BehaviorCommandName<T extends Behavior.Type> = {
     [K in keyof CommandsOfBehavior<T>]: K;
@@ -101,7 +101,7 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     addUserLabel(label: string, value: string): Promise<this>;
     addCommandHandler<C extends CommandHandlers>(command: C, handler: CommandHandlerFunction<C>): this;
     removeCommandHandler<C extends CommandHandlers>(command: C, handler: CommandHandlerFunction<C>): this;
-    executeCommandHandler<C extends CommandHandlers>(command: C, request: CommandHandlerData<C>['request'], cluster: CommandHandlerData<C>['cluster'], attributes: CommandHandlerData<C>['attributes'], endpoint: CommandHandlerData<C>['endpoint']): Promise<void>;
+    executeCommandHandler<C extends CommandHandlers>(command: C, request: CommandHandlerData<C>['request'], cluster: CommandHandlerData<C>['cluster'], attributes: CommandHandlerData<C>['attributes'], endpoint: CommandHandlerData<C>['endpoint']): Promise<CommandHandlerExecutionResult<C>>;
     invokeBehaviorCommand<T extends Behavior.Type, C extends BehaviorCommandName<T>>(cluster: T, command: C, params?: BehaviorCommandParams<T, C>): Promise<void>;
     invokeBehaviorCommand<T extends ClusterType, C extends keyof ClusterType.CommandsOf<T>>(cluster: T, command: C, params?: ClusterType.CommandsOf<T>[C] extends {
         requestSchema: infer S extends import('@matter/types/tlv').TlvSchema<unknown>;
@@ -182,9 +182,8 @@ export declare class MatterbridgeEndpoint extends Endpoint {
     }, airflowDirection?: FanControl.AirflowDirection): this;
     createDefaultHepaFilterMonitoringClusterServer(condition?: number, changeIndication?: ResourceMonitoring.ChangeIndication, inPlaceIndicator?: boolean | undefined, lastChangedTime?: number | null | undefined, replacementProductList?: ResourceMonitoring.ReplacementProduct[]): this;
     createDefaultActivatedCarbonFilterMonitoringClusterServer(condition?: number, changeIndication?: ResourceMonitoring.ChangeIndication, inPlaceIndicator?: boolean | undefined, lastChangedTime?: number | null | undefined, replacementProductList?: ResourceMonitoring.ReplacementProduct[]): this;
-    createDefaultDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType): this;
-    createPinDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType): this;
-    createUserPinDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType): this;
+    createDefaultDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType, autoRelockTime?: number): this;
+    createUserPinDoorLockClusterServer(lockState?: DoorLock.LockState, lockType?: DoorLock.LockType, autoRelockTime?: number, minPinCodeLength?: number, maxPinCodeLength?: number): this;
     createDefaultModeSelectClusterServer(description: string, supportedModes: ModeSelect.ModeOption[], currentMode?: number, startUpMode?: number): this;
     createDefaultValveConfigurationAndControlClusterServer(valveState?: ValveConfigurationAndControl.ValveState, valveLevel?: number): this;
     createDefaultPumpConfigurationAndControlClusterServer(pumpMode?: PumpConfigurationAndControl.OperationMode): this;