@matter/protocol 0.13.0-alpha.0-20250322-f085fa576 → 0.13.0-alpha.0-20250324-d7b7d9731

package/src/certificate/CertificateManager.ts

@@ -15,6 +15,7 @@ import {
     DerKey,
     DerObject,
     DerType,
+    Diagnostic,
     ImplementationError,
     Key,
     Logger,
@@ -788,13 +789,13 @@ export namespace CertificateManager {
         if (rootCert.subject.fabricId !== undefined) {
             if (Array.isArray(rootCert.subject.fabricId)) {
                 throw new CertificateError(
-                    `Invalid fabricId in NoC certificate: ${Logger.toJSON(rootCert.subject.fabricId)}`,
+                    `Invalid fabricId in NoC certificate: ${Diagnostic.json(rootCert.subject.fabricId)}`,
                 );
             }
             // If present, the matter-fabric-id attribute’s value SHALL NOT be 0
             if (rootCert.subject.fabricId === FabricId(0)) {
                 throw new CertificateError(
-                    `Invalid fabricId in NoC certificate: ${Logger.toJSON(rootCert.subject.fabricId)}`,
+                    `Invalid fabricId in NoC certificate: ${Diagnostic.json(rootCert.subject.fabricId)}`,
                 );
             }
         }
@@ -806,7 +807,9 @@ export namespace CertificateManager {
 
         // The subject DN SHALL encode exactly one matter-rcac-id attribute.
         if (rootCert.subject.rcacId === undefined || Array.isArray(rootCert.subject.rcacId)) {
-            throw new CertificateError(`Invalid rcacId in Root certificate: ${Logger.toJSON(rootCert.subject.rcacId)}`);
+            throw new CertificateError(
+                `Invalid rcacId in Root certificate: ${Diagnostic.json(rootCert.subject.rcacId)}`,
+            );
         }
 
         // The subject DN SHALL NOT encode any matter-noc-cat attribute.
@@ -874,23 +877,23 @@ export namespace CertificateManager {
 
         // The subject DN SHALL encode exactly one matter-node-id attribute.
         if (nocCert.subject.nodeId === undefined || Array.isArray(nocCert.subject.nodeId)) {
-            throw new CertificateError(`Invalid nodeId in NoC certificate: ${Logger.toJSON(nocCert.subject.nodeId)}`);
+            throw new CertificateError(`Invalid nodeId in NoC certificate: ${Diagnostic.json(nocCert.subject.nodeId)}`);
         }
         // The matter-node-id attribute’s value SHALL be in the Operational Node ID
         if (!NodeId.isOperationalNodeId(nocCert.subject.nodeId)) {
-            throw new CertificateError(`Invalid nodeId in NoC certificate: ${Logger.toJSON(nocCert.subject.nodeId)}`);
+            throw new CertificateError(`Invalid nodeId in NoC certificate: ${Diagnostic.json(nocCert.subject.nodeId)}`);
         }
 
         // The subject DN SHALL encode exactly one matter-fabric-id attribute.
         if (nocCert.subject.fabricId === undefined || Array.isArray(nocCert.subject.fabricId)) {
             throw new CertificateError(
-                `Invalid fabricId in NoC certificate: ${Logger.toJSON(nocCert.subject.fabricId)}`,
+                `Invalid fabricId in NoC certificate: ${Diagnostic.json(nocCert.subject.fabricId)}`,
             );
         }
         // The matter-fabric-id attribute’s value SHALL NOT be 0
         if (nocCert.subject.fabricId === FabricId(0)) {
             throw new CertificateError(
-                `Invalid fabricId in NoC certificate: ${Logger.toJSON(nocCert.subject.fabricId)}`,
+                `Invalid fabricId in NoC certificate: ${Diagnostic.json(nocCert.subject.fabricId)}`,
             );
         }
 
@@ -914,9 +917,9 @@ export namespace CertificateManager {
         // the same certificate chain.
         if (rootCert.subject.fabricId !== undefined && rootCert.subject.fabricId !== nocCert.subject.fabricId) {
             throw new CertificateError(
-                `FabricId in NoC certificate does not match the fabricId in the parent certificate. ${Logger.toJSON(
+                `FabricId in NoC certificate does not match the fabricId in the parent certificate. ${Diagnostic.json(
                     rootCert.subject.fabricId,
-                )} !== ${Logger.toJSON(nocCert.subject.fabricId)}`,
+                )} !== ${Diagnostic.json(nocCert.subject.fabricId)}`,
             );
         }
         if (
@@ -925,9 +928,9 @@ export namespace CertificateManager {
             icaCert.subject.fabricId !== nocCert.subject.fabricId
         ) {
             throw new CertificateError(
-                `FabricId in NoC certificate does not match the fabricId in the parent certificate. ${Logger.toJSON(
+                `FabricId in NoC certificate does not match the fabricId in the parent certificate. ${Diagnostic.json(
                     icaCert.subject.fabricId,
-                )} !== ${Logger.toJSON(nocCert.subject.fabricId)}`,
+                )} !== ${Diagnostic.json(nocCert.subject.fabricId)}`,
             );
         }
 
@@ -950,7 +953,7 @@ export namespace CertificateManager {
             (!nocCert.extensions.extendedKeyUsage.includes(1) && !nocCert.extensions.extendedKeyUsage.includes(2))
         ) {
             throw new CertificateError(
-                `Noc certificate must have extendedKeyUsage with serverAuth and clientAuth: ${Logger.toJSON(nocCert.extensions.extendedKeyUsage)}`,
+                `Noc certificate must have extendedKeyUsage with serverAuth and clientAuth: ${Diagnostic.json(nocCert.extensions.extendedKeyUsage)}`,
             );
         }
 
@@ -1005,20 +1008,20 @@ export namespace CertificateManager {
         if (icaCert.subject.fabricId !== undefined) {
             if (Array.isArray(icaCert.subject.fabricId)) {
                 throw new CertificateError(
-                    `Invalid fabricId in NoC certificate: ${Logger.toJSON(icaCert.subject.fabricId)}`,
+                    `Invalid fabricId in NoC certificate: ${Diagnostic.json(icaCert.subject.fabricId)}`,
                 );
             }
             // If present, the matter-fabric-id attribute’s value SHALL NOT be 0
             if (icaCert.subject.fabricId === FabricId(0)) {
                 throw new CertificateError(
-                    `Invalid fabricId in NoC certificate: ${Logger.toJSON(icaCert.subject.fabricId)}`,
+                    `Invalid fabricId in NoC certificate: ${Diagnostic.json(icaCert.subject.fabricId)}`,
                 );
             }
         }
 
         // The subject DN SHALL encode exactly one matter-icac-id attribute.
         if (icaCert.subject.icacId === undefined || Array.isArray(icaCert.subject.icacId)) {
-            throw new CertificateError(`Invalid icacId in Ica certificate: ${Logger.toJSON(icaCert.subject.icacId)}`);
+            throw new CertificateError(`Invalid icacId in Ica certificate: ${Diagnostic.json(icaCert.subject.icacId)}`);
         }
 
         // The subject DN SHALL NOT encode any matter-rcac-id attribute.
@@ -1041,18 +1044,18 @@ export namespace CertificateManager {
             rootCert.subject.fabricId !== icaCert.subject.fabricId
         ) {
             throw new CertificateError(
-                `FabricId in Ica certificate does not match the fabricId in the parent certificate. ${Logger.toJSON(
+                `FabricId in Ica certificate does not match the fabricId in the parent certificate. ${Diagnostic.json(
                     rootCert.subject.fabricId,
-                )} !== ${Logger.toJSON(icaCert.subject.fabricId)}`,
+                )} !== ${Diagnostic.json(icaCert.subject.fabricId)}`,
             );
         }
 
         // Verify the certificate chain by checking rcac ids in subject and issuer
         if (rootCert.subject.rcacId !== icaCert.issuer.rcacId) {
             throw new CertificateError(
-                `RcacId in Ica certificate does not match the rcacId in the parent certificate. ${Logger.toJSON(
+                `RcacId in Ica certificate does not match the rcacId in the parent certificate. ${Diagnostic.json(
                     rootCert.subject.rcacId,
-                )} !== ${Logger.toJSON(icaCert.issuer.rcacId)}`,
+                )} !== ${Diagnostic.json(icaCert.issuer.rcacId)}`,
             );
         }
 

package/src/cluster/client/AttributeClient.ts

@@ -106,37 +106,47 @@ export class AttributeClient<T = any> {
         });
     }
 
-    /** Get the value of the attribute. Fabric scoped reads are always done with the remote. */
-    async get(alwaysRequestFromRemote?: boolean, isFabricFiltered = true) {
-        if (alwaysRequestFromRemote === undefined) {
-            alwaysRequestFromRemote = this.#isFabricScoped || !this.#updatedBySubscriptions;
-        } else if (!alwaysRequestFromRemote && this.#isFabricScoped) {
-            alwaysRequestFromRemote = true;
+    /**
+     * Get the value of the attribute. Fabric scoped reads are always done with the remote.
+     * The `requestFromRemote` parameter allowed to force or prevent remote reads:
+     * - `true` forces a remote read
+     * - `false` forces a local read, return undefined if no value is available
+     * - `undefined` returns local values if available or if the read is fabric filtered, otherwise remote read
+     */
+    async get(requestFromRemote?: boolean, isFabricFiltered = true) {
+        if (requestFromRemote === undefined) {
+            requestFromRemote = this.#isFabricScoped || !this.#updatedBySubscriptions ? true : undefined;
+        } else if (!requestFromRemote && this.#isFabricScoped) {
+            requestFromRemote = true;
         }
         return await this.#interactionClient.getAttribute({
             endpointId: this.endpointId,
             clusterId: this.clusterId,
             attribute: this.attribute,
             isFabricFiltered,
-            alwaysRequestFromRemote,
+            requestFromRemote,
         });
     }
 
     /**
      * Get the value with version of the attribute. Fabric scoped reads are always done with the remote.
-     * */
-    async getWithVersion(alwaysRequestFromRemote?: boolean, isFabricFiltered = true) {
-        if (alwaysRequestFromRemote === undefined) {
-            alwaysRequestFromRemote = this.#isFabricScoped;
-        } else if (!alwaysRequestFromRemote && this.#isFabricScoped) {
-            alwaysRequestFromRemote = true;
+     * The `requestFromRemote` parameter allowed to force or prevent remote reads:
+     * - `true` forces a remote read
+     * - `false` forces a local read, return undefined if no value is available
+     * - `undefined` returns local values if available or if the read is fabric filtered, otherwise remote read
+     */
+    async getWithVersion(requestFromRemote?: boolean, isFabricFiltered = true) {
+        if (requestFromRemote === undefined) {
+            requestFromRemote = this.#isFabricScoped || !this.#updatedBySubscriptions ? true : undefined;
+        } else if (!requestFromRemote && this.#isFabricScoped) {
+            requestFromRemote = true;
         }
         return await this.#interactionClient.getAttributeWithVersion({
             endpointId: this.endpointId,
             clusterId: this.clusterId,
             attribute: this.attribute,
             isFabricFiltered,
-            alwaysRequestFromRemote,
+            requestFromRemote,
         });
     }
 

package/src/cluster/server/AttributeServer.ts

@@ -4,7 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ImplementationError, InternalError, Logger, MatterError, MaybePromise, camelize, isDeepEqual } from "#general";
+import {
+    Diagnostic,
+    ImplementationError,
+    InternalError,
+    Logger,
+    MatterError,
+    MaybePromise,
+    camelize,
+    isDeepEqual,
+} from "#general";
 import { AccessLevel, AttributeModel, ClusterModel, DatatypeModel, FabricIndex, MatterModel } from "#model";
 import {
     Attribute,
@@ -165,9 +174,9 @@ export abstract class BaseAttributeServer<T> {
             this.value = initValue;
         } catch (error) {
             logger.warn(
-                `Attribute value to initialize for ${name} has an invalid value ${Logger.toJSON(
+                `Attribute value to initialize for ${name} has an invalid value ${Diagnostic.json(
                     initValue,
-                )}. Restore to default ${Logger.toJSON(defaultValue)}`,
+                )}. Restore to default ${Diagnostic.json(defaultValue)}`,
             );
             if (defaultValue === undefined) {
                 throw new ImplementationError(`Attribute value to initialize for ${name} cannot be undefined.`);
@@ -524,7 +533,7 @@ export class AttributeServer<T> extends FixedAttributeServer<T> {
                 newValue: value,
                 changed: !!this.delayedChangeData?.changed || valueChanged, // We combine the changed flag
             };
-            logger.info(`Delay change for attribute "${this.name}" with value ${Logger.toJSON(value)}`);
+            logger.info(`Delay change for attribute "${this.name}" with value ${Diagnostic.json(value)}`);
         } else {
             this.handleVersionAndTriggerListeners(value, oldValue, valueChanged);
         }
@@ -534,7 +543,7 @@ export class AttributeServer<T> extends FixedAttributeServer<T> {
         if (this.delayedChangeData !== undefined) {
             const { oldValue, newValue, changed } = this.delayedChangeData;
             this.delayedChangeData = undefined;
-            logger.info(`Trigger delayed change for attribute "${this.name}" with value ${Logger.toJSON(newValue)}`);
+            logger.info(`Trigger delayed change for attribute "${this.name}" with value ${Diagnostic.json(newValue)}`);
             this.handleVersionAndTriggerListeners(newValue, oldValue, changed);
         }
     }
@@ -909,7 +918,7 @@ export class FabricScopedAttributeServer<T> extends AttributeServer<T> {
             () => !preserveFabricIndex, // No one should send any index and if we simply SHALL ignore it,  but internally we might need it
         );
         logger.info(
-            `Set remote value for fabric scoped attribute "${this.name}" to ${Logger.toJSON(value)} (delayed=${delayChangeEvents})`,
+            `Set remote value for fabric scoped attribute "${this.name}" to ${Diagnostic.json(value)} (delayed=${delayChangeEvents})`,
         );
 
         super.setRemote(value, session, message, delayChangeEvents);

package/src/cluster/server/CommandServer.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Logger } from "#general";
+import { Diagnostic, Logger } from "#general";
 import { AccessLevel, FabricIndex } from "#model";
 import { CommandId, StatusCode, TlvSchema, TlvStream } from "#types";
 import { Message } from "../../codec/MessageCodec.js";
@@ -69,9 +69,9 @@ export class CommandServer<RequestT = any, ResponseT = any> {
         }
 
         this.requestSchema.validate(request);
-        this.debug(`Invoke ${this.name} with data ${Logger.toJSON(request)}`);
+        this.debug(`Invoke ${this.name} with data ${Diagnostic.json(request)}`);
         const response = await this.handler(request, session, message, endpoint);
-        this.debug(`Invoke ${this.name} response : ${Logger.toJSON(response)}`);
+        this.debug(`Invoke ${this.name} response : ${Diagnostic.json(response)}`);
         return {
             code: StatusCode.Success,
             responseId: this.responseId,

package/src/endpoint/EndpointStructureLogger.ts

@@ -52,7 +52,7 @@ function getAttributeServerValue(attribute: AnyAttributeServer<any>, options: En
             attributeValue !== null &&
             options.logAttributeObjectValues !== false
         ) {
-            value = Logger.toJSON(attributeValue);
+            value = Diagnostic.json(attributeValue);
         }
     } catch (error) {
         if (error instanceof FabricScopeError) {

package/src/events/OccurrenceManager.ts

@@ -7,6 +7,7 @@
 import {
     asyncNew,
     Construction,
+    Diagnostic,
     ImplementationError,
     isObject,
     Logger,
@@ -151,7 +152,7 @@ export class OccurrenceManager {
 
         // TODO - log after fabric filtering and include fabric filter in log message?
         logger.debug(
-            `Got ${occurrences.length} events for ${resolveEventName(eventPath)} with filters: ${Logger.toJSON(filters)}`,
+            `Got ${occurrences.length} events for ${resolveEventName(eventPath)} with filters: ${Diagnostic.json(filters)}`,
         );
 
         // Convert from MaybePromise[] to MaybePromise<[]>
@@ -210,7 +211,7 @@ export class OccurrenceManager {
 
     add(occurrence: Occurrence): MaybePromise<NumberedOccurrence> {
         return MaybePromise.then(this.#store.add(occurrence), entry => {
-            logger.debug(`Recorded event #${entry.number}: ${Logger.toJSON(occurrence)}`);
+            logger.debug(`Recorded event #${entry.number}: ${Diagnostic.json(occurrence)}`);
             this.#occurrences[occurrence.priority].push(entry);
             this.#storedEventCount++;
             if (this.#storedEventCount > this.#bufferConfig.maxEventAllowance) {

package/src/interaction/AttributeDataDecoder.ts

@@ -107,7 +107,7 @@ export function expandPathsInAttributeData(
                 dataVersion: value.dataVersion,
             };
         } else if (!acceptWildcardPaths) {
-            throw new UnexpectedDataError("Tag compression disabled, but path is incomplete: " + Logger.toJSON(path));
+            throw new UnexpectedDataError("Tag compression disabled, but path is incomplete: " + Diagnostic.json(path));
         }
     });
     return data;

package/src/interaction/AttributeDataEncoder.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Logger, MatterFlowError } from "#general";
+import { Diagnostic, MatterFlowError } from "#general";
 import {
     ArraySchema,
     AttributeId,
@@ -77,7 +77,7 @@ export function encodeAttributePayloadData(
     const { attributeData } = attributePayload;
     if (attributeData === undefined) {
         throw new MatterFlowError(
-            `Cannot encode Attribute Payload data with just a attributeStatus: ${Logger.toJSON(attributePayload)}`,
+            `Cannot encode Attribute Payload data with just a attributeStatus: ${Diagnostic.json(attributePayload)}`,
         );
     }
 
@@ -152,13 +152,13 @@ export function chunkAttributePayload(attributePayload: AttributeReportPayload):
     const { hasFabricSensitiveData, attributeData } = attributePayload;
     if (attributeData === undefined) {
         throw new MatterFlowError(
-            `Cannot chunk an AttributePayload with just a attributeStatus: ${Logger.toJSON(attributePayload)}`,
+            `Cannot chunk an AttributePayload with just a attributeStatus: ${Diagnostic.json(attributePayload)}`,
         );
     }
     const { schema, path, dataVersion, payload } = attributeData;
     if (!(schema instanceof ArraySchema) || !Array.isArray(payload)) {
         throw new MatterFlowError(
-            `Cannot chunk an AttributePayload with attributeData that is not an array: ${Logger.toJSON(
+            `Cannot chunk an AttributePayload with attributeData that is not an array: ${Diagnostic.json(
                 attributePayload,
             )}`,
         );

package/src/interaction/InteractionClient.ts

@@ -5,6 +5,7 @@
  */
 
 import {
+    Diagnostic,
     Environment,
     Environmental,
     ImplementationError,
@@ -376,13 +377,13 @@ export class InteractionClient {
         clusterId: ClusterId;
         attribute: A;
         isFabricFiltered?: boolean;
-        alwaysRequestFromRemote?: boolean;
+        requestFromRemote?: boolean;
         executeQueued?: boolean;
     }): Promise<AttributeJsType<A> | undefined> {
-        const { alwaysRequestFromRemote = false } = options;
+        const { requestFromRemote } = options;
         const response = await this.getAttributeWithVersion({
             ...options,
-            alwaysRequestFromRemote,
+            requestFromRemote,
         });
         return response?.value;
     }
@@ -392,22 +393,20 @@ export class InteractionClient {
         clusterId: ClusterId;
         attribute: A;
         isFabricFiltered?: boolean;
-        alwaysRequestFromRemote?: boolean;
+        requestFromRemote?: boolean;
         executeQueued?: boolean;
     }): Promise<{ value: AttributeJsType<A>; version: number } | undefined> {
-        const {
-            endpointId,
-            clusterId,
-            attribute,
-            alwaysRequestFromRemote = false,
-            isFabricFiltered,
-            executeQueued,
-        } = options;
+        const { endpointId, clusterId, attribute, requestFromRemote, isFabricFiltered, executeQueued } = options;
         const { id: attributeId } = attribute;
-        if (!alwaysRequestFromRemote && this.#nodeStore !== undefined) {
-            const { value, version } = this.#nodeStore.retrieveAttribute(endpointId, clusterId, attributeId) ?? {};
-            if (value !== undefined && version !== undefined) {
-                return { value, version } as { value: AttributeJsType<A>; version: number };
+        if (this.#nodeStore !== undefined) {
+            if (!requestFromRemote) {
+                const { value, version } = this.#nodeStore.retrieveAttribute(endpointId, clusterId, attributeId) ?? {};
+                if (value !== undefined && version !== undefined) {
+                    return { value, version } as { value: AttributeJsType<A>; version: number };
+                }
+            }
+            if (requestFromRemote === false) {
+                return undefined;
             }
         }
 
@@ -549,7 +548,7 @@ export class InteractionClient {
             `Sending write request: ${attributes
                 .map(
                     ({ endpointId, clusterId, attribute: { id }, value, dataVersion }) =>
-                        `${resolveAttributeName({ endpointId, clusterId, attributeId: id })} = ${Logger.toJSON(
+                        `${resolveAttributeName({ endpointId, clusterId, attributeId: id })} = ${Diagnostic.json(
                             value,
                         )} (version=${dataVersion})`,
                 )
@@ -973,7 +972,7 @@ export class InteractionClient {
                 let maxEventNumber = this.#nodeStore?.maxEventNumber ?? eventReports[0].events[0].eventNumber;
                 eventReports.forEach(data => {
                     logger.debug(
-                        `Received event update: ${resolveEventName(data.path)}: ${Logger.toJSON(data.events)}`,
+                        `Received event update: ${resolveEventName(data.path)}: ${Diagnostic.json(data.events)}`,
                     );
                     const { events } = data;
 
@@ -1001,7 +1000,7 @@ export class InteractionClient {
                             endpointId,
                             clusterId,
                             attributeId,
-                        })} = ${Logger.toJSON(value)} (version=${version})`,
+                        })} = ${Diagnostic.json(value)} (version=${version})`,
                     );
                     if (value === undefined) throw new MatterFlowError("Received empty subscription result value.");
                     const { value: oldValue } =
@@ -1091,7 +1090,7 @@ export class InteractionClient {
                 endpointId,
                 clusterId,
                 commandId: requestId,
-            })} with ${Logger.toJSON(request)}`,
+            })} with ${Diagnostic.json(request)}`,
         );
 
         if (!skipValidation) {
@@ -1160,7 +1159,7 @@ export class InteractionClient {
                     endpointId,
                     clusterId,
                     commandId: requestId,
-                })} with ${Logger.toJSON(response)})}`,
+                })} with ${Diagnostic.json(response)})}`,
             );
             return response;
         }
@@ -1196,7 +1195,7 @@ export class InteractionClient {
                 endpointId,
                 clusterId,
                 commandId: requestId,
-            })} with ${Logger.toJSON(request)}`,
+            })} with ${Diagnostic.json(request)}`,
         );
         const commandFields = requestSchema.encodeTlv(request);
 

package/src/interaction/InteractionMessenger.ts

@@ -633,7 +633,7 @@ export class InteractionServerMessenger extends InteractionMessenger {
         const encodedMessage = TlvDataReportForSend.encode(dataReportToSend);
         if (encodedMessage.length > this.exchange.maxPayloadSize) {
             throw new MatterFlowError(
-                `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(
+                `DataReport with ${encodedMessage.length}bytes is too long to fit in a single chunk (${this.exchange.maxPayloadSize}bytes), This should not happen! Data: ${Diagnostic.json(
                     dataReportToSend,
                 )}`,
             );
@@ -856,7 +856,7 @@ export class InteractionClientMessenger extends IncomingInteractionClientMesseng
         });
         if (requestWithoutDataVersionFilters.length > this.exchange.maxPayloadSize) {
             throw new MatterFlowError(
-                `Request is too long to fit in a single chunk, This should not happen! Data: ${Logger.toJSON(request)}`,
+                `Request is too long to fit in a single chunk, This should not happen! Data: ${Diagnostic.json(request)}`,
             );
         }
 

package/src/interaction/InteractionServer.ts

@@ -365,7 +365,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
                         logger.debug(
                             `Read event from ${exchange.channel.name}: ${this.#endpointStructure.resolveEventName(
                                 path,
-                            )}=${Logger.toJSON(matchingEvents)}`,
+                            )}=${Diagnostic.json(matchingEvents)}`,
                         );
                         const { schema } = event;
                         reportsForPath.push(
@@ -523,7 +523,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
                         logger.debug(
                             `Read attribute from ${exchange.channel.name}: ${this.#endpointStructure.resolveAttributeName(
                                 path,
-                            )}=${Logger.toJSON(value)} (version=${version}) ignored because of dataVersionFilter`,
+                            )}=${Diagnostic.json(value)} (version=${version}) ignored because of dataVersionFilter`,
                         );
                         continue;
                     }
@@ -531,7 +531,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
                     logger.debug(
                         `Read attribute from ${exchange.channel.name}: ${this.#endpointStructure.resolveAttributeName(
                             path,
-                        )}=${Logger.toJSON(value)} (version=${version})`,
+                        )}=${Diagnostic.json(value)} (version=${version})`,
                     );
 
                     const { schema } = attribute;
@@ -878,7 +878,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
                     logger.debug(
                         `Handle write request from ${
                             exchange.channel.name
-                        } resolved to: ${this.#endpointStructure.resolveAttributeName(path)}=${Logger.toJSON(
+                        } resolved to: ${this.#endpointStructure.resolveAttributeName(path)}=${Diagnostic.json(
                             value,
                         )} (listIndex=${listIndex}, for-version=${dataVersion})`,
                     );
@@ -960,7 +960,7 @@ export class InteractionServer implements ProtocolHandler, InteractionRecipient
                     ? `with following errors: ${errorResults
                           .map(
                               ({ path, statusCode }) =>
-                                  `${this.#endpointStructure.resolveAttributeName(path)}=${Logger.toJSON(statusCode)}`,
+                                  `${this.#endpointStructure.resolveAttributeName(path)}=${Diagnostic.json(statusCode)}`,
                           )
                           .join(", ")}`
                     : "without errors"

package/src/interaction/ServerSubscription.ts

@@ -6,6 +6,7 @@
 
 import { NumberedOccurrence } from "#events/Occurrence.js";
 import {
+    Diagnostic,
     InternalError,
     Logger,
     MatterAggregateError,
@@ -989,7 +990,7 @@ export class ServerSubscription extends Subscription {
                 `Subscription attribute changes for ID ${this.id}: ${attributes
                     .map(
                         ({ path, value, version }) =>
-                            `${this.#structure.resolveAttributeName(path)}=${Logger.toJSON(value)} (${version})`,
+                            `${this.#structure.resolveAttributeName(path)}=${Diagnostic.json(value)} (${version})`,
                     )
                     .join(", ")}`,
             ); // TODO Format path better using endpoint structure

package/src/mdns/MdnsScanner.ts

@@ -213,7 +213,7 @@ export class MdnsScanner implements Scanner {
                     if (dnsMessageDataToSend.answers.length === 0) {
                         // The first answer is already too big, log at least a warning
                         logger.warn(
-                            `MDNS Query with ${Logger.toJSON(
+                            `MDNS Query with ${Diagnostic.json(
                                 queries,
                             )} is too big to fit into a single MDNS message. Send anyway, but please report!`,
                         );
@@ -265,7 +265,7 @@ export class MdnsScanner implements Scanner {
             answers = this.#combineStructuredAnswers(activeExistingQuery.answers, answers);
         }
         this.#activeAnnounceQueries.set(queryId, { queries, answers });
-        logger.debug(`Set ${queries.length} query records for query ${queryId}: ${Logger.toJSON(queries)}`);
+        logger.debug(`Set ${queries.length} query records for query ${queryId}: ${Diagnostic.json(queries)}`);
         this.#queryTimer?.stop();
         this.#nextAnnounceIntervalSeconds = START_ANNOUNCE_INTERVAL_SECONDS; // Reset query interval
         this.#queryTimer = Time.getTimer("MDNS discovery", 0, () => this.#sendQueries()).start();

package/src/peer/ControllerCommissioner.ts

@@ -12,6 +12,7 @@ import {
     Channel,
     ChannelType,
     ClassExtends,
+    Diagnostic,
     Environment,
     Environmental,
     isIPv6,
@@ -220,9 +221,9 @@ export class ControllerCommissioner {
         const scannersToUse = this.#context.scanners.select(discoveryCapabilities);
 
         logger.info(
-            `Connecting to device with identifier ${Logger.toJSON(identifierData)} and ${
+            `Connecting to device with identifier ${Diagnostic.json(identifierData)} and ${
                 scannersToUse.length
-            } scanners and knownAddress ${Logger.toJSON(knownAddress)}`,
+            } scanners and knownAddress ${Diagnostic.json(knownAddress)}`,
         );
 
         // If we have a known address we try this first before we discover the device