matterbridge 2.2.0-dev.6 → 2.2.0-dev.8

package/CHANGELOG.md

@@ -13,27 +13,7 @@ It is also available the official Matterbridge Home Assistant plugin https://git
 
 Tamer (https://github.com/tammeryousef1006) has created the Matterbridge Discord group: https://discord.gg/QX58CDe6hd.
 
-### Breaking Changes
-
-Starting from v. 2.0.0, Matterbridge is running only in mode edge (no parameter needed and no badge in the frontend).
-
-Starting from v. 2.1.0, the legacy old api of matter.js have been completely removed from Matterbridge and from all plugins.
-
-For this reason there is no compatibility with the old versions of the plugins.
-
-You need to update all plugins you use and Matterbridge in the same moment.
-
-I suggest to first update all plugins without restarting and then to update Matterbridge so when it restarts, all versions will be the latest.
-
-If you use docker, all plugins are already installed in the image so you just need to pull the new image.
-
-Compatibility list:
-matterbridge-shelly v. 1.1.5
-matterbridge-zigbee2mqtt v. 2.4.4
-matterbridge-somfy-tahoma v. 1.2.3
-matterbridge-hass v. 0.0.8
-
-## [2.2.0] - 2025-02-26
+## [2.2.0] - 2025-02-28
 
 ### Added
 
@@ -41,24 +21,17 @@ matterbridge-hass v. 0.0.8
 - [platform]: Saving in the storage the selects for faster loading of plugins.
 - [icon]: Added matterbridge svg icon (thanks: https://github.com/robvanoostenrijk https://github.com/stuntguy3000).
 - [pluginManager]: Refactor PluginManager to optimize memory and load time.
-- [frontend]: Frontend v.2.4.5. Please refresh the frontend page after the update.
-- [frontend]: Added processUptime.
+- [frontend]: Frontend v.2.4.6. Please refresh the frontend page after the update.
+- [frontend]: Added processUptime to SystemInfo.
 - [frontend]: Added Share fabrics and Stop sharing to the menu. This allows to pair other controllers without the need to share from the first controller.
 - [frontend]: Added subscriptions to QRDiv.
-- [frontend]: Added autoScroll option for the logs.
+- [frontend]: Added autoScroll option for the logs. Default is enabled.
 - [utils]: Optimized memory and loading time.
 - [shelly]: Added all shelly api to be used when matterbridge is running on the shelly matterbridge board.
 
 ### Changed
 
-- [package]: Update matter.js to 0.12.4-alpha.0-20250212-b2729c9eb
-- [package]: Update matter.js to 0.12.4-alpha.0-20250213-1187f81eb
-- [package]: Update matter.js to 0.12.4-alpha.0-20250215-5af08a8d6
-- [package]: Update matter.js to 0.12.4-alpha.0-20250217-b0bba5179
-- [package]: Update matter.js to 0.12.4-alpha.0-20250223-1e0341a1a
-- [package]: Update matter.js to 0.12.4-alpha.0-20250224-46934b522
-- [package]: Update matter.js to 0.12.4-alpha.0-20250225-52ac4166b
-- [package]: Update matter.js to 0.12.4-alpha.0-20250226-e4ba47db7
+- [package]: Update matter.js to 0.12.4
 - [matterbridge]: The check for available updates now runs at restart and each 24 hours after.
 
 ### Fixed

package/dist/frontend.js

@@ -402,6 +402,21 @@ export class Frontend {
                 }
             });
         });
+        this.expressApp.get('/api/shellydownloadsystemlog', async (req, res) => {
+            this.log.debug('The frontend sent /api/shellydownloadsystemlog');
+            try {
+                await fs.access(path.join(this.matterbridge.matterbridgeDirectory, 'shelly.log'), fs.constants.F_OK);
+            }
+            catch (error) {
+                fs.appendFile(path.join(this.matterbridge.matterbridgeDirectory, 'shelly.log'), 'Create the Shelly system log before downloading it.');
+            }
+            res.download(path.join(this.matterbridge.matterbridgeDirectory, 'shelly.log'), 'shelly.log', (error) => {
+                if (error) {
+                    this.log.error(`Error downloading Shelly system log file: ${error instanceof Error ? error.message : error}`);
+                    res.status(500).send('Error downloading Shelly system log file');
+                }
+            });
+        });
         this.expressApp.get('/api/download-mjstorage', async (req, res) => {
             this.log.debug('The frontend sent /api/download-mjstorage');
             await createZip(path.join(os.tmpdir(), `matterbridge.${this.matterbridge.matterStorageName}.zip`), path.join(this.matterbridge.matterbridgeDirectory, this.matterbridge.matterStorageName));
@@ -1088,6 +1103,11 @@ export class Frontend {
                 triggerShellyMainUpdate(this.matterbridge);
                 return;
             }
+            else if (data.method === '/api/shellycreatesystemlog') {
+                const { createShellySystemLog } = await import('./shelly.js');
+                createShellySystemLog(this.matterbridge);
+                return;
+            }
             else if (data.method === '/api/shellynetconfig') {
                 this.log.debug('/api/shellynetconfig:', data.params);
                 const { triggerShellyChangeIp: triggerShellyChangeNet } = await import('./shelly.js');

package/dist/matterbridge.js

@@ -914,7 +914,7 @@ export class Matterbridge extends EventEmitter {
     async unregisterAndShutdownProcess() {
         this.log.info('Unregistering all devices and shutting down...');
         for (const plugin of this.plugins) {
-            await this.removeAllBridgedEndpoints(plugin.name);
+            await this.removeAllBridgedEndpoints(plugin.name, 250);
         }
         this.log.debug('Waiting for the MessageExchange to finish...');
         await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -1597,10 +1597,12 @@ export class Matterbridge extends EventEmitter {
         }
         this.devices.remove(device);
     }
-    async removeAllBridgedEndpoints(pluginName) {
+    async removeAllBridgedEndpoints(pluginName, delay = 0) {
         this.log.debug(`Removing all bridged endpoints for plugin ${plg}${pluginName}${db}`);
         for (const device of this.devices.array().filter((device) => device.plugin === pluginName)) {
             await this.removeBridgedEndpoint(pluginName, device);
+            if (delay > 0)
+                await new Promise((resolve) => setTimeout(resolve, delay));
         }
     }
     sanitizeFabricInformations(fabricInfo) {

package/dist/shelly.js

@@ -5,12 +5,12 @@ export async function getShellySysUpdate(matterbridge) {
         .then(async (data) => {
         if (data.length > 0) {
             matterbridge.matterbridgeInformation.shellySysUpdate = true;
-            matterbridge.log.notice(`Shelly system update available: ${debugStringify(data)}`);
-            matterbridge.frontend.wssSendSnackbarMessage('Shelly system update available', 60);
             matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_SYS_UPDATE, 'shelly-sys-update', { available: true });
             for (const update of data) {
                 if (update.name)
-                    matterbridge.frontend.wssSendSnackbarMessage('Shelly system update available: ' + update.name, 10);
+                    matterbridge.log.notice(`Shelly system update available: ${update.name}`);
+                if (update.name)
+                    matterbridge.frontend.wssSendSnackbarMessage(`Shelly system update available: ${update.name}`, 10);
             }
         }
     })
@@ -29,8 +29,9 @@ export async function triggerShellySysUpdate(matterbridge) {
         .finally(() => {
         matterbridge.matterbridgeInformation.shellySysUpdate = false;
         matterbridge.log.notice(`Installing Shelly system update...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly system update...', 60);
+        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');
     });
 }
 export async function getShellyMainUpdate(matterbridge) {
@@ -38,12 +39,12 @@ export async function getShellyMainUpdate(matterbridge) {
         .then(async (data) => {
         if (data.length > 0) {
             matterbridge.matterbridgeInformation.shellyMainUpdate = true;
-            matterbridge.log.notice(`Shelly software update available: ${debugStringify(data)}`);
-            matterbridge.frontend.wssSendSnackbarMessage('Shelly software update available', 60);
             matterbridge.frontend.wssBroadcastMessage(WS_ID_SHELLY_MAIN_UPDATE, 'shelly-main-update', { available: true });
             for (const update of data) {
                 if (update.name)
-                    matterbridge.frontend.wssSendSnackbarMessage('Shelly software update available: ' + update.name, 10);
+                    matterbridge.log.notice(`Shelly software update available: ${update.name}`);
+                if (update.name)
+                    matterbridge.frontend.wssSendSnackbarMessage(`Shelly software update available: ${update.name}`, 10);
             }
         }
     })
@@ -62,8 +63,40 @@ export async function triggerShellyMainUpdate(matterbridge) {
         .finally(() => {
         matterbridge.matterbridgeInformation.shellyMainUpdate = false;
         matterbridge.log.notice(`Installing Shelly software update...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Installing Shelly software update...', 60);
+        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');
+    });
+}
+async function verifyShellyUpdate(matterbridge, api, name) {
+    return new Promise((resolve) => {
+        const timeout = setTimeout(() => {
+            matterbridge.log.warn(`${name} check timed out`);
+            clearInterval(interval);
+            resolve();
+        }, 600 * 1000);
+        const interval = setInterval(() => {
+            getShelly(api, 10 * 1000)
+                .then(async (data) => {
+                if (data.updatingInProgress) {
+                    matterbridge.log.notice(`${name} in progress...`);
+                    matterbridge.frontend.wssSendSnackbarMessage(`${name} in progress...`, 20);
+                }
+                else {
+                    matterbridge.log.notice(`${name} installed`);
+                    matterbridge.frontend.wssSendSnackbarMessage(`${name} installed`, 20);
+                    clearInterval(interval);
+                    clearTimeout(timeout);
+                    resolve();
+                }
+            })
+                .catch((error) => {
+                matterbridge.log.warn(`Error getting status of ${name}: ${error instanceof Error ? error.message : error}`);
+                clearInterval(interval);
+                clearTimeout(timeout);
+                resolve();
+            });
+        }, 15 * 1000);
     });
 }
 export async function triggerShellyChangeIp(matterbridge, config) {
@@ -102,6 +135,25 @@ export async function triggerShellyReboot(matterbridge) {
         matterbridge.frontend.wssSendSnackbarMessage('Rebooting Shelly board...');
     });
 }
+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}`);
+    });
+}
 async function getShelly(api, timeout = 60000) {
     const http = await import('node:http');
     return new Promise((resolve, reject) => {
@@ -125,12 +177,17 @@ async function getShelly(api, timeout = 60000) {
             });
             res.on('end', () => {
                 clearTimeout(timeoutId);
-                try {
-                    const jsonData = JSON.parse(data);
-                    resolve(jsonData);
+                if (api !== '/api/logs/system') {
+                    try {
+                        const jsonData = JSON.parse(data);
+                        resolve(jsonData);
+                    }
+                    catch (error) {
+                        reject(new Error(`Failed to parse response JSON: ${error instanceof Error ? error.message : error}`));
+                    }
                 }
-                catch (error) {
-                    reject(new Error(`Failed to parse response JSON: ${error instanceof Error ? error.message : error}`));
+                else {
+                    resolve(data);
                 }
             });
         });

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.cf25d33e.css",
-    "main.js": "./static/js/main.f60aae10.js",
+    "main.js": "./static/js/main.8240902c.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.f60aae10.js.map": "./static/js/main.f60aae10.js.map",
+    "main.8240902c.js.map": "./static/js/main.8240902c.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.cf25d33e.css",
-    "static/js/main.f60aae10.js"
+    "static/js/main.8240902c.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.f60aae10.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.8240902c.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>