@matter/protocol 0.16.0-alpha.0-20251205-dfb1e1556 → 0.16.0-alpha.0-20251209-d6072d23e

package/dist/cjs/session/NodeSession.js

@@ -18,15 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var NodeSession_exports = {};
 __export(NodeSession_exports, {
-  NoAssociatedFabricError: () => NoAssociatedFabricError,
-  NoChannelError: () => NoChannelError,
   NodeSession: () => NodeSession
 });
 module.exports = __toCommonJS(NodeSession_exports);
 var import_Subject = require("#action/server/Subject.js");
 var import_MessageCodec = require("#codec/MessageCodec.js");
+var import_Mark = require("#common/Mark.js");
 var import_general = require("#general");
 var import_PeerAddress = require("#peer/PeerAddress.js");
+var import_errors = require("#protocol/errors.js");
 var import_MessageCounter = require("#protocol/MessageCounter.js");
 var import_MessageReceptionState = require("#protocol/MessageReceptionState.js");
 var import_types = require("#types");
@@ -40,18 +40,8 @@ var import_Session = require("./Session.js");
 const logger = import_general.Logger.get("SecureSession");
 const SESSION_KEYS_INFO = import_general.Bytes.fromString("SessionKeys");
 const SESSION_RESUMPTION_KEYS_INFO = import_general.Bytes.fromString("SessionResumptionKeys");
-class NoChannelError extends import_general.MatterError {
-}
-class NoAssociatedFabricError extends import_types.StatusResponseError {
-  constructor(message) {
-    super(message, import_types.StatusCode.UnsupportedAccess);
-  }
-}
 class NodeSession extends import_SecureSession.SecureSession {
   #crypto;
-  #subscriptions = new import_general.BasicSet();
-  #closingAfterExchangeFinished = false;
-  #sendCloseMessageWhenClosing = true;
   #id;
   #isInitiator;
   #fabric;
@@ -61,26 +51,19 @@ class NodeSession extends import_SecureSession.SecureSession {
   #encryptKey;
   #attestationKey;
   #caseAuthenticatedTags;
-  #isClosing = false;
   supportsMRP = true;
   type = import_MessageCodec.SessionType.Unicast;
-  static async create(args) {
-    const {
-      crypto,
-      manager,
-      id,
-      fabric,
-      peerNodeId,
-      peerSessionId,
-      sharedSecret,
-      salt,
-      isInitiator,
-      isResumption,
-      peerSessionParameters,
-      caseAuthenticatedTags
-    } = args;
+  #closedByPeer = (0, import_general.AsyncObservableValue)();
+  #isPeerLost = false;
+  // TODO - remove this; subscriptions should be owned by the peer, not the session
+  #subscriptions = new import_general.BasicSet();
+  static async create(config) {
+    const { manager, sharedSecret, salt, isResumption, peerSessionParameters, isInitiator } = config;
+    if (manager) {
+      await manager.construction;
+    }
     const keys = import_general.Bytes.of(
-      await args.crypto.createHkdfKey(
+      await config.crypto.createHkdfKey(
         sharedSecret,
         salt,
         isResumption ? SESSION_RESUMPTION_KEYS_INFO : SESSION_KEYS_INFO,
@@ -90,22 +73,15 @@ class NodeSession extends import_SecureSession.SecureSession {
     const decryptKey = isInitiator ? keys.slice(16, 32) : keys.slice(0, 16);
     const encryptKey = isInitiator ? keys.slice(0, 16) : keys.slice(16, 32);
     const attestationKey = keys.slice(32, 48);
-    return new NodeSession({
-      crypto,
-      manager,
-      id,
-      fabric,
-      peerNodeId,
-      peerSessionId,
+    return new this({
+      ...config,
       decryptKey,
       encryptKey,
       attestationKey,
-      sessionParameters: peerSessionParameters,
-      isInitiator,
-      caseAuthenticatedTags
+      sessionParameters: peerSessionParameters
     });
   }
-  constructor(args) {
+  constructor(config) {
     const {
       crypto,
       manager,
@@ -118,14 +94,16 @@ class NodeSession extends import_SecureSession.SecureSession {
       attestationKey,
       caseAuthenticatedTags,
       isInitiator
-    } = args;
+    } = config;
     super({
-      ...args,
+      ...config,
       setActiveTimestamp: true,
       // We always set the active timestamp for Secure sessions
       // Can be changed to a PersistedMessageCounter if we implement session storage
-      messageCounter: new import_MessageCounter.MessageCounter(crypto, () => {
-        this.end(true, true).catch((error) => logger.error(`Error while closing session: ${error}`));
+      messageCounter: new import_MessageCounter.MessageCounter(crypto, async () => {
+        await this.initiateClose(async () => {
+          await this.closeSubscriptions(true);
+        });
       }),
       messageReceptionState: new import_MessageReceptionState.MessageReceptionStateEncryptedWithoutRollover()
     });
@@ -143,7 +121,7 @@ class NodeSession extends import_SecureSession.SecureSession {
     fabric?.addSession(this);
     logger.debug(
       `Created secure ${this.isPase ? "PASE" : "CASE"} session for fabric index ${fabric?.fabricIndex}`,
-      this.name,
+      this.via,
       this.parameterDiagnostics
     );
   }
@@ -165,12 +143,6 @@ class NodeSession extends import_SecureSession.SecureSession {
   get caseAuthenticatedTags() {
     return this.#caseAuthenticatedTags;
   }
-  get closingAfterExchangeFinished() {
-    return this.#closingAfterExchangeFinished;
-  }
-  get sendCloseMessageWhenClosing() {
-    return this.#sendCloseMessageWhenClosing;
-  }
   get isPase() {
     return this.#peerNodeId === import_types.NodeId.UNSPECIFIED_NODE_ID;
   }
@@ -180,21 +152,12 @@ class NodeSession extends import_SecureSession.SecureSession {
   get isInitiator() {
     return this.#isInitiator;
   }
-  get isClosing() {
-    return this.#isClosing;
-  }
   subjectFor(_message) {
     return import_Subject.Subject.Node({
       id: this.peerNodeId,
       catSubjects: this.#caseAuthenticatedTags.map((cat) => import_types.NodeId.fromCaseAuthenticatedTag(cat))
     });
   }
-  async close(closeAfterExchangeFinished) {
-    if (closeAfterExchangeFinished === void 0) {
-      closeAfterExchangeFinished = this.isPeerActive();
-    }
-    await this.end(true, closeAfterExchangeFinished);
-  }
   decode({ header, applicationPayload, messageExtension }, aad) {
     if (header.hasMessageExtensions) {
       logger.info(
@@ -231,17 +194,18 @@ class NodeSession extends import_SecureSession.SecureSession {
   get fabric() {
     return this.#fabric;
   }
-  addAssociatedFabric(fabric) {
-    if (this.#fabric !== void 0) {
-      throw new import_general.MatterFlowError("Session already has an associated Fabric. Cannot change this.");
+  set fabric(fabric) {
+    if (this.#fabric !== void 0 && this.#fabric !== fabric) {
+      throw new import_general.InternalError("Cannot change session fabric");
     }
     this.#fabric = fabric;
+    fabric.addSession(this);
   }
   get id() {
     return this.#id;
   }
-  get name() {
-    return `secure/${this.#id}`;
+  get via() {
+    return import_general.Diagnostic.via(`${this.peerAddress.toString()}${import_Mark.Mark.SESSION}${import_general.hex.word(this.id)}`);
   }
   get peerSessionId() {
     return this.#peerSessionId;
@@ -257,54 +221,82 @@ class NodeSession extends import_SecureSession.SecureSession {
   }
   get associatedFabric() {
     if (this.#fabric === void 0) {
-      throw new NoAssociatedFabricError(
+      throw new import_errors.NoAssociatedFabricError(
         `${this.isPase ? "PASE " : ""}Session needs to have an associated Fabric for fabric sensitive data handling.`
       );
     }
     return this.#fabric;
   }
-  async clearSubscriptions(flushSubscriptions = false, cancelledByPeer = false) {
+  async closeSubscriptions(flush = false) {
     const subscriptions = [...this.#subscriptions];
     for (const subscription of subscriptions) {
-      await subscription.close(flushSubscriptions, cancelledByPeer);
+      await subscription.close(flush ? this : void 0);
     }
     return subscriptions.length;
   }
-  /** Ends a session. Outstanding subscription data will be flushed before the session is destroyed. */
-  async end(sendClose, closeAfterExchangeFinished = false) {
-    await this.clearSubscriptions(true);
-    await this.destroy(sendClose, closeAfterExchangeFinished);
-  }
-  async closeByPeer() {
-    await this.destroy(false, false);
-    await this.closedByPeer.emit();
-  }
-  /** Destroys a session. Outstanding subscription data will be discarded. */
-  async destroy(sendClose = false, closeAfterExchangeFinished = true, flushSubscriptions = false) {
-    await this.clearSubscriptions(flushSubscriptions);
-    this.#fabric?.removeSession(this);
-    if (!sendClose) {
-      this.#sendCloseMessageWhenClosing = false;
-    }
-    if (closeAfterExchangeFinished) {
-      logger.info(`Register Session ${this.name} to close when exchange is ended.`);
-      this.#closingAfterExchangeFinished = true;
-    } else {
-      this.#isClosing = true;
-      logger.info(`End ${this.isPase ? "PASE" : "CASE"} session ${this.name}`);
-      this.manager?.sessions.delete(this);
-      if (this.closer) {
-        try {
-          await this.closer;
-        } catch (error) {
-          NoChannelError.accept(error);
-        } finally {
-          await this.destroyed.emit();
-        }
-        return;
+  get closedByPeer() {
+    return this.#closedByPeer;
+  }
+  async handlePeerClose() {
+    this.#isPeerLost = true;
+    await this.#closedByPeer.emit(true);
+    await this.handlePeerLoss();
+  }
+  async handlePeerLoss(currentExchange) {
+    this.#isPeerLost = true;
+    await this.initiateForceClose(currentExchange);
+  }
+  get isPeerLost() {
+    return this.#isPeerLost;
+  }
+  /**
+   * Close the session.
+   *
+   * If there are open subscriptions they are closed without flushing.  To flush, use {@link closeSubscriptions}
+   * before invoking.
+   *
+   * TODO - subscription handling is only relevant for server; needs to move to server-specific component
+   *
+   * If there are active exchanges the close is deferred until the final exchange closes.  To close sooner, use
+   * {@link initiateForceClose}.
+   *
+   * A final exchange will be opened to notify the peer of closure unless the peer is marked as lost.
+   */
+  async initiateClose(shutdownLogic) {
+    await super.initiateClose(async () => {
+      await shutdownLogic?.();
+      if (this.hasActiveExchanges) {
+        logger.debug(this.via, "Session ends when exchanges end");
+        this.deferredClose = true;
+      }
+    });
+  }
+  async initiateForceClose(currentExchange) {
+    this.#isPeerLost = true;
+    await super.initiateForceClose(currentExchange);
+  }
+  addExchange(exchange) {
+    super.addExchange(exchange);
+    exchange.closed.on(async () => {
+      this.exchanges.delete(exchange);
+      if (this.deferredClose && !this.exchanges.size) {
+        this.deferredClose = false;
+        await this.close();
+      }
+    });
+  }
+  async close() {
+    if (!this.#isPeerLost) {
+      try {
+        await this.gracefulClose.emit();
+      } catch (e) {
+        logger.error(`Unhandled error in ${this.via} graceful close handler:`, e);
       }
-      await this.destroyed.emit();
     }
+    await this.closeSubscriptions();
+    this.#fabric?.deleteSession(this);
+    await super.close();
+    this.manager?.sessions.delete(this);
   }
   /**
    * The peer node's address.
@@ -325,7 +317,7 @@ class NodeSession extends import_SecureSession.SecureSession {
 ((NodeSession2) => {
   function assert(session, errorText) {
     if (!is(session)) {
-      throw new import_general.MatterFlowError(errorText ?? "Insecure session in secure context");
+      throw new import_general.MatterFlowError(errorText ?? "Unsecured session in secure context");
     }
   }
   NodeSession2.assert = assert;
@@ -335,10 +327,10 @@ class NodeSession extends import_SecureSession.SecureSession {
   NodeSession2.is = is;
   function logNew(logger2, operation, session, messenger, fabric, peerNodeId) {
     logger2.info(
+      session.via,
       `${operation} session with`,
       import_general.Diagnostic.strong((0, import_PeerAddress.PeerAddress)({ fabricIndex: fabric.fabricIndex, nodeId: peerNodeId }).toString()),
       import_general.Diagnostic.dict({
-        id: session.id,
         address: messenger.channelName,
         fabric: `${import_types.NodeId.toHexString(fabric.nodeId)} (#${fabric.fabricIndex})`,
         ...session.parameterDiagnostics

package/dist/cjs/session/NodeSession.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/session/NodeSession.ts"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAwB;AACxB,0BAA0F;AAC1F,kBAAqB;AAErB,qBAYO;AAEP,yBAA4B;AAC5B,oBAAwC;AACxC,4BAA+B;AAE/B,mCAA8D;AAE9D,mBAA0D;AAC1D,2BAA8B;AAC9B,qBAAwB;AAhCxB;AAAA;AAAA;AAAA;AAAA;AAmCA,MAAM,SAAS,sBAAO,IAAI,eAAe;AAEzC,MAAM,oBAAoB,qBAAM,WAAW,aAAa;AACxD,MAAM,+BAA+B,qBAAM,WAAW,uBAAuB;AAEtE,MAAM,oBAAoB,mCAAc;AAAA,EAClC;AAAA,EACA;AAAA,EACA;AAAA,EACT;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACT;AAAA,EACS,cAAc;AAAA,EACd,OAAO,gCAAY;AAAA,EACnB,oBAAgB,qCAAqB;AAAA,EAC9C,cAAc;AAAA;AAAA,EAGL,iBAAiB,IAAI,wBAAuB;AAAA,EAErD,aAAa,OAAO,QAAkC;AAClD,UAAM,EAAE,SAAS,cAAc,MAAM,cAAc,uBAAuB,YAAY,IAAI;AAE1F,QAAI,SAAS;AACT,YAAM,QAAQ;AAAA,IAClB;AAEA,UAAM,OAAO,qBAAM;AAAA,MACf,MAAM,OAAO,OAAO;AAAA,QAChB;AAAA,QACA;AAAA,QACA,eAAe,+BAA+B;AAAA,QAC9C,6CAA8B;AAAA,MAClC;AAAA,IACJ;AACA,UAAM,aAAa,cAAc,KAAK,MAAM,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,EAAE;AACtE,UAAM,aAAa,cAAc,KAAK,MAAM,GAAG,EAAE,IAAI,KAAK,MAAM,IAAI,EAAE;AACtE,UAAM,iBAAiB,KAAK,MAAM,IAAI,EAAE;AAExC,WAAO,IAAI,KAAK;AAAA,MACZ,GAAG;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,MACA,mBAAmB;AAAA,IACvB,CAAC;AAAA,EACL;AAAA,EAEA,YAAY,QAA4B;AACpC,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AAEJ,UAAM;AAAA,MACF,GAAG;AAAA,MACH,oBAAoB;AAAA;AAAA;AAAA,MAEpB,gBAAgB,IAAI,qCAAe,QAAQ,YAAY;AAGnD,cAAM,KAAK,cAAc,YAAY;AACjC,gBAAM,KAAK,mBAAmB,IAAI;AAAA,QACtC,CAAC;AAAA,MACL,CAAC;AAAA,MACD,uBAAuB,IAAI,2EAA8C;AAAA,IAC7E,CAAC;AAED,SAAK,UAAU;AACf,SAAK,MAAM;AACX,SAAK,UAAU;AACf,SAAK,cAAc;AACnB,SAAK,iBAAiB;AACtB,SAAK,cAAc;AACnB,SAAK,cAAc;AACnB,SAAK,kBAAkB;AACvB,SAAK,yBAAyB,yBAAyB,CAAC;AACxD,SAAK,eAAe;AAEpB,aAAS,SAAS,IAAI,IAAI;AAC1B,YAAQ,WAAW,IAAI;AAEvB,WAAO;AAAA,MACH,kBAAkB,KAAK,SAAS,SAAS,MAAM,6BAA6B,QAAQ,WAAW;AAAA,MAC/F,KAAK;AAAA,MACL,KAAK;AAAA,IACT;AAAA,EACJ;AAAA,EAEA,IAAI,uBAAuB;AACvB,WAAO,0BAAW;AAAA,MACd;AAAA,QACI,KAAK,wBAAS,OAAO,KAAK,YAAY;AAAA,QACtC,KAAK,wBAAS,OAAO,KAAK,cAAc;AAAA,QACxC,KAAK,wBAAS,OAAO,KAAK,eAAe;AAAA,QACzC,OAAO,KAAK;AAAA,QACZ,OAAO,KAAK;AAAA,QACZ,MAAM,0BAAW,IAAI,KAAK,oBAAoB;AAAA,QAC9C,UAAU,KAAK;AAAA,QACf,MAAM,KAAK;AAAA,MACf;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,IAAI,wBAAwB;AACxB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,SAAkB;AAClB,WAAO,KAAK,gBAAgB,oBAAO;AAAA,EACvC;AAAA,EAEA,IAAI,gBAAgB;AAChB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,cAAc;AACd,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,WAAW,UAA6B;AACpC,WAAO,uBAAQ,KAAK;AAAA,MAChB,IAAI,KAAK;AAAA,MACT,aAAa,KAAK,uBAAuB,IAAI,SAAO,oBAAO,yBAAyB,GAAG,CAAC;AAAA,IAC5F,CAAC;AAAA,EACL;AAAA,EAEA,OAAO,EAAE,QAAQ,oBAAoB,iBAAiB,GAAkB,KAA4B;AAChG,QAAI,OAAO,sBAAsB;AAC7B,aAAO;AAAA,QACH,kDAAkD,mBAAmB,qBAAM,MAAM,gBAAgB,IAAI,MAAS;AAAA,MAClH;AAAA,IACJ;AACA,UAAM,QAAQ,uBAAQ,cAAc,OAAO,eAAe,OAAO,WAAW,KAAK,WAAW;AAC5F,UAAM,UAAU,iCAAa,cAAc;AAAA,MACvC;AAAA,MACA,oBAAoB,KAAK,QAAQ,QAAQ,KAAK,aAAa,oBAAoB,OAAO,GAAG;AAAA,IAC7F,CAAC;AAED,QAAI,QAAQ,cAAc,qBAAqB;AAC3C,aAAO;AAAA,QACH,kDAAkD,QAAQ,oBAAoB,qBAAM,MAAM,QAAQ,iBAAiB,IAAI,MAAS;AAAA,MACpI;AAAA,IACJ;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,OAAO,SAA0B;AAC7B,YAAQ,aAAa,YAAY,KAAK;AACtC,UAAM,EAAE,QAAQ,mBAAmB,IAAI,iCAAa,cAAc,OAAO;AACzE,UAAM,cAAc,iCAAa,mBAAmB,QAAQ,YAAY;AACxE,UAAM,gBAAgB,YAAY,CAAC;AACnC,UAAM,gBAAgB,KAAK,SACrB,oBAAO,sBACN,KAAK,SAAS,UAAU,oBAAO;AACtC,UAAM,QAAQ,uBAAQ,cAAc,eAAe,OAAO,WAAW,aAAa;AAClF,WAAO;AAAA,MACH;AAAA,MACA,oBAAoB,KAAK,QAAQ,QAAQ,KAAK,aAAa,oBAAoB,OAAO,WAAW;AAAA,IACrG;AAAA,EACJ;AAAA,EAEA,IAAI,0BAAiC;AACjC,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,SAA6B;AAC7B,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,OAAO,QAAgB;AACvB,QAAI,KAAK,YAAY,UAAa,KAAK,YAAY,QAAQ;AACvD,YAAM,IAAI,6BAAc,8BAA8B;AAAA,IAC1D;AACA,SAAK,UAAU;AACf,WAAO,WAAW,IAAI;AAAA,EAC1B;AAAA,EAEA,IAAI,KAAK;AACL,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,MAAM;AACN,WAAO,0BAAW,IAAI,GAAG,KAAK,YAAY,SAAS,CAAC,GAAG,iBAAK,OAAO,GAAG,mBAAI,KAAK,KAAK,EAAE,CAAC,EAAE;AAAA,EAC7F;AAAA,EAEA,IAAI,gBAAwB;AACxB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,KAAK,SAAS,UAAU,oBAAO;AAAA,EAC1C;AAAA,EAEA,IAAI,aAAa;AACb,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,sBAAsB;AACtB,WAAO,KAAK,YAAY;AAAA,EAC5B;AAAA,EAEA,IAAI,mBAA2B;AAC3B,QAAI,KAAK,YAAY,QAAW;AAC5B,YAAM,IAAI;AAAA,QACN,GAAG,KAAK,SAAS,UAAU,EAAE;AAAA,MACjC;AAAA,IACJ;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAe,mBAAmB,QAAQ,OAAO;AAC7C,UAAM,gBAAgB,CAAC,GAAG,KAAK,cAAc;AAC7C,eAAW,gBAAgB,eAAe;AACtC,YAAM,aAAa,MAAM,QAAQ,OAAO,MAAS;AAAA,IACrD;AACA,WAAO,cAAc;AAAA,EACzB;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,kBAAkB;AACpB,SAAK,cAAc;AACnB,UAAM,KAAK,cAAc,KAAK,IAAI;AAClC,UAAM,KAAK,eAAe;AAAA,EAC9B;AAAA,EAEA,MAAM,eAAe,iBAAmC;AACpD,SAAK,cAAc;AACnB,UAAM,KAAK,mBAAmB,eAAe;AAAA,EACjD;AAAA,EAEA,IAAI,aAAa;AACb,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAeA,MAAe,cAAc,eAAqC;AAC9D,UAAM,MAAM,cAAc,YAAY;AAClC,YAAM,gBAAgB;AAGtB,UAAI,KAAK,oBAAoB;AACzB,eAAO,MAAM,KAAK,KAAK,iCAAiC;AACxD,aAAK,gBAAgB;AAAA,MACzB;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,MAAe,mBAAmB,iBAAmC;AACjE,SAAK,cAAc;AACnB,UAAM,MAAM,mBAAmB,eAAe;AAAA,EAClD;AAAA,EAES,YAAY,UAA2B;AAC5C,UAAM,YAAY,QAAQ;AAC1B,aAAS,OAAO,GAAG,YAAY;AAC3B,WAAK,UAAU,OAAO,QAAQ;AAC9B,UAAI,KAAK,iBAAiB,CAAC,KAAK,UAAU,MAAM;AAC5C,aAAK,gBAAgB;AACrB,cAAM,KAAK,MAAM;AAAA,MACrB;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,MAAyB,QAAQ;AAC7B,QAAI,CAAC,KAAK,aAAa;AACnB,UAAI;AACA,cAAM,KAAK,cAAc,KAAK;AAAA,MAClC,SAAS,GAAG;AACR,eAAO,MAAM,sBAAsB,KAAK,GAAG,4BAA4B,CAAC;AAAA,MAC5E;AAAA,IACJ;AAEA,UAAM,KAAK,mBAAmB;AAE9B,SAAK,SAAS,cAAc,IAAI;AAChC,UAAM,MAAM,MAAM;AAElB,SAAK,SAAS,SAAS,OAAO,IAAI;AAAA,EACtC;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,cAAc;AACd,eAAO,gCAAY;AAAA,MACf,aAAa,KAAK,SAAS,eAAe,yBAAY;AAAA,MACtD,QAAQ,KAAK;AAAA,IACjB,CAAC;AAAA,EACL;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,SAAsB;AACzB,YACK,KAAK,SAAS,eAAe,yBAAY,eAAe,QAAQ,eACjE,KAAK,gBAAgB,QAAQ;AAAA,EAErC;AACJ;AAAA,CAEO,CAAUA,iBAAV;AACI,WAAS,OAAO,SAAmB,WAAoD;AAC1F,QAAI,CAAC,GAAG,OAAO,GAAG;AACd,YAAM,IAAI,+BAAgB,aAAa,qCAAqC;AAAA,IAChF;AAAA,EACJ;AAJO,EAAAA,aAAS;AAMT,WAAS,GAAG,SAA2C;AAC1D,WAAO,SAAS,SAAS,gCAAY;AAAA,EACzC;AAFO,EAAAA,aAAS;AAIT,WAAS,OACZC,SACA,WACA,SACA,WACA,QACA,YACF;AACE,IAAAA,QAAO;AAAA,MACH,QAAQ;AAAA,MACR,GAAG,SAAS;AAAA,MACZ,0BAAW,WAAO,gCAAY,EAAE,aAAa,OAAO,aAAa,QAAQ,WAAW,CAAC,EAAE,SAAS,CAAC;AAAA,MACjG,0BAAW,KAAK;AAAA,QACZ,SAAS,UAAU;AAAA,QACnB,QAAQ,GAAG,oBAAO,YAAY,OAAO,MAAM,CAAC,MAAM,OAAO,WAAW;AAAA,QACpE,GAAG,QAAQ;AAAA,MACf,CAAC;AAAA,IACL;AAAA,EACJ;AAlBO,EAAAD,aAAS;AAAA,GAXH;",
   "names": ["NodeSession", "logger"]
 }

package/dist/cjs/session/SecureSession.d.ts

@@ -3,10 +3,10 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Subject } from "#action/server/Subject.js";
-import { Message } from "#codec/MessageCodec.js";
-import { Fabric } from "#fabric/Fabric.js";
-import { PeerAddress } from "#peer/PeerAddress.js";
+import type { Subject } from "#action/server/Subject.js";
+import type { Message } from "#codec/MessageCodec.js";
+import type { Fabric } from "#fabric/Fabric.js";
+import type { PeerAddress } from "#peer/PeerAddress.js";
 import { Session } from "./Session.js";
 export declare abstract class SecureSession extends Session {
     readonly isSecure = true;

package/dist/cjs/session/SecureSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SecureSession.d.ts","sourceRoot":"","sources":["../../../src/session/SecureSession.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,8BAAsB,aAAc,SAAQ,OAAO;IAC/C,QAAQ,CAAC,QAAQ,QAAQ;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;CAClD;AAED,yBAAiB,aAAa,CAAC;IAC3B,SAAgB,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,IAAI,aAAa,CAI9F;CACJ"}
+{"version":3,"file":"SecureSession.d.ts","sourceRoot":"","sources":["../../../src/session/SecureSession.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,8BAAsB,aAAc,SAAQ,OAAO;IAC/C,QAAQ,CAAC,QAAQ,QAAQ;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;CAClD;AAED,yBAAiB,aAAa,CAAC;IAC3B,SAAgB,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,IAAI,aAAa,CAI9F;CACJ"}

package/dist/cjs/session/SecureSession.js

@@ -34,7 +34,7 @@ class SecureSession extends import_Session.Session {
 ((SecureSession2) => {
   function assert(session, errorText) {
     if (!session?.isSecure) {
-      throw new import_general.MatterFlowError(errorText ?? "Insecure session in secure context");
+      throw new import_general.MatterFlowError(errorText ?? "Unsecured session in secure context");
     }
   }
   SecureSession2.assert = assert;

package/dist/cjs/session/SecureSession.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/session/SecureSession.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,qBAAgC;AAEhC,qBAAwB;AAVxB;AAAA;AAAA;AAAA;AAAA;AAYO,MAAe,sBAAsB,uBAAQ;AAAA,EACvC,WAAW;AAIxB;AAAA,CAEO,CAAUA,mBAAV;AACI,WAAS,OAAO,SAAmB,WAAsD;AAC5F,QAAI,CAAC,SAAS,UAAU;AACpB,YAAM,IAAI,+BAAgB,aAAa,oCAAoC;AAAA,IAC/E;AAAA,EACJ;AAJO,EAAAA,eAAS;AAAA,GADH;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,qBAAgC;AAEhC,qBAAwB;AAXxB;AAAA;AAAA;AAAA;AAAA;AAaO,MAAe,sBAAsB,uBAAQ;AAAA,EACvC,WAAW;AAIxB;AAAA,CAEO,CAAUA,mBAAV;AACI,WAAS,OAAO,SAAmB,WAAsD;AAC5F,QAAI,CAAC,SAAS,UAAU;AACpB,YAAM,IAAI,+BAAgB,aAAa,qCAAqC;AAAA,IAChF;AAAA,EACJ;AAJO,EAAAA,eAAS;AAAA,GADH;",
   "names": ["SecureSession"]
 }

package/dist/cjs/session/Session.d.ts

@@ -3,57 +3,25 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { SupportedTransportsBitmap } from "#common/SupportedTransportsBitmap.js";
-import { AsyncObservable, Bytes, Duration, Timestamp } from "#general";
-import { NodeId, TypeFromPartialBitSchema } from "#types";
-import { DecodedMessage, DecodedPacket, Message, Packet, SessionType } from "../codec/MessageCodec.js";
-import { Fabric } from "../fabric/Fabric.js";
-import { MessageCounter } from "../protocol/MessageCounter.js";
-import { MessageReceptionState } from "../protocol/MessageReceptionState.js";
-import { SessionIntervals } from "./SessionIntervals.js";
-import { type SessionManager } from "./SessionManager.js";
-/** Fallback value for Data Model Revision when not provided in Session parameters. We use Matter 1.2 as assumption. */
-export declare const FALLBACK_DATAMODEL_REVISION = 17;
-/** Fallback value for Interaction Model Revision when not provided in Session parameters. We use Matter 1.2 as assumption. */
-export declare const FALLBACK_INTERACTIONMODEL_REVISION = 11;
-/**
- * Fallback value for Specification Version when not provided in Session parameters. We use 0 as assumption which is
- * "before 1.3".
- */
-export declare const FALLBACK_SPECIFICATION_VERSION = 0;
-/**
- * Fallback value for the maximum number of paths that can be included in a single invoke message when not provided in
- * Session parameters.
- */
-export declare const FALLBACK_MAX_PATHS_PER_INVOKE = 1;
-export declare const FALLBACK_MAX_TCP_MESSAGE_SIZE = 64000;
-export interface SessionParameters extends SessionIntervals {
-    /** Version of Data Model for the Session parameters side where it appears. */
-    dataModelRevision: number;
-    /** Version of Interaction Model for the Session parameters side where it appears. */
-    interactionModelRevision: number;
-    /** Version of Specification for the Session parameters side where it appears. */
-    specificationVersion: number;
-    /** The maximum number of elements in the InvokeRequests list that the Node is able to process. */
-    maxPathsPerInvoke: number;
-    /** A bitmap of the supported transport protocols in addition to MRP. */
-    supportedTransports: TypeFromPartialBitSchema<typeof SupportedTransportsBitmap>;
-    /**
-     * Maximum size of the message carried over TCP, excluding the framing message length
-     * field, that the node is capable of receiving from its peer.
-     * Default: 64000 bytes
-     */
-    maxTcpMessageSize?: number;
-}
-export type SessionParameterOptions = Partial<SessionParameters>;
+import type { SupportedTransportsBitmap } from "#common/SupportedTransportsBitmap.js";
+import { AsyncObservable, Bytes, Channel, Duration, Lifetime, ObservableValue, Timestamp } from "#general";
+import { MessageChannel } from "#protocol/MessageChannel.js";
+import type { MessageExchange } from "#protocol/MessageExchange.js";
+import type { NodeId, TypeFromPartialBitSchema } from "#types";
+import type { DecodedMessage, DecodedPacket, Message, Packet, PacketHeader, SessionType } from "../codec/MessageCodec.js";
+import type { Fabric } from "../fabric/Fabric.js";
+import type { MessageCounter } from "../protocol/MessageCounter.js";
+import type { MessageReceptionState } from "../protocol/MessageReceptionState.js";
+import type { SessionManager } from "./SessionManager.js";
+import { SessionParameters } from "./SessionParameters.js";
 export declare abstract class Session {
     #private;
-    abstract get name(): string;
-    abstract get closingAfterExchangeFinished(): boolean;
+    abstract get via(): string;
     timestamp: Timestamp;
     readonly createdAt: Timestamp;
     activeTimestamp: Timestamp;
     abstract type: SessionType;
+    protected deferredClose: boolean;
     protected readonly idleInterval: Duration;
     protected readonly activeInterval: Duration;
     protected readonly activeThreshold: Duration;
@@ -64,26 +32,26 @@ export declare abstract class Session {
     protected readonly messageCounter: MessageCounter;
     protected readonly messageReceptionState?: MessageReceptionState;
     protected readonly supportedTransports: TypeFromPartialBitSchema<typeof SupportedTransportsBitmap>;
-    protected readonly maxTcpMessageSize: number;
-    /**
-     * If the ExchangeManager performs async work to clean up a session it sets this promise.  This is because
-     * historically we didn't return from destroy() until ExchangeManager was complete.  Not sure if this is entirely
-     * necessary, but it makes sense so this allows us to maintain the old behavior.
-     */
-    closer?: Promise<void>;
-    constructor(args: {
-        manager?: SessionManager;
-        messageCounter: MessageCounter;
-        messageReceptionState?: MessageReceptionState;
-        sessionParameters?: SessionParameterOptions;
-        setActiveTimestamp: boolean;
-    });
-    get destroyed(): AsyncObservable<[], void>;
-    get closedByPeer(): AsyncObservable<[], void>;
+    protected readonly maxTcpMessageSize?: number;
+    constructor(config: Session.Configuration);
+    get exchanges(): Set<MessageExchange>;
+    addExchange(exchange: MessageExchange): void;
+    deleteExchange(exchange: MessageExchange): void;
+    get closing(): ObservableValue<[any, ...any[]], void>;
     notifyActivity(messageReceived: boolean): void;
-    isPeerActive(): boolean;
+    get isPeerActive(): boolean;
     getIncrementedMessageCounter(): Promise<number>;
     updateMessageCounter(messageCounter: number, _sourceNodeId?: NodeId, _operationalKey?: Bytes): void;
+    /**
+     * Emits on graceful close.
+     *
+     * During normal operation this should trigger a close message to notify the peer of closure.
+     */
+    get gracefulClose(): AsyncObservable<[], void>;
+    /**
+     * Once set this flag prevents establishment of new exchanges.
+     */
+    get isClosing(): boolean;
     protected static generateNonce(securityFlags: number, messageId: number, nodeId: NodeId): Uint8Array<ArrayBufferLike>;
     /**
      * The peer's session parameters.
@@ -98,12 +66,60 @@ export declare abstract class Session {
     abstract supportsMRP: boolean;
     abstract decode(packet: DecodedPacket, aad?: Bytes): DecodedMessage;
     abstract encode(message: Message): Packet;
-    abstract end(sendClose: boolean): Promise<void>;
-    abstract destroy(sendClose?: boolean, closeAfterExchangeFinished?: boolean, flushSubscriptions?: boolean): Promise<void>;
+    static idStrOf(source: Packet | PacketHeader | number): string;
+    /**
+     * Close the session.
+     *
+     * This begins the close process.  {@link shutdownLogic} is logic that should run once the session no longer accepts
+     * new exchanges.  It may set {@link deferredClose} to prevent the close from proceeding until all exchanges are
+     * finished.  Otherwise, the close will proceed immediately.
+     */
+    initiateClose(shutdownLogic?: () => Promise<void>): Promise<void>;
+    /**
+     * Force-close the session.
+     *
+     * This terminates subscriptions and exchanges without notifying peers.  It places the session in a closing state
+     * so no further exchanges are accepted.
+     *
+     * @param except an exchange that should not be forced close; this allows the current exchange to remain open
+     */
+    initiateForceClose(except?: MessageExchange): Promise<void>;
+    get isClosed(): boolean;
+    /**
+     * The {@link MessageChannel} other components use for session communication.
+     */
+    get channel(): MessageChannel;
+    get usesMrp(): boolean;
+    get supportsLargeMessages(): boolean;
+    get hasActiveExchanges(): boolean;
+    closeSubscriptions(_cancelledByPeer?: boolean): Promise<number>;
+    detachChannel(): MessageChannel | undefined;
+    protected close(): Promise<void>;
     protected get manager(): SessionManager | undefined;
     /**
-     * @deprecated
+     * This is primarily intended for testing.
      */
-    get owner(): unknown;
+    protected set channel(channel: MessageChannel);
+    join(...name: unknown[]): Lifetime;
+    /**
+     * Invoked by manager when the session is "live".
+     *
+     * This is separate from construction because we sometimes discard sessions without installing in a manager or
+     * closing.
+     */
+    activate(): Lifetime;
+    protected set lifetime(lifetime: Lifetime);
+}
+export declare namespace Session {
+    interface CommonConfig {
+        manager?: SessionManager;
+        channel?: Channel<Bytes>;
+    }
+    interface Configuration extends CommonConfig {
+        messageCounter: MessageCounter;
+        messageReceptionState?: MessageReceptionState;
+        sessionParameters?: SessionParameters.Config;
+        setActiveTimestamp: boolean;
+    }
 }
 //# sourceMappingURL=Session.d.ts.map

package/dist/cjs/session/Session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"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"}