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

package/dist/cjs/session/Session.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,33 +20,73 @@ 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 Session_exports = {};
 __export(Session_exports, {
-  FALLBACK_DATAMODEL_REVISION: () => FALLBACK_DATAMODEL_REVISION,
-  FALLBACK_INTERACTIONMODEL_REVISION: () => FALLBACK_INTERACTIONMODEL_REVISION,
-  FALLBACK_MAX_PATHS_PER_INVOKE: () => FALLBACK_MAX_PATHS_PER_INVOKE,
-  FALLBACK_MAX_TCP_MESSAGE_SIZE: () => FALLBACK_MAX_TCP_MESSAGE_SIZE,
-  FALLBACK_SPECIFICATION_VERSION: () => FALLBACK_SPECIFICATION_VERSION,
   Session: () => Session
 });
 module.exports = __toCommonJS(Session_exports);
 var import_general = require("#general");
-var import_SessionIntervals = require("./SessionIntervals.js");
+var import_errors = require("#protocol/errors.js");
+var import_MessageChannel = require("#protocol/MessageChannel.js");
+var import_SessionParameters = require("./SessionParameters.js");
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-const FALLBACK_DATAMODEL_REVISION = 17;
-const FALLBACK_INTERACTIONMODEL_REVISION = 11;
-const FALLBACK_SPECIFICATION_VERSION = 0;
-const FALLBACK_MAX_PATHS_PER_INVOKE = 1;
-const FALLBACK_MAX_TCP_MESSAGE_SIZE = 64e3;
+const logger = import_general.Logger.get("Session");
 class Session {
+  #channel;
+  #lifetime;
   #manager;
   timestamp = import_general.Time.nowMs;
   createdAt = import_general.Time.nowMs;
   activeTimestamp = 0;
+  #closing = (0, import_general.ObservableValue)();
+  #gracefulClose = (0, import_general.AsyncObservable)();
+  #exchanges = /* @__PURE__ */ new Set();
+  deferredClose = false;
   idleInterval;
   activeInterval;
   activeThreshold;
@@ -54,34 +98,23 @@ class Session {
   messageReceptionState;
   supportedTransports;
   maxTcpMessageSize;
-  /**
-   * 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;
-  #destroyed = (0, import_general.AsyncObservable)();
-  #closedByPeer = (0, import_general.AsyncObservable)();
-  constructor(args) {
+  constructor(config) {
+    const { manager, channel, messageCounter, messageReceptionState, sessionParameters, setActiveTimestamp } = config;
     const {
-      manager,
-      messageCounter,
-      messageReceptionState,
-      sessionParameters: {
-        idleInterval = import_SessionIntervals.SessionIntervals.defaults.idleInterval,
-        activeInterval = import_SessionIntervals.SessionIntervals.defaults.activeInterval,
-        activeThreshold = import_SessionIntervals.SessionIntervals.defaults.activeThreshold,
-        dataModelRevision = FALLBACK_DATAMODEL_REVISION,
-        interactionModelRevision = FALLBACK_INTERACTIONMODEL_REVISION,
-        specificationVersion = FALLBACK_SPECIFICATION_VERSION,
-        maxPathsPerInvoke = FALLBACK_MAX_PATHS_PER_INVOKE,
-        supportedTransports = {},
-        // no TCP support by default
-        maxTcpMessageSize = FALLBACK_MAX_TCP_MESSAGE_SIZE
-      } = {},
-      setActiveTimestamp
-    } = args;
+      idleInterval,
+      activeInterval,
+      activeThreshold,
+      dataModelRevision,
+      interactionModelRevision,
+      specificationVersion,
+      maxPathsPerInvoke,
+      supportedTransports,
+      maxTcpMessageSize
+    } = (0, import_SessionParameters.SessionParameters)(sessionParameters);
     this.#manager = manager;
+    if (channel) {
+      this.#channel = new import_MessageChannel.MessageChannel(channel, this);
+    }
     this.messageCounter = messageCounter;
     this.messageReceptionState = messageReceptionState;
     this.idleInterval = idleInterval;
@@ -97,11 +130,17 @@ class Session {
       this.activeTimestamp = this.timestamp;
     }
   }
-  get destroyed() {
-    return this.#destroyed;
+  get exchanges() {
+    return this.#exchanges;
+  }
+  addExchange(exchange) {
+    this.#exchanges.add(exchange);
+  }
+  deleteExchange(exchange) {
+    this.#exchanges.delete(exchange);
   }
-  get closedByPeer() {
-    return this.#closedByPeer;
+  get closing() {
+    return this.#closing;
   }
   notifyActivity(messageReceived) {
     this.timestamp = import_general.Time.nowMs;
@@ -109,7 +148,7 @@ class Session {
       this.activeTimestamp = this.timestamp;
     }
   }
-  isPeerActive() {
+  get isPeerActive() {
     return (0, import_general.Timespan)(this.activeTimestamp, import_general.Time.nowMs).duration < this.activeThreshold;
   }
   getIncrementedMessageCounter() {
@@ -121,6 +160,20 @@ class Session {
     }
     this.messageReceptionState.updateMessageCounter(messageCounter);
   }
+  /**
+   * Emits on graceful close.
+   *
+   * During normal operation this should trigger a close message to notify the peer of closure.
+   */
+  get gracefulClose() {
+    return this.#gracefulClose;
+  }
+  /**
+   * Once set this flag prevents establishment of new exchanges.
+   */
+  get isClosing() {
+    return this.#closing.value || this.deferredClose;
+  }
   static generateNonce(securityFlags, messageId, nodeId) {
     const writer = new import_general.DataWriter(import_general.Endian.Little);
     writer.writeUInt8(securityFlags);
@@ -155,14 +208,134 @@ class Session {
       maxTcpMessageSize
     };
   }
+  static idStrOf(source) {
+    let id;
+    if (typeof source === "number") {
+      id = source;
+    } else {
+      if ("header" in source) {
+        id = source.header?.sessionId;
+      } else if ("sessionId" in source) {
+        id = source.sessionId;
+      }
+      if (typeof id !== "number") {
+        return "?";
+      }
+    }
+    return import_general.hex.word(id);
+  }
+  /**
+   * 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.
+   */
+  async initiateClose(shutdownLogic) {
+    if (this.isClosing) {
+      return;
+    }
+    this.#lifetime?.closing();
+    this.#closing.emit(true);
+    await shutdownLogic?.();
+    if (this.deferredClose && this.hasActiveExchanges) {
+      return;
+    }
+    await this.close();
+  }
+  /**
+   * 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
+   */
+  async initiateForceClose(except) {
+    await this.initiateClose(async () => {
+      await this.closeSubscriptions();
+      for (const exchange of this.#exchanges) {
+        if (exchange === except) {
+          continue;
+        }
+        await exchange.close(true);
+      }
+    });
+  }
+  get isClosed() {
+    return !this.#channel;
+  }
+  /**
+   * The {@link MessageChannel} other components use for session communication.
+   */
+  get channel() {
+    if (this.#channel === void 0) {
+      throw new import_errors.SessionClosedError(`Session ${this.via} ended`);
+    }
+    return this.#channel;
+  }
+  get usesMrp() {
+    return this.supportsMRP && !this.#channel?.isReliable;
+  }
+  get supportsLargeMessages() {
+    return this.#channel !== void 0 && !!this.#channel?.supportsLargeMessages;
+  }
+  get hasActiveExchanges() {
+    return !!this.#exchanges.size;
+  }
+  async closeSubscriptions(_cancelledByPeer = false) {
+    return 0;
+  }
+  detachChannel() {
+    const channel = this.#channel;
+    this.#channel = void 0;
+    logger.info(this.via, "Channel detached");
+    return channel;
+  }
+  async close() {
+    var _stack = [];
+    try {
+      const _closing = __using(_stack, this.#lifetime?.closing());
+      if (this.#channel) {
+        await this.#channel.close();
+        this.#channel = void 0;
+        logger.info(this.via, "Session ended");
+      }
+    } catch (_) {
+      var _error = _, _hasError = true;
+    } finally {
+      __callDispose(_stack, _error, _hasError);
+    }
+  }
   get manager() {
     return this.#manager;
   }
   /**
-   * @deprecated
+   * This is primarily intended for testing.
    */
-  get owner() {
-    return this.#manager?.owner;
+  set channel(channel) {
+    if (this.#channel !== void 0) {
+      throw new import_general.ImplementationError("Cannot replace active channel");
+    }
+    this.#channel = channel;
+  }
+  join(...name) {
+    return this.activate().join(...name);
+  }
+  /**
+   * 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() {
+    if (!this.#lifetime) {
+      this.#lifetime = (this.#manager?.construction ?? import_general.Lifetime.process).join("session", this.via);
+    }
+    return this.#lifetime;
+  }
+  set lifetime(lifetime) {
+    this.#lifetime = lifetime;
   }
 }
 //# sourceMappingURL=Session.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/session/Session.ts"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,qBAgBO;AACP,oBAAmC;AACnC,4BAA+B;AAe/B,+BAAkC;AAxClC;AAAA;AAAA;AAAA;AAAA;AA0CA,MAAM,SAAS,sBAAO,IAAI,SAAS;AAE5B,MAAe,QAAQ;AAAA,EAC1B;AAAA,EACA;AAAA,EAGA;AAAA,EACA,YAAY,oBAAK;AAAA,EACR,YAAY,oBAAK;AAAA,EAC1B,kBAA6B;AAAA,EAG7B,eAAW,gCAAgB;AAAA,EAC3B,qBAAiB,gCAAoB;AAAA,EAC5B,aAAa,oBAAI,IAAqB;AAAA,EACrC,gBAAgB;AAAA,EAEP;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEnB,YAAY,QAA+B;AACvC,UAAM,EAAE,SAAS,SAAS,gBAAgB,uBAAuB,mBAAmB,mBAAmB,IACnG;AAEJ,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,QAAI,4CAAkB,iBAAiB;AAEvC,SAAK,WAAW;AAChB,QAAI,SAAS;AACT,WAAK,WAAW,IAAI,qCAAe,SAAS,IAAI;AAAA,IACpD;AACA,SAAK,iBAAiB;AACtB,SAAK,wBAAwB;AAC7B,SAAK,eAAe;AACpB,SAAK,iBAAiB;AACtB,SAAK,kBAAkB;AACvB,SAAK,oBAAoB;AACzB,SAAK,2BAA2B;AAChC,SAAK,uBAAuB;AAC5B,SAAK,oBAAoB;AACzB,SAAK,sBAAsB;AAC3B,SAAK,oBAAoB;AACzB,QAAI,oBAAoB;AACpB,WAAK,kBAAkB,KAAK;AAAA,IAChC;AAAA,EACJ;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,UAA2B;AACnC,SAAK,WAAW,IAAI,QAAQ;AAAA,EAChC;AAAA,EAEA,eAAe,UAA2B;AACtC,SAAK,WAAW,OAAO,QAAQ;AAAA,EACnC;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,eAAe,iBAA0B;AACrC,SAAK,YAAY,oBAAK;AACtB,QAAI,iBAAiB;AAEjB,WAAK,kBAAkB,KAAK;AAAA,IAChC;AAAA,EACJ;AAAA,EAEA,IAAI,eAAwB;AACxB,eAAO,yBAAS,KAAK,iBAAiB,oBAAK,KAAK,EAAE,WAAW,KAAK;AAAA,EACtE;AAAA,EAEA,+BAA+B;AAC3B,WAAO,KAAK,eAAe,sBAAsB;AAAA,EACrD;AAAA,EAEA,qBAAqB,gBAAwB,eAAwB,iBAAyB;AAC1F,QAAI,KAAK,0BAA0B,QAAW;AAC1C,YAAM,IAAI,6BAAc,uDAAuD;AAAA,IACnF;AACA,SAAK,sBAAsB,qBAAqB,cAAc;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,IAAI,gBAAgB;AAChB,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,YAAqB;AACrB,WAAO,KAAK,SAAS,SAAS,KAAK;AAAA,EACvC;AAAA,EAEA,OAAiB,cAAc,eAAuB,WAAmB,QAAgB;AACrF,UAAM,SAAS,IAAI,0BAAW,sBAAO,MAAM;AAC3C,WAAO,WAAW,aAAa;AAC/B,WAAO,YAAY,SAAS;AAC5B,WAAO,YAAY,MAAM;AACzB,WAAO,OAAO,YAAY;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,aAAgC;AAChC,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AACJ,WAAO;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,EAaA,OAAO,QAAQ,QAAwC;AACnD,QAAI;AACJ,QAAI,OAAO,WAAW,UAAU;AAC5B,WAAK;AAAA,IACT,OAAO;AACH,UAAI,YAAY,QAAQ;AACpB,aAAK,OAAO,QAAQ;AAAA,MACxB,WAAW,eAAe,QAAQ;AAC9B,aAAK,OAAO;AAAA,MAChB;AACA,UAAI,OAAO,OAAO,UAAU;AACxB,eAAO;AAAA,MACX;AAAA,IACJ;AAEA,WAAO,mBAAI,KAAK,EAAE;AAAA,EACtB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,cAAc,eAAqC;AACrD,QAAI,KAAK,WAAW;AAChB;AAAA,IACJ;AAEA,SAAK,WAAW,QAAQ;AAExB,SAAK,SAAS,KAAK,IAAI;AAEvB,UAAM,gBAAgB;AAEtB,QAAI,KAAK,iBAAiB,KAAK,oBAAoB;AAC/C;AAAA,IACJ;AAEA,UAAM,KAAK,MAAM;AAAA,EACrB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,mBAAmB,QAA0B;AAC/C,UAAM,KAAK,cAAc,YAAY;AACjC,YAAM,KAAK,mBAAmB;AAC9B,iBAAW,YAAY,KAAK,YAAY;AACpC,YAAI,aAAa,QAAQ;AACrB;AAAA,QACJ;AACA,cAAM,SAAS,MAAM,IAAI;AAAA,MAC7B;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,CAAC,KAAK;AAAA,EACjB;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,UAA0B;AAC1B,QAAI,KAAK,aAAa,QAAW;AAC7B,YAAM,IAAI,iCAAmB,WAAW,KAAK,GAAG,QAAQ;AAAA,IAC5D;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK,eAAe,CAAC,KAAK,UAAU;AAAA,EAC/C;AAAA,EAEA,IAAI,wBAAwB;AACxB,WAAO,KAAK,aAAa,UAAa,CAAC,CAAC,KAAK,UAAU;AAAA,EAC3D;AAAA,EAEA,IAAI,qBAAqB;AACrB,WAAO,CAAC,CAAC,KAAK,WAAW;AAAA,EAC7B;AAAA,EAEA,MAAM,mBAAmB,mBAAmB,OAAwB;AAChE,WAAO;AAAA,EACX;AAAA,EAEA,gBAAgB;AACZ,UAAM,UAAU,KAAK;AACrB,SAAK,WAAW;AAChB,WAAO,KAAK,KAAK,KAAK,kBAAkB;AACxC,WAAO;AAAA,EACX;AAAA,EAEA,MAAgB,QAAQ;AACpB;AAAA;AAAA,YAAM,WAAW,qBAAK,WAAW,QAAQ;AAEzC,UAAI,KAAK,UAAU;AACf,cAAM,KAAK,SAAS,MAAM;AAC1B,aAAK,WAAW;AAChB,eAAO,KAAK,KAAK,KAAK,eAAe;AAAA,MACzC;AAAA,aANA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOJ;AAAA,EAEA,IAAc,UAAU;AACpB,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA,EAKA,IAAc,QAAQ,SAAyB;AAC3C,QAAI,KAAK,aAAa,QAAW;AAC7B,YAAM,IAAI,mCAAoB,+BAA+B;AAAA,IACjE;AACA,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,QAAQ,MAA2B;AAC/B,WAAO,KAAK,SAAS,EAAE,KAAK,GAAG,IAAI;AAAA,EACvC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,WAAqB;AACjB,QAAI,CAAC,KAAK,WAAW;AACjB,WAAK,aAAa,KAAK,UAAU,gBAAgB,wBAAS,SAAS,KAAK,WAAW,KAAK,GAAG;AAAA,IAC/F;AAEA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAc,SAAS,UAAoB;AACvC,SAAK,YAAY;AAAA,EACrB;AACJ;",
   "names": []
 }

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

@@ -3,17 +3,18 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DecodedPacket } from "#codec/MessageCodec.js";
+import type { DecodedPacket } from "#codec/MessageCodec.js";
 import { FabricManager } from "#fabric/FabricManager.js";
-import { BasicSet, Bytes, Construction, Environment, Environmental, Observable, StorageContext } from "#general";
-import { Subscription } from "#interaction/Subscription.js";
+import { BasicSet, Bytes, Channel, ConnectionlessTransportSet, Construction, Crypto, Environment, Environmental, Observable, StorageContext, Timestamp } from "#general";
+import type { Subscription } from "#interaction/Subscription.js";
 import { PeerAddress } from "#peer/PeerAddress.js";
 import { GroupSession } from "#session/GroupSession.js";
 import { CaseAuthenticatedTag, FabricIndex, NodeId } from "#types";
-import { ExposedFabricInformation, Fabric } from "../fabric/Fabric.js";
-import { InsecureSession } from "./InsecureSession.js";
+import type { ExposedFabricInformation, Fabric } from "../fabric/Fabric.js";
 import { NodeSession } from "./NodeSession.js";
-import { Session, SessionParameterOptions, SessionParameters } from "./Session.js";
+import type { Session } from "./Session.js";
+import { SessionParameters } from "./SessionParameters.js";
+import { UnsecuredSession } from "./UnsecuredSession.js";
 export interface ResumptionRecord {
     sharedSecret: Bytes;
     resumptionId: Bytes;
@@ -42,7 +43,7 @@ export interface SessionManagerContext {
     /**
      * Parameter overrides.
      */
-    parameters?: Partial<SessionParameters>;
+    parameters?: SessionParameters.Config;
     /**
      * This is an arbitrary contextual object attached to sessions used for compatibility with legacy APIs.
      *
@@ -59,15 +60,15 @@ export declare class SessionManager {
     static [Environmental.create](env: Environment): SessionManager;
     get construction(): Construction<SessionManager>;
     get context(): SessionManagerContext;
-    get crypto(): import("#general").Crypto;
+    get crypto(): Crypto;
     /**
      * Active secure sessions.
      */
     get sessions(): BasicSet<NodeSession, NodeSession>;
     /**
-     * Active insecure sessions.
+     * Active unsecured sessions.
      */
-    get insecureSessions(): Map<NodeId, InsecureSession>;
+    get unsecuredSessions(): Map<NodeId, UnsecuredSession>;
     /**
      * Our session parameters.  These are the parameters we provide during session negotiation.  The peer may specify
      * different parameters.
@@ -96,22 +97,14 @@ export declare class SessionManager {
      * @deprecated
      */
     get owner(): unknown;
-    createInsecureSession(options: {
+    createUnsecuredSession(options: {
+        channel: Channel<Bytes>;
         initiatorNodeId?: NodeId;
-        sessionParameters?: SessionParameterOptions;
+        sessionParameters?: SessionParameters.Config;
         isInitiator?: boolean;
-    }): InsecureSession;
-    createSecureSession(args: {
-        sessionId: number;
-        fabric: Fabric | undefined;
-        peerNodeId: NodeId;
-        peerSessionId: number;
-        sharedSecret: Bytes;
-        salt: Bytes;
-        isInitiator: boolean;
-        isResumption: boolean;
-        peerSessionParameters?: SessionParameterOptions;
-        caseAuthenticatedTags?: CaseAuthenticatedTag[];
+    }): UnsecuredSession;
+    createSecureSession(config: Omit<NodeSession.CreateConfig, "crypto"> & {
+        crypto?: Crypto;
     }): Promise<NodeSession>;
     /**
      * Deletes a resumption record for a given address.  Returns true if the record was deleted, false if it did not
@@ -128,18 +121,25 @@ export declare class SessionManager {
     getSession(sessionId: number): NodeSession | undefined;
     getPaseSession(): NodeSession | undefined;
     forFabric(fabric: Fabric): NodeSession[];
-    getSessionForNode(address: PeerAddress): NodeSession | undefined;
-    removeAllSessionsForNode(address: PeerAddress, sendClose?: boolean, closeBeforeCreatedTimestamp?: number): Promise<void>;
-    getUnsecureSession(sourceNodeId?: NodeId): InsecureSession | undefined;
+    sessionFor(peer: PeerAddress): NodeSession;
+    maybeSessionFor(address: PeerAddress): NodeSession | undefined;
+    sessionsFor(address: PeerAddress): NodeSession[];
+    sessionsForFabricIndex(fabricIndex: FabricIndex): NodeSession[];
+    handlePeerLoss(address: PeerAddress, asOf?: Timestamp): Promise<void>;
+    getUnsecuredSession(sourceNodeId?: NodeId): UnsecuredSession | undefined;
     /**
-     * Creates or Returns a Group Session for a Group Peer Address.
-     * This is used for sending group messages because it returns the session for the current
-     * Group Epoch key. The Source Node Id is the own Node.
+     * Obtain an outbound group session for a specific group.
+     *
+     * Returns the session for the current group epoch key.  The source is this node and the peer is the group.
      */
-    groupSessionForAddress(address: PeerAddress): GroupSession;
+    groupSessionForAddress(address: PeerAddress, transports: ConnectionlessTransportSet): Promise<GroupSession>;
     /**
-     * Creates or Returns the Group session based on an incoming packet.
-     * The Session ID is determined by trying to decrypt te packet with possible keys.
+     * Obtain a Group session for an incoming packet.
+     *
+     * The session ID is determined by decrypting the packet with possible keys.
+     *
+     * Note that the resulting session is non-operational in the sense that attempting outbound communication will
+     * result in an error.
      */
     groupSessionFromPacket(packet: DecodedPacket, aad: Bytes): {
         session: GroupSession;
@@ -155,9 +155,6 @@ export declare class SessionManager {
     close(): Promise<void>;
     clear(): Promise<void>;
     closeAllSessions(): Promise<void>;
-    updateAllSubscriptions(): void;
-    /** Clears all subscriptions for a given node and returns how many were cleared. */
-    clearSubscriptionsForNode(peerAddress: PeerAddress, flushSubscriptions?: boolean): Promise<number>;
     /**
      * Compress range of IDs.  This is intended for testing.
      */

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

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