matterbridge 3.3.4-dev-20251020-4d2dd49 → 3.3.4-dev-20251020-df40d12

package/dist/utils/jestHelpers.js

@@ -2,10 +2,14 @@ import { rmSync } from 'node:fs';
 import { inspect } from 'node:util';
 import path from 'node:path';
 import { jest } from '@jest/globals';
-import { DeviceTypeId, Endpoint, Environment, ServerNode, ServerNodeStore, VendorId, LogFormat as MatterLogFormat, LogLevel as MatterLogLevel, Lifecycle } from '@matter/main';
-import { AggregatorEndpoint, RootEndpoint } from '@matter/main/endpoints';
-import { MdnsService } from '@matter/main/protocol';
 import { AnsiLogger } from 'node-ansi-logger';
+import '@matter/nodejs';
+import { LogFormat as MatterLogFormat, LogLevel as MatterLogLevel, Environment, Lifecycle } from '@matter/general';
+import { DeviceTypeId, VendorId } from '@matter/types';
+import { MdnsService } from '@matter/protocol';
+import { ServerNode, Endpoint, ServerNodeStore } from '@matter/node';
+import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
+import { RootEndpoint } from '@matter/node/endpoints/root';
 export let loggerLogSpy;
 export let consoleLogSpy;
 export let consoleDebugSpy;

package/dist/utils/network.js

@@ -180,29 +180,3 @@ export async function getGlobalNodeModules() {
         });
     });
 }
-export function formatMemoryUsage(bytes) {
-    if (bytes >= 1024 ** 3) {
-        return `${(bytes / 1024 ** 3).toFixed(2)} GB`;
-    }
-    else if (bytes >= 1024 ** 2) {
-        return `${(bytes / 1024 ** 2).toFixed(2)} MB`;
-    }
-    else {
-        return `${(bytes / 1024).toFixed(2)} KB`;
-    }
-}
-export function formatOsUpTime(seconds) {
-    if (seconds >= 86400) {
-        const days = Math.floor(seconds / 86400);
-        return `${days} day${days !== 1 ? 's' : ''}`;
-    }
-    if (seconds >= 3600) {
-        const hours = Math.floor(seconds / 3600);
-        return `${hours} hour${hours !== 1 ? 's' : ''}`;
-    }
-    if (seconds >= 60) {
-        const minutes = Math.floor(seconds / 60);
-        return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
-    }
-    return `${seconds} second${seconds !== 1 ? 's' : ''}`;
-}

package/dist/utils/tracker.js

@@ -3,6 +3,7 @@ if (process.argv.includes('--loader') || process.argv.includes('-loader'))
 import os from 'node:os';
 import EventEmitter from 'node:events';
 import { AnsiLogger, BRIGHT, CYAN, RESET, YELLOW, db, RED } from 'node-ansi-logger';
+import { formatPercent, formatBytes, formatTimeStamp } from './format.js';
 export class Tracker extends EventEmitter {
     name;
     debug;
@@ -65,35 +66,6 @@ export class Tracker extends EventEmitter {
             this.runGarbageCollector();
         });
     }
-    formatTimeStamp(timestamp) {
-        return `${new Date(timestamp).toLocaleString()}`;
-    }
-    formatOsUpTime(seconds) {
-        if (seconds >= 86400) {
-            const days = Math.floor(seconds / 86400);
-            return `${days} day${days !== 1 ? 's' : ''}`;
-        }
-        if (seconds >= 3600) {
-            const hours = Math.floor(seconds / 3600);
-            return `${hours} hour${hours !== 1 ? 's' : ''}`;
-        }
-        if (seconds >= 60) {
-            const minutes = Math.floor(seconds / 60);
-            return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
-        }
-        return `${seconds} second${seconds !== 1 ? 's' : ''}`;
-    }
-    formatPercent(percent) {
-        return `${percent.toFixed(2)} %`;
-    }
-    formatBytes(bytes) {
-        if (bytes === 0)
-            return '0 B';
-        const units = ['B', 'KB', 'MB', 'GB', 'TB'];
-        const idx = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), units.length - 1);
-        const value = bytes / Math.pow(1024, idx);
-        return `${value.toFixed(2)} ${units[idx]}`;
-    }
     start(sampleIntervalMs = 10000) {
         if (this.trackerInterval)
             return;
@@ -154,14 +126,14 @@ export class Tracker extends EventEmitter {
             this.emit('memory', entry.freeMemory, entry.totalMemory, entry.rss, entry.heapUsed, entry.heapTotal, entry.external, entry.arrayBuffers);
             this.emit('snapshot', entry);
             if (this.debug) {
-                this.log.debug(`Time: ${this.formatTimeStamp(entry.timestamp)} ` +
-                    `os ${CYAN}${BRIGHT}${this.formatPercent(entry.osCpu)}${RESET}${db} (${entry.peakOsCpu > prevEntry.peakOsCpu ? RED : ''}${this.formatPercent(entry.peakOsCpu)}${db}) ` +
-                    `process ${CYAN}${BRIGHT}${this.formatPercent(entry.processCpu)}${RESET}${db} (${entry.peakProcessCpu > prevEntry.peakProcessCpu ? RED : ''}${this.formatPercent(entry.peakProcessCpu)}${db}) ` +
-                    `rss: ${CYAN}${BRIGHT}${this.formatBytes(entry.rss)}${RESET}${db} (${entry.peakRss > prevEntry.peakRss ? RED : ''}${this.formatBytes(entry.peakRss)}${db}) ` +
-                    `heapUsed: ${CYAN}${BRIGHT}${this.formatBytes(entry.heapUsed)}${RESET}${db} (${entry.peakHeapUsed > prevEntry.peakHeapUsed ? RED : ''}${this.formatBytes(entry.peakHeapUsed)}${db}) ` +
-                    `heapTotal: ${CYAN}${BRIGHT}${this.formatBytes(entry.heapTotal)}${RESET}${db} (${entry.peakHeapTotal > prevEntry.peakHeapTotal ? RED : ''}${this.formatBytes(entry.peakHeapTotal)}${db}) ` +
-                    `external: ${CYAN}${BRIGHT}${this.formatBytes(entry.external)}${RESET}${db} (${entry.peakExternal > prevEntry.peakExternal ? RED : ''}${this.formatBytes(entry.peakExternal)}${db}) ` +
-                    `arrayBuffers: ${CYAN}${BRIGHT}${this.formatBytes(entry.arrayBuffers)}${RESET}${db} (${entry.peakArrayBuffers > prevEntry.peakArrayBuffers ? RED : ''}${this.formatBytes(entry.peakArrayBuffers)}${db})`);
+                this.log.debug(`Time: ${formatTimeStamp(entry.timestamp)} ` +
+                    `os ${CYAN}${BRIGHT}${formatPercent(entry.osCpu)}${RESET}${db} (${entry.peakOsCpu > prevEntry.peakOsCpu ? RED : ''}${formatPercent(entry.peakOsCpu)}${db}) ` +
+                    `process ${CYAN}${BRIGHT}${formatPercent(entry.processCpu)}${RESET}${db} (${entry.peakProcessCpu > prevEntry.peakProcessCpu ? RED : ''}${formatPercent(entry.peakProcessCpu)}${db}) ` +
+                    `rss: ${CYAN}${BRIGHT}${formatBytes(entry.rss)}${RESET}${db} (${entry.peakRss > prevEntry.peakRss ? RED : ''}${formatBytes(entry.peakRss)}${db}) ` +
+                    `heapUsed: ${CYAN}${BRIGHT}${formatBytes(entry.heapUsed)}${RESET}${db} (${entry.peakHeapUsed > prevEntry.peakHeapUsed ? RED : ''}${formatBytes(entry.peakHeapUsed)}${db}) ` +
+                    `heapTotal: ${CYAN}${BRIGHT}${formatBytes(entry.heapTotal)}${RESET}${db} (${entry.peakHeapTotal > prevEntry.peakHeapTotal ? RED : ''}${formatBytes(entry.peakHeapTotal)}${db}) ` +
+                    `external: ${CYAN}${BRIGHT}${formatBytes(entry.external)}${RESET}${db} (${entry.peakExternal > prevEntry.peakExternal ? RED : ''}${formatBytes(entry.peakExternal)}${db}) ` +
+                    `arrayBuffers: ${CYAN}${BRIGHT}${formatBytes(entry.arrayBuffers)}${RESET}${db} (${entry.peakArrayBuffers > prevEntry.peakArrayBuffers ? RED : ''}${formatBytes(entry.peakArrayBuffers)}${db})`);
             }
             Tracker.historyIndex = (Tracker.historyIndex + 1) % Tracker.historySize;
         }, sampleIntervalMs);
@@ -214,14 +186,14 @@ export class Tracker extends EventEmitter {
                 const entry = Tracker.history[index];
                 if (entry.timestamp === 0)
                     continue;
-                this.log.debug(`${this.formatTimeStamp(entry.timestamp)} ` +
-                    `${CYAN}${BRIGHT}${this.formatPercent(entry.osCpu).padStart(8)}${RESET} (${this.formatPercent(entry.peakOsCpu).padStart(8)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatPercent(entry.processCpu).padStart(8)}${RESET} (${this.formatPercent(entry.peakProcessCpu).padStart(8)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatBytes(entry.rss).padStart(9)}${RESET} (${this.formatBytes(entry.peakRss).padStart(9)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatBytes(entry.heapUsed).padStart(9)}${RESET} (${this.formatBytes(entry.peakHeapUsed).padStart(9)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatBytes(entry.heapTotal).padStart(9)}${RESET} (${this.formatBytes(entry.peakHeapTotal).padStart(9)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatBytes(entry.external).padStart(9)}${RESET} (${this.formatBytes(entry.peakExternal).padStart(9)}) ` +
-                    `${CYAN}${BRIGHT}${this.formatBytes(entry.arrayBuffers).padStart(9)}${RESET} (${this.formatBytes(entry.peakArrayBuffers).padStart(9)})`);
+                this.log.debug(`${formatTimeStamp(entry.timestamp)} ` +
+                    `${CYAN}${BRIGHT}${formatPercent(entry.osCpu).padStart(8)}${RESET} (${formatPercent(entry.peakOsCpu).padStart(8)}) ` +
+                    `${CYAN}${BRIGHT}${formatPercent(entry.processCpu).padStart(8)}${RESET} (${formatPercent(entry.peakProcessCpu).padStart(8)}) ` +
+                    `${CYAN}${BRIGHT}${formatBytes(entry.rss).padStart(9)}${RESET} (${formatBytes(entry.peakRss).padStart(9)}) ` +
+                    `${CYAN}${BRIGHT}${formatBytes(entry.heapUsed).padStart(9)}${RESET} (${formatBytes(entry.peakHeapUsed).padStart(9)}) ` +
+                    `${CYAN}${BRIGHT}${formatBytes(entry.heapTotal).padStart(9)}${RESET} (${formatBytes(entry.peakHeapTotal).padStart(9)}) ` +
+                    `${CYAN}${BRIGHT}${formatBytes(entry.external).padStart(9)}${RESET} (${formatBytes(entry.peakExternal).padStart(9)}) ` +
+                    `${CYAN}${BRIGHT}${formatBytes(entry.arrayBuffers).padStart(9)}${RESET} (${formatBytes(entry.peakArrayBuffers).padStart(9)})`);
             }
         }
         this.log.debug(`Tracker stopped`);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.3.4-dev-20251020-4d2dd49",
+  "version": "3.3.4-dev-20251020-df40d12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.3.4-dev-20251020-4d2dd49",
+      "version": "3.3.4-dev-20251020-df40d12",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.15.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.3.4-dev-20251020-4d2dd49",
+  "version": "3.3.4-dev-20251020-df40d12",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",