@matter/node 0.15.1 → 0.15.2-alpha.0-20250704-2715344f0

package/dist/esm/storage/server/ServerEndpointStore.js

@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ImplementationError } from "#general";
+import { EndpointStore } from "#storage/EndpointStore.js";
+const NUMBER_KEY = "__number__";
+class ServerEndpointStore extends EndpointStore {
+  #number;
+  #childStorage;
+  #childStores = {};
+  get number() {
+    return this.#number;
+  }
+  set number(number) {
+    if (this.#number !== number) {
+      this.#number = number;
+    }
+  }
+  constructor(storage) {
+    super(storage);
+    this.#childStorage = storage.createContext("parts");
+  }
+  /**
+   * Invoke a function on this store and the stores of descendant parts.
+   */
+  visit(fn) {
+    fn(this);
+    for (const child of Object.values(this.#childStores)) {
+      child.visit(fn);
+    }
+  }
+  childStoreFor(endpoint) {
+    if (!endpoint.lifecycle.hasId) {
+      throw new ImplementationError("Cannot access endpoint storage because endpoint has no assigned ID");
+    }
+    return this.storeForPartId(endpoint.id);
+  }
+  storeForPartId(partId) {
+    let store = this.#childStores[partId];
+    if (store === void 0) {
+      store = this.#childStores[partId] = new ServerEndpointStore(this.#childStorage.createContext(partId));
+    }
+    return store;
+  }
+  async saveNumber() {
+    await this.storage.set(NUMBER_KEY, this.number);
+  }
+  async load() {
+    await super.load();
+    const number = await this.storage.get(NUMBER_KEY, -1);
+    if (number !== -1) {
+      this.#number = number;
+    }
+    await this.#loadSubparts();
+  }
+  /**
+   * Erase the child storage for one part
+   */
+  async eraseChildStoreFor(endpoint) {
+    const partId = endpoint.id;
+    const store = this.#childStores[partId];
+    await store.erase();
+    delete this.#childStores[partId];
+  }
+  async #loadSubparts() {
+    const knownParts = await this.#childStorage.contexts();
+    for (const partId of knownParts) {
+      await this.#loadKnownChildStores(partId);
+    }
+  }
+  async #loadKnownChildStores(partId) {
+    const endpointStore = new ServerEndpointStore(this.#childStorage.createContext(partId));
+    this.#childStores[partId] = endpointStore;
+    await endpointStore.load();
+  }
+}
+export {
+  ServerEndpointStore
+};
+//# sourceMappingURL=ServerEndpointStore.js.map

package/dist/esm/storage/server/ServerEndpointStore.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/storage/server/ServerEndpointStore.ts"],
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,2BAA2C;AACpD,SAAS,qBAAqB;AAE9B,MAAM,aAAa;AAOZ,MAAM,4BAA4B,cAAc;AAAA,EACnD;AAAA,EAEA;AAAA,EACA,eAAe,CAAC;AAAA,EAEhB,IAAI,SAAS;AACT,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,OAAO,QAA4B;AACnC,QAAI,KAAK,YAAY,QAAQ;AACzB,WAAK,UAAU;AAAA,IACnB;AAAA,EACJ;AAAA,EAEA,YAAY,SAAyB;AACjC,UAAM,OAAO;AAEb,SAAK,gBAAgB,QAAQ,cAAc,OAAO;AAAA,EACtD;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,IAA0C;AAC5C,OAAG,IAAI;AACP,eAAW,SAAS,OAAO,OAAO,KAAK,YAAY,GAAG;AAClD,YAAM,MAAM,EAAE;AAAA,IAClB;AAAA,EACJ;AAAA,EAEA,cAAc,UAAyC;AACnD,QAAI,CAAC,SAAS,UAAU,OAAO;AAC3B,YAAM,IAAI,oBAAoB,oEAAoE;AAAA,IACtG;AACA,WAAO,KAAK,eAAe,SAAS,EAAE;AAAA,EAC1C;AAAA,EAEU,eAAe,QAAgB;AACrC,QAAI,QAAQ,KAAK,aAAa,MAAM;AACpC,QAAI,UAAU,QAAW;AACrB,cAAQ,KAAK,aAAa,MAAM,IAAI,IAAI,oBAAoB,KAAK,cAAc,cAAc,MAAM,CAAC;AAAA,IACxG;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,aAAa;AACf,UAAM,KAAK,QAAQ,IAAI,YAAY,KAAK,MAAM;AAAA,EAClD;AAAA,EAEA,MAAe,OAAO;AAClB,UAAM,MAAM,KAAK;AAEjB,UAAM,SAAS,MAAM,KAAK,QAAQ,IAAI,YAAY,EAAE;AACpD,QAAI,WAAW,IAAI;AACf,WAAK,UAAU;AAAA,IACnB;AAEA,UAAM,KAAK,cAAc;AAAA,EAC7B;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,mBAAmB,UAAoB;AACzC,UAAM,SAAS,SAAS;AACxB,UAAM,QAAQ,KAAK,aAAa,MAAM;AACtC,UAAM,MAAM,MAAM;AAClB,WAAO,KAAK,aAAa,MAAM;AAAA,EACnC;AAAA,EAEA,MAAM,gBAAgB;AAClB,UAAM,aAAa,MAAM,KAAK,cAAc,SAAS;AACrD,eAAW,UAAU,YAAY;AAC7B,YAAM,KAAK,sBAAsB,MAAM;AAAA,IAC3C;AAAA,EACJ;AAAA,EAEA,MAAM,sBAAsB,QAAgB;AACxC,UAAM,gBAAgB,IAAI,oBAAoB,KAAK,cAAc,cAAc,MAAM,CAAC;AACtF,SAAK,aAAa,MAAM,IAAI;AAC5B,UAAM,cAAc,KAAK;AAAA,EAC7B;AACJ;",
+  "names": []
+}

package/dist/esm/storage/server/ServerEndpointStores.d.ts

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Endpoint } from "#endpoint/Endpoint.js";
+import type { StorageContext } from "#general";
+import { ServerEndpointStore } from "./ServerEndpointStore.js";
+/**
+ * Manages {@link ServerEndpointStore}s for a {@link ServerNode}.
+ */
+export declare class ServerEndpointStores {
+    #private;
+    load(storage: StorageContext): Promise<void>;
+    erase(): Promise<void>;
+    close(): Promise<void>;
+    /**
+     * Allocate an endpoint number.
+     *
+     * Either allocates a new number for a {@link Endpoint} or reserves the endpoint's number.  If the {@link Endpoint}
+     * already has a number but it is allocated to a different endpoint it is an error.
+     *
+     * We must persist the assigned number and next endpoint number.  We are fairly resilient to the small chance that
+     * persistence fails so we persist lazily and return synchronously.
+     */
+    assignNumber(endpoint: Endpoint): void;
+    /**
+     * Obtain the store for a single {@link Endpoint}.
+     *
+     * These stores are cached internally by ID.
+     */
+    storeForEndpoint(endpoint: Endpoint): ServerEndpointStore;
+    /**
+     * Deactivate the store for a single {@link Endpoint}. This puts the endpoint number back into pre-allocated state
+     */
+    deactivateStoreForEndpoint(endpoint: Endpoint): void;
+    /**
+     * Erase storage for a single {@link Endpoint}.
+     */
+    eraseStoreForEndpoint(endpoint: Endpoint): Promise<void>;
+}
+//# sourceMappingURL=ServerEndpointStores.d.ts.map

package/dist/esm/storage/server/ServerEndpointStores.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerEndpointStores.d.ts","sourceRoot":"","sources":["../../../../src/storage/server/ServerEndpointStores.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM/D;;GAEG;AACH,qBAAa,oBAAoB;;IAUvB,IAAI,CAAC,OAAO,EAAE,cAAc;IAyB5B,KAAK;IAqBL,KAAK;IAWX;;;;;;;;OAQG;IACH,YAAY,CAAC,QAAQ,EAAE,QAAQ;IAmD/B;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,mBAAmB;IAiBzD;;OAEG;IACH,0BAA0B,CAAC,QAAQ,EAAE,QAAQ;IAY7C;;OAEG;IACG,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;CAwDjD"}

package/dist/esm/{node/storage/EndpointStoreService.js → storage/server/ServerEndpointStores.js}

@@ -3,42 +3,30 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Construction, ImplementationError, InternalError, Lifecycle, Logger, asyncNew } from "#general";
-import { EndpointStore } from "../../endpoint/storage/EndpointStore.js";
-import { IdentityConflictError } from "../server/IdentityService.js";
+import { ImplementationError, InternalError, Logger } from "#general";
+import { IdentityConflictError } from "#node/server/IdentityService.js";
+import { ServerEndpointStore } from "./ServerEndpointStore.js";
 const NEXT_NUMBER_KEY = "__nextNumber__";
 const logger = Logger.get("EndpointStoreService");
-class EndpointStoreService {
-}
-class EndpointStoreFactory extends EndpointStoreService {
+class ServerEndpointStores {
   #storage;
   #allocatedNumbers = /* @__PURE__ */ new Set();
   #preAllocatedNumbers = /* @__PURE__ */ new Set();
-  #construction;
   #persistedNextNumber;
   #numbersPersisted;
   #numbersToPersist;
-  #nextNumber;
-  #defaultNextNumber;
+  #nextNumber = 1;
   #root;
-  get construction() {
-    return this.#construction;
-  }
-  constructor({ storage, nextNumber }) {
-    super();
+  async load(storage) {
     this.#storage = storage;
-    this.#defaultNextNumber = nextNumber ?? 1;
-    this.#construction = Construction(this);
-    this.#construction.start();
-  }
-  async [Construction.construct]() {
-    this.#nextNumber = await this.#storage.get(NEXT_NUMBER_KEY, this.#defaultNextNumber) % 65535;
-    if (!this.#nextNumber) {
+    this.#nextNumber = await this.#storage.get(NEXT_NUMBER_KEY, 1) % 65535;
+    if (this.#nextNumber < 1) {
       this.#nextNumber = 1;
     } else {
       this.#persistedNextNumber = this.#nextNumber;
     }
-    this.#root = await asyncNew(EndpointStore, this.#storage);
+    this.#root = new ServerEndpointStore(this.#storage);
+    await this.#root.load();
     this.#root.visit(({ number }) => {
       if (number !== void 0) {
         this.#preAllocatedNumbers.add(number);
@@ -46,28 +34,38 @@ class EndpointStoreFactory extends EndpointStoreService {
     });
   }
   async erase() {
+    const storage = this.#storage;
+    if (!storage) {
+      return;
+    }
     if (this.#numbersPersisted) {
       await this.#numbersPersisted;
     }
-    await this.#storage.clearAll();
-    this.#construction.setStatus(Lifecycle.Status.Inactive);
-    this.#construction.start();
+    this.#storage = void 0;
+    await storage.clearAll();
     this.#allocatedNumbers = /* @__PURE__ */ new Set();
-    this.#nextNumber = (this.#defaultNextNumber ?? 1) % 65535;
+    this.#nextNumber = 1;
     this.#persistedNextNumber = void 0;
-    this.#root = new EndpointStore(this.#storage, false);
-    await this.construction;
+    await this.load(storage);
   }
   async close() {
     if (this.#numbersPersisted) {
       await this.#numbersPersisted;
     }
   }
+  #premature(what) {
+    throw new InternalError(`${what} prior to storage initialization`);
+  }
+  /**
+   * Allocate an endpoint number.
+   *
+   * Either allocates a new number for a {@link Endpoint} or reserves the endpoint's number.  If the {@link Endpoint}
+   * already has a number but it is allocated to a different endpoint it is an error.
+   *
+   * We must persist the assigned number and next endpoint number.  We are fairly resilient to the small chance that
+   * persistence fails so we persist lazily and return synchronously.
+   */
   assignNumber(endpoint) {
-    if (this.#nextNumber === void 0) {
-      throw new InternalError("Endpoint number assigned prior to store initialization");
-    }
-    this.#construction.assert();
     const store = this.storeForEndpoint(endpoint);
     if (endpoint.lifecycle.hasNumber) {
       if (this.#allocatedNumbers.has(endpoint.number)) {
@@ -106,10 +104,17 @@ class EndpointStoreFactory extends EndpointStoreService {
     store.number = endpoint.number;
     this.#persistNumber(endpoint);
   }
+  /**
+   * Obtain the store for a single {@link Endpoint}.
+   *
+   * These stores are cached internally by ID.
+   */
   storeForEndpoint(endpoint) {
-    this.#construction.assert();
     if (endpoint.maybeNumber === 0) {
-      return this.#construction.assert("root node store", this.#root);
+      if (this.#root === void 0) {
+        this.#premature("Root store accessed");
+      }
+      return this.#root;
     }
     if (!endpoint.owner) {
       throw new InternalError(
@@ -118,8 +123,10 @@ class EndpointStoreFactory extends EndpointStoreService {
     }
     return this.storeForEndpoint(endpoint.owner).childStoreFor(endpoint);
   }
+  /**
+   * Deactivate the store for a single {@link Endpoint}. This puts the endpoint number back into pre-allocated state
+   */
   deactivateStoreForEndpoint(endpoint) {
-    this.#construction.assert();
     if (endpoint.maybeNumber === 0) {
       throw new InternalError("Cannot deactivate root node store");
     }
@@ -129,8 +136,10 @@ class EndpointStoreFactory extends EndpointStoreService {
     this.#allocatedNumbers.delete(endpoint.number);
     this.#preAllocatedNumbers.add(endpoint.number);
   }
+  /**
+   * Erase storage for a single {@link Endpoint}.
+   */
   async eraseStoreForEndpoint(endpoint) {
-    this.#construction.assert();
     if (!endpoint.owner) {
       throw new InternalError(
         "Endpoint storage inaccessible because endpoint is not a node and is not owned by another endpoint"
@@ -150,7 +159,6 @@ class EndpointStoreFactory extends EndpointStoreService {
     }
     this.#numbersToPersist = [endpoint];
     const numberPersister = async () => {
-      await this.#construction;
       const numbersToPersist = this.#numbersToPersist;
       if (!numbersToPersist) {
         return;
@@ -161,6 +169,9 @@ class EndpointStoreFactory extends EndpointStoreService {
         await store.saveNumber();
       }
       if (this.#nextNumber !== this.#persistedNextNumber) {
+        if (this.#storage === void 0) {
+          this.#premature("Numer persistance");
+        }
         await this.#storage.set(NEXT_NUMBER_KEY, this.#nextNumber);
         this.#persistedNextNumber = this.#nextNumber;
       }
@@ -173,7 +184,6 @@ class EndpointStoreFactory extends EndpointStoreService {
   }
 }
 export {
-  EndpointStoreFactory,
-  EndpointStoreService
+  ServerEndpointStores
 };
-//# sourceMappingURL=EndpointStoreService.js.map
+//# sourceMappingURL=ServerEndpointStores.js.map

package/dist/esm/storage/server/ServerEndpointStores.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/storage/server/ServerEndpointStores.ts"],
+  "mappings": "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",
+  "names": ["endpoint"]
+}

package/dist/esm/storage/server/ServerNodeStore.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Endpoint } from "#endpoint/Endpoint.js";
+import { Destructable, Environment } from "#general";
+import { NodeStore } from "../NodeStore.js";
+import { ClientNodeStores } from "../client/ClientNodeStores.js";
+import { ServerEndpointStores } from "./ServerEndpointStores.js";
+/**
+ * The "server" node store is a {@link NodeStore} with storage for components shared by the server node and client
+ * nodes.
+ */
+export declare class ServerNodeStore extends NodeStore implements Destructable {
+    #private;
+    constructor(environment: Environment, nodeId: string);
+    static create(environment: Environment, nodeId: string): Promise<ServerNodeStore>;
+    close(): Promise<void>;
+    /**
+     * Stores associated with server endpoints supported by this node.
+     */
+    get endpointStores(): ServerEndpointStores;
+    /**
+     * Stores associated with remote nodes known by this node.
+     */
+    get clientStores(): ClientNodeStores;
+    storeForEndpoint(endpoint: Endpoint): import("./ServerEndpointStore.js").ServerEndpointStore;
+    erase(): Promise<void>;
+    load(): Promise<void>;
+}
+//# sourceMappingURL=ServerNodeStore.d.ts.map

package/dist/esm/storage/server/ServerNodeStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerNodeStore.d.ts","sourceRoot":"","sources":["../../../../src/storage/server/ServerNodeStore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAEH,YAAY,EAEZ,WAAW,EAKd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,SAAU,YAAW,YAAY;;gBAQtD,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM;WAqBvC,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM;IAItD,KAAK;IAQX;;OAEG;IACH,IAAI,cAAc,yBAEjB;IAED;;OAEG;IACH,IAAI,YAAY,qBAEf;IAMD,gBAAgB,CAAC,QAAQ,EAAE,QAAQ;IAInC,KAAK;IAIC,IAAI;CAWb"}

package/dist/esm/{node/storage → storage/server}/ServerNodeStore.js

@@ -11,13 +11,15 @@ import {
   StorageManager,
   StorageService
 } from "#general";
-import { ClientStoreFactory } from "./ClientStoreService.js";
-import { NodeStore } from "./NodeStore.js";
+import { NodeStore } from "../NodeStore.js";
+import { ClientNodeStores } from "../client/ClientNodeStores.js";
+import { ServerEndpointStores } from "./ServerEndpointStores.js";
 const logger = Logger.get("ServerNodeStore");
 class ServerNodeStore extends NodeStore {
   #env;
   #nodeId;
   #location;
+  #endpointStores;
   #storageManager;
   #clientStores;
   constructor(environment, nodeId) {
@@ -31,6 +33,7 @@ class ServerNodeStore extends NodeStore {
         return this.#storageManager.createContext(name);
       }
     });
+    this.#endpointStores = new ServerEndpointStores();
     this.#env = environment;
     this.#nodeId = nodeId;
     this.#location = this.#env.get(StorageService).location ?? "(unknown location)";
@@ -46,17 +49,33 @@ class ServerNodeStore extends NodeStore {
       this.#logChange("Closed");
     });
   }
+  /**
+   * Stores associated with server endpoints supported by this node.
+   */
+  get endpointStores() {
+    return this.construction.assert("endpoint stores", this.#endpointStores);
+  }
+  /**
+   * Stores associated with remote nodes known by this node.
+   */
   get clientStores() {
     return this.construction.assert("client stores", this.#clientStores);
   }
   #logChange(what) {
     logger.info(what, Diagnostic.strong(this.#nodeId ?? "node"), "storage at", `${this.#location}/${this.#nodeId}`);
   }
-  async initializeStorage() {
+  storeForEndpoint(endpoint) {
+    return this.#endpointStores.storeForEndpoint(endpoint);
+  }
+  erase() {
+    return this.#endpointStores.erase();
+  }
+  async load() {
     this.#storageManager = await this.#env.get(StorageService).open(this.#nodeId);
     this.#env.set(StorageManager, this.#storageManager);
-    this.#clientStores = await asyncNew(ClientStoreFactory, this.#storageManager.createContext("nodes"));
-    await super.initializeStorage();
+    this.#clientStores = await asyncNew(ClientNodeStores, this.#storageManager.createContext("nodes"));
+    const rootContext = this.storageFactory.createContext("root");
+    await this.#endpointStores.load(rootContext);
     this.#logChange("Opened");
   }
 }

package/dist/esm/storage/server/ServerNodeStore.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/storage/server/ServerNodeStore.ts"],
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;AAAA,EACI;AAAA,EAEA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,iBAAiB;AAC1B,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AAErC,MAAM,SAAS,OAAO,IAAI,iBAAiB;AAMpC,MAAM,wBAAwB,UAAkC;AAAA,EACnE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,aAA0B,QAAgB;AAClD,UAAM;AAAA,MACF,eAAe,CAAC,SAAiB;AAC7B,YAAI,CAAC,KAAK,iBAAiB;AACvB,gBAAM,IAAI;AAAA,YACN,iCAAiC,IAAI;AAAA,UACzC;AAAA,QACJ;AACA,eAAO,KAAK,gBAAgB,cAAc,IAAI;AAAA,MAClD;AAAA,IACJ,CAAC;AAED,SAAK,kBAAkB,IAAI,qBAAqB;AAEhD,SAAK,OAAO;AACZ,SAAK,UAAU;AACf,SAAK,YAAY,KAAK,KAAK,IAAI,cAAc,EAAE,YAAY;AAE3D,SAAK,aAAa,MAAM;AAAA,EAC5B;AAAA,EAEA,aAAa,OAAO,aAA0B,QAAgB;AAC1D,WAAO,MAAM,SAAS,MAAM,aAAa,MAAM;AAAA,EACnD;AAAA,EAEA,MAAM,QAAQ;AACV,UAAM,KAAK,aAAa,MAAM,YAAY;AACtC,YAAM,KAAK,eAAe,MAAM;AAChC,YAAM,KAAK,iBAAiB,MAAM;AAClC,WAAK,WAAW,QAAQ;AAAA,IAC5B,CAAC;AAAA,EACL;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,iBAAiB;AACjB,WAAO,KAAK,aAAa,OAAO,mBAAmB,KAAK,eAAe;AAAA,EAC3E;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,eAAe;AACf,WAAO,KAAK,aAAa,OAAO,iBAAiB,KAAK,aAAa;AAAA,EACvE;AAAA,EAEA,WAAW,MAA2B;AAClC,WAAO,KAAK,MAAM,WAAW,OAAO,KAAK,WAAW,MAAM,GAAG,cAAc,GAAG,KAAK,SAAS,IAAI,KAAK,OAAO,EAAE;AAAA,EAClH;AAAA,EAEA,iBAAiB,UAAoB;AACjC,WAAO,KAAK,gBAAgB,iBAAiB,QAAQ;AAAA,EACzD;AAAA,EAEA,QAAQ;AACJ,WAAO,KAAK,gBAAgB,MAAM;AAAA,EACtC;AAAA,EAEA,MAAM,OAAO;AACT,SAAK,kBAAkB,MAAM,KAAK,KAAK,IAAI,cAAc,EAAE,KAAK,KAAK,OAAO;AAC5E,SAAK,KAAK,IAAI,gBAAgB,KAAK,eAAe;AAElD,SAAK,gBAAgB,MAAM,SAAS,kBAAkB,KAAK,gBAAgB,cAAc,OAAO,CAAC;AAEjG,UAAM,cAAc,KAAK,eAAe,cAAc,MAAM;AAC5D,UAAM,KAAK,gBAAgB,KAAK,WAAW;AAE3C,SAAK,WAAW,QAAQ;AAAA,EAC5B;AACJ;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/node",
-    "version": "0.15.1",
+    "version": "0.15.2-alpha.0-20250704-2715344f0",
     "description": "API for building Matter nodes",
     "keywords": [
         "iot",
@@ -42,14 +42,14 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.15.1",
-        "@matter/model": "0.15.1",
-        "@matter/types": "0.15.1",
-        "@matter/protocol": "0.15.1"
+        "@matter/general": "0.15.2-alpha.0-20250704-2715344f0",
+        "@matter/model": "0.15.2-alpha.0-20250704-2715344f0",
+        "@matter/types": "0.15.2-alpha.0-20250704-2715344f0",
+        "@matter/protocol": "0.15.2-alpha.0-20250704-2715344f0"
     },
     "devDependencies": {
-        "@matter/tools": "0.15.1",
-        "@matter/testing": "0.15.1"
+        "@matter/tools": "0.15.2-alpha.0-20250704-2715344f0",
+        "@matter/testing": "0.15.2-alpha.0-20250704-2715344f0"
     },
     "files": [
         "dist/**/*",
@@ -72,6 +72,10 @@
             }
         },
         "./load": {
+            "static-load": {
+                "types": "./dist/esm/loader/load.d.ts",
+                "default": "./dist/esm/loader/static.js"
+            },
             "import": {
                 "types": "./dist/esm/loader/load.d.ts",
                 "default": "./dist/esm/loader/load.mjs"

package/src/behavior/cluster/ClusterBehavior.ts

@@ -100,8 +100,9 @@ export class ClusterBehavior extends Behavior {
         this: This,
         cluster: ClusterT,
         schema?: Schema,
+        name?: string,
     ) {
-        return createType(cluster, this, schema) as ClusterBehavior.Type<ClusterT, This>;
+        return createType(cluster, this, schema, name) as ClusterBehavior.Type<ClusterT, This>;
     }
 
     /**
@@ -266,6 +267,7 @@ export namespace ClusterBehavior {
             this: This,
             cluster: ClusterT,
             schema?: Schema,
+            name?: string,
         ): ClusterBehavior.Type<ClusterT, This>;
 
         /**
@@ -380,4 +382,8 @@ export namespace ClusterBehavior {
      * See {@link ClusterInterface} for more details.
      */
     export declare const ExtensionInterface: {};
+
+    export function is(type: Behavior.Type): type is ClusterBehavior.Type {
+        return "cluster" in type;
+    }
 }

package/src/behavior/cluster/ClusterBehaviorCache.ts

@@ -5,9 +5,9 @@
  */
 
 import { Behavior } from "#behavior/Behavior.js";
-import { ClusterBehavior } from "#index.js";
 import { Schema } from "#model";
 import { ClusterType } from "#types";
+import type { ClusterBehavior } from "./ClusterBehavior.js";
 
 /**
  * To save memory we cache behavior implementations specialized for specific clusters.  This allows for efficient

package/src/behavior/cluster/ClusterBehaviorUtil.ts

@@ -47,7 +47,12 @@ export function introspectionInstanceOf(type: Behavior.Type) {
 /**
  * This is the actual implementation of ClusterBehavior.for().  The result must match {@link ClusterBehavior.Type}<C>.
  */
-export function createType<const C extends ClusterType>(cluster: C, base: Behavior.Type, schema?: Schema) {
+export function createType<const C extends ClusterType>(
+    cluster: C,
+    base: Behavior.Type,
+    schema?: Schema,
+    name?: string,
+) {
     if (schema === undefined) {
         if (base.schema) {
             schema = base.schema;
@@ -59,16 +64,21 @@ export function createType<const C extends ClusterType>(cluster: C, base: Behavi
 
     schema = syncFeatures(schema, cluster);
 
-    const cached = ClusterBehaviorCache.get(cluster, base, schema);
-    if (cached) {
-        return cached;
-    }
+    const useCache = name === undefined;
 
-    let name;
-    if (base.name.startsWith(cluster.name)) {
-        name = base.name;
-    } else {
-        name = `${cluster.name}Behavior`;
+    // If we are provided a name, the caller is creating a specialized version of the behavior.  Disable caching and
+    // do not create a name automatically
+    if (useCache) {
+        const cached = ClusterBehaviorCache.get(cluster, base, schema);
+        if (cached) {
+            return cached;
+        }
+
+        if (base.name.startsWith(cluster.name)) {
+            name = base.name;
+        } else {
+            name = `${cluster.name}Behavior`;
+        }
     }
 
     // Mutation of schema will almost certainly result in logic errors so ensure that can't happen
@@ -109,7 +119,9 @@ export function createType<const C extends ClusterType>(cluster: C, base: Behavi
         instanceDescriptors: createDefaultCommandDescriptors(cluster, base),
     }) as ClusterBehavior.Type;
 
-    ClusterBehaviorCache.set(cluster, base, schema, type);
+    if (useCache) {
+        ClusterBehaviorCache.set(cluster, base, schema, type);
+    }
 
     return type;
 }

package/src/behavior/cluster/ClusterInterface.ts

@@ -88,8 +88,6 @@ export namespace ClusterInterface {
     export type MappedMethodsOf<C extends Record<string, ClusterType.Command>> = string extends keyof C
         ? {}
         : {
-              readonly [K in keyof C as C[K] extends { optional: true } ? never : K]: MethodForCommand<C[K]>;
-          } & {
-              readonly [K in keyof C as C[K] extends { optional: true } ? K : never]?: MethodForCommand<C[K]>;
+              readonly [K in keyof C]: MethodForCommand<C[K]>;
           };
 }

package/src/behavior/cluster/FabricScopedDataHandler.ts

@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Behavior, ClusterBehavior } from "#behavior/index.js";
-import { Endpoint } from "#endpoint/Endpoint.js";
-import { SupportedElements } from "#endpoint/properties/Behaviors.js";
+import type { Behavior } from "#behavior/Behavior.js";
+import type { Endpoint } from "#endpoint/Endpoint.js";
+import type { SupportedElements } from "#endpoint/properties/Behaviors.js";
 import { createPromise, deepCopy, isObject, Logger, MaybePromise, withTimeout } from "#general";
-import { ServerNode } from "#node/ServerNode.js";
+import type { ServerNode } from "#node/ServerNode.js";
 import { OccurrenceManager, Val } from "#protocol";
-import { ClusterType, FabricIndex, ObjectSchema } from "#types";
+import type { ClusterType, FabricIndex, ObjectSchema } from "#types";
+import type { ClusterBehavior } from "./ClusterBehavior.js";
 
 const logger = Logger.get("FabricScopedDataHandler");
 

package/src/behavior/context/NodeActivity.ts

@@ -102,4 +102,10 @@ export namespace NodeActivity {
         frame(description: unknown): Disposable;
         close(): void;
     }
+
+    export const activityKey = Symbol("activity");
+
+    export interface WithActivity {
+        [activityKey]?: NodeActivity.Activity;
+    }
 }