@matter/protocol 0.16.0-alpha.0-20250809-ee8375bcb → 0.16.0-alpha.0-20250812-285b75d83

package/dist/esm/mdns/MdnsConsts.js

@@ -3,29 +3,56 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+const MDNS_BROADCAST_IPV4 = "224.0.0.251";
+const MDNS_BROADCAST_IPV6 = "ff02::fb";
+const MDNS_BROADCAST_PORT = 5353;
 const SERVICE_DISCOVERY_QNAME = "_services._dns-sd._udp.local";
 const MATTER_COMMISSION_SERVICE_QNAME = "_matterc._udp.local";
 const MATTER_COMMISSIONER_SERVICE_QNAME = "_matterd._udp.local";
 const MATTER_SERVICE_QNAME = "_matter._tcp.local";
+const DEFAULT_PAIRING_HINT = {
+  powerCycle: true,
+  deviceManual: true
+};
+const PAIRING_HINTS_REQUIRING_INSTRUCTION = Array(
+  "customInstruction",
+  "pressRestButtonForNumberOfSeconds",
+  "pressResetButtonUntilLightBlinks",
+  "pressResetButtonForNumberOfSecondsWithApplicationOfPower",
+  "pressResetButtonUntilLightBlinksWithApplicationOfPower",
+  "pressResetButtonNumberOfTimes",
+  "pressSetupButtonForNumberOfSeconds",
+  "pressSetupButtonUntilLightBlinks",
+  "pressSetupButtonForNumberOfSecondsWithApplicationOfPower",
+  "pressSetupButtonUntilLightBlinksWithApplicationOfPower",
+  "pressSetupButtonNumberOfTimes"
+);
 const getFabricQname = (operationalIdString) => `_I${operationalIdString}._sub.${MATTER_SERVICE_QNAME}`;
-const getDeviceMatterQname = (operationalIdString, nodeIdString) => `${operationalIdString}-${nodeIdString}.${MATTER_SERVICE_QNAME}`;
+const getOperationalDeviceQname = (operationalIdString, nodeIdString) => `${operationalIdString}-${nodeIdString}.${MATTER_SERVICE_QNAME}`;
 const getVendorQname = (vendorId) => `_V${vendorId}._sub.${MATTER_COMMISSION_SERVICE_QNAME}`;
 const getDeviceTypeQname = (deviceType) => `_T${deviceType}._sub.${MATTER_COMMISSION_SERVICE_QNAME}`;
 const getShortDiscriminatorQname = (shortDiscriminator) => `_S${shortDiscriminator}._sub.${MATTER_COMMISSION_SERVICE_QNAME}`;
 const getLongDiscriminatorQname = (longDiscriminator) => `_L${longDiscriminator}._sub.${MATTER_COMMISSION_SERVICE_QNAME}`;
 const getCommissioningModeQname = () => `_CM._sub.${MATTER_COMMISSION_SERVICE_QNAME}`;
-const getDeviceInstanceQname = (instanceId) => `${instanceId}.${MATTER_COMMISSION_SERVICE_QNAME}`;
+const getCommissionableDeviceQname = (instanceId) => `${instanceId}.${MATTER_COMMISSION_SERVICE_QNAME}`;
+const getCommissionerDeviceQname = (instanceId) => `${instanceId}.${MATTER_COMMISSIONER_SERVICE_QNAME}`;
 export {
+  DEFAULT_PAIRING_HINT,
   MATTER_COMMISSIONER_SERVICE_QNAME,
   MATTER_COMMISSION_SERVICE_QNAME,
   MATTER_SERVICE_QNAME,
+  MDNS_BROADCAST_IPV4,
+  MDNS_BROADCAST_IPV6,
+  MDNS_BROADCAST_PORT,
+  PAIRING_HINTS_REQUIRING_INSTRUCTION,
   SERVICE_DISCOVERY_QNAME,
+  getCommissionableDeviceQname,
+  getCommissionerDeviceQname,
   getCommissioningModeQname,
-  getDeviceInstanceQname,
-  getDeviceMatterQname,
   getDeviceTypeQname,
   getFabricQname,
   getLongDiscriminatorQname,
+  getOperationalDeviceQname,
   getShortDiscriminatorQname,
   getVendorQname
 };

package/dist/esm/mdns/MdnsConsts.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/mdns/MdnsConsts.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQO,MAAM,0BAA0B;AAChC,MAAM,kCAAkC;AACxC,MAAM,oCAAoC;AAC1C,MAAM,uBAAuB;AAE7B,MAAM,iBAAiB,CAAC,wBAAgC,KAAK,mBAAmB,SAAS,oBAAoB;AAC7G,MAAM,uBAAuB,CAAC,qBAA6B,iBAC9D,GAAG,mBAAmB,IAAI,YAAY,IAAI,oBAAoB;AAC3D,MAAM,iBAAiB,CAAC,aAAuB,KAAK,QAAQ,SAAS,+BAA+B;AACpG,MAAM,qBAAqB,CAAC,eAAuB,KAAK,UAAU,SAAS,+BAA+B;AAC1G,MAAM,6BAA6B,CAAC,uBACvC,KAAK,kBAAkB,SAAS,+BAA+B;AAC5D,MAAM,4BAA4B,CAAC,sBACtC,KAAK,iBAAiB,SAAS,+BAA+B;AAC3D,MAAM,4BAA4B,MAAM,YAAY,+BAA+B;AACnF,MAAM,yBAAyB,CAAC,eAAuB,GAAG,UAAU,IAAI,+BAA+B;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,sBAAsB;AAC5B,MAAM,sBAAsB;AAC5B,MAAM,sBAAsB;AAE5B,MAAM,0BAA0B;AAChC,MAAM,kCAAkC;AACxC,MAAM,oCAAoC;AAC1C,MAAM,uBAAuB;AAE7B,MAAM,uBAAuB;AAAA,EAChC,YAAY;AAAA,EACZ,cAAc;AAClB;AAEO,MAAM,sCAAsC;AAAA,EAC/C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACJ;AAEO,MAAM,iBAAiB,CAAC,wBAAgC,KAAK,mBAAmB,SAAS,oBAAoB;AAC7G,MAAM,4BAA4B,CAAC,qBAA6B,iBACnE,GAAG,mBAAmB,IAAI,YAAY,IAAI,oBAAoB;AAC3D,MAAM,iBAAiB,CAAC,aAAuB,KAAK,QAAQ,SAAS,+BAA+B;AACpG,MAAM,qBAAqB,CAAC,eAAuB,KAAK,UAAU,SAAS,+BAA+B;AAC1G,MAAM,6BAA6B,CAAC,uBACvC,KAAK,kBAAkB,SAAS,+BAA+B;AAC5D,MAAM,4BAA4B,CAAC,sBACtC,KAAK,iBAAiB,SAAS,+BAA+B;AAC3D,MAAM,4BAA4B,MAAM,YAAY,+BAA+B;AACnF,MAAM,+BAA+B,CAAC,eAAuB,GAAG,UAAU,IAAI,+BAA+B;AAC7G,MAAM,6BAA6B,CAAC,eAAuB,GAAG,UAAU,IAAI,iCAAiC;",
   "names": []
 }

package/dist/esm/mdns/MdnsServer.d.ts

@@ -3,31 +3,22 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DnsRecord, Network, UdpMulticastServer } from "#general";
-export declare const MDNS_BROADCAST_IPV4 = "224.0.0.251";
-export declare const MDNS_BROADCAST_IPV6 = "ff02::fb";
-export declare const MDNS_BROADCAST_PORT = 5353;
-export declare enum AnnouncementType {
-    Commissionable = 0,
-    Operative = 1
-}
+import { DnsRecord, NetworkInterfaceDetails } from "#general";
+import { MdnsSocket } from "./MdnsSocket.js";
 export declare class MdnsServer {
     #private;
-    static create(network: Network, options?: {
-        enableIpv4?: boolean;
-        netInterface?: string;
-    }): Promise<MdnsServer>;
-    constructor(network: Network, multicastServer: UdpMulticastServer, netInterface: string | undefined);
+    constructor(socket: MdnsSocket);
+    get network(): import("#general").Network;
+    get supportsIpv4(): boolean;
     buildDnsRecordKey(record: DnsRecord<any>, netInterface?: string, unicastTarget?: string): string;
-    buildTypePortKey(type: AnnouncementType, port: number): string;
-    isKeyForPort(key: string, port: number): boolean;
-    announce(announcedNetPort?: number): Promise<void>;
-    expireAnnouncements(options?: {
-        announcedNetPort?: number;
-        type?: AnnouncementType;
-        forInstance?: string;
-    }): Promise<void>;
-    setRecordsGenerator(hostPort: number, type: AnnouncementType, generator: (netInterface: string) => Promise<DnsRecord<any>[]>): Promise<void>;
+    broadcast(...services: string[]): Promise<void>;
+    expireAnnouncements(...services: string[]): Promise<void>;
+    setRecordsGenerator(service: string, generator: MdnsServer.RecordGenerator): Promise<void>;
     close(): Promise<void>;
 }
+export declare namespace MdnsServer {
+    interface RecordGenerator {
+        (intf: string, addrs: NetworkInterfaceDetails): DnsRecord[];
+    }
+}
 //# sourceMappingURL=MdnsServer.d.ts.map

package/dist/esm/mdns/MdnsServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MdnsServer.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAOH,SAAS,EAMT,OAAO,EAEP,kBAAkB,EACrB,MAAM,UAAU,CAAC;AAIlB,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,oBAAY,gBAAgB;IACxB,cAAc,IAAA;IACd,SAAS,IAAA;CACZ;AAED,qBAAa,UAAU;;WACN,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;gBAkCnF,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS;IASnG,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;IAIvF,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM;IAIrD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAuKhC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM;IAgBlC,mBAAmB,CAAC,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAsD1G,mBAAmB,CACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;IAQ5D,KAAK;CAkBd"}
+{"version":3,"file":"MdnsServer.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGH,SAAS,EAKT,uBAAuB,EAG1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,qBAAa,UAAU;;gBAwBP,MAAM,EAAE,UAAU;IAK9B,IAAI,OAAO,+BAEV;IAED,IAAI,YAAY,YAEf;IAED,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;IAgGjF,SAAS,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE;IAyBzC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,eAAe;IAW1E,KAAK;CAkBd;AAED,yBAAiB,UAAU,CAAC;IACxB,UAAiB,eAAe;QAC5B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB,GAAG,SAAS,EAAE,CAAC;KAC/D;CACJ"}

package/dist/esm/mdns/MdnsServer.js

@@ -5,82 +5,52 @@
  */
 import {
   AsyncCache,
-  Diagnostic,
-  DnsCodec,
   DnsMessageType,
   DnsRecordType,
   isDeepEqual,
   Logger,
   MatterAggregateError,
-  MAX_MDNS_MESSAGE_SIZE,
-  Time,
-  UdpMulticastServer
+  ObserverGroup,
+  Time
 } from "#general";
 const logger = Logger.get("MdnsServer");
-const MDNS_BROADCAST_IPV4 = "224.0.0.251";
-const MDNS_BROADCAST_IPV6 = "ff02::fb";
-const MDNS_BROADCAST_PORT = 5353;
-var AnnouncementType = /* @__PURE__ */ ((AnnouncementType2) => {
-  AnnouncementType2[AnnouncementType2["Commissionable"] = 0] = "Commissionable";
-  AnnouncementType2[AnnouncementType2["Operative"] = 1] = "Operative";
-  return AnnouncementType2;
-})(AnnouncementType || {});
 class MdnsServer {
-  static async create(network, options) {
-    const { enableIpv4 = true, netInterface } = options ?? {};
-    return new MdnsServer(
-      network,
-      await UdpMulticastServer.create({
-        network,
-        netInterface,
-        broadcastAddressIpv4: enableIpv4 ? MDNS_BROADCAST_IPV4 : void 0,
-        broadcastAddressIpv6: MDNS_BROADCAST_IPV6,
-        listeningPort: MDNS_BROADCAST_PORT
-      }),
-      netInterface
-    );
-  }
+  #observers = new ObserverGroup();
   #recordsGenerator = /* @__PURE__ */ new Map();
   #records = new AsyncCache(
     "MDNS discovery",
     async (multicastInterface) => {
-      const portTypeMap = /* @__PURE__ */ new Map();
-      for (const [announceTypePort, generator] of this.#recordsGenerator) {
-        portTypeMap.set(announceTypePort, await generator(multicastInterface));
+      const serviceRecords = /* @__PURE__ */ new Map();
+      const addrs = await this.network.getIpMac(multicastInterface);
+      if (addrs === void 0) {
+        return serviceRecords;
+      }
+      for (const [service, generator] of this.#recordsGenerator) {
+        serviceRecords.set(service, generator(multicastInterface, addrs));
       }
-      return portTypeMap;
+      return serviceRecords;
     },
     15 * 60 * 1e3
   );
   #recordLastSentAsMulticastAnswer = /* @__PURE__ */ new Map();
-  #recordLastSentAsUnicastAnswer = /* @__PURE__ */ new Map();
-  #network;
-  #multicastServer;
-  #netInterface;
-  constructor(network, multicastServer, netInterface) {
-    multicastServer.onMessage(
-      (message, remoteIp, netInterface2) => void this.#handleDnsMessage(message, remoteIp, netInterface2)
-    );
-    this.#network = network;
-    this.#multicastServer = multicastServer;
-    this.#netInterface = netInterface;
+  #socket;
+  constructor(socket) {
+    this.#socket = socket;
+    this.#observers.on(this.#socket.receipt, this.#handleMessage.bind(this));
   }
-  buildDnsRecordKey(record, netInterface, unicastTarget) {
-    return `${record.name}-${record.recordClass}-${record.recordType}-${netInterface}-${unicastTarget}`;
+  get network() {
+    return this.#socket.network;
   }
-  buildTypePortKey(type, port) {
-    return `${port}-${type}`;
+  get supportsIpv4() {
+    return this.#socket.supportsIpv4;
   }
-  isKeyForPort(key, port) {
-    return key.startsWith(`${port}-`);
+  buildDnsRecordKey(record, netInterface, unicastTarget) {
+    return `${record.name}-${record.recordClass}-${record.recordType}-${netInterface}-${unicastTarget}`;
   }
-  async #handleDnsMessage(messageBytes, remoteIp, netInterface) {
-    if (netInterface === void 0) return;
-    const records = await this.#records.get(netInterface);
+  async #handleMessage(message) {
+    const records = await this.#records.get(message.sourceIntf);
     if (records.size === 0) return;
-    const message = DnsCodec.decode(messageBytes);
-    if (message === void 0) return;
-    const { transactionId, messageType, queries, answers: knownAnswers } = message;
+    const { sourceIntf, sourceIp, transactionId, messageType, queries, answers: knownAnswers } = message;
     if (messageType !== DnsMessageType.Query && messageType !== DnsMessageType.TruncatedQuery) return;
     if (queries.length === 0) return;
     for (const portRecords of records.values()) {
@@ -106,42 +76,33 @@ class MdnsServer {
       const now = Time.nowMs();
       let uniCastResponse = queries.filter((query) => !query.uniCastResponse).length === 0;
       const answersTimeSinceLastSent = answers.map((answer) => ({
-        timeSinceLastMultiCast: now - (this.#recordLastSentAsMulticastAnswer.get(this.buildDnsRecordKey(answer, netInterface)) ?? 0),
-        timeSinceLastUniCast: now - (this.#recordLastSentAsUnicastAnswer.get(this.buildDnsRecordKey(answer, netInterface, remoteIp)) ?? 0),
-        ttl: answer.ttl
+        timeSinceLastMultiCast: now - (this.#recordLastSentAsMulticastAnswer.get(this.buildDnsRecordKey(answer, sourceIntf)) ?? 0),
+        ttl: answer.ttl * 1e3
       }));
-      if (uniCastResponse && answersTimeSinceLastSent.some(
-        ({ timeSinceLastMultiCast, ttl }) => timeSinceLastMultiCast > ttl / 4 * 1e3
-      )) {
+      if (uniCastResponse && answersTimeSinceLastSent.some(({ timeSinceLastMultiCast, ttl }) => timeSinceLastMultiCast > ttl / 4)) {
         uniCastResponse = false;
       }
       if (!uniCastResponse) {
-        answers = answers.filter((_, index) => answersTimeSinceLastSent[index].timeSinceLastMultiCast > 1e3);
-        if (answers.length === 0) continue;
-        answers.forEach(
-          (answer) => this.#recordLastSentAsMulticastAnswer.set(this.buildDnsRecordKey(answer, netInterface), now)
+        answers = answers.filter(
+          (_, index) => answersTimeSinceLastSent[index].timeSinceLastMultiCast >= 900
+          // The last time sent as multicast was more than 900 ms ago
         );
-      } else {
-        answers = answers.filter((_, index) => answersTimeSinceLastSent[index].timeSinceLastUniCast > 1e3);
         if (answers.length === 0) continue;
         answers.forEach(
-          (answer) => this.#recordLastSentAsUnicastAnswer.set(
-            this.buildDnsRecordKey(answer, netInterface, remoteIp),
-            now
-          )
+          (answer) => this.#recordLastSentAsMulticastAnswer.set(this.buildDnsRecordKey(answer, sourceIntf), now)
         );
       }
-      this.#sendRecords(
+      this.#socket.send(
         {
           messageType: DnsMessageType.Response,
           transactionId,
           answers,
           additionalRecords
         },
-        netInterface,
-        uniCastResponse ? remoteIp : void 0
+        sourceIntf,
+        uniCastResponse ? sourceIp : void 0
       ).catch((error) => {
-        logger.warn(`Failed to send mDNS response to ${remoteIp}`, error);
+        logger.warn(`Failed to send mDNS response to ${sourceIp}`, error);
       });
       await Time.sleep("MDNS delay", 20 + Math.floor(Math.random() * 100));
     }
@@ -149,7 +110,7 @@ class MdnsServer {
   async #announceRecordsForInterface(netInterface, records) {
     const answers = records.filter(({ recordType }) => recordType === DnsRecordType.PTR);
     const additionalRecords = records.filter(({ recordType }) => recordType !== DnsRecordType.PTR);
-    await this.#sendRecords(
+    await this.#socket.send(
       {
         messageType: DnsMessageType.Response,
         answers,
@@ -158,115 +119,58 @@ class MdnsServer {
       netInterface
     );
   }
-  async #sendRecords(dnsMessageData, netInterface, unicastTarget) {
-    const { answers = [], additionalRecords = [] } = dnsMessageData;
-    const answersToSend = [...answers];
-    const additionalRecordsToSend = [...additionalRecords];
-    const dnsMessageDataToSend = {
-      ...dnsMessageData,
-      answers: [],
-      additionalRecords: []
-    };
-    const emptyDnsMessage = DnsCodec.encode(dnsMessageDataToSend);
-    let dnsMessageSize = emptyDnsMessage.length;
-    while (true) {
-      if (answersToSend.length > 0) {
-        const nextAnswer = answersToSend.shift();
-        if (nextAnswer === void 0) {
-          break;
-        }
-        const nextAnswerEncoded = DnsCodec.encodeRecord(nextAnswer);
-        dnsMessageSize += nextAnswerEncoded.length;
-        if (dnsMessageSize > MAX_MDNS_MESSAGE_SIZE) {
-          await this.#multicastServer.send(
-            DnsCodec.encode(dnsMessageDataToSend),
-            netInterface,
-            unicastTarget
-          );
-          dnsMessageDataToSend.answers.length = 0;
-          dnsMessageSize = emptyDnsMessage.length + nextAnswerEncoded.length;
-        }
-        dnsMessageDataToSend.answers.push(nextAnswerEncoded);
-      } else {
-        break;
-      }
-    }
-    for (const additionalRecord of additionalRecordsToSend) {
-      const additionalRecordEncoded = DnsCodec.encodeRecord(additionalRecord);
-      dnsMessageSize += additionalRecordEncoded.length;
-      if (dnsMessageSize > MAX_MDNS_MESSAGE_SIZE) {
-        break;
-      }
-      dnsMessageDataToSend.additionalRecords.push(additionalRecordEncoded);
-    }
-    await this.#multicastServer.send(DnsCodec.encode(dnsMessageDataToSend), netInterface, unicastTarget);
-  }
-  async announce(announcedNetPort) {
+  async broadcast(...services) {
     await MatterAggregateError.allSettled(
       (await this.#getMulticastInterfacesForAnnounce()).map(async ({ name: netInterface }) => {
         const records = await this.#records.get(netInterface);
-        for (const [portType, portTypeRecords] of records) {
-          if (announcedNetPort !== void 0 && !this.isKeyForPort(portType, announcedNetPort)) continue;
-          await this.#announceRecordsForInterface(netInterface, portTypeRecords);
+        for (const [service, serviceRecords] of records) {
+          if (services.length && !services.includes(service)) continue;
+          await this.#announceRecordsForInterface(netInterface, serviceRecords);
           await Time.sleep("MDNS delay", 20 + Math.floor(Math.random() * 100));
         }
       }),
-      "Error happened when announcing MDNS messages"
+      "Error announcing MDNS messages"
     ).catch((error) => logger.error(error));
   }
-  async expireAnnouncements(options) {
-    const { announcedNetPort, type, forInstance: instanceToExpire } = options ?? {};
+  async expireAnnouncements(...services) {
     await MatterAggregateError.allSettled(
       this.#records.keys().map(async (netInterface) => {
         const records = await this.#records.get(netInterface);
-        for (const [portType, portTypeRecords] of records) {
-          if (announcedNetPort !== void 0 && !this.isKeyForPort(portType, announcedNetPort)) continue;
-          if (announcedNetPort !== void 0 && type !== void 0 && portType !== this.buildTypePortKey(type, announcedNetPort))
-            continue;
-          const recordsToProcess = instanceToExpire !== void 0 ? portTypeRecords.filter(
-            ({ forInstance }) => forInstance !== void 0 && instanceToExpire === forInstance
-          ) : portTypeRecords;
+        for (const [service, serviceRecords] of records) {
+          if (services.length && !services.includes(service)) continue;
           const instanceSet = /* @__PURE__ */ new Set();
-          recordsToProcess.forEach((record) => {
+          serviceRecords.forEach((record) => {
             record.ttl = 0;
             if (record.recordType === DnsRecordType.TXT) {
               instanceSet.add(record.name);
             }
           });
-          const instanceName = instanceSet.size > 1 ? "multiple" : instanceSet.size === 1 ? Array.from(instanceSet.values())[0] : "";
-          logger.debug(
-            `Expiring records`,
-            Diagnostic.dict({
-              instanceName,
-              port: announcedNetPort,
-              netInterface
-            })
-          );
-          await this.#announceRecordsForInterface(netInterface, portTypeRecords);
-          this.#recordsGenerator.delete(portType);
+          await this.#announceRecordsForInterface(netInterface, serviceRecords);
+          this.#recordsGenerator.delete(service);
           await Time.sleep("MDNS delay", 20 + Math.floor(Math.random() * 100));
         }
       }),
       "Error happened when expiring MDNS announcements"
     ).catch((error) => logger.error(error));
+    await this.#resetServices();
+  }
+  async setRecordsGenerator(service, generator) {
     await this.#records.clear();
     this.#recordLastSentAsMulticastAnswer.clear();
-    this.#recordLastSentAsUnicastAnswer.clear();
+    this.#recordsGenerator.set(service, generator);
   }
-  async setRecordsGenerator(hostPort, type, generator) {
+  async #resetServices() {
     await this.#records.clear();
     this.#recordLastSentAsMulticastAnswer.clear();
-    this.#recordLastSentAsUnicastAnswer.clear();
-    this.#recordsGenerator.set(this.buildTypePortKey(type, hostPort), generator);
   }
   async close() {
+    this.#observers.close();
     await this.#records.close();
     this.#recordLastSentAsMulticastAnswer.clear();
-    this.#recordLastSentAsUnicastAnswer.clear();
-    await this.#multicastServer.close();
   }
   #getMulticastInterfacesForAnnounce() {
-    return this.#netInterface === void 0 ? this.#network.getNetInterfaces() : [{ name: this.#netInterface }];
+    const { netInterface } = this.#socket;
+    return netInterface === void 0 ? this.network.getNetInterfaces() : [{ name: netInterface }];
   }
   #queryRecords({ name, recordType }, records) {
     if (recordType === DnsRecordType.ANY) {
@@ -277,10 +181,6 @@ class MdnsServer {
   }
 }
 export {
-  AnnouncementType,
-  MDNS_BROADCAST_IPV4,
-  MDNS_BROADCAST_IPV6,
-  MDNS_BROADCAST_PORT,
   MdnsServer
 };
 //# sourceMappingURL=MdnsServer.js.map

package/dist/esm/mdns/MdnsServer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/mdns/MdnsServer.ts"],
-  "mappings": "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",
-  "names": ["AnnouncementType", "netInterface"]
+  "mappings": "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",
+  "names": []
 }

package/dist/esm/mdns/MdnsService.d.ts

@@ -4,17 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Construction, Diagnostic, Environment, Environmental } from "#general";
-import { MdnsBroadcaster } from "../mdns/MdnsBroadcaster.js";
-import { MdnsScanner } from "../mdns/MdnsScanner.js";
+import { MdnsServer } from "../mdns/MdnsServer.js";
+import { MdnsClient } from "./MdnsClient.js";
 export declare class MdnsService {
     #private;
     readonly limitedToNetInterface?: string;
     get enableIpv4(): boolean;
     constructor(environment: Environment, options?: MdnsService.Options);
     static [Environmental.create](environment: Environment): MdnsService;
-    createInstanceBroadcaster(port: number): import("./MdnsInstanceBroadcaster.js").MdnsInstanceBroadcaster;
-    get broadcaster(): MdnsBroadcaster;
-    get scanner(): MdnsScanner;
+    get server(): MdnsServer;
+    get client(): MdnsClient;
     get [Diagnostic.value](): string;
     get construction(): Construction<MdnsService>;
     [Symbol.asyncDispose](): Promise<void>;

package/dist/esm/mdns/MdnsService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MdnsService.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,YAAY,EAEZ,UAAU,EACV,WAAW,EACX,aAAa,EAMhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,qBAAa,WAAW;;IAMpB,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAExC,IAAI,UAAU,YAEb;gBAEW,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO;IA0BnE,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW;IAItD,yBAAyB,CAAC,IAAI,EAAE,MAAM;IAItC,IAAI,WAAW,oBAEd;IAED,IAAI,OAAO,gBAEV;IAED,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAErB;IAED,IAAI,YAAY,8BAEf;IAEK,CAAC,MAAM,CAAC,YAAY,CAAC;CAoB9B;AAED,yBAAiB,WAAW,CAAC;IACzB,UAAiB,OAAO;QACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;KAClB;CACJ"}
+{"version":3,"file":"MdnsService.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,YAAY,EACZ,UAAU,EACV,WAAW,EACX,aAAa,EAMhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,qBAAa,WAAW;;IAOpB,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAExC,IAAI,UAAU,YAEb;gBAEW,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO;IAsBnE,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW;IAItD,IAAI,MAAM,eAET;IAED,IAAI,MAAM,eAET;IAED,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAErB;IAED,IAAI,YAAY,8BAEf;IAEK,CAAC,MAAM,CAAC,YAAY,CAAC;CAwB9B;AAED,yBAAiB,WAAW,CAAC;IACzB,UAAiB,OAAO;QACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;KAClB;CACJ"}

package/dist/esm/mdns/MdnsService.js

@@ -5,7 +5,6 @@
  */
 import {
   Construction,
-  Crypto,
   Diagnostic,
   Environmental,
   Logger,
@@ -14,12 +13,14 @@ import {
   Network,
   VariableService
 } from "#general";
-import { MdnsBroadcaster } from "../mdns/MdnsBroadcaster.js";
-import { MdnsScanner } from "../mdns/MdnsScanner.js";
+import { MdnsServer } from "../mdns/MdnsServer.js";
+import { MdnsClient } from "./MdnsClient.js";
+import { MdnsSocket } from "./MdnsSocket.js";
 const logger = Logger.get("MDNS");
 class MdnsService {
-  #broadcaster;
-  #scanner;
+  #socket;
+  #server;
+  #client;
   #env;
   #construction;
   #enableIpv4;
@@ -29,6 +30,7 @@ class MdnsService {
   }
   constructor(environment, options) {
     this.#env = environment;
+    const network = environment.get(Network);
     const rootEnvironment = environment.root;
     rootEnvironment.set(MdnsService, this);
     rootEnvironment.runtime.add(this);
@@ -36,29 +38,22 @@ class MdnsService {
     this.#enableIpv4 = vars.boolean("mdns.ipv4") ?? options?.ipv4 ?? true;
     this.limitedToNetInterface = vars.get("mdns.networkInterface", options?.networkInterface);
     this.#construction = Construction(this, async () => {
-      const crypto = environment.get(Crypto);
-      const network = environment.get(Network);
-      this.#broadcaster = await MdnsBroadcaster.create(crypto, network, {
-        enableIpv4: this.enableIpv4,
-        multicastInterface: this.limitedToNetInterface
-      });
-      this.#scanner = await MdnsScanner.create(network, {
+      this.#socket = await MdnsSocket.create(network, {
         enableIpv4: this.enableIpv4,
         netInterface: this.limitedToNetInterface
       });
+      this.#server = new MdnsServer(this.#socket);
+      this.#client = new MdnsClient(this.#socket);
     });
   }
   static [Environmental.create](environment) {
     return new this(environment);
   }
-  createInstanceBroadcaster(port) {
-    return this.broadcaster.createInstanceBroadcaster(port);
-  }
-  get broadcaster() {
-    return this.#construction.assert("MDNS service", this.#broadcaster);
+  get server() {
+    return this.#construction.assert("MDNS service", this.#server);
   }
-  get scanner() {
-    return this.#construction.assert("MDNS service", this.#scanner);
+  get client() {
+    return this.#construction.assert("MDNS service", this.#client);
   }
   get [Diagnostic.value]() {
     return "MDNS";
@@ -70,20 +65,23 @@ class MdnsService {
     this.#env.delete(MdnsService, this);
     await this.#construction.close(async () => {
       const broadcasterDisposal = MaybePromise.then(
-        this.#broadcaster?.close(),
+        this.#server?.close(),
         void 0,
-        (e) => logger.error("Error disposing of MDNS broadcaster", e)
+        (e) => logger.error("Error disposing of MDNS server", e)
       );
       const scannerDisposal = MaybePromise.then(
-        this.#scanner?.close(),
+        this.#client?.close(),
         void 0,
-        (e) => logger.error("Error disposing of MDNS scanner", e)
+        (e) => logger.error("Error disposing of MDNS client", e)
       );
       await MatterAggregateError.allSettled(
         [broadcasterDisposal, scannerDisposal],
         "Error disposing MDNS services"
       ).catch((error) => logger.error(error));
-      this.#broadcaster = this.#scanner = void 0;
+      if (this.#socket) {
+        await this.#socket?.close();
+      }
+      this.#server = this.#client = void 0;
     });
   }
 }

package/dist/esm/mdns/MdnsService.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/mdns/MdnsService.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,uBAAuB;AAChC,SAAS,mBAAmB;AAE5B,MAAM,SAAS,OAAO,IAAI,MAAM;AAEzB,MAAM,YAAY;AAAA,EACrB;AAAA,EACA;AAAA,EACA;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EAET,IAAI,aAAa;AACb,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,aAA0B,SAA+B;AACjE,SAAK,OAAO;AACZ,UAAM,kBAAkB,YAAY;AACpC,oBAAgB,IAAI,aAAa,IAAI;AACrC,oBAAgB,QAAQ,IAAI,IAAI;AAEhC,UAAM,OAAO,YAAY,IAAI,eAAe;AAC5C,SAAK,cAAc,KAAK,QAAQ,WAAW,KAAK,SAAS,QAAQ;AACjE,SAAK,wBAAwB,KAAK,IAAI,yBAAyB,SAAS,gBAAgB;AAExF,SAAK,gBAAgB,aAAa,MAAM,YAAY;AAChD,YAAM,SAAS,YAAY,IAAI,MAAM;AACrC,YAAM,UAAU,YAAY,IAAI,OAAO;AAEvC,WAAK,eAAe,MAAM,gBAAgB,OAAO,QAAQ,SAAS;AAAA,QAC9D,YAAY,KAAK;AAAA,QACjB,oBAAoB,KAAK;AAAA,MAC7B,CAAC;AAED,WAAK,WAAW,MAAM,YAAY,OAAO,SAAS;AAAA,QAC9C,YAAY,KAAK;AAAA,QACjB,cAAc,KAAK;AAAA,MACvB,CAAC;AAAA,IACL,CAAC;AAAA,EACL;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,aAA0B;AACpD,WAAO,IAAI,KAAK,WAAW;AAAA,EAC/B;AAAA,EAEA,0BAA0B,MAAc;AACpC,WAAO,KAAK,YAAY,0BAA0B,IAAI;AAAA,EAC1D;AAAA,EAEA,IAAI,cAAc;AACd,WAAO,KAAK,cAAc,OAAO,gBAAgB,KAAK,YAAY;AAAA,EACtE;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK,cAAc,OAAO,gBAAgB,KAAK,QAAQ;AAAA,EAClE;AAAA,EAEA,KAAK,WAAW,KAAK,IAAI;AACrB,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,OAAO,OAAO,YAAY,IAAI;AAC1B,SAAK,KAAK,OAAO,aAAa,IAAI;AAElC,UAAM,KAAK,cAAc,MAAM,YAAY;AACvC,YAAM,sBAAsB,aAAa;AAAA,QAAK,KAAK,cAAc,MAAM;AAAA,QAAG;AAAA,QAAW,OACjF,OAAO,MAAM,uCAAuC,CAAC;AAAA,MACzD;AAEA,YAAM,kBAAkB,aAAa;AAAA,QAAK,KAAK,UAAU,MAAM;AAAA,QAAG;AAAA,QAAW,OACzE,OAAO,MAAM,mCAAmC,CAAC;AAAA,MACrD;AAEA,YAAM,qBAAqB;AAAA,QACvB,CAAC,qBAAqB,eAAe;AAAA,QACrC;AAAA,MACJ,EAAE,MAAM,WAAS,OAAO,MAAM,KAAK,CAAC;AAEpC,WAAK,eAAe,KAAK,WAAW;AAAA,IACxC,CAAC;AAAA,EACL;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,kBAAkB;AAC3B,SAAS,kBAAkB;AAC3B,SAAS,kBAAkB;AAE3B,MAAM,SAAS,OAAO,IAAI,MAAM;AAEzB,MAAM,YAAY;AAAA,EACrB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EAET,IAAI,aAAa;AACb,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,aAA0B,SAA+B;AACjE,SAAK,OAAO;AACZ,UAAM,UAAU,YAAY,IAAI,OAAO;AACvC,UAAM,kBAAkB,YAAY;AACpC,oBAAgB,IAAI,aAAa,IAAI;AACrC,oBAAgB,QAAQ,IAAI,IAAI;AAEhC,UAAM,OAAO,YAAY,IAAI,eAAe;AAC5C,SAAK,cAAc,KAAK,QAAQ,WAAW,KAAK,SAAS,QAAQ;AACjE,SAAK,wBAAwB,KAAK,IAAI,yBAAyB,SAAS,gBAAgB;AAExF,SAAK,gBAAgB,aAAa,MAAM,YAAY;AAChD,WAAK,UAAU,MAAM,WAAW,OAAO,SAAS;AAAA,QAC5C,YAAY,KAAK;AAAA,QACjB,cAAc,KAAK;AAAA,MACvB,CAAC;AAED,WAAK,UAAU,IAAI,WAAW,KAAK,OAAO;AAC1C,WAAK,UAAU,IAAI,WAAW,KAAK,OAAO;AAAA,IAC9C,CAAC;AAAA,EACL;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,aAA0B;AACpD,WAAO,IAAI,KAAK,WAAW;AAAA,EAC/B;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,KAAK,cAAc,OAAO,gBAAgB,KAAK,OAAO;AAAA,EACjE;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,KAAK,cAAc,OAAO,gBAAgB,KAAK,OAAO;AAAA,EACjE;AAAA,EAEA,KAAK,WAAW,KAAK,IAAI;AACrB,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,OAAO,OAAO,YAAY,IAAI;AAC1B,SAAK,KAAK,OAAO,aAAa,IAAI;AAElC,UAAM,KAAK,cAAc,MAAM,YAAY;AACvC,YAAM,sBAAsB,aAAa;AAAA,QAAK,KAAK,SAAS,MAAM;AAAA,QAAG;AAAA,QAAW,OAC5E,OAAO,MAAM,kCAAkC,CAAC;AAAA,MACpD;AAEA,YAAM,kBAAkB,aAAa;AAAA,QAAK,KAAK,SAAS,MAAM;AAAA,QAAG;AAAA,QAAW,OACxE,OAAO,MAAM,kCAAkC,CAAC;AAAA,MACpD;AAEA,YAAM,qBAAqB;AAAA,QACvB,CAAC,qBAAqB,eAAe;AAAA,QACrC;AAAA,MACJ,EAAE,MAAM,WAAS,OAAO,MAAM,KAAK,CAAC;AAEpC,UAAI,KAAK,SAAS;AACd,cAAM,KAAK,SAAS,MAAM;AAAA,MAC9B;AAEA,WAAK,UAAU,KAAK,UAAU;AAAA,IAClC,CAAC;AAAA,EACL;AACJ;",
   "names": []
 }