@matter/protocol 0.16.0-alpha.0-20250817-1b000357c → 0.16.0-alpha.0-20250820-24939dd26

package/src/session/SessionIntervals.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ImplementationError } from "@matter/general";
+import { Duration, Hours, ImplementationError, Millis, Seconds } from "#general";
 
 export interface SessionIntervals {
     /**
@@ -13,7 +13,7 @@ export interface SessionIntervals {
      *
      * Default: 500ms
      */
-    idleIntervalMs: number;
+    idleInterval: Duration;
 
     /**
      * Minimum amount of time between sender retries when the destination node is active. This SHALL be greater than or
@@ -21,27 +21,27 @@ export interface SessionIntervals {
      *
      * Default: 300ms
      */
-    activeIntervalMs: number;
+    activeInterval: Duration;
 
     /**
      * Minimum amount of time the node SHOULD stay active after network activity.
      *
      * Default: 4000ms
      */
-    activeThresholdMs: number;
+    activeThreshold: Duration;
 }
 
 export function SessionIntervals(intervals?: Partial<SessionIntervals>): SessionIntervals {
     const reified = { ...SessionIntervals.defaults, ...intervals };
-    const { idleIntervalMs, activeIntervalMs, activeThresholdMs } = reified;
+    const { idleInterval, activeInterval, activeThreshold } = reified;
 
-    if (idleIntervalMs !== undefined && idleIntervalMs > 3600000) {
+    if (idleInterval && idleInterval > Hours.one) {
         throw new ImplementationError("Session Idle Interval must be less than 1 hour");
     }
-    if (activeIntervalMs !== undefined && activeIntervalMs > 3600000) {
+    if (activeInterval && activeInterval > Hours.one) {
         throw new ImplementationError("Session Active Interval must be less than 1 hour");
     }
-    if (activeThresholdMs !== undefined && activeThresholdMs > 65535) {
+    if (activeThreshold && activeThreshold > Seconds(65535)) {
         throw new ImplementationError("Session Active Threshold must be less than 65535 seconds");
     }
 
@@ -50,8 +50,8 @@ export function SessionIntervals(intervals?: Partial<SessionIntervals>): Session
 
 export namespace SessionIntervals {
     export const defaults = {
-        idleIntervalMs: 500,
-        activeIntervalMs: 300,
-        activeThresholdMs: 4000,
+        idleInterval: Millis(500),
+        activeInterval: Millis(300),
+        activeThreshold: Seconds(4),
     };
 }

package/src/session/SessionManager.ts

@@ -11,6 +11,7 @@ import {
     BasicSet,
     Bytes,
     Construction,
+    Duration,
     Environment,
     Environmental,
     Lifecycle,
@@ -74,9 +75,9 @@ type ResumptionStorageRecord = {
     fabricId: FabricId;
     peerNodeId: NodeId;
     sessionParameters: {
-        idleIntervalMs: number;
-        activeIntervalMs: number;
-        activeThresholdMs: number;
+        idleInterval: Duration;
+        activeInterval: Duration;
+        activeThreshold: Duration;
         dataModelRevision: number;
         interactionModelRevision: number;
         specificationVersion: number;
@@ -575,9 +576,9 @@ export class SessionManager {
                 fabricId,
                 peerNodeId,
                 sessionParameters: {
-                    idleIntervalMs,
-                    activeIntervalMs,
-                    activeThresholdMs,
+                    idleInterval,
+                    activeInterval,
+                    activeThreshold,
                     dataModelRevision,
                     interactionModelRevision,
                     specificationVersion,
@@ -607,9 +608,9 @@ export class SessionManager {
                     peerNodeId,
                     sessionParameters: {
                         // Make sure to initialize default values when restoring an older resumption record
-                        idleIntervalMs: idleIntervalMs ?? SessionIntervals.defaults.idleIntervalMs,
-                        activeIntervalMs: activeIntervalMs ?? SessionIntervals.defaults.activeIntervalMs,
-                        activeThresholdMs: activeThresholdMs ?? SessionIntervals.defaults.activeThresholdMs,
+                        idleInterval: idleInterval ?? SessionIntervals.defaults.idleInterval,
+                        activeInterval: activeInterval ?? SessionIntervals.defaults.activeInterval,
+                        activeThreshold: activeThreshold ?? SessionIntervals.defaults.activeThreshold,
                         dataModelRevision: dataModelRevision ?? FALLBACK_DATAMODEL_REVISION,
                         interactionModelRevision: interactionModelRevision ?? FALLBACK_INTERACTIONMODEL_REVISION,
                         specificationVersion: specificationVersion ?? FALLBACK_SPECIFICATION_VERSION,

package/src/session/case/CaseClient.ts

@@ -6,12 +6,14 @@
 
 import { Icac } from "#certificate/kinds/Icac.js";
 import { Noc } from "#certificate/kinds/Noc.js";
-import { Bytes, Logger, PublicKey, UnexpectedDataError } from "#general";
+import { Fabric } from "#fabric/Fabric.js";
+import { Bytes, Diagnostic, Duration, Logger, PublicKey, UnexpectedDataError } from "#general";
+import { PeerAddress } from "#peer/PeerAddress.js";
+import { MessageExchange, RetransmissionLimitReachedError } from "#protocol/MessageExchange.js";
 import { ChannelStatusResponseError } from "#securechannel/SecureChannelMessenger.js";
+import { NodeSession } from "#session/NodeSession.js";
 import { SessionManager } from "#session/SessionManager.js";
 import { NodeId, SecureChannelStatusCode } from "#types";
-import { Fabric } from "../../fabric/Fabric.js";
-import { MessageExchange } from "../../protocol/MessageExchange.js";
 import {
     KDFSR1_KEY_INFO,
     KDFSR2_INFO,
@@ -36,13 +38,13 @@ export class CaseClient {
         this.#sessions = sessions;
     }
 
-    async pair(exchange: MessageExchange, fabric: Fabric, peerNodeId: NodeId, expectedProcessingTimeMs?: number) {
-        const messenger = new CaseClientMessenger(exchange, expectedProcessingTimeMs);
+    async pair(exchange: MessageExchange, fabric: Fabric, peerNodeId: NodeId, expectedProcessingTime?: Duration) {
+        const messenger = new CaseClientMessenger(exchange, expectedProcessingTime);
 
         try {
             return await this.#doPair(messenger, exchange, fabric, peerNodeId);
         } catch (error) {
-            if (!(error instanceof ChannelStatusResponseError)) {
+            if (!(error instanceof ChannelStatusResponseError || error instanceof RetransmissionLimitReachedError)) {
                 await messenger.sendError(SecureChannelStatusCode.InvalidParam);
             }
             throw error;
@@ -126,10 +128,7 @@ export class CaseClient {
                 caseAuthenticatedTags,
             });
             await messenger.sendSuccess();
-            logger.info(
-                `Case client: Session ${secureSession.id} successfully resumed with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(fabric.nodeId)} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)} with parameters`,
-                secureSession.parameterDiagnostics(),
-            );
+            this.#logNewSession("Resumed", secureSession, messenger, fabric, peerNodeId);
 
             resumptionRecord.resumptionId = resumptionId; /* update resumptionId */
             resumptionRecord.sessionParameters = secureSession.parameters; /* update mrpParams */
@@ -239,12 +238,7 @@ export class CaseClient {
                 peerSessionParameters: sessionParameters,
                 caseAuthenticatedTags,
             });
-            logger.info(
-                `Case client Session ${secureSession.id} established successfully with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
-                    fabric.nodeId,
-                )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)} with parameters`,
-                secureSession.parameterDiagnostics(),
-            );
+            this.#logNewSession("New", secureSession, messenger, fabric, peerNodeId);
             resumptionRecord = {
                 fabric,
                 peerNodeId,
@@ -260,4 +254,23 @@ export class CaseClient {
 
         return { session: secureSession, resumed };
     }
+
+    #logNewSession(
+        operation: "New" | "Resumed",
+        session: NodeSession,
+        messenger: CaseClientMessenger,
+        fabric: Fabric,
+        peerNodeId: NodeId,
+    ) {
+        logger.info(
+            `${operation} session with`,
+            Diagnostic.strong(PeerAddress({ fabricIndex: fabric.fabricIndex, nodeId: peerNodeId }).toString()),
+            Diagnostic.dict({
+                id: session.id,
+                address: messenger.channelName,
+                fabric: `${NodeId.toHexString(fabric.nodeId)} (#${fabric.fabricIndex})`,
+                ...session.parameterDiagnostics,
+            }),
+        );
+    }
 }

package/src/session/case/CaseServer.ts

@@ -64,7 +64,7 @@ export class CaseServer implements ProtocolHandler {
     }
 
     async #handleSigma1(messenger: CaseServerMessenger) {
-        logger.info(`Received pairing request from ${messenger.getChannelName()}`);
+        logger.info(`Received pairing request from ${messenger.channelName}`);
 
         // Initialize context with information from peer
         const { sigma1Bytes, sigma1 } = await messenger.readSigma1();
@@ -86,7 +86,7 @@ export class CaseServer implements ProtocolHandler {
         }
 
         logger.info(
-            `Invalid resumption ID or resume MIC received from ${messenger.getChannelName()}`,
+            `Invalid resumption ID or resume MIC received from ${messenger.channelName}`,
             context.peerResumptionId,
             context.peerResumeMic,
         );
@@ -152,7 +152,7 @@ export class CaseServer implements ProtocolHandler {
         }
 
         logger.info(
-            `Session ${secureSession.id} resumed with ${cx.messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+            `Session ${secureSession.id} resumed with ${cx.messenger.channelName} for Fabric ${NodeId.toHexString(
                 fabric.nodeId,
             )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
             "with CATs",
@@ -274,7 +274,7 @@ export class CaseServer implements ProtocolHandler {
             caseAuthenticatedTags,
         });
         logger.info(
-            `Session ${secureSession.id} created with ${cx.messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+            `Session ${secureSession.id} created with ${cx.messenger.channelName} for Fabric ${NodeId.toHexString(
                 fabric.nodeId,
             )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
             "with CATs",

package/src/session/pase/PaseClient.ts

@@ -115,7 +115,7 @@ export class PaseClient {
             peerSessionParameters: sessionParameters,
         });
         await messenger.close();
-        logger.info(`Pase client: Paired successfully with ${messenger.getChannelName()}.`);
+        logger.info(`Pase client: Paired successfully with ${messenger.channelName}.`);
 
         return secureSession;
     }

package/src/session/pase/PaseMessenger.ts

@@ -6,10 +6,7 @@
 
 import { Bytes } from "#general";
 import { SecureMessageType, TypeFromSchema } from "#types";
-import {
-    DEFAULT_NORMAL_PROCESSING_TIME_MS,
-    SecureChannelMessenger,
-} from "../../securechannel/SecureChannelMessenger.js";
+import { DEFAULT_NORMAL_PROCESSING_TIME, SecureChannelMessenger } from "../../securechannel/SecureChannelMessenger.js";
 import {
     TlvPasePake1,
     TlvPasePake2,
@@ -29,16 +26,13 @@ type PasePake3 = TypeFromSchema<typeof TlvPasePake3>;
 
 export class PaseServerMessenger extends SecureChannelMessenger {
     async readPbkdfParamRequest() {
-        const { payload } = await this.nextMessage(
-            SecureMessageType.PbkdfParamRequest,
-            DEFAULT_NORMAL_PROCESSING_TIME_MS,
-        );
+        const { payload } = await this.nextMessage(SecureMessageType.PbkdfParamRequest, DEFAULT_NORMAL_PROCESSING_TIME);
         return { requestPayload: payload, request: TlvPbkdfParamRequest.decode(payload) };
     }
 
     async sendPbkdfParamResponse(response: PbkdfParamResponse) {
         return this.send(response, SecureMessageType.PbkdfParamResponse, TlvPbkdfParamResponse, {
-            expectedProcessingTimeMs: DEFAULT_NORMAL_PROCESSING_TIME_MS,
+            expectedProcessingTime: DEFAULT_NORMAL_PROCESSING_TIME,
         });
     }
 
@@ -58,14 +52,14 @@ export class PaseServerMessenger extends SecureChannelMessenger {
 export class PaseClientMessenger extends SecureChannelMessenger {
     sendPbkdfParamRequest(request: PbkdfParamRequest) {
         return this.send(request, SecureMessageType.PbkdfParamRequest, TlvPbkdfParamRequest, {
-            expectedProcessingTimeMs: DEFAULT_NORMAL_PROCESSING_TIME_MS,
+            expectedProcessingTime: DEFAULT_NORMAL_PROCESSING_TIME,
         });
     }
 
     async readPbkdfParamResponse() {
         const { payload } = await this.nextMessage(
             SecureMessageType.PbkdfParamResponse,
-            DEFAULT_NORMAL_PROCESSING_TIME_MS,
+            DEFAULT_NORMAL_PROCESSING_TIME,
         );
         return { responsePayload: payload, response: TlvPbkdfParamResponse.decode(payload) };
     }

package/src/session/pase/PaseServer.ts

@@ -11,6 +11,7 @@ import {
     Logger,
     MatterFlowError,
     PbkdfParameters,
+    Seconds,
     Spake2p,
     Time,
     Timer,
@@ -27,7 +28,7 @@ const { bytesToNumberBE } = ec;
 
 const logger = Logger.get("PaseServer");
 
-const PASE_PAIRING_TIMEOUT_MS = 60_000;
+const PASE_PAIRING_TIMEOUT_MS = Seconds(60);
 const PASE_COMMISSIONING_MAX_ERRORS = 20;
 
 export class MaximumPasePairingErrorsReachedError extends MatterFlowError {}
@@ -102,7 +103,7 @@ export class PaseServer implements ProtocolHandler {
     }
 
     private async handlePairingRequest(crypto: Crypto, messenger: PaseServerMessenger) {
-        logger.info(`Received pairing request from ${messenger.getChannelName()}.`);
+        logger.info(`Received pairing request from ${messenger.channelName}.`);
 
         this.#pairingTimer = Time.getTimer("PASE pairing timeout", PASE_PAIRING_TIMEOUT_MS, () =>
             this.cancelPairing(messenger),
@@ -173,7 +174,7 @@ export class PaseServer implements ProtocolHandler {
             isResumption: false,
             peerSessionParameters: initiatorSessionParams,
         });
-        logger.info(`Session ${responderSessionId} created with ${messenger.getChannelName()}.`);
+        logger.info(`Session ${responderSessionId} created with ${messenger.channelName}.`);
 
         await messenger.sendSuccess();
         await messenger.close();