@matter/protocol 0.14.0-alpha.0-20250525-d6ada0d45 → 0.14.0-alpha.0-20250528-ad0054c84

package/dist/esm/session/case/CaseClient.js

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Bytes, Crypto, Logger, PublicKey, UnexpectedDataError } from "#general";
-import { NodeId } from "#types";
+import { ChannelStatusResponseError } from "#securechannel/index.js";
+import { NodeId, ProtocolStatusCode } from "#types";
 import { TlvIntermediateCertificate, TlvOperationalCertificate } from "../../certificate/CertificateManager.js";
 import {
   KDFSR1_KEY_INFO,
@@ -28,6 +29,16 @@ class CaseClient {
   }
   async pair(exchange, fabric, peerNodeId, expectedProcessingTimeMs) {
     const messenger = new CaseClientMessenger(exchange, expectedProcessingTimeMs);
+    try {
+      return await this.#doPair(messenger, exchange, fabric, peerNodeId);
+    } catch (error) {
+      if (!(error instanceof ChannelStatusResponseError)) {
+        await messenger.sendError(ProtocolStatusCode.InvalidParam);
+      }
+      throw error;
+    }
+  }
+  async #doPair(messenger, exchange, fabric, peerNodeId) {
     const initiatorRandom = Crypto.getRandom();
     const initiatorSessionId = await this.#sessions.getNextAvailableSessionId();
     const { operationalIdentityProtectionKey, operationalCert: nodeOpCert, intermediateCACert } = fabric;

package/dist/esm/session/case/CaseClient.js.map

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

package/dist/esm/session/case/CaseServer.d.ts

@@ -13,7 +13,6 @@ export declare class CaseServer implements ProtocolHandler {
     readonly requiresSecureSession = false;
     constructor(sessions: SessionManager, fabrics: FabricManager);
     onNewExchange(exchange: MessageExchange): Promise<void>;
-    private handleSigma1;
     close(): Promise<void>;
 }
 //# sourceMappingURL=CaseServer.d.ts.map

package/dist/esm/session/case/CaseServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAmBpE,qBAAa,UAAW,YAAW,eAAe;;IAC9C,QAAQ,CAAC,EAAE,KAA8B;IACzC,QAAQ,CAAC,qBAAqB,SAAS;gBAK3B,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;IAKtD,aAAa,CAAC,QAAQ,EAAE,eAAe;YAoB/B,YAAY;IA4MpB,KAAK;CAGd"}
+{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAoB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAoBpE,qBAAa,UAAW,YAAW,eAAe;;IAC9C,QAAQ,CAAC,EAAE,KAA8B;IACzC,QAAQ,CAAC,qBAAqB,SAAS;gBAK3B,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;IAKtD,aAAa,CAAC,QAAQ,EAAE,eAAe;IAwPvC,KAAK;CAGd"}

package/dist/esm/session/case/CaseServer.js

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Bytes, Crypto, Logger, PublicKey, UnexpectedDataError } from "#general";
+import { Bytes, Crypto, CryptoDecryptError, Logger, PublicKey, UnexpectedDataError } from "#general";
 import { NodeId, ProtocolStatusCode, SECURE_CHANNEL_PROTOCOL_ID } from "#types";
 import { TlvOperationalCertificate } from "../../certificate/CertificateManager.js";
 import { FabricNotFoundError } from "../../fabric/FabricManager.js";
@@ -35,7 +35,7 @@ class CaseServer {
   async onNewExchange(exchange) {
     const messenger = new CaseServerMessenger(exchange);
     try {
-      await this.handleSigma1(messenger);
+      await this.#handleSigma1(messenger);
     } catch (error) {
       logger.error("An error occurred during the commissioning", error);
       if (error instanceof FabricNotFoundError) {
@@ -47,179 +47,221 @@ class CaseServer {
       await exchange.session.destroy();
     }
   }
-  async handleSigma1(messenger) {
+  async #handleSigma1(messenger) {
     logger.info(`Received pairing request from ${messenger.getChannelName()}`);
-    const responderRandom = Crypto.getRandom();
     const { sigma1Bytes, sigma1 } = await messenger.readSigma1();
-    const {
-      initiatorSessionId: peerSessionId,
-      resumptionId: peerResumptionId,
-      initiatorResumeMic: peerResumeMic,
-      destinationId,
-      initiatorRandom: peerRandom,
-      initiatorEcdhPublicKey: peerEcdhPublicKey,
-      initiatorSessionParams
-    } = sigma1;
-    const resumptionId = Crypto.getRandomData(16);
-    const resumptionRecord = peerResumptionId !== void 0 && peerResumeMic !== void 0 ? this.#sessions.findResumptionRecordById(peerResumptionId) : void 0;
-    if (peerResumptionId !== void 0 && peerResumeMic !== void 0 && resumptionRecord !== void 0) {
-      const { sharedSecret, fabric, peerNodeId, caseAuthenticatedTags } = resumptionRecord;
-      const peerResumeKey = await Crypto.hkdf(
-        sharedSecret,
-        Bytes.concat(peerRandom, peerResumptionId),
-        KDFSR1_KEY_INFO
-      );
-      Crypto.decrypt(peerResumeKey, peerResumeMic, RESUME1_MIC_NONCE);
-      const responderSessionId = await this.#sessions.getNextAvailableSessionId();
-      const secureSessionSalt = Bytes.concat(peerRandom, peerResumptionId);
-      const secureSession = await this.#sessions.createSecureSession({
-        sessionId: responderSessionId,
-        fabric,
-        peerNodeId,
-        peerSessionId,
-        sharedSecret,
-        salt: secureSessionSalt,
-        isInitiator: false,
-        isResumption: true,
-        peerSessionParameters: initiatorSessionParams,
-        caseAuthenticatedTags
-      });
-      const resumeSalt = Bytes.concat(peerRandom, resumptionId);
-      const resumeKey = await Crypto.hkdf(sharedSecret, resumeSalt, KDFSR2_KEY_INFO);
-      const resumeMic = Crypto.encrypt(resumeKey, new Uint8Array(0), RESUME2_MIC_NONCE);
-      try {
-        await messenger.sendSigma2Resume({
-          resumptionId,
-          resumeMic,
-          responderSessionId,
-          responderSessionParams: this.#sessions.sessionParameters
-          // responder session parameters
-        });
-      } catch (error) {
-        await secureSession.destroy(false);
-        throw error;
-      }
-      logger.info(
-        `Session ${secureSession.id} resumed with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
-          fabric.nodeId
-        )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
-        "with CATs",
-        caseAuthenticatedTags
-      );
-      resumptionRecord.resumptionId = resumptionId;
-      await messenger.waitForSuccess("Sigma2Resume-Success");
-      await messenger.close();
-      await this.#sessions.saveResumptionRecord(resumptionRecord);
-    } else if (peerResumptionId === void 0 && peerResumeMic === void 0 || peerResumptionId !== void 0 && peerResumeMic !== void 0 && resumptionRecord === void 0) {
-      const fabric = await this.#fabrics.findFabricFromDestinationId(destinationId, peerRandom);
-      const { operationalCert: nodeOpCert, intermediateCACert, operationalIdentityProtectionKey } = fabric;
-      const { publicKey: responderEcdhPublicKey, sharedSecret } = await Crypto.ecdhGeneratePublicKeyAndSecret(peerEcdhPublicKey);
-      const sigma2Salt = Bytes.concat(
-        operationalIdentityProtectionKey,
-        responderRandom,
-        responderEcdhPublicKey,
-        await Crypto.hash(sigma1Bytes)
-      );
-      const sigma2Key = await Crypto.hkdf(sharedSecret, sigma2Salt, KDFSR2_INFO);
-      const signatureData = TlvSignedData.encode({
-        nodeOpCert,
-        intermediateCACert,
-        ecdhPublicKey: responderEcdhPublicKey,
-        peerEcdhPublicKey
-      });
-      const signature = await fabric.sign(signatureData);
-      const encryptedData = TlvEncryptedDataSigma2.encode({
-        nodeOpCert,
-        intermediateCACert,
-        signature,
-        resumptionId
-      });
-      const encrypted = Crypto.encrypt(sigma2Key, encryptedData, TBE_DATA2_NONCE);
-      const responderSessionId = await this.#sessions.getNextAvailableSessionId();
-      const sigma2Bytes = await messenger.sendSigma2({
-        responderRandom,
+    const resumptionRecord = sigma1.resumptionId !== void 0 && sigma1.initiatorResumeMic !== void 0 ? this.#sessions.findResumptionRecordById(sigma1.resumptionId) : void 0;
+    const context = new Sigma1Context(messenger, sigma1Bytes, sigma1, resumptionRecord);
+    if (await this.#resume(context)) {
+      return;
+    }
+    if (await this.#generateSigma2(context)) {
+      return;
+    }
+    logger.info(
+      `Invalid resumption ID or resume MIC received from ${messenger.getChannelName()}`,
+      context.peerResumptionId,
+      context.peerResumeMic
+    );
+    throw new UnexpectedDataError("Invalid resumption ID or resume MIC.");
+  }
+  async #resume(cx) {
+    if (cx.peerResumptionId === void 0 || cx.peerResumeMic === void 0 || cx.resumptionRecord === void 0) {
+      return false;
+    }
+    const { sharedSecret, fabric, peerNodeId, caseAuthenticatedTags } = cx.resumptionRecord;
+    const peerResumeKey = await Crypto.hkdf(
+      sharedSecret,
+      Bytes.concat(cx.peerRandom, cx.peerResumptionId),
+      KDFSR1_KEY_INFO
+    );
+    try {
+      Crypto.decrypt(peerResumeKey, cx.peerResumeMic, RESUME1_MIC_NONCE);
+    } catch (e) {
+      CryptoDecryptError.accept(e);
+      cx.peerResumptionId = cx.peerResumeMic = void 0;
+      return false;
+    }
+    const responderSessionId = await this.#sessions.getNextAvailableSessionId();
+    const secureSessionSalt = Bytes.concat(cx.peerRandom, cx.peerResumptionId);
+    const secureSession = await this.#sessions.createSecureSession({
+      sessionId: responderSessionId,
+      fabric,
+      peerNodeId,
+      peerSessionId: cx.peerSessionId,
+      sharedSecret,
+      salt: secureSessionSalt,
+      isInitiator: false,
+      isResumption: true,
+      peerSessionParameters: cx.peerSessionParams,
+      caseAuthenticatedTags
+    });
+    const resumeSalt = Bytes.concat(cx.peerRandom, cx.localResumptionId);
+    const resumeKey = await Crypto.hkdf(sharedSecret, resumeSalt, KDFSR2_KEY_INFO);
+    const resumeMic = Crypto.encrypt(resumeKey, new Uint8Array(0), RESUME2_MIC_NONCE);
+    try {
+      await cx.messenger.sendSigma2Resume({
+        resumptionId: cx.localResumptionId,
+        resumeMic,
         responderSessionId,
-        responderEcdhPublicKey,
-        encrypted,
         responderSessionParams: this.#sessions.sessionParameters
         // responder session parameters
       });
-      const {
-        sigma3Bytes,
-        sigma3: { encrypted: peerEncrypted }
-      } = await messenger.readSigma3();
-      const sigma3Salt = Bytes.concat(
-        operationalIdentityProtectionKey,
-        await Crypto.hash([sigma1Bytes, sigma2Bytes])
-      );
-      const sigma3Key = await Crypto.hkdf(sharedSecret, sigma3Salt, KDFSR3_INFO);
-      const peerDecryptedData = Crypto.decrypt(sigma3Key, peerEncrypted, TBE_DATA3_NONCE);
-      const {
-        nodeOpCert: peerNewOpCert,
-        intermediateCACert: peerIntermediateCACert,
-        signature: peerSignature
-      } = TlvEncryptedDataSigma3.decode(peerDecryptedData);
-      await fabric.verifyCredentials(peerNewOpCert, peerIntermediateCACert);
-      const peerSignatureData = TlvSignedData.encode({
-        nodeOpCert: peerNewOpCert,
-        intermediateCACert: peerIntermediateCACert,
-        ecdhPublicKey: peerEcdhPublicKey,
-        peerEcdhPublicKey: responderEcdhPublicKey
-      });
-      const {
-        ellipticCurvePublicKey: peerPublicKey,
-        subject: { fabricId: peerFabricId, nodeId: peerNodeId, caseAuthenticatedTags }
-      } = TlvOperationalCertificate.decode(peerNewOpCert);
-      if (fabric.fabricId !== peerFabricId) {
-        throw new UnexpectedDataError(`Fabric ID mismatch: ${fabric.fabricId} !== ${peerFabricId}`);
-      }
-      await Crypto.verify(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
-      const secureSessionSalt = Bytes.concat(
-        operationalIdentityProtectionKey,
-        await Crypto.hash([sigma1Bytes, sigma2Bytes, sigma3Bytes])
-      );
-      const secureSession = await this.#sessions.createSecureSession({
-        sessionId: responderSessionId,
-        fabric,
-        peerNodeId,
-        peerSessionId,
-        sharedSecret,
-        salt: secureSessionSalt,
-        isInitiator: false,
-        isResumption: false,
-        peerSessionParameters: initiatorSessionParams,
-        caseAuthenticatedTags
-      });
-      logger.info(
-        `Session ${secureSession.id} created with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
-          fabric.nodeId
-        )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
-        "with CATs",
-        caseAuthenticatedTags
-      );
-      await messenger.sendSuccess();
-      const resumptionRecord2 = {
-        peerNodeId,
-        fabric,
-        sharedSecret,
-        resumptionId,
-        sessionParameters: secureSession.parameters,
-        caseAuthenticatedTags
-      };
-      await messenger.close();
-      await this.#sessions.saveResumptionRecord(resumptionRecord2);
-    } else {
-      logger.info(
-        `Invalid resumption ID or resume MIC received from ${messenger.getChannelName()}`,
-        peerResumptionId,
-        peerResumeMic
-      );
-      throw new UnexpectedDataError("Invalid resumption ID or resume MIC.");
+    } catch (error) {
+      await secureSession.destroy(false);
+      throw error;
     }
+    logger.info(
+      `Session ${secureSession.id} resumed with ${cx.messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+        fabric.nodeId
+      )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
+      "with CATs",
+      caseAuthenticatedTags
+    );
+    cx.resumptionRecord.resumptionId = cx.localResumptionId;
+    await cx.messenger.waitForSuccess("Sigma2Resume-Success");
+    await cx.messenger.close();
+    await this.#sessions.saveResumptionRecord(cx.resumptionRecord);
+    return true;
+  }
+  async #generateSigma2(cx) {
+    if (
+      // No resumption attempted is OK
+      !(cx.peerResumptionId === void 0 && cx.peerResumeMic === void 0) && // Resumption attempted with no record on our side is OK
+      !(cx.peerResumptionId !== void 0 && cx.peerResumeMic !== void 0 && cx.resumptionRecord === void 0)
+    ) {
+      return false;
+    }
+    const responderRandom = Crypto.getRandom();
+    const fabric = await this.#fabrics.findFabricFromDestinationId(cx.destinationId, cx.peerRandom);
+    const { operationalCert: nodeOpCert, intermediateCACert, operationalIdentityProtectionKey } = fabric;
+    const { publicKey: responderEcdhPublicKey, sharedSecret } = await Crypto.ecdhGeneratePublicKeyAndSecret(
+      cx.peerEcdhPublicKey
+    );
+    const sigma2Salt = Bytes.concat(
+      operationalIdentityProtectionKey,
+      responderRandom,
+      responderEcdhPublicKey,
+      await Crypto.hash(cx.bytes)
+    );
+    const sigma2Key = await Crypto.hkdf(sharedSecret, sigma2Salt, KDFSR2_INFO);
+    const signatureData = TlvSignedData.encode({
+      nodeOpCert,
+      intermediateCACert,
+      ecdhPublicKey: responderEcdhPublicKey,
+      peerEcdhPublicKey: cx.peerEcdhPublicKey
+    });
+    const signature = await fabric.sign(signatureData);
+    const encryptedData = TlvEncryptedDataSigma2.encode({
+      nodeOpCert,
+      intermediateCACert,
+      signature,
+      resumptionId: cx.localResumptionId
+    });
+    const encrypted = Crypto.encrypt(sigma2Key, encryptedData, TBE_DATA2_NONCE);
+    const responderSessionId = await this.#sessions.getNextAvailableSessionId();
+    const sigma2Bytes = await cx.messenger.sendSigma2({
+      responderRandom,
+      responderSessionId,
+      responderEcdhPublicKey,
+      encrypted,
+      responderSessionParams: this.#sessions.sessionParameters
+      // responder session parameters
+    });
+    const {
+      sigma3Bytes,
+      sigma3: { encrypted: peerEncrypted }
+    } = await cx.messenger.readSigma3();
+    const sigma3Salt = Bytes.concat(operationalIdentityProtectionKey, await Crypto.hash([cx.bytes, sigma2Bytes]));
+    const sigma3Key = await Crypto.hkdf(sharedSecret, sigma3Salt, KDFSR3_INFO);
+    const peerDecryptedData = Crypto.decrypt(sigma3Key, peerEncrypted, TBE_DATA3_NONCE);
+    const {
+      nodeOpCert: peerNewOpCert,
+      intermediateCACert: peerIntermediateCACert,
+      signature: peerSignature
+    } = TlvEncryptedDataSigma3.decode(peerDecryptedData);
+    await fabric.verifyCredentials(peerNewOpCert, peerIntermediateCACert);
+    const peerSignatureData = TlvSignedData.encode({
+      nodeOpCert: peerNewOpCert,
+      intermediateCACert: peerIntermediateCACert,
+      ecdhPublicKey: cx.peerEcdhPublicKey,
+      peerEcdhPublicKey: responderEcdhPublicKey
+    });
+    const {
+      ellipticCurvePublicKey: peerPublicKey,
+      subject: { fabricId: peerFabricId, nodeId: peerNodeId, caseAuthenticatedTags }
+    } = TlvOperationalCertificate.decode(peerNewOpCert);
+    if (fabric.fabricId !== peerFabricId) {
+      throw new UnexpectedDataError(`Fabric ID mismatch: ${fabric.fabricId} !== ${peerFabricId}`);
+    }
+    await Crypto.verify(PublicKey(peerPublicKey), peerSignatureData, peerSignature);
+    const secureSessionSalt = Bytes.concat(
+      operationalIdentityProtectionKey,
+      await Crypto.hash([cx.bytes, sigma2Bytes, sigma3Bytes])
+    );
+    const secureSession = await this.#sessions.createSecureSession({
+      sessionId: responderSessionId,
+      fabric,
+      peerNodeId,
+      peerSessionId: cx.peerSessionId,
+      sharedSecret,
+      salt: secureSessionSalt,
+      isInitiator: false,
+      isResumption: false,
+      peerSessionParameters: cx.peerSessionParams,
+      caseAuthenticatedTags
+    });
+    logger.info(
+      `Session ${secureSession.id} created with ${cx.messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+        fabric.nodeId
+      )} (index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
+      "with CATs",
+      caseAuthenticatedTags
+    );
+    await cx.messenger.sendSuccess();
+    const resumptionRecord = {
+      peerNodeId,
+      fabric,
+      sharedSecret,
+      resumptionId: cx.localResumptionId,
+      sessionParameters: secureSession.parameters,
+      caseAuthenticatedTags
+    };
+    await cx.messenger.close();
+    await this.#sessions.saveResumptionRecord(resumptionRecord);
+    return true;
   }
   async close() {
   }
 }
+class Sigma1Context {
+  messenger;
+  bytes;
+  peerSessionId;
+  peerResumptionId;
+  peerResumeMic;
+  destinationId;
+  peerRandom;
+  peerEcdhPublicKey;
+  peerSessionParams;
+  resumptionRecord;
+  #localResumptionId;
+  constructor(messenger, bytes, sigma1, resumptionRecord) {
+    this.messenger = messenger;
+    this.bytes = bytes;
+    this.peerSessionId = sigma1.initiatorSessionId;
+    this.peerResumptionId = sigma1.resumptionId;
+    this.peerResumeMic = sigma1.initiatorResumeMic;
+    this.destinationId = sigma1.destinationId;
+    this.peerRandom = sigma1.initiatorRandom;
+    this.peerEcdhPublicKey = sigma1.initiatorEcdhPublicKey;
+    this.peerSessionParams = sigma1.initiatorSessionParams;
+    this.resumptionRecord = resumptionRecord;
+  }
+  get localResumptionId() {
+    return this.#localResumptionId ??= Crypto.getRandomData(16);
+  }
+}
 export {
   CaseServer
 };

package/dist/esm/session/case/CaseServer.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/protocol",
-    "version": "0.14.0-alpha.0-20250525-d6ada0d45",
+    "version": "0.14.0-alpha.0-20250528-ad0054c84",
     "description": "Low-level APIs for Matter interaction",
     "keywords": [
         "iot",
@@ -40,13 +40,13 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.14.0-alpha.0-20250525-d6ada0d45",
-        "@matter/model": "0.14.0-alpha.0-20250525-d6ada0d45",
-        "@matter/types": "0.14.0-alpha.0-20250525-d6ada0d45"
+        "@matter/general": "0.14.0-alpha.0-20250528-ad0054c84",
+        "@matter/model": "0.14.0-alpha.0-20250528-ad0054c84",
+        "@matter/types": "0.14.0-alpha.0-20250528-ad0054c84"
     },
     "devDependencies": {
-        "@matter/tools": "0.14.0-alpha.0-20250525-d6ada0d45",
-        "@matter/testing": "0.14.0-alpha.0-20250525-d6ada0d45"
+        "@matter/tools": "0.14.0-alpha.0-20250528-ad0054c84",
+        "@matter/testing": "0.14.0-alpha.0-20250528-ad0054c84"
     },
     "files": [
         "dist/**/*",

package/src/fabric/FabricManager.ts

@@ -10,7 +10,6 @@ import {
     Environment,
     Environmental,
     ImplementationError,
-    InternalError,
     Key,
     MatterError,
     MatterFlowError,
@@ -219,7 +218,7 @@ export class FabricManager {
             return fabric;
         }
 
-        throw new InternalError("Fabric cannot be found from destinationId");
+        throw new FabricNotFoundError();
     }
 
     findByKeypair(keypair: Key) {

package/src/session/case/CaseClient.ts

@@ -5,8 +5,9 @@
  */
 
 import { Bytes, Crypto, Logger, PublicKey, UnexpectedDataError } from "#general";
+import { ChannelStatusResponseError } from "#securechannel/index.js";
 import { SessionManager } from "#session/SessionManager.js";
-import { NodeId } from "#types";
+import { NodeId, ProtocolStatusCode } from "#types";
 import { TlvIntermediateCertificate, TlvOperationalCertificate } from "../../certificate/CertificateManager.js";
 import { Fabric } from "../../fabric/Fabric.js";
 import { MessageExchange } from "../../protocol/MessageExchange.js";
@@ -36,7 +37,17 @@ export class CaseClient {
 
     async pair(exchange: MessageExchange, fabric: Fabric, peerNodeId: NodeId, expectedProcessingTimeMs?: number) {
         const messenger = new CaseClientMessenger(exchange, expectedProcessingTimeMs);
+        try {
+            return await this.#doPair(messenger, exchange, fabric, peerNodeId);
+        } catch (error) {
+            if (!(error instanceof ChannelStatusResponseError)) {
+                await messenger.sendError(ProtocolStatusCode.InvalidParam);
+            }
+            throw error;
+        }
+    }
 
+    async #doPair(messenger: CaseClientMessenger, exchange: MessageExchange, fabric: Fabric, peerNodeId: NodeId) {
         // Generate pairing info
         const initiatorRandom = Crypto.getRandom();
         const initiatorSessionId = await this.#sessions.getNextAvailableSessionId(); // Initiator Session Id