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

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

@@ -18,9 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Discovery_exports = {};
 __export(Discovery_exports, {
-  Discovery: () => Discovery,
-  DiscoveryAggregateError: () => DiscoveryAggregateError,
-  DiscoveryError: () => DiscoveryError
+  Discovery: () => Discovery
 });
 module.exports = __toCommonJS(Discovery_exports);
 var import_general = require("#general");
@@ -28,77 +26,101 @@ var import_ClientNodeFactory = require("#node/client/ClientNodeFactory.js");
 var import_protocol = require("#protocol");
 var import_ControllerBehavior = require("../ControllerBehavior.js");
 var import_ActiveDiscoveries = require("./ActiveDiscoveries.js");
+var import_DiscoveryError = require("./DiscoveryError.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-class DiscoveryError extends import_general.MatterError {
-  static [Symbol.hasInstance](instance) {
-    if (instance instanceof DiscoveryAggregateError) {
-      return true;
-    }
-    return super[Symbol.hasInstance](instance);
-  }
-}
-class DiscoveryAggregateError extends import_general.MatterAggregateError {
-}
+const logger = import_general.Logger.get("Logger");
 class Discovery extends import_general.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(import_ActiveDiscoveries.ActiveDiscoveries).delete(this);
+      resolve(result);
+      this.#resolveSettled?.();
+    };
+    this.#reject = (cause) => {
+      this.#isStopped = true;
+      this.#owner.env.get(import_ActiveDiscoveries.ActiveDiscoveries).delete(this);
+      reject(cause);
+      this.#resolveSettled?.();
+    };
     owner.env.get(import_ActiveDiscoveries.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
@@ -122,8 +144,8 @@ class Discovery extends import_general.CancelablePromise {
    * Step 2 - ensure node is online
    */
   #startNode() {
-    if (this.#isCanceled) {
-      this.#invokeCompleter();
+    if (this.#isStopped) {
+      this.#afterDiscovery();
       return;
     }
     if (this.#owner.lifecycle.isOnline) {
@@ -136,14 +158,20 @@ class Discovery extends import_general.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", import_general.Diagnostic.strong("node discovery"));
+    } else {
+      logger.info("Initiating discovery of", import_general.Diagnostic.strong(description));
+    }
     const scanners = this.#owner.env.get(import_protocol.ScannerSet);
     const factory = this.#owner.env.get(import_ClientNodeFactory.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(
@@ -159,24 +187,33 @@ class Discovery extends import_general.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 = import_DiscoveryError.DiscoveryAggregateError.allSettled(promises, `${this} failed`);
+    if (this.#options.timeoutSeconds !== void 0) {
+      promise = (0, import_general.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) {
@@ -184,16 +221,9 @@ class Discovery extends import_general.CancelablePromise {
       return;
     }
     if (import_general.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(import_ActiveDiscoveries.ActiveDiscoveries).delete(this);
     this.#resolve(result);
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/Discovery.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAmF;AACnF,+BAAkC;AAGlC,sBAA4D;AAC5D,gCAAmC;AACnC,+BAAkC;AAZlC;AAAA;AAAA;AAAA;AAAA;AAcO,MAAM,uBAAuB,2BAAY;AAAA,EAC5C,QAAiB,OAAO,WAAW,EAAE,UAAmB;AACpD,QAAI,oBAAoB,yBAAyB;AAC7C,aAAO;AAAA,IACX;AACA,WAAO,MAAM,OAAO,WAAW,EAAE,QAAQ;AAAA,EAC7C;AACJ;AAEO,MAAM,gCAAgC,oCAAqB;AAAC;AAO5D,MAAe,kBAA+B,iCAAqB;AAAA,EACtE,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,OAAmB,SAAwC;AACnE,QAAI,SAA6B;AACjC,UAAM,CAAC,UAAU,aAAa;AAC1B,gBAAU;AACV,eAAS;AAAA,IACb,CAAC;AACD,SAAK,WAAW;AAChB,SAAK,UAAU;AAEf,UAAM,IAAI,IAAI,0CAAiB,EAAE,IAAI,IAAI;AAEzC,SAAK,SAAS;AACd,SAAK,WAAW,WAAW,CAAC;AAE5B,mBAAe,KAAK,sBAAsB,KAAK,IAAI,CAAC;AAAA,EACxD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWS,SAAS;AACd,QAAI,KAAK,aAAa;AAClB;AAAA,IACJ;AAEA,SAAK,cAAc;AACnB,SAAK,UAAU;AAAA,EACnB;AAAA,EAES,WAAW;AAChB,QAAI,gBAAgB,KAAK,UAAU;AAC/B,aAAO,8BAA8B,KAAK,SAAS,UAAU;AAAA,IACjE;AAEA,QAAI,uBAAuB,KAAK,UAAU;AACtC,aAAO,wCAAwC,KAAK,SAAS,iBAAiB;AAAA,IAClF;AAEA,QAAI,wBAAwB,KAAK,UAAU;AACvC,aAAO,wCAAwC,KAAK,SAAS,kBAAkB;AAAA,IACnF;AAEA,QAAI,eAAe,KAAK,YAAY,KAAK,SAAS,cAAc,QAAW;AACvE,UAAI,cAAc,KAAK,UAAU;AAC7B,eAAO,wBAAwB,KAAK,SAAS,SAAS,gBAAgB,KAAK,SAAS,QAAQ;AAAA,MAChG;AACA,aAAO,wBAAwB,KAAK,SAAS,SAAS;AAAA,IAC1D;AAEA,QAAI,cAAc,KAAK,UAAU;AAC7B,aAAO,iCAAiC,KAAK,SAAS,QAAQ;AAAA,IAClE;AAEA,QAAI,gBAAgB,KAAK,UAAU;AAC/B,aAAO,sCAAsC,KAAK,SAAS,UAAU;AAAA,IACzE;AAEA,WAAO;AAAA,EACX;AAAA;AAAA;AAAA;AAAA,EAKA,wBAAwB;AACpB,QAAI;AACJ,QAAI;AACA,WAAK,OAAO,UAAU,QAAQ,4CAAkB;AAChD,8BAAwB,KAAK,OAAO,IAAI,WAAS,MAAM,KAAK,4CAAkB,CAAC;AAAA,IACnF,SAAS,GAAG;AACR,WAAK,QAAQ,CAAC;AACd;AAAA,IACJ;AAEA,QAAI,4BAAa,GAAG,qBAAqB,GAAG;AACxC,4BAAsB,KAAK,KAAK,WAAW,KAAK,IAAI,GAAG,KAAK,OAAO;AACnE;AAAA,IACJ;AAEA,SAAK,WAAW;AAAA,EACpB;AAAA;AAAA;AAAA;AAAA,EAKA,aAAa;AACT,QAAI,KAAK,aAAa;AAClB,WAAK,iBAAiB;AACtB;AAAA,IACJ;AAEA,QAAI,KAAK,OAAO,UAAU,UAAU;AAChC,WAAK,kBAAkB;AACvB;AAAA,IACJ;AAEA,SAAK,OAAO,MAAM,EAAE,KAAK,KAAK,kBAAkB,KAAK,IAAI,GAAG,KAAK,OAAO;AAAA,EAC5E;AAAA;AAAA;AAAA;AAAA,EAKA,oBAAoB;AAChB,QAAI,KAAK,aAAa;AAClB,WAAK,iBAAiB;AACtB;AAAA,IACJ;AAEA,UAAM,WAAW,KAAK,OAAO,IAAI,IAAI,0BAAU;AAE/C,UAAM,UAAU,KAAK,OAAO,IAAI,IAAI,0CAAiB;AACrD,UAAM,WAAW,IAAI,MAA4B;AACjD,UAAM,eAAe,IAAI,QAAc,aAAY,KAAK,UAAU,OAAQ;AAC1E,eAAW,WAAW,UAAU;AAC5B,eAAS;AAAA,QACL,QAAQ;AAAA,UACJ,KAAK;AAAA,UACL,gBAAc;AAEV,gBAAI,OAAO,QAAQ,KAAK,UAAU;AAElC,gBAAI,MAAM;AAEN,oBAAM,gBAAgB,KAAK,IAAI,WAAS;AACpC,sBAAM,cAAc,aAAa;AAAA,cACrC,CAAC;AACD,kBAAI,4BAAa,GAAG,aAAa,GAAG;AAChC,yBAAS,KAAK,aAAa;AAAA,cAC/B;AAAA,YACJ,OAAO;AAEH,qBAAO,QAAQ,OAAO;AAAA,gBAClB,aAAa,KAAK,OAAO;AAAA,gBACzB,eAAe,EAAE,WAAW;AAAA,cAChC,CAAC;AAAA,YACL;AAEA,iBAAK,aAAa,IAAI;AAAA,UAC1B;AAAA,UACA,KAAK,SAAS;AAAA,UACd;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAEA,4BAAwB,WAAW,UAAU,GAAG,IAAI,SAAS,EACxD,KAAK,MAAM,KAAK,iBAAiB,CAAC,EAClC,MAAM,KAAK,OAAO;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA,EAKA,mBAAmB;AACf,QAAI;AACJ,QAAI;AACA,eAAS,KAAK,WAAW;AAAA,IAC7B,SAAS,GAAG;AACR,WAAK,QAAQ,CAAC;AACd;AAAA,IACJ;AAEA,QAAI,4BAAa,GAAG,MAAM,GAAG;AACzB,aAAO,KAAK,KAAK,QAAQ,KAAK,IAAI,GAAG,KAAK,OAAO;AACjD;AAAA,IACJ;AAEA,SAAK,QAAQ,MAAM;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA,EAKA,QAAQ,QAAW;AACf,SAAK,OAAO,IAAI,IAAI,0CAAiB,EAAE,OAAO,IAAI;AAClD,SAAK,SAAS,MAAM;AAAA,EACxB;AACJ;",
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/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/cjs/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"}

package/dist/cjs/behavior/system/controller/discovery/DiscoveryError.js

@@ -0,0 +1,41 @@
+"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 DiscoveryError_exports = {};
+__export(DiscoveryError_exports, {
+  DiscoveryAggregateError: () => DiscoveryAggregateError,
+  DiscoveryError: () => DiscoveryError
+});
+module.exports = __toCommonJS(DiscoveryError_exports);
+var import_general = require("#general");
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class DiscoveryError extends import_general.MatterError {
+  static [Symbol.hasInstance](instance) {
+    if (instance instanceof DiscoveryAggregateError) {
+      return true;
+    }
+    return super[Symbol.hasInstance](instance);
+  }
+}
+class DiscoveryAggregateError extends import_general.MatterAggregateError {
+}
+//# sourceMappingURL=DiscoveryError.js.map

package/dist/cjs/behavior/system/controller/discovery/DiscoveryError.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../src/behavior/system/controller/discovery/DiscoveryError.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAkD;AANlD;AAAA;AAAA;AAAA;AAAA;AAQO,MAAM,uBAAuB,2BAAY;AAAA,EAC5C,QAAiB,OAAO,WAAW,EAAE,UAAmB;AACpD,QAAI,oBAAoB,yBAAyB;AAC7C,aAAO;AAAA,IACX;AACA,WAAO,MAAM,OAAO,WAAW,EAAE,QAAQ;AAAA,EAC7C;AACJ;AAEO,MAAM,gCAAgC,oCAAqB;AAAC;",
+  "names": []
+}

package/dist/cjs/behavior/system/controller/discovery/InstanceDiscovery.d.ts

@@ -14,7 +14,7 @@ import { Discovery } from "./Discovery.js";
  */
 export declare class InstanceDiscovery extends Discovery<ClientNode> {
     #private;
-    constructor(owner: ServerNode, options?: Discovery.Options);
+    constructor(owner: ServerNode, options?: Discovery.InstanceOptions);
     protected onDiscovered(node: ClientNode): void;
     protected onComplete(): MaybePromise<ClientNode>;
 }

package/dist/cjs/behavior/system/controller/discovery/InstanceDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceDiscovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/InstanceDiscovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAkB,MAAM,gBAAgB,CAAC;AAE3D;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,SAAS,CAAC,UAAU,CAAC;;gBAG5C,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAI1D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU;IAKvC,SAAS,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC;CAMnD"}
+{"version":3,"file":"InstanceDiscovery.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/InstanceDiscovery.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,SAAS,CAAC,UAAU,CAAC;;gBAG5C,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,eAAe;IAIlE,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU;IAKvC,SAAS,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC;CAMnD"}

package/dist/cjs/behavior/system/controller/discovery/InstanceDiscovery.js

@@ -22,6 +22,7 @@ __export(InstanceDiscovery_exports, {
 });
 module.exports = __toCommonJS(InstanceDiscovery_exports);
 var import_Discovery = require("./Discovery.js");
+var import_DiscoveryError = require("./DiscoveryError.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
@@ -34,11 +35,11 @@ class InstanceDiscovery extends import_Discovery.Discovery {
   }
   onDiscovered(node) {
     this.#result = node;
-    this.cancel();
+    this.stop();
   }
   onComplete() {
     if (this.#result === void 0) {
-      throw new import_Discovery.DiscoveryError(`${this} failed: Node not found`);
+      throw new import_DiscoveryError.DiscoveryError(`${this} failed: Node not found`);
     }
     return this.#result;
   }

package/dist/cjs/behavior/system/controller/discovery/InstanceDiscovery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/InstanceDiscovery.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,uBAA0C;AAT1C;AAAA;AAAA;AAAA;AAAA;AAgBO,MAAM,0BAA0B,2BAAsB;AAAA,EACzD;AAAA,EAEA,YAAY,OAAmB,SAA6B;AACxD,UAAM,OAAO,OAAO;AAAA,EACxB;AAAA,EAEU,aAAa,MAAkB;AACrC,SAAK,UAAU;AACf,SAAK,OAAO;AAAA,EAChB;AAAA,EAEU,aAAuC;AAC7C,QAAI,KAAK,YAAY,QAAW;AAC5B,YAAM,IAAI,gCAAe,GAAG,IAAI,yBAAyB;AAAA,IAC7D;AACA,WAAO,KAAK;AAAA,EAChB;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,uBAA0B;AAC1B,4BAA+B;AAV/B;AAAA;AAAA;AAAA;AAAA;AAiBO,MAAM,0BAA0B,2BAAsB;AAAA,EACzD;AAAA,EAEA,YAAY,OAAmB,SAAqC;AAChE,UAAM,OAAO,OAAO;AAAA,EACxB;AAAA,EAEU,aAAa,MAAkB;AACrC,SAAK,UAAU;AACf,SAAK,KAAK;AAAA,EACd;AAAA,EAEU,aAAuC;AAC7C,QAAI,KAAK,YAAY,QAAW;AAC5B,YAAM,IAAI,qCAAe,GAAG,IAAI,yBAAyB;AAAA,IAC7D;AACA,WAAO,KAAK;AAAA,EAChB;AACJ;",
   "names": []
 }

package/dist/cjs/behavior/system/controller/discovery/index.d.ts

@@ -7,5 +7,6 @@ export * from "./ActiveDiscoveries.js";
 export * from "./CommissioningDiscovery.js";
 export * from "./ContinuousDiscovery.js";
 export * from "./Discovery.js";
+export * from "./DiscoveryError.js";
 export * from "./InstanceDiscovery.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/behavior/system/controller/discovery/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/behavior/system/controller/discovery/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}

package/dist/cjs/behavior/system/controller/discovery/index.js

@@ -19,6 +19,7 @@ __reExport(discovery_exports, require("./ActiveDiscoveries.js"), module.exports)
 __reExport(discovery_exports, require("./CommissioningDiscovery.js"), module.exports);
 __reExport(discovery_exports, require("./ContinuousDiscovery.js"), module.exports);
 __reExport(discovery_exports, require("./Discovery.js"), module.exports);
+__reExport(discovery_exports, require("./DiscoveryError.js"), module.exports);
 __reExport(discovery_exports, require("./InstanceDiscovery.js"), module.exports);
 /**
  * @license

package/dist/cjs/behavior/system/controller/discovery/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/system/controller/discovery/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,8BAAc,mCANd;AAOA,8BAAc,wCAPd;AAQA,8BAAc,qCARd;AASA,8BAAc,2BATd;AAUA,8BAAc,mCAVd;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,8BAAc,mCANd;AAOA,8BAAc,wCAPd;AAQA,8BAAc,qCARd;AASA,8BAAc,2BATd;AAUA,8BAAc,gCAVd;AAWA,8BAAc,mCAXd;AAAA;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }

package/dist/cjs/behavior/system/network/ClientNetworkRuntime.d.ts

@@ -5,7 +5,6 @@
  */
 import { MatterError } from "#general";
 import type { ClientNode } from "#node/ClientNode.js";
-import { Interactable } from "#protocol";
 import { NetworkRuntime } from "./NetworkRuntime.js";
 export declare class UncommissionedError extends MatterError {
 }
@@ -17,7 +16,6 @@ export declare class OfflineError extends MatterError {
 export declare class ClientNetworkRuntime extends NetworkRuntime {
     #private;
     constructor(owner: ClientNode);
-    interact<T>(interactor: (client: Interactable) => Promise<T>): Promise<T>;
     protected start(): Promise<void>;
     protected stop(): Promise<void>;
     blockNewActivity(): void;

package/dist/cjs/behavior/system/network/ClientNetworkRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAmC,WAAW,EAAgC,MAAM,UAAU,CAAC;AACtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAuC,YAAY,EAAW,MAAM,WAAW,CAAC;AAGvF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,qBAAa,YAAa,SAAQ,WAAW;CAAG;AAIhD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;gBAIxC,KAAK,EAAE,UAAU;IAI7B,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC;cAgB5C,KAAK;cAiBL,IAAI;IA8BpB,gBAAgB;CAGnB"}
+{"version":3,"file":"ClientNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAyB,WAAW,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,qBAAa,YAAa,SAAQ,WAAW;CAAG;AAIhD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;gBAGxC,KAAK,EAAE,UAAU;cAIb,KAAK;cAqBL,IAAI;IAUpB,gBAAgB;CAGnB"}

package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js

@@ -39,27 +39,20 @@ class OfflineError extends import_general.MatterError {
 }
 const logger = import_general.Logger.get("ClientNetworkRuntime");
 class ClientNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
-  #interactions = new import_general.BasicSet();
   #client;
   constructor(owner) {
     super(owner);
   }
-  interact(interactor) {
-    if (this.#client === void 0) {
-      throw new import_general.UninitializedDependencyError(`Node ${this.owner}`, `Interaction client unavailable`);
-    }
-    const { promise, resolver, rejecter } = (0, import_general.createPromise)();
-    this.#interactions.add(promise);
-    interactor(this.#client).then(resolver, rejecter).finally(() => this.#interactions.delete(promise));
-    return promise;
-  }
   async start() {
     if (!this.owner.lifecycle.isCommissioned) {
-      throw new UncommissionedError(`Node unavailable: ${this.owner} is uncommissioned`);
+      throw new UncommissionedError(`Cannot interact with ${this.owner} because it is uncommissioned`);
     }
     const commissioningState = this.owner.stateOf(import_CommissioningClient.CommissioningClient);
     const address = this.owner.stateOf(import_CommissioningClient.CommissioningClient).peerAddress;
     const peers = this.owner.env.get(import_protocol.PeerSet);
+    if (address === void 0) {
+      throw new import_general.InternalError(`Commissioned node ${this.owner} has no peer address`);
+    }
     const exchangeProvider = await peers.exchangeProviderFor(address, {
       discoveryData: import_RemoteDescriptor.RemoteDescriptor.fromLongForm(commissioningState)
     });
@@ -68,25 +61,14 @@ class ClientNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
   }
   async stop() {
     await this.construction;
-    this.blockNewActivity();
     try {
+      await this.#client?.close();
     } catch (e) {
       logger.error(`Error closing connection to ${this.owner}`, e);
     }
-    if (this.#interactions.size) {
-      await new Promise((resolve) => {
-        const deletionListener = () => {
-          if (!this.#interactions.size) {
-            this.#interactions.deleted.off(deletionListener);
-            resolve();
-          }
-        };
-        this.#interactions.deleted.on(deletionListener);
-      });
-    }
   }
   blockNewActivity() {
-    this.#client = void 0;
+    this.owner.env.delete(import_protocol.ClientInteraction, this.#client);
   }
 }
 //# sourceMappingURL=ClientNetworkRuntime.js.map

package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2F;AAE3F,sBAA2E;AAC3E,iCAAoC;AACpC,8BAAiC;AACjC,4BAA+B;AAX/B;AAAA;AAAA;AAAA;AAAA;AAaO,MAAM,4BAA4B,2BAAY;AAAC;AAC/C,MAAM,qBAAqB,2BAAY;AAAC;AAE/C,MAAM,SAAS,sBAAO,IAAI,sBAAsB;AAKzC,MAAM,6BAA6B,qCAAe;AAAA,EACrD,gBAAgB,IAAI,wBAA2B;AAAA,EAC/C;AAAA,EAEA,YAAY,OAAmB;AAC3B,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,SAAY,YAAkD;AAC1D,QAAI,KAAK,YAAY,QAAW;AAC5B,YAAM,IAAI,4CAA6B,QAAQ,KAAK,KAAK,IAAI,gCAAgC;AAAA,IACjG;AAEA,UAAM,EAAE,SAAS,UAAU,SAAS,QAAI,8BAAiB;AAEzD,SAAK,cAAc,IAAI,OAAO;AAE9B,eAAW,KAAK,OAAO,EAClB,KAAK,UAAU,QAAQ,EACvB,QAAQ,MAAM,KAAK,cAAc,OAAO,OAAO,CAAC;AAErD,WAAO;AAAA,EACX;AAAA,EAEA,MAAgB,QAAQ;AACpB,QAAI,CAAC,KAAK,MAAM,UAAU,gBAAgB;AACtC,YAAM,IAAI,oBAAoB,qBAAqB,KAAK,KAAK,oBAAoB;AAAA,IACrF;AAEA,UAAM,qBAAqB,KAAK,MAAM,QAAQ,8CAAmB;AACjE,UAAM,UAAU,KAAK,MAAM,QAAQ,8CAAmB,EAAE;AACxD,UAAM,QAAQ,KAAK,MAAM,IAAI,IAAI,uBAAO;AAExC,UAAM,mBAAmB,MAAM,MAAM,oBAAoB,SAAS;AAAA,MAC9D,eAAe,yCAAiB,aAAa,kBAAkB;AAAA,IACnE,CAAC;AACD,SAAK,MAAM,IAAI,IAAI,kCAAkB,gBAAgB;AAErD,SAAK,UAAU,KAAK,MAAM,IAAI,IAAI,iCAAiB;AAAA,EACvD;AAAA,EAEA,MAAgB,OAAO;AACnB,UAAM,KAAK;AAEX,SAAK,iBAAiB;AAItB,QAAI;AAAA,IAGJ,SAAS,GAAG;AACR,aAAO,MAAM,+BAA+B,KAAK,KAAK,IAAI,CAAC;AAAA,IAC/D;AAEA,QAAI,KAAK,cAAc,MAAM;AAGzB,YAAM,IAAI,QAAc,aAAW;AAC/B,cAAM,mBAAmB,MAAM;AAC3B,cAAI,CAAC,KAAK,cAAc,MAAM;AAC1B,iBAAK,cAAc,QAAQ,IAAI,gBAAgB;AAC/C,oBAAQ;AAAA,UACZ;AAAA,QACJ;AAEA,aAAK,cAAc,QAAQ,GAAG,gBAAgB;AAAA,MAClD,CAAC;AAAA,IACL;AAAA,EACJ;AAAA,EAEA,mBAAmB;AACf,SAAK,UAAU;AAAA,EACnB;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAmD;AAEnD,sBAA6D;AAC7D,iCAAoC;AACpC,8BAAiC;AACjC,4BAA+B;AAX/B;AAAA;AAAA;AAAA;AAAA;AAaO,MAAM,4BAA4B,2BAAY;AAAC;AAC/C,MAAM,qBAAqB,2BAAY;AAAC;AAE/C,MAAM,SAAS,sBAAO,IAAI,sBAAsB;AAKzC,MAAM,6BAA6B,qCAAe;AAAA,EACrD;AAAA,EAEA,YAAY,OAAmB;AAC3B,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,MAAgB,QAAQ;AACpB,QAAI,CAAC,KAAK,MAAM,UAAU,gBAAgB;AACtC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,+BAA+B;AAAA,IACnG;AAEA,UAAM,qBAAqB,KAAK,MAAM,QAAQ,8CAAmB;AACjE,UAAM,UAAU,KAAK,MAAM,QAAQ,8CAAmB,EAAE;AACxD,UAAM,QAAQ,KAAK,MAAM,IAAI,IAAI,uBAAO;AAExC,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,6BAAc,qBAAqB,KAAK,KAAK,sBAAsB;AAAA,IACjF;AAEA,UAAM,mBAAmB,MAAM,MAAM,oBAAoB,SAAS;AAAA,MAC9D,eAAe,yCAAiB,aAAa,kBAAkB;AAAA,IACnE,CAAC;AACD,SAAK,MAAM,IAAI,IAAI,kCAAkB,gBAAgB;AAErD,SAAK,UAAU,KAAK,MAAM,IAAI,IAAI,iCAAiB;AAAA,EACvD;AAAA,EAEA,MAAgB,OAAO;AACnB,UAAM,KAAK;AAEX,QAAI;AACA,YAAM,KAAK,SAAS,MAAM;AAAA,IAC9B,SAAS,GAAG;AACR,aAAO,MAAM,+BAA+B,KAAK,KAAK,IAAI,CAAC;AAAA,IAC/D;AAAA,EACJ;AAAA,EAEA,mBAAmB;AACf,SAAK,MAAM,IAAI,OAAO,mCAAmB,KAAK,OAAO;AAAA,EACzD;AACJ;",
   "names": []
 }

package/dist/cjs/behavior/system/network/NetworkClient.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { DatatypeModel } from "#model";
-import { Interactable, Subscribe } from "#protocol";
+import { Subscribe } from "#protocol";
 import { ClientNetworkRuntime } from "./ClientNetworkRuntime.js";
 import { NetworkBehavior } from "./NetworkBehavior.js";
 export declare class NetworkClient extends NetworkBehavior {
@@ -12,7 +12,6 @@ export declare class NetworkClient extends NetworkBehavior {
     internal: NetworkClient.Internal;
     state: NetworkClient.State;
     initialize(): void;
-    interact<T>(interactor: (client: Interactable) => Promise<T>): Promise<T>;
     protected startup(): Promise<void>;
     /**
      * Define logical schema for fields that should persist.
@@ -27,13 +26,10 @@ export declare namespace NetworkClient {
         /**
          * A subscription installed when the node is first commissioned and when the service is restarted.
          *
-         * The default subscription is a wildcard for all attributes and events of the node.  You can set to undefined
-         * or filter the fields and values but this will prevent the relevant state values from loading.
+         * The default subscription is a wildcard for all attributes and of the node.  You can set to undefined or
+         * filter the fields and values but only values selected by this subscription will update automatically.
          *
-         * If this subscription does not include appropriate BasicInformation and Descriptor attributes then the
-         * endpoint structure may not initialize fully.
-         *
-         * Set to null to disable.
+         * Set to null to disable automatic subscription.
          */
         startupSubscription?: Subscribe | null;
     }

package/dist/cjs/behavior/system/network/NetworkClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,qBAAa,aAAc,SAAQ,eAAe;;IACtC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC;IACjC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;IAE1B,UAAU;IAInB,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC;cAQ5C,OAAO;IAsBvB;;OAEG;IACH,gBAAyB,MAAM,gBAY5B;CACN;AAED,yBAAiB,aAAa,CAAC;IAC3B,MAAa,QAAS,SAAQ,eAAe,CAAC,QAAQ;QAC1C,OAAO,CAAC,EAAE,oBAAoB,CAAC;KAC1C;IAED,MAAa,KAAM,SAAQ,eAAe,CAAC,KAAK;QAC5C;;;;;;;;;;WAUG;QACH,mBAAmB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;KAC1C;CACJ"}
+{"version":3,"file":"NetworkClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAErD,OAAO,EAAsC,SAAS,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBAAa,aAAc,SAAQ,eAAe;;IACtC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC;IACjC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;IAE1B,UAAU;cAIH,OAAO;IA2BvB;;OAEG;IACH,gBAAyB,MAAM,gBAY5B;CACN;AAED,yBAAiB,aAAa,CAAC;IAC3B,MAAa,QAAS,SAAQ,eAAe,CAAC,QAAQ;QAC1C,OAAO,CAAC,EAAE,oBAAoB,CAAC;KAC1C;IAED,MAAa,KAAM,SAAQ,eAAe,CAAC,KAAK;QAC5C;;;;;;;WAOG;QACH,mBAAmB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;KAC1C;CACJ"}

package/dist/cjs/behavior/system/network/NetworkClient.js

@@ -21,9 +21,8 @@ __export(NetworkClient_exports, {
   NetworkClient: () => NetworkClient
 });
 module.exports = __toCommonJS(NetworkClient_exports);
-var import_root = require("#endpoints/root");
-var import_general = require("#general");
 var import_model = require("#model");
+var import_Node = require("#node/Node.js");
 var import_protocol = require("#protocol");
 var import_NetworkBehavior = require("./NetworkBehavior.js");
 /**
@@ -31,33 +30,27 @@ var import_NetworkBehavior = require("./NetworkBehavior.js");
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-const DEFAULT_MIN_INTERVAL_FLOOR_SECONDS = 1;
 class NetworkClient extends import_NetworkBehavior.NetworkBehavior {
   initialize() {
     this.reactTo(this.#node.lifecycle.online, this.startup);
   }
-  interact(interactor) {
-    const { runtime } = this.internal;
-    if (!runtime) {
-      throw new import_general.ImplementationError("Cannot advertise offline server");
-    }
-    return runtime.interact(interactor);
-  }
   async startup() {
     const { startupSubscription } = this.state;
     if (startupSubscription === null) {
       return;
     }
-    const message = (0, import_protocol.Subscribe)({
-      isFabricFiltered: true,
-      minIntervalFloorSeconds: DEFAULT_MIN_INTERVAL_FLOOR_SECONDS,
+    const subscribe = (0, import_protocol.Subscribe)({
+      fabricFilter: true,
+      minIntervalFloorSeconds: import_protocol.DEFAULT_MIN_INTERVAL_FLOOR_SECONDS,
       maxIntervalCeilingSeconds: 0,
+      attributes: [{}],
       ...startupSubscription
     });
-    this.#node.interaction.subscribe(message);
+    for await (const _chunk of this.#node.interaction.read(subscribe)) ;
+    await this.#node.interaction.subscribe(subscribe);
   }
   get #node() {
-    return this.endpoint.ownerOfType(import_root.RootEndpoint);
+    return this.env.get(import_Node.Node);
   }
   /**
    * Define logical schema for fields that should persist.
@@ -83,13 +76,10 @@ class NetworkClient extends import_NetworkBehavior.NetworkBehavior {
     /**
      * A subscription installed when the node is first commissioned and when the service is restarted.
      *
-     * The default subscription is a wildcard for all attributes and events of the node.  You can set to undefined
-     * or filter the fields and values but this will prevent the relevant state values from loading.
-     *
-     * If this subscription does not include appropriate BasicInformation and Descriptor attributes then the
-     * endpoint structure may not initialize fully.
+     * The default subscription is a wildcard for all attributes and of the node.  You can set to undefined or
+     * filter the fields and values but only values selected by this subscription will update automatically.
      *
-     * Set to null to disable.
+     * Set to null to disable automatic subscription.
      */
     startupSubscription;
   }

package/dist/cjs/behavior/system/network/NetworkClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/behavior/system/network/NetworkClient.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,kBAA6B;AAC7B,qBAAoC;AACpC,mBAA4C;AAE5C,sBAAwC;AAExC,6BAAgC;AAZhC;AAAA;AAAA;AAAA;AAAA;AAcA,MAAM,qCAAqC;AAEpC,MAAM,sBAAsB,uCAAgB;AAAA,EAItC,aAAa;AAClB,SAAK,QAAQ,KAAK,MAAM,UAAU,QAAQ,KAAK,OAAO;AAAA,EAC1D;AAAA,EAEA,SAAY,YAAkD;AAC1D,UAAM,EAAE,QAAQ,IAAI,KAAK;AACzB,QAAI,CAAC,SAAS;AACV,YAAM,IAAI,mCAAoB,iCAAiC;AAAA,IACnE;AACA,WAAO,QAAQ,SAAS,UAAU;AAAA,EACtC;AAAA,EAEA,MAAgB,UAAU;AACtB,UAAM,EAAE,oBAAoB,IAAI,KAAK;AACrC,QAAI,wBAAwB,MAAM;AAC9B;AAAA,IACJ;AAGA,UAAM,cAAU,2BAAU;AAAA,MACtB,kBAAkB;AAAA,MAClB,yBAAyB;AAAA,MACzB,2BAA2B;AAAA,MAC3B,GAAG;AAAA,IACP,CAAC;AAGD,SAAK,MAAM,YAAY,UAAU,OAAO;AAAA,EAC5C;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK,SAAS,YAAY,wBAAY;AAAA,EACjD;AAAA;AAAA;AAAA;AAAA,EAKA,OAAyB,SAAS,IAAI,2BAAc;AAAA,IAChD,MAAM;AAAA,IACN,MAAM;AAAA,IAEN,UAAU;AAAA,UACN,2BAAa;AAAA,QACT,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS,EAAE,MAAM,cAAc,YAAY,CAAC,EAAE;AAAA,QAC9C,SAAS;AAAA,MACb,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AACL;AAAA,CAEO,CAAUA,mBAAV;AAAA,EACI,MAAM,iBAAiB,uCAAgB,SAAS;AAAA,EAEvD;AAFO,EAAAA,eAAM;AAAA,EAIN,MAAM,cAAc,uCAAgB,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAY7C;AAAA,EACJ;AAbO,EAAAA,eAAM;AAAA,GALA;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,mBAA4C;AAC5C,kBAAqB;AACrB,sBAA8D;AAE9D,6BAAgC;AAVhC;AAAA;AAAA;AAAA;AAAA;AAYO,MAAM,sBAAsB,uCAAgB;AAAA,EAItC,aAAa;AAClB,SAAK,QAAQ,KAAK,MAAM,UAAU,QAAQ,KAAK,OAAO;AAAA,EAC1D;AAAA,EAEA,MAAgB,UAAU;AACtB,UAAM,EAAE,oBAAoB,IAAI,KAAK;AAErC,QAAI,wBAAwB,MAAM;AAC9B;AAAA,IACJ;AAGA,UAAM,gBAAY,2BAAU;AAAA,MACxB,cAAc;AAAA,MACd,yBAAyB;AAAA,MACzB,2BAA2B;AAAA,MAC3B,YAAY,CAAC,CAAC,CAAC;AAAA,MACf,GAAG;AAAA,IACP,CAAC;AAGD,qBAAiB,UAAU,KAAK,MAAM,YAAY,KAAK,SAAS,EAAE;AAGlE,UAAM,KAAK,MAAM,YAAY,UAAU,SAAS;AAAA,EACpD;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK,IAAI,IAAI,gBAAI;AAAA,EAC5B;AAAA;AAAA;AAAA;AAAA,EAKA,OAAyB,SAAS,IAAI,2BAAc;AAAA,IAChD,MAAM;AAAA,IACN,MAAM;AAAA,IAEN,UAAU;AAAA,UACN,2BAAa;AAAA,QACT,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS,EAAE,MAAM,cAAc,YAAY,CAAC,EAAE;AAAA,QAC9C,SAAS;AAAA,MACb,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AACL;AAAA,CAEO,CAAUA,mBAAV;AAAA,EACI,MAAM,iBAAiB,uCAAgB,SAAS;AAAA,EAEvD;AAFO,EAAAA,eAAM;AAAA,EAIN,MAAM,cAAc,uCAAgB,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAS7C;AAAA,EACJ;AAVO,EAAAA,eAAM;AAAA,GALA;",
   "names": ["NetworkClient"]
 }