matterbridge 2.1.6-dev.4 → 2.1.6-dev.5

package/CHANGELOG.md

@@ -49,6 +49,7 @@ matterbridge-hass v. 0.0.8
 - [package]: Update matter.js to 0.12.4-alpha.0-20250212-b2729c9eb
 - [package]: Update matter.js to 0.12.4-alpha.0-20250213-1187f81eb
 - [package]: Update matter.js to 0.12.4-alpha.0-20250215-5af08a8d6
+- [package]: Update matter.js to 0.12.4-alpha.0-20250217-b0bba5179
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="./yellow-button.png" alt="Buy me a coffee" width="120">

package/dist/cli.js

@@ -1,62 +1,48 @@
 #!/usr/bin/env node
 import { Matterbridge } from './matterbridge.js';
-import { EventEmitter } from 'events';
+import { getIntParameter, hasParameter } from './utils/export.js';
+import { AnsiLogger, BRIGHT, CYAN, db, YELLOW } from './logger/export.js';
+import { EventEmitter } from 'node:events';
 export const cliEmitter = new EventEmitter();
 export let instance;
 let session;
 let memoryCheckInterval;
 let prevCpus;
 export let lastCpuUsage = 0;
-const cli = '\u001B[32m';
-const er = '\u001B[38;5;9m';
-const rs = '\u001B[40;0m';
-const db = '\u001B[38;5;245m';
-const CYAN = '\u001B[36m';
-const YELLOW = '\u001B[33m';
-const BRIGHT = '\u001B[1m';
-async function main() {
-    await startCpuMemoryCheck();
-    if (process.argv.includes('-inspector'))
-        await startInspector();
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Matterbridge.loadInstance() called` + rs);
-    instance = await Matterbridge.loadInstance(true);
-    registerHandlers();
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Matterbridge.loadInstance() exited` + rs);
-}
+let peakCpu = 0;
+let peakRss = 0;
+const log = new AnsiLogger({ logName: 'Cli', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
+const formatMemoryUsage = (bytes) => {
+    if (bytes >= 1024 ** 3) {
+        return `${(bytes / 1024 ** 3).toFixed(2)} GB`;
+    }
+    else if (bytes >= 1024 ** 2) {
+        return `${(bytes / 1024 ** 2).toFixed(2)} MB`;
+    }
+    else {
+        return `${(bytes / 1024).toFixed(2)} KB`;
+    }
+};
+const formatOsUpTime = (seconds) => {
+    if (seconds >= 86400) {
+        const days = Math.floor(seconds / 86400);
+        return `${days} day${days !== 1 ? 's' : ''}`;
+    }
+    if (seconds >= 3600) {
+        const hours = Math.floor(seconds / 3600);
+        return `${hours} hour${hours !== 1 ? 's' : ''}`;
+    }
+    if (seconds >= 60) {
+        const minutes = Math.floor(seconds / 60);
+        return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
+    }
+    return `${seconds} second${seconds !== 1 ? 's' : ''}`;
+};
 async function startCpuMemoryCheck() {
     const os = await import('node:os');
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Cpu memory check started` + rs);
+    log.debug(`Cpu memory check started`);
     prevCpus = os.cpus();
     clearInterval(memoryCheckInterval);
-    const formatMemoryUsage = (bytes) => {
-        if (bytes >= 1024 ** 3) {
-            return `${(bytes / 1024 ** 3).toFixed(2)} GB`;
-        }
-        else if (bytes >= 1024 ** 2) {
-            return `${(bytes / 1024 ** 2).toFixed(2)} MB`;
-        }
-        else {
-            return `${(bytes / 1024).toFixed(2)} KB`;
-        }
-    };
-    const formatOsUpTime = (seconds) => {
-        if (seconds >= 86400) {
-            const days = Math.floor(seconds / 86400);
-            return `${days} day${days !== 1 ? 's' : ''}`;
-        }
-        if (seconds >= 3600) {
-            const hours = Math.floor(seconds / 3600);
-            return `${hours} hour${hours !== 1 ? 's' : ''}`;
-        }
-        if (seconds >= 60) {
-            const minutes = Math.floor(seconds / 60);
-            return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
-        }
-        return `${seconds} second${seconds !== 1 ? 's' : ''}`;
-    };
     const interval = () => {
         const systemUptime = formatOsUpTime(Math.floor(os.uptime()));
         const processUptime = formatOsUpTime(Math.floor(process.uptime()));
@@ -69,13 +55,14 @@ async function startCpuMemoryCheck() {
         const heapUsed = formatMemoryUsage(memoryUsageRaw.heapUsed);
         const external = formatMemoryUsage(memoryUsageRaw.external);
         const arrayBuffers = formatMemoryUsage(memoryUsageRaw.arrayBuffers);
+        if (memoryUsageRaw.rss > peakRss)
+            peakRss = memoryUsageRaw.rss;
         cliEmitter.emit('memory', totalMememory, freeMemory, rss, heapTotal, heapUsed, external, arrayBuffers);
         const currCpus = os.cpus();
         let cpuUsageLog;
         if (currCpus.length !== prevCpus.length) {
             prevCpus = currCpus;
-            if (process.argv.includes('-debug'))
-                console.log(cli + `CLI: Cpu check length failed, resetting previous cpus` + rs);
+            log.debug(`Cpu check length failed, resetting previous cpus`);
             return;
         }
         let totalIdle = 0, totalTick = 0;
@@ -88,59 +75,63 @@ async function startCpuMemoryCheck() {
         });
         const cpuUsage = 100 - (totalIdle / totalTick) * 100;
         if (totalTick === 0 || isNaN(cpuUsage) || !isFinite(cpuUsage) || cpuUsage <= 0) {
-            if (process.argv.includes('-debug') && lastCpuUsage != 0)
-                console.log(cli + `CLI: Cpu check failed, using previous cpus` + rs);
+            if (lastCpuUsage != 0)
+                log.debug(`Cpu check failed, using previous cpus`);
             cpuUsageLog = lastCpuUsage.toFixed(2);
         }
         else {
             cpuUsageLog = cpuUsage.toFixed(2);
             lastCpuUsage = cpuUsage;
+            if (lastCpuUsage > peakCpu)
+                peakCpu = lastCpuUsage;
             cliEmitter.emit('cpu', lastCpuUsage);
         }
         prevCpus = currCpus;
-        if (process.argv.includes('-debug'))
-            console.log(`${YELLOW}${BRIGHT}Cpu usage:${db} ${CYAN}${cpuUsageLog.padStart(6, ' ')} %${db} ${YELLOW}${BRIGHT}Memory usage:${db} rss ${CYAN}${rss}${db} heapTotal ${CYAN}${heapTotal}${db} heapUsed ${CYAN}${heapUsed}${db} external ${external} arrayBuffers ${arrayBuffers}` +
-                rs);
+        log.debug(`***${YELLOW}${BRIGHT}Cpu usage:${db} ${CYAN}${cpuUsageLog.padStart(6, ' ')} %${db} ${YELLOW}${BRIGHT}Memory usage:${db} rss ${CYAN}${rss}${db} heapTotal ${CYAN}${heapTotal}${db} heapUsed ${CYAN}${heapUsed}${db} external ${external} arrayBuffers ${arrayBuffers}`);
     };
     interval();
-    memoryCheckInterval = setInterval(interval, 10 * 1000);
+    memoryCheckInterval = setInterval(interval, getIntParameter('memoryinterval') ?? 10 * 1000);
 }
 async function stopCpuMemoryCheck() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Cpu memory check stopped` + rs);
+    log.debug(`***Cpu memory check stopped. Peak cpu: ${CYAN}${peakCpu.toFixed(2)} %${db}. Peak rss: ${CYAN}${formatMemoryUsage(peakRss)}${db}.`);
     clearInterval(memoryCheckInterval);
 }
 async function startInspector() {
     const { Session } = await import('node:inspector');
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Starting heap sampling...` + rs);
+    log.debug(`Starting heap sampling...`);
     session = new Session();
     session.connect();
-    session.post('HeapProfiler.startSampling', {}, (err) => {
-        if (err)
-            console.error(err);
-        else
-            console.log(cli + `CLI: Heap sampling started` + rs);
+    await new Promise((resolve, reject) => {
+        session?.post('HeapProfiler.startSampling', {}, (err) => (err ? reject(err) : resolve()));
     });
+    log.debug(`Started heap sampling`);
 }
 async function stopInspector() {
     const { writeFileSync } = await import('node:fs');
-    if (process.argv.includes('-debug'))
-        console.log(cli + `CLI: Stopping heap sampling...` + rs);
-    session?.post('HeapProfiler.stopSampling', (err, result) => {
-        if (err) {
-            console.error(err);
-        }
-        else {
-            const profile = JSON.stringify(result.profile, null, 2);
-            writeFileSync('heap-sampling-profile.heapsnapshot', profile);
-            console.log(cli + `CLI: Heap sampling profile saved to heap-sampling-profile.heapsnapshot` + rs);
-        }
-        session?.disconnect();
+    log.debug(`Stopping heap sampling...`);
+    if (!session) {
+        log.error('No active inspector session.');
+        return;
+    }
+    try {
+        const result = await new Promise((resolve, reject) => {
+            session?.post('HeapProfiler.stopSampling', (err, result) => (err ? reject(err) : resolve(result)));
+        });
+        const profile = JSON.stringify(result.profile);
+        writeFileSync('Heap-sampling-profile.heapprofile', profile);
+        log.debug('Heap sampling profile saved to Heap-sampling-profile.heapprofile');
+    }
+    catch (err) {
+        log.error(`Failed to stop heap sampling: ${err instanceof Error ? err.message : err}`);
+    }
+    finally {
+        session.disconnect();
         session = undefined;
-    });
+        log.debug(`Stopped heap sampling`);
+    }
 }
 function registerHandlers() {
+    log.debug('Registering event handlers...');
     if (instance)
         instance.on('shutdown', async () => shutdown());
     if (instance)
@@ -151,38 +142,49 @@ function registerHandlers() {
         instance.on('startmemorycheck', async () => start());
     if (instance)
         instance.on('stopmemorycheck', async () => stop());
+    log.debug('Registered event handlers');
 }
 async function shutdown() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'CLI: received shutdown event, exiting...' + rs);
-    if (process.argv.includes('-inspector'))
+    log.debug('Received shutdown event, exiting...');
+    if (hasParameter('inspect'))
         await stopInspector();
     await stopCpuMemoryCheck();
     process.exit(0);
 }
 async function restart() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'CLI: received restart event, loading...' + rs);
+    log.debug('Received restart event, loading...');
     instance = await Matterbridge.loadInstance(true);
     registerHandlers();
 }
 async function update() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'CLI: received update event, updating...' + rs);
+    log.debug('Received update event, updating...');
     instance = await Matterbridge.loadInstance(true);
     registerHandlers();
 }
 async function start() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'CLI: received start memory check event' + rs);
+    log.debug('Received start memory check event');
     startCpuMemoryCheck();
 }
 async function stop() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'CLI: received stop memory check event' + rs);
+    log.debug('Received stop memory check event');
     stopCpuMemoryCheck();
 }
+async function main() {
+    log.debug(`Cli main() started`);
+    await startCpuMemoryCheck();
+    if (hasParameter('inspect'))
+        await startInspector();
+    log.debug(`***Matterbridge.loadInstance(true) called`);
+    instance = await Matterbridge.loadInstance(true);
+    log.debug(`***Matterbridge.loadInstance(true) exited`);
+    if (instance.shutdown) {
+        shutdown();
+    }
+    else {
+        registerHandlers();
+    }
+}
 process.title = 'matterbridge';
 main().catch((error) => {
-    console.error(er + `CLI: Matterbridge.loadInstance() failed with error: ${error}` + rs);
+    log.error(`Matterbridge.loadInstance() failed with error: ${error instanceof Error ? error.message : error}`);
 });

package/dist/frontend.js

@@ -1,14 +1,15 @@
 import { EndpointServer, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat } from '@matter/main';
-import { createServer } from 'http';
+import { createServer } from 'node:http';
 import https from 'https';
 import express from 'express';
 import WebSocket, { WebSocketServer } from 'ws';
-import os from 'os';
-import path from 'path';
-import { promises as fs } from 'fs';
+import os from 'node:os';
+import path from 'node:path';
+import { promises as fs } from 'node:fs';
 import { AnsiLogger, stringify, debugStringify, CYAN, db, er, nf, rs, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from './logger/export.js';
-import { createZip, deepCopy, hasParameter, isValidNumber, isValidObject, isValidString } from './utils/utils.js';
+import { createZip, deepCopy, isValidNumber, isValidObject, isValidString } from './utils/export.js';
 import { plg } from './matterbridgeTypes.js';
+import { hasParameter } from './utils/export.js';
 export const WS_ID_LOG = 0;
 export const WS_ID_REFRESH_NEEDED = 1;
 export const WS_ID_RESTART_NEEDED = 2;
@@ -236,7 +237,7 @@ export class Frontend {
                 space_available_size: this.formatMemoryUsage(space.space_available_size),
                 physical_space_size: this.formatMemoryUsage(space.physical_space_size),
             }));
-            const { default: module } = await import('module');
+            const { default: module } = await import('node:module');
             const loadedModules = module._cache ? Object.keys(module._cache).sort() : [];
             const memoryReport = {
                 memoryUsage,

package/dist/index.js

@@ -1,4 +1,6 @@
 import { Matterbridge } from './matterbridge.js';
+import { hasParameter } from './utils/export.js';
+import { AnsiLogger } from './logger/export.js';
 export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
 export * from '@matter/main/clusters';
 export * from '@matter/main/types';
@@ -11,16 +13,12 @@ export * from './matterbridgeDeviceTypes.js';
 export * from './matterbridgePlatform.js';
 export * from './matterbridgeAccessoryPlatform.js';
 export * from './matterbridgeDynamicPlatform.js';
-const cli = '\u001B[32m';
-const er = '\u001B[38;5;9m';
-const rs = '\u001B[40;0m';
+const log = new AnsiLogger({ logName: 'Main', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
 async function main() {
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'MAIN: Matterbridge.loadInstance() called' + rs);
+    log.debug('***Matterbridge.loadInstance() called');
     await Matterbridge.loadInstance();
-    if (process.argv.includes('-debug'))
-        console.log(cli + 'MAIN: Matterbridge.loadInstance() exited' + rs);
+    log.debug('***Matterbridge.loadInstance() exited');
 }
 main().catch((error) => {
-    console.error(er + `MAIN: Matterbridge.loadInstance() failed with error: ${error}` + rs);
+    log.error(`Matterbridge.loadInstance() failed with error: ${error instanceof Error ? error.message : error}`);
 });

package/dist/matterbridge.js

@@ -1,13 +1,11 @@
-import { fileURLToPath } from 'url';
-import { promises as fs } from 'fs';
-import { exec, spawn } from 'child_process';
-import EventEmitter from 'events';
-import os from 'os';
-import path from 'path';
-import { randomBytes } from 'crypto';
-import { NodeStorageManager } from './storage/export.js';
+import os from 'node:os';
+import path from 'node:path';
+import { promises as fs } from 'node:fs';
+import EventEmitter from 'node:events';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from './logger/export.js';
-import { logInterfaces, copyDirectory, getParameter, getIntParameter, hasParameter, getNpmPackageVersion } from './utils/utils.js';
+import { NodeStorageManager } from './storage/export.js';
+import { getParameter, getIntParameter, hasParameter } from './utils/export.js';
+import { logInterfaces, copyDirectory, getNpmPackageVersion, getGlobalNodeModules } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
@@ -86,6 +84,7 @@ export class Matterbridge extends EventEmitter {
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
+    shutdown = false;
     edge = true;
     log;
     matterbrideLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
@@ -174,6 +173,7 @@ export class Matterbridge extends EventEmitter {
         return Matterbridge.instance;
     }
     async destroyInstance() {
+        this.log.info(`Destroy instance...`);
         const servers = [];
         if (this.bridgeMode === 'bridge') {
             if (this.serverNode)
@@ -186,6 +186,7 @@ export class Matterbridge extends EventEmitter {
             }
         }
         await this.cleanup('destroying instance...', false);
+        this.log.info(`Dispose ${servers.length} MdnsService...`);
         for (const server of servers) {
             await server.env.get(MdnsService)[Symbol.asyncDispose]();
             this.log.info(`Closed ${server.id} MdnsService`);
@@ -443,7 +444,7 @@ export class Matterbridge extends EventEmitter {
       - disable [plugin name]: disable the globally installed plugin with the given name
       - reset [plugin path]:   remove the commissioning for the plugin from the given absolute or relative path (childbridge mode). Shutdown Matterbridge before using it!
       - reset [plugin name]:   remove the commissioning for the globally installed plugin (childbridge mode). Shutdown Matterbridge before using it!${rs}`);
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('list')) {
@@ -472,7 +473,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.info(`  └─ endpoint ${RED}${device.endpoint}${nf} ${typ}${device.endpointName}${nf} ${debugStringify(device.clusterServersId)}`);
                 }
             });
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('logstorage')) {
@@ -482,41 +483,42 @@ export class Matterbridge extends EventEmitter {
                 this.log.info(`${plg}${plugin.name}${nf} storage log`);
                 await plugin.nodeContext?.logStorage();
             }
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('loginterfaces')) {
             this.log.info(`${plg}Matterbridge${nf} network interfaces log`);
             logInterfaces();
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('add')) {
             this.log.debug(`Adding plugin ${getParameter('add')}`);
             await this.plugins.add(getParameter('add'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('remove')) {
             this.log.debug(`Removing plugin ${getParameter('remove')}`);
             await this.plugins.remove(getParameter('remove'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('enable')) {
             this.log.debug(`Enabling plugin ${getParameter('enable')}`);
             await this.plugins.enable(getParameter('enable'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('disable')) {
             this.log.debug(`Disabling plugin ${getParameter('disable')}`);
             await this.plugins.disable(getParameter('disable'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('factoryreset')) {
             await this.shutdownProcessAndFactoryReset();
+            this.shutdown = true;
             return;
         }
         try {
@@ -528,6 +530,7 @@ export class Matterbridge extends EventEmitter {
         }
         if (hasParameter('reset') && getParameter('reset') === undefined) {
             await this.shutdownProcessAndReset();
+            this.shutdown = true;
             return;
         }
         if (hasParameter('reset') && getParameter('reset') !== undefined) {
@@ -535,20 +538,23 @@ export class Matterbridge extends EventEmitter {
             const plugin = this.plugins.get(getParameter('reset'));
             if (plugin) {
                 const matterStorageManager = await this.matterStorageService?.open(plugin.name);
-                if (!matterStorageManager)
+                if (!matterStorageManager) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} storageManager not found`);
-                await matterStorageManager?.createContext('events')?.clearAll();
-                await matterStorageManager?.createContext('fabrics')?.clearAll();
-                await matterStorageManager?.createContext('root')?.clearAll();
-                await matterStorageManager?.createContext('sessions')?.clearAll();
-                await matterStorageManager?.createContext('persist')?.clearAll();
-                this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
+                }
+                else {
+                    await matterStorageManager?.createContext('events')?.clearAll();
+                    await matterStorageManager?.createContext('fabrics')?.clearAll();
+                    await matterStorageManager?.createContext('root')?.clearAll();
+                    await matterStorageManager?.createContext('sessions')?.clearAll();
+                    await matterStorageManager?.createContext('persist')?.clearAll();
+                    this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
+                }
             }
             else {
                 this.log.warn(`Plugin ${plg}${getParameter('reset')}${wr} not registerd in matterbridge`);
             }
             await this.stopMatterStorage();
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
@@ -720,6 +726,7 @@ export class Matterbridge extends EventEmitter {
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
         this.matterbridgeInformation.homeDirectory = this.homeDirectory;
         this.log.debug(`Home Directory: ${this.homeDirectory}`);
+        const { fileURLToPath } = await import('node:url');
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
         this.matterbridgeInformation.rootDirectory = this.rootDirectory;
@@ -728,7 +735,9 @@ export class Matterbridge extends EventEmitter {
             this.globalModulesDirectory = this.matterbridgeInformation.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
         if (this.globalModulesDirectory === '') {
             try {
-                this.globalModulesDirectory = await this.getGlobalNodeModules();
+                this.execRunningCount++;
+                this.globalModulesDirectory = await getGlobalNodeModules();
+                this.execRunningCount--;
                 this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
                 this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
                 await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
@@ -797,20 +806,6 @@ export class Matterbridge extends EventEmitter {
         const cmdArgs = process.argv.slice(2).join(' ');
         this.log.debug(`Command Line Arguments: ${cmdArgs}`);
     }
-    async getGlobalNodeModules() {
-        return new Promise((resolve, reject) => {
-            this.execRunningCount++;
-            exec('npm root -g', (error, stdout) => {
-                this.execRunningCount--;
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    resolve(stdout.trim());
-                }
-            });
-        });
-    }
     async getMatterbridgeLatestVersion() {
         getNpmPackageVersion('matterbridge')
             .then(async (version) => {
@@ -1202,11 +1197,7 @@ export class Matterbridge extends EventEmitter {
             if (!plugin.enabled)
                 continue;
             if (plugin.type === 'DynamicPlatform') {
-                plugin.locked = true;
-                plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', bridge.code, this.aggregatorVendorId, 'Matterbridge', this.aggregatorProductId, plugin.description);
-                plugin.serverNode = await this.createServerNode(plugin.storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
-                plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
-                await plugin.serverNode.add(plugin.aggregatorNode);
+                await this.createDynamicPlugin(plugin);
             }
         }
         await this.startPlugins();
@@ -1259,7 +1250,7 @@ export class Matterbridge extends EventEmitter {
             for (const plugin of this.plugins) {
                 if (!plugin.enabled || plugin.error)
                     continue;
-                if (!plugin.addedDevices || plugin.addedDevices === 0) {
+                if (plugin.type !== 'DynamicPlatform' && (!plugin.addedDevices || plugin.addedDevices === 0)) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} didn't add any devices to Matterbridge. Verify the plugin configuration.`);
                     continue;
                 }
@@ -1315,6 +1306,7 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Matter node storage closed');
     }
     async createServerNodeContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber) {
+        const { randomBytes } = await import('node:crypto');
         if (!this.matterStorageService)
             throw new Error('No storage service initialized');
         this.log.info(`Creating server node storage context "${pluginName}.persist" for ${pluginName}...`);
@@ -1557,13 +1549,18 @@ export class Matterbridge extends EventEmitter {
         }
     }
     async advertiseServerNode(matterServerNode) {
-        if (matterServerNode && matterServerNode.lifecycle.isCommissioned) {
+        if (matterServerNode) {
             await matterServerNode.env.get(DeviceCommissioner)?.allowBasicCommissioning();
             const { qrPairingCode, manualPairingCode } = matterServerNode.state.commissioning.pairingCodes;
             this.log.notice(`Advertising for ${matterServerNode.id} is now started with the following pairing codes: qrPairingCode ${qrPairingCode}, manualPairingCode ${manualPairingCode}`);
             return { qrPairingCode, manualPairingCode };
         }
-        return undefined;
+    }
+    async stopAdvertiseServerNode(matterServerNode) {
+        if (matterServerNode && matterServerNode.lifecycle.isOnline) {
+            await matterServerNode.env.get(DeviceCommissioner)?.endCommissioning();
+            this.log.notice(`Stopped advertising for ${matterServerNode.id}`);
+        }
     }
     async createAggregatorNode(storageContext) {
         this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator `);
@@ -1635,15 +1632,6 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            if (plugin.registeredDevices === 0 && plugin.addedDevices === 0) {
-                if (plugin.serverNode) {
-                    await this.stopServerNode(plugin.serverNode);
-                    plugin.locked = false;
-                    plugin.aggregatorNode = undefined;
-                    plugin.serverNode = undefined;
-                    this.log.info(`Stopped server node for plugin ${plg}${pluginName}${nf}`);
-                }
-            }
         }
         this.devices.remove(device);
     }
@@ -1702,7 +1690,7 @@ export class Matterbridge extends EventEmitter {
     getVendorIdName = (vendorId) => {
         if (!vendorId)
             return '';
-        let vendorName = '';
+        let vendorName = '(Unknown vendorId)';
         switch (vendorId) {
             case 4937:
                 vendorName = '(AppleHome)';
@@ -1732,15 +1720,13 @@ export class Matterbridge extends EventEmitter {
                 vendorName = '(eWeLink)';
                 break;
             case 65521:
-                vendorName = '(PythonMatterServer)';
-                break;
-            default:
-                vendorName = '(unknown)';
+                vendorName = '(MatterServer)';
                 break;
         }
         return vendorName;
     };
     async spawnCommand(command, args = []) {
+        const { spawn } = await import('node:child_process');
         const cmdLine = command + ' ' + args.join(' ');
         if (process.platform === 'win32' && command === 'npm') {
             const argstring = 'npm ' + args.join(' ');

package/dist/matterbridgeEndpoint.js

@@ -1,6 +1,6 @@
 import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
-import { isValidNumber, isValidObject } from './utils/utils.js';
+import { isValidNumber, isValidObject } from './utils/export.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';

package/dist/matterbridgeEndpointHelpers.js

@@ -1,5 +1,6 @@
-import { createHash } from 'crypto';
+import { createHash } from 'node:crypto';
 import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from './logger/export.js';
+import { deepCopy, deepEqual, isValidArray } from './utils/export.js';
 import { MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
 import { Lifecycle } from '@matter/main';
 import { getClusterNameById } from '@matter/main/types';
@@ -73,7 +74,6 @@ import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-
 import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
-import { deepCopy, deepEqual, isValidArray } from './utils/utils.js';
 export function capitalizeFirstLetter(name) {
     if (!name)
         return name;