@matter/protocol 0.16.0-alpha.0-20251027-17770fb28 → 0.16.0-alpha.0-20251030-e9ca79f93

package/src/interaction/InteractionClient.ts

@@ -92,6 +92,7 @@ export interface AttributeStatus {
 export class InteractionClientProvider {
     readonly #peers: PeerSet;
     readonly #clients = new PeerAddressMap<InteractionClient>();
+    readonly #subscriptionClient = new SubscriptionClient();
 
     constructor(peers: PeerSet) {
         this.#peers = peers;
@@ -109,6 +110,10 @@ export class InteractionClientProvider {
         return this.#peers;
     }
 
+    get subscriptionClient() {
+        return this.#subscriptionClient;
+    }
+
     async connect(
         address: PeerAddress,
         options: PeerConnectionOptions & {
@@ -126,7 +131,7 @@ export class InteractionClientProvider {
 
         return new InteractionClient(
             exchangeProvider,
-            this.#peers.subscriptionClient,
+            this.#subscriptionClient,
             undefined,
             this.#peers.interactionQueue,
         );
@@ -146,7 +151,7 @@ export class InteractionClientProvider {
 
         client = new InteractionClient(
             exchangeProvider,
-            this.#peers.subscriptionClient,
+            this.#subscriptionClient,
             address,
             this.#peers.interactionQueue,
             nodeStore,
@@ -169,14 +174,21 @@ export class InteractionClient {
     readonly #exchangeProvider: ExchangeProvider;
     readonly #nodeStore?: PeerDataStore;
     readonly #ownSubscriptionIds = new Set<number>();
-    readonly #subscriptionClient: SubscriptionClient;
     readonly #queue?: PromiseQueue;
     readonly #address?: PeerAddress;
     readonly isGroupAddress: boolean;
 
+    // TODO - SubscriptionClient is used by CommissioningController but not ClientNode.  However InteractionClient *is*
+    // used by ClientNode to perform commissioning, during which time SubscriptionClient is unnecessary. So this should
+    // be set after commissioning
+    //
+    // If we remove CommissioningController then this entire class goes away; if we first move commissioning to
+    // ClientInteraction then this should become required
+    readonly #subscriptionClient?: SubscriptionClient;
+
     constructor(
         exchangeProvider: ExchangeProvider,
-        subscriptionClient: SubscriptionClient,
+        subscriptionClient?: SubscriptionClient,
         address?: PeerAddress,
         queue?: PromiseQueue,
         nodeStore?: PeerDataStore,
@@ -214,7 +226,7 @@ export class InteractionClient {
 
     removeSubscription(subscriptionId: number) {
         this.#ownSubscriptionIds.delete(subscriptionId);
-        this.#subscriptionClient.delete(subscriptionId);
+        this.#subscriptionClient?.delete(subscriptionId);
     }
 
     async getAllAttributes(
@@ -892,7 +904,7 @@ export class InteractionClient {
 
     async #registerSubscription(subscription: RegisteredSubscription, initialReport: DecodedDataReport) {
         this.#ownSubscriptionIds.add(subscription.id);
-        this.#subscriptionClient.add(subscription);
+        this.#subscriptionClient?.add(subscription);
         await subscription.onData(initialReport);
     }
 

package/src/peer/ControllerCommissioner.ts

@@ -467,7 +467,7 @@ export class ControllerCommissioner {
             // Use the created secure session to do the commissioning
             new InteractionClient(
                 new DedicatedChannelExchangeProvider(this.#context.exchanges, paseSecureMessageChannel),
-                this.#context.clients.peers.subscriptionClient,
+                undefined,
                 address,
             ),
             this.#context.ca,

package/src/peer/PeerSet.ts

@@ -32,7 +32,6 @@ import {
     Time,
     Timer,
 } from "#general";
-import { SubscriptionClient } from "#interaction/SubscriptionClient.js";
 import { MdnsClient } from "#mdns/MdnsClient.js";
 import { PeerAddress, PeerAddressMap } from "#peer/PeerAddress.js";
 import { ChannelManager } from "#protocol/ChannelManager.js";
@@ -107,7 +106,6 @@ export interface PeerSetContext {
     sessions: SessionManager;
     channels: ChannelManager;
     exchanges: ExchangeManager;
-    subscriptionClient: SubscriptionClient;
     scanners: ScannerSet;
     transports: ConnectionlessTransportSet;
     store: PeerAddressStore;
@@ -120,7 +118,6 @@ export class PeerSet implements ImmutableSet<OperationalPeer>, ObservableSet<Ope
     readonly #sessions: SessionManager;
     readonly #channels: ChannelManager;
     readonly #exchanges: ExchangeManager;
-    readonly #subscriptionClient: SubscriptionClient;
     readonly #scanners: ScannerSet;
     readonly #transports: ConnectionlessTransportSet;
     readonly #caseClient: CaseClient;
@@ -138,20 +135,11 @@ export class PeerSet implements ImmutableSet<OperationalPeer>, ObservableSet<Ope
     readonly #disconnected = AsyncObservable<[address: PeerAddress]>();
 
     constructor(context: PeerSetContext) {
-        const {
-            sessions,
-            channels,
-            exchanges,
-            subscriptionClient,
-            scanners,
-            transports: netInterfaces,
-            store,
-        } = context;
+        const { sessions, channels, exchanges, scanners, transports: netInterfaces, store } = context;
 
         this.#sessions = sessions;
         this.#channels = channels;
         this.#exchanges = exchanges;
-        this.#subscriptionClient = subscriptionClient;
         this.#scanners = scanners;
         this.#transports = netInterfaces;
         this.#store = store;
@@ -197,6 +185,10 @@ export class PeerSet implements ImmutableSet<OperationalPeer>, ObservableSet<Ope
         return this.#peers.deleted;
     }
 
+    get empty() {
+        return this.#peers.empty;
+    }
+
     get disconnected() {
         return this.#disconnected;
     }
@@ -237,7 +229,6 @@ export class PeerSet implements ImmutableSet<OperationalPeer>, ObservableSet<Ope
             sessions: env.get(SessionManager),
             channels: env.get(ChannelManager),
             exchanges: env.get(ExchangeManager),
-            subscriptionClient: env.get(SubscriptionClient),
             scanners: env.get(ScannerSet),
             transports: env.get(ConnectionlessTransportSet),
             store: env.get(PeerAddressStore),
@@ -250,10 +241,6 @@ export class PeerSet implements ImmutableSet<OperationalPeer>, ObservableSet<Ope
         return this.#peers;
     }
 
-    get subscriptionClient() {
-        return this.#subscriptionClient;
-    }
-
     get interactionQueue() {
         return this.#interactionQueue;
     }

package/src/protocol/ExchangeManager.ts

@@ -10,8 +10,8 @@ import {
     Channel,
     ConnectionlessTransport,
     ConnectionlessTransportSet,
-    Crypto,
     Diagnostic,
+    Entropy,
     Environment,
     Environmental,
     ImplementationError,
@@ -48,7 +48,7 @@ const MAXIMUM_CONCURRENT_EXCHANGES_PER_SESSION = 5;
  * Interfaces {@link ExchangeManager} with other components.
  */
 export interface ExchangeManagerContext {
-    crypto: Crypto;
+    entropy: Entropy;
     netInterface: ConnectionlessTransportSet;
     sessionManager: SessionManager;
     channelManager: ChannelManager;
@@ -70,7 +70,7 @@ export class ExchangeManager {
         this.#transports = context.netInterface;
         this.#sessionManager = context.sessionManager;
         this.#channelManager = context.channelManager;
-        this.#exchangeCounter = new ExchangeCounter(context.crypto);
+        this.#exchangeCounter = new ExchangeCounter(context.entropy);
 
         for (const netInterface of this.#transports) {
             this.#addListener(netInterface);
@@ -89,7 +89,7 @@ export class ExchangeManager {
 
     static [Environmental.create](env: Environment) {
         const instance = new ExchangeManager({
-            crypto: env.get(Crypto),
+            entropy: env.get(Entropy),
             netInterface: env.get(ConnectionlessTransportSet),
             sessionManager: env.get(SessionManager),
             channelManager: env.get(ChannelManager),
@@ -480,8 +480,8 @@ export class ExchangeManager {
 export class ExchangeCounter {
     #exchangeCounter: number;
 
-    constructor(crypto: Crypto) {
-        this.#exchangeCounter = crypto.randomUint16;
+    constructor(entropy: Entropy) {
+        this.#exchangeCounter = entropy.randomUint16;
     }
 
     getIncrementedCounter() {