matterbridge 2.2.6-dev.1 → 2.2.6-dev.2

package/CHANGELOG.md

@@ -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/matterbridge.js

@@ -1464,6 +1464,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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.2.6-dev.1",
+  "version": "2.2.6-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.2.6-dev.1",
+      "version": "2.2.6-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.2.6-dev.1",
+  "version": "2.2.6-dev.2",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",