@matterbridge/core 3.7.10-dev-20260518-d8df401 → 3.7.10-dev-20260519-b4a9def

package/dist/frontend.js

@@ -130,11 +130,7 @@ export class Frontend extends EventEmitter {
                             this.fixedRestartRequired = true;
                             this.wssSendRestartRequired(true, true);
                             this.wssSendSnackbarMessage(`Installed package ${msg.result.packageName}`, 5, 'success');
-                            const packageName = msg.result.packageName.replace(/-\d.*$/, '');
-                            if (msg.result.packageName.startsWith('matterbridge-') && msg.result.packageName.endsWith('.tgz')) {
-                                fireAndForget(this.server.fetch({ type: 'plugins_add', src: this.server.name, dst: 'plugins', params: { nameOrPath: packageName } }, this.serverFetchTimeout), this.log, `Error adding plugin ${packageName} after uploading package ${msg.result.packageName}`);
-                                setImmediate(() => this.wssSendRefreshRequired('plugins')).unref();
-                            }
+                            setTimeout(() => this.wssSendRefreshRequired('plugins'), 2000).unref();
                         }
                         else {
                             this.wssSendSnackbarMessage(`Package ${msg.result.packageName} not installed`, 10, 'error');
@@ -147,6 +143,7 @@ export class Frontend extends EventEmitter {
                             this.fixedRestartRequired = true;
                             this.wssSendRestartRequired(true, true);
                             this.wssSendSnackbarMessage(`Uninstalled package ${msg.result.packageName}`, 5, 'success');
+                            setTimeout(() => this.wssSendRefreshRequired('plugins'), 2000).unref();
                         }
                         else {
                             this.wssSendSnackbarMessage(`Package ${msg.result.packageName} not uninstalled`, 10, 'error');
@@ -1096,6 +1093,7 @@ export class Frontend extends EventEmitter {
                 type: plugin.type,
                 name: plugin.name,
                 version: plugin.version,
+                private: plugin.private,
                 description: plugin.description,
                 author: plugin.author,
                 homepage: plugin.homepage,

package/dist/matterbridge.js

@@ -620,9 +620,11 @@ export class Matterbridge extends EventEmitter {
         await this.plugins.loadFromStorage();
         this.devices.logLevel = this.log.logLevel;
         for (const plugin of this.plugins) {
-            this.log.debug(`Parsing plugin ${plg}${plugin.name}${db} from path ${CYAN}${plugin.path}${db} with version ${CYAN}${plugin.version}${db} and type ${CYAN}${plugin.type}${db}.`);
             const globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
-            const isLocal = globalModulesDirectory && !plugin.path.includes(globalModulesDirectory);
+            const isLocal = globalModulesDirectory && !plugin.path.startsWith(globalModulesDirectory);
+            this.log.debug(`Parsing plugin ${plg}${plugin.name}${db} from path ${CYAN}${plugin.path}${db} ` +
+                `with version ${CYAN}${plugin.version}${db} type ${CYAN}${plugin.type}${db} local ${CYAN}${isLocal}${db} ` +
+                `private ${CYAN}${plugin.private}${db} tarball ${CYAN}${plugin.tarballPath}${db}.`);
             if ((isLocal &&
                 fs.existsSync(plugin.path) &&
                 !fs.existsSync(path.join(path.dirname(plugin.path), 'node_modules', 'matterbridge')) &&
@@ -642,11 +644,17 @@ export class Matterbridge extends EventEmitter {
             }
             if ((!isLocal && !fs.existsSync(plugin.path) && !hasAnyParameter('add', 'remove', 'enable', 'disable', 'reset', 'factoryreset', 'systemcheck')) ||
                 process.env.MATTERBRIDGE_REINSTALL_PLUGINS === 'jest') {
-                this.log.info(`Error parsing plugin ${plg}${plugin.name}${nf}. Trying to reinstall it from npm...`);
                 const { execSync } = await import('node:child_process');
                 const sudo = hasParameter('sudo') || (process.platform !== 'win32' && !hasParameter('docker') && !hasParameter('nosudo') && !process.env.PATH?.includes('/.nvm/versions/node/'));
                 try {
-                    execSync(`${sudo ? 'sudo ' : ''}npm install -g ${plugin.name}${plugin.version.includes('-dev-') ? '@dev' : ''} --no-fund --no-audit --silent --omit=dev`);
+                    if (plugin.private && plugin.tarballPath && fs.existsSync(path.join(this.matterbridgeDirectory, 'uploads', plugin.tarballPath))) {
+                        this.log.info(`Plugin ${plg}${plugin.name}${nf} not found. Trying to reinstall it from last tarball...`);
+                        execSync(`${sudo ? 'sudo ' : ''}npm install -g ${path.join(this.matterbridgeDirectory, 'uploads', plugin.tarballPath)} --no-fund --no-audit --silent --omit=dev`);
+                    }
+                    else {
+                        this.log.info(`Plugin ${plg}${plugin.name}${nf} not found. Trying to reinstall it from npm...`);
+                        execSync(`${sudo ? 'sudo ' : ''}npm install -g ${plugin.name}${plugin.version.includes('-dev-') ? '@dev' : ''} --no-fund --no-audit --silent --omit=dev`);
+                    }
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                 }
                 catch (error) {

package/dist/pluginManager.js

@@ -276,23 +276,37 @@ export class PluginManager extends EventEmitter {
             switch (msg.type) {
                 case 'manager_spawn_response':
                     if (msg.result && msg.result.packageCommand === 'install') {
-                        if (msg.result.packageName.endsWith('.tgz'))
+                        if (!msg.result.success) {
+                            this.log.error(`Failed to install package ${plg}${msg.result.packageName}${er}`);
                             return;
-                        if (msg.result.success) {
-                            const packageName = msg.result.packageName.replace(/@.*$/, '');
-                            if (packageName !== 'matterbridge') {
+                        }
+                        if (msg.result.packageName.endsWith('.tgz')) {
+                            const packageName = msg.result.packageName.replace(/-\d.*$/, '');
+                            this.log.info(`Installed package ${plg}${packageName}${nf} from ${CYAN}${msg.result.packageName}${nf} successfully`);
+                            if (msg.result.packageName.startsWith('matterbridge-') && msg.result.packageName.endsWith('.tgz')) {
                                 if (!this.has(packageName))
                                     await this.add(packageName);
                                 const plugin = this.get(packageName);
-                                if (plugin && !plugin.loaded) {
+                                if (plugin)
+                                    plugin.tarballPath = msg.result.packageName;
+                                await this.saveToStorage();
+                                if (plugin && !plugin.loaded)
                                     await this.load(plugin);
-                                    this.server.request({ type: 'frontend_refreshrequired', src: 'plugins', dst: 'frontend', params: { changed: 'plugins' } });
-                                }
                             }
-                            this.log.info(`Installed plugin ${plg}${packageName}${db} successfully`);
                         }
                         else {
-                            this.log.error(`Failed to install plugin ${plg}${msg.result.packageName}${er}`);
+                            const packageName = msg.result.packageName.replace(/@.*$/, '');
+                            this.log.info(`Installed plugin ${plg}${packageName}${db} successfully`);
+                            if (packageName !== 'matterbridge') {
+                                if (!this.has(packageName))
+                                    await this.add(packageName);
+                                const plugin = this.get(packageName);
+                                if (plugin)
+                                    plugin.tarballPath = undefined;
+                                await this.saveToStorage();
+                                if (plugin && !plugin.loaded)
+                                    await this.load(plugin);
+                            }
                         }
                     }
                     if (msg.result && msg.result.packageCommand === 'uninstall') {
@@ -302,7 +316,6 @@ export class PluginManager extends EventEmitter {
                                 if (plugin && plugin.loaded)
                                     await this.shutdown(plugin, 'Matterbridge is uninstalling the plugin');
                                 await this.remove(msg.result.packageName);
-                                this.server.request({ type: 'frontend_refreshrequired', src: 'plugins', dst: 'frontend', params: { changed: 'plugins' } });
                             }
                             this.log.info(`Uninstalled plugin ${plg}${msg.result.packageName}${db} successfully`);
                         }
@@ -342,6 +355,7 @@ export class PluginManager extends EventEmitter {
             description: plugin.description,
             author: plugin.author,
             enabled: plugin.enabled,
+            private: plugin.private,
         };
     }
     toApiPlugin(plugin) {
@@ -352,6 +366,7 @@ export class PluginManager extends EventEmitter {
             author: plugin.author,
             path: plugin.path,
             type: plugin.type,
+            private: plugin.private,
             latestVersion: plugin.latestVersion,
             devVersion: plugin.devVersion,
             homepage: plugin.homepage,
@@ -415,7 +430,7 @@ export class PluginManager extends EventEmitter {
         }
         const pluginsArray = await this.matterbridge.nodeContext.get('plugins', []);
         for (const plugin of pluginsArray)
-            this._plugins.set(plugin.name, plugin);
+            this._plugins.set(plugin.name, { ...plugin, private: plugin.private ?? false });
         this.log.debug(`Loaded ${BLUE}${pluginsArray.length}${db} plugins from storage`);
         return pluginsArray;
     }
@@ -433,6 +448,8 @@ export class PluginManager extends EventEmitter {
                 description: plugin.description,
                 author: plugin.author,
                 enabled: plugin.enabled,
+                private: plugin.private,
+                tarballPath: plugin.tarballPath,
             });
         }
         await this.matterbridge.nodeContext.set('plugins', plugins);
@@ -785,6 +802,7 @@ export class PluginManager extends EventEmitter {
                 path: packageJsonPath,
                 type: 'AnyPlatform',
                 version: packageJson.version,
+                private: packageJson.private || false,
                 description: packageJson.description,
                 author: this.getAuthor(packageJson),
                 homepage: this.getHomepage(packageJson),
@@ -861,6 +879,7 @@ export class PluginManager extends EventEmitter {
                 plugin.name = packageJson.name;
                 plugin.description = this.getDescription(packageJson);
                 plugin.version = packageJson.version;
+                plugin.private = packageJson.private || false;
                 plugin.author = this.getAuthor(packageJson);
                 plugin.homepage = this.getHomepage(packageJson);
                 plugin.help = this.getHelp(packageJson);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.7.10-dev-20260518-d8df401",
+  "version": "3.7.10-dev-20260519-b4a9def",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -130,10 +130,10 @@
   ],
   "dependencies": {
     "@matter/main": "0.16.11",
-    "@matterbridge/dgram": "3.7.10-dev-20260518-d8df401",
-    "@matterbridge/thread": "3.7.10-dev-20260518-d8df401",
-    "@matterbridge/types": "3.7.10-dev-20260518-d8df401",
-    "@matterbridge/utils": "3.7.10-dev-20260518-d8df401",
+    "@matterbridge/dgram": "3.7.10-dev-20260519-b4a9def",
+    "@matterbridge/thread": "3.7.10-dev-20260519-b4a9def",
+    "@matterbridge/types": "3.7.10-dev-20260519-b4a9def",
+    "@matterbridge/utils": "3.7.10-dev-20260519-b4a9def",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",