@matter/protocol 0.16.0-alpha.0-20250819-0a388db8b → 0.16.0-alpha.0-20250821-dd03e1003

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, Duration, 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,
@@ -42,7 +44,7 @@ export class CaseClient {
         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/PaseServer.ts

@@ -103,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),
@@ -174,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();