@matterbridge/core 3.10.13 → 3.10.14-dev-20261010-607ee18

package/dist/behaviors/ffmpeg.js

@@ -1,11 +1,25 @@
-import { spawn } from 'node:child_process';
-import { constants } from 'node:fs';
-import { access, readdir } from 'node:fs/promises';
+import { spawn, spawnSync } from 'node:child_process';
+import { accessSync, constants, readdirSync } from 'node:fs';
 import path from 'node:path';
 import { getErrorMessage } from '@matterbridge/utils';
+import { hasAnyParameter } from '@matterbridge/utils/cli';
 import { AnsiLogger, MAGENTA } from 'node-ansi-logger';
-const log = new AnsiLogger({ logName: 'Ffmpeg', logLevel: "debug", logNameColor: MAGENTA, logTimestampFormat: 4 });
-async function runProbe(command, args) {
+const log = new AnsiLogger({
+    logName: 'Ffmpeg',
+    logLevel: hasAnyParameter('debug', 'verbose') ? "debug" : "info",
+    logNameColor: MAGENTA,
+    logTimestampFormat: 4,
+});
+const PROBE_TIMEOUT_MS = 5000;
+function runProbe(command, args) {
+    const child = spawnSync(command, args, { stdio: 'ignore', timeout: PROBE_TIMEOUT_MS });
+    if (child.error)
+        throw child.error;
+    if (child.status !== 0) {
+        throw new Error(`${command} exited with code ${child.status ?? -1}`);
+    }
+}
+async function runCommand(command, args) {
     await new Promise((resolve, reject) => {
         const child = spawn(command, args, { stdio: 'ignore' });
         child.once('error', reject);
@@ -18,10 +32,10 @@ async function runProbe(command, args) {
         });
     });
 }
-async function isRunnable(command) {
+function isRunnable(command) {
     for (const versionArg of ['--version', '-version']) {
         try {
-            await runProbe(command, [versionArg]);
+            runProbe(command, [versionArg]);
             return true;
         }
         catch {
@@ -29,20 +43,20 @@ async function isRunnable(command) {
     }
     return false;
 }
-async function getWindowsCommandCandidates() {
+function getWindowsCommandCandidates() {
     if (process.platform !== 'win32')
         return [];
     const candidates = [];
     if (process.env.LOCALAPPDATA) {
         const wingetPackages = path.join(process.env.LOCALAPPDATA, 'Microsoft', 'WinGet', 'Packages');
         try {
-            const packageDirs = await readdir(wingetPackages, { withFileTypes: true });
+            const packageDirs = readdirSync(wingetPackages, { withFileTypes: true });
             for (const packageDir of packageDirs) {
                 if (!packageDir.isDirectory() || !packageDir.name.startsWith('Gyan.FFmpeg_'))
                     continue;
                 const packagePath = path.join(wingetPackages, packageDir.name);
                 try {
-                    const versionDirs = await readdir(packagePath, { withFileTypes: true });
+                    const versionDirs = readdirSync(packagePath, { withFileTypes: true });
                     for (const versionDir of versionDirs) {
                         if (versionDir.isDirectory() && versionDir.name.startsWith('ffmpeg-'))
                             candidates.push(path.join(packagePath, versionDir.name, 'bin', 'ffmpeg.exe'));
@@ -62,20 +76,20 @@ async function getWindowsCommandCandidates() {
     }
     return candidates;
 }
-async function resolveFfmpeg() {
-    const candidates = ['ffmpeg', '/usr/bin/ffmpeg', '/bin/ffmpeg', '/usr/local/bin/ffmpeg', ...(await getWindowsCommandCandidates())];
+function resolveFfmpeg() {
+    const candidates = ['ffmpeg', '/usr/bin/ffmpeg', '/bin/ffmpeg', '/usr/local/bin/ffmpeg', ...getWindowsCommandCandidates()];
     log.debug(`Resolving ffmpeg: trying ${candidates.length} candidate(s)`);
     for (const candidate of candidates) {
         if (path.isAbsolute(candidate)) {
             try {
-                await access(candidate, constants.X_OK);
+                accessSync(candidate, constants.X_OK);
             }
             catch {
                 log.debug(`Candidate ${candidate} is not accessible`);
                 continue;
             }
         }
-        if (await isRunnable(candidate)) {
+        if (isRunnable(candidate)) {
             log.debug(`Found ffmpeg in ${candidate}`);
             return candidate;
         }
@@ -84,18 +98,27 @@ async function resolveFfmpeg() {
     log.debug('Could not resolve ffmpeg');
     return undefined;
 }
-let ffmpegCommand = await resolveFfmpeg();
-if (ffmpegCommand)
-    log.debug(`Using ffmpeg: ${ffmpegCommand}`);
-else
-    log.warn('ffmpeg could not be resolved on this host; ffmpeg-dependent features will not work');
+let ffmpegCommand;
+let ffmpegResolved = false;
+function ensureFfmpegResolved() {
+    if (ffmpegResolved)
+        return;
+    ffmpegResolved = true;
+    ffmpegCommand = resolveFfmpeg();
+    if (ffmpegCommand)
+        log.debug(`Using ffmpeg: ${ffmpegCommand}`);
+    else
+        log.warn('ffmpeg could not be resolved on this host; ffmpeg-dependent features will not work');
+}
 export function hasFfmpeg() {
+    ensureFfmpegResolved();
     return ffmpegCommand !== undefined;
 }
 export function redactSource(source) {
     return source.replace(/^([a-z][a-z\d+.-]*:\/\/)[^/]*@/i, '$1***@');
 }
 export function runFfmpeg(args) {
+    ensureFfmpegResolved();
     if (!ffmpegCommand) {
         throw new Error('Cannot run ffmpeg: not found on this host');
     }
@@ -168,6 +191,7 @@ export function getPlayWebcamArgs(videoSource, audioSource) {
     return ['-hide_banner', '-window_title', videoSource, '-f', 'v4l2', '-i', videoSource];
 }
 export function playWebcam(videoSource, audioSource) {
+    ensureFfmpegResolved();
     if (!ffmpegCommand) {
         throw new Error('Cannot play the webcam: ffmpeg not found on this host');
     }
@@ -186,12 +210,12 @@ export async function installFfmpeg() {
         return false;
     }
     try {
-        if (await isRunnable('apk')) {
-            await runProbe('apk', ['add', '--no-cache', 'ffmpeg']);
+        if (isRunnable('apk')) {
+            await runCommand('apk', ['add', '--no-cache', 'ffmpeg']);
         }
-        else if (await isRunnable('apt-get')) {
-            await runProbe('apt-get', ['update']);
-            await runProbe('env', ['DEBIAN_FRONTEND=noninteractive', 'apt-get', 'install', '-y', '--no-install-recommends', 'ffmpeg']);
+        else if (isRunnable('apt-get')) {
+            await runCommand('apt-get', ['update']);
+            await runCommand('env', ['DEBIAN_FRONTEND=noninteractive', 'apt-get', 'install', '-y', '--no-install-recommends', 'ffmpeg']);
         }
         else {
             log.warn('Cannot install ffmpeg: no supported package manager found (apk, apt-get)');
@@ -202,7 +226,8 @@ export async function installFfmpeg() {
         log.error(`Failed to install ffmpeg: ${getErrorMessage(error)}`);
         return false;
     }
-    ffmpegCommand = await resolveFfmpeg();
+    ffmpegCommand = resolveFfmpeg();
+    ffmpegResolved = true;
     log.info(ffmpegCommand ? `Installed ffmpeg: ${ffmpegCommand}` : 'ffmpeg was installed but could not be resolved');
     return ffmpegCommand !== undefined;
 }

package/dist/cli.d.ts

@@ -4,3 +4,4 @@ import type { Matterbridge } from './matterbridge.js';
 export declare let instance: Matterbridge | undefined;
 export declare const tracker: Tracker;
 export declare const inspector: Inspector;
+export declare function main(): Promise<void>;

package/dist/cli.js

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { ThreadsManager } from '@matterbridge/thread/manager';
+import { BroadcastServer } from '@matterbridge/thread/server';
 import { hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
 import { inspectError } from '@matterbridge/utils/error';
 import { formatBytes, formatUptime } from '@matterbridge/utils/format';
@@ -13,11 +14,9 @@ logModuleLoaded('Cli');
 export let instance;
 export const tracker = new Tracker('Cli', false, false);
 export const inspector = new Inspector('Cli', false, false);
+const log = new AnsiLogger({ logName: 'Cli', logTimestampFormat: 4, logLevel: hasAnyParameter('debug', 'verbose') ? "debug" : "info" });
 const manager = new ThreadsManager(path.dirname(fileURLToPath(import.meta.url)));
-const colorEnabled = !process.env.NO_COLOR && process.env.TERM !== 'dumb' && process.env.FORCE_COLOR !== '0' && !hasParameter('no-ansi');
-if (!colorEnabled)
-    process.env.NO_COLOR = '1';
-const log = new AnsiLogger({ logName: 'Cli', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
+const server = new BroadcastServer('cli', log);
 function startCpuMemoryCheck() {
     log.debug(`Cpu memory check starting...`);
     tracker.start();
@@ -55,8 +54,8 @@ function registerHandlers() {
     instance.on('shutdown', () => void shutdown().catch((error) => inspectError(log, 'Failed to shutdown', error)));
     instance.on('restart', () => void restart().catch((error) => inspectError(log, 'Failed to restart', error)));
     instance.on('update', () => void update().catch((error) => inspectError(log, 'Failed to update', error)));
-    instance.on('startmemorycheck', () => start());
-    instance.on('stopmemorycheck', () => stop());
+    instance.on('startmemorycheck', () => startCpuMemoryCheck());
+    instance.on('stopmemorycheck', () => stopCpuMemoryCheck());
     instance.on('startinspector', () => void startInspector().catch((error) => inspectError(log, 'Failed to start inspector', error)));
     instance.on('stopinspector', () => void stopInspector().catch((error) => inspectError(log, 'Failed to stop inspector', error)));
     instance.on('takeheapsnapshot', () => void takeHeapSnapshot().catch((error) => inspectError(log, 'Failed to take heap snapshot', error)));
@@ -68,6 +67,7 @@ async function shutdown() {
     if (hasParameter('inspect'))
         await stopInspector();
     stopCpuMemoryCheck();
+    server.close();
     manager.destroy();
     cliEmitter.emit('shutdown');
     log.debug('Received shutdown event, exit with code 0');
@@ -85,16 +85,10 @@ async function update() {
     instance = await Matterbridge.loadInstance(true);
     registerHandlers();
 }
-function start() {
-    log.debug('Received start memory check event');
-    startCpuMemoryCheck();
-}
-function stop() {
-    log.debug('Received stop memory check event');
-    stopCpuMemoryCheck();
-}
-async function main() {
+export async function main() {
     log.debug(`Cli main() started`);
+    if (!(!process.env.NO_COLOR && process.env.TERM !== 'dumb' && process.env.FORCE_COLOR !== '0' && !hasParameter('no-ansi')))
+        process.env.NO_COLOR = '1';
     startCpuMemoryCheck();
     if (hasParameter('inspect'))
         await startInspector();
@@ -175,6 +169,7 @@ function help() {
       --novirtual:             disable the creation of the virtual devices Restart, Update and Reboot Matterbridge
       --root-power-source:     add a Power Source cluster for the mains power feed on the Root endpoint
       --ssl:                   enable SSL for the frontend and the WebSocketServer (the server will use the certificates and switch to https)
+      --tls:                   enable SSL for the frontend and the WebSocketServer (the server will use the certificates and switch to https)
       --mtls:                  enable mTLS for the frontend and the WebSocketServer (both server and client will use and require the certificates and switch to https); it also enables https, so --ssl --tls is not needed
       --vendorId:              override the default vendorId 0xfff1
       --vendorName:            override the default vendorName "Matterbridge"

package/dist/matterbridge.js

@@ -863,12 +863,13 @@ export class Matterbridge extends EventEmitter {
             (hasParameter('controller') ? 'mode controller ' : '') +
             (this.restartMode === 'none' ? '' : 'restart mode ' + this.restartMode + ' ') +
             'running on ' + this.systemInformation.osType + ' (v.' + this.systemInformation.osRelease + ') platform ' + this.systemInformation.osPlatform + ' arch ' + this.systemInformation.osArch);
-        const minNodeVersion = 20;
+        const minNodeVersion = 22;
+        const minNodeMinorVersion = 13;
         const nodeVersion = process.versions.node;
-        const [versionMajor] = nodeVersion.split('.').map(Number);
-        if (versionMajor < minNodeVersion) {
-            this.log.error(`Node version ${versionMajor} is not supported. Please upgrade to ${minNodeVersion} or above.`);
-            throw new Error(`Node version ${versionMajor} is not supported. Please upgrade to ${minNodeVersion} or above.`);
+        const [versionMajor, versionMinor] = nodeVersion.split('.').map(Number);
+        if (versionMajor < minNodeVersion || (versionMajor === minNodeVersion && versionMinor < minNodeMinorVersion)) {
+            this.log.error(`Node version ${nodeVersion} is not supported. Please upgrade to ${minNodeVersion}.${minNodeMinorVersion}.0 or above.`);
+            throw new Error(`Node version ${nodeVersion} is not supported. Please upgrade to ${minNodeVersion}.${minNodeMinorVersion}.0 or above.`);
         }
         await this.parseCommandLine();
         this.emit('initialize_completed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.13",
+  "version": "3.10.14-dev-20261010-607ee18",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -120,7 +120,7 @@
     }
   },
   "engines": {
-    "node": ">=20.19.0 <21.0.0 || >=22.13.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0"
+    "node": ">=22.13.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0"
   },
   "files": [
     "bin",
@@ -136,17 +136,17 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.13",
-    "@matterbridge/thread": "3.10.13",
-    "@matterbridge/types": "3.10.13",
-    "@matterbridge/utils": "3.10.13",
+    "@matterbridge/dgram": "3.10.14-dev-20261010-607ee18",
+    "@matterbridge/thread": "3.10.14-dev-20261010-607ee18",
+    "@matterbridge/types": "3.10.14-dev-20261010-607ee18",
+    "@matterbridge/utils": "3.10.14-dev-20261010-607ee18",
     "escape-html": "1.0.3",
     "express": "5.2.1",
-    "express-rate-limit": "8.7.0",
+    "express-rate-limit": "8.7.1",
     "multer": "2.4.0",
     "node-ansi-logger": "3.3.1",
     "node-persist-manager": "2.1.1",
-    "werift": "0.24.4",
+    "werift": "0.25.0",
     "ws": "8.22.0"
   }
 }