matterbridge 3.3.0-dev-20251004-43d8106 → 3.3.1-dev-20251007-4e5eaac

package/dist/shelly.js

@@ -12,7 +12,7 @@ export async function getShellySysUpdate(matterbridge) {
         const updates = (await getShelly('/api/updates/sys/check'));
         if (updates.length === 0)
             return;
-        matterbridge.matterbridgeInformation.shellySysUpdate = true;
+        matterbridge.shellySysUpdate = true;
         matterbridge.frontend.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'shelly_sys_update', success: true, response: { available: true } });
         for (const { name } of updates) {
             if (!name)
@@ -29,7 +29,7 @@ export async function triggerShellySysUpdate(matterbridge) {
     try {
         await getShelly('/api/updates/sys/perform');
         matterbridge.log.notice('Installing Shelly system update...');
-        matterbridge.matterbridgeInformation.shellySysUpdate = false;
+        matterbridge.shellySysUpdate = false;
         matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly system update...', 15);
         matterbridge.frontend.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'shelly_sys_update', success: true, response: { available: false } });
         await verifyShellyUpdate(matterbridge, '/api/updates/sys/status', 'Shelly system update');
@@ -43,7 +43,7 @@ export async function getShellyMainUpdate(matterbridge) {
         const updates = (await getShelly('/api/updates/main/check'));
         if (updates.length === 0)
             return;
-        matterbridge.matterbridgeInformation.shellyMainUpdate = true;
+        matterbridge.shellyMainUpdate = true;
         matterbridge.frontend.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'shelly_main_update', success: true, response: { available: true } });
         for (const { name } of updates) {
             if (!name)
@@ -60,7 +60,7 @@ export async function triggerShellyMainUpdate(matterbridge) {
     try {
         await getShelly('/api/updates/main/perform');
         matterbridge.log.notice('Installing Shelly software update...');
-        matterbridge.matterbridgeInformation.shellyMainUpdate = false;
+        matterbridge.shellyMainUpdate = false;
         matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly software update...', 15);
         matterbridge.frontend.wssBroadcastMessage({ id: 0, src: 'Matterbridge', dst: 'Frontend', method: 'shelly_main_update', success: true, response: { available: false } });
         await verifyShellyUpdate(matterbridge, '/api/updates/main/status', 'Shelly software update');

package/dist/update.js

@@ -46,7 +46,6 @@ export async function getMatterbridgeLatestVersion(matterbridge) {
     try {
         const version = await getNpmPackageVersion('matterbridge');
         matterbridge.matterbridgeLatestVersion = version;
-        matterbridge.matterbridgeInformation.matterbridgeLatestVersion = version;
         await matterbridge.nodeContext?.set('matterbridgeLatestVersion', matterbridge.matterbridgeLatestVersion);
         if (matterbridge.matterbridgeVersion !== matterbridge.matterbridgeLatestVersion) {
             matterbridge.log.notice(`Matterbridge is out of date. Current version: ${matterbridge.matterbridgeVersion}. Latest version: ${matterbridge.matterbridgeLatestVersion}.`);
@@ -68,7 +67,6 @@ export async function getMatterbridgeDevVersion(matterbridge) {
     try {
         const version = await getNpmPackageVersion('matterbridge', 'dev');
         matterbridge.matterbridgeDevVersion = version;
-        matterbridge.matterbridgeInformation.matterbridgeDevVersion = version;
         await matterbridge.nodeContext?.set('matterbridgeDevVersion', version);
         if (matterbridge.matterbridgeVersion.includes('-dev-') && matterbridge.matterbridgeVersion !== version) {
             matterbridge.log.notice(`Matterbridge@dev is out of date. Current version: ${matterbridge.matterbridgeVersion}. Latest dev version: ${matterbridge.matterbridgeDevVersion}.`);

package/dist/utils/network.js

@@ -1,58 +1,65 @@
 import os from 'node:os';
 import { AnsiLogger, BLUE, CYAN, nf } from 'node-ansi-logger';
-export function getIpv4InterfaceAddress() {
-    let ipv4Address;
-    const networkInterfaces = os.networkInterfaces();
-    for (const interfaceDetails of Object.values(networkInterfaces)) {
-        if (!interfaceDetails) {
-            break;
+export function getInterfaceDetails() {
+    const result = { interfaceName: '', ipv4Address: undefined, ipv6Address: undefined, macAddress: undefined };
+    for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
+        if (!interfaceName || !interfaceDetails || interfaceDetails.length === 0)
+            continue;
+        for (const detail of interfaceDetails) {
+            if (detail.internal)
+                continue;
+            if (!result.interfaceName)
+                result.interfaceName = interfaceName;
+            if (interfaceName === result.interfaceName && !result.ipv4Address && detail.family === 'IPv4')
+                result.ipv4Address = detail.address;
+            if (interfaceName === result.interfaceName && !result.ipv6Address && detail.family === 'IPv6')
+                result.ipv6Address = detail.address;
+            if (interfaceName === result.interfaceName && !result.macAddress)
+                result.macAddress = detail.mac;
         }
+    }
+    if (result.interfaceName)
+        return result;
+}
+export function getInterfaceName() {
+    for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
+        if (!interfaceName || !interfaceDetails || interfaceDetails.length === 0)
+            continue;
         for (const detail of interfaceDetails) {
-            if (detail.family === 'IPv4' && !detail.internal && ipv4Address === undefined) {
-                ipv4Address = detail.address;
-            }
+            if (!detail.internal)
+                return interfaceName;
         }
-        if (ipv4Address !== undefined) {
-            break;
+    }
+}
+export function getIpv4InterfaceAddress() {
+    for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
+        if (!interfaceName || !interfaceDetails || interfaceDetails.length === 0)
+            continue;
+        for (const detail of interfaceDetails) {
+            if (detail.family === 'IPv4' && !detail.internal)
+                return detail.address;
         }
     }
-    return ipv4Address;
 }
 export function getIpv6InterfaceAddress() {
-    let ipv6Address;
-    const networkInterfaces = os.networkInterfaces();
-    for (const interfaceDetails of Object.values(networkInterfaces)) {
-        if (!interfaceDetails) {
-            break;
-        }
+    for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
+        if (!interfaceName || !interfaceDetails || interfaceDetails.length === 0)
+            continue;
         for (const detail of interfaceDetails) {
-            if (detail.family === 'IPv6' && !detail.internal && ipv6Address === undefined) {
-                ipv6Address = detail.address;
-            }
-        }
-        if (ipv6Address !== undefined) {
-            break;
+            if (detail.family === 'IPv6' && !detail.internal)
+                return detail.address;
         }
     }
-    return ipv6Address;
 }
 export function getMacAddress() {
-    let macAddress;
-    const networkInterfaces = os.networkInterfaces();
-    for (const interfaceDetails of Object.values(networkInterfaces)) {
-        if (!interfaceDetails) {
-            break;
-        }
+    for (const [interfaceName, interfaceDetails] of Object.entries(os.networkInterfaces())) {
+        if (!interfaceName || !interfaceDetails || interfaceDetails.length === 0)
+            continue;
         for (const detail of interfaceDetails) {
-            if (!detail.internal && macAddress === undefined) {
-                macAddress = detail.mac;
-            }
-        }
-        if (macAddress !== undefined) {
-            break;
+            if (!detail.internal)
+                return detail.mac;
         }
     }
-    return macAddress;
 }
 export function logInterfaces() {
     const log = new AnsiLogger({ logName: 'MatterbridgeUtils', logTimestampFormat: 4, logLevel: "info" });
@@ -173,3 +180,29 @@ 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/spawn.js

@@ -1,5 +1,5 @@
 import { hasParameter } from './commandLine.js';
-export async function spawnCommand(matterbridge, command, args, packageName) {
+export async function spawnCommand(matterbridge, command, args, packageCommand, packageName) {
     const { spawn } = await import('node:child_process');
     const cmdLine = command + ' ' + args.join(' ');
     if (process.platform === 'win32' && command === 'npm') {
@@ -13,7 +13,10 @@ export async function spawnCommand(matterbridge, command, args, packageName) {
     }
     matterbridge.log.debug(`Spawn command ${command} with ${args.join(' ')}`);
     return new Promise((resolve, reject) => {
-        matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-init', packageName || `unknown-package`);
+        if (packageCommand === 'install')
+            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-init', `Installing ${packageName}`);
+        else if (packageCommand === 'uninstall')
+            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-init', `Uninstalling ${packageName}`);
         const childProcess = spawn(command, args, {
             stdio: ['inherit', 'pipe', 'pipe'],
         });
@@ -23,10 +26,7 @@ export async function spawnCommand(matterbridge, command, args, packageName) {
             reject(err);
         });
         childProcess.on('close', (code, signal) => {
-            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn', `child process closed with code ${code} and signal ${signal}`);
             if (code === 0) {
-                if (cmdLine.startsWith('npm install -g'))
-                    matterbridge.log.notice(`Package ${cmdLine.replace('npm install -g ', '').replace('--verbose', '').replace('--omit=dev', '')} installed correctly`);
                 matterbridge.log.debug(`Child process "${cmdLine}" closed with code ${code} and signal ${signal}`);
                 matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-exit-success', 'Child process closed');
                 resolve(true);
@@ -38,7 +38,6 @@ export async function spawnCommand(matterbridge, command, args, packageName) {
             }
         });
         childProcess.on('exit', (code, signal) => {
-            matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn', `child process exited with code ${code} and signal ${signal}`);
             if (code === 0) {
                 matterbridge.log.debug(`Child process "${cmdLine}" exited with code ${code} and signal ${signal}`);
                 matterbridge.frontend.wssSendLogMessage('spawn', matterbridge.log.now(), 'Matterbridge:spawn-exit-success', 'Child process exited');