matterbridge 1.6.7-dev.1 → 1.6.7-dev.2

package/CHANGELOG.md

@@ -33,6 +33,10 @@ It is possible that some controllers see them as new devices or need time to rea
 
 - [Device]: Fix addChildDeviceType methods to include debug parameter in MatterbridgeDevice instantiation.
 
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.6.6] - 2024-12-12
 
 ### Added

package/dist/matter/export.js

@@ -1,4 +1,5 @@
 export * from '@matter/main';
+export { AttributeElement, ClusterElement, ClusterModel, CommandElement, EventElement, FieldElement } from '@matter/main/model';
 export * from '../matterbridgeDeviceTypes.js';
 export * from '../matterbridgeEndpoint.js';
 export * from '../matterbridgeBehaviors.js';

package/dist/matterbridgeEdge.js

@@ -77,45 +77,6 @@ export class MatterbridgeEdge extends Matterbridge {
         this.matterbridgeContext = undefined;
         this.log.info('Matter node storage closed');
     }
-    createMatterServer(storageManager) {
-        if (hasParameter('debug'))
-            this.log.warn('createMatterServer() => mock MatterServer.addCommissioningServer()');
-        const matterServer = {
-            addCommissioningServer: (commissioningServer, nodeOptions) => {
-                if (hasParameter('debug'))
-                    this.log.warn('MatterServer.addCommissioningServer() => do nothing');
-            },
-        };
-        return matterServer;
-    }
-    async startMatterServer() {
-        if (hasParameter('debug'))
-            this.log.warn('startMatterServer() => do nothing');
-    }
-    async stopMatterServer() {
-        if (hasParameter('debug'))
-            this.log.warn('stopMatterServer() => ...');
-        this.log.info(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
-        if (this.bridgeMode === 'bridge') {
-            const serverNode = this.csToServerNode.get('Matterbridge')?.serverNode;
-            if (serverNode) {
-                await this.stopServerNode(serverNode);
-                this.log.info(`Stopped matter server node Matterbridge`);
-            }
-        }
-        if (this.bridgeMode === 'childbridge') {
-            this.plugins.forEach(async (plugin) => {
-                const serverNode = this.csToServerNode.get(plugin.name)?.serverNode;
-                if (serverNode) {
-                    await this.stopServerNode(serverNode);
-                    this.log.info(`Stopped matter server node ${plugin.name}`);
-                }
-            });
-        }
-        this.log.info('Stopped matter server nodes');
-        await this.environment.get(MdnsService)[Symbol.asyncDispose]();
-        this.log.info('Stopped MdnsService');
-    }
     async createServerNodeContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber) {
         if (!this.matterStorageService)
             throw new Error('No storage service initialized');
@@ -195,6 +156,14 @@ export class MatterbridgeEdge extends Matterbridge {
                 this.matterbridgeSessionInformations = [];
                 this.matterbridgePaired = true;
             }
+            if (this.bridgeMode === 'childbridge') {
+                const plugin = this.plugins.get(storeId);
+                if (plugin) {
+                    plugin.fabricInformations = sanitizedFabrics;
+                    plugin.sessionInformations = [];
+                    plugin.paired = true;
+                }
+            }
         };
         serverNode.lifecycle.commissioned.on(() => this.log.notice(`Server node for ${storeId} was initially commissioned successfully!`));
         serverNode.lifecycle.decommissioned.on(() => this.log.notice(`Server node for ${storeId} was fully decommissioned successfully!`));
@@ -213,6 +182,19 @@ export class MatterbridgeEdge extends Matterbridge {
                     this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
                     this.log.notice(`Manual pairing code: ${manualPairingCode}`);
                 }
+                if (this.bridgeMode === 'childbridge') {
+                    const plugin = this.plugins.get(storeId);
+                    if (plugin) {
+                        plugin.qrPairingCode = qrPairingCode;
+                        plugin.manualPairingCode = manualPairingCode;
+                        plugin.fabricInformations = [];
+                        plugin.sessionInformations = [];
+                        plugin.paired = false;
+                        plugin.connected = false;
+                        this.log.notice(`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`);
+                        this.log.notice(`Manual pairing code: ${manualPairingCode}`);
+                    }
+                }
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);
@@ -255,6 +237,12 @@ export class MatterbridgeEdge extends Matterbridge {
             if (this.bridgeMode === 'bridge') {
                 this.matterbridgeSessionInformations = sanitizedSessions;
             }
+            if (this.bridgeMode === 'childbridge') {
+                const plugin = this.plugins.get(storeId);
+                if (plugin) {
+                    plugin.sessionInformations = sanitizedSessions;
+                }
+            }
         };
         serverNode.events.sessions.opened.on((session) => {
             this.log.notice(`Session opened on server node for ${storeId}: ${debugStringify(session)}`);
@@ -300,8 +288,27 @@ export class MatterbridgeEdge extends Matterbridge {
             await aggregatorNode?.add(device);
         }
         else if (this.bridgeMode === 'childbridge') {
+            if (plugin.type === 'AccessoryPlatform') {
+                if (!plugin.locked && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {
+                    plugin.locked = true;
+                    plugin.storageContext = await this.createServerNodeContext(plugin.name, device.deviceName, DeviceTypeId(device.deviceType), device.vendorId, device.vendorName, device.productId, device.productName);
+                    plugin.commissioningServer = (await this.createServerNode(plugin.storageContext, this.port++, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined));
+                    this.log.debug(`Adding matterbridge endpoint to server node for plugin ${plg}${plugin.name}${db}`);
+                    await plugin.commissioningServer.add(device);
+                    this.csToServerNode.set(plugin.name, { commissioningServer: plugin.commissioningServer, serverNode: plugin.commissioningServer });
+                }
+            }
             if (plugin.type === 'DynamicPlatform') {
-                this.log.info(`Adding ${pluginName}:${device.deviceName} to ${pluginName} aggregator node`);
+                if (!plugin.locked) {
+                    plugin.locked = true;
+                    plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', bridge.code, this.aggregatorVendorId, 'Matterbridge', this.aggregatorProductId, plugin.description);
+                    plugin.commissioningServer = (await this.createServerNode(plugin.storageContext, this.port++, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined));
+                    plugin.aggregator = (await this.createAggregatorNode(plugin.storageContext));
+                    this.log.debug(`Adding matter aggregator node to server node for plugin ${plg}${plugin.name}${db}`);
+                    await plugin.commissioningServer.add(plugin.aggregator);
+                    this.csToServerNode.set(plugin.name, { commissioningServer: plugin.commissioningServer, serverNode: plugin.commissioningServer });
+                    this.agToAggregatorEndpoint.set(plugin.name, { aggregator: plugin.aggregator, aggregatorNode: plugin.aggregator });
+                }
                 const aggregatorNode = this.agToAggregatorEndpoint.get(pluginName)?.aggregatorNode;
                 await aggregatorNode?.add(device);
             }
@@ -365,6 +372,45 @@ export class MatterbridgeEdge extends Matterbridge {
             await this.removeBridgedEndpoint(pluginName, device);
         }
     }
+    createMatterServer(storageManager) {
+        if (hasParameter('debug'))
+            this.log.warn('createMatterServer() => mock MatterServer.addCommissioningServer()');
+        const matterServer = {
+            addCommissioningServer: (commissioningServer, nodeOptions) => {
+                if (hasParameter('debug'))
+                    this.log.warn('MatterServer.addCommissioningServer() => do nothing');
+            },
+        };
+        return matterServer;
+    }
+    async startMatterServer() {
+        if (hasParameter('debug'))
+            this.log.warn('startMatterServer() => do nothing');
+    }
+    async stopMatterServer() {
+        if (hasParameter('debug'))
+            this.log.warn('stopMatterServer() => ...');
+        this.log.info(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
+        if (this.bridgeMode === 'bridge') {
+            const serverNode = this.csToServerNode.get('Matterbridge')?.serverNode;
+            if (serverNode) {
+                await this.stopServerNode(serverNode);
+                this.log.info(`Stopped matter server node Matterbridge`);
+            }
+        }
+        if (this.bridgeMode === 'childbridge') {
+            for (const plugin of this.plugins.array()) {
+                const serverNode = this.csToServerNode.get(plugin.name)?.serverNode;
+                if (serverNode) {
+                    await this.stopServerNode(serverNode);
+                    this.log.info(`Stopped matter server node ${plugin.name}`);
+                }
+            }
+        }
+        this.log.info('Stopped matter server nodes');
+        await this.environment.get(MdnsService)[Symbol.asyncDispose]();
+        this.log.info('Stopped MdnsService');
+    }
     async createCommissioningServerContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName) {
         if (hasParameter('debug'))
             this.log.warn(`createCommissioningServerContext() for ${pluginName} => createServerNodeContext()`);

package/dist/matterbridgeEndpoint.js

@@ -165,7 +165,7 @@ export class MatterbridgeEndpoint extends Endpoint {
         if (clusterId === FlowMeasurement.Cluster.id)
             return FlowMeasurementServer;
         if (clusterId === BooleanState.Cluster.id)
-            return BooleanStateServer;
+            return BooleanStateServer.enable({ events: { stateChange: true } });
         if (clusterId === BooleanStateConfiguration.Cluster.id)
             return MatterbridgeBooleanStateConfigurationServer;
         if (clusterId === OccupancySensing.Cluster.id)
@@ -658,12 +658,8 @@ export class MatterbridgeEndpoint extends Endpoint {
             identifyType,
         }, {
             identify: async (data) => {
-                this.log.debug('Matter command: Identify');
-                await this.commandHandler.executeHandler('identify', data);
             },
             triggerEffect: async (data) => {
-                this.log.debug('Matter command: TriggerEffect');
-                await this.commandHandler.executeHandler('triggerEffect', data);
             },
         });
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "1.6.7-dev.1",
+  "version": "1.6.7-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "1.6.7-dev.1",
+      "version": "1.6.7-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.11.9",
@@ -1952,9 +1952,9 @@
       }
     },
     "node_modules/text-decoder": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.2.tgz",
-      "integrity": "sha512-/MDslo7ZyWTA2vnk1j7XoDVfXsGk3tp+zFEJHJGm0UjIlQifonVFwlVbQDFh8KJzTBnT8ie115TYqir6bclddA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+      "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.4"

package/package.json

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