@matter/protocol 0.16.0-alpha.0-20250817-1b000357c → 0.16.0-alpha.0-20250820-24939dd26

package/src/advertisement/ble/BleAdvertiser.ts

@@ -5,9 +5,9 @@
  */
 
 import { BlePeripheralInterface } from "#ble/Ble.js";
-import { Bytes, ImplementationError } from "#general";
+import { Bytes, Duration, ImplementationError, Millis } from "#general";
 import { DatatypeModel, FieldElement } from "#model";
-import { MAXIMUM_COMMISSIONING_TIMEOUT_S } from "#types";
+import { MAXIMUM_COMMISSIONING_TIMEOUT } from "#types";
 import { Advertisement } from "../Advertisement.js";
 import { Advertiser } from "../Advertiser.js";
 import { CommissioningMode } from "../CommissioningMode.js";
@@ -66,38 +66,38 @@ export namespace BleAdvertiser {
         /**
          * Advertisement timeout.
          */
-        readonly timeout: number;
+        readonly timeout: Duration;
 
         /**
          * Transmission interval for first 30 seconds.
          *
          * Per core spec 5.4.2.5.3 should be 20-60ms.
          */
-        readonly earlyInterval: number;
+        readonly earlyInterval: Duration;
 
         /**
          * Transmission interval after first 30 seconds but before 15 minutes.
          *
          * Per core spec 5.4.2.5.3 should be 150-1285ms.
          */
-        readonly lateInterval: number;
+        readonly lateInterval: Duration;
 
         /**
          * Transmission interval after 15 minutes.
          *
          * Per core spec 5.4.2.5.3 should be ~1285ms.
          */
-        readonly extendedInterval: number;
+        readonly extendedInterval: Duration;
     }
 
     export interface Options extends Partial<Configuration> {}
 
     export function Configuration(options?: Options) {
         return {
-            timeout: MAXIMUM_COMMISSIONING_TIMEOUT_S,
-            earlyInterval: 20,
-            lateInterval: 150,
-            extendedInterval: 1285,
+            timeout: MAXIMUM_COMMISSIONING_TIMEOUT,
+            earlyInterval: Millis(20),
+            lateInterval: Millis(150),
+            extendedInterval: Millis(1285),
             ...options,
         };
     }

package/src/advertisement/mdns/MdnsAdvertisement.ts

@@ -8,7 +8,18 @@ import { Advertisement } from "#advertisement/Advertisement.js";
 import type { Advertiser } from "#advertisement/Advertiser.js";
 import type { ServiceDescription } from "#advertisement/ServiceDescription.js";
 import { SupportedTransportsSchema } from "#common/SupportedTransportsBitmap.js";
-import { AAAARecord, ARecord, DnsRecord, Logger, NetworkInterfaceDetails, SrvRecord, Time, TxtRecord } from "#general";
+import {
+    AAAARecord,
+    ARecord,
+    DnsRecord,
+    Duration,
+    Logger,
+    NetworkInterfaceDetails,
+    SrvRecord,
+    Time,
+    Timestamp,
+    TxtRecord,
+} from "#general";
 import type { MdnsServer } from "#mdns/MdnsServer.js";
 import { SessionIntervals } from "#session/SessionIntervals.js";
 import type { MdnsAdvertiser } from "./MdnsAdvertiser.js";
@@ -29,7 +40,7 @@ export abstract class MdnsAdvertisement<T extends ServiceDescription = ServiceDe
     qname: string;
 
     #isPrivacyMasked: boolean;
-    #stopAt?: number;
+    #stopAt?: Timestamp;
 
     constructor(advertiser: MdnsAdvertiser, qname: string, description: T) {
         description = {
@@ -51,12 +62,12 @@ export abstract class MdnsAdvertisement<T extends ServiceDescription = ServiceDe
         this.#stopAt = undefined;
         let number = 0;
         for (const retryInterval of this.advertiser.broadcastScheduleFor(this, event)) {
-            if (this.#stopAt !== undefined && this.#stopAt <= Time.nowMs()) {
+            if (this.#stopAt !== undefined && this.#stopAt <= Time.nowMs) {
                 break;
             }
 
             number++;
-            logger.debug("Broadcast", this.dict({ number, next: retryInterval }));
+            logger.debug("Broadcast", this.dict({ number, next: Duration.format(retryInterval) }));
             await this.broadcast();
             await context.sleep("MDNS repeat", retryInterval);
         }
@@ -78,7 +89,7 @@ export abstract class MdnsAdvertisement<T extends ServiceDescription = ServiceDe
      * Broadcast expiration announcement immediately.
      */
     async expire() {
-        logger.info("Unpublishing", this.dict({ time: this.duration }));
+        logger.info("Unpublishing", this.dict({ time: Duration.format(this.duration) }));
         await this.advertiser.server.expireAnnouncements(this.service);
     }
 
@@ -94,7 +105,7 @@ export abstract class MdnsAdvertisement<T extends ServiceDescription = ServiceDe
             return;
         }
 
-        this.#stopAt = Time.nowMs() + broadcastAfterConnection;
+        this.#stopAt = Timestamp(Time.nowMs + broadcastAfterConnection);
     }
 
     override serviceDisconnected() {
@@ -148,9 +159,9 @@ export abstract class MdnsAdvertisement<T extends ServiceDescription = ServiceDe
 
     get #txtValues() {
         const values: Record<string, unknown> = {
-            SII: this.description.idleIntervalMs /* Session Idle Interval */,
-            SAI: this.description.activeIntervalMs /* Session Active Interval */,
-            SAT: this.description.activeThresholdMs /* Session Active Threshold */,
+            SII: this.description.idleInterval /* Session Idle Interval */,
+            SAI: this.description.activeInterval /* Session Active Interval */,
+            SAT: this.description.activeThreshold /* Session Active Threshold */,
             ...this.txtValues,
         };
 

package/src/advertisement/mdns/MdnsAdvertiser.ts

@@ -6,10 +6,20 @@
 
 import { Advertiser } from "#advertisement/Advertiser.js";
 import { ServiceDescription } from "#advertisement/ServiceDescription.js";
-import { Bytes, Crypto, ImplementationError, InternalError, RetrySchedule, STANDARD_MATTER_PORT } from "#general";
+import {
+    Bytes,
+    Crypto,
+    Duration,
+    ImplementationError,
+    Instant,
+    InternalError,
+    RetrySchedule,
+    Seconds,
+    STANDARD_MATTER_PORT,
+} from "#general";
 import type { MdnsServer } from "#mdns/MdnsServer.js";
 import { DatatypeModel, FieldElement } from "#model";
-import { MAXIMUM_COMMISSIONING_TIMEOUT_S } from "#types";
+import { MAXIMUM_COMMISSIONING_TIMEOUT } from "#types";
 import { CommissionableMdnsAdvertisement } from "./CommissionableMdnsAdvertisement.js";
 import { CommissionerMdnsAdvertisement } from "./CommissionerMdnsAdvertisement.js";
 import type { MdnsAdvertisement } from "./MdnsAdvertisement.js";
@@ -188,7 +198,7 @@ export namespace MdnsAdvertiser {
          * Set to zero to terminate broadcast immediately after connection.  If undefined broadcasts will continue until
          * terminated by {@link timeout} or {@link maximumCount}.
          */
-        readonly broadcastAfterConnection?: number;
+        readonly broadcastAfterConnection?: Duration;
     }
 
     /**
@@ -196,23 +206,23 @@ export namespace MdnsAdvertiser {
      */
     export const DefaultBroadcastSchedule: BroadcastSchedule = {
         // Mandated by MDNS specification
-        initialInterval: 1_000,
+        initialInterval: Seconds.one,
 
         // Maximum commissioning timeout per Matter specification 5.4.2.3.1, although
-        timeout: MAXIMUM_COMMISSIONING_TIMEOUT_S * 1000,
+        timeout: MAXIMUM_COMMISSIONING_TIMEOUT,
 
         // Minimum per MDNS specification
         backoffFactor: 2,
 
         // Technically this may result in us emitting more than 8 packets which is the maximum per the MDNS
         // specification but extra packets will only come every 90 seconds
-        maximumInterval: 90_000,
+        maximumInterval: Seconds(90),
 
         // Not in any specification AFAIK but common sense to reduce thundering herd
         jitterFactor: 0.25,
 
         // Generally operational broadcast is unnecessary once an operational connection is established
-        broadcastAfterConnection: 0,
+        broadcastAfterConnection: Instant,
     };
 
     /**

package/src/ble/Ble.ts

@@ -4,7 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Bytes, Channel, ChannelType, MatterError, NetInterface, NoProviderError, TransportInterface } from "#general";
+import {
+    Bytes,
+    Channel,
+    ChannelType,
+    Duration,
+    MatterError,
+    NetInterface,
+    NoProviderError,
+    TransportInterface,
+} from "#general";
 import { Scanner } from "../common/Scanner.js";
 import { BLE_MAX_MATTER_PAYLOAD_SIZE } from "./BleConsts.js";
 
@@ -28,7 +37,7 @@ export abstract class Ble {
 }
 
 export interface BlePeripheralInterface extends TransportInterface {
-    advertise(advertiseData: Bytes, additionalAdvertisementData?: Bytes, intervalMs?: number): Promise<void>;
+    advertise(advertiseData: Bytes, additionalAdvertisementData?: Bytes, interval?: Duration): Promise<void>;
     stopAdvertising(): Promise<void>;
 }
 

package/src/ble/BleConsts.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MAX_UDP_MESSAGE_SIZE } from "#general";
+import { MAX_UDP_MESSAGE_SIZE, Millis, Seconds } from "#general";
 
 /** @see {@link MatterSpecification.v11.Core} § 4.17.3.2 */
 export const BLE_MATTER_SERVICE_UUID_SHORT = "fff6";
@@ -22,18 +22,18 @@ export const BTP_MAXIMUM_WINDOW_SIZE = 255; // Server maximum window size
  * The maximum amount of time after sending a BTP Session Handshake request to wait for a BTP Session Handshake response
  * before closing the connection.
  */
-export const BTP_CONN_RSP_TIMEOUT_MS = 5_000; // timer starts when receives handshake request & waits for a subscription request on c2
+export const BTP_CONN_RSP_TIMEOUT = Seconds(5); // timer starts when receives handshake request & waits for a subscription request on c2
 
 /** The maximum amount of time after receipt of a segment before a stand-alone ACK must be sent. */
-export const BTP_ACK_TIMEOUT_MS = 15_000; // timer in ms before ack should be sent for a segment
+export const BTP_ACK_TIMEOUT = Seconds(15); // timer in ms before ack should be sent for a segment
 
-export const BTP_SEND_ACK_TIMEOUT_MS = BTP_ACK_TIMEOUT_MS / 3; // timer starts when we receive a packet and stops when we sends its ack
+export const BTP_SEND_ACK_TIMEOUT = Millis(BTP_ACK_TIMEOUT / 3); // timer starts when we receive a packet and stops when we sends its ack
 
 /**
  * The maximum amount of time no unique data has been sent over a BTP session before the Central Device must close the
  * BTP session.
  */
-export const BTP_CONN_IDLE_TIMEOUT = 30_000;
+export const BTP_CONN_IDLE_TIMEOUT = Seconds(30);
 
 /**
  * The maximum message size that can be transported in a Matter message via BTP.

package/src/ble/BtpSessionHandler.ts

@@ -9,10 +9,10 @@ import { BtpCodec } from "../codec/BtpCodec.js";
 import {
     BLE_MAXIMUM_BTP_MTU,
     BLE_MINIMUM_ATT_MTU,
-    BTP_ACK_TIMEOUT_MS,
+    BTP_ACK_TIMEOUT,
     BTP_CONN_IDLE_TIMEOUT,
     BTP_MAXIMUM_WINDOW_SIZE,
-    BTP_SEND_ACK_TIMEOUT_MS,
+    BTP_SEND_ACK_TIMEOUT,
 } from "./BleConsts.js";
 
 export class BtpMatterError extends MatterError {}
@@ -29,7 +29,7 @@ export class BtpSessionHandler {
     private currentIncomingSegmentedPayload: Bytes | undefined;
     private prevIncomingSequenceNumber = 255; // Incoming Sequence Number received. Set to 255 to start at 0
     private prevIncomingAckNumber = -1; // Previous ackNumber received
-    private readonly ackReceiveTimer = Time.getTimer("BTP ack timeout", BTP_ACK_TIMEOUT_MS, () =>
+    private readonly ackReceiveTimer = Time.getTimer("BTP ack timeout", BTP_ACK_TIMEOUT, () =>
         this.btpAckTimeoutTriggered(),
     );
 
@@ -37,7 +37,7 @@ export class BtpSessionHandler {
     private prevAckedSequenceNumber = -1; // Previous (outgoing) Acked Sequence Number
     private readonly queuedOutgoingMatterMessages = new Array<DataReader<Endian.Little>>();
     private sendInProgress = false;
-    private readonly sendAckTimer = Time.getTimer("BTP send timeout", BTP_SEND_ACK_TIMEOUT_MS, () =>
+    private readonly sendAckTimer = Time.getTimer("BTP send timeout", BTP_SEND_ACK_TIMEOUT, () =>
         this.btpSendAckTimeoutTriggered(),
     );
     private isActive = true;

package/src/certificate/AttestationCertificateManager.ts

@@ -76,7 +76,7 @@ export class AttestationCertificateManager {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     private async generatePAACert(vendorId?: VendorId) {
-        const now = Time.get().now();
+        const now = Time.now;
         const cert = new Paa({
             serialNumber: Bytes.fromHex(toHex(this.paaCertId)),
             signatureAlgorithm: 1 /* EcdsaWithSHA256 */,
@@ -111,7 +111,7 @@ export class AttestationCertificateManager {
     }
 
     private async generatePAICert(vendorId: VendorId, productId?: number) {
-        const now = Time.get().now();
+        const now = Time.now;
         const cert = new Pai({
             serialNumber: Bytes.fromHex(toHex(this.#paiCertId)),
             signatureAlgorithm: 1 /* EcdsaWithSHA256 */,
@@ -146,7 +146,7 @@ export class AttestationCertificateManager {
     }
 
     async generateDaCert(publicKey: Bytes, vendorId: VendorId, productId: number) {
-        const now = Time.get().now();
+        const now = Time.now;
         const certId = this.#nextCertificateId++;
         const cert = new Dac({
             serialNumber: Bytes.fromHex(toHex(certId)),

package/src/certificate/CertificateAuthority.ts

@@ -117,7 +117,7 @@ export class CertificateAuthority {
     }
 
     async #generateRootCert() {
-        const now = Time.get().now();
+        const now = Time.now;
         const cert = new Rcac({
             serialNumber: Bytes.fromHex(toHex(this.#rootCertId)),
             signatureAlgorithm: 1 /* EcdsaWithSHA256 */,
@@ -148,7 +148,7 @@ export class CertificateAuthority {
         nodeId: NodeId,
         caseAuthenticatedTags?: CaseAuthenticatedTag[],
     ) {
-        const now = Time.get().now();
+        const now = Time.now;
         const certId = this.#nextCertificateId++;
         const cert = new Noc({
             serialNumber: Bytes.fromHex(toHex(certId)),

package/src/certificate/kinds/OperationalBase.ts

@@ -62,10 +62,10 @@ export abstract class OperationalBase<CT extends X509Certificate> extends X509Ba
 
         // notBefore date should be already reached, notAfter is not checked right now
         // TODO: implement real checks when we add "Last known Good UTC time"
-        if (cert.notBefore * 1000 > Time.nowMs()) {
-            logger.warn(`Certificate notBefore date is in the future: ${cert.notBefore * 1000} vs ${Time.nowMs()}`);
+        if (cert.notBefore * 1000 > Time.nowMs) {
+            logger.warn(`Certificate notBefore date is in the future: ${cert.notBefore * 1000} vs ${Time.nowMs}`);
             /*throw new CertificateError(
-                `Certificate notBefore date is in the future: ${cert.notBefore * 1000} vs ${Time.nowMs()}`,
+                `Certificate notBefore date is in the future: ${cert.notBefore * 1000} vs ${Time.nowMs}`,
             );*/
         }
     }

package/src/cluster/client/ClusterClient.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { capitalize, Diagnostic, ImplementationError, Logger, Merge } from "#general";
+import { capitalize, Diagnostic, Duration, ImplementationError, Logger, Merge } from "#general";
 import {
     Attribute,
     AttributeId,
@@ -387,16 +387,16 @@ export function ClusterClient<const T extends ClusterType>(
             request: RequestT,
             options: {
                 asTimedRequest?: boolean;
-                timedRequestTimeoutMs?: number;
-                expectedProcessingTimeMs?: number;
+                timedRequestTimeout?: Duration;
+                expectedProcessingTime?: Duration;
                 useExtendedFailSafeMessageResponseTimeout?: boolean;
             } = {},
         ) => {
             const {
                 asTimedRequest,
-                timedRequestTimeoutMs,
+                timedRequestTimeout,
                 useExtendedFailSafeMessageResponseTimeout,
-                expectedProcessingTimeMs,
+                expectedProcessingTime,
             } = options;
             if (isGroupAddress) {
                 return interactionClient.invokeWithSuppressedResponse<Command<RequestT, ResponseT, any>>({
@@ -404,7 +404,7 @@ export function ClusterClient<const T extends ClusterType>(
                     command: commandDef[commandName],
                     request,
                     asTimedRequest,
-                    timedRequestTimeoutMs,
+                    timedRequestTimeout,
                 });
             }
             return interactionClient.invoke<Command<RequestT, ResponseT, any>>({
@@ -413,8 +413,8 @@ export function ClusterClient<const T extends ClusterType>(
                 command: commandDef[commandName],
                 request,
                 asTimedRequest,
-                timedRequestTimeoutMs,
-                expectedProcessingTimeMs,
+                timedRequestTimeout,
+                expectedProcessingTime,
                 useExtendedFailSafeMessageResponseTimeout,
             });
         };

package/src/cluster/client/ClusterClientTypes.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Merge } from "#general";
+import { Duration, Merge } from "#general";
 import {
     Attribute,
     AttributeId,
@@ -63,13 +63,13 @@ export type SignatureFromCommandSpec<C extends Command<any, any, any>> = (
         asTimedRequest?: boolean;
 
         /** Override the request timeout when the command is sent as times request. Default are 10s. */
-        timedRequestTimeoutMs?: number;
+        timedRequestTimeout?: Duration;
 
         /**
          * Expected processing time on the device side for this command.
          * useExtendedFailSafeMessageResponseTimeout is ignored if this value is set.
          */
-        expectedProcessingTimeMs?: number;
+        expectedProcessingTime?: Duration;
 
         /**
          * Use the extended fail-safe message response timeout of 30 seconds. Use this for all commands

package/src/cluster/client/EventClient.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ImplementationError } from "#general";
+import { Duration, ImplementationError } from "#general";
 import { ClusterId, EndpointNumber, Event, EventId, EventNumber } from "#types";
 import { DecodedEventData } from "../../interaction/EventDataDecoder.js";
 import { InteractionClient } from "../../interaction/InteractionClient.js";
@@ -58,8 +58,8 @@ export class EventClient<T> {
     }
 
     async subscribe(
-        minIntervalFloorSeconds: number,
-        maxIntervalCeilingSeconds: number,
+        minIntervalFloor: Duration,
+        maxIntervalCeiling: Duration,
         isUrgent = true,
         minimumEventNumber?: EventNumber,
         isFabricFiltered?: boolean,
@@ -71,8 +71,8 @@ export class EventClient<T> {
             endpointId: this.endpointId,
             clusterId: this.clusterId,
             event: this.event,
-            minIntervalFloorSeconds,
-            maxIntervalCeilingSeconds,
+            minIntervalFloor,
+            maxIntervalCeiling,
             isUrgent,
             minimumEventNumber,
             isFabricFiltered,

package/src/common/FailsafeContext.ts

@@ -8,6 +8,7 @@ import {
     AsyncObservable,
     Bytes,
     Construction,
+    Duration,
     Logger,
     MatterFlowError,
     UnexpectedDataError,
@@ -46,7 +47,7 @@ export abstract class FailsafeContext {
     #commissioned = AsyncObservable<[], void>();
 
     constructor(options: FailsafeContext.Options) {
-        const { expiryLengthSeconds, associatedFabric, maxCumulativeFailsafeSeconds } = options;
+        const { expiryLength, associatedFabric, maxCumulativeFailsafe } = options;
 
         this.#sessions = options.sessions;
         this.#fabrics = options.fabrics;
@@ -61,21 +62,18 @@ export abstract class FailsafeContext {
 
             // If ExpiryLengthSeconds is non-zero and the fail-safe timer was not currently armed, then the fail-safe
             // timer SHALL be armed for that duration.
-            this.#failsafe = new FailsafeTimer(
-                associatedFabric,
-                expiryLengthSeconds,
-                maxCumulativeFailsafeSeconds,
-                () => this.#failSafeExpired(),
+            this.#failsafe = new FailsafeTimer(associatedFabric, expiryLength, maxCumulativeFailsafe, () =>
+                this.#failSafeExpired(),
             );
-            logger.debug(`Arm failSafe timer for ${expiryLengthSeconds}s.`);
+            logger.debug(`Arm failSafe timer for ${Duration.format(expiryLength)}`);
         });
     }
 
-    async extend(fabric: Fabric | undefined, expiryLengthSeconds: number) {
+    async extend(fabric: Fabric | undefined, expiryLength: Duration) {
         await this.#construction;
-        await this.#failsafe?.reArm(fabric, expiryLengthSeconds);
-        if (expiryLengthSeconds > 0) {
-            logger.debug(`Extend failSafe timer for ${expiryLengthSeconds}s.`);
+        await this.#failsafe?.reArm(fabric, expiryLength);
+        if (expiryLength > 0) {
+            logger.debug(`Extend failSafe timer for ${Duration.format(expiryLength)}`);
         }
     }
 
@@ -341,8 +339,8 @@ export namespace FailsafeContext {
     export interface Options {
         sessions: SessionManager;
         fabrics: FabricManager;
-        expiryLengthSeconds: number;
-        maxCumulativeFailsafeSeconds: number;
+        expiryLength: Duration;
+        maxCumulativeFailsafe: Duration;
         associatedFabric: Fabric | undefined;
     }
 }

package/src/common/FailsafeTimer.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Logger, MatterFlowError, Time, Timer } from "#general";
+import { Duration, Logger, MatterFlowError, Time, Timer } from "#general";
 import { Fabric } from "../fabric/Fabric.js";
 import type { FailsafeContext } from "./FailsafeContext.js";
 
@@ -22,16 +22,14 @@ export class FailsafeTimer {
 
     constructor(
         public associatedFabric: Fabric | undefined,
-        expiryLengthSeconds: number,
-        maxCumulativeFailsafeSeconds: number,
+        expiryLength: Duration,
+        maxCumulativeFailsafe: Duration,
         expiryCallback: () => Promise<void>,
     ) {
         this.#expiryCallback = expiryCallback;
-        this.#failsafeTimer = this.#startFailsafeTimer(expiryLengthSeconds);
-        this.#maxCumulativeFailsafeTimer = Time.getTimer(
-            "Max cumulative failsafe",
-            maxCumulativeFailsafeSeconds * 1000,
-            () => this.expire(),
+        this.#failsafeTimer = this.#startFailsafeTimer(expiryLength);
+        this.#maxCumulativeFailsafeTimer = Time.getTimer("Max cumulative failsafe", maxCumulativeFailsafe, () =>
+            this.expire(),
         ).start();
     }
 
@@ -45,7 +43,7 @@ export class FailsafeTimer {
     }
 
     /** Handle "Re-Arming" an existing FailSafe context to extend the timer, expire or fail if not allowed. */
-    async reArm(associatedFabric: Fabric | undefined, expiryLengthSeconds: number) {
+    async reArm(associatedFabric: Fabric | undefined, expiry: Duration) {
         if (!this.#failsafeTimer.isRunning) {
             throw new MatterFlowError("FailSafe already expired.");
         }
@@ -58,7 +56,7 @@ export class FailsafeTimer {
 
         this.#failsafeTimer.stop();
 
-        if (expiryLengthSeconds === 0) {
+        if (expiry === 0) {
             // If ExpiryLengthSeconds is 0 and the fail-safe timer was already armed and the accessing fabric matches
             // the Fabric currently associated with the fail-safe context, then the fail-safe timer SHALL be
             // immediately expired (see further below for side-effects of expiration).
@@ -67,7 +65,7 @@ export class FailsafeTimer {
             // If ExpiryLengthSeconds is non-zero and the fail-safe timer was currently armed, and the accessing Fabric
             // matches the fail-safe context’s associated Fabric, then the fail-safe timer SHALL be re- armed to expire
             // in ExpiryLengthSeconds.
-            this.#failsafeTimer = this.#startFailsafeTimer(expiryLengthSeconds);
+            this.#failsafeTimer = this.#startFailsafeTimer(expiry);
         }
     }
 
@@ -83,8 +81,8 @@ export class FailsafeTimer {
         this.#maxCumulativeFailsafeTimer.stop();
     }
 
-    #startFailsafeTimer(expiryLengthSeconds: number) {
-        return Time.getTimer("Failsafe expiration", expiryLengthSeconds * 1000, () =>
+    #startFailsafeTimer(expiry: Duration) {
+        return Time.getTimer("Failsafe expiration", expiry, () =>
             this.expire().catch(e => logger.error("Error during failsafe expiration", e)),
         ).start();
     }

package/src/common/Scanner.ts

@@ -4,7 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BasicSet, ChannelType, Environment, Environmental, Lifespan, ServerAddress, ServerAddressIp } from "#general";
+import {
+    BasicSet,
+    ChannelType,
+    Duration,
+    Environment,
+    Environmental,
+    Lifespan,
+    ServerAddress,
+    ServerAddressIp,
+} from "#general";
 import { DiscoveryCapabilitiesBitmap, NodeId, TypeFromPartialBitSchema, VendorId } from "#types";
 import { Fabric } from "../fabric/Fabric.js";
 
@@ -32,13 +41,13 @@ export type DiscoveryData = {
     PI?: string;
 
     /** Sleep Idle Interval */
-    SII?: number;
+    SII?: Duration;
 
     /** Sleep Active Interval */
-    SAI?: number;
+    SAI?: Duration;
 
     /** Session active threshold */
-    SAT?: number;
+    SAT?: Duration;
 
     /** TCP supported */
     T?: number; // SupportedTransportsBitmap but comes in as number, so converted on usage
@@ -116,7 +125,7 @@ export interface Scanner {
     findOperationalDevice(
         fabric: Fabric,
         nodeId: NodeId,
-        timeoutSeconds?: number,
+        timeout?: Duration,
         ignoreExistingRecords?: boolean,
     ): Promise<OperationalDevice | undefined>;
 
@@ -132,7 +141,7 @@ export interface Scanner {
      */
     findCommissionableDevices(
         identifier: CommissionableDeviceIdentifiers,
-        timeoutSeconds?: number,
+        timeout?: Duration,
         ignoreExistingRecords?: boolean,
     ): Promise<CommissionableDevice[]>;
 
@@ -144,7 +153,7 @@ export interface Scanner {
     findCommissionableDevicesContinuously(
         identifier: CommissionableDeviceIdentifiers,
         callback: (device: CommissionableDevice) => void,
-        timeoutSeconds?: number,
+        timeout?: Duration,
         cancelSignal?: Promise<void>,
     ): Promise<CommissionableDevice[]>;
 

package/src/events/OccurrenceManager.ts

@@ -277,7 +277,7 @@ export class OccurrenceManager {
 
     add(occurrence: Occurrence): MaybePromise<NumberedOccurrence> {
         return MaybePromise.then(this.#store.add(occurrence), entry => {
-            logger.debug(`Recorded event #${entry.number}: ${Diagnostic.json(occurrence)}`);
+            logger.debug(`Recorded event #${entry.number}`, Diagnostic.dict(occurrence));
             this.#occurrences.push(entry);
             if (this.#occurrences.length > this.#bufferConfig.maxEventAllowance) {
                 this.#startCull();

package/src/groups/FabricGroups.ts

@@ -96,7 +96,7 @@ export class FabricGroups {
 
     /*
     TODO for Controller to generate new epochs
-    addGroupEpoch(groupKeySetId: number, startTimeMs = Time.nowMs()) {
+    addGroupEpoch(groupKeySetId: number, startTimeMs = Time.nowMs) {
         // TODO for Controller to generate new epochs
         const epochKey = Crypto.getRandomData(CRYPTO_SYMMETRIC_KEY_LENGTH);
         const operationalEpochKey = Crypto.hkdf(epochKey, this.#fabric.operationalId, GROUP_SECURITY_INFO);