@matterbridge/core 3.10.13-dev-20261005-49e0dbd → 3.10.13-dev-20261007-320f739

package/dist/matterbridge.d.ts

@@ -5,7 +5,7 @@ import { Endpoint, ServerNode } from '@matter/node';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
 import { type DeviceCertification } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
-import type { ApiMatter, ApiSettings, BridgeMode, BridgeStatus, MaybePromise, PlatformMatterbridge, RestartMode, SharedMatterbridge, SystemInformation, VirtualMode } from '@matterbridge/types';
+import type { ApiSettings, BridgeMode, BridgeStatus, MaybePromise, PlatformMatterbridge, RestartMode, SharedMatterbridge, SystemInformation, VirtualMode } from '@matterbridge/types';
 import { AnsiLogger, LogLevel } from 'node-ansi-logger';
 import { type NodeStorage, NodeStorageManager } from 'node-persist-manager';
 import { DeviceManager } from './deviceManager.js';
@@ -120,7 +120,6 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     controllerVendorName: string;
     controllerProductId: number;
     controllerProductName: string;
-    advertisingNodes: Map<string, number>;
     private readonly server;
     private constructor();
     destroy(): void;
@@ -154,7 +153,6 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     private stopMatterStorage;
     private createServerNodeContext;
     private createServerNode;
-    getServerNodeData(serverNode: ServerNode): ApiMatter;
     private startServerNode;
     private stopServerNode;
     private createAggregatorNode;
@@ -166,9 +164,6 @@ export declare class Matterbridge extends EventEmitter<MatterbridgeEvents> {
     removeAllBridgedEndpoints(pluginName: string, delay?: number): Promise<void>;
     addVirtualEndpoint(pluginName: string, name: string, type: 'light' | 'outlet' | 'switch' | 'mounted_switch', callback: () => Promise<void>): Promise<boolean>;
     private subscribeAttributeChanged;
-    private sanitizeFabricInformations;
-    private sanitizeSessionInformation;
     private setAggregatorReachability;
-    private getVendorIdName;
 }
 export {};

package/dist/matterbridge.js

@@ -16,7 +16,7 @@ import { DeviceTypeId, EndpointNumber, 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 { isBun, getGlobalBunModules, memoryFootprint } 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';
@@ -33,6 +33,7 @@ import { Frontend } from './frontend.js';
 import { addVirtualDevice, addVirtualDevices, resolveRootDirectory } from './helpers.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
+import { clearAdvertisingNodes, deleteAdvertisingNode, getServerNodeData, setAdvertisingNode } from './matterNodeHelpers.js';
 import { PluginManager } from './pluginManager.js';
 logModuleLoaded('Matterbridge');
 export class Matterbridge extends EventEmitter {
@@ -159,7 +160,6 @@ export class Matterbridge extends EventEmitter {
     controllerVendorName = getParameter('vendorName') ?? 'Matterbridge';
     controllerProductId = getIntParameter('productId') ?? 0x8000;
     controllerProductName = getParameter('productName') ?? 'Matterbridge Controller';
-    advertisingNodes = new Map();
     server;
     constructor() {
         super();
@@ -231,6 +231,13 @@ export class Matterbridge extends EventEmitter {
         };
     }
     getApiSettings() {
+        this.systemInformation.totalMemory = formatBytes(os.totalmem());
+        this.systemInformation.freeMemory = formatBytes(os.freemem());
+        this.systemInformation.systemUptime = formatUptime(os.uptime());
+        this.systemInformation.processUptime = formatUptime(Math.floor(process.uptime()));
+        this.systemInformation.rss = formatBytes(memoryFootprint());
+        this.systemInformation.heapTotal = formatBytes(process.memoryUsage().heapTotal);
+        this.systemInformation.heapUsed = formatBytes(process.memoryUsage().heapUsed);
         return {
             systemInformation: { ...this.systemInformation },
             matterbridgeInformation: {
@@ -317,6 +324,29 @@ export class Matterbridge extends EventEmitter {
                 case 'matterbridge_shared':
                     this.server.respond({ ...msg, result: { data: this.getSharedMatterbridge(), success: true } });
                     break;
+                case 'matterbridge_restart':
+                    this.server.respond({ ...msg, result: { success: true } });
+                    await this.restartProcess();
+                    break;
+                case 'matterbridge_shutdown':
+                    this.server.respond({ ...msg, result: { success: true } });
+                    await this.shutdownProcess();
+                    break;
+                case 'matterbridge_apimatter': {
+                    let serverNode;
+                    if (msg.params.id === 'Matterbridge')
+                        serverNode = this.serverNode;
+                    else
+                        serverNode =
+                            this.plugins.array().find((p) => p.serverNode && p.serverNode.id === msg.params.id)?.serverNode ??
+                                this.devices.array().find((d) => d.serverNode && d.serverNode.id === msg.params.id)?.serverNode;
+                    if (!serverNode) {
+                        this.server.respond({ ...msg, result: { matter: undefined } });
+                        break;
+                    }
+                    this.server.respond({ ...msg, result: { matter: getServerNodeData(serverNode) } });
+                    break;
+                }
                 case 'matterbridge_apisettings':
                     this.server.respond({ ...msg, result: { data: this.getApiSettings(), success: true } });
                     break;
@@ -1123,7 +1153,7 @@ export class Matterbridge extends EventEmitter {
         this.systemInformation.processUptime = formatUptime(process.uptime());
         this.systemInformation.cpuUsage = formatPercent(0);
         this.systemInformation.processCpuUsage = formatPercent(0);
-        this.systemInformation.rss = formatBytes(process.memoryUsage().rss);
+        this.systemInformation.rss = formatBytes(memoryFootprint());
         this.systemInformation.heapTotal = formatBytes(process.memoryUsage().heapTotal);
         this.systemInformation.heapUsed = formatBytes(process.memoryUsage().heapUsed);
         this.log.debug('Host System Information:');
@@ -1408,6 +1438,7 @@ export class Matterbridge extends EventEmitter {
                 this.log.info('Matter storage reset done!');
             }
             await this.stopMatterStorage();
+            clearAdvertisingNodes();
             function unlinkSafe(path, log) {
                 try {
                     log.debug(`Removing ${path}...`);
@@ -1956,14 +1987,14 @@ export class Matterbridge extends EventEmitter {
         });
         serverNode.lifecycle.commissioned.on(() => {
             this.log.notice(`Server node for ${storeId} commissioned successfully!`);
-            this.advertisingNodes.delete(storeId);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            deleteAdvertisingNode(storeId);
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
             this.frontend.wssSendSnackbarMessage(`Server node for ${storeId} commissioned successfully!`, 5, 'success');
         });
         serverNode.lifecycle.decommissioned.on(() => {
             this.log.notice(`Server node for ${storeId} fully decommissioned successfully!`);
-            this.advertisingNodes.delete(storeId);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            deleteAdvertisingNode(storeId);
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
             this.frontend.wssSendSnackbarMessage(`${storeId} is offline`, 5, 'warning');
             this.frontend.wssSendSnackbarMessage(`Server node for ${storeId} fully decommissioned successfully!`, 5, 'success');
         });
@@ -1978,24 +2009,24 @@ export class Matterbridge extends EventEmitter {
             }
             if (serverNode.lifecycle.isCommissioned) {
                 this.log.notice(`Server node for ${storeId} is already commissioned.`);
-                this.advertisingNodes.delete(storeId);
+                deleteAdvertisingNode(storeId);
             }
             else {
                 this.log.notice(`Server node for ${storeId} is not commissioned. Pair to commission.`);
-                this.advertisingNodes.set(storeId, Date.now());
+                setAdvertisingNode(storeId, Date.now());
                 const { qrPairingCode, manualPairingCode } = serverNode.state.commissioning.pairingCodes;
                 const pairingData = ManualPairingCodeCodec.decode(manualPairingCode);
                 this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
                 this.log.notice(`Manual pairing code ${CYAN}${manualPairingCode}${nt} discriminator ${CYAN}${discriminator}${nt} short discriminator ${CYAN}${pairingData.shortDiscriminator}${nt} passcode ${CYAN}${passcode}${nt}`);
             }
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
             this.frontend.wssSendSnackbarMessage(`${storeId} is online`, 5, 'success');
             this.emit('online', storeId);
         });
         serverNode.lifecycle.offline.on(() => {
             this.log.notice(`Server node for ${storeId} is offline`);
-            this.advertisingNodes.delete(storeId);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            deleteAdvertisingNode(storeId);
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
             this.frontend.wssSendSnackbarMessage(`${storeId} is offline`, 5, 'warning');
             this.emit('offline', storeId);
         });
@@ -2003,7 +2034,7 @@ export class Matterbridge extends EventEmitter {
             let action = '';
             switch (fabricAction) {
                 case 'added':
-                    this.advertisingNodes.delete(storeId);
+                    deleteAdvertisingNode(storeId);
                     action = 'added';
                     break;
                 case 'deleted':
@@ -2014,39 +2045,23 @@ export class Matterbridge extends EventEmitter {
                     break;
             }
             this.log.notice(`Commissioned fabric index ${fabricIndex} ${action} on server node for ${storeId}: ${debugStringify(serverNode.state.commissioning.fabrics[fabricIndex])}`);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.opened.on((session) => {
             this.log.notice(`Session opened on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.closed.on((session) => {
             this.log.notice(`Session closed on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
         });
         serverNode.events.sessions.subscriptionsChanged.on((session) => {
             this.log.notice(`Session subscriptions changed on server node for ${storeId}: ${debugStringify(session)}`);
-            this.frontend.wssSendRefreshRequired('matter', { matter: { ...this.getServerNodeData(serverNode) } });
+            this.frontend.wssSendRefreshRequired('matter', { matter: { ...getServerNodeData(serverNode) } });
         });
         this.log.info(`Created server node for ${storeId}`);
         return serverNode;
     }
-    getServerNodeData(serverNode) {
-        const advertiseTime = this.advertisingNodes.get(serverNode.id) ?? 0;
-        return {
-            id: serverNode.id,
-            online: serverNode.lifecycle.isOnline,
-            commissioned: serverNode.state.commissioning.commissioned,
-            advertising: advertiseTime > 0,
-            advertiseTime,
-            windowStatus: serverNode.state.administratorCommissioning.windowStatus,
-            qrPairingCode: serverNode.state.commissioning.pairingCodes.qrPairingCode,
-            manualPairingCode: serverNode.state.commissioning.pairingCodes.manualPairingCode,
-            fabricInformations: this.sanitizeFabricInformations(Object.values(serverNode.state.commissioning.fabrics)),
-            sessionInformations: this.sanitizeSessionInformation(Object.values(serverNode.state.sessions.sessions)),
-            serialNumber: serverNode.state.basicInformation.serialNumber,
-        };
-    }
     async startServerNode(matterServerNode) {
         if (!matterServerNode)
             return;
@@ -2353,89 +2368,6 @@ export class Matterbridge extends EventEmitter {
             }
         }
     }
-    sanitizeFabricInformations(fabricInfo) {
-        return fabricInfo.map((info) => {
-            return {
-                fabricIndex: info.fabricIndex,
-                fabricId: info.fabricId.toString(),
-                nodeId: info.nodeId.toString(),
-                rootNodeId: info.rootNodeId.toString(),
-                rootVendorId: info.rootVendorId,
-                rootVendorName: this.getVendorIdName(info.rootVendorId),
-                label: info.label,
-            };
-        });
-    }
-    sanitizeSessionInformation(sessions) {
-        return sessions
-            .filter((session) => session.isPeerActive)
-            .map((session) => {
-            return {
-                name: session.name,
-                nodeId: session.nodeId.toString(),
-                peerNodeId: session.peerNodeId.toString(),
-                fabric: session.fabric
-                    ? {
-                        fabricIndex: session.fabric.fabricIndex,
-                        fabricId: session.fabric.fabricId.toString(),
-                        nodeId: session.fabric.nodeId.toString(),
-                        rootNodeId: session.fabric.rootNodeId.toString(),
-                        rootVendorId: session.fabric.rootVendorId,
-                        rootVendorName: this.getVendorIdName(session.fabric.rootVendorId),
-                        label: session.fabric.label,
-                    }
-                    : undefined,
-                isPeerActive: session.isPeerActive,
-                lastInteractionTimestamp: session.lastInteractionTimestamp?.toString(),
-                lastActiveTimestamp: session.lastActiveTimestamp?.toString(),
-                numberOfActiveSubscriptions: session.numberOfActiveSubscriptions,
-            };
-        });
-    }
     async setAggregatorReachability(aggregatorNode, reachable) {
     }
-    getVendorIdName = (vendorId) => {
-        if (!vendorId)
-            return '';
-        let vendorName = '(Unknown vendorId)';
-        switch (vendorId) {
-            case 4937:
-                vendorName = '(AppleHome)';
-                break;
-            case 4996:
-                vendorName = '(AppleKeyChain)';
-                break;
-            case 4362:
-                vendorName = '(SmartThings)';
-                break;
-            case 4939:
-                vendorName = '(HomeAssistant)';
-                break;
-            case 24582:
-                vendorName = '(GoogleHome)';
-                break;
-            case 4631:
-                vendorName = '(Alexa)';
-                break;
-            case 4701:
-                vendorName = '(Tuya)';
-                break;
-            case 4718:
-                vendorName = '(Xiaomi)';
-                break;
-            case 4742:
-                vendorName = '(eWeLink)';
-                break;
-            case 5264:
-                vendorName = '(Shelly)';
-                break;
-            case 0x1488:
-                vendorName = '(ShortcutLabsFlic)';
-                break;
-            case 65521:
-                vendorName = '(MatterTest)';
-                break;
-        }
-        return vendorName;
-    };
 }

package/dist/pluginManager.js

@@ -11,6 +11,7 @@ import { AnsiLogger, BLUE, CYAN, db, debugStringify, er, nf, nt, rs, UNDERLINE,
 import { isMatterbridgeAccessoryPlatform } from './matterbridgeAccessoryPlatform.js';
 import { isMatterbridgeDynamicPlatform } from './matterbridgeDynamicPlatform.js';
 import { assertMatterbridgePlatform } from './matterbridgePlatform.js';
+import { getServerNodeData } from './matterNodeHelpers.js';
 logModuleLoaded('Plugin Manager');
 export class PluginManager extends EventEmitter {
     matterbridge;
@@ -389,7 +390,7 @@ export class PluginManager extends EventEmitter {
             schemaJson: plugin.schemaJson,
             hasWhiteList: plugin.hasWhiteList,
             hasBlackList: plugin.hasBlackList,
-            matter: plugin.serverNode ? this.matterbridge.getServerNodeData(plugin.serverNode) : undefined,
+            matter: plugin.serverNode ? getServerNodeData(plugin.serverNode) : undefined,
         };
     }
     array() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.13-dev-20261005-49e0dbd",
+  "version": "3.10.13-dev-20261007-320f739",
   "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-20261005-49e0dbd",
-    "@matterbridge/thread": "3.10.13-dev-20261005-49e0dbd",
-    "@matterbridge/types": "3.10.13-dev-20261005-49e0dbd",
-    "@matterbridge/utils": "3.10.13-dev-20261005-49e0dbd",
+    "@matterbridge/dgram": "3.10.13-dev-20261007-320f739",
+    "@matterbridge/thread": "3.10.13-dev-20261007-320f739",
+    "@matterbridge/types": "3.10.13-dev-20261007-320f739",
+    "@matterbridge/utils": "3.10.13-dev-20261007-320f739",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",

package/dist/backend.d.ts

@@ -1,37 +0,0 @@
-import EventEmitter from 'node:events';
-import type { ApiDevice, ApiPlugin, ApiSettings, SharedMatterbridge } from '@matterbridge/types';
-import type { BackendExpress } from './backendExpress.js';
-import type { BackendWsServer } from './backendWsServer.js';
-interface BackendEvents {
-    server_listening: [protocol: string, port: number, address?: string];
-    server_error: [error: unknown];
-    server_stopped: [];
-    websocket_server_listening: [protocol: string];
-    websocket_server_stopped: [];
-}
-export declare class Backend extends EventEmitter<BackendEvents> {
-    private debug;
-    private verbose;
-    private log;
-    private matterbridge;
-    private readonly server;
-    private port;
-    private listening;
-    private httpServer;
-    private httpsServer;
-    backendExpress: BackendExpress | undefined;
-    backendWsServer: BackendWsServer | undefined;
-    storedPassword: string | undefined;
-    authClients: Set<string>;
-    authClientsTimeout: NodeJS.Timeout | undefined;
-    constructor(matterbridge: SharedMatterbridge);
-    destroy(): void;
-    private broadcastMsgHandler;
-    start(port?: number): Promise<void>;
-    stop(): Promise<void>;
-    getApiSettings(): Promise<ApiSettings>;
-    getApiPlugins(): Promise<ApiPlugin[]>;
-    getApiDevices(pluginName?: string): Promise<ApiDevice[]>;
-    generateDiagnostic(): Promise<void>;
-}
-export {};