@matter/protocol 0.15.1 → 0.15.2-alpha.0-20250703-2e16aba2b

package/src/interaction/InteractionClient.ts

@@ -509,7 +509,8 @@ export class InteractionClient {
                 .join(", ")} and events ${eventRequests?.map(path => resolveEventName(path)).join(", ")}`,
         );
         // Send read request and combine all (potentially chunked) responses
-        const response = await messenger.sendReadRequest(request);
+        await messenger.sendReadRequest(request);
+        const response = await messenger.readAggregateDataReport();
 
         // Normalize and decode the response
         const normalizedResult = DecodedDataReport(response);
@@ -752,7 +753,7 @@ export class InteractionClient {
             report: DataReport;
             maximumPeerResponseTimeMs: number;
         }>(async messenger => {
-            const { subscribeResponse, report } = await messenger.sendSubscribeRequest({
+            await messenger.sendSubscribeRequest({
                 interactionModelRevision: Specification.INTERACTION_MODEL_REVISION,
                 attributeRequests: [{ endpointId, clusterId, attributeId }],
                 dataVersionFilters:
@@ -764,6 +765,7 @@ export class InteractionClient {
                 maxIntervalCeilingSeconds,
                 isFabricFiltered,
             });
+            const { subscribeResponse, report } = await messenger.readAggregateSubscribeResponse();
             return {
                 subscribeResponse,
                 report,
@@ -863,7 +865,7 @@ export class InteractionClient {
             report: DataReport;
             maximumPeerResponseTimeMs: number;
         }>(async messenger => {
-            const { subscribeResponse, report } = await messenger.sendSubscribeRequest({
+            await messenger.sendSubscribeRequest({
                 interactionModelRevision: Specification.INTERACTION_MODEL_REVISION,
                 eventRequests: [{ endpointId, clusterId, eventId, isUrgent }],
                 eventFilters: minimumEventNumber !== undefined ? [{ eventMin: minimumEventNumber }] : undefined,
@@ -872,6 +874,7 @@ export class InteractionClient {
                 maxIntervalCeilingSeconds,
                 isFabricFiltered,
             });
+            const { subscribeResponse, report } = await messenger.readAggregateSubscribeResponse();
             return {
                 subscribeResponse,
                 report,
@@ -1030,7 +1033,7 @@ export class InteractionClient {
             report: DataReport;
             maximumPeerResponseTimeMs: number;
         }>(async messenger => {
-            const { subscribeResponse, report } = await messenger.sendSubscribeRequest({
+            await messenger.sendSubscribeRequest({
                 interactionModelRevision: Specification.INTERACTION_MODEL_REVISION,
                 attributeRequests,
                 eventRequests,
@@ -1044,6 +1047,7 @@ export class InteractionClient {
                     dataVersion,
                 })),
             });
+            const { subscribeResponse, report } = await messenger.readAggregateSubscribeResponse();
             return {
                 subscribeResponse,
                 report,

package/src/interaction/InteractionMessenger.ts

@@ -848,6 +848,14 @@ export class IncomingInteractionClientMessenger extends InteractionMessenger {
         return result;
     }
 
+    /**
+     * Read a single data report.
+     */
+    async readDataReport() {
+        const dataReportMessage = await this.waitFor("DataReport", MessageType.ReportData);
+        return TlvDataReport.decode(dataReportMessage.payload);
+    }
+
     /**
      * Read data reports as they come in on the wire.
      *
@@ -855,8 +863,7 @@ export class IncomingInteractionClientMessenger extends InteractionMessenger {
      */
     async *readDataReports() {
         while (true) {
-            const dataReportMessage = await this.waitFor("DataReport", MessageType.ReportData);
-            const report = TlvDataReport.decode(dataReportMessage.payload);
+            const report = await this.readDataReport();
 
             yield report;
 
@@ -895,16 +902,16 @@ export class IncomingInteractionClientMessenger extends InteractionMessenger {
 }
 
 export class InteractionClientMessenger extends IncomingInteractionClientMessenger {
+    #exchangeProvider: ExchangeProvider;
+
     static async create(exchangeProvider: ExchangeProvider) {
         const exchange = await exchangeProvider.initiateExchange();
         return new this(exchange, exchangeProvider);
     }
 
-    constructor(
-        exchange: MessageExchange,
-        private readonly exchangeProvider: ExchangeProvider,
-    ) {
+    constructor(exchange: MessageExchange, exchangeProvider: ExchangeProvider) {
         super(exchange);
+        this.#exchangeProvider = exchangeProvider;
     }
 
     /** Implements a send method with an automatic reconnection mechanism */
@@ -917,7 +924,7 @@ export class InteractionClientMessenger extends IncomingInteractionClientMesseng
             return await this.exchange.send(messageType, payload, options);
         } catch (error) {
             if (
-                this.exchangeProvider.supportsReconnect &&
+                this.#exchangeProvider.supportsReconnect &&
                 (error instanceof RetransmissionLimitReachedError || error instanceof ChannelNotConnectedError) &&
                 !options?.multipleMessageInteraction
             ) {
@@ -927,8 +934,8 @@ export class InteractionClientMessenger extends IncomingInteractionClientMesseng
                     `${error instanceof RetransmissionLimitReachedError ? "Retransmission limit reached" : "Channel not connected"}, trying to reconnect and resend the message.`,
                 );
                 await this.exchange.close();
-                if (await this.exchangeProvider.reconnectChannel()) {
-                    this.exchange = await this.exchangeProvider.initiateExchange();
+                if (await this.#exchangeProvider.reconnectChannel()) {
+                    this.exchange = await this.#exchangeProvider.initiateExchange();
                     return await this.exchange.send(messageType, payload, options);
                 }
             } else {
@@ -939,8 +946,6 @@ export class InteractionClientMessenger extends IncomingInteractionClientMesseng
 
     async sendReadRequest(readRequest: ReadRequest) {
         await this.send(MessageType.ReadRequest, this.#encodeReadingRequest(TlvReadRequest, readRequest));
-
-        return this.readAggregateDataReport();
     }
 
     #encodeReadingRequest<T extends TlvSchema<any>>(schema: T, request: TypeFromSchema<T>) {
@@ -1000,7 +1005,9 @@ export class InteractionClientMessenger extends IncomingInteractionClientMesseng
     async sendSubscribeRequest(subscribeRequest: SubscribeRequest) {
         const request = this.#encodeReadingRequest(TlvSubscribeRequest, subscribeRequest);
         await this.send(MessageType.SubscribeRequest, request);
+    }
 
+    async readAggregateSubscribeResponse() {
         const report = await this.readAggregateDataReport();
         const { subscriptionId } = report;
 

package/src/mdns/MdnsScanner.ts

@@ -96,13 +96,12 @@ const START_ANNOUNCE_INTERVAL_SECONDS = 1.5;
 /**
  * Interface to add criteria for MDNS discovery a node is interested in
  *
- * This interface is used to define criteria for mDNS scanner targets.
- * It includes the information if commissionable devices are relevant for the target
- * and a list of operational targets. Operational targets can consist of operational IDs
- * and optional node IDs.
+ * This interface is used to define criteria for mDNS scanner targets. It includes the information if commissionable
+ * devices are relevant for the target and a list of operational targets. Operational targets can consist of operational
+ * IDs and optional node IDs.
  *
- * When no commissionable devices are relevant and no operational targets are defined, it is
- * not required to add a criteria to the scanner.
+ * When no commissionable devices are relevant and no operational targets are defined, it is not required to add a
+ * criteria to the scanner.
  */
 export interface MdnsScannerTargetCriteria {
     /** Are commissionable MDNS records relevant? */

package/src/protocol/DeviceCommissioner.ts

@@ -162,9 +162,7 @@ export class DeviceCommissioner {
         );
     }
 
-    async beginTimed(failsafeContext: FailsafeContext) {
-        await failsafeContext.construction;
-
+    beginTimed(failsafeContext: FailsafeContext) {
         this.#failsafeContext = failsafeContext;
 
         this.#context.fabrics.events.added.on(fabric => {
@@ -246,10 +244,7 @@ export class DeviceCommissioner {
         this.#activeDiscriminator = discriminator;
 
         // MDNS is sent in parallel
-        // TODO - untracked promise
-        this.#enterCommissioningMode(windowStatus, discriminator).catch(error =>
-            logger.warn("Error sending announcement:", error),
-        );
+        await this.#enterCommissioningMode(windowStatus, discriminator);
     }
 
     async endCommissioning() {

package/src/securechannel/SecureChannelMessenger.ts

@@ -60,6 +60,7 @@ export class SecureChannelMessenger {
 
     /**
      * Waits for the next message and returns it.
+     *
      * When no expectedProcessingTimeMs is provided, the default value of EXPECTED_CRYPTO_PROCESSING_TIME_MS is used.
      */
     async #nextMessage(
@@ -82,6 +83,7 @@ export class SecureChannelMessenger {
 
     /**
      * Waits for the next message and decodes it.
+     *
      * When no expectedProcessingTimeMs is provided, the default value of EXPECTED_CRYPTO_PROCESSING_TIME_MS is used.
      */
     async nextMessageDecoded<T>(
@@ -94,6 +96,7 @@ export class SecureChannelMessenger {
 
     /**
      * Waits for the next message and returns it.
+     *
      * When no expectedProcessingTimeMs is provided, the default value of EXPECTED_CRYPTO_PROCESSING_TIME_MS is used.
      */
     async waitForSuccess(
@@ -106,6 +109,7 @@ export class SecureChannelMessenger {
 
     /**
      * Sends a message of the given type with the given payload.
+     *
      * If no ExchangeSendOptions are provided, the expectedProcessingTimeMs will be set to
      * EXPECTED_CRYPTO_PROCESSING_TIME_MS.
      */