@matter/node 0.16.0-alpha.0-20251210-206ca2db7 → 0.16.0-alpha.0-20251211-0f80042cf

package/src/node/client/ClientStructure.ts

@@ -11,7 +11,7 @@ import { Descriptor } from "#clusters/descriptor";
 import { Endpoint } from "#endpoint/Endpoint.js";
 import { EndpointType } from "#endpoint/type/EndpointType.js";
 import { RootEndpoint } from "#endpoints/root";
-import { Diagnostic, InternalError, isDeepEqual, Logger } from "#general";
+import { Diagnostic, InternalError, isDeepEqual, Logger, Observable } from "#general";
 import {
     AcceptedCommandList,
     AttributeList,
@@ -25,8 +25,8 @@ import {
 import type { ClientNode } from "#node/ClientNode.js";
 import type { Node } from "#node/Node.js";
 import { ReadScope, type Read, type ReadResult } from "#protocol";
+import { ClientNodeStore } from "#storage/client/ClientNodeStore.js";
 import { DatasourceCache } from "#storage/client/DatasourceCache.js";
-import { ClientNodeStore } from "#storage/index.js";
 import type { AttributeId, ClusterId, ClusterType, CommandId, EndpointNumber } from "#types";
 import { Status } from "#types";
 import { ClientEventEmitter } from "./ClientEventEmitter.js";
@@ -52,6 +52,7 @@ export class ClientStructure {
     #pendingStructureEvents = Array<PendingEvent>();
     #delayedClusterEvents = new Array<ReadResult.EventValue>();
     #events: ClientStructureEvents;
+    #changed = Observable<[void]>();
 
     constructor(node: ClientNode) {
         this.#node = node;
@@ -64,6 +65,10 @@ export class ClientStructure {
         this.#events = this.#node.env.get(ClientStructureEvents);
     }
 
+    get changed() {
+        return this.#changed;
+    }
+
     /**
      * Load initial structure from cache.
      */
@@ -175,14 +180,16 @@ export class ClientStructure {
         // Apply changes
         const scope = ReadScope(request);
         for await (const chunk of changes) {
+            const chunkData = new Array<ReadResult.Report>();
             for (const change of chunk) {
+                chunkData.push(change);
                 switch (change.kind) {
                     case "attr-value":
                         currentUpdates = await this.#mutateAttribute(change, scope, currentUpdates);
                         break;
 
                     case "event-value":
-                        this.#emitEvent(change, currentUpdates);
+                        await this.#emitEvent(change, currentUpdates);
                         break;
 
                     case "attr-status":
@@ -197,7 +204,7 @@ export class ClientStructure {
                 }
             }
 
-            yield chunk;
+            yield chunkData;
         }
 
         // The last cluster still needs its changes applied
@@ -226,6 +233,7 @@ export class ClientStructure {
 
         // Likewise, we don't emit events until we've applied all structural changes
         this.#emitPendingStructureEvents();
+        await this.#emitPendingEvents();
     }
 
     /** Reference to the default subscription used when the node was started. */
@@ -280,7 +288,7 @@ export class ClientStructure {
         return currentUpdates;
     }
 
-    #emitEvent(occurrence: ReadResult.EventValue, currentUpdates?: AttributeUpdates) {
+    async #emitEvent(occurrence: ReadResult.EventValue, currentUpdates?: AttributeUpdates) {
         const { endpointId, clusterId } = occurrence.path;
 
         const endpoint = this.#endpoints.get(endpointId);
@@ -291,7 +299,7 @@ export class ClientStructure {
         ) {
             this.#delayedClusterEvents.push(occurrence);
         } else {
-            this.#eventEmitter(occurrence);
+            await this.#eventEmitter(occurrence);
         }
     }
 
@@ -628,7 +636,7 @@ export class ClientStructure {
     /**
      * Replace clusters after activation because fixed global attributes have changed.
      *
-     * Currently we apply granular updates to clusters.  This will possibly result in subtle errors if peers change in
+     * Currently, we apply granular updates to clusters.  This will possibly result in subtle errors if peers change in
      * incompatible ways, but the backings are designed to be fairly resilient to this.  This is simpler for API users
      * to deal with in the common case where they can just ignore. If it becomes problematic we can revert to replacing
      * entire endpoints or behaviors when there are structural changes.
@@ -742,8 +750,6 @@ export class ClientStructure {
      */
     #emitPendingStructureEvents() {
         const structureEvents = this.#pendingStructureEvents;
-        const clusterEvents = this.#delayedClusterEvents;
-        this.#delayedClusterEvents = [];
         this.#pendingStructureEvents = [];
         for (const event of structureEvents) {
             switch (event.kind) {
@@ -789,8 +795,14 @@ export class ClientStructure {
                 }
             }
         }
+        this.#changed.emit();
+    }
+
+    async #emitPendingEvents() {
+        const clusterEvents = this.#delayedClusterEvents;
+        this.#delayedClusterEvents = [];
         for (const occurrence of clusterEvents) {
-            this.#eventEmitter(occurrence);
+            await this.#eventEmitter(occurrence);
         }
     }
 }

package/src/node/client/NodePeerAddressStore.ts

@@ -5,12 +5,12 @@
  */
 
 import { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
+import { Crypto, ServerAddress, ServerAddressUdp } from "#general";
 import type { ClientNode } from "#node/ClientNode.js";
 import { IdentityService } from "#node/server/IdentityService.js";
 import type { ServerNode } from "#node/ServerNode.js";
 import { PeerAddress, PeerAddressMap, PeerAddressStore, PeerDescriptor } from "#protocol";
 import { FabricIndex, NodeId } from "#types";
-import { Crypto, ServerAddress, ServerAddressUdp } from "@matter/general";
 
 /**
  * This is an adapter for lower-level components in the protocol package.
@@ -74,17 +74,20 @@ export class NodePeerAddressStore extends PeerAddressStore {
 
     async updatePeer(peer: PeerDescriptor) {
         const node = this.#owner.peers.get(peer.address);
-        if (!node) {
+        if (!node || !node.lifecycle.isInstalled) {
             return;
         }
 
-        await node.act(agent => {
+        await node.act(async agent => {
+            await agent.context.transaction.addResources(agent.commissioning);
+            await agent.context.transaction.begin();
             const state = agent.commissioning.state;
             RemoteDescriptor.toLongForm(peer.discoveryData, state);
             if (peer.operationalAddress) {
                 // TODO - modify lower tiers to pass along full set of operational addresses
                 state.addresses = [peer.operationalAddress];
             }
+            await agent.context.transaction.commit();
         });
     }
 

package/src/node/client/PeerBehavior.ts

@@ -25,6 +25,7 @@ import {
     ClusterComposer,
     ClusterId,
     ClusterRegistry,
+    ClusterType,
     Command,
     CommandId,
     MutableCluster,
@@ -103,12 +104,10 @@ function instrumentDiscoveredShape(shape: PeerBehavior.DiscoveredClusterShape) {
         return type;
     }
 
-    let baseType: Behavior.Type;
+    let baseType: Behavior.Type | undefined;
     const standardCluster = ClusterRegistry.get(shape.id);
-    if (standardCluster) {
+    if (standardCluster && !standardCluster.name.startsWith("Unknown cluster 0x")) {
         baseType = ClusterBehavior.for(standardCluster);
-    } else {
-        baseType = ClusterBehavior;
     }
 
     type = discoveredCache[fingerprint] = generateDiscoveredType(analysis, baseType);
@@ -138,22 +137,31 @@ function instrumentKnownShape(shape: PeerBehavior.KnownClusterShape) {
     return type;
 }
 
-function generateDiscoveredType(analysis: DiscoveredShapeAnalysis, baseType: Behavior.Type): ClusterBehavior.Type {
-    // Ensure the input type is a ClusterBehavior
-    if (!ClusterBehavior.is(baseType)) {
-        throw new InternalError(`Base for cluster ${analysis.schema.name} is not a ClusterBehavior`);
-    }
-
+function generateDiscoveredType(analysis: DiscoveredShapeAnalysis, baseType?: Behavior.Type): ClusterBehavior.Type {
     let { schema } = analysis;
-    let isExtended = false;
-    const { attrSupportOverrides, extraAttrs, commandSupportOverrides, extraCommands } = analysis;
 
-    // Obtain a ClusterType.  This provides TLV for known elements
-    let { cluster } = baseType;
-    if (!cluster) {
+    let isExtended: boolean;
+    let cluster: ClusterType;
+
+    if (baseType) {
+        isExtended = false;
+
+        // Ensure the input type is a ClusterBehavior
+        if (!ClusterBehavior.is(baseType)) {
+            throw new InternalError(`Base for cluster ${analysis.schema.name} is not a ClusterBehavior`);
+        }
+
+        cluster = baseType.cluster;
+    } else {
+        isExtended = true;
+
         cluster = MutableCluster({ id: schema.id, name: schema.name, revision: schema.revision });
+
+        baseType = ClusterBehavior;
     }
 
+    const { attrSupportOverrides, extraAttrs, commandSupportOverrides, extraCommands } = analysis;
+
     // Identify known features the device supports
     let supportedFeatures = analysis.shape.features;
     if (typeof supportedFeatures === "number") {

package/src/node/server/InteractionServer.ts

@@ -449,6 +449,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
         if (fabric !== undefined && !keepSubscriptions) {
             let clearedCount = 0;
             for (const sess of this.#context.sessions.sessions) {
+                // TODO Adjust this filtering when subscriptions move to Peer
                 if (!PeerAddress.is(sess.peerAddress, session.peerAddress)) {
                     // Ignore subscriptions from other peers
                     continue;