@matter/node 0.16.0-alpha.0-20251207-37e501b18 → 0.16.0-alpha.0-20251210-206ca2db7

package/dist/esm/node/server/ServerEndpointInitializer.d.ts

@@ -6,8 +6,9 @@
 import { Behavior } from "#behavior/Behavior.js";
 import { BehaviorBacking } from "#behavior/internal/BehaviorBacking.js";
 import { Endpoint } from "#endpoint/Endpoint.js";
+import type { Agent } from "#endpoint/index.js";
 import { EndpointInitializer } from "#endpoint/properties/EndpointInitializer.js";
-import { Environment } from "#general";
+import { Environment, MaybePromise } from "#general";
 export declare class ServerEndpointInitializer extends EndpointInitializer {
     #private;
     constructor(environment: Environment);
@@ -21,5 +22,6 @@ export declare class ServerEndpointInitializer extends EndpointInitializer {
      * initializes.
      */
     createBacking(endpoint: Endpoint, type: Behavior.Type): BehaviorBacking;
+    behaviorsInitialized(agent: Agent): MaybePromise;
 }
 //# sourceMappingURL=ServerEndpointInitializer.d.ts.map

package/dist/esm/node/server/ServerEndpointInitializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerEndpointInitializer.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEndpointInitializer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,WAAW,EAAyB,MAAM,UAAU,CAAC;AAM9D,qBAAa,yBAA0B,SAAQ,mBAAmB;;gBAGlD,WAAW,EAAE,WAAW;IAK3B,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAa1C,eAAe,CAAC,QAAQ,EAAE,QAAQ;IAQlC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAQ7C;;;;;OAKG;IACH,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,eAAe;CA+C1E"}
+{"version":3,"file":"ServerEndpointInitializer.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEndpointInitializer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,WAAW,EAAyB,YAAY,EAAE,MAAM,UAAU,CAAC;AAO5E,qBAAa,yBAA0B,SAAQ,mBAAmB;;gBAGlD,WAAW,EAAE,WAAW;IAK3B,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAa1C,eAAe,CAAC,QAAQ,EAAE,QAAQ;IAQlC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAQ7C;;;;;OAKG;IACH,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,eAAe;IAgD9D,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,YAAY;CAS5D"}

package/dist/esm/node/server/ServerEndpointInitializer.js

@@ -3,10 +3,12 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { limitEndpointAttributeDataToAllowedFabrics } from "#behavior/cluster/FabricScopedDataHandler.js";
 import { ServerBehaviorBacking } from "#behavior/internal/ServerBehaviorBacking.js";
 import { Endpoint } from "#endpoint/Endpoint.js";
 import { EndpointInitializer } from "#endpoint/properties/EndpointInitializer.js";
 import { InternalError, Logger } from "#general";
+import { FabricManager } from "#protocol";
 import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
 import { DescriptorServer } from "../../behaviors/descriptor/DescriptorServer.js";
 const logger = Logger.get("BehaviorInit");
@@ -80,6 +82,14 @@ class ServerEndpointInitializer extends EndpointInitializer {
     logger.warn(`Using fallback ID of ${id} for child of ${endpoint.owner}; assign ID to remove this warning`);
     return id;
   }
+  behaviorsInitialized(agent) {
+    if (agent.env.has(FabricManager)) {
+      const fabricIndices = agent.env.get(FabricManager).fabrics.map((fabric) => fabric.fabricIndex);
+      if (fabricIndices.length > 0) {
+        return limitEndpointAttributeDataToAllowedFabrics(agent.endpoint, fabricIndices);
+      }
+    }
+  }
 }
 export {
   ServerEndpointInitializer

package/dist/esm/node/server/ServerEndpointInitializer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/server/ServerEndpointInitializer.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,6BAA6B;AACtC,SAAS,gBAAgB;AACzB,SAAS,2BAA2B;AACpC,SAAsB,eAAe,cAAc;AACnD,SAAS,uBAAuB;AAChC,SAAS,wBAAwB;AAEjC,MAAM,SAAS,OAAO,IAAI,cAAc;AAEjC,MAAM,kCAAkC,oBAAoB;AAAA,EAC/D;AAAA,EAEA,YAAY,aAA0B;AAClC,UAAM;AACN,SAAK,SAAS,YAAY,IAAI,eAAe;AAAA,EACjD;AAAA,EAES,qBAAqB,UAAoB;AAC9C,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B,eAAS,KAAK,KAAK,cAAc,QAAQ;AAAA,IAC7C;AAEA,SAAK,OAAO,eAAe,aAAa,QAAQ;AAGhD,QAAI,EAAE,iBAAiB,MAAM,SAAS,UAAU,YAAY;AACxD,eAAS,UAAU,OAAO,kBAAkB,QAAW,KAAK;AAAA,IAChE;AAAA,EACJ;AAAA,EAEA,MAAM,gBAAgB,UAAoB;AACtC,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B;AAAA,IACJ;AAEA,UAAM,KAAK,OAAO,eAAe,sBAAsB,QAAQ;AAAA,EACnE;AAAA,EAEA,MAAM,qBAAqB,UAAoB;AAC3C,QAAI,CAAC,SAAS,UAAU,SAAS,SAAS,WAAW,GAAG;AACpD;AAAA,IACJ;AAEA,SAAK,OAAO,eAAe,2BAA2B,QAAQ;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,cAAc,UAAoB,MAAsC;AACpE,UAAM,QAAQ,KAAK,OAAO,iBAAiB,QAAQ,EAAE,uBAAuB,KAAK,EAAE;AAEnF,WAAO,IAAI,sBAAsB,UAAU,MAAM,OAAO,SAAS,UAAU,WAAW,IAAI,CAAC;AAAA,EAC/F;AAAA;AAAA;AAAA;AAAA,EAKA,cAAc,UAAoB;AAC9B,UAAM,YACF,SAAS,UAAU,UAAU,oBAAoB,SAAS,UAAU,UAAU;AAClF,QAAI,WAAW;AACX,YAAM,WAAW;AAAA,QACb,GAAG,IAAI,UAAU,MAAM;AAAA,QACvB,GAAG,SAAS,UAAU,YAAY,SAAS;AAAA,MAC/C;AAEA,UAAIA,MAAM,SAAoC;AAC9C,UAAIA,KAAI;AACJ,eAAOA;AAAA,MACX;AAEA,MAAAA,MAAM,SAAoC;AAC1C,UAAIA,KAAI;AACJ,eAAOA;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,EAAE,SAAS,iBAAiB,WAAW;AACvC,YAAM,IAAI,cAAc,2DAA2D;AAAA,IACvF;AACA,QAAI,CAAC,SAAS,MAAM,UAAU,OAAO;AACjC,YAAM,IAAI,cAAc,2DAA2D;AAAA,IACvF;AAEA,UAAM,QAAQ,SAAS,MAAM,MAAM,QAAQ,QAAQ;AACnD,QAAI,UAAU,IAAI;AACd,YAAM,IAAI,cAAc,wEAAwE;AAAA,IACpG;AAGA,UAAM,KAAK,OAAO,KAAK;AACvB,WAAO,KAAK,wBAAwB,EAAE,iBAAiB,SAAS,KAAK,oCAAoC;AAEzG,WAAO;AAAA,EACX;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,kDAAkD;AAE3D,SAAS,6BAA6B;AACtC,SAAS,gBAAgB;AAEzB,SAAS,2BAA2B;AACpC,SAAsB,eAAe,cAA4B;AACjE,SAAS,qBAAqB;AAC9B,SAAS,uBAAuB;AAChC,SAAS,wBAAwB;AAEjC,MAAM,SAAS,OAAO,IAAI,cAAc;AAEjC,MAAM,kCAAkC,oBAAoB;AAAA,EAC/D;AAAA,EAEA,YAAY,aAA0B;AAClC,UAAM;AACN,SAAK,SAAS,YAAY,IAAI,eAAe;AAAA,EACjD;AAAA,EAES,qBAAqB,UAAoB;AAC9C,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B,eAAS,KAAK,KAAK,cAAc,QAAQ;AAAA,IAC7C;AAEA,SAAK,OAAO,eAAe,aAAa,QAAQ;AAGhD,QAAI,EAAE,iBAAiB,MAAM,SAAS,UAAU,YAAY;AACxD,eAAS,UAAU,OAAO,kBAAkB,QAAW,KAAK;AAAA,IAChE;AAAA,EACJ;AAAA,EAEA,MAAM,gBAAgB,UAAoB;AACtC,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B;AAAA,IACJ;AAEA,UAAM,KAAK,OAAO,eAAe,sBAAsB,QAAQ;AAAA,EACnE;AAAA,EAEA,MAAM,qBAAqB,UAAoB;AAC3C,QAAI,CAAC,SAAS,UAAU,SAAS,SAAS,WAAW,GAAG;AACpD;AAAA,IACJ;AAEA,SAAK,OAAO,eAAe,2BAA2B,QAAQ;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,cAAc,UAAoB,MAAsC;AACpE,UAAM,QAAQ,KAAK,OAAO,iBAAiB,QAAQ,EAAE,uBAAuB,KAAK,EAAE;AAEnF,WAAO,IAAI,sBAAsB,UAAU,MAAM,OAAO,SAAS,UAAU,WAAW,IAAI,CAAC;AAAA,EAC/F;AAAA;AAAA;AAAA;AAAA,EAKA,cAAc,UAAoB;AAC9B,UAAM,YACF,SAAS,UAAU,UAAU,oBAAoB,SAAS,UAAU,UAAU;AAClF,QAAI,WAAW;AACX,YAAM,WAAW;AAAA,QACb,GAAG,IAAI,UAAU,MAAM;AAAA,QACvB,GAAG,SAAS,UAAU,YAAY,SAAS;AAAA,MAC/C;AAEA,UAAIA,MAAM,SAAoC;AAC9C,UAAIA,KAAI;AACJ,eAAOA;AAAA,MACX;AAEA,MAAAA,MAAM,SAAoC;AAC1C,UAAIA,KAAI;AACJ,eAAOA;AAAA,MACX;AAAA,IACJ;AAEA,QAAI,EAAE,SAAS,iBAAiB,WAAW;AACvC,YAAM,IAAI,cAAc,2DAA2D;AAAA,IACvF;AACA,QAAI,CAAC,SAAS,MAAM,UAAU,OAAO;AACjC,YAAM,IAAI,cAAc,2DAA2D;AAAA,IACvF;AAEA,UAAM,QAAQ,SAAS,MAAM,MAAM,QAAQ,QAAQ;AACnD,QAAI,UAAU,IAAI;AACd,YAAM,IAAI,cAAc,wEAAwE;AAAA,IACpG;AAGA,UAAM,KAAK,OAAO,KAAK;AACvB,WAAO,KAAK,wBAAwB,EAAE,iBAAiB,SAAS,KAAK,oCAAoC;AAEzG,WAAO;AAAA,EACX;AAAA,EAES,qBAAqB,OAA4B;AAEtD,QAAI,MAAM,IAAI,IAAI,aAAa,GAAG;AAC9B,YAAM,gBAAgB,MAAM,IAAI,IAAI,aAAa,EAAE,QAAQ,IAAI,YAAU,OAAO,WAAW;AAC3F,UAAI,cAAc,SAAS,GAAG;AAC1B,eAAO,2CAA2C,MAAM,UAAU,aAAa;AAAA,MACnF;AAAA,IACJ;AAAA,EACJ;AACJ;",
   "names": ["id"]
 }

package/dist/esm/node/server/ServerSubscription.d.ts

@@ -116,7 +116,7 @@ export declare class ServerSubscription implements Subscription {
             dataVersion: import("#types").FieldType<number>;
         }>[]>;
         interactionModelRevision: import("#types").FieldType<number>;
-    }>, "keepSubscriptions" | "interactionModelRevision">;
+    }>, "interactionModelRevision" | "keepSubscriptions">;
     get cancelled(): AsyncObservable<[subscription: Subscription], void>;
     get maxInterval(): Duration;
     get sendInterval(): Duration;

package/dist/esm/node/server/ServerSubscription.js

@@ -1,4 +1,4 @@
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __typeError = (msg) => {
   throw TypeError(msg);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/node",
-    "version": "0.16.0-alpha.0-20251207-37e501b18",
+    "version": "0.16.0-alpha.0-20251210-206ca2db7",
     "description": "API for building Matter nodes",
     "keywords": [
         "iot",
@@ -42,14 +42,14 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.16.0-alpha.0-20251207-37e501b18",
-        "@matter/model": "0.16.0-alpha.0-20251207-37e501b18",
-        "@matter/types": "0.16.0-alpha.0-20251207-37e501b18",
-        "@matter/protocol": "0.16.0-alpha.0-20251207-37e501b18"
+        "@matter/general": "0.16.0-alpha.0-20251210-206ca2db7",
+        "@matter/model": "0.16.0-alpha.0-20251210-206ca2db7",
+        "@matter/types": "0.16.0-alpha.0-20251210-206ca2db7",
+        "@matter/protocol": "0.16.0-alpha.0-20251210-206ca2db7"
     },
     "devDependencies": {
-        "@matter/tools": "0.16.0-alpha.0-20251207-37e501b18",
-        "@matter/testing": "0.16.0-alpha.0-20251207-37e501b18"
+        "@matter/tools": "0.16.0-alpha.0-20251210-206ca2db7",
+        "@matter/testing": "0.16.0-alpha.0-20251210-206ca2db7"
     },
     "files": [
         "dist/**/*",

package/src/behavior/system/commissioning/CommissioningClient.ts

@@ -7,11 +7,14 @@
 import { Behavior } from "#behavior/Behavior.js";
 import { Events as BaseEvents } from "#behavior/Events.js";
 import { OperationalCredentialsClient } from "#behaviors/operational-credentials";
+import { OperationalCredentials } from "#clusters/operational-credentials";
 import {
+    ClassExtends,
     Diagnostic,
     Duration,
     ImplementationError,
     Logger,
+    MatterError,
     NotImplementedError,
     Observable,
     ServerAddress,
@@ -40,6 +43,7 @@ import { IdentityService } from "#node/server/IdentityService.js";
 import {
     CommissioningMode,
     ControllerCommissioner,
+    ControllerCommissioningFlow,
     DiscoveryData,
     Fabric,
     FabricAuthority,
@@ -113,7 +117,7 @@ export class CommissioningClient extends Behavior {
 
         // Validate passcode
         let { passcode } = opts;
-        if (typeof passcode !== "number" || !Number.isFinite(passcode)) {
+        if (!Number.isFinite(passcode)) {
             passcode = Number.parseInt(passcode as unknown as string);
             if (!Number.isFinite(passcode)) {
                 throw new ImplementationError(`You must provide the numeric passcode to commission a node`);
@@ -162,6 +166,7 @@ export class CommissioningClient extends Behavior {
             nodeId: address.nodeId,
             passcode,
             discoveryData: this.descriptor,
+            commissioningFlowImpl: options.commissioningFlowImpl,
         };
 
         if (this.finalizeCommissioning !== CommissioningClient.prototype.finalizeCommissioning) {
@@ -217,7 +222,16 @@ export class CommissioningClient extends Behavior {
 
         const opcreds = this.agent.get(OperationalCredentialsClient);
 
-        await opcreds.removeFabric({ fabricIndex: opcreds.state.currentFabricIndex });
+        const fabricIndex = opcreds.state.currentFabricIndex;
+        logger.debug(`Removing node ${peerAddress.toString()} by removing fabric ${fabricIndex} on the node`);
+
+        const result = await opcreds.removeFabric({ fabricIndex });
+
+        if (result.statusCode !== OperationalCredentials.NodeOperationalCertStatus.Ok) {
+            throw new MatterError(
+                `Removing node ${peerAddress.toString()} failed with status ${result.statusCode} "${result.debugText}".`,
+            );
+        }
 
         this.state.peerAddress = undefined;
 
@@ -486,6 +500,11 @@ export namespace CommissioningClient {
          */
         fabricAuthority?: FabricAuthority;
 
+        /**
+         * Custom commissioning flow implementation to use instead of the default.
+         */
+        commissioningFlowImpl?: ClassExtends<ControllerCommissioningFlow>;
+
         /**
          * Discovery capabilities to use for discovery. These are included in the QR code normally and defined if BLE
          * is supported for initial commissioning.

package/src/behavior/system/commissioning/CommissioningServer.ts

@@ -98,8 +98,6 @@ export class CommissioningServer extends Behavior {
         this.reactTo((this.endpoint as Node).lifecycle.online, this.#enterOnlineMode);
 
         this.reactTo((this.endpoint as Node).lifecycle.goingOffline, this.#enterOfflineMode);
-
-        this.reactTo(this.env.get(FabricManager).events.added, this.enterOperationalMode);
     }
 
     override async [Symbol.asyncDispose]() {
@@ -203,6 +201,8 @@ export class CommissioningServer extends Behavior {
     }
 
     async #enterOnlineMode() {
+        this.reactTo(this.env.get(FabricManager).events.added, this.enterOperationalMode);
+
         // If already commissioned, trigger operational announcement
         if ((this.endpoint.lifecycle as NodeLifecycle).isCommissioned) {
             // Restore subscriptions if we have some persisted

package/src/behavior/system/commissioning/RemoteDescriptor.ts

@@ -148,9 +148,9 @@ export namespace RemoteDescriptor {
         return result;
     }
 
-    export function toLongForm(descriptor: RemoteDescriptor | undefined, long: Long) {
+    export function toLongForm(descriptor: RemoteDescriptor | undefined, long: Long = {}) {
         if (!descriptor) {
-            descriptor = {};
+            return long;
         }
 
         const { addresses, discoveredAt, ttl, deviceIdentifier, VP, DT, DN, RI, PH, PI, SII, SAI, SAT, T, ICD } =
@@ -206,5 +206,6 @@ export namespace RemoteDescriptor {
         if ("CM" in descriptor) {
             long.commissioningMode = descriptor.CM;
         }
+        return long;
     }
 }

package/src/behavior/system/commissioning/index.ts

@@ -6,3 +6,4 @@
 
 export * from "./CommissioningClient.js";
 export * from "./CommissioningServer.js";
+export * from "./RemoteDescriptor.js";

package/src/behavior/system/controller/ControllerBehavior.ts

@@ -88,7 +88,7 @@ export class ControllerBehavior extends Behavior {
 
         this.reactTo(node.lifecycle.online, this.#nodeOnline);
         if (node.lifecycle.isOnline) {
-            this.#nodeOnline();
+            await this.#nodeOnline();
         }
         this.reactTo(node.lifecycle.goingOffline, this.#nodeGoingOffline);
     }
@@ -108,7 +108,7 @@ export class ControllerBehavior extends Behavior {
         };
     }
 
-    #nodeOnline() {
+    async #nodeOnline() {
         // Configure network connections
         const netTransports = this.env.get(ConnectionlessTransportSet);
         if (this.state.ble) {
@@ -116,9 +116,12 @@ export class ControllerBehavior extends Behavior {
             netTransports.add(this.env.get(Ble).centralInterface);
         }
 
-        // Add each pre-existing fabric to discovery criteria
+        // Add each pre-existing fabric to discovery criteria and update fabric label if needed
         const authority = this.env.get(FabricAuthority);
         for (const fabric of authority.fabrics) {
+            if (fabric.label !== this.state.adminFabricLabel) {
+                await fabric.setLabel(this.state.adminFabricLabel);
+            }
             this.#enableScanningForFabric(fabric);
         }
         this.reactTo(authority.fabricAdded, this.#enableScanningForFabric);

package/src/behavior/system/network/index.ts

@@ -5,4 +5,5 @@
  */
 
 export * from "./NetworkBehavior.js";
+export * from "./NetworkClient.js";
 export * from "./NetworkServer.js";

package/src/behaviors/access-control/AccessControlServer.ts

@@ -6,7 +6,7 @@
 
 import { ActionContext } from "#behavior/context/ActionContext.js";
 import { AccessControl as AccessControlTypes } from "#clusters/access-control";
-import { Bytes, deepCopy, InternalError, Logger, MaybePromise } from "#general";
+import { Bytes, deepCopy, InternalError, Logger } from "#general";
 import { NodeLifecycle } from "#node/NodeLifecycle.js";
 import {
     AccessControl,
@@ -49,7 +49,7 @@ const logger = Logger.get("AccessControlServer");
 export class AccessControlServer extends AccessControlBehavior.with("Extension") {
     declare internal: AccessControlServer.Internal;
 
-    override initialize(): MaybePromise {
+    override initialize() {
         this.reactTo(this.events.acl$Changing, this.#validateAccessControlListChanges); // Enhanced Validation
         this.reactTo(this.events.acl$Changed, this.#handleAccessControlListChange); // Event handling for changes
         if (this.state.extension !== undefined) {

package/src/behaviors/basic-information/BasicInformationServer.ts

@@ -7,7 +7,7 @@
 import { ActionContext } from "#behavior/context/ActionContext.js";
 import { OnlineEvent } from "#behavior/Events.js";
 import { BasicInformation } from "#clusters/basic-information";
-import { Diagnostic, ImplementationError, Logger, MaybePromise } from "#general";
+import { Diagnostic, ImplementationError, Logger } from "#general";
 import { AttributeModel, EventModel, Schema, Specification } from "#model";
 import { NodeLifecycle } from "#node/NodeLifecycle.js";
 import { Fabric, FabricManager } from "#protocol";
@@ -25,7 +25,7 @@ const Base = BasicInformationBehavior.enable({
  * This is the default server implementation of BasicInformationBehavior.
  */
 export class BasicInformationServer extends Base {
-    override initialize(): MaybePromise {
+    override initialize() {
         const state = this.state;
 
         const defaultsSet = {} as Record<string, any>;
@@ -63,7 +63,6 @@ export class BasicInformationServer extends Base {
         }
 
         const lifecycle = this.endpoint.lifecycle as NodeLifecycle;
-
         this.reactTo(lifecycle.online, this.#online);
         this.reactTo(lifecycle.goingOffline, this.#goingOffline);
 

package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts

@@ -56,6 +56,7 @@ export class GeneralCommissioningServer extends GeneralCommissioningBehavior {
     /** As required by Commissioning Flows any new PASE session needs to arm the failsafe for 60s. */
     async #handleAddedPaseSessions(session: NodeSession) {
         if (
+            session.isInitiator || // Only server sessions
             !session.isPase || // Only PASE sessions
             session.fabric !== undefined // That does not have an assigned fabric (can never happen in real usecases)
         ) {

package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts

@@ -64,7 +64,7 @@ export class GeneralDiagnosticsServer extends Base {
     declare state: GeneralDiagnosticsServer.State;
     static override readonly schema = schema;
 
-    override initialize(): MaybePromise {
+    override initialize() {
         if (this.state.testEventTriggersEnabled === undefined) {
             this.state.testEventTriggersEnabled = false;
         } else if (this.state.testEventTriggersEnabled) {

package/src/behaviors/group-key-management/GroupKeyManagementServer.ts

@@ -6,7 +6,7 @@
 
 import { ActionContext } from "#behavior/context/ActionContext.js";
 import { GroupKeyManagement } from "#clusters/group-key-management";
-import { deepCopy, ImplementationError, Logger, MaybePromise } from "#general";
+import { deepCopy, ImplementationError, Logger } from "#general";
 import { DatatypeModel, FieldElement } from "#model";
 import { NodeLifecycle } from "#node/NodeLifecycle.js";
 import { assertRemoteActor, Fabric, FabricManager, hasRemoteActor, IPK_DEFAULT_EPOCH_START_TIME } from "#protocol";
@@ -47,7 +47,7 @@ export class GroupKeyManagementServer extends GroupKeyManagementBehavior {
     declare state: GroupKeyManagementServer.State;
     static override readonly schema = schema;
 
-    override initialize(): MaybePromise {
+    override initialize() {
         if (this.features.cacheAndSync) {
             throw new ImplementationError("The CacheAndSync feature is provisional. Do not use it.");
         }

package/src/endpoint/properties/Behaviors.ts

@@ -6,7 +6,6 @@
 
 import { Behavior } from "#behavior/Behavior.js";
 import type { ClusterBehavior } from "#behavior/cluster/ClusterBehavior.js";
-import { limitEndpointAttributeDataToAllowedFabrics } from "#behavior/cluster/FabricScopedDataHandler.js";
 import { ActionContext } from "#behavior/context/ActionContext.js";
 import { NodeActivity } from "#behavior/context/NodeActivity.js";
 import { LocalActorContext } from "#behavior/context/server/LocalActorContext.js";
@@ -28,7 +27,7 @@ import {
 } from "#general";
 import { FeatureSet } from "#model";
 import { ProtocolService } from "#node/integration/ProtocolService.js";
-import { ClusterTypeProtocol, FabricManager, Val } from "#protocol";
+import { ClusterTypeProtocol, Val } from "#protocol";
 import { ClusterType, VoidSchema } from "#types";
 import type { Agent } from "../Agent.js";
 import type { Endpoint } from "../Endpoint.js";
@@ -243,16 +242,6 @@ export class Behaviors {
                 promise = endpointInitializer.behaviorsInitialized(agent);
             }
 
-            if (this.#endpoint.env.has(FabricManager)) {
-                const fabricIndices = this.#endpoint.env.get(FabricManager).fabrics.map(fabric => fabric.fabricIndex);
-                if (fabricIndices.length > 0) {
-                    // Make sure the state on startup only includes allowed Fabric scoped data
-                    return MaybePromise.then(promise, () =>
-                        limitEndpointAttributeDataToAllowedFabrics(this.#endpoint, fabricIndices),
-                    );
-                }
-            }
-
             return promise;
         };
 
@@ -281,7 +270,17 @@ export class Behaviors {
     /**
      * Does the {@link Endpoint} support a specified behavior?
      */
-    has<T extends Behavior.Type>(type: T) {
+    has<T extends Behavior.Type>(type: T): boolean;
+
+    /**
+     * Does the {@link Endpoint} support a specified behavior by its behavior Id?
+     */
+    has(typeId: string): boolean;
+
+    has(type: Behavior.Type | string): boolean {
+        if (typeof type === "string") {
+            return !!this.#supported[type];
+        }
         const myType = this.#supported[type.id];
         return myType === type || myType?.supports(type);
     }
@@ -609,7 +608,18 @@ export class Behaviors {
     /**
      * Obtain current data version of behavior.
      */
-    versionOf(type: Behavior.Type) {
+    versionOf(type: Behavior.Type): number;
+
+    /**
+     * Obtain current data version of behavior by its behavior Id, if existing
+     */
+    versionOf(typeId: string): number | undefined;
+
+    versionOf(type: Behavior.Type | string) {
+        if (typeof type === "string") {
+            const backing = this.#backings[type];
+            return backing?.maybeDatasource?.version;
+        }
         const backing = this.#backingFor(type);
         return backing.datasource.version;
     }

package/src/endpoint/properties/EndpointInitializer.ts

@@ -7,6 +7,7 @@
 import type { Behavior } from "#behavior/Behavior.js";
 import type { BehaviorBacking } from "#behavior/internal/BehaviorBacking.js";
 import type { Agent } from "#endpoint/Agent.js";
+import { MaybePromise } from "#general";
 import type { Endpoint } from "../Endpoint.js";
 
 /**
@@ -40,5 +41,5 @@ export abstract class EndpointInitializer {
     /**
      * Invoked after behaviors are initialized but before the initialization transaction commits.
      */
-    behaviorsInitialized(_agent: Agent) {}
+    behaviorsInitialized(_agent: Agent): MaybePromise {}
 }

package/src/endpoint/properties/Endpoints.ts

@@ -61,14 +61,14 @@ export class Endpoints implements ImmutableSet<Endpoint> {
         return this.#list[Symbol.iterator]();
     }
 
-    for(number: number | string): Endpoint {
-        if (number === 0) {
+    for(id: number | string): Endpoint {
+        if (id === 0) {
             return this.#node;
         }
 
-        const endpoint = typeof number === "string" ? this.#idIndex[number] : this.#index[number];
+        const endpoint = typeof id === "string" ? this.#idIndex[id] : this.#index[id];
         if (endpoint === undefined) {
-            throw new StatusResponse.NotFoundError(`Endpoint ${number} does not exist`);
+            throw new StatusResponse.NotFoundError(`Endpoint ${id} does not exist`);
         }
         return endpoint;
     }

package/src/node/Node.ts

@@ -41,6 +41,7 @@ export abstract class Node<T extends Node.CommonRootEndpoint = Node.CommonRootEn
     #environment: Environment;
     #runtime?: NetworkRuntime;
     #startInProgress = false;
+    #closeInProgress = false;
 
     constructor(config: Node.Configuration<T>) {
         const parentEnvironment = config.environment ?? config.owner?.env ?? Environment.default;
@@ -183,9 +184,17 @@ export abstract class Node<T extends Node.CommonRootEndpoint = Node.CommonRootEn
     }
 
     override async close() {
-        this.lifecycle.targetState = "offline";
-        await this.lifecycle.mutex.close();
-        await this.closeWithMutex();
+        if (this.#closeInProgress) {
+            return;
+        }
+        this.#closeInProgress = true;
+        try {
+            this.lifecycle.targetState = "offline";
+            await this.lifecycle.mutex.close();
+            await this.closeWithMutex();
+        } finally {
+            this.#closeInProgress = false;
+        }
     }
 
     protected async closeWithMutex() {

package/src/node/NodePhysicalProperties.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { DescriptorClient } from "#behaviors/descriptor";
 import { NetworkCommissioningClient } from "#behaviors/network-commissioning";
 import { PowerSourceClient } from "#behaviors/power-source";
 import { ThreadNetworkDiagnosticsClient } from "#behaviors/thread-network-diagnostics";
@@ -20,7 +21,7 @@ import { ClusterId } from "#types";
  * Inspects a node to generate {@link PhysicalDeviceProperties}.
  */
 export function NodePhysicalProperties(node: Node) {
-    const rootEndpointServerList = [...node.state.descriptor.serverList];
+    const rootEndpointServerList = [...(node.maybeStateOf(DescriptorClient)?.serverList ?? [])];
 
     const properties: PhysicalDeviceProperties = {
         threadConnected: false,
@@ -58,8 +59,9 @@ function inspectEndpoint(endpoint: Endpoint, properties: PhysicalDevicePropertie
     const powerSource = endpoint.behaviors.typeFor(PowerSourceClient);
     if (powerSource) {
         const features = powerSource.schema.supportedFeatures;
+        const status = endpoint.stateOf(PowerSourceClient).status;
         if (features.has("WIRED")) {
-            if (endpoint.stateOf(PowerSourceClient).status === PowerSource.PowerSourceStatus.Active) {
+            if (status === PowerSource.PowerSourceStatus.Active) {
                 // Should we only consider A/C "mains" powered?  What is a DC adapter?  What is an external battery?
                 // For now assuming "wired" means "don't worry about power consumption"
                 properties.isMainsPowered = true;
@@ -71,9 +73,9 @@ function inspectEndpoint(endpoint: Endpoint, properties: PhysicalDevicePropertie
             endpoint.behaviors.elementsOf(powerSource).attributes.has("batChargeLevel")
         ) {
             if (
-                endpoint.stateOf(PowerSourceClient).status === PowerSource.PowerSourceStatus.Active ||
+                status === PowerSource.PowerSourceStatus.Active ||
                 // Some devices do not properly specify state as active
-                endpoint.stateOf(PowerSourceClient).status === PowerSource.PowerSourceStatus.Unspecified
+                status === PowerSource.PowerSourceStatus.Unspecified
             ) {
                 properties.isBatteryPowered = true;
             }

package/src/node/client/index.ts

@@ -5,5 +5,6 @@
  */
 
 export * from "./ClientEndpointInitializer.js";
+export * from "./ClientNodeInteraction.js";
 export * from "./NodePeerAddressStore.js";
 export * from "./Peers.js";

package/src/node/index.ts

@@ -5,6 +5,7 @@
  */
 
 export * from "./client/index.js";
+export * from "./ClientNode.js";
 export * from "./integration/index.js";
 export * from "./Node.js";
 export * from "./NodeLifecycle.js";

package/src/node/server/InteractionServer.ts

@@ -448,11 +448,15 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
 
         if (fabric !== undefined && !keepSubscriptions) {
             let clearedCount = 0;
-            for (const session of this.#context.sessions.sessions) {
-                for (const subscription of session.subscriptions) {
+            for (const sess of this.#context.sessions.sessions) {
+                if (!PeerAddress.is(sess.peerAddress, session.peerAddress)) {
+                    // Ignore subscriptions from other peers
+                    continue;
+                }
+                for (const subscription of sess.subscriptions) {
                     await subscription.handlePeerCancel();
+                    clearedCount++;
                 }
-                clearedCount++;
             }
             if (clearedCount > 0) {
                 logger.debug(

package/src/node/server/ServerEndpointInitializer.ts

@@ -5,11 +5,14 @@
  */
 
 import { Behavior } from "#behavior/Behavior.js";
+import { limitEndpointAttributeDataToAllowedFabrics } from "#behavior/cluster/FabricScopedDataHandler.js";
 import { BehaviorBacking } from "#behavior/internal/BehaviorBacking.js";
 import { ServerBehaviorBacking } from "#behavior/internal/ServerBehaviorBacking.js";
 import { Endpoint } from "#endpoint/Endpoint.js";
+import type { Agent } from "#endpoint/index.js";
 import { EndpointInitializer } from "#endpoint/properties/EndpointInitializer.js";
-import { Environment, InternalError, Logger } from "#general";
+import { Environment, InternalError, Logger, MaybePromise } from "#general";
+import { FabricManager } from "#protocol";
 import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
 import { DescriptorServer } from "../../behaviors/descriptor/DescriptorServer.js";
 
@@ -105,4 +108,14 @@ export class ServerEndpointInitializer extends EndpointInitializer {
 
         return id;
     }
+
+    override behaviorsInitialized(agent: Agent): MaybePromise {
+        // Make sure the state only includes allowed Fabric scoped data when an endpoint is added after node is online
+        if (agent.env.has(FabricManager)) {
+            const fabricIndices = agent.env.get(FabricManager).fabrics.map(fabric => fabric.fabricIndex);
+            if (fabricIndices.length > 0) {
+                return limitEndpointAttributeDataToAllowedFabrics(agent.endpoint, fabricIndices);
+            }
+        }
+    }
 }

package/src/node/server/ServerSubscription.ts

@@ -443,7 +443,7 @@ export class ServerSubscription implements Subscription {
                 break;
             }
 
-            this.#lastUpdateTime = Time.nowMs;
+            this.#lastUpdateTime = Time.nowMs; // TODO Count time from here or from "receive of the ack"?
 
             try {
                 using sending = updating?.join("sending");