matterbridge 2.2.6-dev.1 → 2.2.6-dev.3

package/CHANGELOG.md

@@ -29,7 +29,7 @@ Features:
 - It is possible to choose the method: GET or POST.
 - The webhook can be tested directly in the frontend.
 
-## [2.2.6] - 2025-03-29
+## [2.2.6] - 2025-03-31
 
 ### Added
 
@@ -39,13 +39,14 @@ Features:
 
 ### Changed
 
+- [commissionig]: If the bridge is not paired, when the advertising stops (after 15 minutes from start) the QR code is hidden and a notification is displayed.
 - [package]: Update dependencies.
 - [package]: Update matter.js to 0.12.6.
 
 ### Fixed
 
 - [ipv6address]: The ipv6address can be entered in the frontend with the scopeid. On Windows the format is ipv6%scopeid (i.e. fe80::5a71:b2f6:7bc8:d00b%8). On Linux the format is ipv6%interfaceName (i.e. fe80::5a71:b2f6:7bc8:d00b%eth0)
-- [onOff]: The onOff cluster created from createOnOffClusterServer() is not correct (no Lighting feature).
+- [onOff]: The onOff cluster created from createOnOffClusterServer() is now correct (no Lighting feature).
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">

package/dist/frontend.js

@@ -1170,6 +1170,16 @@ export class Frontend {
                 triggerShellyChangeNet(this.matterbridge, data.params);
                 return;
             }
+            else if (data.method === '/api/softreset') {
+                const { triggerShellySoftReset } = await import('./shelly.js');
+                triggerShellySoftReset(this.matterbridge);
+                return;
+            }
+            else if (data.method === '/api/hardreset') {
+                const { triggerShellyHardReset } = await import('./shelly.js');
+                triggerShellyHardReset(this.matterbridge);
+                return;
+            }
             else if (data.method === '/api/reboot') {
                 const { triggerShellyReboot } = await import('./shelly.js');
                 triggerShellyReboot(this.matterbridge);

package/dist/matterbridge.js

@@ -46,6 +46,7 @@ export class Matterbridge extends EventEmitter {
         rootDirectory: '',
         matterbridgeDirectory: '',
         matterbridgePluginDirectory: '',
+        matterbridgeCertDirectory: '',
         globalModulesDirectory: '',
         matterbridgeVersion: '',
         matterbridgeLatestVersion: '',
@@ -79,6 +80,7 @@ export class Matterbridge extends EventEmitter {
     rootDirectory = '';
     matterbridgeDirectory = '';
     matterbridgePluginDirectory = '';
+    matterbridgeCertDirectory = '';
     globalModulesDirectory = '';
     matterbridgeVersion = '';
     matterbridgeLatestVersion = '';
@@ -845,6 +847,29 @@ export class Matterbridge extends EventEmitter {
             }
         }
         this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
+        this.matterbridgeCertDirectory = path.join(this.homeDirectory, '.mattercert');
+        this.matterbridgeInformation.matterbridgeCertDirectory = this.matterbridgeCertDirectory;
+        try {
+            await fs.access(this.matterbridgeCertDirectory);
+        }
+        catch (err) {
+            if (err instanceof Error) {
+                const nodeErr = err;
+                if (nodeErr.code === 'ENOENT') {
+                    try {
+                        await fs.mkdir(this.matterbridgeCertDirectory, { recursive: true });
+                        this.log.info(`Created .mattercert directory: ${this.matterbridgeCertDirectory}`);
+                    }
+                    catch (err) {
+                        this.log.error(`Error creating .mattercert directory: ${err}`);
+                    }
+                }
+                else {
+                    this.log.error(`Error accessing .mattercert directory: ${err}`);
+                }
+            }
+        }
+        this.log.debug(`Matterbridge Matter Cert Directory: ${this.matterbridgeCertDirectory}`);
         const packageJson = JSON.parse(await fs.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
         this.matterbridgeVersion = this.matterbridgeLatestVersion = packageJson.version;
         this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeVersion;
@@ -1464,6 +1489,23 @@ export class Matterbridge extends EventEmitter {
                         }
                     }
                 }
+                setTimeout(() => {
+                    if (this.bridgeMode === 'bridge') {
+                        this.matterbridgeQrPairingCode = undefined;
+                        this.matterbridgeManualPairingCode = undefined;
+                    }
+                    if (this.bridgeMode === 'childbridge') {
+                        const plugin = this.plugins.get(storeId);
+                        if (plugin) {
+                            plugin.qrPairingCode = undefined;
+                            plugin.manualPairingCode = undefined;
+                            this.frontend.wssSendRefreshRequired('plugins');
+                        }
+                    }
+                    this.frontend.wssSendRefreshRequired('settings');
+                    this.frontend.wssSendSnackbarMessage(`Advertising on server node for ${storeId} stopped. Restart to commission.`, 0);
+                    this.log.notice(`Advertising on server node for ${storeId} stopped. Restart to commission.`);
+                }, 15 * 60 * 1000).unref();
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);

package/dist/matterbridgeEndpoint.js

@@ -843,34 +843,34 @@ export class MatterbridgeEndpoint extends Endpoint {
                 return false;
             }
             if (event === 'Single') {
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.SinglePress${db}`);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
-                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.SinglePress${db}`);
+                await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 1 }, log);
             }
             if (event === 'Double') {
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.DoublePress${db}`);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                this.triggerEvent(Switch.Cluster.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'multiPressOngoing', { newPosition: 1, currentNumberOfPressesCounted: 2 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
-                this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
-                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.DoublePress${db}`);
+                await this.triggerEvent(Switch.Cluster.id, 'shortRelease', { previousPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'multiPressComplete', { previousPosition: 1, totalNumberOfPressesCounted: 2 }, log);
             }
             if (event === 'Long') {
+                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.LongPress${db}`);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
-                this.triggerEvent(Switch.Cluster.id, 'longPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'initialPress', { newPosition: 1 }, log);
+                await this.triggerEvent(Switch.Cluster.id, 'longPress', { newPosition: 1 }, log);
                 await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'longRelease', { previousPosition: 1 }, log);
-                log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.LongPress${db}`);
+                await this.triggerEvent(Switch.Cluster.id, 'longRelease', { previousPosition: 1 }, log);
             }
         }
         if (['Press', 'Release'].includes(event)) {
@@ -879,14 +879,14 @@ export class MatterbridgeEndpoint extends Endpoint {
                 return false;
             }
             if (event === 'Press') {
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
-                this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 1 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Press${db}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 1, log);
+                await this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 1 }, log);
             }
             if (event === 'Release') {
-                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
-                this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 0 }, log);
                 log?.info(`${db}Trigger endpoint ${or}${this.id}:${this.number}${db} event ${hk}Switch.Release${db}`);
+                await this.setAttribute(Switch.Cluster.id, 'currentPosition', 0, log);
+                await this.triggerEvent(Switch.Cluster.id, 'switchLatched', { newPosition: 0 }, log);
             }
         }
         return true;

package/dist/matterbridgePlatform.js

@@ -137,6 +137,10 @@ export class MatterbridgePlatform {
         this.selectEntity.clear();
         await this.saveSelects();
     }
+    async clearDeviceSelect(device) {
+        this.selectDevice.delete(device);
+        await this.saveSelects();
+    }
     setSelectDevice(serial, name, configUrl, icon, entities) {
         const device = this.selectDevice.get(serial);
         if (device) {

package/dist/shelly.js

@@ -112,13 +112,15 @@ export async function triggerShellyChangeIp(matterbridge, config) {
     postShelly(api, data, 60 * 1000)
         .then(async () => {
         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}`);
+        matterbridge.frontend.wssSendSnackbarMessage('Error changing Shelly network configuration', 10, 'error');
     })
         .finally(() => {
-        matterbridge.log.notice(`Changed Shelly network configuration`);
-        matterbridge.frontend.wssSendSnackbarMessage('Changed Shelly network configuration');
     });
 }
 export async function triggerShellyReboot(matterbridge) {
@@ -126,13 +128,47 @@ export async function triggerShellyReboot(matterbridge) {
     postShelly('/api/system/reboot', {}, 60 * 1000)
         .then(async () => {
         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.wssSendSnackbarMessage('Error rebooting Shelly board', 10, 'error');
+    })
+        .finally(() => {
+    });
+}
+export async function triggerShellySoftReset(matterbridge) {
+    matterbridge.log.debug(`Triggering Shelly soft reset`);
+    postShelly('/api/reset/soft', {}, 60 * 1000)
+        .then(async () => {
+        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.wssSendSnackbarMessage('Error resetting the network parameters on Shelly board', 10, 'error');
+    })
+        .finally(() => {
+    });
+}
+export async function triggerShellyHardReset(matterbridge) {
+    matterbridge.log.debug(`Triggering Shelly hard reset`);
+    postShelly('/api/reset/hard', {}, 60 * 1000)
+        .then(async () => {
+        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.wssSendSnackbarMessage('Error while factory resetting the Shelly board', 10, 'error');
     })
         .finally(() => {
-        matterbridge.log.notice(`Rebooting Shelly board...`);
-        matterbridge.frontend.wssSendSnackbarMessage('Rebooting Shelly board...');
     });
 }
 export async function createShellySystemLog(matterbridge) {

package/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.ea7910e9.css",
-    "main.js": "./static/js/main.a45801ac.js",
+    "main.js": "./static/js/main.f00179ca.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.ea7910e9.css.map": "./static/css/main.ea7910e9.css.map",
-    "main.a45801ac.js.map": "./static/js/main.a45801ac.js.map",
+    "main.f00179ca.js.map": "./static/js/main.f00179ca.js.map",
     "453.d855a71b.chunk.js.map": "./static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.ea7910e9.css",
-    "static/js/main.a45801ac.js"
+    "static/js/main.f00179ca.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.a45801ac.js"></script><link href="./static/css/main.ea7910e9.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.f00179ca.js"></script><link href="./static/css/main.ea7910e9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>