@matter/protocol 0.12.4-alpha.0-20250215-5af08a8d6 → 0.12.4-alpha.0-20250223-1e0341a1a

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/protocol",
-    "version": "0.12.4-alpha.0-20250215-5af08a8d6",
+    "version": "0.12.4-alpha.0-20250223-1e0341a1a",
     "description": "Low-level APIs for Matter interaction",
     "keywords": [
         "iot",
@@ -40,14 +40,14 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.12.4-alpha.0-20250215-5af08a8d6",
-        "@matter/model": "0.12.4-alpha.0-20250215-5af08a8d6",
-        "@matter/types": "0.12.4-alpha.0-20250215-5af08a8d6",
+        "@matter/general": "0.12.4-alpha.0-20250223-1e0341a1a",
+        "@matter/model": "0.12.4-alpha.0-20250223-1e0341a1a",
+        "@matter/types": "0.12.4-alpha.0-20250223-1e0341a1a",
         "@noble/curves": "^1.8.1"
     },
     "devDependencies": {
-        "@matter/tools": "0.12.4-alpha.0-20250215-5af08a8d6",
-        "@matter/testing": "0.12.4-alpha.0-20250215-5af08a8d6"
+        "@matter/tools": "0.12.4-alpha.0-20250223-1e0341a1a",
+        "@matter/testing": "0.12.4-alpha.0-20250223-1e0341a1a"
     },
     "files": [
         "dist/**/*",

package/src/interaction/InteractionMessenger.ts

@@ -542,7 +542,6 @@ export class InteractionServerMessenger extends InteractionMessenger {
                                                 allowMissingFieldsForNonFabricFilteredRead,
                                             }),
                                         );
-
                                         break;
                                     }
                                     availableBytes -= encodedChunkDataSize;
@@ -583,6 +582,12 @@ export class InteractionServerMessenger extends InteractionMessenger {
                             attributeReportsToSend.push(attributeToSend);
                             continue;
                         }
+                        if (encodedSize > this.exchange.maxPayloadSize - emptyDataReportBytes.length - 3) {
+                            // We sent the message but the current attribute is too big for a message alone so needs to
+                            // be chunked, so add it to the queue at the beginning
+                            attributeReportsToSend.unshift(attributeToSend);
+                            continue;
+                        }
                     }
                     messageSize += encodedSize;
                     if (dataReport.attributeReports === undefined) {
@@ -626,7 +631,7 @@ export class InteractionServerMessenger extends InteractionMessenger {
         const encodedMessage = TlvDataReportForSend.encode(dataReportToSend);
         if (encodedMessage.length > this.exchange.maxPayloadSize) {
             throw new MatterFlowError(
-                `DataReport is too long to fit in a single chunk, This should not happen! Data: ${Logger.toJSON(
+                `DataReport with ${encodedMessage.length}bytes is too long to fit in a single chunk (${this.exchange.maxPayloadSize}bytes), This should not happen! Data: ${Logger.toJSON(
                     dataReportToSend,
                 )}`,
             );

package/src/protocol/ExchangeManager.ts

@@ -48,6 +48,7 @@ export class MessageChannel implements Channel<Message> {
         closeCallback?: () => Promise<void>,
     ) {
         this.#closeCallback = closeCallback;
+        this.session.destroyed.on(() => this.close());
     }
 
     set closeCallback(callback: () => Promise<void>) {
@@ -272,7 +273,7 @@ export class ExchangeManager {
                     !message.payloadHeader.requiresAck
                 ) {
                     logger.debug(
-                        `Ignoring unsolicited standalone ack message ${messageId} for protocol ${message.payloadHeader.protocolId} and exchange id ${message.payloadHeader.exchangeId}.`,
+                        `Ignoring unsolicited standalone ack message ${messageId} for protocol ${message.payloadHeader.protocolId} and exchange id ${message.payloadHeader.exchangeId} on channel ${channel.name}`,
                     );
                     return;
                 }
@@ -295,7 +296,7 @@ export class ExchangeManager {
                 });
                 await exchange.close();
                 logger.debug(
-                    `Ignoring unsolicited message ${messageId} for protocol ${message.payloadHeader.protocolId}.`,
+                    `Ignoring unsolicited message ${messageId} for protocol ${message.payloadHeader.protocolId} on channel ${channel.name}`,
                 );
             } else {
                 if (protocolHandler === undefined) {
@@ -303,14 +304,14 @@ export class ExchangeManager {
                 }
                 if (isDuplicate) {
                     logger.info(
-                        `Ignoring duplicate message ${messageId} (requires no ack) for protocol ${message.payloadHeader.protocolId}.`,
+                        `Ignoring duplicate message ${messageId} (requires no ack) for protocol ${message.payloadHeader.protocolId} on channel ${channel.name}`,
                     );
                     return;
                 } else {
                     logger.info(
                         `Discarding unexpected message ${messageId} for protocol ${
                             message.payloadHeader.protocolId
-                        }, exchangeIndex ${exchangeIndex} and sessionId ${session.id} : ${Logger.toJSON(message)}`,
+                        }, exchangeIndex ${exchangeIndex} and sessionId ${session.id} on channel ${channel.name}: ${Logger.toJSON(message)}`,
                     );
                 }
             }
@@ -355,7 +356,7 @@ export class ExchangeManager {
         }
         if (session.sendCloseMessageWhenClosing) {
             const channel = this.#channelManager.getChannelForSession(session);
-            logger.debug(`Channel for session ${session.name} is ${channel?.name}`);
+            logger.debug(`Channel for session ${sessionName} is ${channel?.name}`);
             if (channel !== undefined) {
                 const exchange = this.initiateExchangeWithChannel(channel, SECURE_CHANNEL_PROTOCOL_ID);
                 if (exchange !== undefined) {
@@ -422,18 +423,21 @@ export class ExchangeManager {
             transportInterface.onData((socket, data) => {
                 if (udpInterface && data.length > socket.maxPayloadSize) {
                     logger.warn(
-                        `Ignoring UDP message with size ${data.length} from ${socket.name}, which is larger than the maximum allowed size of ${socket.maxPayloadSize}.`,
+                        `Ignoring UDP message on channel ${socket.name} with size ${data.length} from ${socket.name}, which is larger than the maximum allowed size of ${socket.maxPayloadSize}.`,
                     );
                     return;
                 }
 
                 try {
                     this.onMessage(socket, data).catch(error =>
-                        logger.info(error instanceof MatterError ? error.message : error),
+                        logger.info(
+                            `Error on channel ${socket.name}:`,
+                            error instanceof MatterError ? error.message : error,
+                        ),
                     );
                 } catch (error) {
                     logger.info(
-                        "Ignoring UDP message with error",
+                        `Ignoring UDP message on channel ${socket.name} with error`,
                         error instanceof MatterError ? error.message : error,
                     );
                 }

package/src/session/InsecureSession.ts

@@ -87,6 +87,7 @@ export class InsecureSession extends Session {
 
     async destroy() {
         await this.end();
+        await this.destroyed.emit();
     }
 
     async end() {

package/src/session/SecureSession.ts

@@ -327,9 +327,13 @@ export class SecureSession extends Session {
                     await this.closer;
                 } catch (error) {
                     NoChannelError.accept(error);
+                } finally {
+                    await this.destroyed.emit();
                 }
+                return;
             }
         }
+        await this.destroyed.emit();
     }
 
     /**

package/src/session/Session.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Time } from "#general";
+import { AsyncObservable, Time } from "#general";
 import { NodeId } from "#types";
 import { DecodedMessage, DecodedPacket, Message, Packet } from "../codec/MessageCodec.js";
 import { Fabric } from "../fabric/Fabric.js";
@@ -76,9 +76,10 @@ export abstract class Session {
     /**
      * 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.
+     * necessary, but it makes sense so this allows us to maintain the old behavior.
      */
     closer?: Promise<void>;
+    #destroyed = AsyncObservable<[]>();
 
     constructor(args: {
         manager?: SessionManager;
@@ -117,6 +118,10 @@ export abstract class Session {
         }
     }
 
+    get destroyed() {
+        return this.#destroyed;
+    }
+
     notifyActivity(messageReceived: boolean) {
         this.timestamp = Time.nowMs();
         if (messageReceived) {

package/src/session/case/CaseClient.ts

@@ -79,7 +79,12 @@ export class CaseClient {
         if (sigma2Resume !== undefined) {
             // Process sigma2 resume
             if (resumptionRecord === undefined) throw new UnexpectedDataError("Received an unexpected sigma2Resume.");
-            const { sharedSecret, fabric, sessionParameters: resumptionSessionParams } = resumptionRecord;
+            const {
+                sharedSecret,
+                fabric,
+                sessionParameters: resumptionSessionParams,
+                caseAuthenticatedTags,
+            } = resumptionRecord;
             const { responderSessionId: peerSessionId, resumptionId, resumeMic } = sigma2Resume;
 
             // We use the Fallbacks for the session parameters overridden by our stored ones from the resumption record
@@ -103,10 +108,11 @@ export class CaseClient {
                 isInitiator: true,
                 isResumption: true,
                 peerSessionParameters: sessionParameters,
+                caseAuthenticatedTags,
             });
             await messenger.sendSuccess();
             logger.info(
-                `Case client: Session resumed with ${messenger.getChannelName()} and parameters`,
+                `Case client: Session ${secureSession.id} successfully resumed with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(fabric.nodeId)}(index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)} and parameters`,
                 secureSession.parameterDiagnostics(),
             );
 
@@ -157,17 +163,12 @@ export class CaseClient {
 
             if (peerNodeIdNOCert !== peerNodeId) {
                 throw new UnexpectedDataError(
-                    "The node ID in the peer certificate doesn't match the expected peer node ID",
-                );
-            }
-            if (peerNodeIdNOCert !== peerNodeId) {
-                throw new UnexpectedDataError(
-                    "The node ID in the peer certificate doesn't match the expected peer node ID",
+                    `The node ID in the peer certificate ${peerNodeIdNOCert} doesn't match the expected peer node ID ${peerNodeId}`,
                 );
             }
             if (peerFabricIdNOCert !== fabric.fabricId) {
                 throw new UnexpectedDataError(
-                    "The fabric ID in the peer certificate doesn't match the expected fabric ID",
+                    `The fabric ID in the peer certificate ${peerFabricIdNOCert} doesn't match the expected fabric ID ${fabric.fabricId}`,
                 );
             }
             if (peerIntermediateCACert !== undefined) {
@@ -175,9 +176,9 @@ export class CaseClient {
                     subject: { fabricId: peerFabricIdIcaCert },
                 } = TlvIntermediateCertificate.decode(peerIntermediateCACert);
 
-                if (peerFabricIdIcaCert !== fabric.fabricId) {
+                if (peerFabricIdIcaCert !== undefined && peerFabricIdIcaCert !== fabric.fabricId) {
                     throw new UnexpectedDataError(
-                        "The fabric ID in the peer intermediate CA certificate doesn't match the expected fabric ID",
+                        `The fabric ID in the peer intermediate CA certificate ${peerFabricIdIcaCert} doesn't match the expected fabric ID ${fabric.fabricId}`,
                     );
                 }
             }
@@ -199,6 +200,7 @@ export class CaseClient {
             await messenger.waitForSuccess("Sigma3-Success");
 
             // All good! Create secure session
+            const { caseAuthenticatedTags } = resumptionRecord ?? {}; // Even if resumption does not work try to reuse the caseAuthenticatedTags
             const secureSessionSalt = Bytes.concat(
                 operationalIdentityProtectionKey,
                 Crypto.hash([sigma1Bytes, sigma2Bytes, sigma3Bytes]),
@@ -213,9 +215,12 @@ export class CaseClient {
                 isInitiator: true,
                 isResumption: false,
                 peerSessionParameters: sessionParameters,
+                caseAuthenticatedTags,
             });
             logger.info(
-                `Case client: Paired successfully with ${messenger.getChannelName()} and parameters`,
+                `Case client Session ${secureSession.id} established successfully with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+                    fabric.nodeId,
+                )}(index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}and parameters`,
                 secureSession.parameterDiagnostics(),
             );
             resumptionRecord = {
@@ -224,6 +229,7 @@ export class CaseClient {
                 sharedSecret,
                 resumptionId: peerResumptionId,
                 sessionParameters: secureSession.parameters,
+                caseAuthenticatedTags,
             };
         }
 

package/src/session/case/CaseServer.ts

@@ -234,7 +234,7 @@ export class CaseServer implements ProtocolHandler {
                 caseAuthenticatedTags,
             });
             logger.info(
-                `session ${secureSession.id} created with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
+                `Session ${secureSession.id} created with ${messenger.getChannelName()} for Fabric ${NodeId.toHexString(
                     fabric.nodeId,
                 )}(index ${fabric.fabricIndex}) and PeerNode ${NodeId.toHexString(peerNodeId)}`,
                 "with CATs",