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

package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Behavior } from "#behavior/Behavior.js";
+import { MdnsScannerTargetCriteria } from "#protocol";
 /**
  * Node controller functionality.
  *
@@ -15,11 +16,18 @@ import { Behavior } from "#behavior/Behavior.js";
 export declare class ControllerBehavior extends Behavior {
     #private;
     static readonly id = "controller";
+    internal: ControllerBehavior.Internal;
     state: ControllerBehavior.State;
     initialize(): Promise<void>;
     [Symbol.asyncDispose](): Promise<void>;
 }
 export declare namespace ControllerBehavior {
+    class Internal {
+        /**
+         * MDNS scanner criteria for each controlled fabric (keyed by operational ID).
+         */
+        mdnsTargetCriteria: MdnsScannerTargetCriteria;
+    }
     class State {
         /**
          * Set to false to disable scanning on BLE.

package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AA6BjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,QAAQ;;IAC5C,gBAAyB,EAAE,gBAAgB;IAEnC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAEzB,UAAU;IAwDV,CAAC,MAAM,CAAC,YAAY,CAAC;CAkDvC;AAED,yBAAiB,kBAAkB,CAAC;IAChC,MAAa,KAAK;QACd;;;;WAIG;QACH,GAAG,CAAC,EAAE,OAAO,CAAa;QAE1B;;;;WAIG;QACH,EAAE,CAAC,EAAE,OAAO,CAAa;QAEzB;;WAEG;QACH,gBAAgB,EAAG,MAAM,CAAC;KAC7B;CACJ"}
+{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EASH,yBAAyB,EAI5B,MAAM,WAAW,CAAC;AAOnB;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,QAAQ;;IAC5C,gBAAyB,EAAE,gBAAgB;IAEnC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAEzB,UAAU;IA2DV,CAAC,MAAM,CAAC,YAAY,CAAC;CAqEvC;AAED,yBAAiB,kBAAkB,CAAC;IAChC,MAAa,QAAQ;QACjB;;WAEG;QACH,kBAAkB,EAAE,yBAAyB,CAG3C;KACL;IAED,MAAa,KAAK;QACd;;;;WAIG;QACH,GAAG,CAAC,EAAE,OAAO,CAAa;QAE1B;;;;WAIG;QACH,EAAE,CAAC,EAAE,OAAO,CAAa;QAEzB;;WAEG;QACH,gBAAgB,SAAe;KAClC;CACJ"}

package/dist/esm/behavior/system/controller/ControllerBehavior.js

@@ -5,33 +5,27 @@
  */
 import { Behavior } from "#behavior/Behavior.js";
 import { BasicInformationBehavior } from "#behaviors/basic-information";
-import {
-  ImplementationError,
-  isNetworkInterface,
-  Logger,
-  MatterAggregateError,
-  NetInterfaceSet,
-  TransportInterfaceSet
-} from "#general";
+import { ImplementationError, isNetworkInterface, NetInterfaceSet, TransportInterfaceSet } from "#general";
 import { Node } from "#node/Node.js";
 import { InteractionServer } from "#node/server/InteractionServer.js";
 import {
   Ble,
+  ClientSubscriptionHandler,
+  ClientSubscriptions,
   FabricAuthority,
   FabricAuthorityConfigurationProvider,
   FabricManager,
+  MdnsScanner,
   MdnsService,
-  ScannerSet,
-  SubscriptionClient
+  ScannerSet
 } from "#protocol";
 import { CommissioningServer } from "../commissioning/CommissioningServer.js";
 import { NetworkServer } from "../network/NetworkServer.js";
 import { ActiveDiscoveries } from "./discovery/ActiveDiscoveries.js";
-const logger = Logger.get("ControllerBehavior");
 class ControllerBehavior extends Behavior {
   static id = "controller";
   async initialize() {
-    if (this.state.adminFabricLabel === void 0) {
+    if (this.state.adminFabricLabel === void 0 || this.state.adminFabricLabel === "") {
       throw new ImplementationError("adminFabricLabel must be set for ControllerBehavior.");
     }
     const adminFabricLabel = this.state.adminFabricLabel;
@@ -61,10 +55,11 @@ class ControllerBehavior extends Behavior {
         }()
       );
     }
+    await this.env.load(FabricAuthority);
     const commissioning = this.agent.get(CommissioningServer);
     if (commissioning.state.enabled === void 0) {
-      const controlledFabrics = this.env.get(FabricAuthority).fabrics.length;
       const totalFabrics = this.env.get(FabricManager).length;
+      const controlledFabrics = this.env.get(FabricAuthority).fabrics.length;
       if (controlledFabrics === totalFabrics) {
         commissioning.state.enabled = false;
       }
@@ -76,15 +71,7 @@ class ControllerBehavior extends Behavior {
     }
   }
   async [Symbol.asyncDispose]() {
-    const discoveries = this.env.get(ActiveDiscoveries);
-    while (discoveries.size) {
-      for (const discovery of discoveries) {
-        discovery.cancel();
-      }
-      await MatterAggregateError.allSettled([...discoveries], "Error while cancelling discoveries").catch(
-        (error) => logger.error(error)
-      );
-    }
+    await this.env.close(ActiveDiscoveries);
     this.env.delete(FabricAuthority);
     this.env.delete(ScannerSet);
   }
@@ -99,11 +86,24 @@ class ControllerBehavior extends Behavior {
     if (this.state.ble) {
       netInterfaces.add(Ble.get().getBleCentralInterface());
     }
-    this.env.get(InteractionServer).clientHandler = this.env.get(SubscriptionClient);
+    const subscriptions = this.env.get(ClientSubscriptions);
+    const interactionServer = this.env.get(InteractionServer);
+    interactionServer.clientHandler = new ClientSubscriptionHandler(subscriptions);
     const node = Node.forEndpoint(this.endpoint);
     this.reactTo(node.lifecycle.goingOffline, this.#nodeGoingOffline);
+    const authority = this.env.get(FabricAuthority);
+    for (const fabric of authority.fabrics) {
+      this.#enableScanningForFabric(fabric);
+    }
+    this.reactTo(authority.fabricAdded, this.#enableScanningForFabric);
+    const scanners = this.env.get(ScannerSet);
+    for (const scanner of scanners) {
+      this.#enableScanningForScanner(scanner);
+    }
+    this.reactTo(scanners.added, this.#enableScanningForScanner);
   }
   async #nodeGoingOffline() {
+    await this.env.close(ClientSubscriptions);
     const netInterfaces = this.env.get(NetInterfaceSet);
     const netTransports = this.env.get(TransportInterfaceSet);
     for (const intf of netInterfaces) {
@@ -113,8 +113,27 @@ class ControllerBehavior extends Behavior {
     }
     await this.env.close(NetInterfaceSet);
   }
+  #enableScanningForFabric(fabric) {
+    this.internal.mdnsTargetCriteria.operationalTargets.push({ operationalId: fabric.operationalId });
+  }
+  #enableScanningForScanner(scanner) {
+    if (!(scanner instanceof MdnsScanner)) {
+      return;
+    }
+    scanner.targetCriteriaProviders.add(this.internal.mdnsTargetCriteria);
+  }
 }
 ((ControllerBehavior2) => {
+  class Internal {
+    /**
+     * MDNS scanner criteria for each controlled fabric (keyed by operational ID).
+     */
+    mdnsTargetCriteria = {
+      commissionable: true,
+      operationalTargets: []
+    };
+  }
+  ControllerBehavior2.Internal = Internal;
   class State {
     /**
      * Set to false to disable scanning on BLE.
@@ -131,7 +150,7 @@ class ControllerBehavior extends Behavior {
     /**
      * Contains the label of the admin fabric which is set for all commissioned devices
      */
-    adminFabricLabel;
+    adminFabricLabel = "matter.js";
   }
   ControllerBehavior2.State = State;
 })(ControllerBehavior || (ControllerBehavior = {}));

package/dist/esm/behavior/system/controller/ControllerBehavior.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["ControllerBehavior"]
 }

package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.d.ts

@@ -9,6 +9,9 @@ import type { Discovery } from "./Discovery.js";
  * Ongoing node discoveries registered with the environment.
  */
 export declare class ActiveDiscoveries extends Set<Discovery<any>> {
+    #private;
+    constructor(env: Environment);
     static [Environmental.create](env: Environment): ActiveDiscoveries;
+    close(): Promise<void>;
 }
 //# sourceMappingURL=ActiveDiscoveries.d.ts.map

package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActiveDiscoveries.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/ActiveDiscoveries.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;CAKjD"}
+{"version":3,"file":"ActiveDiscoveries.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/ActiveDiscoveries.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;;gBAI1C,GAAG,EAAE,WAAW;IAS5B,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAMxC,KAAK;CAmCd"}

package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.js

@@ -4,12 +4,51 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Environmental } from "#general";
+import { MdnsScanner, ScannerSet } from "#protocol";
 class ActiveDiscoveries extends Set {
+  #env;
+  #mdnsTargetCriteria;
+  constructor(env) {
+    super();
+    this.#env = env;
+    this.#activateCommissionableScanning();
+    env.get(ScannerSet).added.on(this.#activateCommissionableScanningFor.bind(this));
+  }
   static [Environmental.create](env) {
-    const instance = new ActiveDiscoveries();
+    const instance = new ActiveDiscoveries(env);
     env.set(ActiveDiscoveries, instance);
     return instance;
   }
+  async close() {
+    this.#env.delete(ActiveDiscoveries, this);
+    this.#deactivateCommissionableScanning();
+  }
+  #activateCommissionableScanning() {
+    const scanners = this.#env.get(ScannerSet);
+    for (const scanner of scanners) {
+      this.#activateCommissionableScanningFor(scanner);
+    }
+  }
+  #activateCommissionableScanningFor(scanner) {
+    if (!(scanner instanceof MdnsScanner)) {
+      return;
+    }
+    if (this.#mdnsTargetCriteria === void 0) {
+      this.#mdnsTargetCriteria = { commissionable: true, operationalTargets: [] };
+    }
+    scanner.targetCriteriaProviders.add(this.#mdnsTargetCriteria);
+  }
+  #deactivateCommissionableScanning() {
+    if (!this.#mdnsTargetCriteria) {
+      return;
+    }
+    const scanners = this.#env.get(ScannerSet);
+    for (const scanner of scanners) {
+      if (scanner instanceof MdnsScanner) {
+        scanner.targetCriteriaProviders.delete(this.#mdnsTargetCriteria);
+      }
+    }
+  }
 }
 export {
   ActiveDiscoveries

package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/ActiveDiscoveries.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAsB,qBAAqB;AAMpC,MAAM,0BAA0B,IAAoB;AAAA,EACvD,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,kBAAkB;AACvC,QAAI,IAAI,mBAAmB,QAAQ;AACnC,WAAO;AAAA,EACX;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAsB,qBAAqB;AAC3C,SAAS,aAAiD,kBAAkB;AAMrE,MAAM,0BAA0B,IAAoB;AAAA,EACvD;AAAA,EACA;AAAA,EAEA,YAAY,KAAkB;AAC1B,UAAM;AAEN,SAAK,OAAO;AAEZ,SAAK,gCAAgC;AACrC,QAAI,IAAI,UAAU,EAAE,MAAM,GAAG,KAAK,mCAAmC,KAAK,IAAI,CAAC;AAAA,EACnF;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,kBAAkB,GAAG;AAC1C,QAAI,IAAI,mBAAmB,QAAQ;AACnC,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,KAAK,OAAO,mBAAmB,IAAI;AAExC,SAAK,kCAAkC;AAAA,EAC3C;AAAA,EAEA,kCAAkC;AAC9B,UAAM,WAAW,KAAK,KAAK,IAAI,UAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,WAAK,mCAAmC,OAAO;AAAA,IACnD;AAAA,EACJ;AAAA,EAEA,mCAAmC,SAAkB;AACjD,QAAI,EAAE,mBAAmB,cAAc;AACnC;AAAA,IACJ;AAEA,QAAI,KAAK,wBAAwB,QAAW;AACxC,WAAK,sBAAsB,EAAE,gBAAgB,MAAM,oBAAoB,CAAC,EAAE;AAAA,IAC9E;AACA,YAAQ,wBAAwB,IAAI,KAAK,mBAAmB;AAAA,EAChE;AAAA,EAEA,oCAAoC;AAChC,QAAI,CAAC,KAAK,qBAAqB;AAC3B;AAAA,IACJ;AACA,UAAM,WAAW,KAAK,KAAK,IAAI,UAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,UAAI,mBAAmB,aAAa;AAChC,gBAAQ,wBAAwB,OAAO,KAAK,mBAAmB;AAAA,MACnE;AAAA,IACJ;AAAA,EACJ;AACJ;",
   "names": []
 }

package/dist/esm/behavior/system/controller/discovery/CommissioningDiscovery.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { CommissioningClient } from "#behavior/system/commissioning/CommissioningClient.js";
+import { CommissioningClient } from "#behavior/system/commissioning/CommissioningClient.js";
 import type { ServerNode } from "#node/ServerNode.js";
 import type { Discovery } from "./Discovery.js";
 import { InstanceDiscovery } from "./InstanceDiscovery.js";
@@ -16,6 +16,6 @@ export declare class CommissioningDiscovery extends InstanceDiscovery {
     protected onComplete(): Promise<import("../../../../node/ClientNode.js").ClientNode>;
 }
 export declare namespace CommissioningDiscovery {
-    type Options = Discovery.Options & CommissioningClient.CommissioningOptions;
+    type Options = Discovery.InstanceOptions & CommissioningClient.CommissioningOptions;
 }
 //# sourceMappingURL=CommissioningDiscovery.d.ts.map

package/dist/esm/behavior/system/controller/discovery/CommissioningDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommissioningDiscovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/CommissioningDiscovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AACjG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;;gBAG7C,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,sBAAsB,CAAC,OAAO;cAK7C,UAAU;CAQtC;AAED,yBAAiB,sBAAsB,CAAC;IACpC,KAAY,OAAO,GAAG,SAAS,CAAC,OAAO,GAAG,mBAAmB,CAAC,oBAAoB,CAAC;CACtF"}
+{"version":3,"file":"CommissioningDiscovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/CommissioningDiscovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAC;AAC5F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;;gBAG7C,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,sBAAsB,CAAC,OAAO;cAa7C,UAAU;CAQtC;AAED,yBAAiB,sBAAsB,CAAC;IACpC,KAAY,OAAO,GAAG,SAAS,CAAC,eAAe,GAAG,mBAAmB,CAAC,oBAAoB,CAAC;CAC9F"}

package/dist/esm/behavior/system/controller/discovery/CommissioningDiscovery.js

@@ -3,10 +3,16 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { CommissioningClient } from "#behavior/system/commissioning/CommissioningClient.js";
 import { InstanceDiscovery } from "./InstanceDiscovery.js";
 class CommissioningDiscovery extends InstanceDiscovery {
   #options;
   constructor(owner, options) {
+    const opts = CommissioningClient.PasscodeOptions(options);
+    const { discriminator } = opts;
+    if (discriminator !== void 0) {
+      options = { ...options, longDiscriminator: discriminator };
+    }
     super(owner, options);
     this.#options = options;
   }

package/dist/esm/behavior/system/controller/discovery/CommissioningDiscovery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/CommissioningDiscovery.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AASA,SAAS,yBAAyB;AAK3B,MAAM,+BAA+B,kBAAkB;AAAA,EAC1D;AAAA,EAEA,YAAY,OAAmB,SAAyC;AACpE,UAAM,OAAO,OAAO;AACpB,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAyB,aAAa;AAClC,UAAM,OAAO,MAAM,MAAM,WAAW;AAGpC,UAAM,KAAK,IAAI,cAAc,WAAS,MAAM,cAAc,WAAW,KAAK,QAAQ,CAAC;AAEnF,WAAO;AAAA,EACX;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,2BAA2B;AAGpC,SAAS,yBAAyB;AAK3B,MAAM,+BAA+B,kBAAkB;AAAA,EAC1D;AAAA,EAEA,YAAY,OAAmB,SAAyC;AACpE,UAAM,OAAO,oBAAoB,gBAAgB,OAAO;AAExD,UAAM,EAAE,cAAc,IAAI;AAC1B,QAAI,kBAAkB,QAAW;AAC7B,gBAAU,EAAE,GAAG,SAAS,mBAAmB,cAAc;AAAA,IAC7D;AAEA,UAAM,OAAO,OAAO;AAEpB,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAyB,aAAa;AAClC,UAAM,OAAO,MAAM,MAAM,WAAW;AAGpC,UAAM,KAAK,IAAI,cAAc,WAAS,MAAM,cAAc,WAAW,KAAK,QAAQ,CAAC;AAEnF,WAAO;AAAA,EACX;AACJ;",
   "names": []
 }

package/dist/esm/behavior/system/controller/discovery/Discovery.d.ts

@@ -3,15 +3,10 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CancelablePromise, MatterAggregateError, MatterError, MaybePromise } from "#general";
+import { CancelablePromise, MaybePromise } from "#general";
 import type { ClientNode } from "#node/ClientNode.js";
 import type { ServerNode } from "#node/ServerNode.js";
 import { CommissionableDeviceIdentifiers } from "#protocol";
-export declare class DiscoveryError extends MatterError {
-    static [Symbol.hasInstance](instance: unknown): boolean;
-}
-export declare class DiscoveryAggregateError extends MatterAggregateError {
-}
 /**
  * Discovery of commissionable devices.
  *
@@ -20,6 +15,7 @@ export declare class DiscoveryAggregateError extends MatterAggregateError {
 export declare abstract class Discovery<T = unknown> extends CancelablePromise<T> {
     #private;
     constructor(owner: ServerNode, options: Discovery.Options | undefined);
+    get settled(): Promise<void>;
     protected abstract onDiscovered(node: ClientNode): void;
     protected abstract onComplete(): MaybePromise<T>;
     /**
@@ -27,13 +23,25 @@ export declare abstract class Discovery<T = unknown> extends CancelablePromise<T
      *
      * This will not abort node initialization but it will terminate any active discoveries.  The discovery result will
      * be the same as if the discovery had timed out.
+     *
+     * To abort the operation due to error use {@link cancel}.
      */
-    cancel(): void;
+    stop(): void;
     toString(): string;
+    protected onCancel(reason: Error): void;
 }
 export declare namespace Discovery {
     type Options = CommissionableDeviceIdentifiers & {
         timeoutSeconds?: number;
     };
+    type InstanceOptions = Options & {
+        /**
+         * The local ID to assign the node if newly discovered.  This is the stable identifier used for the node's "id"
+         * property.
+         *
+         * By default matter.js assigns an ID of the form "nodeN".
+         */
+        id?: string;
+    };
 }
 //# sourceMappingURL=Discovery.d.ts.map

package/dist/esm/behavior/system/controller/discovery/Discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Discovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/Discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAc,MAAM,WAAW,CAAC;AAIxE,qBAAa,cAAe,SAAQ,WAAW;WAC3B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,OAAO;CAMzD;AAED,qBAAa,uBAAwB,SAAQ,oBAAoB;CAAG;AAEpE;;;;GAIG;AACH,8BAAsB,SAAS,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;;gBAQzD,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,GAAG,SAAS;IAiBrE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IACvD,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,YAAY,CAAC,CAAC,CAAC;IAEhD;;;;;OAKG;IACM,MAAM;IASN,QAAQ;CAmJpB;AAED,yBAAiB,SAAS,CAAC;IACvB,KAAY,OAAO,GAAG,+BAA+B,GAAG;QACpD,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;CACL"}
+{"version":3,"file":"Discovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/Discovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAsB,YAAY,EAAe,MAAM,UAAU,CAAC;AAE5F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAc,MAAM,WAAW,CAAC;AAOxE;;;;GAIG;AACH,8BAAsB,SAAS,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;;gBAWzD,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,GAAG,SAAS;IA4BrE,IAAI,OAAO,kBAKV;IAED,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IACvD,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,YAAY,CAAC,CAAC,CAAC;IAEhD;;;;;;;OAOG;IACH,IAAI;IASK,QAAQ;cAuCE,QAAQ,CAAC,MAAM,EAAE,KAAK;CAmI5C;AAED,yBAAiB,SAAS,CAAC;IACvB,KAAY,OAAO,GAAG,+BAA+B,GAAG;QACpD,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IAEF,KAAY,eAAe,GAAG,OAAO,GAAG;QACpC;;;;;WAKG;QACH,EAAE,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACL"}

package/dist/esm/behavior/system/controller/discovery/Discovery.js

@@ -3,77 +3,101 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CancelablePromise, MatterAggregateError, MatterError, MaybePromise } from "#general";
+import { CancelablePromise, Diagnostic, Logger, MaybePromise, withTimeout } from "#general";
 import { ClientNodeFactory } from "#node/client/ClientNodeFactory.js";
 import { ScannerSet } from "#protocol";
 import { ControllerBehavior } from "../ControllerBehavior.js";
 import { ActiveDiscoveries } from "./ActiveDiscoveries.js";
-class DiscoveryError extends MatterError {
-  static [Symbol.hasInstance](instance) {
-    if (instance instanceof DiscoveryAggregateError) {
-      return true;
-    }
-    return super[Symbol.hasInstance](instance);
-  }
-}
-class DiscoveryAggregateError extends MatterAggregateError {
-}
+import { DiscoveryAggregateError } from "./DiscoveryError.js";
+const logger = Logger.get("Logger");
 class Discovery extends CancelablePromise {
-  #isCanceled = false;
-  #cancel;
+  #abortReason;
+  #isStopped = false;
+  #stopDiscovery;
   #owner;
   #options;
   #resolve;
   #reject;
+  #settled;
+  #resolveSettled;
   constructor(owner, options) {
     let resolve, reject;
     super((resolver, rejecter) => {
       resolve = resolver;
       reject = rejecter;
     });
-    this.#resolve = resolve;
-    this.#reject = reject;
+    this.#resolve = (result) => {
+      this.#isStopped = true;
+      this.#owner.env.get(ActiveDiscoveries).delete(this);
+      resolve(result);
+      this.#resolveSettled?.();
+    };
+    this.#reject = (cause) => {
+      this.#isStopped = true;
+      this.#owner.env.get(ActiveDiscoveries).delete(this);
+      reject(cause);
+      this.#resolveSettled?.();
+    };
     owner.env.get(ActiveDiscoveries).add(this);
     this.#owner = owner;
     this.#options = options ?? {};
     queueMicrotask(this.#initializeController.bind(this));
   }
+  get settled() {
+    if (this.#settled === void 0) {
+      this.#settled = new Promise((resolve) => this.#resolveSettled = resolve);
+    }
+    return this.#settled;
+  }
   /**
    * Terminate discovery.
    *
    * This will not abort node initialization but it will terminate any active discoveries.  The discovery result will
    * be the same as if the discovery had timed out.
+   *
+   * To abort the operation due to error use {@link cancel}.
    */
-  cancel() {
-    if (this.#isCanceled) {
+  stop() {
+    if (this.#isStopped) {
       return;
     }
-    this.#isCanceled = true;
-    this.#cancel?.();
+    this.#isStopped = true;
+    this.#stopDiscovery?.();
   }
   toString() {
+    const description = this.#description;
+    if (description === void 0) {
+      return "node discovery";
+    }
+    return `discovery of ${description}`;
+  }
+  get #description() {
     if ("instanceId" in this.#options) {
-      return `Discovery of node instance ${this.#options.instanceId}`;
+      return `node instance ${this.#options.instanceId}`;
     }
     if ("longDiscriminator" in this.#options) {
-      return `Discovery of node with discriminator ${this.#options.longDiscriminator}`;
+      return `node with discriminator ${this.#options.longDiscriminator}`;
     }
     if ("shortDiscriminator" in this.#options) {
-      return `Discovery of node with discriminator ${this.#options.shortDiscriminator}`;
+      return `node with discriminator ${this.#options.shortDiscriminator}`;
     }
     if ("productId" in this.#options && this.#options.productId !== void 0) {
       if ("vendorId" in this.#options) {
-        return `Discovery of product ${this.#options.productId} from vendor ${this.#options.vendorId}`;
+        return `product ${this.#options.productId} from vendor ${this.#options.vendorId}`;
       }
-      return `Discovery of product ${this.#options.productId}`;
+      return `product ${this.#options.productId}`;
     }
     if ("vendorId" in this.#options) {
-      return `Discovery of node from vendor ${this.#options.vendorId}`;
+      return `node from vendor ${this.#options.vendorId}`;
     }
     if ("deviceType" in this.#options) {
-      return `Discovery of node with device type ${this.#options.deviceType}`;
+      return `node with device type ${this.#options.deviceType}`;
     }
-    return "Node discovery";
+    return "node discovery";
+  }
+  onCancel(reason) {
+    this.#abortReason = reason;
+    this.stop();
   }
   /**
    * Step 1 - ensure node is initialized as a controller
@@ -97,8 +121,8 @@ class Discovery extends CancelablePromise {
    * Step 2 - ensure node is online
    */
   #startNode() {
-    if (this.#isCanceled) {
-      this.#invokeCompleter();
+    if (this.#isStopped) {
+      this.#afterDiscovery();
       return;
     }
     if (this.#owner.lifecycle.isOnline) {
@@ -111,14 +135,20 @@ class Discovery extends CancelablePromise {
    * Step 3 - perform actual discovery
    */
   #performDiscovery() {
-    if (this.#isCanceled) {
-      this.#invokeCompleter();
+    if (this.#isStopped) {
+      this.#afterDiscovery();
       return;
     }
+    const description = this.#description;
+    if (description === void 0) {
+      logger.info("Initiating", Diagnostic.strong("node discovery"));
+    } else {
+      logger.info("Initiating discovery of", Diagnostic.strong(description));
+    }
     const scanners = this.#owner.env.get(ScannerSet);
     const factory = this.#owner.env.get(ClientNodeFactory);
     const promises = new Array();
-    const cancelSignal = new Promise((resolve) => this.#cancel = resolve);
+    const cancelSignal = new Promise((resolve) => this.#stopDiscovery = resolve);
     for (const scanner of scanners) {
       promises.push(
         scanner.findCommissionableDevicesContinuously(
@@ -134,24 +164,33 @@ class Discovery extends CancelablePromise {
               }
             } else {
               node = factory.create({
+                id: this.#options.id,
                 environment: this.#owner.env,
                 commissioning: { descriptor }
               });
             }
             this.onDiscovered(node);
           },
-          this.#options.timeoutSeconds,
+          void 0,
           cancelSignal
         )
       );
     }
-    DiscoveryAggregateError.allSettled(promises, `${this} failed`).then(() => this.#invokeCompleter()).catch(this.#reject);
+    let promise = DiscoveryAggregateError.allSettled(promises, `${this} failed`);
+    if (this.#options.timeoutSeconds !== void 0) {
+      promise = withTimeout(this.#options.timeoutSeconds * 1e3, promise, this.stop.bind(this));
+    }
+    promise.then(this.#afterDiscovery.bind(this)).catch(this.#reject);
   }
   /**
    * Step 4 - invoke completion callback
    */
-  #invokeCompleter() {
+  #afterDiscovery() {
     let result;
+    if (this.#abortReason) {
+      this.#reject(this.#abortReason);
+      return;
+    }
     try {
       result = this.onComplete();
     } catch (e) {
@@ -159,22 +198,13 @@ class Discovery extends CancelablePromise {
       return;
     }
     if (MaybePromise.is(result)) {
-      result.then(this.#finish.bind(this), this.#reject);
+      result.then(this.#resolve.bind(this), this.#reject);
       return;
     }
-    this.#finish(result);
-  }
-  /**
-   * Step 5 - deregister from environment and resolve
-   */
-  #finish(result) {
-    this.#owner.env.get(ActiveDiscoveries).delete(this);
     this.#resolve(result);
   }
 }
 export {
-  Discovery,
-  DiscoveryAggregateError,
-  DiscoveryError
+  Discovery
 };
 //# sourceMappingURL=Discovery.js.map

package/dist/esm/behavior/system/controller/discovery/Discovery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/Discovery.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/behavior/system/controller/discovery/DiscoveryError.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { MatterAggregateError, MatterError } from "#general";
+export declare class DiscoveryError extends MatterError {
+    static [Symbol.hasInstance](instance: unknown): boolean;
+}
+export declare class DiscoveryAggregateError extends MatterAggregateError {
+}
+//# sourceMappingURL=DiscoveryError.d.ts.map

package/dist/esm/behavior/system/controller/discovery/DiscoveryError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DiscoveryError.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/DiscoveryError.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE7D,qBAAa,cAAe,SAAQ,WAAW;WAC3B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,OAAO;CAMzD;AAED,qBAAa,uBAAwB,SAAQ,oBAAoB;CAAG"}