@matter/protocol 0.16.0-alpha.0-20251203-aaf94bca8 → 0.16.0-alpha.0-20251207-37e501b18

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

@@ -50,6 +50,7 @@ var __callDispose = (stack, error, hasError) => {
  */
 import { Invoke } from "#action/request/Invoke.js";
 import { resolvePathForSpecifier } from "#action/request/Specifier.js";
+import { Mark } from "#common/Mark.js";
 import {
   Abort,
   BasicSet,
@@ -64,6 +65,7 @@ import {
   Seconds
 } from "#general";
 import { InteractionClientMessenger, MessageType } from "#interaction/InteractionMessenger.js";
+import { Subscription } from "#interaction/Subscription.js";
 import { ExchangeProvider } from "#protocol/ExchangeProvider.js";
 import { SecureSession } from "#session/SecureSession.js";
 import { Status, TlvNoResponse, TlvSubscribeResponse } from "#types";
@@ -77,6 +79,7 @@ const SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT = Minutes(60);
 const DEFAULT_TIMED_REQUEST_TIMEOUT = Seconds(10);
 const DEFAULT_MINIMUM_RESPONSE_TIMEOUT_WITH_FAILSAFE = Seconds(30);
 class ClientInteraction {
+  #lifetime;
   #exchanges;
   #subscriptions;
   #interactions = new BasicSet();
@@ -90,14 +93,31 @@ class ClientInteraction {
       environment.get(Entropy),
       RetrySchedule.Configuration(SustainedSubscription.DefaultRetrySchedule, sustainRetries)
     );
+    this.#lifetime = environment.join("interactions");
+    Object.defineProperties(this.#lifetime.details, {
+      "# active": {
+        get: () => {
+          return this.#interactions.size;
+        },
+        enumerable: true
+      }
+    });
   }
   get session() {
     return this.#exchanges.session;
   }
   async close() {
-    this.#abort();
-    while (this.#interactions.size) {
-      await this.#interactions.deleted;
+    var _stack = [];
+    try {
+      const _closing = __using(_stack, this.#lifetime.closing());
+      this.#abort();
+      while (this.#interactions.size) {
+        await this.#interactions.deleted;
+      }
+    } catch (_) {
+      var _error = _, _hasError = true;
+    } finally {
+      __callDispose(_stack, _error, _hasError);
     }
   }
   get subscriptions() {
@@ -115,9 +135,9 @@ class ClientInteraction {
           "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 context = __using(_stack, await this.#begin("reading", request, session), true);
       const { checkAbort, messenger } = context;
-      logger.debug("Read \xBB", messenger.exchange.via, request);
+      logger.debug("Read", Mark.OUTBOUND, messenger.exchange.via, request);
       await messenger.sendReadRequest(request);
       checkAbort();
       let attributeReportCount = 0;
@@ -131,7 +151,8 @@ class ClientInteraction {
         checkAbort();
       }
       logger.debug(
-        "Read \xAB",
+        "Read",
+        Mark.INBOUND,
         messenger.exchange.via,
         Diagnostic.weak(
           attributeReportCount + eventReportCount === 0 ? "(empty)" : Diagnostic.dict({ attributes: attributeReportCount, events: eventReportCount })
@@ -153,13 +174,13 @@ class ClientInteraction {
   async write(request, session) {
     var _stack = [];
     try {
-      const context = __using(_stack, await this.#begin(request, session), true);
+      const context = __using(_stack, await this.#begin("writing", 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);
+      logger.info("Write", Mark.OUTBOUND, messenger.exchange.via, request);
       const response = await messenger.sendWriteCommand(request);
       checkAbort();
       if (request.suppressResponse) {
@@ -195,7 +216,8 @@ class ClientInteraction {
         }
       );
       logger.info(
-        "Write \xAB",
+        "Write",
+        Mark.INBOUND,
         messenger.exchange.via,
         Diagnostic.weak(
           successCount + failureCount === 0 ? "(empty)" : Diagnostic.dict({ success: successCount, failure: failureCount })
@@ -215,14 +237,15 @@ class ClientInteraction {
   async *invoke(request, session) {
     var _stack = [];
     try {
-      const context = __using(_stack, await this.#begin(request, session), true);
+      const context = __using(_stack, await this.#begin("invoking", request, session), true);
       const { checkAbort, messenger } = context;
       if (request.timedRequest) {
         await messenger.sendTimedRequest(request.timeout ?? DEFAULT_TIMED_REQUEST_TIMEOUT);
         checkAbort();
       }
       logger.info(
-        "Invoke \xBB",
+        "Invoke",
+        Mark.OUTBOUND,
         messenger.exchange.via,
         Diagnostic.asFlags({ suppressResponse: request.suppressResponse, timed: request.timedRequest }),
         request
@@ -256,7 +279,8 @@ class ClientInteraction {
               }
               const data = commandFields === void 0 ? void 0 : responseSchema.decodeTlv(commandFields);
               logger.info(
-                "Invoke \xAB",
+                "Invoke",
+                Mark.INBOUND,
                 messenger.exchange.via,
                 Diagnostic.strong(resolvePathForSpecifier(cmd)),
                 isObject(data) ? Diagnostic.dict(data) : Diagnostic.weak("(no payload)")
@@ -318,7 +342,7 @@ class ClientInteraction {
     if (!request.keepSubscriptions) {
       for (const subscription2 of this.#subscriptions) {
         logger.debug(
-          `Removing subscription with ID ${subscription2.subscriptionId} because new subscription replaces it`
+          `Removing subscription with ID ${Subscription.idStrOf(subscription2)} because new subscription replaces it`
         );
         subscription2.close();
       }
@@ -339,7 +363,7 @@ class ClientInteraction {
     const subscribe = async (request2) => {
       var _stack = [];
       try {
-        const context = __using(_stack, await this.#begin(request2, session), true);
+        const context = __using(_stack, await this.#begin("subscribing", request2, session), true);
         const { checkAbort, messenger } = context;
         logger.info(
           "Subscribe \xBB",
@@ -362,7 +386,8 @@ class ClientInteraction {
         const responseMessage = await messenger.nextMessage(MessageType.SubscribeResponse);
         const response = TlvSubscribeResponse.decode(responseMessage.payload);
         logger.info(
-          "Subscription successful \xAB",
+          "Subscription successful",
+          Mark.INBOUND,
           messenger.exchange.via,
           Diagnostic.dict({
             id: response.subscriptionId,
@@ -370,6 +395,7 @@ class ClientInteraction {
           })
         );
         const subscription2 = new PeerSubscription({
+          lifetime: this.#subscriptions,
           request: request2,
           peer,
           closed: () => this.#subscriptions.delete(subscription2),
@@ -388,6 +414,7 @@ class ClientInteraction {
     let subscription;
     if (request.sustain) {
       subscription = new SustainedSubscription({
+        lifetime: this.#subscriptions,
         subscribe,
         peer,
         closed: () => this.#subscriptions.delete(subscription),
@@ -408,27 +435,48 @@ class ClientInteraction {
       for await (const _chunk of result) ;
     }
   }
-  async #begin(request, session) {
-    if (this.#abort.aborted) {
-      throw new ImplementationError("Client interaction unavailable after close");
-    }
-    this.#interactions.add(request);
-    const checkAbort = Abort.checkerFor(session);
-    const messenger = await InteractionClientMessenger.create(this.#exchanges);
-    const context = {
-      checkAbort,
-      messenger,
-      [Symbol.asyncDispose]: async () => {
-        await messenger.close();
-        this.#interactions.delete(request);
-      }
-    };
+  async #begin(what, request, session) {
+    var _stack = [];
     try {
-      context.checkAbort();
-    } catch (e) {
-      await context[Symbol.asyncDispose]();
+      const lifetime = __using(_stack, this.#lifetime.join(what));
+      if (this.#abort.aborted) {
+        throw new ImplementationError("Client interaction unavailable after close");
+      }
+      this.#interactions.add(request);
+      const checkAbort = Abort.checkerFor(session);
+      const messenger = await InteractionClientMessenger.create(this.#exchanges);
+      Object.defineProperty(lifetime.details, "via", {
+        get() {
+          return messenger.exchange.via;
+        }
+      });
+      const context = {
+        checkAbort,
+        messenger,
+        [Symbol.asyncDispose]: async () => {
+          var _stack2 = [];
+          try {
+            const _closing = __using(_stack2, lifetime.closing());
+            await messenger.close();
+            this.#interactions.delete(request);
+          } catch (_2) {
+            var _error2 = _2, _hasError2 = true;
+          } finally {
+            __callDispose(_stack2, _error2, _hasError2);
+          }
+        }
+      };
+      try {
+        context.checkAbort();
+      } catch (e) {
+        await context[Symbol.asyncDispose]();
+      }
+      return context;
+    } catch (_) {
+      var _error = _, _hasError = true;
+    } finally {
+      __callDispose(_stack, _error, _hasError);
     }
-    return context;
   }
 }
 async function* readChunks(messenger) {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/action/client/ClientInteraction.ts"],
-  "mappings": "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",
-  "names": ["subscription", "request"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAuB,cAAc;AAErC,SAAS,+BAA+B;AAMxC,SAAS,YAAY;AACrB;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,4BAA4B,mBAAmB;AACxD,SAAS,oBAAoB;AAC7B,SAAS,wBAAwB;AACjC,SAAS,qBAAqB;AAC9B,SAAS,QAA4B,eAAe,4BAA4C;AAChG,SAAS,kBAAkB;AAG3B,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,6BAA6B;AAEtC,MAAM,SAAS,OAAO,IAAI,mBAAmB;AAQtC,MAAM,6BAA6B,QAAQ,CAAC;AAQ5C,MAAM,4CAA4C,QAAQ,EAAE;AAEnE,MAAM,gCAAgC,QAAQ,EAAE;AAChD,MAAM,iDAAiD,QAAQ,EAAE;AAK1D,MAAM,kBAEuB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA,gBAAgB,IAAI,SAA4C;AAAA,EAChE;AAAA,EACA;AAAA,EAET,YAAY,EAAE,aAAa,OAAO,eAAe,GAA6B;AAC1E,SAAK,aAAa,YAAY,IAAI,gBAAgB;AAClD,SAAK,iBAAiB,YAAY,IAAI,mBAAmB;AACzD,SAAK,SAAS,MAAM,QAAQ,KAAK;AACjC,SAAK,kBAAkB,IAAI;AAAA,MACvB,YAAY,IAAI,OAAO;AAAA,MACvB,cAAc,cAAc,sBAAsB,sBAAsB,cAAc;AAAA,IAC1F;AAEA,SAAK,YAAY,YAAY,KAAK,cAAc;AAChD,WAAO,iBAAiB,KAAK,UAAU,SAAS;AAAA,MAC5C,YAAY;AAAA,QACR,KAAK,MAAM;AACP,iBAAO,KAAK,cAAc;AAAA,QAC9B;AAAA,QAEA,YAAY;AAAA,MAChB;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK,WAAW;AAAA,EAC3B;AAAA,EAEA,MAAM,QAAQ;AACV;AAAA;AAAA,YAAM,WAAW,qBAAK,UAAU,QAAQ;AAExC,WAAK,OAAO;AAEZ,aAAO,KAAK,cAAc,MAAM;AAC5B,cAAM,KAAK,cAAc;AAAA,MAC7B;AAAA,aANA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOJ;AAAA,EAEA,IAAI,gBAAgB;AAChB,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,KAAK,SAAe,SAAgC;AAQvD;AAAA;AAPA,YAAM,kBAAkB,QAAQ,mBAAmB,UAAU,MAAM,QAAQ,eAAe,UAAU;AACpG,UAAI,iBAAiB,GAAG;AACpB,eAAO;AAAA,UACH;AAAA,QACJ;AAAA,MACJ;AAEA,YAAY,UAAU,sBAAM,KAAK,OAAO,WAAW,SAAS,OAAO,GAA7C;AACtB,YAAM,EAAE,YAAY,UAAU,IAAI;AAElC,aAAO,MAAM,QAAQ,KAAK,UAAU,UAAU,SAAS,KAAK,OAAO;AACnE,YAAM,UAAU,gBAAgB,OAAO;AACvC,iBAAW;AAEX,UAAI,uBAAuB;AAC3B,UAAI,mBAAmB;AAEvB,YAAM,eAAe,IAAI,MAAiD;AAC1E,uBAAiB,UAAU,UAAU,gBAAgB,GAAG;AACpD,mBAAW;AACX,gCAAwB,OAAO,kBAAkB,UAAU;AAC3D,4BAAoB,OAAO,cAAc,UAAU;AACnD,cAAM,WAAW,QAAQ,YAAY;AACrC,mBAAW;AAAA,MACf;AAEA,aAAO;AAAA,QACH;AAAA,QACA,KAAK;AAAA,QACL,UAAU,SAAS;AAAA,QACnB,WAAW;AAAA,UACP,uBAAuB,qBAAqB,IACtC,YACA,WAAW,KAAK,EAAE,YAAY,sBAAsB,QAAQ,iBAAiB,CAAC;AAAA,QACxF;AAAA,MACJ;AAAA,aA5BA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA6BJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,MAAM,MAAuB,SAAY,SAAoC;AACzE;AAAA;AAAA,YAAY,UAAU,sBAAM,KAAK,OAAO,WAAW,SAAS,OAAO,GAA7C;AACtB,YAAM,EAAE,YAAY,UAAU,IAAI;AAElC,UAAI,QAAQ,cAAc;AACtB,cAAM,UAAU,iBAAiB,QAAQ,WAAW,6BAA6B;AACjF,mBAAW;AAAA,MACf;AAEA,aAAO,KAAK,SAAS,KAAK,UAAU,UAAU,SAAS,KAAK,OAAO;AAEnE,YAAM,WAAW,MAAM,UAAU,iBAAiB,OAAO;AACzD,iBAAW;AACX,UAAI,QAAQ,kBAAkB;AAC1B,eAAO;AAAA,MACX;AACA,UAAI,CAAC,YAAY,CAAC,SAAS,gBAAgB,QAAQ;AAC/C,eAAO,CAAC;AAAA,MACZ;AAEA,UAAI,eAAe;AACnB,UAAI,eAAe;AACnB,YAAM,SAAS,SAAS,eAAe;AAAA,QACnC,CAAC;AAAA,UACG,MAAM,EAAE,QAAQ,YAAY,WAAW,aAAa,UAAU;AAAA,UAC9D,QAAQ,EAAE,QAAQ,cAAc;AAAA,QACpC,MAAM;AACF,cAAI,WAAW,OAAO,SAAS;AAC3B;AAAA,UACJ,OAAO;AACH;AAAA,UACJ;AACA,iBAAO;AAAA,YACH,MAAM;AAAA,YACN,MAAM;AAAA,cACF;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YACJ;AAAA,YACA;AAAA,YACA;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAEA,aAAO;AAAA,QACH;AAAA,QACA,KAAK;AAAA,QACL,UAAU,SAAS;AAAA,QACnB,WAAW;AAAA,UACP,eAAe,iBAAiB,IAC1B,YACA,WAAW,KAAK,EAAE,SAAS,cAAc,SAAS,aAAa,CAAC;AAAA,QAC1E;AAAA,MACJ;AAEA,aAAO;AAAA,aAzDP;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA0DJ;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,OAAO,SAAuB,SAAyC;AAC1E;AAAA;AAAA,YAAY,UAAU,sBAAM,KAAK,OAAO,YAAY,SAAS,OAAO,GAA9C;AACtB,YAAM,EAAE,YAAY,UAAU,IAAI;AAElC,UAAI,QAAQ,cAAc;AACtB,cAAM,UAAU,iBAAiB,QAAQ,WAAW,6BAA6B;AACjF,mBAAW;AAAA,MACf;AAEA,aAAO;AAAA,QACH;AAAA,QACA,KAAK;AAAA,QACL,UAAU,SAAS;AAAA,QACnB,WAAW,QAAQ,EAAE,kBAAkB,QAAQ,kBAAkB,OAAO,QAAQ,aAAa,CAAC;AAAA,QAC9F;AAAA,MACJ;AAEA,YAAM,EAAE,wBAAwB,0CAA0C,IAAI;AAC9E,YAAM,SAAS,MAAM,UAAU;AAAA,QAC3B;AAAA,QACA,2BACK,4CACK,iDACA;AAAA,MACd;AACA,iBAAW;AACX,UAAI,CAAC,QAAQ,kBAAkB;AAC3B,YAAI,UAAU,OAAO,iBAAiB,QAAQ;AAC1C,gBAAM,QAA4B,OAAO,gBACpC,IAAI,cAAY;AACb,gBAAI,SAAS,YAAY,QAAW;AAChC,oBAAM;AAAA,gBACF,aAAa,EAAE,YAAY,WAAW,UAAU;AAAA,gBAChD;AAAA,gBACA;AAAA,cACJ,IAAI,SAAS;AACb,oBAAM,MAAM,QAAQ,SAAS,IAAI,UAAU;AAC3C,kBAAI,CAAC,KAAK;AACN,sBAAM,IAAI;AAAA,kBACN,2CAA2C,UAAU,cAAc,UAAU,aAAa,SAAS,aAAa,SAAS;AAAA,gBAC7H;AAAA,cACJ;AACA,oBAAM,iBAAiB,OAAO,UAAU,GAAG,EAAE;AAC7C,kBAAI,kBAAkB,UAAa,mBAAmB,eAAe;AACjE,sBAAM,IAAI;AAAA,kBACN,0CAA0C,UAAU,cAAc,UAAU,aAAa,SAAS,aAAa,SAAS;AAAA,gBAC5H;AAAA,cACJ;AAEA,oBAAM,OACF,kBAAkB,SAAY,SAAY,eAAe,UAAU,aAAa;AAEpF,qBAAO;AAAA,gBACH;AAAA,gBACA,KAAK;AAAA,gBACL,UAAU,SAAS;AAAA,gBACnB,WAAW,OAAO,wBAAwB,GAAG,CAAC;AAAA,gBAC9C,SAAS,IAAI,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,cAAc;AAAA,cAC3E;AAEA,oBAAM,MAA2C;AAAA,gBAC7C,MAAM;AAAA,gBACN,MAAM;AAAA,kBACF;AAAA,kBACA;AAAA,kBACA;AAAA,gBACJ;AAAA,gBACA;AAAA,gBACA;AAAA,cACJ;AACA,qBAAO;AAAA,YACX,WAAW,SAAS,WAAW,QAAW;AACtC,oBAAM;AAAA,gBACF,aAAa,EAAE,YAAY,WAAW,UAAU;AAAA,gBAChD;AAAA,gBACA,QAAQ,EAAE,QAAQ,cAAc;AAAA,cACpC,IAAI,SAAS;AACb,oBAAM,MAAkC;AAAA,gBACpC,MAAM;AAAA,gBACN,MAAM;AAAA,kBACF;AAAA,kBACA;AAAA,kBACA;AAAA,gBACJ;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cACJ;AACA,qBAAO;AAAA,YACX,OAAO;AAEH,qBAAO;AAAA,YACX;AAAA,UACJ,CAAC,EACA,OAAO,OAAK,MAAM,MAAS;AAChC,gBAAM;AAAA,QACV,OAAO;AACH,gBAAM,CAAC;AAAA,QACX;AACA,mBAAW;AAAA,MACf;AAAA,aAnGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAoGJ;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,UAAU,SAA0B,SAAoB;AAC1D,UAAM,0BAA0B,QAAQ,mBAAmB,UAAU,MAAM,QAAQ,eAAe,UAAU;AAC5G,QAAI,yBAAyB,GAAG;AAC5B,aAAO,MAAM,mFAAmF;AAAA,IACpG;AAEA,QAAI,CAAC,QAAQ,mBAAmB;AAC5B,iBAAWA,iBAAgB,KAAK,gBAAgB;AAC5C,eAAO;AAAA,UACH,iCAAiC,aAAa,QAAQA,aAAY,CAAC;AAAA,QACvE;AACA,QAAAA,cAAa,MAAM;AAAA,MACvB;AAAA,IACJ;AAEA,UAAM;AAAA,MACF,mBAAmB;AAAA,MACnB,qBAAqB;AAAA,IACzB,IAAI;AAEJ,QAAI,qBAAqB,kBAAkB;AACvC,YAAM,IAAI;AAAA,QACN,qDAAqD,SAAS;AAAA,UAC1D;AAAA,QACJ,CAAC,oCAAoC,SAAS,OAAO,gBAAgB,CAAC;AAAA,MAC1E;AAAA,IACJ;AAEA,kBAAc,OAAO,KAAK,WAAW,OAAO;AAC5C,UAAM,OAAO,KAAK,WAAW,QAAQ;AAErC,UAAM,YAAY,OAAOC,aAA6B;AAClD;AAAA;AAAA,cAAY,UAAU,sBAAM,KAAK,OAAO,eAAeA,UAAS,OAAO,GAAjD;AACtB,cAAM,EAAE,YAAY,UAAU,IAAI;AAElC,eAAO;AAAA,UACH;AAAA,UACA,UAAU,SAAS;AAAA,UACnB,WAAW,QAAQ,EAAE,mBAAmBA,SAAQ,kBAAkB,CAAC;AAAA,UACnE,WAAW,KAAK;AAAA,YACZ,KAAK,SAAS,OAAOA,SAAQ,gBAAgB;AAAA,YAC7C,KAAK,SAAS,OAAOA,SAAQ,kBAAkB;AAAA,UACnD,CAAC;AAAA,UACDA;AAAA,QACJ;AAEA,cAAM,UAAU,qBAAqB;AAAA,UACjC,GAAGA;AAAA,UACH,yBAAyB,QAAQ,GAAG,gBAAgB;AAAA,UACpD,2BAA2B,QAAQ,GAAG,kBAAkB;AAAA,QAC5D,CAAC;AACD,mBAAW;AAEX,cAAM,KAAK,4BAA4BA,UAAS,WAAW,SAAS,CAAC;AACrE,mBAAW;AAEX,cAAM,kBAAkB,MAAM,UAAU,YAAY,YAAY,iBAAiB;AACjF,cAAM,WAAW,qBAAqB,OAAO,gBAAgB,OAAO;AAEpE,eAAO;AAAA,UACH;AAAA,UACA,KAAK;AAAA,UACL,UAAU,SAAS;AAAA,UACnB,WAAW,KAAK;AAAA,YACZ,IAAI,SAAS;AAAA,YACb,UAAU,SAAS,OAAO,QAAQ,SAAS,WAAW,CAAC;AAAA,UAC3D,CAAC;AAAA,QACL;AAEA,cAAMD,gBAAe,IAAI,iBAAiB;AAAA,UACtC,UAAU,KAAK;AAAA,UACf,SAAAC;AAAA,UACA;AAAA,UACA,QAAQ,MAAM,KAAK,eAAe,OAAOD,aAAY;AAAA,UACrD;AAAA,UACA,OAAO,SAAS;AAAA,QACpB,CAAC;AACD,aAAK,eAAe,QAAQA,aAAY;AAExC,eAAOA;AAAA,eA/CP;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAgDJ;AAEA,QAAI;AACJ,QAAI,QAAQ,SAAS;AACjB,qBAAe,IAAI,sBAAsB;AAAA,QACrC,UAAU,KAAK;AAAA,QACf;AAAA,QACA;AAAA,QACA,QAAQ,MAAM,KAAK,eAAe,OAAO,YAAY;AAAA,QACrD;AAAA,QACA,OAAO,SAAS;AAAA,QAChB,SAAS,KAAK;AAAA,MAClB,CAAC;AAAA,IACL,OAAO;AACH,qBAAe,MAAM,UAAU,OAAO;AAAA,IAC1C;AAEA,SAAK,eAAe,UAAU,YAAY;AAE1C,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,4BAA4B,SAAoB,QAAoB;AACtE,QAAI,QAAQ,SAAS;AACjB,YAAM,QAAQ,QAAQ,MAAM;AAAA,IAChC,OAAO;AAMH,uBAAiB,UAAU,OAAO;AAAA,IACtC;AAAA,EACJ;AAAA,EAEA,MAAM,OAAO,MAAc,SAA4C,SAA+B;AAClG;AAAA;AAAA,YAAM,WAAW,qBAAK,UAAU,KAAK,IAAI;AAEzC,UAAI,KAAK,OAAO,SAAS;AACrB,cAAM,IAAI,oBAAoB,4CAA4C;AAAA,MAC9E;AACA,WAAK,cAAc,IAAI,OAAO;AAE9B,YAAM,aAAa,MAAM,WAAW,OAAO;AAE3C,YAAM,YAAY,MAAM,2BAA2B,OAAO,KAAK,UAAU;AAGzE,aAAO,eAAe,SAAS,SAAS,OAAO;AAAA,QAC3C,MAAM;AACF,iBAAO,UAAU,SAAS;AAAA,QAC9B;AAAA,MACJ,CAAC;AAED,YAAM,UAA0B;AAAA,QAC5B;AAAA,QACA;AAAA,QACA,CAAC,OAAO,YAAY,GAAG,YAAY;AAC/B,cAAAE,UAAA;AAAA;AAAA,kBAAM,WAAW,QAAAA,SAAA,SAAS,QAAQ;AAClC,kBAAM,UAAU,MAAM;AACtB,iBAAK,cAAc,OAAO,OAAO;AAAA,mBAFjCC,IAAA;AAAA,gBAAAC,UAAAD,IAAAE,aAAA;AAAA;AAAA,0BAAAH,SAAAE,SAAAC;AAAA;AAAA,QAGJ;AAAA,MACJ;AAEA,UAAI;AACA,gBAAQ,WAAW;AAAA,MACvB,SAAS,GAAG;AACR,cAAM,QAAQ,OAAO,YAAY,EAAE;AAAA,MACvC;AAEA,aAAO;AAAA,aAlCP;AAAA;AAAA;AAAA;AAAA;AAAA,EAmCJ;AACJ;AASA,gBAAgB,WAAW,WAAuC;AAC9D,QAAM,eAAe,IAAI,MAAiD;AAC1E,mBAAiB,UAAU,UAAU,gBAAgB,GAAG;AACpD,UAAM,WAAW,QAAQ,YAAY;AAAA,EACzC;AACJ;",
+  "names": ["subscription", "request", "_stack", "_", "_error", "_hasError"]
 }

package/dist/esm/action/client/subscription/ClientSubscription.d.ts

@@ -5,9 +5,10 @@
  */
 import type { Subscribe } from "#action/request/Subscribe.js";
 import type { ActiveSubscription } from "#action/response/SubscribeResult.js";
-import { Abort, Logger } from "#general";
-import { PeerAddress } from "#peer/PeerAddress.js";
-import { ClientSubscribe } from "./ClientSubscribe.js";
+import { Abort, Lifetime, Logger } from "#general";
+import type { SubscriptionId } from "#interaction/Subscription.js";
+import type { PeerAddress } from "#peer/PeerAddress.js";
+import type { ClientSubscribe } from "./ClientSubscribe.js";
 /**
  * The client view of an established Matter subscription.
  */
@@ -15,23 +16,27 @@ export declare abstract class ClientSubscription implements ActiveSubscription {
     #private;
     readonly request: Subscribe;
     readonly peer: PeerAddress;
-    abstract subscriptionId: number;
     abstract maxInterval: number;
     abstract interactionModelRevision: number;
     /**
      * If the subscription has an async worker, this is the promise associated with the worker.
      */
     done?: Promise<void>;
-    constructor({ request, peer, closed, abort }: ClientSubscription.Configuration);
+    constructor({ request, peer, closed, abort, lifetime }: ClientSubscription.Configuration);
+    get kind(): string;
+    get subscriptionId(): SubscriptionId;
+    set subscriptionId(id: SubscriptionId);
     close(): void;
     protected get abort(): Abort;
     protected get logger(): Logger;
 }
 export declare namespace ClientSubscription {
+    const NO_SUBSCRIPTION = -1;
     interface Configuration {
         request: ClientSubscribe;
         peer: PeerAddress;
         closed: () => void;
+        lifetime: Lifetime.Owner;
         abort?: AbortSignal;
     }
 }

package/dist/esm/action/client/subscription/ClientSubscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientSubscription.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/ClientSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAc,MAAM,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD;;GAEG;AACH,8BAAsB,kBAAmB,YAAW,kBAAkB;;IAClE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAE1C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAMT,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,CAAC,aAAa;IAU9E,KAAK;IA4BL,SAAS,KAAK,KAAK,UAElB;IAED,SAAS,KAAK,MAAM,WAEnB;CACJ;AAED,yBAAiB,kBAAkB,CAAC;IAChC,UAAiB,aAAa;QAC1B,OAAO,EAAE,eAAe,CAAC;QACzB,IAAI,EAAE,WAAW,CAAC;QAClB,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,CAAC,EAAE,WAAW,CAAC;KACvB;CACJ"}
+{"version":3,"file":"ClientSubscription.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/ClientSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAA0B,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI5D;;GAEG;AACH,8BAAsB,kBAAmB,YAAW,kBAAkB;;IAClE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAE1C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAQT,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,kBAAkB,CAAC,aAAa;IAWxF,IAAI,IAAI,WAEP;IAED,IAAI,cAAc,IAIK,cAAc,CAFpC;IAED,IAAI,cAAc,CAAC,EAAE,EAAE,cAAc,EAGpC;IAED,KAAK;IAkCL,SAAS,KAAK,KAAK,UAElB;IAED,SAAS,KAAK,MAAM,WAEnB;CACJ;AAED,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,eAAe,KAAK,CAAC;IAElC,UAAiB,aAAa;QAC1B,OAAO,EAAE,eAAe,CAAC;QACzB,IAAI,EAAE,WAAW,CAAC;QAClB,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;QACzB,KAAK,CAAC,EAAE,WAAW,CAAC;KACvB;CACJ"}

package/dist/esm/action/client/subscription/ClientSubscription.js

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Abort, Diagnostic, Logger } from "#general";
+import { Abort, decamelize, Diagnostic, Logger } from "#general";
 const logger = Logger.get("ClientSubscription");
 class ClientSubscription {
   request;
@@ -12,10 +12,13 @@ class ClientSubscription {
    * If the subscription has an async worker, this is the promise associated with the worker.
    */
   done;
+  #lifetime;
   #closed;
   #abort;
   #isClosed = false;
-  constructor({ request, peer, closed, abort }) {
+  #id = -1;
+  constructor({ request, peer, closed, abort, lifetime }) {
+    this.#lifetime = lifetime.join(this.kind);
     this.request = request;
     this.peer = peer;
     this.#closed = closed;
@@ -24,10 +27,21 @@ class ClientSubscription {
       handler: this.close.bind(this)
     });
   }
+  get kind() {
+    return decamelize(this.constructor.name.replace(/Subscription$/, ""), " ");
+  }
+  get subscriptionId() {
+    return this.#id;
+  }
+  set subscriptionId(id) {
+    this.#id = id;
+    this.#lifetime.name = [this.kind, Diagnostic.strong(id)];
+  }
   close() {
     if (this.#isClosed) {
       return;
     }
+    const closing = this.#lifetime.closing();
     this.#isClosed = true;
     this.#abort();
     this.#closed();
@@ -37,12 +51,15 @@ class ClientSubscription {
     if (this.done) {
       this.done.finally(() => {
         this.request.closed?.();
+        closing[Symbol.dispose]();
       }).catch(unhandledError);
     } else {
       try {
         this.request.closed?.();
       } catch (e) {
         unhandledError(e);
+      } finally {
+        closing[Symbol.dispose]();
       }
     }
   }
@@ -53,6 +70,9 @@ class ClientSubscription {
     return logger;
   }
 }
+((ClientSubscription2) => {
+  ClientSubscription2.NO_SUBSCRIPTION = -1;
+})(ClientSubscription || (ClientSubscription = {}));
 export {
   ClientSubscription
 };

package/dist/esm/action/client/subscription/ClientSubscription.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/action/client/subscription/ClientSubscription.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,OAAO,YAAY,cAAc;AAI1C,MAAM,SAAS,OAAO,IAAI,oBAAoB;AAKvC,MAAe,mBAAiD;AAAA,EAC1D;AAAA,EACA;AAAA;AAAA;AAAA;AAAA,EAQT;AAAA,EAES;AAAA,EACA;AAAA,EACT,YAAY;AAAA,EAEZ,YAAY,EAAE,SAAS,MAAM,QAAQ,MAAM,GAAqC;AAC5E,SAAK,UAAU;AACf,SAAK,OAAO;AACZ,SAAK,UAAU;AACf,SAAK,SAAS,IAAI,MAAM;AAAA,MACpB;AAAA,MACA,SAAS,KAAK,MAAM,KAAK,IAAI;AAAA,IACjC,CAAC;AAAA,EACL;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,WAAW;AAChB;AAAA,IACJ;AACA,SAAK,YAAY;AAEjB,SAAK,OAAO;AACZ,SAAK,QAAQ;AAEb,UAAM,iBAAiB,CAAC,MAAe;AACnC,WAAK,OAAO,MAAM,sCAAsC,WAAW,OAAO,KAAK,KAAK,SAAS,CAAC,GAAG,CAAC;AAAA,IACtG;AAEA,QAAI,KAAK,MAAM;AACX,WAAK,KACA,QAAQ,MAAM;AACX,aAAK,QAAQ,SAAS;AAAA,MAC1B,CAAC,EACA,MAAM,cAAc;AAAA,IAC7B,OAAO;AACH,UAAI;AACA,aAAK,QAAQ,SAAS;AAAA,MAC1B,SAAS,GAAG;AACR,uBAAe,CAAC;AAAA,MACpB;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,IAAc,QAAQ;AAClB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAc,SAAS;AACnB,WAAO;AAAA,EACX;AACJ;",
-  "names": []
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,OAAO,YAAY,YAAsB,cAAc;AAKhE,MAAM,SAAS,OAAO,IAAI,oBAAoB;AAKvC,MAAe,mBAAiD;AAAA,EAC1D;AAAA,EACA;AAAA;AAAA;AAAA;AAAA,EAOT;AAAA,EAES;AAAA,EACA;AAAA,EACA;AAAA,EACT,YAAY;AAAA,EACZ,MAAsB;AAAA,EAEtB,YAAY,EAAE,SAAS,MAAM,QAAQ,OAAO,SAAS,GAAqC;AACtF,SAAK,YAAY,SAAS,KAAK,KAAK,IAAI;AACxC,SAAK,UAAU;AACf,SAAK,OAAO;AACZ,SAAK,UAAU;AACf,SAAK,SAAS,IAAI,MAAM;AAAA,MACpB;AAAA,MACA,SAAS,KAAK,MAAM,KAAK,IAAI;AAAA,IACjC,CAAC;AAAA,EACL;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,WAAW,KAAK,YAAY,KAAK,QAAQ,iBAAiB,EAAE,GAAG,GAAG;AAAA,EAC7E;AAAA,EAEA,IAAI,iBAAiB;AACjB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,eAAe,IAAoB;AACnC,SAAK,MAAM;AACX,SAAK,UAAU,OAAO,CAAC,KAAK,MAAM,WAAW,OAAO,EAAE,CAAC;AAAA,EAC3D;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,WAAW;AAChB;AAAA,IACJ;AAEA,UAAM,UAAU,KAAK,UAAU,QAAQ;AAEvC,SAAK,YAAY;AAEjB,SAAK,OAAO;AACZ,SAAK,QAAQ;AAEb,UAAM,iBAAiB,CAAC,MAAe;AACnC,WAAK,OAAO,MAAM,sCAAsC,WAAW,OAAO,KAAK,KAAK,SAAS,CAAC,GAAG,CAAC;AAAA,IACtG;AAEA,QAAI,KAAK,MAAM;AACX,WAAK,KACA,QAAQ,MAAM;AACX,aAAK,QAAQ,SAAS;AACtB,gBAAQ,OAAO,OAAO,EAAE;AAAA,MAC5B,CAAC,EACA,MAAM,cAAc;AAAA,IAC7B,OAAO;AACH,UAAI;AACA,aAAK,QAAQ,SAAS;AAAA,MAC1B,SAAS,GAAG;AACR,uBAAe,CAAC;AAAA,MACpB,UAAE;AACE,gBAAQ,OAAO,OAAO,EAAE;AAAA,MAC5B;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,IAAc,QAAQ;AAClB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAc,SAAS;AACnB,WAAO;AAAA,EACX;AACJ;AAAA,CAEO,CAAUA,wBAAV;AACI,EAAMA,oBAAA,kBAAkB;AAAA,GADlB;",
+  "names": ["ClientSubscription"]
 }

package/dist/esm/action/client/subscription/ClientSubscriptionHandler.js

@@ -6,6 +6,7 @@
 import { Diagnostic, InternalError, Logger } from "#general";
 import { DecodedDataReport } from "#interaction/DecodedDataReport.js";
 import { IncomingInteractionClientMessenger } from "#interaction/InteractionMessenger.js";
+import { Subscription } from "#interaction/Subscription.js";
 import { SecureSession } from "#session/SecureSession.js";
 import { INTERACTION_PROTOCOL_ID, Status } from "#types";
 import { InputChunk } from "../InputChunk.js";
@@ -65,9 +66,7 @@ class ClientSubscriptionHandler {
 async function sendInvalid(messenger, subscriptionId) {
   await messenger.sendStatus(Status.InvalidSubscription, {
     multipleMessageInteraction: true,
-    logContext: {
-      subId: subscriptionId
-    }
+    logContext: Subscription.diagnosticOf(subscriptionId)
   });
   await messenger.close();
 }

package/dist/esm/action/client/subscription/ClientSubscriptionHandler.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/action/client/subscription/ClientSubscriptionHandler.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,YAAY,eAAe,cAAc;AAClD,SAAS,yBAAyB;AAClC,SAAS,0CAA0C;AAInD,SAAS,qBAAqB;AAC9B,SAAqB,yBAAyB,cAAc;AAC5D,SAAS,kBAAkB;AAG3B,MAAM,SAAS,OAAO,IAAI,2BAA2B;AAK9C,MAAM,0BAAqD;AAAA,EAC9D,KAAK;AAAA,EACL,wBAAwB;AAAA,EAExB;AAAA,EAEA,YAAY,eAAoC;AAC5C,SAAK,iBAAiB;AAAA,EAC1B;AAAA,EAEA,MAAM,cAAc,UAA2B;AAC3C,UAAM,YAAY,IAAI,mCAAmC,QAAQ;AAEjE,UAAM,UAAU,UAAU,gBAAgB;AAE1C,UAAM,mBAAmB,MAAM,QAAQ,KAAK;AAC5C,QAAI,iBAAiB,MAAM;AACvB,YAAM,IAAI,cAAc,4CAA4C;AAAA,IACxE;AACA,UAAM,gBAAgB,iBAAiB;AAGvC,UAAM,EAAE,eAAe,IAAI;AAC3B,QAAI,mBAAmB,QAAW;AAC9B,aAAO,MAAM,0DAA0D;AACvE,YAAM,YAAY,WAAW,MAAS;AACtC;AAAA,IACJ;AAGA,UAAM,EAAE,QAAQ,IAAI,SAAS;AAC7B,kBAAc,OAAO,OAAO;AAC5B,UAAM,eAAe,KAAK,eAAe,QAAQ,QAAQ,aAAa,cAAc;AACpF,QAAI,iBAAiB,QAAW;AAC5B,aAAO,MAAM,oDAAoD,WAAW,OAAO,cAAc,CAAC;AAClG,YAAM,YAAY,WAAW,cAAc;AAC3C;AAAA,IACJ;AAGA,QAAI,CAAC,cAAc,kBAAkB,UAAU,CAAC,cAAc,cAAc,QAAQ;AAChF,mBAAa,YAAY;AACzB,WAAK,eAAe,WAAW;AAC/B,YAAM,SAAS,MAAM;AACrB;AAAA,IACJ;AAGA,QAAI;AACA,mBAAa,YAAY;AAEzB,UAAI,aAAa,QAAQ,SAAS;AAC9B,cAAM,aAAa,QAAQ,QAAQ,eAAe,eAAe,SAAS,SAAS,CAAC;AAAA,MACxF,OAAO;AAIH,yBAAiB,UAAU,QAAQ;AAAA,MACvC;AAAA,IACJ,UAAE;AACE,mBAAa,YAAY;AACzB,mBAAa,YAAY;AACzB,WAAK,eAAe,WAAW;AAC/B,YAAM,SAAS,MAAM;AAAA,IACzB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ;AAAA,EAAC;AACnB;AAEA,eAAe,YAAY,WAA+C,gBAAiC;AACvG,QAAM,UAAU,WAAW,OAAO,qBAAqB;AAAA,IACnD,4BAA4B;AAAA,IAC5B,YAAY;AAAA,MACR,OAAO;AAAA,IACX;AAAA,EACJ,CAAC;AACD,QAAM,UAAU,MAAM;AAC1B;AAOA,gBAAgB,eACZ,eACA,cACA,WACU;AACV,QAAM,WAAW,aAAa;AAE9B,QAAM,EAAE,eAAe,IAAI;AAE3B,mBAAiB,UAAU,cAAc;AACrC,UAAM,UAAU,kBAAkB,MAAM;AAExC,QAAI,QAAQ,mBAAmB,QAAW;AACtC,aAAO,MAAM,mDAAmD;AAChE,YAAM,YAAY,WAAW,QAAQ,cAAc;AACnD;AAAA,IACJ;AAEA,QAAI,QAAQ,mBAAmB,gBAAgB;AAC3C,aAAO;AAAA,QACH;AAAA,QACA,WAAW,OAAO,QAAQ,cAAc;AAAA,MAC5C;AACA,YAAM,YAAY,WAAW,QAAQ,cAAc;AACnD;AAAA,IACJ;AAEA,UAAM,WAAW,MAAM;AAAA,EAC3B;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,YAAY,eAAe,cAAc;AAClD,SAAS,yBAAyB;AAClC,SAAS,0CAA0C;AACnD,SAAS,oBAAoC;AAG7C,SAAS,qBAAqB;AAC9B,SAAqB,yBAAyB,cAAc;AAC5D,SAAS,kBAAkB;AAG3B,MAAM,SAAS,OAAO,IAAI,2BAA2B;AAK9C,MAAM,0BAAqD;AAAA,EAC9D,KAAK;AAAA,EACL,wBAAwB;AAAA,EAExB;AAAA,EAEA,YAAY,eAAoC;AAC5C,SAAK,iBAAiB;AAAA,EAC1B;AAAA,EAEA,MAAM,cAAc,UAA2B;AAC3C,UAAM,YAAY,IAAI,mCAAmC,QAAQ;AAEjE,UAAM,UAAU,UAAU,gBAAgB;AAE1C,UAAM,mBAAmB,MAAM,QAAQ,KAAK;AAC5C,QAAI,iBAAiB,MAAM;AACvB,YAAM,IAAI,cAAc,4CAA4C;AAAA,IACxE;AACA,UAAM,gBAAgB,iBAAiB;AAGvC,UAAM,EAAE,eAAe,IAAI;AAC3B,QAAI,mBAAmB,QAAW;AAC9B,aAAO,MAAM,0DAA0D;AACvE,YAAM,YAAY,WAAW,MAAS;AACtC;AAAA,IACJ;AAGA,UAAM,EAAE,QAAQ,IAAI,SAAS;AAC7B,kBAAc,OAAO,OAAO;AAC5B,UAAM,eAAe,KAAK,eAAe,QAAQ,QAAQ,aAAa,cAAc;AACpF,QAAI,iBAAiB,QAAW;AAC5B,aAAO,MAAM,oDAAoD,WAAW,OAAO,cAAc,CAAC;AAClG,YAAM,YAAY,WAAW,cAAc;AAC3C;AAAA,IACJ;AAGA,QAAI,CAAC,cAAc,kBAAkB,UAAU,CAAC,cAAc,cAAc,QAAQ;AAChF,mBAAa,YAAY;AACzB,WAAK,eAAe,WAAW;AAC/B,YAAM,SAAS,MAAM;AACrB;AAAA,IACJ;AAGA,QAAI;AACA,mBAAa,YAAY;AAEzB,UAAI,aAAa,QAAQ,SAAS;AAC9B,cAAM,aAAa,QAAQ,QAAQ,eAAe,eAAe,SAAS,SAAS,CAAC;AAAA,MACxF,OAAO;AAIH,yBAAiB,UAAU,QAAQ;AAAA,MACvC;AAAA,IACJ,UAAE;AACE,mBAAa,YAAY;AACzB,mBAAa,YAAY;AACzB,WAAK,eAAe,WAAW;AAC/B,YAAM,SAAS,MAAM;AAAA,IACzB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ;AAAA,EAAC;AACnB;AAEA,eAAe,YAAY,WAA+C,gBAAiC;AACvG,QAAM,UAAU,WAAW,OAAO,qBAAqB;AAAA,IACnD,4BAA4B;AAAA,IAC5B,YAAY,aAAa,aAAa,cAAc;AAAA,EACxD,CAAC;AACD,QAAM,UAAU,MAAM;AAC1B;AAOA,gBAAgB,eACZ,eACA,cACA,WACU;AACV,QAAM,WAAW,aAAa;AAE9B,QAAM,EAAE,eAAe,IAAI;AAE3B,mBAAiB,UAAU,cAAc;AACrC,UAAM,UAAU,kBAAkB,MAAM;AAExC,QAAI,QAAQ,mBAAmB,QAAW;AACtC,aAAO,MAAM,mDAAmD;AAChE,YAAM,YAAY,WAAW,QAAQ,cAAc;AACnD;AAAA,IACJ;AAEA,QAAI,QAAQ,mBAAmB,gBAAgB;AAC3C,aAAO;AAAA,QACH;AAAA,QACA,WAAW,OAAO,QAAQ,cAAc;AAAA,MAC5C;AACA,YAAM,YAAY,WAAW,QAAQ,cAAc;AACnD;AAAA,IACJ;AAEA,UAAM,WAAW,MAAM;AAAA,EAC3B;AACJ;",
   "names": []
 }

package/dist/esm/action/client/subscription/ClientSubscriptions.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ReadResult } from "#action/response/ReadResult.js";
-import { Environment, Environmental } from "#general";
+import { Environment, Environmental, Lifetime } from "#general";
 import { SubscriptionId } from "#interaction/Subscription.js";
 import { PeerAddress } from "#peer/PeerAddress.js";
 import { ClientSubscription } from "./ClientSubscription.js";
@@ -12,9 +12,11 @@ import type { PeerSubscription } from "./PeerSubscription.js";
 /**
  * A managed set of {@link ActiveSubscription} instances.
  */
-export declare class ClientSubscriptions {
+export declare class ClientSubscriptions implements Lifetime.Owner {
     #private;
+    constructor(lifetime: Lifetime.Owner);
     static [Environmental.create](env: Environment): ClientSubscriptions;
+    join(...name: unknown[]): Lifetime;
     /**
      * Register a user-facing {@link ClientSubscription}.
      */

package/dist/esm/action/client/subscription/ClientSubscriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientSubscriptions.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/ClientSubscriptions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,OAAO,EAAY,WAAW,EAAE,aAAa,EAAkC,MAAM,UAAU,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AACH,qBAAa,mBAAmB;;IAK5B,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAM9C;;OAEG;IACH,SAAS,CAAC,YAAY,EAAE,kBAAkB;IAI1C;;OAEG;IACH,OAAO,CAAC,YAAY,EAAE,gBAAgB;IAUtC;;OAEG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,cAAc;IAIhD;;OAEG;IACH,MAAM,CAAC,YAAY,EAAE,kBAAkB;IAUvC;;OAEG;IACH,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIjB;;OAEG;IACG,KAAK;IAaX;;OAEG;IACH,UAAU;CAiDb;AAED,yBAAiB,mBAAmB,CAAC;IACjC,UAAiB,QAAQ;QACrB,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7D;CACJ"}
+{"version":3,"file":"ClientSubscriptions.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/ClientSubscriptions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,OAAO,EAAY,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAkC,MAAM,UAAU,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AACH,qBAAa,mBAAoB,YAAW,QAAQ,CAAC,KAAK;;gBAM1C,QAAQ,EAAE,QAAQ,CAAC,KAAK;IAIpC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAM9C,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE;IAIvB;;OAEG;IACH,SAAS,CAAC,YAAY,EAAE,kBAAkB;IAI1C;;OAEG;IACH,OAAO,CAAC,YAAY,EAAE,gBAAgB;IAUtC;;OAEG;IACH,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,cAAc;IAIhD;;OAEG;IACH,MAAM,CAAC,YAAY,EAAE,kBAAkB;IAUvC;;OAEG;IACH,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIjB;;OAEG;IACG,KAAK;IAeX;;OAEG;IACH,UAAU;CAiDb;AAED,yBAAiB,mBAAmB,CAAC;IACjC,UAAiB,QAAQ;QACrB,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7D;CACJ"}

package/dist/esm/action/client/subscription/ClientSubscriptions.js

@@ -1,3 +1,48 @@
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+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();
+};
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
@@ -5,14 +50,21 @@
  */
 import { BasicSet, Environmental, Millis, Time, Timestamp } from "#general";
 class ClientSubscriptions {
+  #lifetime;
   #active = new BasicSet();
   #peers = /* @__PURE__ */ new Map();
   #timeout;
+  constructor(lifetime) {
+    this.#lifetime = lifetime.join("client subscriptions");
+  }
   static [Environmental.create](env) {
-    const instance = new ClientSubscriptions();
+    const instance = new ClientSubscriptions(env);
     env.set(ClientSubscriptions, instance);
     return instance;
   }
+  join(...name) {
+    return this.#lifetime.join(...name);
+  }
   /**
    * Register a user-facing {@link ClientSubscription}.
    */
@@ -58,14 +110,22 @@ class ClientSubscriptions {
    * Terminate all subscriptions.
    */
   async close() {
-    if (this.#timeout) {
-      this.#timeout.stop();
-      this.#timeout = void 0;
-    }
-    for (const subscription of this.#active) {
-      subscription.close();
+    var _stack = [];
+    try {
+      const _closing = __using(_stack, this.#lifetime.closing());
+      if (this.#timeout) {
+        this.#timeout.stop();
+        this.#timeout = void 0;
+      }
+      for (const subscription of this.#active) {
+        subscription.close();
+      }
+      await this.#active.empty;
+    } catch (_) {
+      var _error = _, _hasError = true;
+    } finally {
+      __callDispose(_stack, _error, _hasError);
     }
-    await this.#active.empty;
   }
   /**
    * Restart the timeout timer for the current set of active subscriptions.

package/dist/esm/action/client/subscription/ClientSubscriptions.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/action/client/subscription/ClientSubscriptions.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,UAAuB,eAAe,QAAQ,MAAa,iBAAiB;AAS9E,MAAM,oBAAoB;AAAA,EAC7B,UAAU,IAAI,SAA6B;AAAA,EAC3C,SAAS,oBAAI,IAAgD;AAAA,EAC7D;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,oBAAoB;AACzC,QAAI,IAAI,qBAAqB,QAAQ;AACrC,WAAO;AAAA,EACX;AAAA;AAAA;AAAA;AAAA,EAKA,UAAU,cAAkC;AACxC,SAAK,QAAQ,IAAI,YAAY;AAAA,EACjC;AAAA;AAAA;AAAA;AAAA,EAKA,QAAQ,cAAgC;AACpC,QAAI,UAAU,KAAK,OAAO,IAAI,aAAa,IAAI;AAC/C,QAAI,YAAY,QAAW;AACvB,WAAK,OAAO,IAAI,aAAa,MAAO,UAAU,oBAAI,IAAI,CAAE;AAAA,IAC5D;AACA,YAAQ,IAAI,aAAa,gBAAgB,YAAY;AAErD,SAAK,WAAW;AAAA,EACpB;AAAA;AAAA;AAAA;AAAA,EAKA,QAAQ,SAAsB,IAAoB;AAC9C,WAAO,KAAK,OAAO,IAAI,OAAO,GAAG,IAAI,EAAE;AAAA,EAC3C;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,cAAkC;AACrC,UAAM,UAAU,KAAK,OAAO,IAAI,aAAa,IAAI;AACjD,QAAI,SAAS,OAAO,aAAa,cAAc,GAAG;AAC9C,UAAI,CAAC,QAAQ,MAAM;AACf,aAAK,OAAO,OAAO,aAAa,IAAI;AAAA,MACxC;AAAA,IACJ;AACA,SAAK,QAAQ,OAAO,YAAY;AAAA,EACpC;AAAA;AAAA;AAAA;AAAA,EAKA,CAAC,OAAO,QAAQ,IAAI;AAChB,WAAO,KAAK,QAAQ,OAAO,QAAQ,EAAE;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,QAAQ;AACV,QAAI,KAAK,UAAU;AACf,WAAK,SAAS,KAAK;AACnB,WAAK,WAAW;AAAA,IACpB;AAEA,eAAW,gBAAgB,KAAK,SAAS;AACrC,mBAAa,MAAM;AAAA,IACvB;AAEA,UAAM,KAAK,QAAQ;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA,EAKA,aAAa;AACT,UAAM,MAAM,KAAK;AACjB,QAAI;AAGJ,eAAW,QAAQ,KAAK,OAAO,OAAO,GAAG;AACrC,iBAAW,gBAAgB,KAAK,OAAO,GAAG;AAEtC,YAAI,aAAa,WAAW;AACxB;AAAA,QACJ;AAGA,YAAI,EAAE,UAAU,IAAI;AACpB,YAAI,cAAc,QAAW;AAEzB,sBAAY,aAAa,YAAY,UAAU,MAAM,aAAa,OAAO;AAAA,QAC7E,WAAW,YAAY,KAAK;AAExB,uBAAa,SAAS;AACtB;AAAA,QACJ;AAGA,YAAI,kBAAkB,UAAa,gBAAgB,WAAW;AAC1D,0BAAgB;AAAA,QACpB;AAAA,MACJ;AAAA,IACJ;AAGA,QAAI,kBAAkB,QAAW;AAC7B,WAAK,UAAU,KAAK;AACpB;AAAA,IACJ;AAGA,QAAI,KAAK,UAAU;AACf,WAAK,UAAU,KAAK;AACpB,WAAK,SAAS,WAAW,OAAO,gBAAgB,GAAG;AAAA,IACvD,OAAO;AACH,WAAK,WAAW,KAAK;AAAA,QACjB;AAAA,QACA,OAAO,gBAAgB,GAAG;AAAA,QAC1B,KAAK,WAAW,KAAK,IAAI;AAAA,MAC7B;AAAA,IACJ;AACA,SAAK,SAAS,MAAM;AAAA,EACxB;AACJ;",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/action/client/subscription/PeerSubscription.d.ts

@@ -12,7 +12,6 @@ import { ClientSubscription } from "./ClientSubscription.js";
 export declare class PeerSubscription extends ClientSubscription {
     readonly interactionModelRevision: number;
     readonly maxInterval: number;
-    readonly subscriptionId: number;
     isReading: boolean;
     timeoutAt?: Timestamp;
     constructor(config: PeerSubscription.Configuration);

package/dist/esm/action/client/subscription/PeerSubscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PeerSubscription.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/PeerSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAc,QAAQ,EAAmB,SAAS,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,SAAS,UAAS;IAElB,SAAS,CAAC,EAAE,SAAS,CAAC;gBAEV,MAAM,EAAE,gBAAgB,CAAC,aAAa;IASlD,IAAI,OAAO,aAEV;IAED,QAAQ;CAUX;AAED,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,aAAc,SAAQ,kBAAkB,CAAC,aAAa;QACnE,QAAQ,EAAE,iBAAiB,CAAC;KAC/B;CACJ"}
+{"version":3,"file":"PeerSubscription.d.ts","sourceRoot":"","sources":["../../../../../src/action/client/subscription/PeerSubscription.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAc,QAAQ,EAAmB,SAAS,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,SAAS,UAAS;IAElB,SAAS,CAAC,EAAE,SAAS,CAAC;gBAEV,MAAM,EAAE,gBAAgB,CAAC,aAAa;IAUlD,IAAI,OAAO,aAEV;IAED,QAAQ;CAUX;AAED,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,aAAc,SAAQ,kBAAkB,CAAC,aAAa;QACnE,QAAQ,EAAE,iBAAiB,CAAC;KAC/B;CACJ"}

package/dist/esm/action/client/subscription/PeerSubscription.js

@@ -8,12 +8,11 @@ import { ClientSubscription } from "./ClientSubscription.js";
 class PeerSubscription extends ClientSubscription {
   interactionModelRevision;
   maxInterval;
-  subscriptionId;
   isReading = false;
   timeoutAt;
   constructor(config) {
-    super(config);
     const { subscriptionId, interactionModelRevision, maxInterval } = config.response;
+    super(config);
     this.subscriptionId = subscriptionId;
     this.interactionModelRevision = interactionModelRevision;
     this.maxInterval = maxInterval;

package/dist/esm/action/client/subscription/PeerSubscription.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/action/client/subscription/PeerSubscription.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY,UAAU,QAAQ,eAA0B;AAEjE,SAAS,0BAA0B;AAK5B,MAAM,yBAAyB,mBAAmB;AAAA,EAC5C;AAAA,EACA;AAAA,EACA;AAAA,EACT,YAAY;AAAA,EAEZ;AAAA,EAEA,YAAY,QAAwC;AAChD,UAAM,MAAM;AAEZ,UAAM,EAAE,gBAAgB,0BAA0B,YAAY,IAAI,OAAO;AACzE,SAAK,iBAAiB;AACtB,SAAK,2BAA2B;AAChC,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,OAAO,QAAQ,KAAK,WAAW,KAAK,KAAK,QAAQ,uBAAuB,EAAE;AAAA,EACrF;AAAA,EAEA,WAAW;AACP,SAAK,OAAO;AAAA,MACR;AAAA,MACA,WAAW,OAAO,KAAK,cAAc;AAAA,MACrC;AAAA,MACA,WAAW,OAAO,SAAS,OAAO,KAAK,OAAO,CAAC;AAAA,IACnD;AAEA,SAAK,MAAM;AAAA,EACf;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY,UAAU,QAAQ,eAA0B;AAEjE,SAAS,0BAA0B;AAK5B,MAAM,yBAAyB,mBAAmB;AAAA,EAC5C;AAAA,EACA;AAAA,EACT,YAAY;AAAA,EAEZ;AAAA,EAEA,YAAY,QAAwC;AAChD,UAAM,EAAE,gBAAgB,0BAA0B,YAAY,IAAI,OAAO;AAEzE,UAAM,MAAM;AAEZ,SAAK,iBAAiB;AACtB,SAAK,2BAA2B;AAChC,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,OAAO,QAAQ,KAAK,WAAW,KAAK,KAAK,QAAQ,uBAAuB,EAAE;AAAA,EACrF;AAAA,EAEA,WAAW;AACP,SAAK,OAAO;AAAA,MACR;AAAA,MACA,WAAW,OAAO,KAAK,cAAc;AAAA,MACrC;AAAA,MACA,WAAW,OAAO,SAAS,OAAO,KAAK,OAAO,CAAC;AAAA,IACnD;AAEA,SAAK,MAAM;AAAA,EACf;AACJ;",
   "names": []
 }