@matterbridge/core 3.9.2-dev-20260625-1591faa → 3.9.2-dev-20260625-582ef8d

package/dist/backendExpress.js

@@ -2,6 +2,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { BroadcastServer } from '@matterbridge/thread';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_BACKUP_FILE, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, MATTERBRIDGE_PLUGIN_CONFIG_FILE, MATTERBRIDGE_PLUGIN_STORAGE_FILE, NODE_STORAGE_DIR, plg, } from '@matterbridge/types';
+import { isBun } from '@matterbridge/utils/bun';
 import { hasParameter } from '@matterbridge/utils/cli';
 import { getErrorMessage } from '@matterbridge/utils/error';
 import { formatBytes } from '@matterbridge/utils/format';
@@ -411,8 +412,8 @@ export class BackendExpress {
                             name: 'SpawnCommand',
                             workerData: {
                                 threadName: 'SpawnCommand',
-                                command: 'npm',
-                                args: ['install', '-g', filePath, '--omit=dev', '--verbose'],
+                                command: isBun() ? 'bun' : 'npm',
+                                args: isBun() ? ['install', '-g', filePath, '--production'] : ['install', '-g', filePath, '--omit=dev', '--verbose'],
                                 packageCommand: 'install',
                                 packageName: filename,
                             },

package/dist/frontend.js

@@ -9,6 +9,7 @@ import { CommissioningOptions } from '@matter/types/commissioning';
 import { FabricIndex } from '@matter/types/datatype';
 import { BroadcastServer } from '@matterbridge/thread/server';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, } from '@matterbridge/types';
+import { isBun } from '@matterbridge/utils/bun';
 import { getParameter, hasParameter } from '@matterbridge/utils/cli';
 import { getErrorMessage, inspectError, logError } from '@matterbridge/utils/error';
 import { formatBytes, formatPercent, formatUptime } from '@matterbridge/utils/format';
@@ -798,8 +799,8 @@ export class Frontend extends EventEmitter {
                             name: 'SpawnCommand',
                             workerData: {
                                 threadName: 'SpawnCommand',
-                                command: 'npm',
-                                args: ['install', '-g', filePath, '--omit=dev', '--verbose'],
+                                command: isBun() ? 'bun' : 'npm',
+                                args: isBun() ? ['install', '-g', filePath, '--production'] : ['install', '-g', filePath, '--omit=dev', '--verbose'],
                                 packageCommand: 'install',
                                 packageName: filename,
                             },
@@ -2236,8 +2237,8 @@ export class Frontend extends EventEmitter {
                 name: 'SpawnCommand',
                 workerData: {
                     threadName: 'SpawnCommand',
-                    command: 'npm',
-                    args: [command, '-g', packageName, '--omit=dev', '--verbose'],
+                    command: isBun() ? 'bun' : 'npm',
+                    args: isBun() ? [command, '-g', packageName, '--production'] : [command, '-g', packageName, '--omit=dev', '--verbose'],
                     packageCommand: command,
                     packageName: packageName,
                 },

package/dist/matterbridge.js

@@ -14,6 +14,7 @@ import { DeviceTypeId, VendorId } from '@matter/types/datatype';
 import { ManualPairingCodeCodec } from '@matter/types/schema';
 import { BroadcastServer } from '@matterbridge/thread/server';
 import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_DIR, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from '@matterbridge/types';
+import { isBun, getGlobalBunModules } from '@matterbridge/utils/bun';
 import { getIntParameter, getParameter, hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
 import { copyDirectory } from '@matterbridge/utils/copy-dir';
 import { createDirectory } from '@matterbridge/utils/create-dir';
@@ -384,14 +385,19 @@ export class Matterbridge extends EventEmitter {
         this.matterbridgeCertDirectory = this.profile ? path.join(this.homeDirectory, '.mattercert', 'profiles', this.profile) : path.join(this.homeDirectory, '.mattercert');
         await createDirectory(this.matterbridgeCertDirectory, 'Matterbridge Matter Certificate Directory', this.log);
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
-        if (currentFileDirectory.includes(path.join('packages', 'core'))) {
+        this.log.debug(`Determining root directory from currentFileDirectory = ${CYAN}${currentFileDirectory}${db}`);
+        if (currentFileDirectory.endsWith(path.join('matterbridge', 'packages', 'core', 'src')) ||
+            currentFileDirectory.endsWith(path.join('matterbridge', 'packages', 'core', 'dist'))) {
             this.rootDirectory = path.resolve(currentFileDirectory, '..', '..', '..');
+            this.log.debug(`Found packages core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
         }
-        else if (path.basename(currentFileDirectory) === 'dist') {
+        else if (currentFileDirectory.endsWith(path.join('matterbridge', 'dist'))) {
             this.rootDirectory = path.resolve(currentFileDirectory, '..');
+            this.log.debug(`Found bundled core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
         }
         else {
             this.rootDirectory = path.resolve(currentFileDirectory, '..', '..', '..', '..');
+            this.log.debug(`Found production core >>> root directory: ${CYAN}${this.rootDirectory}${db}`);
         }
         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);
@@ -675,12 +681,37 @@ export class Matterbridge extends EventEmitter {
             this.virtualMode = (await this.nodeContext.get('virtualmode', 'outlet'));
         }
         this.log.debug(`Virtual mode ${this.virtualMode}.`);
+        if (isBun()) {
+            this.globalModulesDirectory = getGlobalBunModules();
+            this.log.debug(`Global node_modules Directory (Bun): ${this.globalModulesDirectory}`);
+            await this.nodeContext.set('globalModulesDirectory', this.globalModulesDirectory);
+        }
+        else {
+            this.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
+        }
+        if (this.globalModulesDirectory === '') {
+            this.log.debug(`Getting global node_modules directory...`);
+            try {
+                const { getGlobalNodeModules } = await import('@matterbridge/utils/npm-prefix');
+                this.globalModulesDirectory = await getGlobalNodeModules();
+                this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
+                await this.nodeContext.set('globalModulesDirectory', this.globalModulesDirectory);
+            }
+            catch (error) {
+                logError(this.log, `Error getting global node_modules directory`, error);
+            }
+        }
+        else {
+            if (!isBun()) {
+                this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
+                this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'GlobalPrefix' } });
+            }
+        }
         this.plugins.logLevel = this.log.logLevel;
         await this.plugins.loadFromStorage();
         this.devices.logLevel = this.log.logLevel;
         for (const plugin of this.plugins) {
-            const globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
-            const isLocal = globalModulesDirectory.length > 0 && !plugin.path.startsWith(globalModulesDirectory);
+            const isLocal = fs.existsSync(plugin.path) && this.globalModulesDirectory.length > 0 && !plugin.path.startsWith(this.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}.`);
@@ -691,7 +722,7 @@ export class Matterbridge extends EventEmitter {
                 process.env.MATTERBRIDGE_LINK_LOCAL_PLUGINS === 'jest') {
                 const { execSync } = await import('node:child_process');
                 try {
-                    execSync('npm link matterbridge --no-fund --no-audit --silent', { cwd: path.dirname(plugin.path) });
+                    execSync(isBun() ? 'bun link matterbridge --silent' : 'npm link matterbridge --no-fund --no-audit --silent', { cwd: path.dirname(plugin.path) });
                     this.log.info(`Matterbridge linked to plugin ${plg}${plugin.name}${nf}.`);
                 }
                 catch (error) {
@@ -708,11 +739,11 @@ export class Matterbridge extends EventEmitter {
                 try {
                     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`);
+                        execSync(`${sudo ? 'sudo ' : ''}${isBun() ? 'bun' : 'npm'} install -g ${path.join(this.matterbridgeDirectory, 'uploads', plugin.tarballPath)} ${isBun() ? '--production --silent' : '--no-fund --no-audit --silent --omit=dev'}`);
                     }
                     else {
                         this.log.info(`Plugin ${plg}${plugin.name}${nf} not found. Trying to reinstall it from npm${plugin.version.includes('-dev-') ? ' with tag @dev' : ''}...`);
-                        execSync(`${sudo ? 'sudo ' : ''}npm install -g ${plugin.name}${plugin.version.includes('-dev-') ? '@dev' : ''} --no-fund --no-audit --silent --omit=dev`);
+                        execSync(`${sudo ? 'sudo ' : ''}${isBun() ? 'bun' : 'npm'} install -g ${plugin.name}${plugin.version.includes('-dev-') ? '@dev' : ''} ${isBun() ? '--production --silent' : '--no-fund --no-audit --silent --omit=dev'}`);
                     }
                     this.log.info(`Plugin ${plg}${plugin.name}${nf} reinstalled.`);
                 }
@@ -1078,24 +1109,7 @@ export class Matterbridge extends EventEmitter {
         this.log.debug(`Matterbridge Directory: ${this.matterbridgeDirectory}`);
         this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
         this.log.debug(`Matterbridge Matter Certificate Directory: ${this.matterbridgeCertDirectory}`);
-        if (this.nodeContext)
-            this.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
-        if (this.globalModulesDirectory === '') {
-            this.log.debug(`Getting global node_modules directory...`);
-            try {
-                const { getGlobalNodeModules } = await import('@matterbridge/utils/npm-prefix');
-                this.globalModulesDirectory = await getGlobalNodeModules();
-                this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
-                await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
-            }
-            catch (error) {
-                logError(this.log, `Error getting global node_modules directory`, error);
-            }
-        }
-        else {
-            this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
-            this.server.request({ type: 'manager_run', src: 'matterbridge', dst: 'manager', params: { name: 'GlobalPrefix' } });
-        }
+        this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
         this.log.debug(`Reading matterbridge package.json...`);
         const packageJson = JSON.parse(await fs.promises.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
         this.matterbridgeVersion = this.matterbridgeLatestVersion = this.matterbridgeDevVersion = packageJson.version;
@@ -1180,8 +1194,8 @@ export class Matterbridge extends EventEmitter {
                 name: 'SpawnCommand',
                 workerData: {
                     threadName: 'SpawnCommand',
-                    command: 'npm',
-                    args: ['install', '-g', 'matterbridge', '--omit=dev', '--verbose'],
+                    command: isBun() ? 'bun' : 'npm',
+                    args: isBun() ? ['install', '-g', 'matterbridge', '--production'] : ['install', '-g', 'matterbridge', '--omit=dev', '--verbose'],
                     packageCommand: 'install',
                     packageName: 'matterbridge',
                 },

package/dist/pluginManager.js

@@ -2,6 +2,7 @@ import EventEmitter from 'node:events';
 import path from 'node:path';
 import { BroadcastServer } from '@matterbridge/thread/server';
 import { plg, typ } from '@matterbridge/types';
+import { isBun } from '@matterbridge/utils/bun';
 import { hasParameter } from '@matterbridge/utils/cli';
 import { getErrorMessage, inspectError, logError } from '@matterbridge/utils/error';
 import { logModuleLoaded } from '@matterbridge/utils/loader';
@@ -522,8 +523,8 @@ export class PluginManager extends EventEmitter {
                 name: 'SpawnCommand',
                 workerData: {
                     threadName: 'SpawnCommand',
-                    command: 'npm',
-                    args: ['install', '-g', packageName, '--omit=dev', '--verbose'],
+                    command: isBun() ? 'bun' : 'npm',
+                    args: isBun() ? ['install', '-g', packageName, '--production'] : ['install', '-g', packageName, '--omit=dev', '--verbose'],
                     packageCommand: 'install',
                     packageName: packageName,
                 },
@@ -540,8 +541,8 @@ export class PluginManager extends EventEmitter {
                 name: 'SpawnCommand',
                 workerData: {
                     threadName: 'SpawnCommand',
-                    command: 'npm',
-                    args: ['uninstall', '-g', packageName, '--omit=dev', '--verbose'],
+                    command: isBun() ? 'bun' : 'npm',
+                    args: isBun() ? ['uninstall', '-g', packageName] : ['uninstall', '-g', packageName, '--verbose'],
                     packageCommand: 'uninstall',
                     packageName: packageName,
                 },
@@ -635,7 +636,16 @@ export class PluginManager extends EventEmitter {
             plugin = p;
         }
         try {
-            this.log.debug(`Parsing package.json of plugin ${plg}${plugin.name}${db}`);
+            const { existsSync } = await import('node:fs');
+            this.log.debug(`Parsing package.json of plugin ${plg}${plugin.name}${db} at path ${CYAN}${plugin.path}${db}`);
+            if (!existsSync(plugin.path) && existsSync(path.join(this.matterbridge.globalModulesDirectory, plugin.name, 'package.json'))) {
+                plugin.path = path.join(this.matterbridge.globalModulesDirectory, plugin.name, 'package.json');
+                this.log.debug(`Found package.json of plugin ${plg}${plugin.name}${db} in global npm modules directory: ${CYAN}${plugin.path}${db}`);
+            }
+            if (!existsSync(plugin.path) && existsSync(path.join(this.matterbridge.matterbridgePluginDirectory, plugin.name, 'package.json'))) {
+                plugin.path = path.join(this.matterbridge.matterbridgePluginDirectory, plugin.name, 'package.json');
+                this.log.debug(`Found package.json of plugin ${plg}${plugin.name}${db} in matterbridge plugin directory: ${CYAN}${plugin.path}${db}`);
+            }
             const packageJson = JSON.parse(await promises.readFile(plugin.path, 'utf8'));
             if (!packageJson.name)
                 this.log.warn(`Plugin ${plg}${plugin.name}${wr} has no name in package.json`);
@@ -662,7 +672,6 @@ export class PluginManager extends EventEmitter {
             if (!plugin.type)
                 this.log.warn(`Plugin ${plg}${plugin.name}${wr} has no type`);
             const frontendPath = path.join(plugin.path.replace('package.json', ''), 'apps', 'frontend', 'build', 'index.html');
-            const { existsSync } = await import('node:fs');
             if (existsSync(frontendPath))
                 plugin.frontendPath = frontendPath;
             const invalidDependencies = this.findInvalidDependencies(packageJson);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.9.2-dev-20260625-1591faa",
+  "version": "3.9.2-dev-20260625-582ef8d",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -130,10 +130,10 @@
   ],
   "dependencies": {
     "@matter/main": "0.17.4-alpha.0-20260624-ef5aefa3b",
-    "@matterbridge/dgram": "3.9.2-dev-20260625-1591faa",
-    "@matterbridge/thread": "3.9.2-dev-20260625-1591faa",
-    "@matterbridge/types": "3.9.2-dev-20260625-1591faa",
-    "@matterbridge/utils": "3.9.2-dev-20260625-1591faa",
+    "@matterbridge/dgram": "3.9.2-dev-20260625-582ef8d",
+    "@matterbridge/thread": "3.9.2-dev-20260625-582ef8d",
+    "@matterbridge/types": "3.9.2-dev-20260625-582ef8d",
+    "@matterbridge/utils": "3.9.2-dev-20260625-582ef8d",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.5.2",