@matter/protocol 0.16.0-alpha.0-20251030-e9ca79f93 → 0.16.0-alpha.0-20251101-70c8d51d7

package/dist/cjs/action/Interactable.d.ts

@@ -15,6 +15,7 @@ import { WriteResult } from "./response/WriteResult.js";
 import { AccessControl } from "./server/AccessControl.js";
 export type InteractionSession = AccessControl.Session & {
     transaction?: Transaction;
+    abort?: AbortSignal;
 };
 /**
  * Objects implementing this interface can participate in Matter interactions.

package/dist/cjs/action/Interactable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Interactable.d.ts","sourceRoot":"","sources":["../../../src/action/Interactable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,kBAAkB,GAAG,aAAa,CAAC,OAAO,GAAG;IACrD,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,YAAY,CAAC,QAAQ,GAAG,kBAAkB;IACvD;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAEpD;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,eAAe,CAAC;IAEnE;;OAEG;IACH,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAEvE;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC;CAC7D"}
+{"version":3,"file":"Interactable.d.ts","sourceRoot":"","sources":["../../../src/action/Interactable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,kBAAkB,GAAG,aAAa,CAAC,OAAO,GAAG;IACrD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,YAAY,CAAC,QAAQ,GAAG,kBAAkB;IACvD;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IAEpD;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,eAAe,CAAC;IAEnE;;OAEG;IACH,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAEvE;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC;CAC7D"}

package/dist/cjs/action/client/ClientInteraction.d.ts

@@ -6,19 +6,18 @@
 import { Interactable, InteractionSession } from "#action/Interactable.js";
 import { ClientInvoke } from "#action/request/Invoke.js";
 import { Read } from "#action/request/Read.js";
-import { Subscribe } from "#action/request/Subscribe.js";
 import { Write } from "#action/request/Write.js";
 import { DecodedInvokeResult } from "#action/response/InvokeResult.js";
 import { ReadResult } from "#action/response/ReadResult.js";
-import { SubscribeResult } from "#action/response/SubscribeResult.js";
 import { WriteResult } from "#action/response/WriteResult.js";
-import { Duration, Environment, Environmental, PromiseQueue } from "#general";
-import { ExchangeProvider } from "#protocol/ExchangeProvider.js";
-import { ClientSubscriptions } from "./ClientSubscriptions.js";
+import { Abort, Duration, Environment, RetrySchedule } from "#general";
+import { ClientSubscribe } from "./subscription/ClientSubscribe.js";
+import { ClientSubscription } from "./subscription/ClientSubscription.js";
+import { ClientSubscriptions } from "./subscription/ClientSubscriptions.js";
 export interface ClientInteractionContext {
-    exchanges: ExchangeProvider;
-    subscriptions: ClientSubscriptions;
-    queue: PromiseQueue;
+    environment: Environment;
+    abort?: Abort.Signal;
+    sustainRetries?: RetrySchedule.Configuration;
 }
 export declare const DEFAULT_MIN_INTERVAL_FLOOR: Duration;
 /**
@@ -26,20 +25,27 @@ export declare const DEFAULT_MIN_INTERVAL_FLOOR: Duration;
  */
 export declare class ClientInteraction<SessionT extends InteractionSession = InteractionSession> implements Interactable<SessionT> {
     #private;
-    constructor(context: ClientInteractionContext);
+    constructor({ environment, abort, sustainRetries }: ClientInteractionContext);
     close(): Promise<void>;
     get subscriptions(): ClientSubscriptions;
-    get queue(): PromiseQueue | undefined;
-    static [Environmental.create](env: Environment): ClientInteraction<InteractionSession>;
-    read(request: Read, _session?: SessionT): ReadResult;
     /**
-     * Write chosen attributes remotely to the node.
-     * The returned attribute write status information is returned. No error is thrown for individual attribute write
-     * failures.
+     * Read attributes and events.
      */
-    write<T extends Write>(request: T, _session?: SessionT): WriteResult<T>;
-    invoke(request: ClientInvoke, _session?: SessionT): DecodedInvokeResult;
-    subscribe(request: Subscribe, _session?: SessionT): SubscribeResult;
-    cancelSubscription(id: number): void;
+    read(request: Read, session?: SessionT): ReadResult;
+    /**
+     * Update node attributes.
+     *
+     * Writes with the Matter protocol are generally not atomic, so this method only throws if the entire action fails.
+     * You must check each {@link WriteResult.AttributeStatus} to determine whether individual updates failed.
+     */
+    write<T extends Write>(request: T, session?: SessionT): WriteResult<T>;
+    /**
+     * Invoke one or more commands.
+     */
+    invoke(request: ClientInvoke, session?: SessionT): DecodedInvokeResult;
+    /**
+     * Subscribe to attribute values and events.
+     */
+    subscribe(request: ClientSubscribe, session?: SessionT): Promise<ClientSubscription>;
 }
 //# sourceMappingURL=ClientInteraction.d.ts.map

package/dist/cjs/action/client/ClientInteraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientInteraction.d.ts","sourceRoot":"","sources":["../../../../src/action/client/ClientInteraction.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAU,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAgB,MAAM,kCAAkC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAGH,QAAQ,EACR,WAAW,EACX,aAAa,EAIb,YAAY,EAEf,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAK/D,MAAM,WAAW,wBAAwB;IACrC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,aAAa,EAAE,mBAAmB,CAAC;IACnC,KAAK,EAAE,YAAY,CAAC;CACvB;AAED,eAAO,MAAM,0BAA0B,UAAa,CAAC;AAKrD;;GAEG;AACH,qBAAa,iBAAiB,CAAC,QAAQ,SAAS,kBAAkB,GAAG,kBAAkB,CACnF,YAAW,YAAY,CAAC,QAAQ,CAAC;;gBAQrB,OAAO,EAAE,wBAAwB;IAMvC,KAAK;IAQX,IAAI,aAAa,wBAEhB;IAED,IAAI,KAAK,6BAER;IAED,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAUvC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU;IAyC3D;;;;OAIG;IACG,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC;IAiEtE,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB;IAyGxE,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,eAAe;IA2DzE,kBAAkB,CAAC,EAAE,EAAE,MAAM;CA2BhC"}
+{"version":3,"file":"ClientInteraction.d.ts","sourceRoot":"","sources":["../../../../src/action/client/ClientInteraction.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAU,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAgB,MAAM,kCAAkC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EACH,KAAK,EAGL,QAAQ,EAER,WAAW,EAIX,aAAa,EAEhB,MAAM,UAAU,CAAC;AAMlB,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAM5E,MAAM,WAAW,wBAAwB;IACrC,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC;CAChD;AAED,eAAO,MAAM,0BAA0B,UAAa,CAAC;AAKrD;;GAEG;AACH,qBAAa,iBAAiB,CAAC,QAAQ,SAAS,kBAAkB,GAAG,kBAAkB,CACnF,YAAW,YAAY,CAAC,QAAQ,CAAC;;gBAQrB,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,wBAAwB;IAUtE,KAAK;IAQX,IAAI,aAAa,wBAEhB;IAED;;OAEG;IACI,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU;IAqC1D;;;;;OAKG;IACG,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC;IA4D5E;;OAEG;IACI,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,mBAAmB;IAqG7E;;OAEG;IACG,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,QAAQ;CA8H/D"}

package/dist/cjs/action/client/ClientInteraction.js

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +20,47 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __using = (stack, value, async) => {
+  if (value != null) {
+    if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
+    var dispose, inner;
+    if (async) dispose = value[__knownSymbol("asyncDispose")];
+    if (dispose === void 0) {
+      dispose = value[__knownSymbol("dispose")];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") __typeError("Object not disposable");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    stack.push([async, dispose, value]);
+  } else if (async) {
+    stack.push([async]);
+  }
+  return value;
+};
+var __callDispose = (stack, error, hasError) => {
+  var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
+    return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
+  };
+  var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
+  var next = (it) => {
+    while (it = stack.pop()) {
+      try {
+        var result = it[1] && it[1].call(it[2]);
+        if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
+      } catch (e) {
+        fail(e);
+      }
+    }
+    if (hasError) throw error;
+  };
+  return next();
+};
 var ClientInteraction_exports = {};
 __export(ClientInteraction_exports, {
   ClientInteraction: () => ClientInteraction,
@@ -26,11 +71,13 @@ var import_Invoke = require("#action/request/Invoke.js");
 var import_Specifier = require("#action/request/Specifier.js");
 var import_general = require("#general");
 var import_InteractionMessenger = require("#interaction/InteractionMessenger.js");
-var import_InteractionQueue = require("#peer/InteractionQueue.js");
 var import_ExchangeProvider = require("#protocol/ExchangeProvider.js");
+var import_SecureSession = require("#session/SecureSession.js");
 var import_types = require("#types");
-var import_ClientSubscriptions = require("./ClientSubscriptions.js");
 var import_InputChunk = require("./InputChunk.js");
+var import_ClientSubscriptions = require("./subscription/ClientSubscriptions.js");
+var import_PeerSubscription = require("./subscription/PeerSubscription.js");
+var import_SustainedSubscription = require("./subscription/SustainedSubscription.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
@@ -43,16 +90,20 @@ const DEFAULT_MINIMUM_RESPONSE_TIMEOUT_WITH_FAILSAFE = (0, import_general.Second
 class ClientInteraction {
   #exchanges;
   #subscriptions;
-  #queue;
   #interactions = new import_general.BasicSet();
-  #closed = false;
-  constructor(context) {
-    this.#exchanges = context.exchanges;
-    this.#subscriptions = context.subscriptions;
-    this.#queue = context.queue;
+  #abort;
+  #sustainRetries;
+  constructor({ environment, abort, sustainRetries }) {
+    this.#exchanges = environment.get(import_ExchangeProvider.ExchangeProvider);
+    this.#subscriptions = environment.get(import_ClientSubscriptions.ClientSubscriptions);
+    this.#abort = import_general.Abort.subtask(abort);
+    this.#sustainRetries = new import_general.RetrySchedule(
+      environment.get(import_general.Entropy),
+      import_general.RetrySchedule.Configuration(import_SustainedSubscription.SustainedSubscription.DefaultRetrySchedule, sustainRetries)
+    );
   }
   async close() {
-    this.#closed = true;
+    this.#abort();
     while (this.#interactions.size) {
       await this.#interactions.deleted;
     }
@@ -60,37 +111,31 @@ class ClientInteraction {
   get subscriptions() {
     return this.#subscriptions;
   }
-  get queue() {
-    return this.#queue;
-  }
-  static [import_general.Environmental.create](env) {
-    const instance = new ClientInteraction({
-      exchanges: env.get(import_ExchangeProvider.ExchangeProvider),
-      subscriptions: env.get(import_ClientSubscriptions.ClientSubscriptions),
-      queue: env.get(import_InteractionQueue.InteractionQueue)
-    });
-    env.set(ClientInteraction, instance);
-    return instance;
-  }
-  async *read(request, _session) {
-    const readPathsCount = (request.attributeRequests?.length ?? 0) + (request.eventRequests?.length ?? 0);
-    if (readPathsCount > 9) {
-      logger.debug(
-        "Read interactions with more then 9 paths might be not allowed by the device. Consider splitting then into several read requests."
-      );
-    }
-    this.#begin(request);
-    let messenger;
+  /**
+   * Read attributes and events.
+   */
+  async *read(request, session) {
+    var _stack = [];
     try {
-      messenger = await import_InteractionMessenger.InteractionClientMessenger.create(this.#exchanges);
+      const readPathsCount = (request.attributeRequests?.length ?? 0) + (request.eventRequests?.length ?? 0);
+      if (readPathsCount > 9) {
+        logger.debug(
+          "Read interactions with more then 9 paths might be not allowed by the device. Consider splitting then into several read requests."
+        );
+      }
+      const context = __using(_stack, await this.#begin(request, session), true);
+      const { checkAbort, messenger } = context;
       logger.debug("Read \xBB", messenger.exchange.via, request);
       await messenger.sendReadRequest(request);
+      checkAbort();
       let attributeReportCount = 0;
       let eventReportCount = 0;
       for await (const report of messenger.readDataReports()) {
+        checkAbort();
         attributeReportCount += report.attributeReports?.length ?? 0;
         eventReportCount += report.eventReports?.length ?? 0;
         yield (0, import_InputChunk.InputChunk)(report);
+        checkAbort();
       }
       logger.debug(
         "Read \xAB",
@@ -99,26 +144,31 @@ class ClientInteraction {
           attributeReportCount + eventReportCount === 0 ? "(empty)" : import_general.Diagnostic.dict({ attributes: attributeReportCount, events: eventReportCount })
         )
       );
+    } catch (_) {
+      var _error = _, _hasError = true;
     } finally {
-      await messenger?.close();
-      this.#end(request);
+      var _promise = __callDispose(_stack, _error, _hasError);
+      _promise && await _promise;
     }
   }
   /**
-   * Write chosen attributes remotely to the node.
-   * The returned attribute write status information is returned. No error is thrown for individual attribute write
-   * failures.
+   * Update node attributes.
+   *
+   * Writes with the Matter protocol are generally not atomic, so this method only throws if the entire action fails.
+   * You must check each {@link WriteResult.AttributeStatus} to determine whether individual updates failed.
    */
-  async write(request, _session) {
-    this.#begin(request);
-    let messenger;
+  async write(request, session) {
+    var _stack = [];
     try {
-      messenger = await import_InteractionMessenger.InteractionClientMessenger.create(this.#exchanges);
+      const context = __using(_stack, await this.#begin(request, session), true);
+      const { checkAbort, messenger } = context;
       if (request.timedRequest) {
         await messenger.sendTimedRequest(request.timeout ?? DEFAULT_TIMED_REQUEST_TIMEOUT);
+        checkAbort();
       }
       logger.info("Write \xBB", messenger.exchange.via, request);
       const response = await messenger.sendWriteCommand(request);
+      checkAbort();
       if (request.suppressResponse) {
         return void 0;
       }
@@ -159,18 +209,24 @@ class ClientInteraction {
         )
       );
       return result;
+    } catch (_) {
+      var _error = _, _hasError = true;
     } finally {
-      await messenger?.close();
-      this.#end(request);
+      var _promise = __callDispose(_stack, _error, _hasError);
+      _promise && await _promise;
     }
   }
-  async *invoke(request, _session) {
-    this.#begin(request);
-    let messenger;
+  /**
+   * Invoke one or more commands.
+   */
+  async *invoke(request, session) {
+    var _stack = [];
     try {
-      messenger = await import_InteractionMessenger.InteractionClientMessenger.create(this.#exchanges);
+      const context = __using(_stack, await this.#begin(request, session), true);
+      const { checkAbort, messenger } = context;
       if (request.timedRequest) {
         await messenger.sendTimedRequest(request.timeout ?? DEFAULT_TIMED_REQUEST_TIMEOUT);
+        checkAbort();
       }
       logger.info(
         "Invoke \xBB",
@@ -183,6 +239,7 @@ class ClientInteraction {
         request,
         expectedProcessingTime ?? (useExtendedFailSafeMessageResponseTimeout ? DEFAULT_MINIMUM_RESPONSE_TIMEOUT_WITH_FAILSAFE : void 0)
       );
+      checkAbort();
       if (!request.suppressResponse) {
         if (result && result.invokeResponses?.length) {
           const chunk = result.invokeResponses.map((response) => {
@@ -248,64 +305,98 @@ class ClientInteraction {
         } else {
           yield [];
         }
+        checkAbort();
       }
+    } catch (_) {
+      var _error = _, _hasError = true;
     } finally {
-      await messenger?.close();
-      this.#end(request);
+      var _promise = __callDispose(_stack, _error, _hasError);
+      _promise && await _promise;
     }
   }
-  async subscribe(request, _session) {
+  /**
+   * Subscribe to attribute values and events.
+   */
+  async subscribe(request, session) {
     const subscriptionPathsCount = (request.attributeRequests?.length ?? 0) + (request.eventRequests?.length ?? 0);
     if (subscriptionPathsCount > 3) {
       logger.debug("Subscribe interactions with more then 3 paths might be not allowed by the device.");
     }
     if (!request.keepSubscriptions) {
-      for (const subscription of this.#subscriptions) {
+      for (const subscription2 of this.#subscriptions) {
         logger.debug(
-          `Removing subscription with ID ${subscription.subscriptionId} because new subscription replaces it`
+          `Removing subscription with ID ${subscription2.subscriptionId} because new subscription replaces it`
         );
-        subscription.close();
+        subscription2.close();
       }
     }
-    this.#begin(request);
-    let messenger;
-    try {
-      messenger = await import_InteractionMessenger.InteractionClientMessenger.create(this.#exchanges);
-      logger.info(
-        "Subscribe \xBB",
-        messenger.exchange.via,
-        import_general.Diagnostic.asFlags({ keepSubscriptions: request.keepSubscriptions }),
-        import_general.Diagnostic.dict({
-          min: import_general.Duration.format(request.minIntervalFloor),
-          max: import_general.Duration.format(request.maxIntervalCeiling)
-        }),
-        request
-      );
-      await messenger.sendSubscribeRequest({
-        minIntervalFloorSeconds: import_general.Seconds.of(DEFAULT_MIN_INTERVAL_FLOOR),
-        maxIntervalCeilingSeconds: import_general.Seconds.of(DEFAULT_MIN_INTERVAL_FLOOR),
-        // TODO use better max fallback
-        ...request
+    import_SecureSession.SecureSession.assert(this.#exchanges.session);
+    const peer = this.#exchanges.session.peerAddress;
+    const subscribe = async (request2) => {
+      var _stack = [];
+      try {
+        const context = __using(_stack, await this.#begin(request2, session), true);
+        const { checkAbort, messenger } = context;
+        logger.info(
+          "Subscribe \xBB",
+          messenger.exchange.via,
+          import_general.Diagnostic.asFlags({ keepSubscriptions: request2.keepSubscriptions }),
+          import_general.Diagnostic.dict({
+            min: import_general.Duration.format(request2.minIntervalFloor),
+            max: import_general.Duration.format(request2.maxIntervalCeiling)
+          }),
+          request2
+        );
+        await messenger.sendSubscribeRequest({
+          minIntervalFloorSeconds: import_general.Seconds.of(DEFAULT_MIN_INTERVAL_FLOOR),
+          maxIntervalCeilingSeconds: import_general.Seconds.of(DEFAULT_MIN_INTERVAL_FLOOR),
+          // TODO use better max fallback
+          ...request2
+        });
+        checkAbort();
+        await this.#handleSubscriptionResponse(request2, readChunks(messenger));
+        checkAbort();
+        const responseMessage = await messenger.nextMessage(import_InteractionMessenger.MessageType.SubscribeResponse);
+        const response = import_types.TlvSubscribeResponse.decode(responseMessage.payload);
+        logger.info(
+          "Subscription successful \xAB",
+          messenger.exchange.via,
+          import_general.Diagnostic.dict({
+            id: response.subscriptionId,
+            interval: import_general.Duration.format((0, import_general.Seconds)(response.maxInterval))
+          })
+        );
+        const subscription2 = new import_PeerSubscription.PeerSubscription({
+          request: request2,
+          peer,
+          closed: () => this.#subscriptions.delete(subscription2),
+          response,
+          abort: session?.abort
+        });
+        this.#subscriptions.addPeer(subscription2);
+        return subscription2;
+      } catch (_) {
+        var _error = _, _hasError = true;
+      } finally {
+        var _promise = __callDispose(_stack, _error, _hasError);
+        _promise && await _promise;
+      }
+    };
+    let subscription;
+    if (request.sustain) {
+      subscription = new import_SustainedSubscription.SustainedSubscription({
+        subscribe,
+        peer,
+        closed: () => this.#subscriptions.delete(subscription),
+        request,
+        abort: session?.abort,
+        retries: this.#sustainRetries
       });
-      await this.#handleSubscriptionResponse(request, readChunks(messenger));
-      const responseMessage = await messenger.nextMessage(import_InteractionMessenger.MessageType.SubscribeResponse);
-      const response = import_types.TlvSubscribeResponse.decode(responseMessage.payload);
-      logger.info(
-        "Subscription successful \xAB",
-        messenger.exchange.via,
-        import_general.Diagnostic.dict({
-          subId: response.subscriptionId,
-          interval: import_general.Duration.format((0, import_general.Seconds)(response.maxInterval))
-        })
-      );
-      return this.#subscriptions.add(request, response);
-    } finally {
-      await messenger?.close();
-      this.#end(request);
+    } else {
+      subscription = await subscribe(request);
     }
-  }
-  cancelSubscription(id) {
-    this.#subscriptions.get(id)?.close();
+    this.#subscriptions.addActive(subscription);
+    return subscription;
   }
   async #handleSubscriptionResponse(request, result) {
     if (request.updated) {
@@ -314,14 +405,27 @@ class ClientInteraction {
       for await (const _chunk of result) ;
     }
   }
-  #begin(request) {
-    if (this.#closed) {
+  async #begin(request, session) {
+    if (this.#abort.aborted) {
       throw new import_general.ImplementationError("Client interaction unavailable after close");
     }
     this.#interactions.add(request);
-  }
-  #end(request) {
-    this.#interactions.delete(request);
+    const checkAbort = import_general.Abort.checkerFor(session);
+    const messenger = await import_InteractionMessenger.InteractionClientMessenger.create(this.#exchanges);
+    const context = {
+      checkAbort,
+      messenger,
+      [Symbol.asyncDispose]: async () => {
+        await messenger.close();
+        this.#interactions.delete(request);
+      }
+    };
+    try {
+      context.checkAbort();
+    } catch (e) {
+      await context[Symbol.asyncDispose]();
+    }
+    return context;
   }
 }
 async function* readChunks(messenger) {

package/dist/cjs/action/client/ClientInteraction.js.map

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

package/dist/cjs/action/client/index.d.ts

@@ -4,9 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 export * from "./ClientInteraction.js";
-export * from "./ClientSubscription.js";
-export * from "./ClientSubscriptionHandler.js";
-export * from "./ClientSubscriptions.js";
 export * from "./InputChunk.js";
 export * from "./ReadScope.js";
+export * from "./subscription/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/action/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/action/client/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/action/client/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC"}

package/dist/cjs/action/client/index.js

@@ -16,11 +16,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var client_exports = {};
 module.exports = __toCommonJS(client_exports);
 __reExport(client_exports, require("./ClientInteraction.js"), module.exports);
-__reExport(client_exports, require("./ClientSubscription.js"), module.exports);
-__reExport(client_exports, require("./ClientSubscriptionHandler.js"), module.exports);
-__reExport(client_exports, require("./ClientSubscriptions.js"), module.exports);
 __reExport(client_exports, require("./InputChunk.js"), module.exports);
 __reExport(client_exports, require("./ReadScope.js"), module.exports);
+__reExport(client_exports, require("./subscription/index.js"), module.exports);
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors

package/dist/cjs/action/client/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/action/client/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,2BAAc,mCANd;AAOA,2BAAc,oCAPd;AAQA,2BAAc,2CARd;AASA,2BAAc,qCATd;AAUA,2BAAc,4BAVd;AAWA,2BAAc,2BAXd;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,2BAAc,mCANd;AAOA,2BAAc,4BAPd;AAQA,2BAAc,2BARd;AASA,2BAAc,oCATd;AAAA;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }

package/dist/cjs/action/client/subscription/ClientSubscribe.d.ts

@@ -0,0 +1,8 @@
+import { Subscribe } from "#action/request/Subscribe.js";
+export interface ClientSubscribe extends Subscribe {
+    /**
+     * If true the subscription is virtualized and the underlying subscription is reestablished when lost.
+     */
+    sustain?: boolean;
+}
+//# sourceMappingURL=ClientSubscribe.d.ts.map

package/dist/cjs/action/client/subscription/ClientSubscribe.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClientSubscribe.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/ClientSubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAC9C;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB"}

package/dist/cjs/action/client/{ClientSubscription.js → subscription/ClientSubscribe.js}

@@ -12,11 +12,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var ClientSubscription_exports = {};
-module.exports = __toCommonJS(ClientSubscription_exports);
-/**
- * @license
- * Copyright 2022-2025 Matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-//# sourceMappingURL=ClientSubscription.js.map
+var ClientSubscribe_exports = {};
+module.exports = __toCommonJS(ClientSubscribe_exports);
+//# sourceMappingURL=ClientSubscribe.js.map

package/dist/cjs/action/client/subscription/ClientSubscribe.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/action/client/subscription/ClientSubscribe.ts"],
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
+  "names": []
+}