matterbridge 1.6.8-dev.5 → 1.6.8-dev.7

package/CHANGELOG.md

@@ -13,11 +13,11 @@ 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.
 
-## [1.6.8-dev.5] - 2024-12-18
+## [1.6.8-dev.7] - 2024-12-19
 
 ### Added
 
-- [storage]: Added conversion from old matter storage to the new api format with fabrics, resumptionRecords, network, commissioning, operationalCredentials, acl and parts number. The conversion is automatic the first time you run this release.
+- [storage]: Added conversion from old matter storage to the new api format with fabrics, resumptionRecords, network, commissioning, operationalCredentials, acl and parts number.
 - [package]: Update README.md and README-SERVICE.md to include instructions for using SSL on port 443.
 
 ### Changed

package/dist/matterbridge.js

@@ -990,8 +990,8 @@ export class Matterbridge extends EventEmitter {
                 });
                 this.webSocketServer = undefined;
             }
-            if (this.edge === false && this.matterbridgeContext && ['updating...', 'restarting...', 'shutting down...'].includes(message)) {
-                this.convertStorage(this.matterbridgeContext, 'Mattebridge');
+            if (hasParameter('convert') && this.edge === false && this.matterbridgeContext && ['updating...', 'restarting...', 'shutting down...'].includes(message)) {
+                await this.convertStorage(this.matterbridgeContext, 'Mattebridge');
             }
             await this.stopMatterServer();
             await this.stopMatterStorage();
@@ -1593,14 +1593,24 @@ export class Matterbridge extends EventEmitter {
             });
             nocArray.push({ noc: fabric.operationalCert, icac: null, fabricIndex: fabric.fabricIndex });
             trcArray.push('{\"__object__\":\"Uint8Array\",\"__value__\":\"' + Buffer.from(fabric.rootCert).toString('hex') + '\"}');
-            aclArray.push({ fabricIndex: fabric.fabricIndex, privilege: 5, authMode: 2, subjects: ['{\"__object__\":\"BigInt\",\"__value__\":\"' + fabric.rootNodeId.toString().replace('n', '') + '\"}'], targets: null });
+            this.log.info(`- updating ACL for fabricIndex ${fabric.fabricIndex}:`, fabric.scopedClusterData);
+            const acl = fabric.scopedClusterData.get(0x1f)?.get('acl');
+            if (acl && acl.value.length > 0) {
+                aclArray.push(acl.value[0]);
+                this.log.info(`- ACL updated to ${debugStringify(acl.value)}${nf} for fabricIndex ${CYAN}${fabric.fabricIndex}${nf}`);
+            }
+            else {
+                const defaultAcl = { fabricIndex: fabric.fabricIndex, privilege: 5, authMode: 2, subjects: [fabric.rootNodeId], targets: null };
+                aclArray.push(defaultAcl);
+                this.log.info(`- ACL updated to default ${debugStringify(defaultAcl)}${nf} for fabricIndex ${CYAN}${fabric.fabricIndex}${nf}`);
+            }
         }
         await nodeStorage.createContext('fabrics').set('fabrics', fabrics);
         await nodeStorage.createContext('fabrics').set('nextFabricIndex', nextFabricIndex);
         await nodeStorage.createContext('sessions').set('resumptionRecords', await sessionManagerContext.get('resumptionRecords', []));
         await nodeStorage.createContext('events').set('lastEventNumber', await eventHandlerContext.get('lastEventNumber', 1));
         await nodeStorage.createContext('root').set('__number__', 0);
-        await nodeStorage.createContext('root').set('__nextNumber__', 1);
+        await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').set('__number__', 1);
         await nodeStorage.createContext('root').createContext('commissioning').set('enabled', true);
         await nodeStorage.createContext('root').createContext('commissioning').set('commissioned', true);
         await nodeStorage.createContext('root').createContext('commissioning').set('fabrics', fabricInfo);
@@ -1622,8 +1632,10 @@ export class Matterbridge extends EventEmitter {
         await nodeStorage.createContext('root').createContext('productDescription').set('productId', 0x8000);
         await nodeStorage.createContext('root').createContext('productDescription').set('vendorId', 0xfff1);
         for (const key of await endpointStructureContext.keys()) {
-            if (key === 'nextEndpointId')
+            if (key === 'nextEndpointId') {
+                await nodeStorage.createContext('root').set('__nextNumber__', await endpointStructureContext.get(key));
                 continue;
+            }
             const parts = key.split('-');
             const number = await endpointStructureContext.get(key);
             if (parts.length === 2) {
@@ -1642,8 +1654,21 @@ export class Matterbridge extends EventEmitter {
                 }
             }
         }
-        await nodeStorage.createContext('root').createContext('parts').createContext('Matterbridge').set('__number__', 1);
         await nodeStorage.createContext('persist').set('converted', true);
+        await nodeStorage.createContext('persist').set('deviceName', await context.get('deviceName'));
+        await nodeStorage.createContext('persist').set('deviceType', await context.get('deviceType'));
+        await nodeStorage.createContext('persist').set('vendorId', await context.get('vendorId'));
+        await nodeStorage.createContext('persist').set('vendorName', await context.get('vendorName'));
+        await nodeStorage.createContext('persist').set('productId', await context.get('productId'));
+        await nodeStorage.createContext('persist').set('productName', await context.get('productName'));
+        await nodeStorage.createContext('persist').set('nodeLabel', await context.get('nodeLabel'));
+        await nodeStorage.createContext('persist').set('productLabel', await context.get('productLabel'));
+        await nodeStorage.createContext('persist').set('serialNumber', 'SN' + (await context.get('serialNumber')));
+        await nodeStorage.createContext('persist').set('uniqueId', await context.get('uniqueId'));
+        await nodeStorage.createContext('persist').set('softwareVersion', await context.get('softwareVersion'));
+        await nodeStorage.createContext('persist').set('softwareVersionString', await context.get('softwareVersionString'));
+        await nodeStorage.createContext('persist').set('hardwareVersion', await context.get('hardwareVersion'));
+        await nodeStorage.createContext('persist').set('hardwareVersionString', await context.get('hardwareVersionString'));
         await context.set('converted', true);
         this.log.notice(`Matter storage converted to Matterbridge edge for ${plg}${pluginName}${nt}`);
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "1.6.8-dev.5",
+  "version": "1.6.8-dev.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "1.6.8-dev.5",
+      "version": "1.6.8-dev.7",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.11.9",
@@ -1186,9 +1186,9 @@
       "license": "MIT"
     },
     "node_modules/math-intrinsics": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.0.0.tgz",
-      "integrity": "sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"

package/package.json

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