@project-chip/matter.js 0.11.0-alpha.0-20240926-407400ecb → 0.11.0-alpha.0-20241002-e7b377c34

package/src/CommissioningServer.ts

@@ -418,7 +418,9 @@ export class CommissioningServer extends MatterNode {
 
             for (const endpoint of this.endpointStructure.endpoints.values()) {
                 for (const cluster of (endpoint as Endpoint).getAllClusterServers()) {
-                    new CommissioningServerClusterDatasource(endpoint, cluster, this.storage, this.eventHandler);
+                    new CommissioningServerClusterDatasource(endpoint, cluster, this.storage, this.eventHandler, () =>
+                        this.deviceInstance!.getFabrics(),
+                    );
                 }
             }
         });
@@ -532,15 +534,7 @@ export class CommissioningServer extends MatterNode {
             throw new ImplementationError("BasicInformationCluster needs to be set!");
         }
 
-        this.interactionServer = new LegacyInteractionServer({
-            endpointStructure: this.endpointStructure,
-            subscriptionOptions: {
-                maxIntervalSeconds: this.options.subscriptionMaxIntervalSeconds,
-                minIntervalSeconds: this.options.subscriptionMinIntervalSeconds,
-                randomizationWindowSeconds: this.options.subscriptionRandomizationWindowSeconds,
-            },
-            maxPathsPerInvoke: basicInformation.getMaxPathsPerInvokeAttribute(),
-        });
+        const maxPathsPerInvoke = basicInformation.getMaxPathsPerInvokeAttribute();
 
         this.nextEndpointId = this.endpointStructureStorage.get("nextEndpointId", this.nextEndpointId);
 
@@ -587,13 +581,27 @@ export class CommissioningServer extends MatterNode {
                 }
             },
             (fabricIndex: FabricIndex) => this.options.activeSessionsChangedCallback?.(fabricIndex),
-            { maxPathsPerInvoke: this.interactionServer.maxPathsPerInvoke },
+            { maxPathsPerInvoke: maxPathsPerInvoke },
         );
         deviceInstance.addTransportInterface(
             await UdpInterface.create(Network.get(), "udp6", this.port, this.options.listeningAddressIpv6),
         );
-        deviceInstance.addScanner(this.mdnsScanner);
+
+        this.interactionServer = new LegacyInteractionServer({
+            sessions: deviceInstance.sessionManager,
+            structure: this.endpointStructure,
+            subscriptionOptions: {
+                maxIntervalSeconds: this.options.subscriptionMaxIntervalSeconds,
+                minIntervalSeconds: this.options.subscriptionMinIntervalSeconds,
+                randomizationWindowSeconds: this.options.subscriptionRandomizationWindowSeconds,
+            },
+            maxPathsPerInvoke,
+            initiateExchange: (address, protocolId) => {
+                return deviceInstance.initiateExchange(address, protocolId);
+            },
+        });
         deviceInstance.addProtocolHandler(this.interactionServer);
+
         this.deviceInstance = deviceInstance;
         if (!this.ipv4Disabled) {
             deviceInstance.addTransportInterface(
@@ -985,16 +993,19 @@ class CommissioningServerClusterDatasource implements ClusterDatasource<SyncStor
     #clusterDescription: string;
     #storage: StorageContext<SyncStorage>;
     #eventHandler: EventHandler;
+    #getFabrics: () => Fabric[];
 
     constructor(
         endpoint: EndpointInterface,
         cluster: ClusterServerObj,
         storage: StorageContext<SyncStorage>,
         eventHandler: EventHandler<SyncStorage>,
+        getFabrics: () => Fabric[],
     ) {
         this.#eventHandler = eventHandler;
         this.#clusterDescription = `cluster ${cluster.name} (${cluster.id})`;
         this.#storage = storage = storage.createContext(`Cluster-${endpoint.number}-${cluster.id}`);
+        this.#getFabrics = getFabrics;
 
         this.#version = cluster.datasource?.version ?? Crypto.getRandomUInt32();
 
@@ -1029,6 +1040,10 @@ class CommissioningServerClusterDatasource implements ClusterDatasource<SyncStor
         return this.#eventHandler;
     }
 
+    get fabrics() {
+        return this.#getFabrics();
+    }
+
     increaseVersion(): number {
         if (this.#version === 0xffffffff) {
             this.#version = -1;