@matterbridge/utils 3.9.1-dev-20260614-18d1a2e → 3.9.1-dev-20260617-b1e1b99

package/README.md

@@ -6,10 +6,12 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/luligu/matterbridge?label=docker%20pulls)](https://hub.docker.com/r/luligu/matterbridge)
 ![Node.js CI](https://github.com/Luligu/matterbridge/actions/workflows/build.yml/badge.svg)
 ![CodeQL](https://github.com/Luligu/matterbridge/actions/workflows/codeql.yml/badge.svg)
-[![codecov](https://codecov.io/gh/Luligu/matterbridge/branch/main/graph/badge.svg)](https://codecov.io/gh/Luligu/matterbridge)
-[![styled with prettier](https://img.shields.io/badge/styled_with-Prettier-f8bc45.svg?logo=prettier)](https://prettier.io/)
-[![linted with eslint](https://img.shields.io/badge/linted_with-ES_Lint-4B32C3.svg?logo=eslint)](https://eslint.org/)
+[![Codecov](https://codecov.io/gh/Luligu/matterbridge/branch/main/graph/badge.svg)](https://codecov.io/gh/Luligu/matterbridge)
+[![tested with Vitest](https://img.shields.io/badge/tested_with-Vitest-6E9F18.svg?logo=vitest&logoColor=white)](https://vitest.dev)
+[![styled with Oxc](https://img.shields.io/badge/styled_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/formatter.html)
+[![linted with Oxc](https://img.shields.io/badge/linted_with-Oxc-9BE4E0.svg?logo=oxc&logoColor=white)](https://oxc.rs/docs/guide/usage/linter.html)
 [![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
+[![TypeScript Native](https://img.shields.io/badge/TypeScript_Native-3178C6?logo=typescript&logoColor=white)](https://github.com/microsoft/typescript-go)
 [![ESM](https://img.shields.io/badge/ESM-Node.js-339933?logo=node.js&logoColor=white)](https://nodejs.org/)
 [![matterbridge.io](https://img.shields.io/badge/matterbridge.io-online-brightgreen)](https://matterbridge.io)
 

package/dist/colorUtils.js

@@ -87,13 +87,13 @@ export function xyColorToRgbColor(x, y, brightness = 254) {
     red = Math.round(red * 255);
     green = Math.round(green * 255);
     blue = Math.round(blue * 255);
-    if (isNaN(red) || red < 0) {
+    if (Number.isNaN(red) || red < 0) {
         red = 0;
     }
-    if (isNaN(green) || green < 0) {
+    if (Number.isNaN(green) || green < 0) {
         green = 0;
     }
-    if (isNaN(blue) || blue < 0) {
+    if (Number.isNaN(blue) || blue < 0) {
         blue = 0;
     }
     return {

package/dist/copyDirectory.d.ts

@@ -1,2 +1,2 @@
-import { type AnsiLogger } from 'node-ansi-logger';
+import type { AnsiLogger } from 'node-ansi-logger';
 export declare function copyDirectory(srcDir: string, destDir: string, log?: AnsiLogger): Promise<boolean>;

package/dist/copyDirectory.js

@@ -1,4 +1,6 @@
 import { getErrorMessage } from './error.js';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('CopyDirectory');
 export async function copyDirectory(srcDir, destDir, log) {
     if (srcDir === '') {
         throw new Error('Source directory must be specified.');
@@ -16,7 +18,7 @@ export async function copyDirectory(srcDir, destDir, log) {
         throw new Error('Source and destination directories must be different.');
     }
     const fs = await import('node:fs').then((mod) => mod.promises);
-    const path = await import('node:path');
+    const { default: path } = await import('node:path');
     log?.debug(`copyDirectory: copying directory from ${srcDir} to ${destDir}`);
     try {
         await fs.mkdir(destDir, { recursive: true });

package/dist/createDirectory.d.ts

@@ -1,2 +1,2 @@
-import { type AnsiLogger } from 'node-ansi-logger';
+import type { AnsiLogger } from 'node-ansi-logger';
 export declare function createDirectory(path: string, name: string, log: AnsiLogger): Promise<void>;

package/dist/createDirectory.js

@@ -1,21 +1,24 @@
 import { promises as fs } from 'node:fs';
+import { isErrnoException, logError } from './error.js';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('CreateDirectory');
 export async function createDirectory(path, name, log) {
     try {
         await fs.access(path);
         log.debug(`Directory ${name} already exists at path: ${path}`);
     }
     catch (err) {
-        if (err.code === 'ENOENT') {
+        if (isErrnoException(err) && err.code === 'ENOENT') {
             try {
                 await fs.mkdir(path, { recursive: true });
                 log.info(`Created ${name}: ${path}`);
             }
             catch (err) {
-                log.error(`Error creating dir ${name} path ${path}: ${err}`);
+                logError(log, `Error creating dir ${name} path ${path}`, err);
             }
         }
         else {
-            log.error(`Error accessing dir ${name} path ${path}: ${err}`);
+            logError(log, `Error accessing dir ${name} path ${path}`, err);
         }
     }
 }

package/dist/deepCopy.js

@@ -1,3 +1,5 @@
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('DeepCopy');
 export function deepCopy(value) {
     if (typeof value !== 'object' || value === null) {
         return value;

package/dist/deepEqual.js

@@ -1,3 +1,5 @@
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('DeepEqual');
 export function deepEqual(a, b, excludeProperties = []) {
     const debugLog = (...messages) => {
     };

package/dist/enumDescription.js

@@ -1,15 +1,17 @@
-export function getEnumDescription(enumType, value, options = {}) {
-    const fallback = options.fallback ?? 'Invalid';
-    if (value === undefined || value === null)
-        return fallback;
-    const enumKey = getEnumKey(enumType, value);
-    return enumKey ?? fallback;
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('EnumDescription');
+function isNumericEnumReverseKey(key) {
+    return /^-?\d+$/.test(key);
 }
 function getEnumKey(enumType, value) {
     return Object.keys(enumType)
         .filter((key) => !isNumericEnumReverseKey(key))
         .find((key) => enumType[key] === value);
 }
-function isNumericEnumReverseKey(key) {
-    return /^-?\d+$/.test(key);
+export function getEnumDescription(enumType, value, options = {}) {
+    const fallback = options.fallback ?? 'Invalid';
+    if (value === undefined || value === null)
+        return fallback;
+    const enumKey = getEnumKey(enumType, value);
+    return enumKey ?? fallback;
 }

package/dist/error.d.ts

@@ -1,4 +1,5 @@
 import { type AnsiLogger } from 'node-ansi-logger';
+export declare function isErrnoException(e: unknown): e is NodeJS.ErrnoException;
 export declare function getErrorMessage(error: unknown): string;
 export declare function logError(log: AnsiLogger, message: string, error: unknown): void;
 export declare function inspectError(log: AnsiLogger, message: string, error: unknown): string;

package/dist/error.js

@@ -1,5 +1,10 @@
 import { inspect } from 'node:util';
 import { RESET } from 'node-ansi-logger';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Error');
+export function isErrnoException(e) {
+    return e instanceof Error && 'code' in e && typeof e.code === 'string';
+}
 export function getErrorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }

package/dist/export.d.ts

@@ -10,6 +10,7 @@ export * from './format.js';
 export * from './githubVersion.js';
 export * from './hex.js';
 export * from './inspector.js';
+export * from './loader.js';
 export * from './network.js';
 export * from './npmPrefix.js';
 export * from './npmVersion.js';

package/dist/export.js

@@ -10,6 +10,7 @@ export * from './format.js';
 export * from './githubVersion.js';
 export * from './hex.js';
 export * from './inspector.js';
+export * from './loader.js';
 export * from './network.js';
 export * from './npmPrefix.js';
 export * from './npmVersion.js';

package/dist/format.js

@@ -1,3 +1,5 @@
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Format');
 export function formatTimeStamp(timestamp) {
     return new Date(timestamp).toLocaleString();
 }
@@ -15,15 +17,15 @@ export function formatBytes(bytes, digits = 2) {
 export function formatUptime(seconds) {
     if (seconds >= 86400) {
         const days = Math.floor(seconds / 86400);
-        return `${days} day${days !== 1 ? 's' : ''}`;
+        return `${days} day${days === 1 ? '' : 's'}`;
     }
     if (seconds >= 3600) {
         const hours = Math.floor(seconds / 3600);
-        return `${hours} hour${hours !== 1 ? 's' : ''}`;
+        return `${hours} hour${hours === 1 ? '' : 's'}`;
     }
     if (seconds >= 60) {
         const minutes = Math.floor(seconds / 60);
-        return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
+        return `${minutes} minute${minutes === 1 ? '' : 's'}`;
     }
-    return `${seconds} second${seconds !== 1 ? 's' : ''}`;
+    return `${seconds} second${seconds === 1 ? '' : 's'}`;
 }

package/dist/inspector.js

@@ -1,9 +1,9 @@
-if (process.argv.includes('--loader'))
-    console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] Inspector loaded.\u001B[40;0m');
 import EventEmitter from 'node:events';
 import { AnsiLogger, BRIGHT, CYAN, db, RESET, YELLOW } from 'node-ansi-logger';
 import { getErrorMessage } from './error.js';
+import { logModuleLoaded } from './loader.js';
 import { fireAndForget } from './wait.js';
+logModuleLoaded('Inspector');
 export class Inspector extends EventEmitter {
     name;
     debug;
@@ -52,7 +52,12 @@ export class Inspector extends EventEmitter {
             this.session = new Session();
             this.session.connect();
             await new Promise((resolve, reject) => {
-                this.session?.post('HeapProfiler.startSampling', (err) => (err ? reject(err) : resolve()));
+                this.session?.post('HeapProfiler.startSampling', (err) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve();
+                });
             });
             this.log.debug(`Started heap sampling`);
             const { getIntParameter } = await import('./commandLine.js');
@@ -60,19 +65,14 @@ export class Inspector extends EventEmitter {
             if (interval && interval >= 30000) {
                 this.log.debug(`Started heap snapshot interval of ${CYAN}${interval}${db} ms`);
                 clearInterval(this.snapshotInterval);
-                this.snapshotInterval = setInterval(async () => {
-                    try {
-                        if (this.snapshotInProgress) {
-                            if (this.debug)
-                                this.log.debug(`Skip heap snapshot: previous snapshot still in progress`);
-                            return;
-                        }
-                        this.log.debug(`Run heap snapshot interval`);
-                        await this.takeHeapSnapshot();
-                    }
-                    catch (err) {
-                        this.log.error(`Error during scheduled heap snapshot: ${getErrorMessage(err)}`);
+                this.snapshotInterval = setInterval(() => {
+                    if (this.snapshotInProgress) {
+                        if (this.debug)
+                            this.log.debug(`Skip heap snapshot: previous snapshot still in progress`);
+                        return;
                     }
+                    this.log.debug(`Run heap snapshot interval`);
+                    fireAndForget(this.takeHeapSnapshot(), this.log, 'Inspector snapshot interval');
                 }, interval).unref();
             }
         }
@@ -89,7 +89,7 @@ export class Inspector extends EventEmitter {
             return;
         }
         const { writeFileSync } = await import('node:fs');
-        const path = await import('node:path');
+        const { default: path } = await import('node:path');
         this.log.debug(`Stopping heap sampling...`);
         if (this.snapshotInterval) {
             this.log.debug(`Clearing heap snapshot interval...`);
@@ -98,7 +98,12 @@ export class Inspector extends EventEmitter {
         }
         try {
             const result = await new Promise((resolve, reject) => {
-                this.session?.post('HeapProfiler.stopSampling', (err, result) => (err ? reject(err) : resolve(result)));
+                this.session?.post('HeapProfiler.stopSampling', (err, result) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve(result);
+                });
             });
             const profile = JSON.stringify(result.profile);
             const safeTimestamp = new Date().toISOString().replace(/[<>:"/\\|?*]/g, '-');
@@ -127,7 +132,7 @@ export class Inspector extends EventEmitter {
         }
         this.snapshotInProgress = true;
         const { createWriteStream } = await import('node:fs');
-        const path = await import('node:path');
+        const { default: path } = await import('node:path');
         const safeTimestamp = new Date().toISOString().replace(/[<>:"/\\|?*]/g, '-');
         const filename = path.join('heap_snapshots', `${safeTimestamp}.heapsnapshot`);
         this.runGarbageCollector('minor', 'async');

package/dist/loader.d.ts

@@ -0,0 +1 @@
+export declare function logModuleLoaded(moduleName: string, color?: string): void;

package/dist/loader.js

@@ -0,0 +1,7 @@
+export function logModuleLoaded(moduleName, color = '\u001B[32m') {
+    if (process.argv.includes('--loader') || process.argv.includes('-loader')) {
+        console.log(`${color}[` +
+            new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) +
+            `] ${moduleName} loaded.\u001B[40;0m`);
+    }
+}

package/dist/network.js

@@ -1,5 +1,7 @@
 import os from 'node:os';
 import { AnsiLogger, BLUE, CYAN, nf } from 'node-ansi-logger';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Network');
 export const excludedInterfaceNamePattern = /(tailscale|wireguard|openvpn|zerotier|hamachi|\bwg\d+\b|\btun\d+\b|\btap\d+\b|\butun\d+\b|docker|podman|\bveth[a-z0-9]*\b|\bbr-[a-z0-9]+\b|cni|kube|flannel|calico|virbr\d*\b|vmware|vmnet\d*\b|virtualbox|vboxnet\d*\b|teredo|isatap)/i;
 export function getInterfaceDetails() {
     const result = {
@@ -11,7 +13,7 @@ export function getInterfaceDetails() {
     for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
         if (!interfaceName || excludedInterfaceNamePattern.test(interfaceName))
             continue;
-        for (const detail of interfaceDetails || []) {
+        for (const detail of interfaceDetails ?? []) {
             if (detail.internal)
                 continue;
             if (!result.interfaceName)
@@ -26,32 +28,35 @@ export function getInterfaceDetails() {
     }
     if (result.interfaceName)
         return result;
+    return undefined;
 }
 export function getInterfaceName() {
     for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
         if (!interfaceName || excludedInterfaceNamePattern.test(interfaceName))
             continue;
-        for (const detail of interfaceDetails || []) {
+        for (const detail of interfaceDetails ?? []) {
             if (!detail.internal)
                 return interfaceName;
         }
     }
+    return undefined;
 }
 export function getIpv4InterfaceAddress() {
     for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
         if (!interfaceName || excludedInterfaceNamePattern.test(interfaceName))
             continue;
-        for (const detail of interfaceDetails || []) {
+        for (const detail of interfaceDetails ?? []) {
             if (detail.family === 'IPv4' && !detail.internal)
                 return detail.address;
         }
     }
+    return undefined;
 }
 export function getIpv6InterfaceAddress(scope = false) {
     for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
         if (!interfaceName || excludedInterfaceNamePattern.test(interfaceName))
             continue;
-        for (const detail of interfaceDetails || []) {
+        for (const detail of interfaceDetails ?? []) {
             if (detail.family === 'IPv6' && !detail.internal) {
                 const address = detail.address;
                 if (!scope)
@@ -67,16 +72,18 @@ export function getIpv6InterfaceAddress(scope = false) {
             }
         }
     }
+    return undefined;
 }
 export function getMacAddress() {
     for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
         if (!interfaceName || excludedInterfaceNamePattern.test(interfaceName))
             continue;
-        for (const detail of interfaceDetails || []) {
+        for (const detail of interfaceDetails ?? []) {
             if (!detail.internal)
                 return detail.mac;
         }
     }
+    return undefined;
 }
 export function logInterfaces() {
     const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });

package/dist/npmPrefix.js

@@ -1,13 +1,13 @@
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('NpmPrefix');
 export async function getGlobalNodeModules() {
     const { exec } = await import('node:child_process');
     return new Promise((resolve, reject) => {
         exec('npm root -g', (error, stdout) => {
-            if (error) {
+            if (error)
                 reject(error);
-            }
-            else {
+            else
                 resolve(stdout.trim());
-            }
         });
     });
 }

package/dist/tracker.js

@@ -1,9 +1,9 @@
-if (process.argv.includes('--loader'))
-    console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] Tracker loaded.\u001B[40;0m');
 import EventEmitter from 'node:events';
 import os from 'node:os';
 import { AnsiLogger, BRIGHT, CYAN, db, RED, RESET, YELLOW } from 'node-ansi-logger';
 import { formatBytes, formatPercent, formatTimeStamp } from './format.js';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Tracker');
 export class Tracker extends EventEmitter {
     name;
     debug;

package/dist/validate.js

@@ -1,3 +1,5 @@
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Validate');
 export function isValidIpv4Address(ipv4Address) {
     const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
     return ipv4Regex.test(ipv4Address);

package/dist/wait.js

@@ -1,6 +1,9 @@
 import { AnsiLogger } from 'node-ansi-logger';
 import { inspectError } from './error.js';
+import { logModuleLoaded } from './loader.js';
+logModuleLoaded('Wait');
 export async function waiter(name, check, exitWithReject = false, resolveTimeout = 5000, resolveInterval = 500, debug = false) {
+    let intervalId;
     const log = new AnsiLogger({ logName: 'Waiter', logTimestampFormat: 4, logLevel: "debug" });
     if (check()) {
         if (debug)
@@ -20,7 +23,7 @@ export async function waiter(name, check, exitWithReject = false, resolveTimeout
             else
                 resolve(false);
         }, resolveTimeout).unref();
-        const intervalId = setInterval(async () => {
+        intervalId = setInterval(() => {
             if (check()) {
                 if (debug)
                     log.debug(`Waiter "${name}" finished for true condition...`);
@@ -28,7 +31,6 @@ export async function waiter(name, check, exitWithReject = false, resolveTimeout
                 clearInterval(intervalId);
                 resolve(true);
             }
-            await Promise.resolve();
         }, resolveInterval).unref();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/utils",
-  "version": "3.9.1-dev-20260614-18d1a2e",
+  "version": "3.9.1-dev-20260617-b1e1b99",
   "description": "Matterbridge utils library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -121,6 +121,10 @@
     "./color-utils": {
       "types": "./dist/colorUtils.d.ts",
       "import": "./dist/colorUtils.js"
+    },
+    "./loader": {
+      "types": "./dist/loader.d.ts",
+      "import": "./dist/loader.js"
     }
   },
   "engines": {