@libp2p/mdns 1.0.0 → 1.0.3

package/src/compat/utils.ts

@@ -0,0 +1,81 @@
+import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import type { PeerId } from '@libp2p/interfaces/peer-id'
+import { logger } from '@libp2p/logger'
+import { peerIdFromString } from '@libp2p/peer-id'
+import { Multiaddr } from '@multiformats/multiaddr'
+import type { Answer } from 'dns-packet'
+import { SERVICE_TAG_LOCAL } from './constants.js'
+
+const log = logger('libp2p:mdns:compat:utils')
+
+export function findPeerInfoInAnswers (answers: Answer[], ourPeerId: PeerId): PeerInfo | undefined {
+  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.trace('got response', SERVICE_TAG_LOCAL)
+
+  const txtRecord = answers.find(a => a.type === 'TXT')
+  if (txtRecord == null || txtRecord.type !== 'TXT') {
+    log('missing TXT record in response')
+    return
+  }
+
+  let peerIdStr: string
+  try {
+    peerIdStr = txtRecord.data[0].toString()
+  } catch (err) {
+    log('failed to extract peer ID from TXT record data', txtRecord, err)
+    return
+  }
+
+  let peerId: PeerId
+  try {
+    peerId = peerIdFromString(peerIdStr)
+  } catch (err) {
+    log('failed to create peer ID from TXT record data', peerIdStr, err)
+    return
+  }
+
+  if (ourPeerId.equals(peerId)) {
+    log('ignoring reply to myself')
+    return
+  }
+
+  const multiaddrs: Multiaddr[] = []
+  const hosts: { A: Record<string, string>, AAAA: Record<string, string> } = {
+    A: {},
+    AAAA: {}
+  }
+
+  answers.forEach(answer => {
+    if (answer.type === 'A') {
+      hosts.A[answer.name] = answer.data
+    }
+
+    if (answer.type === 'AAAA') {
+      hosts.AAAA[answer.name] = answer.data
+    }
+  })
+
+  answers.forEach(answer => {
+    if (answer.type === 'SRV') {
+      if (hosts.A[answer.data.target] != null) {
+        multiaddrs.push(new Multiaddr(`/ip4/${hosts.A[answer.data.target]}/tcp/${answer.data.port}/p2p/${peerId.toString()}`))
+      } else if (hosts.AAAA[answer.data.target] != null) {
+        multiaddrs.push(new Multiaddr(`/ip6/${hosts.AAAA[answer.data.target]}/tcp/${answer.data.port}/p2p/${peerId.toString()}`))
+      } else {
+        multiaddrs.push(new Multiaddr(`/dnsaddr/${answer.data.target}/tcp/${answer.data.port}/p2p/${peerId.toString()}`))
+      }
+    }
+  })
+
+  return {
+    id: peerId,
+    multiaddrs,
+    protocols: []
+  }
+}

package/src/index.ts

@@ -3,26 +3,23 @@ import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
 import { logger } from '@libp2p/logger'
 import * as query from './query.js'
 import { GoMulticastDNS } from './compat/index.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { PeerDiscovery, PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
-import type { Multiaddr } from '@multiformats/multiaddr'
-import type { PeerData } from '@libp2p/interfaces/peer-data'
+import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:mdns')
 
 export interface MulticastDNSOptions {
-  peerId: PeerId
   broadcast?: boolean
   interval?: number
   serviceTag?: string
   port?: number
-  multiaddrs?: Multiaddr[]
   compat?: boolean
   compatQueryPeriod?: number
   compatQueryInterval?: number
 }
 
-export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements PeerDiscovery {
+export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements PeerDiscovery, Initializable {
   static tag = 'mdns'
 
   public mdns?: multicastDNS.MulticastDNS
@@ -31,24 +28,17 @@ export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements P
   private readonly interval: number
   private readonly serviceTag: string
   private readonly port: number
-  private readonly peerId: PeerId
-  private readonly peerMultiaddrs: Multiaddr[] // TODO: update this when multiaddrs change?
-  private _queryInterval: NodeJS.Timer | null
+  private _queryInterval: ReturnType<typeof setInterval> | null
   private readonly _goMdns?: GoMulticastDNS
+  private components: Components = new Components()
 
-  constructor (options: MulticastDNSOptions) {
+  constructor (options: MulticastDNSOptions = {}) {
     super()
 
-    if (options.peerId == null) {
-      throw new Error('needs own PeerId to work')
-    }
-
     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)
@@ -56,8 +46,6 @@ export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements P
 
     if (options.compat !== false) {
       this._goMdns = new GoMulticastDNS({
-        multiaddrs: this.peerMultiaddrs,
-        peerId: options.peerId,
         queryPeriod: options.compatQueryPeriod,
         queryInterval: options.compatQueryInterval
       })
@@ -65,6 +53,12 @@ export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements P
     }
   }
 
+  init (components: Components): void {
+    this.components = components
+
+    this._goMdns?.init(components)
+  }
+
   isStarted () {
     return Boolean(this.mdns)
   }
@@ -95,29 +89,34 @@ export class MulticastDNS extends EventEmitter<PeerDiscoveryEvents> implements P
       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: multicastDNS.ResponsePacket) {
+    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.dispatchEvent(new CustomEvent('peer', {
+        log('discovered peer in mDNS qeury response %p', foundPeer.id)
+
+        this.dispatchEvent(new CustomEvent<PeerInfo>('peer', {
           detail: foundPeer
         }))
       }
     } catch (err) {
-      log('Error processing peer response', err)
+      log.error('Error processing peer response', err)
     }
   }
 
-  _onPeer (evt: CustomEvent<PeerData>) {
+  _onPeer (evt: CustomEvent<PeerInfo>) {
     if (this.mdns == null) {
       return
     }
 
-    this.dispatchEvent(new CustomEvent('peer', {
+    this.dispatchEvent(new CustomEvent<PeerInfo>('peer', {
       detail: evt.detail
     }))
   }

package/src/query.ts

@@ -1,17 +1,18 @@
 import os from 'os'
 import { logger } from '@libp2p/logger'
-import { Multiaddr, MultiaddrObject } from '@multiformats/multiaddr'
-import { base58btc } from 'multiformats/bases/base58'
-import { PeerId } from '@libp2p/peer-id'
-import type { PeerData } from '@libp2p/interfaces/peer-data'
+import { Multiaddr, MultiaddrObject, protocols } from '@multiformats/multiaddr'
+import { peerIdFromString } from '@libp2p/peer-id'
+import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerInfo } from '@libp2p/interfaces/peer-info'
 import type { MulticastDNS, ResponsePacket, QueryPacket } from 'multicast-dns'
 import type { SrvAnswer, StringAnswer, TxtAnswer, Answer } from 'dns-packet'
 
-const log = logger('libp2p:mdns')
+const log = logger('libp2p:mdns:query')
 
 export function queryLAN (mdns: MulticastDNS, serviceTag: string, interval: number) {
   const query = () => {
     log('query', serviceTag)
+
     mdns.query({
       questions: [{
         name: serviceTag,
@@ -33,7 +34,7 @@ interface Answers {
   aaaa: StringAnswer[]
 }
 
-export function gotResponse (rsp: ResponsePacket, localPeerId: PeerId, serviceTag: string): PeerData | undefined {
+export function gotResponse (rsp: ResponsePacket, localPeerId: PeerId, serviceTag: string): PeerInfo | undefined {
   if (rsp.answers == null) {
     return
   }
@@ -81,14 +82,16 @@ export function gotResponse (rsp: ResponsePacket, localPeerId: PeerId, serviceTa
     }
   })
 
-  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: []
   }
@@ -96,11 +99,12 @@ export function gotResponse (rsp: ResponsePacket, localPeerId: PeerId, serviceTa
 
 export function gotQuery (qry: QueryPacket, mdns: MulticastDNS, peerId: PeerId, multiaddrs: Multiaddr[], serviceTag: string, broadcast: boolean) {
   if (!broadcast) {
+    log('not responding to mDNS query as broadcast mode is false')
     return
   }
 
   const addresses: MultiaddrObject[] = multiaddrs.reduce<MultiaddrObject[]>((acc, addr) => {
-    if (addr.isThinWaistAddress()) {
+    if (addr.decapsulateCode(protocols('p2p').code).isThinWaistAddress()) {
       acc.push(addr.toOptions())
     }
     return acc
@@ -108,6 +112,7 @@ export function gotQuery (qry: QueryPacket, mdns: MulticastDNS, peerId: PeerId,
 
   // Only announce TCP for now
   if (addresses.length === 0) {
+    log('no thin waist addresses present, cannot respond to query')
     return
   }
 
@@ -119,14 +124,14 @@ export function gotQuery (qry: QueryPacket, mdns: MulticastDNS, peerId: PeerId,
       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,
@@ -139,11 +144,11 @@ export function gotQuery (qry: QueryPacket, mdns: MulticastDNS, peerId: PeerId,
     })
 
     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) => {