@project-chip/matter.js 0.16.0-alpha.0-20251001-7eb06da95 → 0.16.0-alpha.0-20251003-dc6d5523d

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js",
-    "version": "0.16.0-alpha.0-20251001-7eb06da95",
+    "version": "0.16.0-alpha.0-20251003-dc6d5523d",
     "description": "Matter protocol in pure js",
     "keywords": [
         "iot",
@@ -44,15 +44,15 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.16.0-alpha.0-20251001-7eb06da95",
-        "@matter/model": "0.16.0-alpha.0-20251001-7eb06da95",
-        "@matter/node": "0.16.0-alpha.0-20251001-7eb06da95",
-        "@matter/protocol": "0.16.0-alpha.0-20251001-7eb06da95",
-        "@matter/types": "0.16.0-alpha.0-20251001-7eb06da95"
+        "@matter/general": "0.16.0-alpha.0-20251003-dc6d5523d",
+        "@matter/model": "0.16.0-alpha.0-20251003-dc6d5523d",
+        "@matter/node": "0.16.0-alpha.0-20251003-dc6d5523d",
+        "@matter/protocol": "0.16.0-alpha.0-20251003-dc6d5523d",
+        "@matter/types": "0.16.0-alpha.0-20251003-dc6d5523d"
     },
     "devDependencies": {
-        "@matter/tools": "0.16.0-alpha.0-20251001-7eb06da95",
-        "@matter/testing": "0.16.0-alpha.0-20251001-7eb06da95"
+        "@matter/tools": "0.16.0-alpha.0-20251003-dc6d5523d",
+        "@matter/testing": "0.16.0-alpha.0-20251003-dc6d5523d"
     },
     "files": [
         "dist/**/*",

package/src/CommissioningController.ts

@@ -8,13 +8,13 @@ import { OperationalCredentials } from "#clusters";
 import { ControllerStore } from "#ControllerStore.js";
 import {
     ClassExtends,
+    ConnectionlessTransportSet,
     Crypto,
     Environment,
     ImplementationError,
     InternalError,
     Logger,
     Minutes,
-    NetInterfaceSet,
     Network,
     NoAddressAvailableError,
     StorageContext,
@@ -265,7 +265,7 @@ export class CommissioningController {
         const controller = await MatterController.create({
             controllerStore,
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             sessionClosedCallback: peerNodeId => {
                 logger.info(`Session for peer node ${peerNodeId} disconnected ...`);
                 const handler = this.#sessionDisconnectedHandler.get(peerNodeId);
@@ -808,7 +808,7 @@ export async function configureNetwork(options: {
 }) {
     const { network, ble, ipv4Disabled, mdnsClient, localPort, listeningAddressIpv6, listeningAddressIpv4 } = options;
 
-    const netInterfaces = new NetInterfaceSet();
+    const netInterfaces = new ConnectionlessTransportSet();
     const scanners = new ScannerSet();
 
     let udpInterface: UdpInterface;

package/src/MatterController.ts

@@ -18,6 +18,7 @@ import { DeviceInformationData } from "#device/DeviceInformation.js";
 import {
     Bytes,
     ChannelType,
+    ConnectionlessTransportSet,
     Construction,
     Crypto,
     CRYPTO_SYMMETRIC_KEY_LENGTH,
@@ -26,9 +27,8 @@ import {
     Logger,
     MatterError,
     Minutes,
-    NetInterfaceSet,
     ServerAddress,
-    ServerAddressIp,
+    ServerAddressUdp,
     StorageBackendMemory,
     StorageManager,
 } from "#general";
@@ -79,7 +79,7 @@ import { ClassExtends } from "@matter/general";
 import { ControllerCommissioningFlow, MessageChannel } from "@matter/protocol";
 
 export type CommissionedNodeDetails = {
-    operationalServerAddress?: ServerAddressIp;
+    operationalServerAddress?: ServerAddressUdp;
     discoveryData?: DiscoveryData;
     deviceData?: DeviceInformationData;
 };
@@ -101,7 +101,7 @@ export class MatterController {
     public static async create(options: {
         controllerStore: ControllerStoreInterface;
         scanners: ScannerSet;
-        netInterfaces: NetInterfaceSet;
+        transports: ConnectionlessTransportSet;
         sessionClosedCallback?: (peerNodeId: NodeId) => void;
         adminVendorId?: VendorId;
         adminFabricId?: FabricId;
@@ -116,7 +116,7 @@ export class MatterController {
         const {
             controllerStore,
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             sessionClosedCallback,
             adminVendorId,
             adminFabricId = FabricId(DEFAULT_FABRIC_ID),
@@ -142,7 +142,7 @@ export class MatterController {
                 controller = new MatterController({
                     controllerStore,
                     scanners,
-                    netInterfaces,
+                    transports: netInterfaces,
                     certificateManager: ca,
                     fabric,
                     adminFabricLabel,
@@ -181,7 +181,7 @@ export class MatterController {
             controller = new MatterController({
                 controllerStore,
                 scanners,
-                netInterfaces,
+                transports: netInterfaces,
                 certificateManager: ca,
                 fabric,
                 adminFabricLabel,
@@ -197,7 +197,7 @@ export class MatterController {
         rootCertificateAuthority?: CertificateAuthority;
         fabricConfig: Fabric.Config;
         scanners: ScannerSet;
-        netInterfaces: NetInterfaceSet;
+        transports: ConnectionlessTransportSet;
         adminFabricLabel: string;
         sessionClosedCallback?: (peerNodeId: NodeId) => void;
         crypto?: Crypto;
@@ -208,7 +208,7 @@ export class MatterController {
             fabricConfig,
             adminFabricLabel,
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             sessionClosedCallback,
         } = options;
 
@@ -240,7 +240,7 @@ export class MatterController {
         const controller = new MatterController({
             controllerStore: new LegacyControllerStore(storageManager.createContext("Commissioner")),
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             certificateManager,
             fabric,
             adminFabricLabel,
@@ -251,7 +251,7 @@ export class MatterController {
     }
 
     readonly sessionManager: SessionManager;
-    private readonly netInterfaces = new NetInterfaceSet();
+    private readonly transports = new ConnectionlessTransportSet();
     private readonly channelManager = new ChannelManager(CONTROLLER_CONNECTIONS_PER_FABRIC_AND_NODE);
     private readonly exchangeManager: ExchangeManager;
     private readonly peers: PeerSet;
@@ -274,7 +274,7 @@ export class MatterController {
     constructor(options: {
         controllerStore: ControllerStoreInterface;
         scanners: ScannerSet;
-        netInterfaces: NetInterfaceSet;
+        transports: ConnectionlessTransportSet;
         certificateManager: CertificateAuthority;
         fabric: Fabric;
         adminFabricLabel: string;
@@ -283,7 +283,7 @@ export class MatterController {
         const {
             controllerStore,
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             certificateManager,
             fabric,
             sessionClosedCallback,
@@ -291,7 +291,7 @@ export class MatterController {
         } = options;
         this.#store = controllerStore;
         this.scanners = scanners;
-        this.netInterfaces = netInterfaces;
+        this.transports = netInterfaces;
         this.ca = certificateManager;
         this.fabric = fabric;
         this.sessionClosedCallback = sessionClosedCallback;
@@ -320,7 +320,7 @@ export class MatterController {
             crypto: fabric.crypto,
             sessionManager: this.sessionManager,
             channelManager: this.channelManager,
-            transportInterfaces: this.netInterfaces,
+            netInterface: this.transports,
         });
         this.exchangeManager.addProtocolHandler(new SecureChannelProtocol(this.sessionManager, fabricManager));
         this.exchangeManager.addProtocolHandler(subscriptionClient);
@@ -334,7 +334,7 @@ export class MatterController {
             exchanges: this.exchangeManager,
             subscriptionClient,
             scanners: this.scanners,
-            netInterfaces: this.netInterfaces,
+            transports: this.transports,
             store: this.nodesStore,
         });
 
@@ -344,7 +344,7 @@ export class MatterController {
             peers: this.peers,
             clients: this.clients,
             scanners: this.scanners,
-            netInterfaces: this.netInterfaces,
+            transports: this.transports,
             exchanges: this.exchangeManager,
             sessions: this.sessionManager,
             ca: this.ca,
@@ -584,7 +584,7 @@ export class MatterController {
         await this.exchangeManager.close();
         await this.sessionManager.close();
         await this.channelManager.close();
-        await this.netInterfaces.close();
+        await this.transports.close();
         await this.#advertiser.close();
     }
 

package/src/PaseCommissioner.ts

@@ -102,7 +102,7 @@ export class PaseCommissioner {
             certificateAuthorityConfig: rootCertificateData,
             fabricConfig: fabricConfig,
             scanners,
-            netInterfaces,
+            transports: netInterfaces,
             adminFabricLabel: this.options.fabricConfig.label,
         });
     }

package/src/device/CachedClientNodeStore.ts

@@ -5,8 +5,8 @@
  */
 
 import type { StorageContext } from "#general";
-import { Construction, Logger } from "#general";
-import { DecodedAttributeReportValue, PeerDataStore, Val } from "#protocol";
+import { Construction, Logger, MaybePromise } from "#general";
+import { DecodedAttributeReportValue, PeerDataStore, ReadScope, Val } from "#protocol";
 import { AttributeId, ClusterId, EndpointNumber, EventNumber } from "#types";
 import { ClientEndpointStore } from "./ClientEndpointStore.js";
 
@@ -141,7 +141,12 @@ export class CachedClientNodeStore extends PeerDataStore {
             });
     }
 
-    async persistAttributes(attributes: DecodedAttributeReportValue<any>[]) {
+    async persistAttributes(attributes: DecodedAttributeReportValue<any>[], scope: ReadScope) {
+        // We only store values that are filtered by out fabric, else we create a mixture of data
+        if (!scope.isFabricFiltered) {
+            return;
+        }
+
         const endpointDataMap = new Map<EndpointNumber, Record<ClusterId, Val.Struct>>();
         for (const {
             path: { endpointId, clusterId, attributeId, attributeName },
@@ -165,7 +170,9 @@ export class CachedClientNodeStore extends PeerDataStore {
             }
 
             clusterData[attributeId.toString()] = { value, attributeName };
-            clusterData[VERSION_KEY] = version;
+            if (scope.isWildcard(endpointId, clusterId)) {
+                clusterData[VERSION_KEY] = version;
+            }
         }
         for (const [endpointId, endpointData] of endpointDataMap) {
             const store = this.#storeForEndpoint(endpointId);
@@ -202,4 +209,17 @@ export class CachedClientNodeStore extends PeerDataStore {
         }
         return versions;
     }
+
+    cleanupAttributeData(endpointId: EndpointNumber, clusterIds?: ClusterId[]): MaybePromise<void> {
+        const store = this.#storeForEndpoint(endpointId);
+        if (clusterIds === undefined) {
+            this.#endpointStores.delete(endpointId);
+            return store.erase();
+        }
+        for (const clusterId of store.get.keys()) {
+            if (!clusterIds.includes(ClusterId(parseInt(clusterId)))) {
+                store.get.delete(clusterId);
+            }
+        }
+    }
 }

package/src/device/Endpoint.ts

@@ -305,7 +305,7 @@ export class Endpoint {
         return Array.from(this.childEndpoints.values());
     }
 
-    protected removeChildEndpoint(endpoint: Endpoint): void {
+    removeChildEndpoint(endpoint: Endpoint): void {
         const id = endpoint.getNumber();
         const knownEndpoint = this.childEndpoints.get(id);
         if (knownEndpoint === undefined) {