matterbridge 2.1.6-dev.1 → 2.1.6-dev.2

package/CHANGELOG.md

@@ -38,7 +38,7 @@ matterbridge-hass v. 0.0.8
 ### Added
 
 - [docker]: Added health check directly inside the docker image. No need to change configuration.
-- [platform]: Added saving to storage the selects for faster loading.
+- [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).
 - [frontend]: Frontend v.2.4.2.
 

package/dist/matterbridgePlatform.js

@@ -14,6 +14,10 @@ export class MatterbridgePlatform {
     context;
     selectDevice = new Map();
     selectEntity = new Map();
+    contextReady;
+    selectDeviceContextReady;
+    selectEntityContextReady;
+    ready;
     registeredEndpoints = new Map();
     registeredEndpointsByName = new Map();
     constructor(matterbridge, log, config) {
@@ -31,26 +35,28 @@ export class MatterbridgePlatform {
             forgiveParseErrors: true,
         });
         this.log.debug(`Creating context for plugin ${this.config.name}`);
-        this.storage.createStorage('context').then((context) => {
+        this.contextReady = this.storage.createStorage('context').then((context) => {
             this.context = context;
             this.log.debug(`Created context for plugin ${this.config.name}`);
+            return context;
         });
         this.log.debug(`Loading selectDevice for plugin ${this.config.name}`);
-        this.storage.createStorage('selectDevice').then((context) => {
-            context.get('selectDevice', []).then((selectDevice) => {
-                for (const device of selectDevice)
-                    this.selectDevice.set(device.serial, device);
-            });
+        this.selectDeviceContextReady = this.storage.createStorage('selectDevice').then(async (context) => {
+            const selectDevice = await context.get('selectDevice', []);
+            for (const device of selectDevice)
+                this.selectDevice.set(device.serial, device);
             this.log.debug(`Loaded ${this.selectDevice.size} selectDevice for plugin ${this.config.name}`);
         });
         this.log.debug(`Loading selectEntity for plugin ${this.config.name}`);
-        this.storage.createStorage('selectEntity').then((context) => {
-            context.get('selectEntity', []).then((selectEntity) => {
-                for (const entity of selectEntity)
-                    this.selectEntity.set(entity.name, entity);
-            });
+        this.selectEntityContextReady = this.storage.createStorage('selectEntity').then(async (context) => {
+            const selectEntity = await context.get('selectEntity', []);
+            for (const entity of selectEntity)
+                this.selectEntity.set(entity.name, entity);
             this.log.debug(`Loaded ${this.selectEntity.size} selectEntity for plugin ${this.config.name}`);
         });
+        this.ready = Promise.all([this.contextReady, this.selectDeviceContextReady, this.selectEntityContextReady]).then(() => {
+            this.log.debug(`MatterbridgePlatform for plugin ${this.config.name} is fully initialized`);
+        });
     }
     async onStart(reason) {
         this.log.error('Plugins must override onStart.', reason);
@@ -77,7 +83,9 @@ export class MatterbridgePlatform {
         this.selectEntity.clear();
         this.registeredEndpoints.clear();
         this.registeredEndpointsByName.clear();
-        this.log.debug('Saving context...');
+        this.contextReady = undefined;
+        this.selectDeviceContextReady = undefined;
+        this.selectEntityContextReady = undefined;
         await this.context?.close();
         this.context = undefined;
         await this.storage?.close();
@@ -214,16 +222,15 @@ export class MatterbridgePlatform {
                 endpointMap.set(device.uniqueId, device.maybeNumber);
             }
             for (const child of device.getChildEndpoints()) {
-                const childId = child.id;
-                if (!childId || !child.maybeNumber)
+                if (!child.maybeId || !child.maybeNumber)
                     continue;
-                if (endpointMap.has(device.uniqueId + separator + childId) && endpointMap.get(device.uniqueId + separator + childId) !== child.maybeNumber) {
-                    this.log.warn(`Child endpoint number for device ${CYAN}${device.deviceName}${wr}.${CYAN}${childId}${wr} changed from ${CYAN}${endpointMap.get(device.uniqueId + separator + childId)}${wr} to ${CYAN}${child.maybeNumber}${wr}`);
-                    endpointMap.set(device.uniqueId + separator + childId, child.maybeNumber);
+                if (endpointMap.has(device.uniqueId + separator + child.id) && endpointMap.get(device.uniqueId + separator + child.id) !== child.maybeNumber) {
+                    this.log.warn(`Child endpoint number for device ${CYAN}${device.deviceName}${wr}.${CYAN}${child.id}${wr} changed from ${CYAN}${endpointMap.get(device.uniqueId + separator + child.id)}${wr} to ${CYAN}${child.maybeNumber}${wr}`);
+                    endpointMap.set(device.uniqueId + separator + child.id, child.maybeNumber);
                 }
-                if (!endpointMap.has(device.uniqueId + separator + childId)) {
-                    this.log.debug(`Setting child endpoint number for device ${CYAN}${device.uniqueId}${db}.${CYAN}${childId}${db} to ${CYAN}${child.maybeNumber}${db}`);
-                    endpointMap.set(device.uniqueId + separator + childId, child.maybeNumber);
+                if (!endpointMap.has(device.uniqueId + separator + child.id)) {
+                    this.log.debug(`Setting child endpoint number for device ${CYAN}${device.uniqueId}${db}.${CYAN}${child.id}${db} to ${CYAN}${child.maybeNumber}${db}`);
+                    endpointMap.set(device.uniqueId + separator + child.id, child.maybeNumber);
                 }
             }
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.6-dev.1",
+  "version": "2.1.6-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.6-dev.1",
+      "version": "2.1.6-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "^0.12.4-alpha.0-20250212-b2729c9eb",
@@ -474,9 +474,9 @@
       }
     },
     "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
-      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",

package/package.json

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