libp2p 1.1.0 → 1.1.1

package/src/connection-manager/utils.ts

@@ -1,6 +1,4 @@
-import { setMaxListeners } from '@libp2p/interface'
 import { type AbortOptions, multiaddr, type Multiaddr } from '@multiformats/multiaddr'
-import { type ClearableSignal, anySignal } from 'any-signal'
 import type { LoggerOptions } from '@libp2p/interface'
 
 /**
@@ -47,21 +45,3 @@ async function resolveRecord (ma: Multiaddr, options: AbortOptions & LoggerOptio
     return []
   }
 }
-
-export function combineSignals (...signals: Array<AbortSignal | undefined>): ClearableSignal {
-  const sigs: AbortSignal[] = []
-
-  for (const sig of signals) {
-    if (sig != null) {
-      setMaxListeners(Infinity, sig)
-      sigs.push(sig)
-    }
-  }
-
-  // let any signal abort the dial
-  const signal = anySignal(sigs)
-
-  setMaxListeners(Infinity, signal)
-
-  return signal
-}

package/src/content-routing.ts

@@ -1,9 +1,8 @@
 import { CodeError } from '@libp2p/interface'
 import { PeerSet } from '@libp2p/peer-collections'
 import merge from 'it-merge'
-import parallel from 'it-parallel'
 import { codes, messages } from './errors.js'
-import type { AbortOptions, ComponentLogger, ContentRouting, Logger, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface'
+import type { AbortOptions, ComponentLogger, ContentRouting, PeerInfo, PeerRouting, PeerStore, RoutingOptions, Startable } from '@libp2p/interface'
 import type { CID } from 'multiformats/cid'
 
 export interface CompoundContentRoutingInit {
@@ -17,13 +16,11 @@ export interface CompoundContentRoutingComponents {
 }
 
 export class CompoundContentRouting implements ContentRouting, Startable {
-  private readonly log: Logger
   private readonly routers: ContentRouting[]
   private started: boolean
   private readonly components: CompoundContentRoutingComponents
 
   constructor (components: CompoundContentRoutingComponents, init: CompoundContentRoutingInit) {
-    this.log = components.logger.forComponent('libp2p:content-routing')
     this.routers = init.routers ?? []
     this.started = false
     this.components = components
@@ -52,31 +49,8 @@ export class CompoundContentRouting implements ContentRouting, Startable {
     const self = this
     const seen = new PeerSet()
 
-    for await (const peer of parallel(
-      async function * () {
-        const source = merge(
-          ...self.routers.map(router => router.findProviders(key, options))
-        )
-
-        for await (let peer of source) {
-          yield async () => {
-            // find multiaddrs if they are missing
-            if (peer.multiaddrs.length === 0) {
-              try {
-                peer = await self.components.peerRouting.findPeer(peer.id, {
-                  ...options,
-                  useCache: false
-                })
-              } catch (err) {
-                self.log.error('could not find peer multiaddrs', err)
-                return
-              }
-            }
-
-            return peer
-          }
-        }
-      }()
+    for await (const peer of merge(
+      ...self.routers.map(router => router.findProviders(key, options))
     )) {
       // the peer was yielded by a content router without multiaddrs and we
       // failed to load them
@@ -84,16 +58,13 @@ export class CompoundContentRouting implements ContentRouting, Startable {
         continue
       }
 
-      // skip peers without addresses
-      if (peer.multiaddrs.length === 0) {
-        continue
+      // store the addresses for the peer if found
+      if (peer.multiaddrs.length > 0) {
+        await this.components.peerStore.merge(peer.id, {
+          multiaddrs: peer.multiaddrs
+        })
       }
 
-      // ensure we have the addresses for a given peer
-      await this.components.peerStore.merge(peer.id, {
-        multiaddrs: peer.multiaddrs
-      })
-
       // deduplicate peers
       if (seen.has(peer.id)) {
         continue

package/src/peer-routing.ts

@@ -22,7 +22,7 @@ export class DefaultPeerRouting implements PeerRouting {
   private readonly peerStore: PeerStore
   private readonly routers: PeerRouting[]
 
-  constructor (components: DefaultPeerRoutingComponents, init: PeerRoutingInit) {
+  constructor (components: DefaultPeerRoutingComponents, init: PeerRoutingInit = {}) {
     this.log = components.logger.forComponent('libp2p:peer-routing')
     this.peerId = components.peerId
     this.peerStore = components.peerStore
@@ -57,10 +57,12 @@ export class DefaultPeerRouting implements PeerRouting {
         continue
       }
 
-      // ensure we have the addresses for a given peer
-      await this.peerStore.merge(peer.id, {
-        multiaddrs: peer.multiaddrs
-      })
+      // store the addresses for the peer if found
+      if (peer.multiaddrs.length > 0) {
+        await this.peerStore.merge(peer.id, {
+          multiaddrs: peer.multiaddrs
+        })
+      }
 
       return peer
     }
@@ -105,22 +107,17 @@ export class DefaultPeerRouting implements PeerRouting {
         }
       }()
     )) {
-      // the peer was yielded by a content router without multiaddrs and we
-      // failed to load them
       if (peer == null) {
         continue
       }
 
-      // skip peers without addresses
-      if (peer.multiaddrs.length === 0) {
-        continue
+      // store the addresses for the peer if found
+      if (peer.multiaddrs.length > 0) {
+        await this.peerStore.merge(peer.id, {
+          multiaddrs: peer.multiaddrs
+        })
       }
 
-      // ensure we have the addresses for a given peer
-      await this.peerStore.merge(peer.id, {
-        multiaddrs: peer.multiaddrs
-      })
-
       // deduplicate peers
       if (seen.has(peer.id)) {
         continue

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '1.1.0'
+export const version = '1.1.1'
 export const name = 'libp2p'