@matterbridge/core 3.10.13-dev-20261008-55d98fb → 3.10.13-dev-20261009-7fc645a

package/dist/backend.js

@@ -182,6 +182,7 @@ export class Backend extends EventEmitter {
                 try {
                     const upgrade = (req.headers.upgrade || '').toLowerCase();
                     if (upgrade !== 'websocket') {
+                        this.log.error(`WebSocket upgrade error: Invalid upgrade header ${req.headers.upgrade}`);
                         socket.write('HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n');
                         socket.destroy();
                         return;

package/dist/backendExpress.js

@@ -82,6 +82,11 @@ export class BackendExpress {
         this.expressApp.post('/api/login', express.json(), (req, res) => {
             const { password } = req.body;
             this.log.debug(`The frontend sent /api/login with password ${password ? '[redacted]' : '(empty)'}`);
+            if (this.backend.storedPassword === undefined) {
+                this.log.error('/api/login stored password not loaded');
+                res.status(500).json({ valid: false });
+                return;
+            }
             if (this.backend.storedPassword === '' || password === this.backend.storedPassword) {
                 this.log.debug('/api/login password valid');
                 res.json({ valid: true });

package/dist/backendWsServer.js

@@ -163,6 +163,22 @@ export class BackendWsServer {
             if (data.method === 'ping') {
                 sendResponse({ id: data.id, method: 'pong', src: 'Matterbridge', dst: data.src, success: true, response: 'pong' });
             }
+            else if (data.method === '/api/login') {
+                const storedPassword = this.backend.storedPassword;
+                if (storedPassword === undefined) {
+                    this.log.error('Login stored password not loaded');
+                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Internal error: stored password not loaded' });
+                    return;
+                }
+                if (storedPassword === '' || storedPassword === data.params.password) {
+                    this.log.debug('Login password valid');
+                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, success: true });
+                }
+                else {
+                    this.log.debug('Error wrong password');
+                    sendResponse({ id: data.id, method: data.method, src: 'Matterbridge', dst: data.src, error: 'Wrong password' });
+                }
+            }
             else if (data.method === '/api/restart') {
                 this.wssSendSnackbarMessage('Restarting matterbridge...', 0);
                 await this.server.fetch({ type: 'matterbridge_restart', src: 'frontend', dst: 'matterbridge', params: undefined });

package/dist/cli.js

@@ -175,7 +175,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)
-      --mtls:                  enable mTLS for the frontend and the WebSocketServer (both server and client will use and require 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"
       --productId:             override the default productId 0x8000

package/dist/cliEmitter.d.ts

@@ -7,8 +7,4 @@ interface CliEvents {
     ready: [];
 }
 export declare const cliEmitter: EventEmitter<CliEvents>;
-export declare let lastOsCpuUsage: number;
-export declare let lastProcessCpuUsage: number;
-export declare function setLastOsCpuUsage(val: number): void;
-export declare function setLastProcessCpuUsage(val: number): void;
 export {};

package/dist/cliEmitter.js

@@ -2,11 +2,3 @@ import { EventEmitter } from 'node:events';
 import { logModuleLoaded } from '@matterbridge/utils/loader';
 logModuleLoaded('CliEmitter');
 export const cliEmitter = new EventEmitter();
-export let lastOsCpuUsage = 0;
-export let lastProcessCpuUsage = 0;
-export function setLastOsCpuUsage(val) {
-    lastOsCpuUsage = val;
-}
-export function setLastProcessCpuUsage(val) {
-    lastProcessCpuUsage = val;
-}

package/dist/frontend.js

@@ -8,7 +8,7 @@ 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, memoryFootprint } from '@matterbridge/utils/bun';
-import { getParameter, hasParameter } from '@matterbridge/utils/cli';
+import { getParameter, hasAnyParameter, hasParameter } from '@matterbridge/utils/cli';
 import { writeDiagnostic } from '@matterbridge/utils/diagnostic';
 import { getErrorMessage, inspectError, logError } from '@matterbridge/utils/error';
 import { formatBytes, formatPercent, formatUptime } from '@matterbridge/utils/format';
@@ -16,7 +16,7 @@ import { logModuleLoaded } from '@matterbridge/utils/loader';
 import { isValidArray, isValidBoolean, isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
 import { fireAndForget, wait, withTimeout } from '@matterbridge/utils/wait';
 import { AnsiLogger, bgHex, CYAN, db, debugStringify, er, GREEN, nf, nt, rs, stringify, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from 'node-ansi-logger';
-import { cliEmitter, lastOsCpuUsage, lastProcessCpuUsage } from './cliEmitter.js';
+import { cliEmitter } from './cliEmitter.js';
 import { generateHistoryPage } from './cliHistory.js';
 import { capitalizeFirstLetter } from './matterbridgeEndpointHelpers.js';
 import { deleteAdvertisingNode, getBatteryLevel, getClusterTextFromDevice, getPowerSource, getReachability, getServerNodeData, setAdvertisingNode } from './matterNodeHelpers.js';
@@ -209,7 +209,8 @@ export class Frontend extends EventEmitter {
     async start(port = 8283) {
         this.port = port;
         this.storedPassword = await this.matterbridge.nodeContext?.get('password', '');
-        this.log.debug(`Initializing the frontend ${hasParameter('ssl') ? 'https' : 'http'} server on port ${YELLOW}${this.port}${db}`);
+        const secure = hasAnyParameter('ssl', 'tls', 'mtls');
+        this.log.debug(`Initializing the frontend ${secure ? 'https' : 'http'} server on port ${YELLOW}${this.port}${db}`);
         const multer = await import('multer');
         const uploadDir = path.join(this.matterbridge.matterbridgeDirectory, 'uploads');
         const upload = multer.default({ dest: uploadDir });
@@ -219,7 +220,7 @@ export class Frontend extends EventEmitter {
         this.log.debug(`Creating WebSocketServer...`);
         const ws = await import('ws');
         this.webSocketServer = new ws.WebSocketServer({ noServer: true });
-        this.emit('websocket_server_listening', hasParameter('ssl') ? 'wss' : 'ws');
+        this.emit('websocket_server_listening', secure ? 'wss' : 'ws');
         this.webSocketServer.on('connection', (ws, request) => {
             const clientIp = request.socket.remoteAddress;
             let callbackLogLevel = "notice";
@@ -264,7 +265,7 @@ export class Frontend extends EventEmitter {
         this.webSocketServer.on('error', (ws, error) => {
             this.log.error(`WebSocketServer error: ${error}`);
         });
-        if (!hasParameter('ssl')) {
+        if (!secure) {
             const http = await import('node:http');
             try {
                 this.log.debug(`Creating HTTP server...`);
@@ -929,8 +930,8 @@ export class Frontend extends EventEmitter {
         this.matterbridge.systemInformation.freeMemory = formatBytes(os.freemem());
         this.matterbridge.systemInformation.systemUptime = formatUptime(os.uptime());
         this.matterbridge.systemInformation.processUptime = formatUptime(Math.floor(process.uptime()));
-        this.matterbridge.systemInformation.cpuUsage = formatPercent(lastOsCpuUsage);
-        this.matterbridge.systemInformation.processCpuUsage = formatPercent(lastProcessCpuUsage);
+        this.matterbridge.systemInformation.cpuUsage = formatPercent(0);
+        this.matterbridge.systemInformation.processCpuUsage = formatPercent(0);
         this.matterbridge.systemInformation.rss = formatBytes(memoryFootprint());
         this.matterbridge.systemInformation.heapTotal = formatBytes(process.memoryUsage().heapTotal);
         this.matterbridge.systemInformation.heapUsed = formatBytes(process.memoryUsage().heapUsed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.13-dev-20261008-55d98fb",
+  "version": "3.10.13-dev-20261009-7fc645a",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -136,10 +136,10 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.13-dev-20261008-55d98fb",
-    "@matterbridge/thread": "3.10.13-dev-20261008-55d98fb",
-    "@matterbridge/types": "3.10.13-dev-20261008-55d98fb",
-    "@matterbridge/utils": "3.10.13-dev-20261008-55d98fb",
+    "@matterbridge/dgram": "3.10.13-dev-20261009-7fc645a",
+    "@matterbridge/thread": "3.10.13-dev-20261009-7fc645a",
+    "@matterbridge/types": "3.10.13-dev-20261009-7fc645a",
+    "@matterbridge/utils": "3.10.13-dev-20261009-7fc645a",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",