matterbridge 3.0.2-dev-20250514-175db7e → 3.0.2-dev-20250514-6ffb970

package/CHANGELOG.md

@@ -14,6 +14,7 @@ If you like this project and find it useful, please consider giving it a star on
 
 - [virtual] Added virtual devices Restart Matterbridge and Update Matterbridge and full Jest tests.
 - [virtual] Added virtual devices Reboot Matterbridge for Shelly board and full Jest tests.
+- [shelly] Refactor shelly api and added full Jest test.
 
 ### Changed
 
@@ -24,6 +25,8 @@ If you like this project and find it useful, please consider giving it a star on
 
 ### Fixed
 
+- [frontend]: Fixed refresh of start/stop sharing.
+
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
 </a>

package/dist/shelly.js

@@ -1,89 +1,93 @@
 import { WS_ID_SHELLY_MAIN_UPDATE, WS_ID_SHELLY_SYS_UPDATE } from './frontend.js';
 import { debugStringify } from './logger/export.js';
+let verifyIntervalSecs = 15;
+let verifyTimeoutSecs = 600;
+export function setVerifyIntervalSecs(seconds) {
+    verifyIntervalSecs = seconds;
+}
+export function setVerifyTimeoutSecs(seconds) {
+    verifyTimeoutSecs = seconds;
+}
 export async function getShellySysUpdate(matterbridge) {
-    getShelly('/api/updates/sys/check', 60 * 1000)
-        .then(async (data) => {
-        if (data.length > 0) {
-            matterbridge.matterbridgeInformation.shellySysUpdate = true;
-            matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_SYS_UPDATE, 'shelly-sys-update', { available: true });
-            for (const update of data) {
-                if (update.name)
-                    matterbridge.log.notice(`Shelly system update available: ${update.name}`);
-                if (update.name)
-                    matterbridge.frontend.wssSendSnackbarMessage(`Shelly system update available: ${update.name}`, 10);
-            }
+    try {
+        const updates = (await getShelly('/api/updates/sys/check'));
+        if (updates.length === 0)
+            return;
+        matterbridge.matterbridgeInformation.shellySysUpdate = true;
+        matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_SYS_UPDATE, 'shelly-sys-update', { available: true });
+        for (const { name } of updates) {
+            if (!name)
+                continue;
+            matterbridge.log.notice(`Shelly system update available: ${name}`);
+            matterbridge.frontend.wssSendSnackbarMessage(`Shelly system update available: ${name}`, 10);
         }
-    })
-        .catch((error) => {
-        matterbridge.log.warn(`Error getting Shelly system updates: ${error instanceof Error ? error.message : error}`);
-    });
+    }
+    catch (err) {
+        matterbridge.log.error(`Error getting Shelly system updates: ${err instanceof Error ? err.message : String(err)}`);
+    }
 }
 export async function triggerShellySysUpdate(matterbridge) {
-    getShelly('/api/updates/sys/perform', 10 * 1000)
-        .then(async () => {
-        matterbridge.log.debug(`Triggered Shelly system updates`);
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly system updates: ${error instanceof Error ? error.message : error}`);
-    })
-        .finally(() => {
+    try {
+        await getShelly('/api/updates/sys/perform');
+        matterbridge.log.notice('Installing Shelly system update...');
         matterbridge.matterbridgeInformation.shellySysUpdate = false;
-        matterbridge.log.notice(`Installing Shelly system update...`);
         matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly system update...', 15);
         matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_SYS_UPDATE, 'shelly-sys-update', { available: false });
-        verifyShellyUpdate(matterbridge, '/api/updates/sys/status', 'Shelly system update');
-    });
+        await verifyShellyUpdate(matterbridge, '/api/updates/sys/status', 'Shelly system update');
+    }
+    catch (err) {
+        matterbridge.log.error(`Error triggering Shelly system update: ${err instanceof Error ? err.message : String(err)}`);
+    }
 }
 export async function getShellyMainUpdate(matterbridge) {
-    getShelly('/api/updates/main/check', 60 * 1000)
-        .then(async (data) => {
-        if (data.length > 0) {
-            matterbridge.matterbridgeInformation.shellyMainUpdate = true;
-            matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_MAIN_UPDATE, 'shelly-main-update', { available: true });
-            for (const update of data) {
-                if (update.name)
-                    matterbridge.log.notice(`Shelly software update available: ${update.name}`);
-                if (update.name)
-                    matterbridge.frontend.wssSendSnackbarMessage(`Shelly software update available: ${update.name}`, 10);
-            }
+    try {
+        const updates = (await getShelly('/api/updates/main/check'));
+        if (updates.length === 0)
+            return;
+        matterbridge.matterbridgeInformation.shellyMainUpdate = true;
+        matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_MAIN_UPDATE, 'shelly-main-update', { available: true });
+        for (const { name } of updates) {
+            if (!name)
+                continue;
+            matterbridge.log.notice(`Shelly software update available: ${name}`);
+            matterbridge.frontend.wssSendSnackbarMessage(`Shelly software update available: ${name}`, 10);
         }
-    })
-        .catch((error) => {
-        matterbridge.log.warn(`Error getting Shelly main updates: ${error instanceof Error ? error.message : error}`);
-    });
+    }
+    catch (err) {
+        matterbridge.log.error(`Error getting Shelly main updates: ${err instanceof Error ? err.message : String(err)}`);
+    }
 }
 export async function triggerShellyMainUpdate(matterbridge) {
-    getShelly('/api/updates/main/perform', 10 * 1000)
-        .then(async () => {
-        matterbridge.log.debug(`Triggered Shelly main updates`);
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly main updates: ${error instanceof Error ? error.message : error}`);
-    })
-        .finally(() => {
+    try {
+        await getShelly('/api/updates/main/perform');
+        matterbridge.log.notice('Installing Shelly software update...');
         matterbridge.matterbridgeInformation.shellyMainUpdate = false;
-        matterbridge.log.notice(`Installing Shelly software update...`);
         matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly software update...', 15);
         matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_MAIN_UPDATE, 'shelly-main-update', { available: false });
-        verifyShellyUpdate(matterbridge, '/api/updates/main/status', 'Shelly software update');
-    });
+        await verifyShellyUpdate(matterbridge, '/api/updates/main/status', 'Shelly software update');
+    }
+    catch (err) {
+        matterbridge.log.error(`Error triggering Shelly main update: ${err instanceof Error ? err.message : String(err)}`);
+    }
 }
 async function verifyShellyUpdate(matterbridge, api, name) {
     return new Promise((resolve) => {
         const timeout = setTimeout(() => {
-            matterbridge.log.warn(`${name} check timed out`);
+            matterbridge.log.error(`${name} check timed out`);
+            matterbridge.frontend.wssSendCloseSnackbarMessage(`${name} in progress...`);
             clearInterval(interval);
             resolve();
-        }, 600 * 1000);
+        }, verifyTimeoutSecs * 1000);
         const interval = setInterval(() => {
             getShelly(api, 10 * 1000)
                 .then(async (data) => {
                 if (data.updatingInProgress) {
                     matterbridge.log.debug(`${name} in progress...`);
-                    matterbridge.frontend.wssSendSnackbarMessage(`${name} in progress...`, 20);
+                    matterbridge.frontend.wssSendSnackbarMessage(`${name} in progress...`, 0);
                 }
                 else {
                     matterbridge.log.notice(`${name} installed`);
+                    matterbridge.frontend.wssSendCloseSnackbarMessage(`${name} in progress...`);
                     matterbridge.frontend.wssSendSnackbarMessage(`${name} installed`, 20);
                     clearInterval(interval);
                     clearTimeout(timeout);
@@ -91,12 +95,13 @@ async function verifyShellyUpdate(matterbridge, api, name) {
                 }
             })
                 .catch((error) => {
-                matterbridge.log.warn(`Error getting status of ${name}: ${error instanceof Error ? error.message : error}`);
+                matterbridge.log.error(`Error getting status of ${name}: ${error instanceof Error ? error.message : String(error)}`);
+                matterbridge.frontend.wssSendCloseSnackbarMessage(`${name} in progress...`);
                 clearInterval(interval);
                 clearTimeout(timeout);
                 resolve();
             });
-        }, 15 * 1000);
+        }, verifyIntervalSecs * 1000);
     });
 }
 export async function triggerShellyChangeIp(matterbridge, config) {
@@ -109,78 +114,82 @@ export async function triggerShellyChangeIp(matterbridge, config) {
         data['dns'] = config.dns;
     }
     matterbridge.log.debug(`Triggering Shelly network configuration change: ${debugStringify(config)}`);
-    postShelly(api, data, 60 * 1000)
-        .then(async () => {
+    try {
+        await postShelly(api, data);
         matterbridge.log.debug(`Triggered Shelly network configuration change: ${debugStringify(config)}`);
         matterbridge.log.notice(`Changed Shelly network configuration`);
         matterbridge.frontend.wssSendSnackbarMessage('Changed Shelly network configuration');
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly network configuration change: ${error instanceof Error ? error.message : error}`);
-        matterbridge.log.error(`Error changing Shelly network configuration: ${error instanceof Error ? error.message : error}`);
+    }
+    catch (error) {
+        matterbridge.log.debug(`****Error triggering Shelly network configuration change ${debugStringify(config)}: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.log.error(`Error changing Shelly network configuration: ${error instanceof Error ? error.message : String(error)}`);
         matterbridge.frontend.wssSendSnackbarMessage('Error changing Shelly network configuration', 10, 'error');
-    });
+    }
 }
 export async function triggerShellyReboot(matterbridge) {
     matterbridge.log.debug(`Triggering Shelly system reboot`);
-    postShelly('/api/system/reboot', {}, 60 * 1000)
-        .then(async () => {
+    try {
+        matterbridge.frontend.wssSendSnackbarMessage('Rebooting Shelly board...', 0);
+        await postShelly('/api/system/reboot', {});
         matterbridge.log.debug(`Triggered Shelly system reboot`);
         matterbridge.log.notice(`Rebooting Shelly board...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Rebooting Shelly board...');
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly system reboot: ${error instanceof Error ? error.message : error}`);
-        matterbridge.log.error(`Error rebooting Shelly board: ${error instanceof Error ? error.message : error}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Rebooting Shelly board...');
+        matterbridge.frontend.wssSendSnackbarMessage('Reboot of Shelly board started!', 5, 'success');
+    }
+    catch (error) {
+        matterbridge.log.debug(`****Error triggering Shelly system reboot: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.log.error(`Error rebooting Shelly board: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Rebooting Shelly board...');
         matterbridge.frontend.wssSendSnackbarMessage('Error rebooting Shelly board', 10, 'error');
-    });
+    }
 }
 export async function triggerShellySoftReset(matterbridge) {
     matterbridge.log.debug(`Triggering Shelly soft reset`);
-    getShelly('/api/reset/soft', 60 * 1000)
-        .then(async () => {
+    try {
+        matterbridge.frontend.wssSendSnackbarMessage('Resetting the network parameters on Shelly board...', 0);
+        await getShelly('/api/reset/soft');
         matterbridge.log.debug(`Triggered Shelly soft reset`);
         matterbridge.log.notice(`Resetting the network parameters on Shelly board...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Resetting the network parameters on Shelly board...');
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly soft reset: ${error instanceof Error ? error.message : error}`);
-        matterbridge.log.error(`Error resetting the network parameters on Shelly board: ${error instanceof Error ? error.message : error}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Resetting the network parameters on Shelly board...');
+        matterbridge.frontend.wssSendSnackbarMessage('Reset of the network parameters on Shelly board done!', 5, 'success');
+    }
+    catch (error) {
+        matterbridge.log.debug(`****Error triggering Shelly soft reset: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.log.error(`Error resetting the network parameters on Shelly board: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Resetting the network parameters on Shelly board...');
         matterbridge.frontend.wssSendSnackbarMessage('Error resetting the network parameters on Shelly board', 10, 'error');
-    });
+    }
 }
 export async function triggerShellyHardReset(matterbridge) {
     matterbridge.log.debug(`Triggering Shelly hard reset`);
-    getShelly('/api/reset/hard', 60 * 1000)
-        .then(async () => {
+    try {
+        matterbridge.frontend.wssSendSnackbarMessage('Factory resetting Shelly board...', 0);
+        await getShelly('/api/reset/hard');
         matterbridge.log.debug(`Triggered Shelly hard reset`);
         matterbridge.log.notice(`Factory resetting Shelly board...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Factory resetting Shelly board...');
-    })
-        .catch((error) => {
-        matterbridge.log.debug(`****Error triggering Shelly hard reset: ${error instanceof Error ? error.message : error}`);
-        matterbridge.log.error(`Error while factory resetting the Shelly board: ${error instanceof Error ? error.message : error}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Factory resetting Shelly board...');
+        matterbridge.frontend.wssSendSnackbarMessage('Factory reset of Shelly board done!', 5, 'success');
+    }
+    catch (error) {
+        matterbridge.log.debug(`****Error triggering Shelly hard reset: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.log.error(`Error while factory resetting the Shelly board: ${error instanceof Error ? error.message : String(error)}`);
+        matterbridge.frontend.wssSendCloseSnackbarMessage('Factory resetting Shelly board...');
         matterbridge.frontend.wssSendSnackbarMessage('Error while factory resetting the Shelly board', 10, 'error');
-    });
+    }
 }
 export async function createShellySystemLog(matterbridge) {
     const { promises: fs } = await import('node:fs');
     const path = await import('node:path');
     matterbridge.log.debug(`Downloading Shelly system log...`);
-    getShelly('/api/logs/system', 60 * 1000)
-        .then(async (data) => {
-        fs.writeFile(path.join(matterbridge.matterbridgeDirectory, 'shelly.log'), data)
-            .then(() => {
-            matterbridge.log.notice(`Shelly system log ready for download`);
-            matterbridge.frontend.wssSendSnackbarMessage('Shelly system log ready for download');
-        })
-            .catch((error) => {
-            matterbridge.log.warn(`Error writing Shelly system log to file: ${error instanceof Error ? error.message : error}`);
-        });
-    })
-        .catch((error) => {
-        matterbridge.log.warn(`Error getting Shelly system log: ${error instanceof Error ? error.message : error}`);
-    });
+    try {
+        const data = await getShelly('/api/logs/system');
+        await fs.writeFile(path.join(matterbridge.matterbridgeDirectory, 'shelly.log'), data);
+        matterbridge.log.notice(`Shelly system log ready for download`);
+        matterbridge.frontend.wssSendSnackbarMessage('Shelly system log ready for download');
+    }
+    catch (error) {
+        matterbridge.log.error(`Error getting Shelly system log: ${error instanceof Error ? error.message : error}`);
+    }
 }
 export async function getShelly(api, timeout = 60000) {
     const http = await import('node:http');

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.944b63c3.css",
-    "main.js": "./static/js/main.15906009.js",
+    "main.js": "./static/js/main.f6e0f736.js",
     "static/js/453.d855a71b.chunk.js": "./static/js/453.d855a71b.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.c4d6cab43bec89049809.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.599f66a60bdf974e578e.woff2",
@@ -77,11 +77,11 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.60729cafbded24073dfb.woff",
     "index.html": "./index.html",
     "main.944b63c3.css.map": "./static/css/main.944b63c3.css.map",
-    "main.15906009.js.map": "./static/js/main.15906009.js.map",
+    "main.f6e0f736.js.map": "./static/js/main.f6e0f736.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.944b63c3.css",
-    "static/js/main.15906009.js"
+    "static/js/main.f6e0f736.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.15906009.js"></script><link href="./static/css/main.944b63c3.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.f6e0f736.js"></script><link href="./static/css/main.944b63c3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>