@matter/protocol 0.16.0-alpha.0-20250816-d22ad240d → 0.16.0-alpha.0-20250819-0a388db8b

package/dist/cjs/interaction/Subscription.js

@@ -35,7 +35,7 @@ class Subscription {
   #isCanceledByPeer;
   #criteria;
   #cancelled = (0, import_general.AsyncObservable)();
-  #maxIntervalMs;
+  #maxInterval;
   constructor(session, id, criteria) {
     this.#session = session;
     this.#id = id;
@@ -59,20 +59,17 @@ class Subscription {
   get cancelled() {
     return this.#cancelled;
   }
-  get maxIntervalMs() {
-    if (this.#maxIntervalMs === void 0) {
-      throw new import_general.InternalError("Subscription MaxIntervalMs accessed before it was set");
+  get maxInterval() {
+    if (this.#maxInterval === void 0) {
+      throw new import_general.InternalError("Subscription maxInterval accessed before it was set");
     }
-    return this.#maxIntervalMs;
+    return this.#maxInterval;
   }
-  set maxIntervalMs(value) {
-    if (this.#maxIntervalMs !== void 0) {
-      throw new import_general.InternalError("Subscription MaxIntervalMs set twice. This should never happen.");
+  set maxInterval(value) {
+    if (this.#maxInterval !== void 0) {
+      throw new import_general.InternalError("Subscription maxInterval set twice");
     }
-    this.#maxIntervalMs = value;
-  }
-  get maxInterval() {
-    return Math.ceil(this.maxIntervalMs / 1e3);
+    this.#maxInterval = value;
   }
   /**
    * Update session state.  This probably is meaningless except in a server context.

package/dist/cjs/interaction/Subscription.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/interaction/Subscription.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuD;AANvD;AAAA;AAAA;AAAA;AAAA;AAUA,MAAM,SAAS,sBAAO,IAAI,cAAc;AAejC,MAAe,aAAa;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,iBAAa,gCAA8C;AAAA,EAC3D;AAAA,EAEA,YAAY,SAAsB,IAAoB,UAAgC;AAClF,SAAK,WAAW;AAChB,SAAK,MAAM;AACX,SAAK,YAAY;AAAA,EACrB;AAAA,EAEA,IAAI,KAAK;AACL,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,CAAC,CAAC,KAAK;AAAA,EAClB;AAAA,EAEA,IAAI,mBAAmB;AACnB,WAAO,CAAC,CAAC,KAAK;AAAA,EAClB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,gBAAwB;AACxB,QAAI,KAAK,mBAAmB,QAAW;AACnC,YAAM,IAAI,6BAAc,uDAAuD;AAAA,IACnF;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,cAAc,OAAe;AAC7B,QAAI,KAAK,mBAAmB,QAAW;AACnC,YAAM,IAAI,6BAAc,iEAAiE;AAAA,IAC7F;AACA,SAAK,iBAAiB;AAAA,EAC1B;AAAA,EAEA,IAAI,cAAsB;AACtB,WAAO,KAAK,KAAK,KAAK,gBAAgB,GAAI;AAAA,EAC9C;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,SAAS;AAAA,EAAC;AAAA;AAAA;AAAA;AAAA,EAKhB,IAAc,iBAAiB,OAAgB;AAC3C,SAAK,oBAAoB;AAAA,EAC7B;AAAA,EAEA,IAAc,SAAS,OAAgB;AACnC,SAAK,YAAY;AAAA,EACrB;AAAA;AAAA;AAAA;AAAA,EAQA,MAAgB,UAAyB;AACrC,SAAK,YAAY;AACjB,SAAK,SAAS,cAAc,OAAO,IAAI;AACvC,WAAO,MAAM,wBAAwB,KAAK,EAAE,SAAS,KAAK,SAAS,IAAI,EAAE;AAEzE,SAAK,WAAW,KAAK,IAAI;AAAA,EAC7B;AAAA,EAEU,WAAW;AAEjB,SAAK,SAAS,cAAc,IAAI,IAAI;AACpC,WAAO,MAAM,sBAAsB,KAAK,GAAG,OAAO,KAAK,SAAS,IAAI,EAAE;AAAA,EAC1E;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAiE;AANjE;AAAA;AAAA;AAAA;AAAA;AAUA,MAAM,SAAS,sBAAO,IAAI,cAAc;AAejC,MAAe,aAAa;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,iBAAa,gCAA8C;AAAA,EAC3D;AAAA,EAEA,YAAY,SAAsB,IAAoB,UAAgC;AAClF,SAAK,WAAW;AAChB,SAAK,MAAM;AACX,SAAK,YAAY;AAAA,EACrB;AAAA,EAEA,IAAI,KAAK;AACL,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,CAAC,CAAC,KAAK;AAAA,EAClB;AAAA,EAEA,IAAI,mBAAmB;AACnB,WAAO,CAAC,CAAC,KAAK;AAAA,EAClB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,cAAc;AACd,QAAI,KAAK,iBAAiB,QAAW;AACjC,YAAM,IAAI,6BAAc,qDAAqD;AAAA,IACjF;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,YAAY,OAAiB;AAC7B,QAAI,KAAK,iBAAiB,QAAW;AACjC,YAAM,IAAI,6BAAc,oCAAoC;AAAA,IAChE;AACA,SAAK,eAAe;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,SAAS;AAAA,EAAC;AAAA;AAAA;AAAA;AAAA,EAKhB,IAAc,iBAAiB,OAAgB;AAC3C,SAAK,oBAAoB;AAAA,EAC7B;AAAA,EAEA,IAAc,SAAS,OAAgB;AACnC,SAAK,YAAY;AAAA,EACrB;AAAA;AAAA;AAAA;AAAA,EAQA,MAAgB,UAAyB;AACrC,SAAK,YAAY;AACjB,SAAK,SAAS,cAAc,OAAO,IAAI;AACvC,WAAO,MAAM,wBAAwB,KAAK,EAAE,SAAS,KAAK,SAAS,IAAI,EAAE;AAEzE,SAAK,WAAW,KAAK,IAAI;AAAA,EAC7B;AAAA,EAEU,WAAW;AAEjB,SAAK,SAAS,cAAc,IAAI,IAAI;AACpC,WAAO,MAAM,sBAAsB,KAAK,GAAG,OAAO,KAAK,SAAS,IAAI,EAAE;AAAA,EAC1E;AACJ;",
   "names": []
 }

package/dist/cjs/interaction/SubscriptionClient.d.ts

@@ -3,14 +3,14 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Environment, Environmental, MaybePromise } from "#general";
+import { Duration, Environment, Environmental, MaybePromise } from "#general";
 import { MessageExchange } from "#protocol/MessageExchange.js";
 import { ProtocolHandler } from "#protocol/ProtocolHandler.js";
 import { DataReport } from "./InteractionMessenger.js";
 export interface RegisteredSubscription {
     id: number;
-    maximumPeerResponseTimeMs: number;
-    maxIntervalS: number;
+    maximumPeerResponseTime: Duration;
+    maxInterval: Duration;
     onData: (dataReport: DataReport) => MaybePromise<void>;
     onTimeout?: () => void;
 }

package/dist/cjs/interaction/SubscriptionClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionClient.d.ts","sourceRoot":"","sources":["../../../src/interaction/SubscriptionClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAU,YAAY,EAAe,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAsC,MAAM,2BAA2B,CAAC;AAI3F,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,yBAAyB,EAAE,MAAM,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACvD,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,eAAe;;IACtD,QAAQ,CAAC,EAAE,KAA2B;IACtC,QAAQ,CAAC,qBAAqB,QAAQ;;IAMtC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAM9C;;OAEG;IACH,GAAG,CAAC,YAAY,EAAE,sBAAsB;IAuBxC;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM;IASX,aAAa,CAAC,QAAQ,EAAE,eAAe;IAsBvC,KAAK;CAKd"}
+{"version":3,"file":"SubscriptionClient.d.ts","sourceRoot":"","sources":["../../../src/interaction/SubscriptionClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAU,YAAY,EAAuB,MAAM,UAAU,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAsC,MAAM,2BAA2B,CAAC;AAI3F,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,uBAAuB,EAAE,QAAQ,CAAC;IAClC,WAAW,EAAE,QAAQ,CAAC;IACtB,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACvD,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,eAAe;;IACtD,QAAQ,CAAC,EAAE,KAA2B;IACtC,QAAQ,CAAC,qBAAqB,QAAQ;;IAMtC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAM9C;;OAEG;IACH,GAAG,CAAC,YAAY,EAAE,sBAAsB;IAuBxC;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM;IASX,aAAa,CAAC,QAAQ,EAAE,eAAe;IAsBvC,KAAK;CAKd"}

package/dist/cjs/interaction/SubscriptionClient.js

@@ -54,9 +54,9 @@ class SubscriptionClient {
         timer.stop();
         this.#timeouts.delete(id);
       }
-      const maxIntervalMs = subscription.maxIntervalS * 1e3 + subscription.maximumPeerResponseTimeMs;
-      timer = import_general.Time.getTimer("Subscription timeout", maxIntervalMs, () => {
-        logger.info(`Subscription ${id} timed out after ${maxIntervalMs}ms`);
+      const maxInterval = (0, import_general.Millis)(subscription.maxInterval + subscription.maximumPeerResponseTime);
+      timer = import_general.Time.getTimer("Subscription timeout", maxInterval, () => {
+        logger.info(`Subscription ${id} timed out after ${import_general.Duration.format(maxInterval)}`);
         this.delete(id);
         onTimeout();
       }).start();

package/dist/cjs/interaction/SubscriptionClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/interaction/SubscriptionClient.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA8E;AAG9E,mBAAwC;AACxC,kCAA+D;AAV/D;AAAA;AAAA;AAAA;AAAA;AAYA,MAAM,SAAS,sBAAO,IAAI,oBAAoB;AAevC,MAAM,mBAA8C;AAAA,EAC9C,KAAK;AAAA,EACL,wBAAwB;AAAA,EACxB,aAAa,oBAAI,IAA4D;AAAA,EAC7E,YAAY,oBAAI,IAAmB;AAAA,EAE5C,cAAc;AAAA,EAAC;AAAA,EAEf,QAAQ,6BAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,SAAS,IAAI,mBAAmB;AACtC,QAAI,IAAI,oBAAoB,MAAM;AAClC,WAAO;AAAA,EACX;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,cAAsC;AACtC,UAAM,EAAE,IAAI,QAAQ,UAAU,IAAI;AAElC,SAAK,WAAW,IAAI,IAAI,MAAM;AAC9B,QAAI,WAAW;AACX,UAAI,QAAQ,KAAK,UAAU,IAAI,EAAE;AACjC,UAAI,UAAU,QAAW;AACrB,cAAM,KAAK;AACX,aAAK,UAAU,OAAO,EAAE;AAAA,MAC5B;AAEA,YAAM,gBAAgB,aAAa,eAAe,MAAO,aAAa;AAEtE,cAAQ,oBAAK,SAAS,wBAAwB,eAAe,MAAM;AAC/D,eAAO,KAAK,gBAAgB,EAAE,oBAAoB,aAAa,IAAI;AACnE,aAAK,OAAO,EAAE;AACd,kBAAU;AAAA,MACd,CAAC,EAAE,MAAM;AAET,WAAK,UAAU,IAAI,IAAI,KAAK;AAAA,IAChC;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,IAAY;AACf,SAAK,WAAW,OAAO,EAAE;AACzB,UAAM,QAAQ,KAAK,UAAU,IAAI,EAAE;AACnC,QAAI,UAAU,QAAW;AACrB,YAAM,KAAK;AACX,WAAK,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACJ;AAAA,EAEA,MAAM,cAAc,UAA2B;AAC3C,UAAM,YAAY,IAAI,+DAAmC,QAAQ;AAEjE,QAAI;AACJ,QAAI;AAEA,mBAAa,MAAM,UAAU,wBAAwB,CAAC,GAAG,KAAK,WAAW,KAAK,CAAC,CAAC;AAAA,IACpF,UAAE;AACE,gBAAU,MAAM,EAAE,MAAM,WAAS,OAAO,KAAK,kCAAkC,KAAK,CAAC;AAAA,IACzF;AACA,UAAM,iBAAiB,WAAW;AAElC,UAAM,WAAW,KAAK,WAAW,IAAI,cAAc;AACnD,UAAM,QAAQ,KAAK,UAAU,IAAI,cAAc;AAE/C,QAAI,UAAU,QAAW;AACrB,YAAM,KAAK,EAAE,MAAM;AAAA,IACvB;AAEA,UAAM,WAAW,UAAU;AAAA,EAC/B;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,WAAW,MAAM;AACtB,SAAK,UAAU,QAAQ,WAAS,MAAM,KAAK,CAAC;AAC5C,SAAK,UAAU,MAAM;AAAA,EACzB;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAgG;AAGhG,mBAAwC;AACxC,kCAA+D;AAV/D;AAAA;AAAA;AAAA;AAAA;AAYA,MAAM,SAAS,sBAAO,IAAI,oBAAoB;AAevC,MAAM,mBAA8C;AAAA,EAC9C,KAAK;AAAA,EACL,wBAAwB;AAAA,EACxB,aAAa,oBAAI,IAA4D;AAAA,EAC7E,YAAY,oBAAI,IAAmB;AAAA,EAE5C,cAAc;AAAA,EAAC;AAAA,EAEf,QAAQ,6BAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,SAAS,IAAI,mBAAmB;AACtC,QAAI,IAAI,oBAAoB,MAAM;AAClC,WAAO;AAAA,EACX;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,cAAsC;AACtC,UAAM,EAAE,IAAI,QAAQ,UAAU,IAAI;AAElC,SAAK,WAAW,IAAI,IAAI,MAAM;AAC9B,QAAI,WAAW;AACX,UAAI,QAAQ,KAAK,UAAU,IAAI,EAAE;AACjC,UAAI,UAAU,QAAW;AACrB,cAAM,KAAK;AACX,aAAK,UAAU,OAAO,EAAE;AAAA,MAC5B;AAEA,YAAM,kBAAc,uBAAO,aAAa,cAAc,aAAa,uBAAuB;AAE1F,cAAQ,oBAAK,SAAS,wBAAwB,aAAa,MAAM;AAC7D,eAAO,KAAK,gBAAgB,EAAE,oBAAoB,wBAAS,OAAO,WAAW,CAAC,EAAE;AAChF,aAAK,OAAO,EAAE;AACd,kBAAU;AAAA,MACd,CAAC,EAAE,MAAM;AAET,WAAK,UAAU,IAAI,IAAI,KAAK;AAAA,IAChC;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,OAAO,IAAY;AACf,SAAK,WAAW,OAAO,EAAE;AACzB,UAAM,QAAQ,KAAK,UAAU,IAAI,EAAE;AACnC,QAAI,UAAU,QAAW;AACrB,YAAM,KAAK;AACX,WAAK,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACJ;AAAA,EAEA,MAAM,cAAc,UAA2B;AAC3C,UAAM,YAAY,IAAI,+DAAmC,QAAQ;AAEjE,QAAI;AACJ,QAAI;AAEA,mBAAa,MAAM,UAAU,wBAAwB,CAAC,GAAG,KAAK,WAAW,KAAK,CAAC,CAAC;AAAA,IACpF,UAAE;AACE,gBAAU,MAAM,EAAE,MAAM,WAAS,OAAO,KAAK,kCAAkC,KAAK,CAAC;AAAA,IACzF;AACA,UAAM,iBAAiB,WAAW;AAElC,UAAM,WAAW,KAAK,WAAW,IAAI,cAAc;AACnD,UAAM,QAAQ,KAAK,UAAU,IAAI,cAAc;AAE/C,QAAI,UAAU,QAAW;AACrB,YAAM,KAAK,EAAE,MAAM;AAAA,IACvB;AAEA,UAAM,WAAW,UAAU;AAAA,EAC/B;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,WAAW,MAAM;AACtB,SAAK,UAAU,QAAQ,WAAS,MAAM,KAAK,CAAC;AAC5C,SAAK,UAAU,MAAM;AAAA,EACzB;AACJ;",
   "names": []
 }

package/dist/cjs/mdns/MdnsClient.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BasicSet, Bytes, ChannelType, Diagnostic, Lifespan, ServerAddressIp } from "#general";
+import { BasicSet, Bytes, ChannelType, Diagnostic, Duration, Lifespan, ServerAddressIp } from "#general";
 import { NodeId } from "#types";
 import { CommissionableDevice, CommissionableDeviceIdentifiers, DiscoveryData, OperationalDevice, Scanner } from "../common/Scanner.js";
 import { Fabric } from "../fabric/Fabric.js";
@@ -42,7 +42,7 @@ export declare class MdnsClient implements Scanner {
      * Method to find an operational device (already commissioned) and return a promise with the list of discovered
      * IP/ports or an empty array if not found.
      */
-    findOperationalDevice({ operationalId }: Fabric, nodeId: NodeId, timeoutSeconds?: number, ignoreExistingRecords?: boolean): Promise<OperationalDevice | undefined>;
+    findOperationalDevice({ operationalId }: Fabric, nodeId: NodeId, timeout?: Duration, ignoreExistingRecords?: boolean): Promise<OperationalDevice | undefined>;
     cancelOperationalDeviceDiscovery(fabric: Fabric, nodeId: NodeId, resolvePromise?: boolean): void;
     cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise?: boolean): void;
     getDiscoveredOperationalDevice({ operationalId }: Fabric, nodeId: NodeId): OperationalDevice | undefined;
@@ -54,19 +54,19 @@ export declare class MdnsClient implements Scanner {
      * promise got fulfilled no more queries are send out, but more device entries might be added when discovered later.
      * These can be requested by the getCommissionableDevices method.
      */
-    findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeoutSeconds?: number, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;
+    findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeout?: Duration, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;
     /**
      * Discovers commissionable devices based on a defined identifier and returns the first found entries.
      * If an own cancelSignal promise is used the discovery can only be cancelled via this signal!
      */
-    findCommissionableDevicesContinuously(identifier: CommissionableDeviceIdentifiers, callback: (device: CommissionableDevice) => void, timeoutSeconds?: number, cancelSignal?: Promise<void>): Promise<CommissionableDevice[]>;
+    findCommissionableDevicesContinuously(identifier: CommissionableDeviceIdentifiers, callback: (device: CommissionableDevice) => void, timeout?: Duration, cancelSignal?: Promise<void>): Promise<CommissionableDevice[]>;
     getDiscoveredCommissionableDevices(identifier: CommissionableDeviceIdentifiers): {
         addresses: ServerAddressIp[];
         discoveredAt: undefined;
         ttl: undefined;
-        SII?: number | undefined;
-        SAI?: number | undefined;
-        SAT?: number | undefined;
+        SII?: Duration | undefined;
+        SAI?: Duration | undefined;
+        SAT?: Duration | undefined;
         DN?: string | undefined;
         DT?: number | undefined;
         VP?: string | undefined;
@@ -87,8 +87,8 @@ export declare class MdnsClient implements Scanner {
      * Close all connects, end all timers and resolve all pending promises.
      */
     close(): Promise<void>;
-    static discoveryDataDiagnostics(data: DiscoveryData): Record<string, unknown> & Diagnostic;
-    static deviceAddressDiagnostics(addresses: Map<string, MatterServerRecordWithExpire>): (Record<string, unknown> & Diagnostic)[];
+    static discoveryDataDiagnostics(data: DiscoveryData, kind?: string): Record<string, unknown> & Diagnostic;
+    static deviceAddressDiagnostics(addresses: Map<string, MatterServerRecordWithExpire>): Diagnostic;
 }
 export {};
 //# sourceMappingURL=MdnsClient.d.ts.map

package/dist/cjs/mdns/MdnsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MdnsClient.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,QAAQ,EACR,KAAK,EACL,WAAW,EACX,UAAU,EAQV,QAAQ,EAGR,eAAe,EAMlB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAC1C,OAAO,EACH,oBAAoB,EACpB,+BAA+B,EAC/B,aAAa,EACb,iBAAiB,EACjB,OAAO,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAY7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,KAAK,4BAA4B,GAAG,eAAe,GAAG,QAAQ,CAAC;AAoC/D;;;;;;;;;GASG;AACH,MAAM,WAAW,yBAAyB;IACtC,gDAAgD;IAChD,cAAc,EAAE,OAAO,CAAC;IAExB,mCAAmC;IACnC,kBAAkB,EAAE;QAChB,aAAa,EAAE,KAAK,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACP;AAED;;;GAGG;AACH,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;gBAyCpB,MAAM,EAAE,UAAU;IAW9B,uDAAuD;IACvD,IAAI,uBAAuB,mEAE1B;IAkTD;;;OAGG;IACG,qBAAqB,CACvB,EAAE,aAAa,EAAE,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,MAAM,EACvB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAwBzC,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,UAAO;IAKtF,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IAQtG,8BAA8B,CAAC,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAoLxE;;;;;;;OAOG;IACG,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,cAAc,SAAI,EAClB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAiBlC;;;OAGG;IACG,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAiDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B;mBAlOvD,eAAe,EAAE;;;;;;;;;;;;;;;;;oBAxfxB,MAAM;YACd,MAAM;YACN,MAAM;YACN,MAAM;;IA2tBd;;OAEG;IACG,KAAK;IA6tBX,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa;IAmBnD,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC;CASvF"}
+{"version":3,"file":"MdnsClient.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,QAAQ,EACR,KAAK,EACL,WAAW,EACX,UAAU,EAMV,QAAQ,EAKR,QAAQ,EAOR,eAAe,EAOlB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAC1C,OAAO,EACH,oBAAoB,EACpB,+BAA+B,EAC/B,aAAa,EACb,iBAAiB,EACjB,OAAO,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAY7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,KAAK,4BAA4B,GAAG,eAAe,GAAG,QAAQ,CAAC;AAoC/D;;;;;;;;;GASG;AACH,MAAM,WAAW,yBAAyB;IACtC,gDAAgD;IAChD,cAAc,EAAE,OAAO,CAAC;IAExB,mCAAmC;IACnC,kBAAkB,EAAE;QAChB,aAAa,EAAE,KAAK,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACP;AAED;;;GAGG;AACH,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;gBAyCpB,MAAM,EAAE,UAAU;IAW9B,uDAAuD;IACvD,IAAI,uBAAuB,mEAE1B;IAkTD;;;OAGG;IACG,qBAAqB,CACvB,EAAE,aAAa,EAAE,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAwBzC,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,UAAO;IAKtF,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IAQtG,8BAA8B,CAAC,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAoLxE;;;;;;;OAOG;IACG,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAa,EACpB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAiBlC;;;OAGG;IACG,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAiDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B;mBAlOvD,eAAe,EAAE;;;;;;;;;;;;;;;;;oBAxfxB,MAAM;YACd,MAAM;YACN,MAAM;YACN,MAAM;;IA2tBd;;OAEG;IACG,KAAK;IAstBX,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAiBlE,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC;CAUvF"}

package/dist/cjs/mdns/MdnsClient.js

@@ -31,7 +31,7 @@ var import_MdnsConsts = require("./MdnsConsts.js");
  */
 const logger = import_general.Logger.get("MdnsClient");
 const MDNS_EXPIRY_GRACE_PERIOD_FACTOR = 1.05;
-const START_ANNOUNCE_INTERVAL_SECONDS = 1.5;
+const START_ANNOUNCE_INTERVAL = (0, import_general.Seconds)(1.5);
 class MdnsClient {
   type = import_general.ChannelType.UDP;
   /** Active announces by queryId with queries and known answers */
@@ -45,7 +45,7 @@ class MdnsClient {
   /** Waiters for specific queryIds to resolve a promise when a record is discovered */
   #recordWaiters = /* @__PURE__ */ new Map();
   #queryTimer;
-  #nextAnnounceIntervalSeconds = START_ANNOUNCE_INTERVAL_SECONDS;
+  #nextAnnounceInterval = START_ANNOUNCE_INTERVAL;
   #periodicTimer;
   #closing = false;
   #socket;
@@ -61,7 +61,7 @@ class MdnsClient {
     this.#observers.on(this.#socket.receipt, this.#handleMessage.bind(this));
     this.#periodicTimer = import_general.Time.getPeriodicTimer(
       "Discovered node expiration",
-      60 * 1e3,
+      import_general.Minutes.one,
       () => this.#expire()
     ).start();
     this.#observers.on(this.#targetCriteriaProviders.added, () => this.#handleChangedScanTargets());
@@ -119,7 +119,7 @@ class MdnsClient {
     }
   }
   #effectiveTTL(ttl) {
-    return Math.ceil(ttl * MDNS_EXPIRY_GRACE_PERIOD_FACTOR);
+    return (0, import_general.Millis)(ttl * MDNS_EXPIRY_GRACE_PERIOD_FACTOR);
   }
   /**
    * Sends out one DNS-SD query for all collected announce records and start a timer for the next query with doubled
@@ -138,18 +138,14 @@ class MdnsClient {
     );
     this.#queryTimer = import_general.Time.getTimer(
       "MDNS discovery",
-      this.#nextAnnounceIntervalSeconds * 1e3,
+      this.#nextAnnounceInterval,
       () => this.#sendQueries()
     ).start();
     logger.debug(
-      `Sending ${queries.length} query records for ${this.#activeAnnounceQueries.size} queries with ${answers.length} known answers. Re-Announce in ${this.#nextAnnounceIntervalSeconds} seconds`
-    );
-    const nextAnnounceInterval = this.#nextAnnounceIntervalSeconds * 2;
-    this.#nextAnnounceIntervalSeconds = Math.min(
-      nextAnnounceInterval,
-      60 * 60
-      /* 1 hour */
+      `Sending ${queries.length} query records for ${this.#activeAnnounceQueries.size} queries with ${answers.length} known answers. Re-Announce in ${import_general.Duration.format(this.#nextAnnounceInterval)}`
     );
+    const nextAnnounceInterval = (0, import_general.Millis)(this.#nextAnnounceInterval * 2);
+    this.#nextAnnounceInterval = import_general.Duration.min(nextAnnounceInterval, import_general.Hours.one);
     await this.#socket.send({
       messageType: import_general.DnsMessageType.Query,
       queries,
@@ -181,8 +177,8 @@ class MdnsClient {
     this.#activeAnnounceQueries.set(queryId, { queries, answers });
     logger.debug(`Set ${queries.length} query records for query ${queryId}: ${import_general.Diagnostic.json(queries)}`);
     this.#queryTimer?.stop();
-    this.#nextAnnounceIntervalSeconds = START_ANNOUNCE_INTERVAL_SECONDS;
-    this.#queryTimer = import_general.Time.getTimer("MDNS discovery", 0, () => this.#sendQueries()).start();
+    this.#nextAnnounceInterval = START_ANNOUNCE_INTERVAL;
+    this.#queryTimer = import_general.Time.getTimer("MDNS discovery", import_general.Instant, () => this.#sendQueries()).start();
   }
   /**
    * Combines the known answers from all active queries and the known IP addresses from the network
@@ -203,7 +199,7 @@ class MdnsClient {
     if (this.#activeAnnounceQueries.size === 0) {
       logger.debug(`Removing last query ${queryId} and stopping announce timer`);
       this.#queryTimer?.stop();
-      this.#nextAnnounceIntervalSeconds = START_ANNOUNCE_INTERVAL_SECONDS;
+      this.#nextAnnounceInterval = START_ANNOUNCE_INTERVAL;
     } else {
       logger.debug(`Removing query ${queryId}`);
     }
@@ -268,9 +264,9 @@ class MdnsClient {
    * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
    * The promise will be resolved when the timer runs out latest.
    */
-  async #registerWaiterPromise(queryId, commissionable, timeoutSeconds, resolveOnUpdatedRecords = true, cancelResolver) {
+  async #registerWaiterPromise(queryId, commissionable, timeout, resolveOnUpdatedRecords = true, cancelResolver) {
     const { promise, resolver } = (0, import_general.createPromise)();
-    const timer = timeoutSeconds !== void 0 ? import_general.Time.getTimer("MDNS timeout", timeoutSeconds * 1e3, () => {
+    const timer = timeout !== void 0 ? import_general.Time.getTimer("MDNS timeout", timeout, () => {
       cancelResolver?.();
       this.#finishWaiter(queryId, true);
     }).start() : void 0;
@@ -281,7 +277,7 @@ class MdnsClient {
       this.#registerOperationalQuery(queryId);
     }
     logger.debug(
-      `Registered waiter for query ${queryId} with ${timeoutSeconds !== void 0 ? `timeout ${timeoutSeconds} seconds` : "no timeout"}${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
+      `Registered waiter for query ${queryId} with ${timeout !== void 0 ? `timeout ${timeout}` : "no timeout"}${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
     );
     await promise;
   }
@@ -336,14 +332,14 @@ class MdnsClient {
    * Method to find an operational device (already commissioned) and return a promise with the list of discovered
    * IP/ports or an empty array if not found.
    */
-  async findOperationalDevice({ operationalId }, nodeId, timeoutSeconds, ignoreExistingRecords = false) {
+  async findOperationalDevice({ operationalId }, nodeId, timeout, ignoreExistingRecords = false) {
     if (this.#closing) {
       throw new import_general.ImplementationError("Cannot discover operational device because scanner is closing.");
     }
     const deviceMatterQname = this.#createOperationalMatterQName(operationalId, nodeId);
     let storedDevice = ignoreExistingRecords ? void 0 : this.#getOperationalDeviceRecords(deviceMatterQname);
     if (storedDevice === void 0) {
-      const promise = this.#registerWaiterPromise(deviceMatterQname, false, timeoutSeconds);
+      const promise = this.#registerWaiterPromise(deviceMatterQname, false, timeout);
       this.#setQueryRecords(deviceMatterQname, [
         {
           name: deviceMatterQname,
@@ -523,11 +519,11 @@ class MdnsClient {
    * promise got fulfilled no more queries are send out, but more device entries might be added when discovered later.
    * These can be requested by the getCommissionableDevices method.
    */
-  async findCommissionableDevices(identifier, timeoutSeconds = 5, ignoreExistingRecords = false) {
+  async findCommissionableDevices(identifier, timeout = (0, import_general.Seconds)(5), ignoreExistingRecords = false) {
     let storedRecords = ignoreExistingRecords ? [] : this.#getCommissionableDeviceRecords(identifier).filter(({ addresses }) => addresses.length > 0);
     if (storedRecords.length === 0) {
       const queryId = this.#buildCommissionableQueryIdentifier(identifier);
-      const promise = this.#registerWaiterPromise(queryId, true, timeoutSeconds);
+      const promise = this.#registerWaiterPromise(queryId, true, timeout);
       this.#setQueryRecords(queryId, this.#getCommissionableQueryRecords(identifier));
       await promise;
       storedRecords = this.#getCommissionableDeviceRecords(identifier);
@@ -538,9 +534,9 @@ class MdnsClient {
    * Discovers commissionable devices based on a defined identifier and returns the first found entries.
    * If an own cancelSignal promise is used the discovery can only be cancelled via this signal!
    */
-  async findCommissionableDevicesContinuously(identifier, callback, timeoutSeconds, cancelSignal) {
+  async findCommissionableDevicesContinuously(identifier, callback, timeout, cancelSignal) {
     const discoveredDevices = /* @__PURE__ */ new Set();
-    const discoveryEndTime = timeoutSeconds ? import_general.Time.nowMs() + timeoutSeconds * 1e3 : void 0;
+    const discoveryEndTime = timeout ? import_general.Time.nowMs + timeout : void 0;
     const queryId = this.#buildCommissionableQueryIdentifier(identifier);
     this.#setQueryRecords(queryId, this.#getCommissionableQueryRecords(identifier));
     let queryResolver;
@@ -571,7 +567,7 @@ class MdnsClient {
       });
       let remainingTime;
       if (discoveryEndTime !== void 0) {
-        remainingTime = Math.ceil((discoveryEndTime - import_general.Time.nowMs()) / 1e3);
+        remainingTime = import_general.Seconds.ceil((0, import_general.Timespan)(import_general.Time.nowMs, discoveryEndTime).duration);
         if (remainingTime <= 0) {
           break;
         }
@@ -598,7 +594,7 @@ class MdnsClient {
   /** Converts the discovery data into a structured format for performant access. */
   #structureAnswers(...answersList) {
     const structuredAnswers = {};
-    const discoveredAt = import_general.Time.nowMs();
+    const discoveredAt = import_general.Time.nowMs;
     answersList.forEach(
       (answers) => answers.forEach((answer) => {
         const { name, recordType } = answer;
@@ -854,7 +850,7 @@ class MdnsClient {
   }
   #handleOperationalTxtRecord(record, netInterface) {
     const { name: matterName, value, ttl } = record;
-    const discoveredAt = import_general.Time.nowMs();
+    const discoveredAt = import_general.Time.nowMs;
     if (ttl === 0) {
       if (this.#operationalDeviceRecords.has(matterName)) {
         logger.debug(
@@ -875,19 +871,16 @@ class MdnsClient {
       device = {
         ...device,
         discoveredAt,
-        ttl: ttl * 1e3,
+        ttl,
         ...txtData
       };
     } else {
-      logger.debug(
-        `Adding operational device ${matterName} in cache (interface ${netInterface}, ttl=${ttl}) with TXT data:`,
-        MdnsClient.discoveryDataDiagnostics(txtData)
-      );
+      logNewService(matterName, "operational", txtData);
       device = {
         deviceIdentifier: matterName,
         addresses: /* @__PURE__ */ new Map(),
         discoveredAt,
-        ttl: ttl * 1e3,
+        ttl,
         ...txtData
       };
     }
@@ -913,12 +906,12 @@ class MdnsClient {
     if (!deviceExisted && !this.#matchesOperationalCriteria(matterName)) {
       return;
     }
-    const discoveredAt = import_general.Time.nowMs();
+    const discoveredAt = import_general.Time.nowMs;
     const device = this.#operationalDeviceRecords.get(matterName) ?? {
       deviceIdentifier: matterName,
       addresses: /* @__PURE__ */ new Map(),
       discoveredAt,
-      ttl: ttl * 1e3
+      ttl
     };
     const ipsInitiallyEmpty = device.addresses.size === 0;
     const { addresses } = device;
@@ -933,15 +926,12 @@ class MdnsClient {
         }
         const address = addresses.get(ip) ?? { ip, port, type: "udp" };
         address.discoveredAt = discoveredAt;
-        address.ttl = ttl2 * 1e3;
+        address.ttl = ttl2;
         addresses.set(address.ip, address);
       }
       device.addresses = addresses;
       if (ipsInitiallyEmpty) {
-        logger.debug(
-          `Added ${addresses.size} IPs for operational device ${matterName} to cache (interface ${netInterface}):`,
-          ...MdnsClient.deviceAddressDiagnostics(addresses)
-        );
+        logNewAddresses(matterName, "operational", netInterface, addresses);
       }
       this.#operationalDeviceRecords.set(matterName, device);
     }
@@ -999,10 +989,7 @@ class MdnsClient {
       const storedRecord = this.#commissionableDeviceRecords.get(name);
       if (storedRecord === void 0) {
         queryMissingDataForInstances.add(name);
-        logger.debug(
-          `Found commissionable device ${name} with data:`,
-          MdnsClient.discoveryDataDiagnostics(parsedRecord)
-        );
+        logNewService(name, "commissionable", parsedRecord);
       } else {
         parsedRecord.addresses = storedRecord.addresses;
       }
@@ -1035,8 +1022,8 @@ class MdnsClient {
             continue;
           }
           const matterServer = storedRecord.addresses.get(ip) ?? { ip, port, type: "udp" };
-          matterServer.discoveredAt = import_general.Time.nowMs();
-          matterServer.ttl = ttl2 * 1e3;
+          matterServer.discoveredAt = import_general.Time.nowMs;
+          matterServer.ttl = ttl2;
           storedRecord.addresses.set(ip, matterServer);
         }
       }
@@ -1053,10 +1040,7 @@ class MdnsClient {
         );
         this.#setQueryRecords(queryId2, queries, answers);
       } else if (!recordAddressesKnown) {
-        logger.debug(
-          `Added ${storedRecord.addresses.size} IPs for commissionable device ${record.name} to cache (interface ${netInterface}):`,
-          ...MdnsClient.deviceAddressDiagnostics(storedRecord.addresses)
-        );
+        logNewAddresses(record.name, "commissionable", netInterface, storedRecord.addresses);
       }
       if (storedRecord.addresses.size === 0) continue;
       const queryId = this.#findCommissionableQueryIdentifier(record.name, storedRecord);
@@ -1086,12 +1070,17 @@ class MdnsClient {
       for (const item of value) {
         const [key, value2] = item.split("=");
         if (key === void 0 || value2 === void 0) continue;
-        if (["SII", "SAI", "SAT", "T", "D", "CM", "DT", "PH", "ICD"].includes(key)) {
+        if (["T", "D", "CM", "DT", "PH", "ICD"].includes(key)) {
           const intValue = parseInt(value2);
           if (isNaN(intValue)) continue;
           result[key] = intValue;
         } else if (["VP", "DN", "RI", "PI"].includes(key)) {
           result[key] = value2;
+        } else if (["SII", "SAI", "SAT"].includes(key)) {
+          const intValue = parseInt(value2);
+          if (isNaN(intValue)) continue;
+          result[key] = intValue;
+          result[key] = (0, import_general.Millis)(intValue);
         }
       }
     }
@@ -1114,13 +1103,13 @@ class MdnsClient {
     }
     return {
       addresses: /* @__PURE__ */ new Map(),
-      discoveredAt: import_general.Time.nowMs(),
-      ttl: ttl * 1e3,
+      discoveredAt: import_general.Time.nowMs,
+      ttl,
       ...txtRecord
     };
   }
   #expire() {
-    const now = import_general.Time.nowMs();
+    const now = import_general.Time.nowMs;
     [...this.#operationalDeviceRecords.entries()].forEach(([recordKey, { addresses, discoveredAt, ttl }]) => {
       const expires = discoveredAt + this.#effectiveTTL(ttl);
       if (now <= expires) {
@@ -1153,7 +1142,7 @@ class MdnsClient {
       Object.keys(data.operational).forEach((recordType) => {
         const type = parseInt(recordType);
         data.operational[type] = data.operational[type].filter(
-          ({ discoveredAt, ttl }) => now < discoveredAt + this.#effectiveTTL(ttl * 1e3)
+          ({ discoveredAt, ttl }) => now < discoveredAt + this.#effectiveTTL(ttl)
         );
         if (data.operational[type].length === 0) {
           delete data.operational[type];
@@ -1164,7 +1153,7 @@ class MdnsClient {
       Object.keys(data.commissionable).forEach((recordType) => {
         const type = parseInt(recordType);
         data.commissionable[type] = data.commissionable[type].filter(
-          ({ discoveredAt, ttl }) => now < discoveredAt + this.#effectiveTTL(ttl * 1e3)
+          ({ discoveredAt, ttl }) => now < discoveredAt + this.#effectiveTTL(ttl)
         );
         if (data.commissionable[type].length === 0) {
           delete data.commissionable[type];
@@ -1174,7 +1163,7 @@ class MdnsClient {
     if (data.addressesV6) {
       Object.keys(data.addressesV6).forEach((name) => {
         for (const [ip, { discoveredAt, ttl }] of data.addressesV6[name].entries()) {
-          if (now < discoveredAt + this.#effectiveTTL(ttl * 1e3)) continue;
+          if (now < discoveredAt + this.#effectiveTTL(ttl)) continue;
           data.addressesV6[name].delete(ip);
         }
         if (data.addressesV6[name].size === 0) {
@@ -1185,7 +1174,7 @@ class MdnsClient {
     if (data.addressesV4) {
       Object.keys(data.addressesV4).forEach((name) => {
         for (const [ip, { discoveredAt, ttl }] of data.addressesV4[name].entries()) {
-          if (now < discoveredAt + this.#effectiveTTL(ttl * 1e3)) continue;
+          if (now < discoveredAt + this.#effectiveTTL(ttl)) continue;
           data.addressesV4[name].delete(ip);
         }
         if (data.addressesV4[name].size === 0) {
@@ -1194,32 +1183,47 @@ class MdnsClient {
       });
     }
   }
-  static discoveryDataDiagnostics(data) {
-    return import_general.Diagnostic.dict(
-      {
-        SII: data.SII,
-        SAI: data.SAI,
-        SAT: data.SAT,
-        T: data.T,
-        DT: data.DT,
-        PH: data.PH,
-        ICD: data.ICD,
-        VP: data.VP,
-        DN: data.DN,
-        RI: data.RI,
-        PI: data.PI
-      },
-      true
-    );
+  static discoveryDataDiagnostics(data, kind) {
+    return import_general.Diagnostic.dict({
+      kind,
+      SII: import_general.Duration.format(data.SII),
+      SAI: import_general.Duration.format(data.SAI),
+      SAT: import_general.Duration.format(data.SAT),
+      T: data.T,
+      DT: data.DT,
+      PH: data.PH,
+      ICD: data.ICD,
+      VP: data.VP,
+      DN: data.DN,
+      RI: data.RI,
+      PI: data.PI
+    });
   }
   static deviceAddressDiagnostics(addresses) {
-    return Array.from(addresses.values()).map(
-      (address) => import_general.Diagnostic.dict({
-        type: address.type,
-        ip: address.ip,
-        port: address.port
-      })
-    );
+    const diagnostic = Array();
+    for (const address of addresses.values()) {
+      if (diagnostic.length) {
+        diagnostic.push(", ");
+      }
+      diagnostic.push(import_general.ServerAddress.diagnosticFor(address));
+    }
+    return import_general.Diagnostic.squash(...diagnostic);
   }
 }
+function logNewService(service, kind, data) {
+  logger.debug("Found device", import_general.Diagnostic.strong(service), MdnsClient.discoveryDataDiagnostics(data, kind));
+}
+function logNewAddresses(service, kind, intf, addresses) {
+  logger.debug(
+    "Added",
+    addresses.size,
+    "addresses for",
+    import_general.Diagnostic.strong(service),
+    import_general.Diagnostic.dict({
+      kind,
+      addrs: MdnsClient.deviceAddressDiagnostics(addresses),
+      intf
+    })
+  );
+}
 //# sourceMappingURL=MdnsClient.js.map