@libp2p/mdns 0.18.0 → 1.0.2

package/dist/src/index.js

@@ -1,37 +1,34 @@
 import multicastDNS from 'multicast-dns';
-import { EventEmitter } from 'events';
-import debug from 'debug';
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces';
+import { logger } from '@libp2p/logger';
 import * as query from './query.js';
 import { GoMulticastDNS } from './compat/index.js';
-const log = Object.assign(debug('libp2p:mdns'), {
-    error: debug('libp2p:mdns:error')
-});
+import { Components } from '@libp2p/interfaces/components';
+const log = logger('libp2p:mdns');
 export class MulticastDNS extends EventEmitter {
-    constructor(options) {
+    constructor(options = {}) {
         super();
-        if (options.peerId == null) {
-            throw new Error('needs own PeerId to work');
-        }
+        this.components = new Components();
         this.broadcast = options.broadcast !== false;
         this.interval = options.interval ?? (1e3 * 10);
         this.serviceTag = options.serviceTag ?? 'ipfs.local';
         this.port = options.port ?? 5353;
-        this.peerId = options.peerId;
-        this.peerMultiaddrs = options.multiaddrs ?? [];
         this._queryInterval = null;
         this._onPeer = this._onPeer.bind(this);
         this._onMdnsQuery = this._onMdnsQuery.bind(this);
         this._onMdnsResponse = this._onMdnsResponse.bind(this);
         if (options.compat !== false) {
             this._goMdns = new GoMulticastDNS({
-                multiaddrs: this.peerMultiaddrs,
-                peerId: options.peerId,
                 queryPeriod: options.compatQueryPeriod,
                 queryInterval: options.compatQueryInterval
             });
-            this._goMdns.on('peer', this._onPeer);
+            this._goMdns.addEventListener('peer', this._onPeer);
         }
     }
+    init(components) {
+        this.components = components;
+        this._goMdns?.init(components);
+    }
     isStarted() {
         return Boolean(this.mdns);
     }
@@ -56,21 +53,31 @@ export class MulticastDNS extends EventEmitter {
         if (this.mdns == null) {
             return;
         }
-        query.gotQuery(event, this.mdns, this.peerId, this.peerMultiaddrs, this.serviceTag, this.broadcast);
+        log.trace('received incoming mDNS query');
+        query.gotQuery(event, this.mdns, this.components.getPeerId(), this.components.getAddressManager().getAddresses(), this.serviceTag, this.broadcast);
     }
     _onMdnsResponse(event) {
+        log.trace('received mDNS query response');
         try {
-            const foundPeer = query.gotResponse(event, this.peerId, this.serviceTag);
+            const foundPeer = query.gotResponse(event, this.components.getPeerId(), this.serviceTag);
             if (foundPeer != null) {
-                this.emit('peer', foundPeer);
+                log('discovered peer in mDNS qeury response %p', foundPeer.id);
+                this.dispatchEvent(new CustomEvent('peer', {
+                    detail: foundPeer
+                }));
             }
         }
         catch (err) {
-            log('Error processing peer response', err);
+            log.error('Error processing peer response', err);
         }
     }
-    _onPeer(peerData) {
-        (this.mdns != null) && this.emit('peer', peerData);
+    _onPeer(evt) {
+        if (this.mdns == null) {
+            return;
+        }
+        this.dispatchEvent(new CustomEvent('peer', {
+            detail: evt.detail
+        }));
     }
     /**
      * Stop sending queries to the LAN.
@@ -83,7 +90,7 @@ export class MulticastDNS extends EventEmitter {
         }
         this.mdns.removeListener('query', this._onMdnsQuery);
         this.mdns.removeListener('response', this._onMdnsResponse);
-        this._goMdns?.removeListener('peer', this._onPeer);
+        this._goMdns?.removeEventListener('peer', this._onPeer);
         if (this._queryInterval != null) {
             clearInterval(this._queryInterval);
             this._queryInterval = null;

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/query.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Multiaddr } from '@multiformats/multiaddr';
-import { PeerId } from '@libp2p/peer-id';
+import type { PeerId } from '@libp2p/interfaces/peer-id';
 import type { PeerData } from '@libp2p/interfaces/peer-data';
 import type { MulticastDNS, ResponsePacket, QueryPacket } from 'multicast-dns';
 export declare function queryLAN(mdns: MulticastDNS, serviceTag: string, interval: number): NodeJS.Timer;

package/dist/src/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAmB,MAAM,yBAAyB,CAAA;AAEpE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAO9E,wBAAgB,QAAQ,CAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAcjF;AAUD,wBAAgB,WAAW,CAAE,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CA2D/G;AAED,wBAAgB,QAAQ,CAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,QAmE9I"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAA8B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK9E,wBAAgB,QAAQ,CAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gBAejF;AAUD,wBAAgB,WAAW,CAAE,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CA6D/G;AAED,wBAAgB,QAAQ,CAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,QAqE9I"}

package/dist/src/query.js

@@ -1,11 +1,8 @@
 import os from 'os';
-import debug from 'debug';
-import { Multiaddr } from '@multiformats/multiaddr';
-import { base58btc } from 'multiformats/bases/base58';
-import { PeerId } from '@libp2p/peer-id';
-const log = Object.assign(debug('libp2p:mdns'), {
-    error: debug('libp2p:mdns:error')
-});
+import { logger } from '@libp2p/logger';
+import { Multiaddr, protocols } from '@multiformats/multiaddr';
+import { peerIdFromString } from '@libp2p/peer-id';
+const log = logger('libp2p:mdns:query');
 export function queryLAN(mdns, serviceTag, interval) {
     const query = () => {
         log('query', serviceTag);
@@ -69,28 +66,31 @@ export function gotResponse(rsp, localPeerId, serviceTag) {
             multiaddrs.push(ma);
         }
     });
-    if (localPeerId.toString(base58btc) === b58Id) {
+    if (localPeerId.toString() === b58Id) {
         return; // replied to myself, ignore
     }
-    log('peer found -', b58Id);
+    const id = peerIdFromString(b58Id);
+    log('peer found %p', id);
     return {
-        id: PeerId.fromString(b58Id),
+        id,
         multiaddrs,
         protocols: []
     };
 }
 export function gotQuery(qry, mdns, peerId, multiaddrs, serviceTag, broadcast) {
     if (!broadcast) {
+        log('not responding to mDNS query as broadcast mode is false');
         return;
     }
     const addresses = multiaddrs.reduce((acc, addr) => {
-        if (addr.isThinWaistAddress()) {
+        if (addr.decapsulateCode(protocols('p2p').code).isThinWaistAddress()) {
             acc.push(addr.toOptions());
         }
         return acc;
     }, []);
     // Only announce TCP for now
     if (addresses.length === 0) {
+        log('no thin waist addresses present, cannot respond to query');
         return;
     }
     if (qry.questions[0] != null && qry.questions[0].name === serviceTag) {
@@ -100,12 +100,12 @@ export function gotQuery(qry, mdns, peerId, multiaddrs, serviceTag, broadcast) {
             type: 'PTR',
             class: 'IN',
             ttl: 120,
-            data: peerId.toString(base58btc) + '.' + serviceTag
+            data: peerId.toString() + '.' + serviceTag
         });
         // Only announce TCP multiaddrs for now
         const port = addresses[0].port;
         answers.push({
-            name: peerId.toString(base58btc) + '.' + serviceTag,
+            name: peerId.toString() + '.' + serviceTag,
             type: 'SRV',
             class: 'IN',
             ttl: 120,
@@ -117,11 +117,11 @@ export function gotQuery(qry, mdns, peerId, multiaddrs, serviceTag, broadcast) {
             }
         });
         answers.push({
-            name: peerId.toString(base58btc) + '.' + serviceTag,
+            name: peerId.toString() + '.' + serviceTag,
             type: 'TXT',
             class: 'IN',
             ttl: 120,
-            data: peerId.toString(base58btc)
+            data: peerId.toString()
         });
         addresses.forEach((addr) => {
             if ([4, 6].includes(addr.family)) {

package/dist/src/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/mdns",
-  "version": "0.18.0",
+  "version": "1.0.2",
   "description": "Node.js libp2p mDNS discovery implementation for peer discovery",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-mdns#readme",
@@ -123,27 +123,27 @@
     "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
     "build": "tsc",
     "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test",
+    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/*/*.js",
     "test:node": "npm run test -- -t node --cov",
     "test:electron-main": "npm run test -- -t electron-main",
     "release": "semantic-release"
   },
   "dependencies": {
-    "@libp2p/peer-id": "^1.0.4",
-    "@multiformats/multiaddr": "^10.0.0",
-    "debug": "^4.3.1",
+    "@libp2p/logger": "^1.1.2",
+    "@libp2p/peer-id": "^1.1.8",
+    "@multiformats/multiaddr": "^10.1.5",
     "multicast-dns": "^7.2.0",
     "multiformats": "^9.6.3"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^1.0.8",
-    "@libp2p/interfaces": "^1.1.1",
-    "@libp2p/peer-id-factory": "^1.0.3",
-    "@types/debug": "^4.1.7",
+    "@libp2p/interface-compliance-tests": "^1.1.16",
+    "@libp2p/interfaces": "^1.3.14",
+    "@libp2p/peer-id-factory": "^1.0.8",
     "@types/multicast-dns": "^7.2.1",
-    "aegir": "^36.1.0",
+    "aegir": "^36.1.3",
     "delay": "^5.0.0",
     "p-defer": "^4.0.0",
-    "p-wait-for": "^4.1.0"
+    "p-wait-for": "^4.1.0",
+    "ts-sinon": "^2.0.2"
   }
 }

package/src/compat/index.ts

@@ -1,37 +1,42 @@
 // Compatibility with Go libp2p MDNS
-import { EventEmitter } from 'events'
+import { EventEmitter, CustomEvent } from '@libp2p/interfaces'
 import { Responder } from './responder.js'
 import { Querier } from './querier.js'
-import type { Multiaddr } from '@multiformats/multiaddr'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { PeerDiscovery } from '@libp2p/interfaces/peer-discovery'
+import type { PeerDiscovery, PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
+import type { Components, Initializable } from '@libp2p/interfaces/components'
 
-export class GoMulticastDNS extends EventEmitter implements PeerDiscovery {
+export interface GoMulticastDNSInit {
+  queryPeriod?: number
+  queryInterval?: number
+}
+
+export class GoMulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements PeerDiscovery, Initializable {
   private _started: boolean
   private readonly _responder: Responder
   private readonly _querier: Querier
 
-  constructor (options: { peerId: PeerId, multiaddrs: Multiaddr[], queryPeriod?: number, queryInterval?: number }) {
+  constructor (options: GoMulticastDNSInit = {}) {
     super()
-    const { peerId, multiaddrs, queryPeriod, queryInterval } = options
+    const { queryPeriod, queryInterval } = options
 
     this._started = false
 
-    this._responder = new Responder({
-      peerId,
-      multiaddrs
-    })
+    this._responder = new Responder()
     this._querier = new Querier({
-      peerId,
       queryInterval,
       queryPeriod
     })
 
-    this._querier.on('peer', (peerData) => {
-      this.emit('peer', peerData)
+    this._querier.addEventListener('peer', (evt) => {
+      this.dispatchEvent(new CustomEvent('peer', { detail: evt.detail }))
     })
   }
 
+  init (components: Components): void {
+    this._responder.init(components)
+    this._querier.init(components)
+  }
+
   isStarted () {
     return this._started
   }

package/src/compat/querier.ts

@@ -1,20 +1,16 @@
-import { EventEmitter } from 'events'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
 import MDNS from 'multicast-dns'
-import { Multiaddr } from '@multiformats/multiaddr'
-import { PeerId } from '@libp2p/peer-id'
-import debug from 'debug'
+import { logger } from '@libp2p/logger'
 import { SERVICE_TAG_LOCAL, MULTICAST_IP, MULTICAST_PORT } from './constants.js'
-import { base58btc } from 'multiformats/bases/base58'
-import type { PeerDiscovery } from '@libp2p/interfaces/peer-discovery'
+import type { PeerDiscovery, PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
 import type { ResponsePacket } from 'multicast-dns'
 import type { RemoteInfo } from 'dgram'
+import { Components, Initializable } from '@libp2p/interfaces/components'
+import { findPeerDataInAnswers } from './utils.js'
 
-const log = Object.assign(debug('libp2p:mdns:compat:querier'), {
-  error: debug('libp2p:mdns:compat:querier:error')
-})
+const log = logger('libp2p:mdns:compat:querier')
 
-export interface QuerierOptions {
-  peerId: PeerId
+export interface QuerierInit {
   queryInterval?: number
   queryPeriod?: number
 }
@@ -23,24 +19,17 @@ export interface Handle {
   stop: () => Promise<void>
 }
 
-export class Querier extends EventEmitter implements PeerDiscovery {
-  private readonly _peerIdStr: string
-  private readonly _options: Required<QuerierOptions>
+export class Querier extends EventEmitter<PeerDiscoveryEvents> implements PeerDiscovery, Initializable {
+  private readonly _init: Required<QuerierInit>
   private _handle?: Handle
+  private components: Components = new Components()
 
-  constructor (options: QuerierOptions) {
+  constructor (init: QuerierInit = {}) {
     super()
 
-    const { peerId, queryInterval, queryPeriod } = options
-
-    if (peerId == null) {
-      throw new Error('missing peerId parameter')
-    }
-
-    this._peerIdStr = peerId.toString(base58btc)
-    this._options = {
-      peerId,
+    const { queryInterval, queryPeriod } = init
 
+    this._init = {
       // Re-query in leu of network change detection (every 60s by default)
       queryInterval: queryInterval ?? 60000,
       // Time for which the MDNS server will stay alive waiting for responses
@@ -53,6 +42,10 @@ export class Querier extends EventEmitter implements PeerDiscovery {
     this._onResponse = this._onResponse.bind(this)
   }
 
+  init (components: Components): void {
+    this.components = components
+  }
+
   isStarted () {
     return Boolean(this._handle)
   }
@@ -84,74 +77,32 @@ export class Querier extends EventEmitter implements PeerDiscovery {
         }
       }
     }, {
-      period: this._options.queryPeriod,
-      interval: this._options.queryInterval
+      period: this._init.queryPeriod,
+      interval: this._init.queryInterval
     })
   }
 
   _onResponse (event: ResponsePacket, info: RemoteInfo) {
+    log.trace('received mDNS query response')
     const answers = event.answers ?? []
-    const ptrRecord = answers.find(a => a.type === 'PTR' && a.name === SERVICE_TAG_LOCAL)
-
-    // Only deal with responses for our service tag
-    if (ptrRecord == null) return
-
-    log('got response', event, info)
-
-    const txtRecord = answers.find(a => a.type === 'TXT')
-    if (txtRecord == null || txtRecord.type !== 'TXT') {
-      return log('missing TXT record in response')
-    }
 
-    let peerIdStr
-    try {
-      peerIdStr = txtRecord.data[0].toString()
-    } catch (err) {
-      return log('failed to extract peer ID from TXT record data', txtRecord, err)
-    }
-
-    if (this._peerIdStr === peerIdStr) {
-      return log('ignoring reply to myself')
-    }
+    const peerData = findPeerDataInAnswers(answers, this.components.getPeerId())
 
-    let peerId
-    try {
-      peerId = PeerId.fromString(peerIdStr)
-    } catch (err) {
-      return log('failed to create peer ID from TXT record data', peerIdStr, err)
+    if (peerData == null) {
+      log('could not read peer data from query response')
+      return
     }
 
-    const srvRecord = answers.find(a => a.type === 'SRV')
-    if (srvRecord == null || srvRecord.type !== 'SRV') {
-      return log('missing SRV record in response')
+    if (peerData.multiaddrs.length === 0) {
+      log('could not parse multiaddrs from mDNS response')
+      return
     }
 
-    log('peer found', peerIdStr)
+    log('discovered peer in mDNS qeury response %p', peerData.id)
 
-    const { port } = srvRecord.data ?? {}
-    const protos = { A: 'ip4', AAAA: 'ip6' }
-
-    const multiaddrs = answers
-      .filter(a => ['A', 'AAAA'].includes(a.type))
-      .reduce<Multiaddr[]>((addrs, a) => {
-      if (a.type !== 'A' && a.type !== 'AAAA') {
-        return addrs
-      }
-
-      const maStr = `/${protos[a.type]}/${a.data}/tcp/${port}`
-      try {
-        addrs.push(new Multiaddr(maStr))
-        log(maStr)
-      } catch (err) {
-        log(`failed to create multiaddr from ${a.type} record data`, maStr, port, err)
-      }
-      return addrs
-    }, [])
-
-    this.emit('peer', {
-      id: peerId,
-      multiaddrs
-    })
+    this.dispatchEvent(new CustomEvent('peer', {
+      detail: peerData
+    }))
   }
 
   async stop () {

package/src/compat/responder.ts

@@ -1,54 +1,45 @@
 import OS from 'os'
 import MDNS, { QueryPacket } from 'multicast-dns'
-import debug from 'debug'
+import { logger } from '@libp2p/logger'
 import { SERVICE_TAG_LOCAL } from './constants.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { Multiaddr, MultiaddrObject } from '@multiformats/multiaddr'
-import { base58btc } from 'multiformats/bases/base58'
+import { MultiaddrObject, protocols } from '@multiformats/multiaddr'
 import type { RemoteInfo } from 'dgram'
 import type { Answer } from 'dns-packet'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
-const log = Object.assign(debug('libp2p:mdns:compat:responder'), {
-  error: debug('libp2p:mdns:compat:responder:error')
-})
+const log = logger('libp2p:mdns:compat:responder')
 
-export interface ResponderOptions {
-  peerId: PeerId
-  multiaddrs: Multiaddr[]
-}
-
-export class Responder {
-  private readonly _peerIdStr: string
-  private readonly _multiaddrs: Multiaddr[]
+export class Responder implements Initializable {
+  private components: Components = new Components()
   private _mdns?: MDNS.MulticastDNS
 
-  constructor (options: ResponderOptions) {
-    const { peerId, multiaddrs } = options
-
-    if (peerId == null) {
-      throw new Error('missing peerId parameter')
-    }
-
-    this._peerIdStr = peerId.toString(base58btc)
-    this._multiaddrs = multiaddrs
+  constructor () {
     this._onQuery = this._onQuery.bind(this)
   }
 
+  init (components: Components): void {
+    this.components = components
+  }
+
   start () {
     this._mdns = MDNS()
     this._mdns.on('query', this._onQuery)
   }
 
   _onQuery (event: QueryPacket, info: RemoteInfo) {
-    const addresses = this._multiaddrs.reduce<MultiaddrObject[]>((acc, addr) => {
+    const addresses = this.components.getAddressManager().getAddresses().reduce<MultiaddrObject[]>((acc, addr) => {
+      addr = addr.decapsulateCode(protocols('p2p').code)
+
       if (addr.isThinWaistAddress()) {
         acc.push(addr.toOptions())
       }
+
       return acc
     }, [])
 
     // Only announce TCP for now
     if (addresses.length === 0) {
+      log('no tcp addresses configured so cannot respond to mDNS query')
       return
     }
 
@@ -57,10 +48,10 @@ export class Responder {
     // Only respond to queries for our service tag
     if (!questions.some(q => q.name === SERVICE_TAG_LOCAL)) return
 
-    log('got query', event, info)
+    log.trace('got query', event, info)
 
     const answers: Answer[] = []
-    const peerServiceTagLocal = `${this._peerIdStr}.${SERVICE_TAG_LOCAL}`
+    const peerServiceTagLocal = `${this.components.getPeerId().toString()}.${SERVICE_TAG_LOCAL}`
 
     answers.push({
       name: SERVICE_TAG_LOCAL,
@@ -70,44 +61,45 @@ export class Responder {
       data: peerServiceTagLocal
     })
 
-    // Only announce TCP multiaddrs for now
-    const port = addresses[0].port
-
-    answers.push({
-      name: peerServiceTagLocal,
-      type: 'SRV',
-      class: 'IN',
-      ttl: 120,
-      data: {
-        priority: 10,
-        weight: 1,
-        port,
-        target: OS.hostname()
-      }
-    })
-
     answers.push({
       name: peerServiceTagLocal,
       type: 'TXT',
       class: 'IN',
       ttl: 120,
-      data: [Buffer.from(this._peerIdStr)]
+      data: [Buffer.from(this.components.getPeerId().toString())]
     })
 
-    addresses.forEach((ma) => {
-      if ([4, 6].includes(ma.family)) {
-        answers.push({
-          name: OS.hostname(),
-          type: ma.family === 4 ? 'A' : 'AAAA',
-          class: 'IN',
-          ttl: 120,
-          data: ma.host
-        })
+    addresses.forEach(ma => {
+      if (![4, 6].includes(ma.family)) {
+        return
       }
+
+      answers.push({
+        name: peerServiceTagLocal,
+        type: 'SRV',
+        class: 'IN',
+        ttl: 120,
+        data: {
+          priority: 10,
+          weight: 1,
+          port: ma.port,
+          target: OS.hostname()
+        }
+      })
+
+      answers.push({
+        name: OS.hostname(),
+        type: ma.family === 4 ? 'A' : 'AAAA',
+        class: 'IN',
+        ttl: 120,
+        data: ma.host
+      })
     })
 
     if (this._mdns != null) {
-      log('responding to query', answers)
+      log.trace('responding to query')
+      log.trace('query answers', answers)
+
       this._mdns.respond(answers, info)
     }
   }