libp2p 0.44.0-cd67b7d8 → 0.44.0-ceed8d89

package/src/autonat/index.ts

@@ -34,7 +34,7 @@ const log = logger('libp2p:autonat')
 // https://github.com/libp2p/specs/blob/master/autonat/README.md#autonat-protocol
 const REQUIRED_SUCCESSFUL_DIALS = 4
 
-export interface AutonatServiceInit {
+export interface AutoNATServiceInit {
   /**
    * Allows overriding the protocol prefix used
    */
@@ -56,17 +56,17 @@ export interface AutonatServiceInit {
   refreshInterval?: number
 
   /**
-   * How many parallel inbound autonat streams we allow per-connection
+   * How many parallel inbound autoNAT streams we allow per-connection
    */
   maxInboundStreams?: number
 
   /**
-   * How many parallel outbound autonat streams we allow per-connection
+   * How many parallel outbound autoNAT streams we allow per-connection
    */
   maxOutboundStreams?: number
 }
 
-export interface AutonatComponents {
+export interface AutoNATComponents {
   registrar: Registrar
   addressManager: AddressManager
   transportManager: TransportManager
@@ -75,8 +75,8 @@ export interface AutonatComponents {
   peerRouting: PeerRouting
 }
 
-class DefaultAutonatService implements Startable {
-  private readonly components: AutonatComponents
+class DefaultAutoNATService implements Startable {
+  private readonly components: AutoNATComponents
   private readonly startupDelay: number
   private readonly refreshInterval: number
   private readonly protocol: string
@@ -86,7 +86,7 @@ class DefaultAutonatService implements Startable {
   private verifyAddressTimeout?: ReturnType<typeof setTimeout>
   private started: boolean
 
-  constructor (components: AutonatComponents, init: AutonatServiceInit) {
+  constructor (components: AutoNATComponents, init: AutoNATServiceInit) {
     this.components = components
     this.started = false
     this.protocol = `/${init.protocolPrefix ?? PROTOCOL_PREFIX}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`
@@ -130,7 +130,7 @@ class DefaultAutonatService implements Startable {
   }
 
   /**
-   * Handle an incoming autonat request
+   * Handle an incoming AutoNAT request
    */
   async handleIncomingAutonatStream (data: IncomingStreamData): Promise<void> {
     const signal = anySignal([AbortSignal.timeout(this.timeout)])
@@ -565,8 +565,8 @@ class DefaultAutonatService implements Startable {
   }
 }
 
-export function autonatService (init: AutonatServiceInit = {}): (components: AutonatComponents) => {} {
+export function autoNATService (init: AutoNATServiceInit = {}): (components: AutoNATComponents) => {} {
   return (components) => {
-    return new DefaultAutonatService(components, init)
+    return new DefaultAutoNATService(components, init)
   }
 }

package/src/connection-manager/auto-dial.ts

@@ -1,7 +1,7 @@
 import { logger } from '@libp2p/logger'
 import type { PeerStore } from '@libp2p/interface-peer-store'
 import type { ConnectionManager } from '@libp2p/interface-connection-manager'
-import { PeerMap } from '@libp2p/peer-collections'
+import { PeerMap, PeerSet } from '@libp2p/peer-collections'
 import PQueue from 'p-queue'
 import { AUTO_DIAL_CONCURRENCY, AUTO_DIAL_INTERVAL, AUTO_DIAL_PRIORITY, MIN_CONNECTIONS } from './constants.js'
 import type { Startable } from '@libp2p/interfaces/startable'
@@ -103,6 +103,12 @@ export class AutoDial implements Startable {
 
     const connections = this.connectionManager.getConnectionsMap()
     const numConnections = connections.size
+    const dialQueue = new PeerSet(
+      // @ts-expect-error boolean filter removes falsy peer IDs
+      this.connectionManager.getDialQueue()
+        .map(queue => queue.peerId)
+        .filter(Boolean)
+    )
 
     // Already has enough connections
     if (numConnections >= this.minConnections) {
@@ -127,6 +133,11 @@ export class AutoDial implements Startable {
         return false
       }
 
+      // remove peers we are already dialling
+      if (dialQueue.has(peer.id)) {
+        return false
+      }
+
       return true
     })
 

package/src/connection-manager/dial-queue.ts

@@ -238,7 +238,7 @@ export class DialQueue {
         signal.clear()
       })
       .catch(err => {
-        log.error('dial failed to %s', addrsToDial.map(({ multiaddr }) => multiaddr.toString()).join(', '), err)
+        log.error('dial failed to %s', pendingDial.multiaddrs.map(ma => ma.toString()).join(', '), err)
 
         // Error is a timeout
         if (signal.aborted) {
@@ -384,7 +384,14 @@ export class DialQueue {
       gatedAdrs.push(addr)
     }
 
-    return gatedAdrs.sort(this.addressSorter)
+    const sortedGatedAddrs = gatedAdrs.sort(this.addressSorter)
+
+    // make sure we actually have some addresses to dial
+    if (sortedGatedAddrs.length === 0) {
+      throw new CodeError('The connection gater denied all addresses in the dial request', codes.ERR_NO_VALID_ADDRESSES)
+    }
+
+    return sortedGatedAddrs
   }
 
   private async performDial (pendingDial: PendingDial, options: DialOptions = {}): Promise<Connection> {

package/src/transport-manager.ts

@@ -12,8 +12,6 @@ import { trackedMap } from '@libp2p/tracked-map'
 import type { Metrics } from '@libp2p/interface-metrics'
 import type { AddressManager } from '@libp2p/interface-address-manager'
 import type { Libp2pEvents } from '@libp2p/interface-libp2p'
-import type { PeerStore } from '@libp2p/interface-peer-store'
-import type { PeerId } from '@libp2p/interface-peer-id'
 
 const log = logger('libp2p:transports')
 
@@ -26,8 +24,6 @@ export interface DefaultTransportManagerComponents {
   addressManager: AddressManager
   upgrader: Upgrader
   events: EventEmitter<Libp2pEvents>
-  peerId: PeerId
-  peerStore: PeerStore
 }
 
 export class DefaultTransportManager implements TransportManager, Startable {
@@ -210,17 +206,9 @@ export class DefaultTransportManager implements TransportManager, Startable {
 
         // Track listen/close events
         listener.addEventListener('listening', () => {
-          this.components.peerStore.patch(this.components.peerId, {
-            multiaddrs: this.getAddrs()
+          this.components.events.safeDispatchEvent('transport:listening', {
+            detail: listener
           })
-            .then(() => {
-              this.components.events.safeDispatchEvent('transport:listening', {
-                detail: listener
-              })
-            })
-            .catch(err => {
-              log.error('error while updating peer record after listener began listening', err)
-            })
         })
         listener.addEventListener('close', () => {
           const index = listeners.findIndex(l => l === listener)
@@ -228,17 +216,9 @@ export class DefaultTransportManager implements TransportManager, Startable {
           // remove the listener
           listeners.splice(index, 1)
 
-          this.components.peerStore.patch(this.components.peerId, {
-            multiaddrs: this.getAddrs()
+          this.components.events.safeDispatchEvent('transport:close', {
+            detail: listener
           })
-            .then(() => {
-              this.components.events.safeDispatchEvent('transport:close', {
-                detail: listener
-              })
-            })
-            .catch(err => {
-              log.error('error while updating peer record after listener stopped listening', err)
-            })
         })
 
         // We need to attempt to listen on everything

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.44.0-cd67b7d8'
+export const version = '0.44.0-ceed8d89'
 export const name = 'libp2p'