@matterbridge/core 3.8.0-dev-20260604-901f3fc → 3.8.0-dev-20260605-48352af

package/dist/backendWsServer.js

@@ -142,7 +142,8 @@ export class BackendWsServer {
                 else if ('error' in data) {
                     this.log.debug(`Sending api error message: ${debugStringify(data)}`);
                 }
-                client.send(JSON.stringify(data));
+                const bigintReplacer = (_, v) => (typeof v === 'bigint' ? `${v}n` : v);
+                client.send(JSON.stringify(data, bigintReplacer));
             }
             else {
                 this.log.error('Cannot send api response, client not connected');

package/dist/behaviors/bindingServer.js

@@ -12,8 +12,12 @@ export class MatterbridgeBindingServer extends BindingServer {
             const currentClientList = this.endpoint.stateOf(DescriptorServer).clientList;
             const toAddClientList = clientList.filter((id) => !currentClientList.includes(id));
             if (toAddClientList.length > 0) {
-                await this.endpoint.setStateOf(DescriptorServer, { clientList: [...currentClientList, ...toAddClientList] });
                 device.log.info(`Adding client clusters to endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber}: ${toAddClientList.join(', ')}`);
+                await this.endpoint.setStateOf(DescriptorServer, { clientList: [...currentClientList, ...toAddClientList] });
+            }
+            const targets = this.endpoint.stateOf(BindingServer).binding;
+            for (const target of targets) {
+                device.log.info(`Active binding for endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber}: target ${debugStringify(target)}`);
             }
         });
         this.reactTo(this.events.binding$Changed, (value) => {

package/dist/frontend.js

@@ -1307,7 +1307,8 @@ export class Frontend extends EventEmitter {
                 else {
                     this.log.debug(`Sending api response message: ${debugStringify(data)}`);
                 }
-                client.send(JSON.stringify(data));
+                const bigintReplacer = (_, v) => (typeof v === 'bigint' ? `${v}n` : v);
+                client.send(JSON.stringify(data, bigintReplacer));
             }
             else {
                 this.log.error('Cannot send api response, client not connected');

package/dist/matterbridge.js

@@ -8,10 +8,10 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { inspect } from 'node:util';
 import { Crypto, Environment, LogFormat as MatterLogFormat, Logger, LogLevel as MatterLogLevel, StorageService, UINT16_MAX, UINT32_MAX, } from '@matter/general';
-import { Endpoint, NetworkClient, ServerNode } from '@matter/node';
-import { BasicInformationClient, BasicInformationServer } from '@matter/node/behaviors/basic-information';
+import { Endpoint, ServerNode } from '@matter/node';
+import { BasicInformationServer } from '@matter/node/behaviors/basic-information';
 import { AggregatorEndpoint } from '@matter/node/endpoints/aggregator';
-import { PaseClient, Read, Subscribe } from '@matter/protocol';
+import { PaseClient } from '@matter/protocol';
 import { DeviceTypeId, VendorId } from '@matter/types/datatype';
 import { ManualPairingCodeCodec } from '@matter/types/schema';
 import { BroadcastServer } from '@matterbridge/thread/server';
@@ -1584,265 +1584,6 @@ export class Matterbridge extends EventEmitter {
         }, Number(process.env['MATTERBRIDGE_START_MATTER_INTERVAL_MS']) || this.startMatterIntervalMs);
     }
     async startController() {
-        if (!this.matterStorageManager) {
-            this.log.error('No storage manager initialized');
-            await this.cleanup('No storage manager initialized');
-            return;
-        }
-        if (!this.matterStorageService) {
-            this.log.error('No storage service initialized');
-            await this.cleanup('No storage service initialized');
-            return;
-        }
-        await createDirectory(path.join(this.matterbridgeDirectory, MATTER_STORAGE_DIR, 'MatterbridgeController'), `Matter node storage directory for MatterbridgeController`, this.log);
-        this.matterStorageManager = await this.matterStorageService.open('MatterbridgeController');
-        this.log.info('Matter node storage manager "MatterbridgeController" created');
-        this.log.info('Creating context controllerContext...');
-        this.controllerContext = this.matterStorageManager.createContext('controllerContext');
-        if (!this.controllerContext) {
-            this.log.error('No storage context controllerContext initialized');
-            await this.cleanup('No storage context controllerContext initialized');
-            return;
-        }
-        const { randomBytes } = await import('node:crypto');
-        const storeId = 'MatterbridgeController';
-        const random = randomBytes(8).toString('hex');
-        await this.controllerContext.set('storeId', storeId);
-        await this.controllerContext.set('vendorId', this.controllerVendorId);
-        await this.controllerContext.set('vendorName', this.controllerVendorName.slice(0, 32));
-        await this.controllerContext.set('productId', this.controllerProductId);
-        await this.controllerContext.set('productName', this.controllerProductName.slice(0, 32));
-        await this.controllerContext.set('productLabel', this.controllerProductName.replace(this.controllerVendorName, '').trim().slice(0, 32));
-        await this.controllerContext.set('nodeLabel', storeId.slice(0, 32));
-        await this.controllerContext.set('serialNumber', await this.controllerContext.get('serialNumber', 'SN' + random));
-        await this.controllerContext.set('uniqueId', await this.controllerContext.get('uniqueId', 'UI' + random));
-        await this.controllerContext.set('softwareVersion', isValidNumber(parseVersionString(this.matterbridgeVersion), 0, UINT32_MAX) ? parseVersionString(this.matterbridgeVersion) : 1);
-        await this.controllerContext.set('softwareVersionString', isValidString(this.matterbridgeVersion, 5, 64) ? this.matterbridgeVersion : '1.0.0');
-        await this.controllerContext.set('hardwareVersion', isValidNumber(parseVersionString(this.systemInformation.osRelease), 0, UINT16_MAX) ? parseVersionString(this.systemInformation.osRelease) : 1);
-        await this.controllerContext.set('hardwareVersionString', isValidString(this.systemInformation.osRelease, 5, 64) ? this.systemInformation.osRelease : '1.0.0');
-        this.log.info('Creating matter commissioning controller...');
-        this.controllerNode = await ServerNode.create({
-            id: storeId,
-            environment: this.environment,
-            network: {
-                listeningAddressIpv4: this.ipv4Address,
-                listeningAddressIpv6: this.ipv6Address,
-                port: this.port,
-            },
-            basicInformation: {
-                nodeLabel: await this.controllerContext.get('nodeLabel'),
-                vendorId: VendorId(await this.controllerContext.get('vendorId')),
-                vendorName: await this.controllerContext.get('vendorName'),
-                productId: await this.controllerContext.get('productId'),
-                productName: await this.controllerContext.get('productName'),
-                productLabel: await this.controllerContext.get('productLabel'),
-                serialNumber: await this.controllerContext.get('serialNumber'),
-                uniqueId: await this.controllerContext.get('uniqueId'),
-                softwareVersion: await this.controllerContext.get('softwareVersion'),
-                softwareVersionString: await this.controllerContext.get('softwareVersionString'),
-                hardwareVersion: await this.controllerContext.get('hardwareVersion'),
-                hardwareVersionString: await this.controllerContext.get('hardwareVersionString'),
-                reachable: true,
-            },
-        });
-        this.log.info(`Loaded matter commissioning controller with ${this.controllerNode.peers.size} peer nodes.`);
-        const requestedNodeId = getIntParameter('node');
-        const nodeLabel = requestedNodeId !== undefined ? `Node ${requestedNodeId}` : undefined;
-        const peerId = requestedNodeId !== undefined ? `peer${requestedNodeId}` : undefined;
-        if (hasParameter('pair')) {
-            let options;
-            if (hasParameter('pairingcode')) {
-                const pairingCode = getParameter('pairingcode');
-                this.log.info(`Pairing device ${nodeLabel} with pairingcode: ${pairingCode}`);
-                const pairingData = ManualPairingCodeCodec.decode(pairingCode);
-                this.log.info(`- passcode: ${pairingData.passcode}`);
-                this.log.info(`- shortDiscriminator: ${pairingData.shortDiscriminator ?? 'n/a (should never be n/a, short discriminator is encoded in the manual pairing code)'} `);
-                this.log.info(`- longDiscriminator: ${pairingData.discriminator ?? 'n/a (manual pairing code encodes short discriminator only)'}`);
-                this.log.info(`- vendorId: ${pairingData.vendorId ?? 'n/a'}`);
-                this.log.info(`- productId: ${pairingData.productId ?? 'n/a'}`);
-                options = {
-                    id: peerId,
-                    pairingCode,
-                    ...(pairingData.shortDiscriminator !== undefined ? { shortDiscriminator: pairingData.shortDiscriminator } : {}),
-                    ...(pairingData.vendorId !== undefined ? { vendorId: pairingData.vendorId } : {}),
-                    ...(pairingData.productId !== undefined ? { productId: pairingData.productId } : {}),
-                };
-            }
-            else {
-                const discriminator = getIntParameter('discriminator');
-                const passcode = getIntParameter('passcode') ?? 0;
-                this.log.info(`Pairing device ${nodeLabel} with discriminator: ${discriminator}, passcode: ${passcode}`);
-                options = { id: peerId, discriminator, passcode };
-            }
-            this.log.notice(`Commissioning node ${nodeLabel} with options: ${debugStringify(options)}`);
-            try {
-                const commissionedNode = await this.controllerNode.peers.commission(options);
-                this.log.notice(`Commissioning successfully done for node ${commissionedNode.id}`);
-            }
-            catch (error) {
-                this.log.error(`Commissioning failed for node ${nodeLabel}: ${error instanceof Error ? error.message : error}`);
-            }
-        }
-        else if (hasParameter('discover')) {
-            this.log.info('Discovering commissionable devices...');
-            const discovery = this.controllerNode.peers.discover();
-            discovery.discovered.on((node) => {
-                this.log.info(`Discovered commissionable device: ${node.id}`);
-            });
-        }
-        else if (hasParameter('peers')) {
-            await this.controllerNode.start();
-            const peers = this.controllerNode.peers;
-            this.log.info(`Matter commissioning controller paired nodes: ${peers.size}`);
-            for (const peer of peers) {
-                const match = /^peer(\d+)$/.exec(peer.id);
-                this.log.info(`- ${match ? `Node ${match[1]}` : peer.id}`);
-            }
-        }
-        else if (hasParameter('unpair')) {
-            await this.controllerNode.start();
-            const requestedNodeId = getIntParameter('node');
-            if (requestedNodeId === undefined) {
-                this.log.error('Missing parameter --node for --unpair');
-                return;
-            }
-            const nodeLabel = `Node ${requestedNodeId}`;
-            const peerId = `peer${requestedNodeId}`;
-            this.log.info(`Matter commissioning controller decommissioning node: ${nodeLabel}`);
-            const peers = this.controllerNode.peers;
-            for (const peer of peers) {
-                if (peer.id === peerId) {
-                    await peer.decommission();
-                    this.log.info(`Matter commissioning controller decommissioned node: ${nodeLabel}`);
-                    return;
-                }
-            }
-            this.log.warn(`Matter commissioning controller node not found: ${nodeLabel}`);
-        }
-        else if (hasParameter('unpairall')) {
-            await this.controllerNode.start();
-            this.log.info('Matter commissioning controller decommissioning all nodes...');
-            const nodeIds = this.controllerNode.peers;
-            for (const nodeId of nodeIds) {
-                this.log.info('Matter commissioning controller decommissioning node:', nodeId.id);
-                await nodeId.decommission();
-            }
-            this.log.info('Matter commissioning controller decommissioned all nodes');
-        }
-        else {
-            this.log.info('Starting matter commissioning controller...');
-            await this.controllerNode.start();
-            this.log.info(`Matter commissioning controller started with ${this.controllerNode.peers.size} paired nodes`);
-            const tracerSubscriptions = new Map();
-            const peersToStart = [];
-            if (peerId) {
-                const peer = this.controllerNode.peers.get(peerId);
-                if (!peer) {
-                    this.log.warn(`Matter commissioning controller peer not found: ${nodeLabel ?? peerId}`);
-                }
-                else {
-                    peersToStart.push(peer);
-                }
-            }
-            else {
-                for (const peer of this.controllerNode.peers) {
-                    peersToStart.push(peer);
-                }
-            }
-            for (const peer of peersToStart) {
-                const match = /^peer(\d+)$/.exec(peer.id);
-                const startedLabel = match ? `Node ${match[1]}` : peer.id;
-                peer.lifecycle.online.on(() => {
-                    this.log.notice(`Matter commissioning controller peer ${startedLabel} is online`);
-                    if (peer.stateOf(NetworkClient).autoSubscribe) {
-                        this.log.info(`Matter commissioning controller autoSubscribe is enabled for peer ${startedLabel}`);
-                    }
-                    else {
-                        this.log.info(`Matter commissioning controller setting autoSubscribe for peer ${startedLabel}`);
-                        peer.setStateOf(NetworkClient, { autoSubscribe: true }).catch((error) => {
-                            this.log.error(`Failed to set autoSubscribe for peer ${startedLabel}: ${error instanceof Error ? error.message : error}`);
-                        });
-                    }
-                    if (hasParameter('trace-peer') && !tracerSubscriptions.has(peer.id)) {
-                        this.log.info(`Matter commissioning controller enabling trace-peer for ${startedLabel}`);
-                        const subscribe = Subscribe({
-                            fabricFilter: true,
-                            keepSubscriptions: false,
-                            attributes: [{}],
-                            events: [{ isUrgent: true }],
-                        });
-                        const subscriptionPromise = peer.interaction.subscribe({
-                            ...subscribe,
-                            updated: async (update) => {
-                                for await (const chunk of update) {
-                                    for (const report of chunk) {
-                                        if (report.kind === 'attr-value') {
-                                            this.log.info(`Peer ${startedLabel} attr ${report.path.endpointId}/${report.path.clusterId}/${report.path.attributeId} v${report.version}: ${typeof report.value === 'object' ? debugStringify(report.value ?? { none: true }) : String(report.value)}`);
-                                        }
-                                        else if (report.kind === 'event-value') {
-                                            this.log.info(`Peer ${startedLabel} event ${report.path.endpointId}/${report.path.clusterId}/${report.path.eventId} #${report.number}: ${typeof report.value === 'object' ? debugStringify(report.value ?? { none: true }) : String(report.value)}`);
-                                        }
-                                        else if (report.kind === 'attr-status') {
-                                            this.log.warn(`Peer ${startedLabel} attr-status ${report.path.endpointId}/${report.path.clusterId}/${report.path.attributeId}: ${String(report.status)}`);
-                                        }
-                                        else if (report.kind === 'event-status') {
-                                            this.log.warn(`Peer ${startedLabel} event-status ${report.path.endpointId}/${report.path.clusterId}/${report.path.eventId}: ${String(report.status)}`);
-                                        }
-                                    }
-                                }
-                            },
-                            closed: () => {
-                                this.log.warn(`Matter commissioning controller trace-peer subscription closed for ${startedLabel}`);
-                                tracerSubscriptions.delete(peer.id);
-                            },
-                        });
-                        tracerSubscriptions.set(peer.id, subscriptionPromise);
-                        subscriptionPromise.catch((error) => {
-                            tracerSubscriptions.delete(peer.id);
-                            this.log.error(`Matter commissioning controller trace-peer subscription failed for ${startedLabel}: ${error instanceof Error ? error.message : error}`);
-                        });
-                    }
-                    if (hasParameter('dump-peer')) {
-                        void (async () => {
-                            try {
-                                for await (const _chunk of peer.interaction.read(Read({ fabricFilter: true, attributes: [{}] }))) {
-                                }
-                                const basicInfo = peer.stateOf(BasicInformationClient);
-                                Logger.get(`BasicInformation: ${startedLabel}`).info(basicInfo);
-                            }
-                            catch (error) {
-                                this.log.error(`Matter commissioning controller dump-peer failed for ${startedLabel}: ${error instanceof Error ? error.message : error}`);
-                            }
-                        })();
-                    }
-                });
-                peer.lifecycle.offline.on(() => {
-                    this.log.warn(`Matter commissioning controller peer ${startedLabel} is offline`);
-                });
-                peer.eventsOf(NetworkClient).autoSubscribe$Changed.on((value, oldValue) => {
-                    this.log.info(`Matter commissioning controller peer ${startedLabel} autoSubscribe changed from ${oldValue ? 'active' : 'inactive'} to ${value ? 'active' : 'inactive'}`);
-                });
-                peer.eventsOf(NetworkClient).defaultSubscription$Changed.on((value, oldValue) => {
-                    this.log.info(`Matter commissioning controller peer ${startedLabel} defaultSubscription changed from ${oldValue ? 'active' : 'inactive'} to ${value ? 'active' : 'inactive'}`);
-                });
-                peer.eventsOf(NetworkClient).subscriptionStatusChanged.on((isActive) => {
-                    this.log.info(`Matter commissioning controller peer ${startedLabel} subscription is ${isActive ? 'active' : 'inactive'}`);
-                });
-                peer.eventsOf(NetworkClient).subscriptionAlive.on(() => {
-                    this.log.info(`Matter commissioning controller peer ${startedLabel} subscription alive event received`);
-                });
-                this.log.notice(`Starting matter commissioning controller peer ${startedLabel}...`);
-                peer
-                    .start()
-                    .then(() => {
-                    this.log.notice(`Matter commissioning controller peer ${startedLabel} started successfully`);
-                    return;
-                })
-                    .catch((error) => {
-                    this.log.error(`Matter commissioning controller failed to start peer ${startedLabel}: ${error instanceof Error ? error.message : error}`);
-                });
-            }
-        }
     }
     async startMatterStorage() {
         this.log.info(`Starting matter node storage...`);

package/dist/matterbridgeDeviceTypes.d.ts

@@ -11,20 +11,28 @@ export declare enum DeviceClasses {
     Duplicate = "Duplicate",
     BridgedPowerSourceInfo = "BridgedPowerSourceInfo"
 }
+export declare enum DeviceScopes {
+    Endpoint = "endpoint",
+    Node = "node"
+}
 export interface DeviceTypeDefinition {
     name: string;
+    deviceName: string;
     code: DeviceTypeId;
     deviceClass: DeviceClasses;
+    deviceScope: DeviceScopes;
     revision: number;
     requiredServerClusters: ClusterId[];
     optionalServerClusters: ClusterId[];
     requiredClientClusters: ClusterId[];
     optionalClientClusters: ClusterId[];
 }
-export declare const DeviceTypeDefinition: ({ name, code, deviceClass, revision, requiredServerClusters, optionalServerClusters, requiredClientClusters, optionalClientClusters, }: {
+export declare const DeviceTypeDefinition: ({ name, deviceName, code, deviceClass, deviceScope, revision, requiredServerClusters, optionalServerClusters, requiredClientClusters, optionalClientClusters, }: {
     name: string;
+    deviceName: string;
     code: number;
     deviceClass: DeviceClasses;
+    deviceScope: DeviceScopes;
     revision: number;
     requiredServerClusters?: ClusterId[];
     optionalServerClusters?: ClusterId[];
@@ -49,6 +57,7 @@ export declare const onOffMountedSwitch: DeviceTypeDefinition;
 export declare const dimmableMountedSwitch: DeviceTypeDefinition;
 export declare const pumpDevice: DeviceTypeDefinition;
 export declare const waterValve: DeviceTypeDefinition;
+export declare const irrigationSystem: DeviceTypeDefinition;
 export declare const onOffSwitch: DeviceTypeDefinition;
 export declare const dimmableSwitch: DeviceTypeDefinition;
 export declare const colorTemperatureSwitch: DeviceTypeDefinition;
@@ -65,8 +74,12 @@ export declare const airQualitySensor: DeviceTypeDefinition;
 export declare const waterFreezeDetector: DeviceTypeDefinition;
 export declare const waterLeakDetector: DeviceTypeDefinition;
 export declare const rainSensor: DeviceTypeDefinition;
+export declare const soilSensor: DeviceTypeDefinition;
 export declare const doorLockDevice: DeviceTypeDefinition;
 export declare const coverDevice: DeviceTypeDefinition;
+export declare const closure: DeviceTypeDefinition;
+export declare const closurePanel: DeviceTypeDefinition;
+export declare const closureController: DeviceTypeDefinition;
 export declare const thermostatDevice: DeviceTypeDefinition;
 export declare const fanDevice: DeviceTypeDefinition;
 export declare const airPurifier: DeviceTypeDefinition;
@@ -94,11 +107,6 @@ export declare const waterHeater: DeviceTypeDefinition;
 export declare const solarPower: DeviceTypeDefinition;
 export declare const batteryStorage: DeviceTypeDefinition;
 export declare const heatPump: DeviceTypeDefinition;
-export declare const soilSensor: DeviceTypeDefinition;
-export declare const irrigationSystem: DeviceTypeDefinition;
-export declare const closure: DeviceTypeDefinition;
-export declare const closurePanel: DeviceTypeDefinition;
-export declare const closureController: DeviceTypeDefinition;
 export declare const meterReferencePoint: DeviceTypeDefinition;
 export declare const electricalEnergyTariff: DeviceTypeDefinition;
 export declare const electricalMeter: DeviceTypeDefinition;