matterbridge 2.1.6-dev.4 → 2.1.6-dev.5

package/dist/matterbridgePlatform.js

@@ -1,8 +1,8 @@
 import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
-import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
+import { isValidArray, isValidObject, isValidString } from './utils/export.js';
 import { CYAN, db, er, nf, wr } from './logger/export.js';
 import { NodeStorageManager } from './storage/export.js';
-import path from 'path';
+import path from 'node:path';
 export class MatterbridgePlatform {
     matterbridge;
     log;

package/dist/utils/colorUtils.js

@@ -1,4 +1,4 @@
-import { assert } from 'console';
+import { assert } from 'node:console';
 export function hslColorToRgbColor(hue, saturation, luminance) {
     if (hue === 360) {
         hue = 0;

package/dist/utils/export.js

@@ -1,2 +1,4 @@
 export * from './utils.js';
+export * from './parameter.js';
+export * from './isvalid.js';
 export * from './colorUtils.js';

package/dist/utils/isvalid.js

@@ -0,0 +1,50 @@
+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);
+}
+export function isValidNumber(value, min, max) {
+    if (value === undefined || value === null || typeof value !== 'number' || Number.isNaN(value))
+        return false;
+    if (min !== undefined && value < min)
+        return false;
+    if (max !== undefined && value > max)
+        return false;
+    return true;
+}
+export function isValidBoolean(value) {
+    return value !== undefined && value !== null && typeof value === 'boolean';
+}
+export function isValidString(value, minLength, maxLength) {
+    if (value === undefined || value === null || typeof value !== 'string')
+        return false;
+    if (minLength !== undefined && value.length < minLength)
+        return false;
+    if (maxLength !== undefined && value.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidObject(value, minLength, maxLength) {
+    if (value === undefined || value === null || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const keys = Object.keys(value);
+    if (minLength !== undefined && keys.length < minLength)
+        return false;
+    if (maxLength !== undefined && keys.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidArray(value, minLength, maxLength) {
+    if (value === undefined || value === null || !Array.isArray(value))
+        return false;
+    if (minLength !== undefined && value.length < minLength)
+        return false;
+    if (maxLength !== undefined && value.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidNull(value) {
+    return value === null;
+}
+export function isValidUndefined(value) {
+    return value === undefined;
+}

package/dist/utils/parameter.js

@@ -0,0 +1,26 @@
+import { isValidNumber } from './export.js';
+export function getParameter(name) {
+    const commandArguments = process.argv.slice(2);
+    let markerIndex = commandArguments.indexOf(`-${name}`);
+    if (markerIndex === -1)
+        markerIndex = commandArguments.indexOf(`--${name}`);
+    if (markerIndex === -1 || markerIndex + 1 === commandArguments.length)
+        return undefined;
+    return commandArguments[markerIndex + 1];
+}
+export function hasParameter(name) {
+    const commandArguments = process.argv.slice(2);
+    let markerIncluded = commandArguments.includes(`-${name}`);
+    if (!markerIncluded)
+        markerIncluded = commandArguments.includes(`--${name}`);
+    return markerIncluded;
+}
+export function getIntParameter(name) {
+    const value = getParameter(name);
+    if (value === undefined)
+        return undefined;
+    const intValue = parseInt(value, 10);
+    if (!isValidNumber(intValue))
+        return undefined;
+    return intValue;
+}

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
-import os from 'os';
-import path from 'path';
-import { AnsiLogger, idn, rs } from 'node-ansi-logger';
+import os from 'node:os';
+import path from 'node:path';
+import { AnsiLogger, idn, rs } from '../logger/export.js';
 const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });
 export function deepEqual(a, b, excludeProperties = []) {
     const debug = false;
@@ -147,56 +147,6 @@ export function getMacAddress() {
     }
     return macAddress;
 }
-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);
-}
-export function isValidNumber(value, min, max) {
-    if (value === undefined || value === null || typeof value !== 'number' || Number.isNaN(value))
-        return false;
-    if (min !== undefined && value < min)
-        return false;
-    if (max !== undefined && value > max)
-        return false;
-    return true;
-}
-export function isValidBoolean(value) {
-    return value !== undefined && value !== null && typeof value === 'boolean';
-}
-export function isValidString(value, minLength, maxLength) {
-    if (value === undefined || value === null || typeof value !== 'string')
-        return false;
-    if (minLength !== undefined && value.length < minLength)
-        return false;
-    if (maxLength !== undefined && value.length > maxLength)
-        return false;
-    return true;
-}
-export function isValidObject(value, minLength, maxLength) {
-    if (value === undefined || value === null || typeof value !== 'object' || Array.isArray(value))
-        return false;
-    const keys = Object.keys(value);
-    if (minLength !== undefined && keys.length < minLength)
-        return false;
-    if (maxLength !== undefined && keys.length > maxLength)
-        return false;
-    return true;
-}
-export function isValidArray(value, minLength, maxLength) {
-    if (value === undefined || value === null || !Array.isArray(value))
-        return false;
-    if (minLength !== undefined && value.length < minLength)
-        return false;
-    if (maxLength !== undefined && value.length > maxLength)
-        return false;
-    return true;
-}
-export function isValidNull(value) {
-    return value === null;
-}
-export function isValidUndefined(value) {
-    return value === undefined;
-}
 export function logInterfaces(debug = true) {
     log.logLevel = "info";
     log.logName = 'LogInterfaces';
@@ -260,7 +210,7 @@ export async function wait(timeout = 1000, name, debug = false) {
 export async function createZip(outputPath, ...sourcePaths) {
     const { default: archiver } = await import('archiver');
     const { glob } = await import('glob');
-    const { createWriteStream, statSync } = await import('fs');
+    const { createWriteStream, statSync } = await import('node:fs');
     log.logLevel = "info";
     log.logName = 'Archive';
     log.debug(`creating archive ${outputPath} from ${sourcePaths.join(', ')} ...`);
@@ -326,7 +276,7 @@ export async function createZip(outputPath, ...sourcePaths) {
     });
 }
 export async function copyDirectory(srcDir, destDir) {
-    const fs = await import('fs').then((mod) => mod.promises);
+    const fs = await import('node:fs').then((mod) => mod.promises);
     log.debug(`copyDirectory: copying directory from ${srcDir} to ${destDir}`);
     try {
         await fs.mkdir(destDir, { recursive: true });
@@ -349,7 +299,7 @@ export async function copyDirectory(srcDir, destDir) {
     }
 }
 export async function resolveHostname(hostname, family = 4) {
-    const dns = await import('dns');
+    const dns = await import('node:dns');
     try {
         const addresses = await dns.promises.lookup(hostname.toLowerCase(), { family });
         return addresses.address;
@@ -358,31 +308,6 @@ export async function resolveHostname(hostname, family = 4) {
         return null;
     }
 }
-export function getParameter(name) {
-    const commandArguments = process.argv.slice(2);
-    let markerIndex = commandArguments.indexOf(`-${name}`);
-    if (markerIndex === -1)
-        markerIndex = commandArguments.indexOf(`--${name}`);
-    if (markerIndex === -1 || markerIndex + 1 === commandArguments.length)
-        return undefined;
-    return commandArguments[markerIndex + 1];
-}
-export function hasParameter(name) {
-    const commandArguments = process.argv.slice(2);
-    let markerIncluded = commandArguments.includes(`-${name}`);
-    if (!markerIncluded)
-        markerIncluded = commandArguments.includes(`--${name}`);
-    return markerIncluded;
-}
-export function getIntParameter(name) {
-    const value = getParameter(name);
-    if (value === undefined)
-        return undefined;
-    const intValue = parseInt(value, 10);
-    if (!isValidNumber(intValue))
-        return undefined;
-    return intValue;
-}
 export async function getNpmPackageVersion(packageName, tag = 'latest', timeout = 5000) {
     const https = await import('https');
     return new Promise((resolve, reject) => {
@@ -427,3 +352,16 @@ export async function getNpmPackageVersion(packageName, tag = 'latest', timeout
         });
     });
 }
+export async function getGlobalNodeModules() {
+    const { exec } = await import('node:child_process');
+    return new Promise((resolve, reject) => {
+        exec('npm root -g', (error, stdout) => {
+            if (error) {
+                reject(error);
+            }
+            else {
+                resolve(stdout.trim());
+            }
+        });
+    });
+}

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.cf25d33e.css",
-    "main.js": "./static/js/main.257513e8.js",
+    "main.js": "./static/js/main.be75f5a3.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
@@ -61,11 +61,11 @@
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
     "main.cf25d33e.css.map": "./static/css/main.cf25d33e.css.map",
-    "main.257513e8.js.map": "./static/js/main.257513e8.js.map",
+    "main.be75f5a3.js.map": "./static/js/main.be75f5a3.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.cf25d33e.css",
-    "static/js/main.257513e8.js"
+    "static/js/main.be75f5a3.js"
   ]
 }

package/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.257513e8.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.be75f5a3.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>