@matter/node 0.15.1 → 0.15.2-alpha.0-20250703-2e16aba2b

package/dist/cjs/node/client/ClientEndpointInitializer.js

@@ -22,8 +22,10 @@ __export(ClientEndpointInitializer_exports, {
 });
 module.exports = __toCommonJS(ClientEndpointInitializer_exports);
 var import_ClientBehaviorBacking = require("#behavior/internal/ClientBehaviorBacking.js");
+var import_ServerBehaviorBacking = require("#behavior/internal/ServerBehaviorBacking.js");
 var import_EndpointInitializer = require("#endpoint/properties/EndpointInitializer.js");
-var import_ServerNodeStore = require("#node/storage/ServerNodeStore.js");
+var import_NodeStore = require("#storage/NodeStore.js");
+var import_ClientStructure = require("./ClientStructure.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
@@ -32,10 +34,11 @@ var import_ServerNodeStore = require("#node/storage/ServerNodeStore.js");
 class ClientEndpointInitializer extends import_EndpointInitializer.EndpointInitializer {
   #node;
   #store;
+  #structure;
   constructor(node) {
     super();
     this.#node = node;
-    this.#store = node.env.get(import_ServerNodeStore.ServerNodeStore).clientStores.storeForNode(node);
+    this.#store = node.env.get(import_NodeStore.NodeStore);
   }
   async eraseDescendant(endpoint) {
     if (endpoint === this.#node) {
@@ -45,22 +48,23 @@ class ClientEndpointInitializer extends import_EndpointInitializer.EndpointIniti
     if (!endpoint.lifecycle.hasId) {
       return;
     }
-    const store = this.#store.endpointStores.storeForEndpoint(endpoint);
+    const store = this.#store.storeForEndpoint(endpoint);
     await store.erase();
   }
   async deactivateDescendant(_endpoint) {
   }
-  get ready() {
-    return this.#store.construction.ready;
-  }
-  static async create(node) {
-    const instance = new ClientEndpointInitializer(node);
-    await instance.ready;
-    return instance;
+  createBacking(endpoint, type) {
+    if (type.cluster === void 0) {
+      return new import_ServerBehaviorBacking.ServerBehaviorBacking(endpoint, type, endpoint.behaviors.optionsFor(type));
+    }
+    const store = this.structure.storeFor(endpoint, type);
+    return new import_ClientBehaviorBacking.ClientBehaviorBacking(endpoint, type, store, endpoint.behaviors.optionsFor(type));
   }
-  createBacking(endpoint, behavior) {
-    const store = this.#store.endpointStores.storeForEndpoint(endpoint);
-    return new import_ClientBehaviorBacking.ClientBehaviorBacking(endpoint, behavior, store, endpoint.behaviors.optionsFor(behavior));
+  get structure() {
+    if (this.#structure === void 0) {
+      this.#structure = new import_ClientStructure.ClientStructure(this.#node);
+    }
+    return this.#structure;
   }
 }
 //# sourceMappingURL=ClientEndpointInitializer.js.map

package/dist/cjs/node/client/ClientEndpointInitializer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/client/ClientEndpointInitializer.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,mCAAsC;AAEtC,iCAAoC;AAGpC,6BAAgC;AAbhC;AAAA;AAAA;AAAA;AAAA;AAeO,MAAM,kCAAkC,+CAAoB;AAAA,EAC/D;AAAA,EACA;AAAA,EAEA,YAAY,MAAkB;AAC1B,UAAM;AACN,SAAK,QAAQ;AACb,SAAK,SAAS,KAAK,IAAI,IAAI,sCAAe,EAAE,aAAa,aAAa,IAAI;AAAA,EAC9E;AAAA,EAEA,MAAM,gBAAgB,UAAoB;AACtC,QAAI,aAAa,KAAK,OAAO;AACzB,YAAM,KAAK,OAAO,MAAM;AACxB;AAAA,IACJ;AAEA,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B;AAAA,IACJ;AAEA,UAAM,QAAQ,KAAK,OAAO,eAAe,iBAAiB,QAAQ;AAClE,UAAM,MAAM,MAAM;AAAA,EACtB;AAAA,EAEA,MAAM,qBAAqB,WAAqB;AAAA,EAEhD;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK,OAAO,aAAa;AAAA,EACpC;AAAA,EAEA,aAAa,OAAO,MAAkB;AAClC,UAAM,WAAW,IAAI,0BAA0B,IAAI;AACnD,UAAM,SAAS;AACf,WAAO;AAAA,EACX;AAAA,EAES,cAAc,UAAoB,UAA0C;AACjF,UAAM,QAAQ,KAAK,OAAO,eAAe,iBAAiB,QAAQ;AAClE,WAAO,IAAI,mDAAsB,UAAU,UAAU,OAAO,SAAS,UAAU,WAAW,QAAQ,CAAC;AAAA,EACvG;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,mCAAsC;AACtC,mCAAsC;AAEtC,iCAAoC;AAEpC,uBAA0B;AAC1B,6BAAgC;AAfhC;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,kCAAkC,+CAAoB;AAAA,EAC/D;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,MAAkB;AAC1B,UAAM;AACN,SAAK,QAAQ;AACb,SAAK,SAAS,KAAK,IAAI,IAAI,0BAAS;AAAA,EACxC;AAAA,EAEA,MAAM,gBAAgB,UAAoB;AACtC,QAAI,aAAa,KAAK,OAAO;AACzB,YAAM,KAAK,OAAO,MAAM;AACxB;AAAA,IACJ;AAEA,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B;AAAA,IACJ;AAEA,UAAM,QAAQ,KAAK,OAAO,iBAAiB,QAAQ;AACnD,UAAM,MAAM,MAAM;AAAA,EACtB;AAAA,EAEA,MAAM,qBAAqB,WAAqB;AAAA,EAEhD;AAAA,EAES,cAAc,UAAoB,MAAsC;AAC7E,QAAK,KAA8B,YAAY,QAAW;AACtD,aAAO,IAAI,mDAAsB,UAAU,MAAM,SAAS,UAAU,WAAW,IAAI,CAAC;AAAA,IACxF;AAEA,UAAM,QAAQ,KAAK,UAAU,SAAS,UAAU,IAA4B;AAC5E,WAAO,IAAI,mDAAsB,UAAU,MAAM,OAAO,SAAS,UAAU,WAAW,IAAI,CAAC;AAAA,EAC/F;AAAA,EAEA,IAAI,YAAY;AACZ,QAAI,KAAK,eAAe,QAAW;AAC/B,WAAK,aAAa,IAAI,uCAAgB,KAAK,KAAK;AAAA,IACpD;AACA,WAAO,KAAK;AAAA,EAChB;AACJ;",
   "names": []
 }

package/dist/cjs/node/client/ClientNodeFactory.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
-import { ImmutableSet } from "#general";
+import type { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
+import type { ImmutableSet } from "#general";
 import type { ClientNode } from "#node/ClientNode.js";
 /**
  * Create a new client node.

package/dist/cjs/node/client/ClientNodeFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientNodeFactory.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientNodeFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;GAKG;AACH,8BAAsB,iBAAiB;IACnC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,UAAU,GAAG,SAAS;IACnE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,UAAU;IACxD,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;CAC5C"}
+{"version":3,"file":"ClientNodeFactory.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientNodeFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;GAKG;AACH,8BAAsB,iBAAiB;IACnC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,UAAU,GAAG,SAAS;IACnE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,UAAU;IACxD,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;CAC5C"}

package/dist/cjs/node/client/ClientNodeInteraction.d.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ActionContext } from "#behavior/context/ActionContext.js";
+import type { ClientNode } from "#node/ClientNode.js";
+import type { Interactable, InvokeRequest, InvokeResult, Read, ReadResult, Subscribe, SubscribeResult, Write, WriteResult } from "#protocol";
+/**
+ * A {@link ClientInteraction} that brings the node online before attempting interaction.
+ */
+export declare class ClientNodeInteraction implements Interactable<ActionContext> {
+    #private;
+    constructor(node: ClientNode);
+    read(request: Read, context?: ActionContext): ReadResult;
+    subscribe(request: Subscribe, context?: ActionContext): SubscribeResult;
+    write<T extends Write>(request: T, context?: ActionContext): WriteResult<T>;
+    invoke(request: InvokeRequest, context?: ActionContext): InvokeResult;
+    get structure(): import("./ClientStructure.js").ClientStructure;
+}
+//# sourceMappingURL=ClientNodeInteraction.d.ts.map

package/dist/cjs/node/client/ClientNodeInteraction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientNodeInteraction.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientNodeInteraction.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACR,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,SAAS,EACT,eAAe,EACf,KAAK,EACL,WAAW,EACd,MAAM,WAAW,CAAC;AAInB;;GAEG;AACH,qBAAa,qBAAsB,YAAW,YAAY,CAAC,aAAa,CAAC;;gBAGzD,IAAI,EAAE,UAAU;IAIrB,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,UAAU;IAOzD,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,eAAe;IAsBvE,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC;IAI1E,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY;IAW5E,IAAI,SAAS,mDAEZ;CACJ"}

package/dist/cjs/node/client/ClientNodeInteraction.js

@@ -0,0 +1,76 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ClientNodeInteraction_exports = {};
+__export(ClientNodeInteraction_exports, {
+  ClientNodeInteraction: () => ClientNodeInteraction
+});
+module.exports = __toCommonJS(ClientNodeInteraction_exports);
+var import_EndpointInitializer = require("#endpoint/properties/EndpointInitializer.js");
+var import_protocol = require("#protocol");
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class ClientNodeInteraction {
+  #node;
+  constructor(node) {
+    this.#node = node;
+  }
+  async *read(request, context) {
+    request = this.structure.injectVersionFilters(request);
+    const interaction = await this.#connect();
+    const response = interaction.read(request, context);
+    yield* this.structure.mutate(request, response);
+  }
+  async subscribe(request, context) {
+    const intermediateRequest = {
+      ...this.structure.injectVersionFilters(request),
+      updated: async (data) => {
+        const result = this.structure.mutate(request, data);
+        if (request.updated) {
+          await request.updated(result);
+        } else {
+          for await (const _chunk of result) ;
+        }
+      },
+      closed(cause) {
+        request.closed?.(cause);
+      }
+    };
+    const interaction = await this.#connect();
+    return interaction.subscribe(intermediateRequest, context);
+  }
+  async write(request, context) {
+    return (await this.#connect()).write(request, context);
+  }
+  async *invoke(request, context) {
+    yield* (await this.#connect()).invoke(request, context);
+  }
+  async #connect() {
+    if (!this.#node.lifecycle.isOnline) {
+      await this.#node.start();
+    }
+    return this.#node.env.get(import_protocol.ClientInteraction);
+  }
+  get structure() {
+    return this.#node.env.get(import_EndpointInitializer.EndpointInitializer).structure;
+  }
+}
+//# sourceMappingURL=ClientNodeInteraction.js.map

package/dist/cjs/node/client/ClientNodeInteraction.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/node/client/ClientNodeInteraction.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,iCAAoC;AAapC,sBAAkC;AApBlC;AAAA;AAAA;AAAA;AAAA;AA0BO,MAAM,sBAA6D;AAAA,EACtE;AAAA,EAEA,YAAY,MAAkB;AAC1B,SAAK,QAAQ;AAAA,EACjB;AAAA,EAEA,OAAO,KAAK,SAAe,SAAqC;AAC5D,cAAU,KAAK,UAAU,qBAAqB,OAAO;AACrD,UAAM,cAAc,MAAM,KAAK,SAAS;AACxC,UAAM,WAAW,YAAY,KAAK,SAAS,OAAO;AAClD,WAAO,KAAK,UAAU,OAAO,SAAS,QAAQ;AAAA,EAClD;AAAA,EAEA,MAAM,UAAU,SAAoB,SAA0C;AAC1E,UAAM,sBAAiC;AAAA,MACnC,GAAG,KAAK,UAAU,qBAAqB,OAAO;AAAA,MAE9C,SAAS,OAAM,SAAQ;AACnB,cAAM,SAAS,KAAK,UAAU,OAAO,SAAS,IAAI;AAClD,YAAI,QAAQ,SAAS;AACjB,gBAAM,QAAQ,QAAQ,MAAM;AAAA,QAChC,OAAO;AACH,2BAAiB,UAAU,OAAO;AAAA,QACtC;AAAA,MACJ;AAAA,MAEA,OAAO,OAAO;AAEV,gBAAQ,SAAS,KAAK;AAAA,MAC1B;AAAA,IACJ;AACA,UAAM,cAAc,MAAM,KAAK,SAAS;AACxC,WAAO,YAAY,UAAU,qBAAqB,OAAO;AAAA,EAC7D;AAAA,EAEA,MAAM,MAAuB,SAAY,SAAyC;AAC9E,YAAQ,MAAM,KAAK,SAAS,GAAG,MAAM,SAAS,OAAO;AAAA,EACzD;AAAA,EAEA,OAAO,OAAO,SAAwB,SAAuC;AACzE,YAAQ,MAAM,KAAK,SAAS,GAAG,OAAO,SAAS,OAAO;AAAA,EAC1D;AAAA,EAEA,MAAM,WAAuC;AACzC,QAAI,CAAC,KAAK,MAAM,UAAU,UAAU;AAChC,YAAM,KAAK,MAAM,MAAM;AAAA,IAC3B;AACA,WAAO,KAAK,MAAM,IAAI,IAAI,iCAAiB;AAAA,EAC/C;AAAA,EAEA,IAAI,YAAY;AACZ,WAAQ,KAAK,MAAM,IAAI,IAAI,8CAAmB,EAAgC;AAAA,EAClF;AACJ;",
+  "names": []
+}

package/dist/cjs/node/client/ClientNodes.d.ts

@@ -37,11 +37,7 @@ export declare class ClientNodes extends EndpointContainer<ClientNode> {
     /**
      * Find a specific commissionable node and commission.
      */
-    commission(passcode: number, discriminator?: number): Promise<ClientNode>;
-    /**
-     * Find a specific commissionable node and commission.
-     */
-    commission(options: CommissioningDiscovery.Options): Promise<ClientNode>;
+    commission(options: CommissioningDiscovery.Options): CommissioningDiscovery;
     get(id: string | PeerAddress): ClientNode | undefined;
     get owner(): ServerNode;
     add(node: ClientNode): void;

package/dist/cjs/node/client/ClientNodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientNodes.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientNodes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,iEAAiE,CAAC;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAG9E,OAAO,EAAE,WAAW,EAAoB,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOnD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,iBAAiB,CAAC,UAAU,CAAC;;gBAG9C,KAAK,EAAE,UAAU;IAa7B;;OAEG;IACH,UAAU;IAcV;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIlC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIpC;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAEzE;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IAc/D,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW;IAerC,IAAa,KAAK,IACQ,UAAU,CACnC;IAEQ,GAAG,CAAC,IAAI,EAAE,UAAU;IAMd,KAAK;CAmFvB"}
+{"version":3,"file":"ClientNodes.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientNodes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,iEAAiE,CAAC;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAoB,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AASnD;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,iBAAiB,CAAC,UAAU,CAAC;;gBAK9C,KAAK,EAAE,UAAU;IAa7B;;OAEG;IACH,UAAU;IAcV;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIlC;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAIpC;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO;IAIzC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW;IAerC,IAAa,KAAK,IACQ,UAAU,CACnC;IAEQ,GAAG,CAAC,IAAI,EAAE,UAAU;IAMd,KAAK;CAgGvB"}

package/dist/cjs/node/client/ClientNodes.js

@@ -27,8 +27,8 @@ var import_ContinuousDiscovery = require("#behavior/system/controller/discovery/
 var import_InstanceDiscovery = require("#behavior/system/controller/discovery/InstanceDiscovery.js");
 var import_EndpointContainer = require("#endpoint/properties/EndpointContainer.js");
 var import_general = require("#general");
-var import_ServerNodeStore = require("#node/storage/ServerNodeStore.js");
 var import_protocol = require("#protocol");
+var import_ServerNodeStore = require("#storage/server/ServerNodeStore.js");
 var import_ClientNode = require("../ClientNode.js");
 var import_ClientNodeFactory = require("./ClientNodeFactory.js");
 var import_NodePeerAddressStore = require("./NodePeerAddressStore.js");
@@ -37,10 +37,13 @@ var import_NodePeerAddressStore = require("./NodePeerAddressStore.js");
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+const logger = import_general.Logger.get("ClientNodes");
 const DEFAULT_TTL = 900 * 1e3;
 const EXPIRATION_INTERVAL = 60 * 1e3;
 class ClientNodes extends import_EndpointContainer.EndpointContainer {
   #expirationInterval;
+  #expirationWorker;
+  #closed = false;
   constructor(owner) {
     super(owner);
     if (!owner.env.has(import_ClientNodeFactory.ClientNodeFactory)) {
@@ -80,14 +83,11 @@ class ClientNodes extends import_EndpointContainer.EndpointContainer {
   discover(options) {
     return new import_ContinuousDiscovery.ContinuousDiscovery(this.owner, options);
   }
-  commission(optionsOrPasscode, discriminator) {
-    if (typeof optionsOrPasscode !== "object") {
-      optionsOrPasscode = { passcode: optionsOrPasscode };
-    }
-    if (discriminator !== void 0) {
-      optionsOrPasscode.longDiscriminator = discriminator;
-    }
-    return new import_CommissioningDiscovery.CommissioningDiscovery(this.owner, optionsOrPasscode);
+  /**
+   * Find a specific commissionable node and commission.
+   */
+  commission(options) {
+    return new import_CommissioningDiscovery.CommissioningDiscovery(this.owner, options);
   }
   get(id) {
     if (typeof id !== "string") {
@@ -110,7 +110,9 @@ class ClientNodes extends import_EndpointContainer.EndpointContainer {
     super.add(node);
   }
   async close() {
+    this.#closed = true;
     this.#cancelExpiration();
+    await this.#expirationWorker;
     await super.close();
   }
   #cancelExpiration() {
@@ -120,6 +122,9 @@ class ClientNodes extends import_EndpointContainer.EndpointContainer {
     }
   }
   #manageExpiration() {
+    if (this.#closed || this.#expirationWorker) {
+      return;
+    }
     if (this.#expirationInterval) {
       if (!this.size) {
         this.#cancelExpiration();
@@ -129,13 +134,17 @@ class ClientNodes extends import_EndpointContainer.EndpointContainer {
     if (!this.size) {
       return;
     }
-    this.#expirationInterval = import_general.Time.sleep("client node expiration", EXPIRATION_INTERVAL).then(async () => {
-      this.#expirationInterval = void 0;
-      try {
-        await this.#cullExpiredNodesAndAddresses();
-      } finally {
-        this.#manageExpiration();
-      }
+    this.#expirationInterval = import_general.Time.sleep("client node expiration", EXPIRATION_INTERVAL).then(
+      this.#onExpirationIntervalElapsed.bind(this)
+    );
+  }
+  #onExpirationIntervalElapsed() {
+    this.#expirationInterval = void 0;
+    this.#expirationWorker = this.#cullExpiredNodesAndAddresses().catch((error) => {
+      logger.error("Error culling expired nodes", error);
+    }).finally(() => {
+      this.#expirationWorker = void 0;
+      this.#manageExpiration();
     });
   }
   async #cullExpiredNodesAndAddresses() {
@@ -155,7 +164,7 @@ class ClientNodes extends import_EndpointContainer.EndpointContainer {
         return exp > now;
       });
       if (!isCommissioned) {
-        if (!newAddresses?.length || expirationOf(state) <= now) {
+        if (!newAddresses?.length || (expirationOf(state) ?? 0) <= now) {
           await node.delete();
           continue;
         }

package/dist/cjs/node/client/ClientNodes.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/client/ClientNodes.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["freshestExp"]
 }

package/dist/cjs/node/client/ClientStructure.d.ts

@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ClusterBehavior } from "#behavior/cluster/ClusterBehavior.js";
+import { Datasource } from "#behavior/state/managed/Datasource.js";
+import { Endpoint } from "#endpoint/Endpoint.js";
+import type { ClientNode } from "#node/ClientNode.js";
+import { type Read, type ReadResult } from "#protocol";
+/**
+ * Manages endpoint and behavior structure for a single client node.
+ */
+export declare class ClientStructure {
+    #private;
+    constructor(node: ClientNode);
+    /**
+     * Load initial structure from cache.
+     */
+    loadCache(): void;
+    /**
+     * Obtain the store for a behavior.
+     */
+    storeFor(endpoint: Endpoint, type: ClusterBehavior.Type): Datasource.ExternallyMutableStore;
+    /**
+     * Inject version filters into a Read or Subscribe request.
+     */
+    injectVersionFilters<T extends Read>(request: T): T;
+    /**
+     * Update the node structure by applying attribute changes.
+     */
+    mutate(request: Read, changes: ReadResult): AsyncGenerator<ReadResult.Chunk, void, unknown>;
+}
+//# sourceMappingURL=ClientStructure.d.ts.map

package/dist/cjs/node/client/ClientStructure.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientStructure.d.ts","sourceRoot":"","sources":["../../../../src/node/client/ClientStructure.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAa,KAAK,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAUlE;;GAEG;AACH,qBAAa,eAAe;;gBAIZ,IAAI,EAAE,UAAU;IAQ5B;;OAEG;IACH,SAAS;IAyBT;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI;IAOvD;;OAEG;IACH,oBAAoB,CAAC,CAAC,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC;IAmCnD;;OAEG;IACI,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU;CA0MnD"}

package/dist/cjs/node/client/ClientStructure.js

@@ -0,0 +1,270 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ClientStructure_exports = {};
+__export(ClientStructure_exports, {
+  ClientStructure: () => ClientStructure
+});
+module.exports = __toCommonJS(ClientStructure_exports);
+var import_Datasource = require("#behavior/state/managed/Datasource.js");
+var import_descriptor = require("#clusters/descriptor");
+var import_Endpoint = require("#endpoint/Endpoint.js");
+var import_EndpointType = require("#endpoint/type/EndpointType.js");
+var import_model = require("#model");
+var import_protocol = require("#protocol");
+var import_DatasourceCache = require("#storage/client/DatasourceCache.js");
+var import_storage = require("#storage/index.js");
+var import_ClientBehavior = require("./ClientBehavior.js");
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const DEVICE_TYPE_LIST_ATTR_ID = import_descriptor.DescriptorCluster.attributes.deviceTypeList.id;
+const SERVER_LIST_ATTR_ID = import_descriptor.DescriptorCluster.attributes.serverList.id;
+const PARTS_LIST_ATTR_ID = import_descriptor.DescriptorCluster.attributes.partsList.id;
+class ClientStructure {
+  #nodeStore;
+  #endpoints = {};
+  constructor(node) {
+    this.#nodeStore = node.env.get(import_storage.ClientNodeStore);
+    this.#endpoints[node.number] = {
+      endpoint: node,
+      clusters: {}
+    };
+  }
+  /**
+   * Load initial structure from cache.
+   */
+  loadCache() {
+    for (const store of this.#nodeStore.endpointStores) {
+      const id = store.id;
+      const number = Number.parseInt(id);
+      if (Number.isNaN(number)) {
+        continue;
+      }
+      const endpoint = this.#endpointFor(number);
+      for (const idStr of store.knownBehaviors) {
+        const id2 = Number.parseInt(idStr);
+        if (Number.isNaN(id2)) {
+          continue;
+        }
+        const cluster = this.#clusterFor(endpoint, id2);
+        this.#initializeCluster(endpoint, cluster);
+      }
+    }
+  }
+  /**
+   * Obtain the store for a behavior.
+   */
+  storeFor(endpoint, type) {
+    const endpointStructure = this.#endpointFor(endpoint.number);
+    const clusterStructure = this.#clusterFor(endpointStructure, type.cluster.id);
+    return clusterStructure.store;
+  }
+  /**
+   * Inject version filters into a Read or Subscribe request.
+   */
+  injectVersionFilters(request) {
+    const scope = (0, import_protocol.ReadScope)(request);
+    let result = request;
+    for (const {
+      endpoint: { number: endpointId },
+      clusters
+    } of Object.values(this.#endpoints)) {
+      for (const {
+        id: clusterId,
+        store: { version }
+      } of Object.values(clusters)) {
+        if (!scope.isRelevant(endpointId, clusterId)) {
+          continue;
+        }
+        if (version === import_Datasource.Datasource.UNKNOWN_VERSION) {
+          continue;
+        }
+        if (result === request) {
+          result = { ...request };
+        }
+        if (result.dataVersionFilters === void 0) {
+          result.dataVersionFilters = [];
+        }
+        result.dataVersionFilters.push({ path: { endpointId, clusterId }, dataVersion: version });
+      }
+    }
+    return result;
+  }
+  /**
+   * Update the node structure by applying attribute changes.
+   */
+  async *mutate(request, changes) {
+    const scope = (0, import_protocol.ReadScope)(request);
+    let currentUpdates;
+    for await (const chunk of changes) {
+      for (const change of chunk) {
+        if (change.kind !== "attr-value") {
+          continue;
+        }
+        const { endpointId, clusterId, attributeId } = change.path;
+        if (currentUpdates && (currentUpdates.endpointId !== endpointId || currentUpdates.clusterId !== clusterId)) {
+          await this.#updateCluster(currentUpdates);
+          currentUpdates = void 0;
+        }
+        if (currentUpdates === void 0) {
+          currentUpdates = {
+            endpointId,
+            clusterId,
+            values: {
+              [attributeId]: change.value
+            }
+          };
+          if (scope.isWildcard(endpointId, clusterId)) {
+            currentUpdates.values[import_DatasourceCache.DatasourceCache.VERSION_KEY] = change.version;
+          }
+        } else {
+          currentUpdates.values[attributeId] = change.value;
+        }
+      }
+      yield chunk;
+    }
+    if (currentUpdates) {
+      await this.#updateCluster(currentUpdates);
+    }
+  }
+  /**
+   * Apply new attribute values for specific endpoint/cluster.
+   *
+   * This is invoked in a batch when we've collected all sequential values for the current endpoint/cluster.
+   */
+  async #updateCluster(attrs) {
+    const endpoint = this.#endpointFor(attrs.endpointId);
+    const cluster = this.#clusterFor(endpoint, attrs.clusterId);
+    await cluster.store.externalSet(attrs.values);
+    this.#initializeCluster(endpoint, cluster);
+  }
+  /**
+   * If enough attributes are present, installs a behavior on an endpoint
+   *
+   * If the cluster is Descriptor, performs additional {@link Endpoint} configuration such as installing parts and
+   * device types.
+   *
+   * Invoked once we've loaded all attributes in an interaction.
+   */
+  #initializeCluster(endpoint, cluster) {
+    const attrs = cluster.store.initialValues ?? {};
+    if (cluster.behavior === void 0) {
+      const {
+        [import_model.ClusterRevision.id]: clusterRevision,
+        [import_model.FeatureMap.id]: features,
+        [import_model.AttributeList.id]: attributeList,
+        [import_model.AcceptedCommandList.id]: commandList
+      } = attrs;
+      if (typeof clusterRevision === "number") {
+        cluster.revision = clusterRevision;
+      }
+      if (typeof features === "object" && features !== null && !Array.isArray(features)) {
+        cluster.features = features;
+      }
+      if (Array.isArray(attributeList)) {
+        cluster.attributes = attributeList.filter((attr) => typeof attr === "number");
+      }
+      if (Array.isArray(commandList)) {
+        cluster.commands = commandList.filter((cmd) => typeof cmd === "number");
+      }
+      if (cluster.revision !== void 0 && cluster.features !== void 0 && cluster.attributes !== void 0 && cluster.commands !== void 0) {
+        cluster.behavior = (0, import_ClientBehavior.ClientBehavior)(cluster);
+        endpoint.endpoint.behaviors.require(cluster.behavior);
+      }
+    }
+    if (cluster.id === import_descriptor.DescriptorCluster.id) {
+      this.#synchronizeDescriptor(endpoint, attrs);
+    }
+  }
+  #synchronizeDescriptor(endpoint, attrs) {
+    const deviceTypeList = attrs[DEVICE_TYPE_LIST_ATTR_ID];
+    if (Array.isArray(deviceTypeList) && deviceTypeList?.[0]) {
+      const [{ deviceType, revision }] = deviceTypeList;
+      if (typeof deviceType === "number") {
+        endpoint.endpoint.type.deviceType = deviceType;
+      }
+      if (typeof revision === "number") {
+        endpoint.endpoint.type.deviceRevision = revision;
+      }
+    }
+    const serverList = attrs[SERVER_LIST_ATTR_ID];
+    if (Array.isArray(serverList)) {
+      for (const cluster of serverList) {
+        if (typeof cluster === "number") {
+          this.#clusterFor(endpoint, cluster);
+        }
+      }
+    }
+    const partsList = attrs[PARTS_LIST_ATTR_ID];
+    if (Array.isArray(partsList)) {
+      for (const partNo of partsList) {
+        if (typeof partNo !== "number") {
+          continue;
+        }
+        const part = this.#endpointFor(partNo);
+        let isAlreadyDescendant = false;
+        for (let owner = part.endpoint.owner; owner; owner = owner.owner) {
+          if (owner === endpoint.endpoint) {
+            isAlreadyDescendant = true;
+            break;
+          }
+        }
+        if (isAlreadyDescendant) {
+          continue;
+        }
+        part.endpoint.owner = endpoint.endpoint;
+      }
+    }
+  }
+  #endpointFor(number) {
+    let endpoint = this.#endpoints[number];
+    if (endpoint) {
+      return endpoint;
+    }
+    endpoint = {
+      endpoint: new import_Endpoint.Endpoint({
+        id: `ep${number}`,
+        number,
+        type: (0, import_EndpointType.EndpointType)({
+          name: "ClientEndpoint",
+          deviceType: -1,
+          deviceRevision: -1
+        })
+      }),
+      clusters: {}
+    };
+    this.#endpoints[number] = endpoint;
+    return endpoint;
+  }
+  #clusterFor(endpoint, id) {
+    let cluster = endpoint.clusters[id];
+    if (cluster) {
+      return cluster;
+    }
+    cluster = {
+      id,
+      store: this.#nodeStore.storeForEndpoint(endpoint.endpoint).createStoreForBehavior(id.toString(), import_DatasourceCache.DatasourceCache)
+    };
+    endpoint.clusters[id] = cluster;
+    return cluster;
+  }
+}
+//# sourceMappingURL=ClientStructure.js.map