matterbridge 3.2.9-dev-20250924-2e9594f → 3.2.9-dev-20250926-85736bb

package/CHANGELOG.md

@@ -22,6 +22,7 @@ If you like this project and find it useful, please consider giving it a star on
 - [frontend]: Optimized WebSocker message handlers. Now, the handler targets the component.
 - [frontend]: Removed dangerouslySetInnerHTML from log rendering.
 - [frontend]: Added push update to Icon view and table view cluster panel.
+- [frontend]: Added install progress dialog when installing or uploading packages.
 - [endpoint]: Added occupancy feature to all Thermostat cluster helpers. When provided (either false or true) it will create a Thermostat with occupancy feature.
 - [endpoint]: Added outdoorTemperature to all Thermostat cluster helpers. Default is undefined (it will be ignored).
 

package/dist/frontend.js

@@ -21,6 +21,7 @@ export class Frontend extends EventEmitter {
     matterbridge;
     log;
     port = 8283;
+    listening = false;
     expressApp;
     httpServer;
     httpsServer;
@@ -63,6 +64,7 @@ export class Frontend extends EventEmitter {
             if (hasParameter('ingress')) {
                 this.httpServer.listen(this.port, '0.0.0.0', () => {
                     this.log.info(`The frontend http server is listening on ${UNDERLINE}http://0.0.0.0:${this.port}${UNDERLINEOFF}${rs}`);
+                    this.listening = true;
                     this.emit('server_listening', 'http', this.port, '0.0.0.0');
                 });
             }
@@ -72,6 +74,7 @@ export class Frontend extends EventEmitter {
                         this.log.info(`The frontend http server is listening on ${UNDERLINE}http://${this.matterbridge.systemInformation.ipv4Address}:${this.port}${UNDERLINEOFF}${rs}`);
                     if (this.matterbridge.systemInformation.ipv6Address !== '')
                         this.log.info(`The frontend http server is listening on ${UNDERLINE}http://[${this.matterbridge.systemInformation.ipv6Address}]:${this.port}${UNDERLINEOFF}${rs}`);
+                    this.listening = true;
                     this.emit('server_listening', 'http', this.port);
                 });
             }
@@ -164,6 +167,7 @@ export class Frontend extends EventEmitter {
             if (hasParameter('ingress')) {
                 this.httpsServer.listen(this.port, '0.0.0.0', () => {
                     this.log.info(`The frontend https server is listening on ${UNDERLINE}https://0.0.0.0:${this.port}${UNDERLINEOFF}${rs}`);
+                    this.listening = true;
                     this.emit('server_listening', 'https', this.port, '0.0.0.0');
                 });
             }
@@ -173,6 +177,7 @@ export class Frontend extends EventEmitter {
                         this.log.info(`The frontend https server is listening on ${UNDERLINE}https://${this.matterbridge.systemInformation.ipv4Address}:${this.port}${UNDERLINEOFF}${rs}`);
                     if (this.matterbridge.systemInformation.ipv6Address !== '')
                         this.log.info(`The frontend https server is listening on ${UNDERLINE}https://[${this.matterbridge.systemInformation.ipv6Address}]:${this.port}${UNDERLINEOFF}${rs}`);
+                    this.listening = true;
                     this.emit('server_listening', 'https', this.port);
                 });
             }
@@ -525,7 +530,7 @@ export class Frontend extends EventEmitter {
                 this.log.info(`File ${plg}${filename}${nf} uploaded successfully`);
                 if (filename.endsWith('.tgz')) {
                     const { spawnCommand } = await import('./utils/spawn.js');
-                    await spawnCommand(this.matterbridge, 'npm', ['install', '-g', filePath, '--omit=dev', '--verbose']);
+                    await spawnCommand(this.matterbridge, 'npm', ['install', '-g', filePath, '--omit=dev', '--verbose'], filename);
                     this.log.info(`Plugin package ${plg}${filename}${nf} installed successfully. Full restart required.`);
                     this.wssSendCloseSnackbarMessage(`Installing package ${filename}. Please wait...`);
                     this.wssSendSnackbarMessage(`Installed package ${filename}`, 10, 'success');
@@ -581,6 +586,7 @@ export class Frontend extends EventEmitter {
             this.log.debug('Closing http server...');
             this.httpServer.close();
             this.log.debug('Http server closed successfully');
+            this.listening = false;
             this.emit('server_stopped');
             this.httpServer.removeAllListeners();
             this.httpServer = undefined;
@@ -590,6 +596,7 @@ export class Frontend extends EventEmitter {
             this.log.debug('Closing https server...');
             this.httpsServer.close();
             this.log.debug('Https server closed successfully');
+            this.listening = false;
             this.emit('server_stopped');
             this.httpsServer.removeAllListeners();
             this.httpsServer = undefined;
@@ -969,7 +976,7 @@ export class Frontend extends EventEmitter {
                 }
                 this.wssSendSnackbarMessage(`Installing package ${data.params.packageName}...`, 0);
                 const { spawnCommand } = await import('./utils/spawn.js');
-                spawnCommand(this.matterbridge, 'npm', ['install', '-g', data.params.packageName, '--omit=dev', '--verbose'])
+                spawnCommand(this.matterbridge, 'npm', ['install', '-g', data.params.packageName, '--omit=dev', '--verbose'], data.params.packageName)
                     .then((_response) => {
                     sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: data.src, success: true });
                     this.wssSendCloseSnackbarMessage(`Installing package ${localData.params.packageName}...`);
@@ -1037,7 +1044,7 @@ export class Frontend extends EventEmitter {
                 }
                 this.wssSendSnackbarMessage(`Uninstalling package ${data.params.packageName}...`, 0);
                 const { spawnCommand } = await import('./utils/spawn.js');
-                spawnCommand(this.matterbridge, 'npm', ['uninstall', '-g', data.params.packageName, '--verbose'])
+                spawnCommand(this.matterbridge, 'npm', ['uninstall', '-g', data.params.packageName, '--verbose'], data.params.packageName)
                     .then((_response) => {
                     sendResponse({ id: localData.id, method: localData.method, src: 'Matterbridge', dst: data.src, success: true });
                     this.wssSendCloseSnackbarMessage(`Uninstalling package ${localData.params.packageName}...`);

package/dist/matterbridge.js

@@ -507,7 +507,7 @@ export class Matterbridge extends EventEmitter {
                 this.log.info(`Error parsing plugin ${plg}${plugin.name}${nf}. Trying to reinstall it from npm.`);
                 try {
                     const { spawnCommand } = await import('./utils/spawn.js');
-                    await spawnCommand(this, 'npm', ['install', '-g', plugin.name, '--omit=dev', '--verbose']);
+                    await spawnCommand(this, 'npm', ['install', '-g', plugin.name, '--omit=dev', '--verbose'], plugin.name);
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                     plugin.error = false;
                 }
@@ -654,6 +654,8 @@ export class Matterbridge extends EventEmitter {
             this.shutdown = true;
             return;
         }
+        if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
+            await this.frontend.start(getIntParameter('frontend'));
         try {
             await this.startMatterStorage();
             if (this.aggregatorSerialNumber && this.aggregatorUniqueId && this.matterStorageService) {
@@ -699,8 +701,6 @@ export class Matterbridge extends EventEmitter {
             this.shutdown = true;
             return;
         }
-        if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
-            await this.frontend.start(getIntParameter('frontend'));
         clearTimeout(this.checkUpdateTimeout);
         this.checkUpdateTimeout = setTimeout(async () => {
             const { checkUpdates } = await import('./update.js');
@@ -737,7 +737,7 @@ export class Matterbridge extends EventEmitter {
             return;
         }
     }
-    async startPlugins() {
+    async startPlugins(wait = false, start = true) {
         for (const plugin of this.plugins) {
             plugin.configJson = await this.plugins.loadConfig(plugin);
             plugin.schemaJson = await this.plugins.loadSchema(plugin);
@@ -757,7 +757,10 @@ export class Matterbridge extends EventEmitter {
             plugin.started = false;
             plugin.configured = false;
             plugin.registeredDevices = undefined;
-            this.plugins.load(plugin, true, 'Matterbridge is starting');
+            if (wait)
+                await this.plugins.load(plugin, start, 'Matterbridge is starting');
+            else
+                this.plugins.load(plugin, start, 'Matterbridge is starting');
         }
         this.frontend.wssSendRefreshRequired('plugins');
     }
@@ -949,7 +952,7 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Updating matterbridge...');
         try {
             const { spawnCommand } = await import('./utils/spawn.js');
-            await spawnCommand(this, 'npm', ['install', '-g', 'matterbridge', '--omit=dev', '--verbose']);
+            await spawnCommand(this, 'npm', ['install', '-g', 'matterbridge', '--omit=dev', '--verbose'], 'matterbridge');
             this.log.info('Matterbridge has been updated. Full restart required.');
         }
         catch (error) {
@@ -1252,7 +1255,14 @@ export class Matterbridge extends EventEmitter {
     async startChildbridge(delay = 1000) {
         if (!this.matterStorageManager)
             throw new Error('No storage manager initialized');
-        await this.startPlugins();
+        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...');
+        for (const plugin of this.plugins.array().filter((p) => p.enabled && !p.error)) {
+            if (plugin.type === 'DynamicPlatform')
+                await this.createDynamicPlugin(plugin);
+            this.plugins.start(plugin, 'Matterbridge is starting');
+        }
         this.log.debug('Starting start matter interval in childbridge mode...');
         let failCount = 0;
         this.startMatterInterval = setInterval(async () => {
@@ -1280,9 +1290,6 @@ export class Matterbridge extends EventEmitter {
                         plugin.error = true;
                     }
                 }
-                if (plugin.type === 'DynamicPlatform' && !plugin.locked) {
-                    await this.createDynamicPlugin(plugin);
-                }
             }
             if (!allStarted)
                 return;

package/dist/utils/spawn.js

@@ -1,5 +1,5 @@
 import { hasParameter } from './commandLine.js';
-export async function spawnCommand(matterbridge, command, args) {
+export async function spawnCommand(matterbridge, command, args, packageName) {
     const { spawn } = await import('node:child_process');
     const cmdLine = command + ' ' + args.join(' ');
     if (process.platform === 'win32' && command === 'npm') {
@@ -13,6 +13,7 @@ export async function spawnCommand(matterbridge, command, args) {
     }
     matterbridge.log.debug(`Spawn command ${command} with ${args.join(' ')}`);
     return new Promise((resolve, reject) => {
+        matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-init', packageName || `unknown-package`);
         const childProcess = spawn(command, args, {
             stdio: ['inherit', 'pipe', 'pipe'],
         });
@@ -22,6 +23,7 @@ export async function spawnCommand(matterbridge, command, args) {
         });
         childProcess.on('close', (code, signal) => {
             matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn', `child process closed with code ${code} and signal ${signal}`);
+            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-exit', 'Child process closed');
             if (code === 0) {
                 if (cmdLine.startsWith('npm install -g'))
                     matterbridge.log.notice(`Package ${cmdLine.replace('npm install -g ', '').replace('--verbose', '').replace('--omit=dev', '')} installed correctly`);
@@ -35,6 +37,7 @@ export async function spawnCommand(matterbridge, command, args) {
         });
         childProcess.on('exit', (code, signal) => {
             matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn', `child process exited with code ${code} and signal ${signal}`);
+            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-exit', 'Child process exited');
             if (code === 0) {
                 matterbridge.log.debug(`Child process "${cmdLine}" exited with code ${code} and signal ${signal}`);
                 resolve(true);