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

package/dist/cjs/cluster/client/AttributeClient.js.map

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

package/dist/cjs/codec/MessageCodec.d.ts

@@ -43,6 +43,14 @@ export interface Message {
     securityExtension?: Bytes;
     payload: Bytes;
 }
+export declare namespace Message {
+    function via({ via }: {
+        via: string;
+    }, { packetHeader: { messageId } }: Message): string;
+    function diagnosticsOf(context: {
+        via: string;
+    }, message: Message, logContext?: ExchangeLogContext): Record<string, unknown>;
+}
 export interface DecodedMessage extends Message {
     packetHeader: DecodedPacketHeader;
 }
@@ -58,7 +66,6 @@ export declare class MessageCodec {
     private static decodePacketHeader;
     private static decodePayloadHeader;
     static encodePacketHeader({ messageId: messageCounter, sessionId, destGroupId, destNodeId, sourceNodeId, sessionType, }: PacketHeader): Uint8Array<ArrayBufferLike>;
-    static messageDiagnostics({ packetHeader: { messageId, sessionId }, payloadHeader: { exchangeId, messageType, protocolId, ackedMessageId, requiresAck }, payload, }: Message, logContext?: ExchangeLogContext): Record<string, unknown>;
     private static encodePayloadHeader;
 }
 //# sourceMappingURL=MessageCodec.d.ts.map

package/dist/cjs/codec/MessageCodec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageCodec.d.ts","sourceRoot":"","sources":["../../../src/codec/MessageCodec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAQR,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAoC,MAAM,EAAiD,MAAM,QAAQ,CAAC;AAGjH,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACrD,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,MAAM;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACzB,kBAAkB,EAAE,KAAK,CAAC;CAC7B;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM;IACzC,MAAM,EAAE,mBAAmB,CAAC;CAC/B;AACD,MAAM,WAAW,OAAO;IACpB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,OAAO,EAAE,KAAK,CAAC;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC3C,YAAY,EAAE,mBAAmB,CAAC;CACrC;AAID,oBAAY,WAAW;IACnB,KAAK,IAAI;IACT,OAAO,IAAI;CACd;AA2CD,qBAAa,YAAY;IACrB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa;IAkB/C,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,aAAa,GAAG,cAAc;IAuBnF,MAAM,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,OAAO,GAAG,MAAM;IAWlG,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,MAAM,GAAG,KAAK;IAOpF,OAAO,CAAC,MAAM,CAAC,kBAAkB;IA8DjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAyBlC,MAAM,CAAC,kBAAkB,CAAC,EACtB,SAAS,EAAE,cAAc,EACzB,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,WAAW,GACd,EAAE,YAAY;IAyBf,MAAM,CAAC,kBAAkB,CACrB,EACI,YAAY,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EACtC,aAAa,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,EACnF,OAAO,GACV,EAAE,OAAO,EACV,UAAU,CAAC,EAAE,kBAAkB;IA0BnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;CA2BrC"}
+{"version":3,"file":"MessageCodec.d.ts","sourceRoot":"","sources":["../../../src/codec/MessageCodec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACH,KAAK,EASR,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAoC,MAAM,EAAiD,MAAM,QAAQ,CAAC;AAGjH,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACrD,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,MAAM;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACzB,kBAAkB,EAAE,KAAK,CAAC;CAC7B;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM;IACzC,MAAM,EAAE,mBAAmB,CAAC;CAC/B;AAED,MAAM,WAAW,OAAO;IACpB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,OAAO,EAAE,KAAK,CAAC;CAClB;AAED,yBAAiB,OAAO,CAAC;IACrB,SAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,UAErF;IAED,SAAgB,aAAa,CAAC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,kBAAkB,2BA4BxG;CACJ;AAED,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC3C,YAAY,EAAE,mBAAmB,CAAC;CACrC;AAID,oBAAY,WAAW;IACnB,KAAK,IAAI;IACT,OAAO,IAAI;CACd;AA2CD,qBAAa,YAAY;IACrB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa;IAkB/C,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,aAAa,GAAG,cAAc;IAuBnF,MAAM,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,OAAO,GAAG,MAAM;IAWlG,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,MAAM,GAAG,KAAK;IAOpF,OAAO,CAAC,MAAM,CAAC,kBAAkB;IA8DjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAyBlC,MAAM,CAAC,kBAAkB,CAAC,EACtB,SAAS,EAAE,cAAc,EACzB,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,WAAW,GACd,EAAE,YAAY;IAyBf,OAAO,CAAC,MAAM,CAAC,mBAAmB;CA2BrC"}

package/dist/cjs/codec/MessageCodec.js

@@ -18,10 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var MessageCodec_exports = {};
 __export(MessageCodec_exports, {
+  Message: () => Message,
   MessageCodec: () => MessageCodec,
   SessionType: () => SessionType
 });
 module.exports = __toCommonJS(MessageCodec_exports);
+var import_Mark = require("#common/Mark.js");
 var import_general = require("#general");
 var import_types = require("#types");
 var import_InteractionMessenger = require("../interaction/InteractionMessenger.js");
@@ -30,6 +32,42 @@ var import_InteractionMessenger = require("../interaction/InteractionMessenger.j
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+var Message;
+((Message2) => {
+  function via({ via: via2 }, { packetHeader: { messageId } }) {
+    return import_general.Diagnostic.via(`${via2}${import_Mark.Mark.MESSAGE}${import_general.hex.fixed(messageId, 8)}`);
+  }
+  Message2.via = via;
+  function diagnosticsOf(context, message, logContext) {
+    const {
+      payloadHeader: { messageType, protocolId, ackedMessageId, requiresAck },
+      payload
+    } = message;
+    const duplicate = !!logContext?.duplicate;
+    const forInfo = logContext?.for;
+    const log = { ...logContext };
+    delete log.duplicate;
+    delete log.for;
+    const { type, for: forType } = mapProtocolAndMessageType(protocolId, messageType);
+    return import_general.Diagnostic.dict(
+      {
+        for: forInfo ?? forType,
+        ...log,
+        id: Message2.via(context, message),
+        type,
+        acked: ackedMessageId === void 0 ? void 0 : import_general.hex.fixed(ackedMessageId, 8),
+        msgFlags: import_general.Diagnostic.asFlags({
+          reqAck: requiresAck,
+          dup: duplicate
+        }),
+        size: payload.byteLength ? payload.byteLength : void 0,
+        payload: payload.byteLength ? payload : void 0
+      },
+      true
+    );
+  }
+  Message2.diagnosticsOf = diagnosticsOf;
+})(Message || (Message = {}));
 const HEADER_VERSION = 0;
 var SessionType = /* @__PURE__ */ ((SessionType2) => {
   SessionType2[SessionType2["Group"] = 1] = "Group";
@@ -225,34 +263,6 @@ class MessageCodec {
     if (destGroupId !== void 0) writer.writeUInt16(destGroupId);
     return writer.toByteArray();
   }
-  static messageDiagnostics({
-    packetHeader: { messageId, sessionId },
-    payloadHeader: { exchangeId, messageType, protocolId, ackedMessageId, requiresAck },
-    payload
-  }, logContext) {
-    const duplicate = !!logContext?.duplicate;
-    const forInfo = logContext?.for;
-    const log = { ...logContext };
-    delete log.duplicate;
-    delete log.for;
-    const { type, for: forType } = mapProtocolAndMessageType(protocolId, messageType);
-    return import_general.Diagnostic.dict(
-      {
-        for: forInfo ?? forType,
-        ...log,
-        msgId: `${sessionId}/${exchangeId}/${messageId}`,
-        type,
-        acked: ackedMessageId,
-        msgFlags: import_general.Diagnostic.asFlags({
-          reqAck: requiresAck,
-          dup: duplicate
-        }),
-        size: payload.byteLength ? payload.byteLength : void 0,
-        payload: payload.byteLength ? payload : void 0
-      },
-      true
-    );
-  }
   static encodePayloadHeader({
     exchangeId,
     isInitiatorMessage,

package/dist/cjs/codec/MessageCodec.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/codec/MessageCodec.ts"],
-  "mappings": "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",
-  "names": ["SessionType", "PacketHeaderFlag", "PayloadHeaderFlag", "SecurityFlag"]
+  "mappings": "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",
+  "names": ["Message", "via", "SessionType", "PacketHeaderFlag", "PayloadHeaderFlag", "SecurityFlag"]
 }

package/dist/cjs/common/FailsafeContext.d.ts

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AsyncObservable, Bytes, Construction, Duration, MatterFlowError } from "#general";
-import { SecureSession } from "#session/SecureSession.js";
+import type { MessageExchange } from "#protocol/MessageExchange.js";
+import type { NodeSession } from "#session/NodeSession.js";
 import { NodeId, VendorId } from "#types";
 import { Fabric } from "../fabric/Fabric.js";
 import { FabricManager } from "../fabric/FabricManager.js";
@@ -24,7 +25,7 @@ export declare class MatterFabricInvalidAdminSubjectError extends MatterFlowErro
 export declare abstract class FailsafeContext {
     #private;
     constructor(options: FailsafeContext.Options);
-    extend(fabric: Fabric | undefined, expiryLength: Duration): Promise<void>;
+    extend(fabric: Fabric | undefined, expiryLength: Duration, currentExchange?: MessageExchange): Promise<void>;
     get fabricIndex(): import("#types").FabricIndex | undefined;
     get construction(): Construction<FailsafeContext>;
     get commissioned(): AsyncObservable<[], void>;
@@ -37,15 +38,14 @@ export declare abstract class FailsafeContext {
     completeCommission(): Promise<void>;
     getFailSafeContext(): FailsafeTimer;
     getNextFabricIndex(): import("#types").FabricIndex;
-    addFabric(fabric: Fabric): Promise<import("#types").FabricIndex>;
-    updateFabric(fabric: Fabric): Promise<void>;
+    replaceFabric(fabric: Fabric): Promise<void>;
     /**
      * Handles a CSR from OperationalCredentials cluster and stores additional internal information for further
      * validity checks.
      */
     createCertificateSigningRequest(isForUpdateNoc: boolean, sessionId: number): Promise<AllowSharedBufferSource>;
-    removePaseSession(): Promise<void>;
-    close(): Promise<void>;
+    closePaseSession(currentExchange?: MessageExchange): Promise<void>;
+    close(currentExchange?: MessageExchange): Promise<void>;
     /** Handles adding a trusted root certificate from Operational Credentials cluster. */
     setRootCert(rootCert: Bytes): Promise<void>;
     /**
@@ -61,12 +61,11 @@ export declare abstract class FailsafeContext {
         ipkValue: Bytes;
         caseAdminSubject: NodeId;
     }): Promise<Fabric>;
-    protected rollback(): Promise<void>;
+    protected rollback(currentExchange?: MessageExchange): Promise<void>;
     abstract storeEndpointState(): Promise<void>;
     /** Restore Cluster data when the FailSafe context expired. */
     abstract restoreNetworkState(): Promise<void>;
     restoreFabric(fabric: Fabric): Promise<void>;
-    abstract revokeFabric(fabric: Fabric): Promise<void>;
     abstract restoreBreadcrumb(): Promise<void>;
 }
 export declare namespace FailsafeContext {
@@ -75,7 +74,7 @@ export declare namespace FailsafeContext {
         fabrics: FabricManager;
         expiryLength: Duration;
         maxCumulativeFailsafe: Duration;
-        session: SecureSession;
+        session: NodeSession;
     }
 }
 //# sourceMappingURL=FailsafeContext.d.ts.map

package/dist/cjs/common/FailsafeContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FailsafeContext.d.ts","sourceRoot":"","sources":["../../../src/common/FailsafeContext.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,eAAe,EACf,KAAK,EACL,YAAY,EACZ,QAAQ,EAER,eAAe,EAGlB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAwB,MAAM,EAAmB,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjF,OAAO,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAI9E,qBAAa,oCAAqC,SAAQ,eAAe;CAAG;AAE5E;;;;;;;;GAQG;AACH,8BAAsB,eAAe;;gBAarB,OAAO,EAAE,eAAe,CAAC,OAAO;IA+BtC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,YAAY,EAAE,QAAQ;IAQ/D,IAAI,WAAW,6CAEd;IAED,IAAI,YAAY,kCAEf;IAED,IAAI,YAAY,8BAEf;IAED,IAAI,gBAAgB,uBAEnB;IAED,IAAI,YAAY,uBAEf;IAED,IAAI,YAAY,wBAEf;IAED,IAAI,WAAW,YAEd;IAED,IAAI,WAAW,YAEd;IAED,IAAI,QAAQ,wCAEX;IAEK,kBAAkB;IAwBxB,kBAAkB;IAKlB,kBAAkB;IAIZ,SAAS,CAAC,MAAM,EAAE,MAAM;IAQxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAKjC;;;OAGG;IACH,+BAA+B,CAAC,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAWpE,iBAAiB;IAOjB,KAAK;IAUX,sFAAsF;IAChF,WAAW,CAAC,QAAQ,EAAE,KAAK;IAKjC;;;OAGG;IACG,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,SAAS;IAStE,+GAA+G;IACzG,WAAW,CAAC,OAAO,EAAE;QACvB,QAAQ,EAAE,KAAK,CAAC;QAChB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;QAC7B,aAAa,EAAE,QAAQ,CAAC;QACxB,QAAQ,EAAE,KAAK,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;KAC5B;cA2Ce,QAAQ;IAsDxB,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAE5C,8DAA8D;IAC9D,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAEvC,aAAa,CAAC,MAAM,EAAE,MAAM;IAIlC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAEpD,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ9C;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,OAAO;QACpB,QAAQ,EAAE,cAAc,CAAC;QACzB,OAAO,EAAE,aAAa,CAAC;QACvB,YAAY,EAAE,QAAQ,CAAC;QACvB,qBAAqB,EAAE,QAAQ,CAAC;QAChC,OAAO,EAAE,aAAa,CAAC;KAC1B;CACJ"}
+{"version":3,"file":"FailsafeContext.d.ts","sourceRoot":"","sources":["../../../src/common/FailsafeContext.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,eAAe,EACf,KAAK,EACL,YAAY,EACZ,QAAQ,EAER,eAAe,EAGlB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAwB,MAAM,EAAmB,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjF,OAAO,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAI9E,qBAAa,oCAAqC,SAAQ,eAAe;CAAG;AAE5E;;;;;;;;GAQG;AACH,8BAAsB,eAAe;;gBAarB,OAAO,EAAE,eAAe,CAAC,OAAO;IAkCtC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,eAAe;IAQlG,IAAI,WAAW,6CAEd;IAED,IAAI,YAAY,kCAEf;IAED,IAAI,YAAY,8BAEf;IAED,IAAI,gBAAgB,uBAEnB;IAED,IAAI,YAAY,uBAEf;IAED,IAAI,YAAY,wBAEf;IAED,IAAI,WAAW,YAEd;IAED,IAAI,WAAW,YAEd;IAED,IAAI,QAAQ,wCAEX;IAEK,kBAAkB;IAwBxB,kBAAkB;IAKlB,kBAAkB;IAIZ,aAAa,CAAC,MAAM,EAAE,MAAM;IAKlC;;;OAGG;IACH,+BAA+B,CAAC,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAWpE,gBAAgB,CAAC,eAAe,CAAC,EAAE,eAAe;IAOlD,KAAK,CAAC,eAAe,CAAC,EAAE,eAAe;IAU7C,sFAAsF;IAChF,WAAW,CAAC,QAAQ,EAAE,KAAK;IAKjC;;;OAGG;IACG,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,SAAS;IAStE,+GAA+G;IACzG,WAAW,CAAC,OAAO,EAAE;QACvB,QAAQ,EAAE,KAAK,CAAC;QAChB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;QAC7B,aAAa,EAAE,QAAQ,CAAC;QACxB,QAAQ,EAAE,KAAK,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;KAC5B;cAkDe,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe;IAkD1D,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAE5C,8DAA8D;IAC9D,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAEvC,aAAa,CAAC,MAAM,EAAE,MAAM;IAIlC,QAAQ,CAAC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ9C;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,OAAO;QACpB,QAAQ,EAAE,cAAc,CAAC;QACzB,OAAO,EAAE,aAAa,CAAC;QACvB,YAAY,EAAE,QAAQ,CAAC;QACvB,qBAAqB,EAAE,QAAQ,CAAC;QAChC,OAAO,EAAE,WAAW,CAAC;KACxB;CACJ"}

package/dist/cjs/common/FailsafeContext.js

@@ -58,7 +58,7 @@ class FailsafeContext {
         this.#associatedFabric,
         expiryLength,
         maxCumulativeFailsafe,
-        () => this.#failSafeExpired()
+        this.#failSafeExpired.bind(this)
       );
       logger.debug(`Arm failSafe timer for ${import_general.Duration.format(expiryLength)}`);
       session.closedByPeer.on(() => {
@@ -68,9 +68,9 @@ class FailsafeContext {
       });
     });
   }
-  async extend(fabric, expiryLength) {
+  async extend(fabric, expiryLength, currentExchange) {
     await this.#construction;
-    await this.#failsafe?.reArm(fabric, expiryLength);
+    await this.#failsafe?.reArm(fabric, expiryLength, currentExchange);
     if (expiryLength > 0) {
       logger.debug(`Extend failSafe timer for ${import_general.Duration.format(expiryLength)}`);
     }
@@ -112,7 +112,7 @@ class FailsafeContext {
     }
     this.#failsafe = void 0;
     await this.commissioned.emit();
-    await this.removePaseSession();
+    await this.closePaseSession();
     await this.close();
   }
   getFailSafeContext() {
@@ -122,15 +122,8 @@ class FailsafeContext {
   getNextFabricIndex() {
     return this.#fabrics.allocateFabricIndex();
   }
-  async addFabric(fabric) {
-    this.#fabrics.addFabric(fabric);
-    if (this.#failsafe !== void 0) {
-      this.#associatedFabric = this.#failsafe.associatedFabric = fabric;
-    }
-    return fabric.fabricIndex;
-  }
-  async updateFabric(fabric) {
-    await this.#fabrics.updateFabric(fabric);
+  async replaceFabric(fabric) {
+    await this.#fabrics.replaceFabric(fabric);
     await this.#sessions.deleteResumptionRecordsForFabric(fabric);
   }
   /**
@@ -146,18 +139,18 @@ class FailsafeContext {
     this.#forUpdateNoc = isForUpdateNoc;
     return result;
   }
-  async removePaseSession() {
+  async closePaseSession(currentExchange) {
     const session = this.#sessions.getPaseSession();
-    if (session !== void 0) {
-      await session.close(true);
+    if (session) {
+      await session.initiateForceClose(currentExchange);
     }
   }
-  async close() {
+  async close(currentExchange) {
     await this.#construction.close(async () => {
       if (this.#failsafe) {
         await this.#failsafe.close();
         this.#failsafe = void 0;
-        await this.rollback();
+        await this.rollback(currentExchange);
       }
     });
   }
@@ -202,26 +195,30 @@ class FailsafeContext {
         `Fabric with Id ${builder.fabricId} and Node Id ${builder.nodeId} already exists.`
       );
     }
-    return builder.setRootVendorId(adminVendorId).setIdentityProtectionKey(ipkValue).setRootNodeId(caseAdminSubject).build(this.#fabrics.allocateFabricIndex());
+    this.#associatedFabric = await builder.setRootVendorId(adminVendorId).setIdentityProtectionKey(ipkValue).setRootNodeId(caseAdminSubject).build(this.#fabrics.allocateFabricIndex());
+    this.#fabrics.addFabric(this.#associatedFabric);
+    if (this.#failsafe) {
+      this.#failsafe.associatedFabric = this.#associatedFabric;
+    }
+    return this.#associatedFabric;
   }
-  async #failSafeExpired() {
+  async #failSafeExpired(currentExchange) {
     logger.info("Failsafe timer expired; resetting fabric builder");
-    await this.close();
+    await this.close(currentExchange);
   }
-  async rollback() {
+  async rollback(currentExchange) {
     if (this.fabricIndex !== void 0 && !this.#forUpdateNoc) {
-      logger.debug(`Revoking fabric with index ${this.fabricIndex}`);
-      await this.#fabrics.revokeFabric(this.fabricIndex);
+      logger.debug(`Revoking fabric index ${this.fabricIndex}`);
+      await this.#associatedFabric?.delete(currentExchange);
     }
-    await this.removePaseSession();
+    await this.closePaseSession(currentExchange);
     let fabric = void 0;
     if (this.fabricIndex !== void 0) {
       const fabricIndex = this.fabricIndex;
       if (this.#fabrics.has(fabricIndex)) {
         fabric = this.#fabrics.for(fabricIndex);
-        const session = this.#sessions.getSessionForNode(fabric.addressOf(fabric.rootNodeId));
-        if (session !== void 0 && session.isSecure) {
-          await session.close(false);
+        for (const session of this.#sessions.sessionsForFabricIndex(fabricIndex)) {
+          await session.initiateForceClose(currentExchange);
         }
       }
     }
@@ -230,15 +227,12 @@ class FailsafeContext {
       await this.restoreFabric(this.associatedFabric);
     }
     if (!this.#forUpdateNoc && fabric !== void 0) {
-      const fabricIndex = this.fabricIndex;
-      if (fabricIndex !== void 0 && this.#fabrics.has(fabricIndex)) {
-        await this.revokeFabric(this.#fabrics.for(fabricIndex));
-      }
+      await this.#associatedFabric?.delete();
     }
     await this.restoreBreadcrumb();
   }
   async restoreFabric(fabric) {
-    await this.updateFabric(fabric);
+    await this.replaceFabric(fabric);
   }
   get #builder() {
     if (this.#fabricBuilder === void 0) {

package/dist/cjs/common/FailsafeContext.js.map

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

package/dist/cjs/common/FailsafeTimer.d.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Duration, MatterFlowError } from "#general";
+import { MessageExchange } from "#protocol/MessageExchange.js";
 import { Fabric } from "../fabric/Fabric.js";
 export declare class MatterFabricConflictError extends MatterFlowError {
 }
@@ -13,14 +14,14 @@ export declare class MatterFabricConflictError extends MatterFlowError {
 export declare class FailsafeTimer {
     #private;
     associatedFabric: Fabric | undefined;
-    constructor(associatedFabric: Fabric | undefined, expiryLength: Duration, maxCumulativeFailsafe: Duration, expiryCallback: () => Promise<void>);
+    constructor(associatedFabric: Fabric | undefined, expiryLength: Duration, maxCumulativeFailsafe: Duration, expiryCallback: (currentExchange?: MessageExchange) => Promise<void>);
     close(): Promise<void>;
     /** Handle "Re-Arming" an existing FailSafe context to extend the timer, expire or fail if not allowed. */
-    reArm(associatedFabric: Fabric | undefined, expiry: Duration): Promise<void>;
+    reArm(associatedFabric: Fabric | undefined, expiry: Duration, currentExchange?: MessageExchange): Promise<void>;
     /** Returns whether the FailSafe context is currently armed. */
     get completed(): boolean;
     /** Expire the FailSafe context. This is called by the timer and can also be called manually if needed. */
-    expire(): Promise<void>;
+    expire(currentExchange?: MessageExchange): Promise<void>;
     /** Complete the FailSafe context. This is called when the commissioning is completed. */
     complete(): void;
 }

package/dist/cjs/common/FailsafeTimer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FailsafeTimer.d.ts","sourceRoot":"","sources":["../../../src/common/FailsafeTimer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAe,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,qBAAa,yBAA0B,SAAQ,eAAe;CAAG;AAIjE;;GAEG;AACH,qBAAa,aAAa;;IAOX,gBAAgB,EAAE,MAAM,GAAG,SAAS;gBAApC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAC3C,YAAY,EAAE,QAAQ,EACtB,qBAAqB,EAAE,QAAQ,EAC/B,cAAc,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IASjC,KAAK;IASX,0GAA0G;IACpG,KAAK,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,QAAQ;IA0BlE,+DAA+D;IAC/D,IAAI,SAAS,YAEZ;IAED,0GAA0G;IACpG,MAAM;IASZ,yFAAyF;IACzF,QAAQ;CAWX"}
+{"version":3,"file":"FailsafeTimer.d.ts","sourceRoot":"","sources":["../../../src/common/FailsafeTimer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAe,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,qBAAa,yBAA0B,SAAQ,eAAe;CAAG;AAIjE;;GAEG;AACH,qBAAa,aAAa;;IAOX,gBAAgB,EAAE,MAAM,GAAG,SAAS;gBAApC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAC3C,YAAY,EAAE,QAAQ,EACtB,qBAAqB,EAAE,QAAQ,EAC/B,cAAc,EAAE,CAAC,eAAe,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC;IASlE,KAAK;IASX,0GAA0G;IACpG,KAAK,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,eAAe;IA0BrG,+DAA+D;IAC/D,IAAI,SAAS,YAEZ;IAED,0GAA0G;IACpG,MAAM,CAAC,eAAe,CAAC,EAAE,eAAe;IAS9C,yFAAyF;IACzF,QAAQ;CAWX"}

package/dist/cjs/common/FailsafeTimer.js

@@ -55,7 +55,7 @@ class FailsafeTimer {
     }
   }
   /** Handle "Re-Arming" an existing FailSafe context to extend the timer, expire or fail if not allowed. */
-  async reArm(associatedFabric, expiry) {
+  async reArm(associatedFabric, expiry, currentExchange) {
     if (!this.#failsafeTimer.isRunning) {
       throw new import_general.MatterFlowError("FailSafe already expired.");
     }
@@ -66,7 +66,7 @@ class FailsafeTimer {
     }
     this.#failsafeTimer.stop();
     if (expiry === 0) {
-      await this.expire();
+      await this.expire(currentExchange);
     } else {
       this.#failsafeTimer = this.#startFailsafeTimer(expiry);
     }
@@ -76,12 +76,12 @@ class FailsafeTimer {
     return this.#completed;
   }
   /** Expire the FailSafe context. This is called by the timer and can also be called manually if needed. */
-  async expire() {
+  async expire(currentExchange) {
     if (this.#completed) {
       return;
     }
     this.complete();
-    await this.#expiryCallback();
+    await this.#expiryCallback(currentExchange);
   }
   /** Complete the FailSafe context. This is called when the commissioning is completed. */
   complete() {

package/dist/cjs/common/FailsafeTimer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/common/FailsafeTimer.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA+D;AAN/D;AAAA;AAAA;AAAA;AAAA;AAUO,MAAM,kCAAkC,+BAAgB;AAAC;AAEhE,MAAM,SAAS,sBAAO,IAAI,eAAe;AAKlC,MAAM,cAAc;AAAA,EAMvB,YACW,kBACP,cACA,uBACA,gBACF;AAJS;AAKP,SAAK,kBAAkB;AACvB,SAAK,iBAAiB,KAAK,oBAAoB,YAAY;AAC3D,SAAK,8BAA8B,oBAAK;AAAA,MAAS;AAAA,MAA2B;AAAA,MAAuB,MAC/F,KAAK,OAAO;AAAA,IAChB,EAAE,MAAM;AAAA,EACZ;AAAA,EAhBA;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EAeb,MAAM,QAAQ;AACV,QAAI,KAAK,eAAe,WAAW;AAC/B,WAAK,eAAe,KAAK;AAAA,IAC7B;AACA,QAAI,KAAK,4BAA4B,WAAW;AAC5C,WAAK,4BAA4B,KAAK;AAAA,IAC1C;AAAA,EACJ;AAAA;AAAA,EAGA,MAAM,MAAM,kBAAsC,QAAkB;AAChE,QAAI,CAAC,KAAK,eAAe,WAAW;AAChC,YAAM,IAAI,+BAAgB,2BAA2B;AAAA,IACzD;AAEA,QAAI,KAAK,kBAAkB,gBAAgB,kBAAkB,aAAa;AACtE,YAAM,IAAI;AAAA,QACN,iCAAiC,KAAK,kBAAkB,WAAW,kCAAkC,kBAAkB,WAAW;AAAA,MACtI;AAAA,IACJ;AAEA,SAAK,eAAe,KAAK;AAEzB,QAAI,WAAW,GAAG;AAId,YAAM,KAAK,OAAO;AAAA,IACtB,OAAO;AAIH,WAAK,iBAAiB,KAAK,oBAAoB,MAAM;AAAA,IACzD;AAAA,EACJ;AAAA;AAAA,EAGA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA,EAGA,MAAM,SAAS;AACX,QAAI,KAAK,YAAY;AAEjB;AAAA,IACJ;AACA,SAAK,SAAS;AACd,UAAM,KAAK,gBAAgB;AAAA,EAC/B;AAAA;AAAA,EAGA,WAAW;AACP,SAAK,aAAa;AAClB,SAAK,eAAe,KAAK;AACzB,SAAK,4BAA4B,KAAK;AAAA,EAC1C;AAAA,EAEA,oBAAoB,QAAkB;AAClC,WAAO,oBAAK;AAAA,MAAS;AAAA,MAAuB;AAAA,MAAQ,MAChD,KAAK,OAAO,EAAE,MAAM,OAAK,OAAO,MAAM,oCAAoC,CAAC,CAAC;AAAA,IAChF,EAAE,MAAM;AAAA,EACZ;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA+D;AAN/D;AAAA;AAAA;AAAA;AAAA;AAWO,MAAM,kCAAkC,+BAAgB;AAAC;AAEhE,MAAM,SAAS,sBAAO,IAAI,eAAe;AAKlC,MAAM,cAAc;AAAA,EAMvB,YACW,kBACP,cACA,uBACA,gBACF;AAJS;AAKP,SAAK,kBAAkB;AACvB,SAAK,iBAAiB,KAAK,oBAAoB,YAAY;AAC3D,SAAK,8BAA8B,oBAAK;AAAA,MAAS;AAAA,MAA2B;AAAA,MAAuB,MAC/F,KAAK,OAAO;AAAA,IAChB,EAAE,MAAM;AAAA,EACZ;AAAA,EAhBA;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EAeb,MAAM,QAAQ;AACV,QAAI,KAAK,eAAe,WAAW;AAC/B,WAAK,eAAe,KAAK;AAAA,IAC7B;AACA,QAAI,KAAK,4BAA4B,WAAW;AAC5C,WAAK,4BAA4B,KAAK;AAAA,IAC1C;AAAA,EACJ;AAAA;AAAA,EAGA,MAAM,MAAM,kBAAsC,QAAkB,iBAAmC;AACnG,QAAI,CAAC,KAAK,eAAe,WAAW;AAChC,YAAM,IAAI,+BAAgB,2BAA2B;AAAA,IACzD;AAEA,QAAI,KAAK,kBAAkB,gBAAgB,kBAAkB,aAAa;AACtE,YAAM,IAAI;AAAA,QACN,iCAAiC,KAAK,kBAAkB,WAAW,kCAAkC,kBAAkB,WAAW;AAAA,MACtI;AAAA,IACJ;AAEA,SAAK,eAAe,KAAK;AAEzB,QAAI,WAAW,GAAG;AAId,YAAM,KAAK,OAAO,eAAe;AAAA,IACrC,OAAO;AAIH,WAAK,iBAAiB,KAAK,oBAAoB,MAAM;AAAA,IACzD;AAAA,EACJ;AAAA;AAAA,EAGA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA,EAGA,MAAM,OAAO,iBAAmC;AAC5C,QAAI,KAAK,YAAY;AAEjB;AAAA,IACJ;AACA,SAAK,SAAS;AACd,UAAM,KAAK,gBAAgB,eAAe;AAAA,EAC9C;AAAA;AAAA,EAGA,WAAW;AACP,SAAK,aAAa;AAClB,SAAK,eAAe,KAAK;AACzB,SAAK,4BAA4B,KAAK;AAAA,EAC1C;AAAA,EAEA,oBAAoB,QAAkB;AAClC,WAAO,oBAAK;AAAA,MAAS;AAAA,MAAuB;AAAA,MAAQ,MAChD,KAAK,OAAO,EAAE,MAAM,OAAK,OAAO,MAAM,oCAAoC,CAAC,CAAC;AAAA,IAChF,EAAE,MAAM;AAAA,EACZ;AACJ;",
   "names": []
 }

package/dist/cjs/common/Mark.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Visual demarcators for specific log elements.
+ */
+export declare namespace Mark {
+    const INBOUND = "\u00AB";
+    const OUTBOUND = "\u00BB";
+    const SESSION = "\u2022";
+    const LOCAL_SESSION = "\u25E6";
+    const EXCHANGE = "\u21F5";
+    const MESSAGE = "\u2709";
+}
+//# sourceMappingURL=Mark.d.ts.map

package/dist/cjs/common/Mark.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Mark.d.ts","sourceRoot":"","sources":["../../../src/common/Mark.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,yBAAiB,IAAI,CAAC;IACX,MAAM,OAAO,WAAM,CAAC;IACpB,MAAM,QAAQ,WAAM,CAAC;IACrB,MAAM,OAAO,WAAM,CAAC;IACpB,MAAM,aAAa,WAAM,CAAC;IAC1B,MAAM,QAAQ,WAAM,CAAC;IACrB,MAAM,OAAO,WAAM,CAAC;CAC9B"}

package/dist/cjs/{peer/OperationalPeer.js → common/Mark.js}

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -12,11 +16,23 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var OperationalPeer_exports = {};
-module.exports = __toCommonJS(OperationalPeer_exports);
+var Mark_exports = {};
+__export(Mark_exports, {
+  Mark: () => Mark
+});
+module.exports = __toCommonJS(Mark_exports);
 /**
  * @license
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-//# sourceMappingURL=OperationalPeer.js.map
+var Mark;
+((Mark2) => {
+  Mark2.INBOUND = "\xAB";
+  Mark2.OUTBOUND = "\xBB";
+  Mark2.SESSION = "\u2022";
+  Mark2.LOCAL_SESSION = "\u25E6";
+  Mark2.EXCHANGE = "\u21F5";
+  Mark2.MESSAGE = "\u2709";
+})(Mark || (Mark = {}));
+//# sourceMappingURL=Mark.js.map

package/dist/cjs/common/Mark.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/common/Mark.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,IAAU;AAAA,CAAV,CAAUA,UAAV;AACI,EAAMA,MAAA,UAAU;AAChB,EAAMA,MAAA,WAAW;AACjB,EAAMA,MAAA,UAAU;AAChB,EAAMA,MAAA,gBAAgB;AACtB,EAAMA,MAAA,WAAW;AACjB,EAAMA,MAAA,UAAU;AAAA,GANV;",
+  "names": ["Mark"]
+}

package/dist/cjs/common/index.d.ts

@@ -7,6 +7,7 @@ export * from "../peer/PeerAddress.js";
 export * from "./ExpandedPath.js";
 export * from "./FailsafeContext.js";
 export * from "./FailsafeTimer.js";
+export * from "./Mark.js";
 export * from "./OperationalCredentialsTypes.js";
 export * from "./Scanner.js";
 export * from "./SupportedTransportsBitmap.js";

package/dist/cjs/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kCAAkC,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,kCAAkC,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC"}

package/dist/cjs/common/index.js

@@ -19,6 +19,7 @@ __reExport(common_exports, require("../peer/PeerAddress.js"), module.exports);
 __reExport(common_exports, require("./ExpandedPath.js"), module.exports);
 __reExport(common_exports, require("./FailsafeContext.js"), module.exports);
 __reExport(common_exports, require("./FailsafeTimer.js"), module.exports);
+__reExport(common_exports, require("./Mark.js"), module.exports);
 __reExport(common_exports, require("./OperationalCredentialsTypes.js"), module.exports);
 __reExport(common_exports, require("./Scanner.js"), module.exports);
 __reExport(common_exports, require("./SupportedTransportsBitmap.js"), module.exports);

package/dist/cjs/common/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/common/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,2BAAc,mCANd;AAOA,2BAAc,8BAPd;AAQA,2BAAc,iCARd;AASA,2BAAc,+BATd;AAUA,2BAAc,6CAVd;AAWA,2BAAc,yBAXd;AAYA,2BAAc,2CAZd;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,2BAAc,mCANd;AAOA,2BAAc,8BAPd;AAQA,2BAAc,iCARd;AASA,2BAAc,+BATd;AAUA,2BAAc,sBAVd;AAWA,2BAAc,6CAXd;AAYA,2BAAc,yBAZd;AAaA,2BAAc,2CAbd;AAAA;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }