matterbridge 3.1.8 → 3.2.0-dev-20250729-fcbf392

package/dist/utils/network.js

@@ -1,38 +1,8 @@
-/**
- * @description This file contains the network functions.
- * @file network.ts
- * @author Luca Liguori
- * @created 2024-02-17
- * @version 1.0.1
- * @license Apache-2.0
- *
- * Copyright 2024, 2025, 2026 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// Node.js modules
 import os from 'node:os';
-// AnsiLogger module
 import { AnsiLogger, BLUE, CYAN, nf } from 'node-ansi-logger';
-/**
- * Retrieves the IPv4 address of the first non-internal network interface.
- *
- * @returns {string | undefined} The IPv4 address of the selected network interface, or undefined if not found.
- */
 export function getIpv4InterfaceAddress() {
     let ipv4Address;
     const networkInterfaces = os.networkInterfaces();
-    // console.log('Available Network Interfaces:', networkInterfaces);
     for (const interfaceDetails of Object.values(networkInterfaces)) {
         if (!interfaceDetails) {
             break;
@@ -46,18 +16,11 @@ export function getIpv4InterfaceAddress() {
             break;
         }
     }
-    // console.log('Selected Network Interfaces:', ipv4Address);
     return ipv4Address;
 }
-/**
- * Retrieves the IPv6 address of the first non-internal network interface.
- *
- * @returns {string | undefined} The IPv4 address of the selected network interface, or undefined if not found.
- */
 export function getIpv6InterfaceAddress() {
     let ipv6Address;
     const networkInterfaces = os.networkInterfaces();
-    // console.log('Available Network Interfaces:', networkInterfaces);
     for (const interfaceDetails of Object.values(networkInterfaces)) {
         if (!interfaceDetails) {
             break;
@@ -71,18 +34,11 @@ export function getIpv6InterfaceAddress() {
             break;
         }
     }
-    // console.log('Selected Network Interfaces:', ipv6Address);
     return ipv6Address;
 }
-/**
- * Retrieves the mac address of the first non-internal network interface.
- *
- * @returns {string | undefined} The mac address, or undefined if not found.
- */
 export function getMacAddress() {
     let macAddress;
     const networkInterfaces = os.networkInterfaces();
-    // console.log('Available Network Interfaces:', networkInterfaces);
     for (const interfaceDetails of Object.values(networkInterfaces)) {
         if (!interfaceDetails) {
             break;
@@ -98,14 +54,9 @@ export function getMacAddress() {
     }
     return macAddress;
 }
-/**
- * Logs the available network interfaces and their details.
- *
- * @returns {void}
- */
 export function logInterfaces() {
-    const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "info" /* LogLevel.INFO */ });
-    log.logLevel = "info" /* LogLevel.INFO */;
+    const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });
+    log.logLevel = "info";
     log.logName = 'LogInterfaces';
     log.info('Available Network Interfaces:');
     const availableAddresses = Object.entries(os.networkInterfaces());
@@ -119,36 +70,16 @@ export function logInterfaces() {
         }
     }
 }
-/**
- * Resolves the given hostname to an IP address.
- *
- * @param {string} hostname - The hostname to resolve.
- * @param {0 | 4 | 6} [family] - The address family to use (0 for any, 4 for IPv4, 6 for IPv6). Default is 4.
- * @returns {Promise<string | null>} - A promise that resolves to the IP address or null if not found.
- *
- * @remarks
- * This function uses DNS lookup to resolve the hostname, which can take some time to complete.
- */
 export async function resolveHostname(hostname, family = 4) {
     const dns = await import('node:dns');
     try {
-        const addresses = await dns.promises.lookup(hostname.toLowerCase() /* + '.local'*/, { family });
+        const addresses = await dns.promises.lookup(hostname.toLowerCase(), { family });
         return addresses.address;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
     }
     catch (error) {
         return null;
     }
 }
-/**
- * Retrieves the version of an npm package from the npm registry.
- *
- * @param {string} packageName - The name of the npm package.
- * @param {string} [tag] - The tag of the package version to retrieve (default is 'latest').
- * @param {number} [timeout] - The timeout duration in milliseconds (default is 10000ms).
- * @returns {Promise<string>} A promise that resolves to the version string of the package.
- * @throws {Error} If the request fails or the tag is not found.
- */
 export async function getNpmPackageVersion(packageName, tag = 'latest', timeout = 10000) {
     const https = await import('node:https');
     return new Promise((resolve, reject) => {
@@ -162,8 +93,8 @@ export async function getNpmPackageVersion(packageName, tag = 'latest', timeout
             let data = '';
             if (res.statusCode !== 200) {
                 clearTimeout(timeoutId);
-                res.resume(); // Discard response data to close the socket properly
-                req.destroy(); // Forcefully close the request
+                res.resume();
+                req.destroy();
                 reject(new Error(`Failed to fetch data. Status code: ${res.statusCode}`));
                 return;
             }
@@ -174,7 +105,6 @@ export async function getNpmPackageVersion(packageName, tag = 'latest', timeout
                 clearTimeout(timeoutId);
                 try {
                     const jsonData = JSON.parse(data);
-                    // console.log(`Package ${packageName} tag ${tag}`, jsonData);
                     const version = jsonData['dist-tags']?.[tag];
                     if (version) {
                         resolve(version);
@@ -194,11 +124,44 @@ export async function getNpmPackageVersion(packageName, tag = 'latest', timeout
         });
     });
 }
-/**
- * Retrieves the path to the global Node.js modules directory.
- *
- * @returns {Promise<string>} A promise that resolves to the path of the global Node.js modules directory.
- */
+export async function getGitHubUpdate(branch, file, timeout = 10000) {
+    const https = await import('node:https');
+    return new Promise((resolve, reject) => {
+        const url = `https://raw.githubusercontent.com/Luligu/matterbridge/${branch}/public/${file}`;
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => {
+            controller.abort();
+            reject(new Error(`Request timed out after ${timeout / 1000} seconds`));
+        }, timeout);
+        const req = https.get(url, { signal: controller.signal }, (res) => {
+            let data = '';
+            if (res.statusCode !== 200) {
+                clearTimeout(timeoutId);
+                res.resume();
+                req.destroy();
+                reject(new Error(`Failed to fetch data. Status code: ${res.statusCode}`));
+                return;
+            }
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                clearTimeout(timeoutId);
+                try {
+                    const jsonData = JSON.parse(data);
+                    resolve(jsonData);
+                }
+                catch (error) {
+                    reject(new Error(`Failed to parse response JSON: ${error instanceof Error ? error.message : error}`));
+                }
+            });
+        });
+        req.on('error', (error) => {
+            clearTimeout(timeoutId);
+            reject(new Error(`Request failed: ${error instanceof Error ? error.message : error}`));
+        });
+    });
+}
 export async function getGlobalNodeModules() {
     const { exec } = await import('node:child_process');
     return new Promise((resolve, reject) => {
@@ -212,4 +175,3 @@ export async function getGlobalNodeModules() {
         });
     });
 }
-//# sourceMappingURL=network.js.map

package/dist/utils/spawn.js

@@ -1,51 +1,12 @@
-/**
- * @description This file contains the spawn functions.
- * @file spawn.ts
- * @author Luca Liguori
- * @created 2025-02-16
- * @version 1.1.0
- * @license Apache-2.0
- *
- * Copyright 2025, 2026, 2027 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 import { hasParameter } from './commandLine.js';
-/**
- * Spawns a child process with the given command and arguments.
- *
- * @param {Matterbridge} matterbridge - The Matterbridge instance to use for logging and sending messages.
- * @param {string} command - The command to execute.
- * @param {string[]} args - The arguments to pass to the command (default: []).
- * @returns {Promise<boolean>} A promise that resolves when the child process exits successfully, or rejects if there is an error.
- */
 export async function spawnCommand(matterbridge, command, args) {
     const { spawn } = await import('node:child_process');
-    /*
-      npm > npm.cmd on windows
-      cmd.exe ['dir'] on windows
-      await this.spawnCommand('npm', ['install', '-g', 'matterbridge']);
-      */
     const cmdLine = command + ' ' + args.join(' ');
     if (process.platform === 'win32' && command === 'npm') {
-        // Must be spawn('cmd.exe', ['/c', 'npm -g install <package>']);
         const argstring = 'npm ' + args.join(' ');
         args.splice(0, args.length, '/c', argstring);
         command = 'cmd.exe';
     }
-    // Decide when using sudo on linux and macOS
-    // When you need sudo: Spawn stderr: npm error Error: EACCES: permission denied
-    // When you don't need sudo: Failed to start child process "npm install -g matterbridge-eve-door": spawn sudo ENOENT
     if (hasParameter('sudo') || (process.platform !== 'win32' && command === 'npm' && !hasParameter('docker') && !hasParameter('nosudo'))) {
         args.unshift(command);
         command = 'sudo';
@@ -103,4 +64,3 @@ export async function spawnCommand(matterbridge, command, args) {
         }
     });
 }
-//# sourceMappingURL=spawn.js.map

package/dist/utils/wait.js

@@ -1,44 +1,9 @@
-/**
- * This file contains the wait, waiter and withTimeout functions.
- *
- * @file wait.ts
- * @author Luca Liguori
- * @created 2025-02-16
- * @version 1.0.1
- * @license Apache-2.0
- *
- * Copyright 2025, 2026, 2027 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// AnsiLogger module
 import { AnsiLogger } from '../logger/export.js';
-export const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: "info" /* LogLevel.INFO */ });
-/**
- * Asynchronous waiter function that resolves when the provided condition is met or rejects on timeout.
- *
- * @param {string} name - The name of the waiter.
- * @param {() => boolean} check - A function that checks the condition. Should return a boolean.
- * @param {boolean} [exitWithReject] - Optional. If true, the promise will be rejected on timeout. Default is false.
- * @param {number} [resolveTimeout] - Optional. The timeout duration in milliseconds. Default is 5000ms.
- * @param {number} [resolveInterval] - Optional. The interval duration in milliseconds between condition checks. Default is 500ms.
- * @param {boolean} [debug] - Optional. If true, debug messages will be logged to the console. Default is false.
- * @returns {Promise<boolean>} A promise that resolves to true when the condition is met, or false if the timeout occurs.
- */
+export const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });
 export async function waiter(name, check, exitWithReject = false, resolveTimeout = 5000, resolveInterval = 500, debug = false) {
     if (check())
         return true;
-    log.logLevel = "debug" /* LogLevel.DEBUG */;
+    log.logLevel = "debug";
     log.logName = 'Waiter';
     if (debug)
         log.debug(`Waiter "${name}" started...`);
@@ -65,20 +30,11 @@ export async function waiter(name, check, exitWithReject = false, resolveTimeout
         }, resolveInterval);
     });
 }
-/**
- * Asynchronously waits for a specified amount of time.
- *
- * @param {number} timeout - The duration to wait in milliseconds. Default is 1000ms.
- * @param {string} name - The name of the wait operation. Default is undefined.
- * @param {boolean} debug - Whether to enable debug logging. Default is false.
- * @returns {Promise<void>} A Promise that resolves after the specified timeout.
- */
 export async function wait(timeout = 1000, name, debug = false) {
-    log.logLevel = "debug" /* LogLevel.DEBUG */;
+    log.logLevel = "debug";
     log.logName = 'Wait';
     if (debug)
         log.debug(`Wait "${name}" started...`);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return new Promise((resolve, reject) => {
         const timeoutId = setTimeout(() => {
             if (debug)
@@ -88,14 +44,6 @@ export async function wait(timeout = 1000, name, debug = false) {
         }, timeout);
     });
 }
-/**
- * Wraps a promise with a timeout. If the promise does not resolve or reject within the specified time, it will be rejected.
- *
- * @param {Promise<T>} promise - The promise to wrap.
- * @param {number} [timeoutMillisecs] - The timeout duration in milliseconds. Default is 10000ms.
- * @param {boolean} [reThrow] - Optional. If true, the promise will rethrow the original promise and will reject on timeout. Default is true.
- * @returns {Promise<T>} A new promise that resolves or rejects based on the original promise and the timeout.
- */
 export function withTimeout(promise, timeoutMillisecs = 10000, reThrow = true) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => {
@@ -103,24 +51,23 @@ export function withTimeout(promise, timeoutMillisecs = 10000, reThrow = true) {
                 reject(new Error('Operation timed out'));
             }
             else {
-                resolve(undefined); // Resolve with undefined if reThrow is false
+                resolve(undefined);
             }
-        }, timeoutMillisecs).unref(); // Unref the timer to prevent it from keeping the event loop alive
+        }, timeoutMillisecs).unref();
         promise
             .then((result) => {
-            clearTimeout(timer); // Prevent memory leak
+            clearTimeout(timer);
             resolve(result);
             return result;
         })
             .catch((error) => {
-            clearTimeout(timer); // Ensure timeout does not fire if promise rejects first
+            clearTimeout(timer);
             if (reThrow) {
-                reject(error); // Reject with the original error
+                reject(error);
             }
             else {
-                resolve(undefined); // Resolve with undefined if reThrow is false
+                resolve(undefined);
             }
         });
     });
 }
-//# sourceMappingURL=wait.js.map

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "matterbridge",
-  "version": "3.1.8",
+  "version": "3.2.0-dev-20250729-fcbf392",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.1.8",
+      "version": "3.2.0-dev-20250729-fcbf392",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/main": "0.15.1",
+        "@matter/main": "0.15.2",
         "archiver": "7.0.1",
         "express": "5.1.0",
         "glob": "11.0.3",
@@ -24,7 +24,7 @@
         "mb_mdns": "bin/mb_mdns.js"
       },
       "engines": {
-        "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
+        "node": ">=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
       },
       "funding": {
         "type": "buymeacoffee",
@@ -70,92 +70,92 @@
       }
     },
     "node_modules/@matter/general": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.15.1.tgz",
-      "integrity": "sha512-r+LUdHlwbwkKO+8QYAvhjaFRISp/rcof+86mHfQEQ46cw/9fFPgjHshj8Qp4mRVDxv18XtV9ND6gjwQ2gJuTbg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.15.2.tgz",
+      "integrity": "sha512-b160CG9ucZRWJD8KCQj6Tylqy73Z6wYloP+6mzSX1u6pwHeISbhSRKJBXSm9gsFPFsFVQgSLP1wMk3KtJ0sy7g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@noble/curves": "^1.9.2"
+        "@noble/curves": "^1.9.4"
       }
     },
     "node_modules/@matter/main": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.15.1.tgz",
-      "integrity": "sha512-xwdWUafh5dJW24PGxGmO+CLqE13vqa380YY4dSi1ZMx3QMTmSJcl0OPaxzAnXsKUZH8OByafYU49V1VIfj1pOg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.15.2.tgz",
+      "integrity": "sha512-93Mqr0DmHO7QNAD2NdZFULFTYS0s1GFtPS3q0V5JKtzJ/W1LJzHYcQNPegD6sZJgCbouuzztWmDeyRsFXB06Rw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/model": "0.15.1",
-        "@matter/node": "0.15.1",
-        "@matter/protocol": "0.15.1",
-        "@matter/types": "0.15.1"
+        "@matter/general": "0.15.2",
+        "@matter/model": "0.15.2",
+        "@matter/node": "0.15.2",
+        "@matter/protocol": "0.15.2",
+        "@matter/types": "0.15.2"
       },
       "optionalDependencies": {
-        "@matter/nodejs": "0.15.1"
+        "@matter/nodejs": "0.15.2"
       }
     },
     "node_modules/@matter/model": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.15.1.tgz",
-      "integrity": "sha512-Bk7HNovGifQ5cRie5utoRuNzzQ3RIGRMfmTDcPRda90e5vAM1af7dt8sdkzTjpemv3yTT/Z9MlO5AC4/TkeaQQ==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.15.2.tgz",
+      "integrity": "sha512-8h47ks+hnyySal/70cuHXWk+xeYKLJdmcTLPRuJIegm5MoeH36hP4yhW3AH92Ej4tHTMiyHf1F9qShZq9/7Z0A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.1"
+        "@matter/general": "0.15.2"
       }
     },
     "node_modules/@matter/node": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.15.1.tgz",
-      "integrity": "sha512-yfmyz496+OUUAOMLgm/6QlYUIU8SVn2iYtKl/pEol0/AzN6Lla8eqf3VTE/uAwjVc07y3Vi5KwijKSsAO9RlQg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.15.2.tgz",
+      "integrity": "sha512-4ZmRNE4SU+aj/DXV8xN2ypZXr/9hVJE8Yj52byQVBdTj7Uh/eRVLoPN19egIBc+VXdrD0uHVaHRhS0yInVBogQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/model": "0.15.1",
-        "@matter/protocol": "0.15.1",
-        "@matter/types": "0.15.1"
+        "@matter/general": "0.15.2",
+        "@matter/model": "0.15.2",
+        "@matter/protocol": "0.15.2",
+        "@matter/types": "0.15.2"
       }
     },
     "node_modules/@matter/nodejs": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.15.1.tgz",
-      "integrity": "sha512-Gy8Ee9yHzYvEdACUdUsD8U5+RHxo0WjRQ0XaXyVmn9xHFSaNRadNwMx3HZFw9M4pQA44t16pnmaCpfF1OS2yuw==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.15.2.tgz",
+      "integrity": "sha512-Lgsv1Uvejq0/e2mdUmlXiabopw7xIshybIZWkWtYXT1egyXKNfRev69XiH+fCRzjxDbkKRweMFOHSpv9PQ2YKg==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/node": "0.15.1",
-        "@matter/protocol": "0.15.1",
-        "@matter/types": "0.15.1"
+        "@matter/general": "0.15.2",
+        "@matter/node": "0.15.2",
+        "@matter/protocol": "0.15.2",
+        "@matter/types": "0.15.2"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
     "node_modules/@matter/protocol": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.15.1.tgz",
-      "integrity": "sha512-5s7BBGop2Qu42P2ogeub/lkidLV2mRc2h6dvqOA1bDdCqhntmWOwwhEbMTaEnME5ryrcyeVFfrknwVxgJ4tIXA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.15.2.tgz",
+      "integrity": "sha512-7hycAbst9Laoc9w986nhEB6t9JoYYtiIQndMdVe5Qjq/BeOlDa0iEtJKTDVMKN2T4ML19Nq+m1tUGAoFBz1qHQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/model": "0.15.1",
-        "@matter/types": "0.15.1"
+        "@matter/general": "0.15.2",
+        "@matter/model": "0.15.2",
+        "@matter/types": "0.15.2"
       }
     },
     "node_modules/@matter/types": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.15.1.tgz",
-      "integrity": "sha512-+kUSUJvXZGDCCez/lz9e3e2mYG35Hss1udst9X2TuQ/q3RwVPr6QqtKydUwwsTXds5EIHmcQAdRI6jQpFeVfPw==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.15.2.tgz",
+      "integrity": "sha512-70vPowfi+1GEAZ5F+ZI7I3WjX0dw0o9b8i+dt5sVt0D7CirxJkPY0XsLTWJHLKBGmSpLxY9J3XeQDUqva6sLmA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/model": "0.15.1"
+        "@matter/general": "0.15.2",
+        "@matter/model": "0.15.2"
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.4.tgz",
-      "integrity": "sha512-2bKONnuM53lINoDrSmK8qP8W271ms7pygDhZt4SiLOoLwBtoHqeCFi6RG42V8zd3mLHuJFhU/Bmaqo4nX0/kBw==",
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.5.tgz",
+      "integrity": "sha512-IHiC8xU74NLKg7gNmwMbUVtqqZy9OWKphTAChESCgsXI5NTK6n3ewOFXrj4Dxal/Ml8D3msbPIHfpHLwv50Q2w==",
       "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.8.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.1.8",
+  "version": "3.2.0-dev-20250729-fcbf392",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -41,14 +41,13 @@
   ],
   "type": "module",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "bin": {
     "matterbridge": "bin/matterbridge.js",
     "mb_mdns": "bin/mb_mdns.js",
     "mb_coap": "bin/mb_coap.js"
   },
   "engines": {
-    "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
+    "node": ">=20.0.0 <21.0.0 || >=22.0.0 <23.0.0 || >=24.0.0 <25.0.0"
   },
   "exports": {
     ".": {
@@ -101,7 +100,7 @@
     }
   },
   "dependencies": {
-    "@matter/main": "0.15.1",
+    "@matter/main": "0.15.2",
     "archiver": "7.0.1",
     "express": "5.1.0",
     "glob": "11.0.3",

package/dist/cli.d.ts

@@ -1,26 +0,0 @@
-/**
- * This file contains the CLI entry point of Matterbridge.
- *
- * @file cli.ts
- * @author Luca Liguori
- * @created 2023-12-29
- * @version 2.0.1
- * @license Apache-2.0
- *
- * Copyright 2023, 2024, 2025 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Matterbridge } from './matterbridge.js';
-export declare let instance: Matterbridge | undefined;
-//# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAYH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,eAAO,IAAI,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC"}

package/dist/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}