libp2p 0.46.4 → 0.46.5

package/dist/src/dcutr/pb/message.js

@@ -0,0 +1,77 @@
+/* eslint-disable import/export */
+/* eslint-disable complexity */
+/* eslint-disable @typescript-eslint/no-namespace */
+/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
+/* eslint-disable @typescript-eslint/no-empty-interface */
+import { enumeration, encodeMessage, decodeMessage, message } from 'protons-runtime';
+export var HolePunch;
+(function (HolePunch) {
+    let Type;
+    (function (Type) {
+        Type["UNUSED"] = "UNUSED";
+        Type["CONNECT"] = "CONNECT";
+        Type["SYNC"] = "SYNC";
+    })(Type = HolePunch.Type || (HolePunch.Type = {}));
+    let __TypeValues;
+    (function (__TypeValues) {
+        __TypeValues[__TypeValues["UNUSED"] = 0] = "UNUSED";
+        __TypeValues[__TypeValues["CONNECT"] = 100] = "CONNECT";
+        __TypeValues[__TypeValues["SYNC"] = 300] = "SYNC";
+    })(__TypeValues || (__TypeValues = {}));
+    (function (Type) {
+        Type.codec = () => {
+            return enumeration(__TypeValues);
+        };
+    })(Type = HolePunch.Type || (HolePunch.Type = {}));
+    let _codec;
+    HolePunch.codec = () => {
+        if (_codec == null) {
+            _codec = message((obj, w, opts = {}) => {
+                if (opts.lengthDelimited !== false) {
+                    w.fork();
+                }
+                if (obj.type != null) {
+                    w.uint32(8);
+                    HolePunch.Type.codec().encode(obj.type, w);
+                }
+                if (obj.observedAddresses != null) {
+                    for (const value of obj.observedAddresses) {
+                        w.uint32(18);
+                        w.bytes(value);
+                    }
+                }
+                if (opts.lengthDelimited !== false) {
+                    w.ldelim();
+                }
+            }, (reader, length) => {
+                const obj = {
+                    observedAddresses: []
+                };
+                const end = length == null ? reader.len : reader.pos + length;
+                while (reader.pos < end) {
+                    const tag = reader.uint32();
+                    switch (tag >>> 3) {
+                        case 1:
+                            obj.type = HolePunch.Type.codec().decode(reader);
+                            break;
+                        case 2:
+                            obj.observedAddresses.push(reader.bytes());
+                            break;
+                        default:
+                            reader.skipType(tag & 7);
+                            break;
+                    }
+                }
+                return obj;
+            });
+        }
+        return _codec;
+    };
+    HolePunch.encode = (obj) => {
+        return encodeMessage(obj, HolePunch.codec());
+    };
+    HolePunch.decode = (buf) => {
+        return decodeMessage(buf, HolePunch.codec());
+    };
+})(HolePunch || (HolePunch = {}));
+//# sourceMappingURL=message.js.map

package/dist/src/dcutr/pb/message.js.map

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

package/dist/src/version.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.46.4";
+export declare const version = "0.46.5";
 export declare const name = "libp2p";
 //# sourceMappingURL=version.d.ts.map

package/dist/src/version.js

@@ -1,3 +1,3 @@
-export const version = '0.46.4';
+export const version = '0.46.5';
 export const name = 'libp2p';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.46.4",
+  "version": "0.46.5",
   "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/libp2p#readme",
@@ -56,6 +56,10 @@
       "types": "./dist/src/circuit-relay/index.d.ts",
       "import": "./dist/src/circuit-relay/index.js"
     },
+    "./dcutr": {
+      "types": "./dist/src/dcutr/index.d.ts",
+      "import": "./dist/src/dcutr/index.js"
+    },
     "./fetch": {
       "types": "./dist/src/fetch/index.d.ts",
       "import": "./dist/src/fetch/index.js"
@@ -100,7 +104,8 @@
     "build": "aegir build",
     "generate": "run-s generate:proto:*",
     "generate:proto:autonat": "protons ./src/autonat/pb/index.proto",
-    "generate:proto:circuit": "protons ./src/circuit/pb/index.proto",
+    "generate:proto:circuit-relay": "protons ./src/circuit-relay/pb/index.proto",
+    "generate:proto:dcutr": "protons ./src/dcutr/pb/message.proto",
     "generate:proto:fetch": "protons ./src/fetch/pb/proto.proto",
     "generate:proto:identify": "protons ./src/identify/pb/message.proto",
     "generate:proto:plaintext": "protons ./src/insecure/pb/proto.proto",
@@ -117,7 +122,7 @@
     "@achingbrain/nat-port-mapper": "^1.0.9",
     "@libp2p/crypto": "^2.0.3",
     "@libp2p/interface": "^0.1.2",
-    "@libp2p/interface-internal": "^0.1.3",
+    "@libp2p/interface-internal": "^0.1.4",
     "@libp2p/keychain": "^3.0.3",
     "@libp2p/logger": "^3.0.2",
     "@libp2p/multistream-select": "^4.0.2",
@@ -129,6 +134,7 @@
     "@libp2p/utils": "^4.0.2",
     "@multiformats/mafmt": "^12.1.2",
     "@multiformats/multiaddr": "^12.1.5",
+    "@multiformats/multiaddr-matcher": "^1.0.0",
     "abortable-iterator": "^5.0.1",
     "any-signal": "^4.1.1",
     "datastore-core": "^9.0.1",
@@ -163,18 +169,17 @@
     "@chainsafe/libp2p-gossipsub": "^10.0.0",
     "@chainsafe/libp2p-noise": "^13.0.0",
     "@chainsafe/libp2p-yamux": "^5.0.0",
-    "@libp2p/bootstrap": "^9.0.3",
+    "@libp2p/bootstrap": "^9.0.4",
     "@libp2p/daemon-client": "^7.0.0",
     "@libp2p/daemon-server": "^6.0.0",
-    "@libp2p/floodsub": "^8.0.4",
-    "@libp2p/interface-compliance-tests": "^4.0.3",
+    "@libp2p/floodsub": "^8.0.5",
+    "@libp2p/interface-compliance-tests": "^4.0.4",
     "@libp2p/interop": "^9.0.0",
-    "@libp2p/kad-dht": "^10.0.3",
-    "@libp2p/mdns": "^9.0.3",
-    "@libp2p/mplex": "^9.0.3",
-    "@libp2p/tcp": "^8.0.3",
-    "@libp2p/websockets": "^7.0.3",
-    "@types/varint": "^6.0.0",
+    "@libp2p/kad-dht": "^10.0.4",
+    "@libp2p/mdns": "^9.0.4",
+    "@libp2p/mplex": "^9.0.4",
+    "@libp2p/tcp": "^8.0.4",
+    "@libp2p/websockets": "^7.0.4",
     "@types/xsalsa20": "^1.1.0",
     "aegir": "^40.0.8",
     "delay": "^6.0.0",
@@ -191,6 +196,7 @@
     "sinon-ts": "^1.0.0"
   },
   "browser": {
+    "./dist/src/connection-manager/constants.js": "./dist/src/connection-manager/constants.browser.js",
     "./dist/src/config/connection-gater.js": "./dist/src/config/connection-gater.browser.js"
   }
 }

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

@@ -1,7 +1,8 @@
 import { logger } from '@libp2p/logger'
 import { PeerMap, PeerSet } from '@libp2p/peer-collections'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { PeerJobQueue } from '../utils/peer-job-queue.js'
-import { AUTO_DIAL_CONCURRENCY, AUTO_DIAL_INTERVAL, AUTO_DIAL_MAX_QUEUE_LENGTH, AUTO_DIAL_PRIORITY, MIN_CONNECTIONS } from './constants.js'
+import { AUTO_DIAL_CONCURRENCY, AUTO_DIAL_INTERVAL, AUTO_DIAL_MAX_QUEUE_LENGTH, AUTO_DIAL_PEER_RETRY_THRESHOLD, AUTO_DIAL_PRIORITY, LAST_DIAL_FAILURE_KEY, MIN_CONNECTIONS } from './constants.js'
 import type { Libp2pEvents } from '@libp2p/interface'
 import type { EventEmitter } from '@libp2p/interface/events'
 import type { PeerStore } from '@libp2p/interface/peer-store'
@@ -16,6 +17,7 @@ interface AutoDialInit {
   autoDialConcurrency?: number
   autoDialPriority?: number
   autoDialInterval?: number
+  autoDialPeerRetryThreshold?: number
 }
 
 interface AutoDialComponents {
@@ -29,7 +31,8 @@ const defaultOptions = {
   maxQueueLength: AUTO_DIAL_MAX_QUEUE_LENGTH,
   autoDialConcurrency: AUTO_DIAL_CONCURRENCY,
   autoDialPriority: AUTO_DIAL_PRIORITY,
-  autoDialInterval: AUTO_DIAL_INTERVAL
+  autoDialInterval: AUTO_DIAL_INTERVAL,
+  autoDialPeerRetryThreshold: AUTO_DIAL_PEER_RETRY_THRESHOLD
 }
 
 export class AutoDial implements Startable {
@@ -40,6 +43,7 @@ export class AutoDial implements Startable {
   private readonly autoDialPriority: number
   private readonly autoDialIntervalMs: number
   private readonly autoDialMaxQueueLength: number
+  private readonly autoDialPeerRetryThresholdMs: number
   private autoDialInterval?: ReturnType<typeof setInterval>
   private started: boolean
   private running: boolean
@@ -56,6 +60,7 @@ export class AutoDial implements Startable {
     this.autoDialPriority = init.autoDialPriority ?? defaultOptions.autoDialPriority
     this.autoDialIntervalMs = init.autoDialInterval ?? defaultOptions.autoDialInterval
     this.autoDialMaxQueueLength = init.maxQueueLength ?? defaultOptions.maxQueueLength
+    this.autoDialPeerRetryThresholdMs = init.autoDialPeerRetryThreshold ?? defaultOptions.autoDialPeerRetryThreshold
     this.started = false
     this.running = false
     this.queue = new PeerJobQueue({
@@ -207,9 +212,26 @@ export class AutoDial implements Startable {
       return 0
     })
 
-    log('selected %d/%d peers to dial', sortedPeers.length, peers.length)
+    const peersThatHaveNotFailed = sortedPeers.filter(peer => {
+      const lastDialFailure = peer.metadata.get(LAST_DIAL_FAILURE_KEY)
 
-    for (const peer of sortedPeers) {
+      if (lastDialFailure == null) {
+        return true
+      }
+
+      const lastDialFailureTimestamp = parseInt(uint8ArrayToString(lastDialFailure))
+
+      if (isNaN(lastDialFailureTimestamp)) {
+        return true
+      }
+
+      // only dial if the time since the last failure is above the retry threshold
+      return Date.now() - lastDialFailureTimestamp > this.autoDialPeerRetryThresholdMs
+    })
+
+    log('selected %d/%d peers to dial', peersThatHaveNotFailed.length, peers.length)
+
+    for (const peer of peersThatHaveNotFailed) {
       this.queue.add(async () => {
         const numConnections = this.connectionManager.getConnectionsMap().size
 
@@ -222,7 +244,6 @@ export class AutoDial implements Startable {
 
         log('connecting to a peerStore stored peer %p', peer.id)
         await this.connectionManager.openConnection(peer.id, {
-          // @ts-expect-error needs adding to the ConnectionManager interface
           priority: this.autoDialPriority
         })
       }, {

package/src/connection-manager/constants.browser.ts

@@ -0,0 +1,21 @@
+export * from './constants.defaults.js'
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxParallelDials
+ */
+export const MAX_PARALLEL_DIALS = 10
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#minConnections
+ */
+export const MIN_CONNECTIONS = 5
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxConnections
+ */
+export const MAX_CONNECTIONS = 100
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialConcurrency
+ */
+export const AUTO_DIAL_CONCURRENCY = 10

package/src/connection-manager/constants.defaults.ts

@@ -0,0 +1,59 @@
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#dialTimeout
+ */
+export const DIAL_TIMEOUT = 30e3
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#inboundUpgradeTimeout
+ */
+export const INBOUND_UPGRADE_TIMEOUT = 30e3
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxPeerAddrsToDial
+ */
+export const MAX_PEER_ADDRS_TO_DIAL = 25
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxParallelDialsPerPeer
+ */
+export const MAX_PARALLEL_DIALS_PER_PEER = 10
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialInterval
+ */
+export const AUTO_DIAL_INTERVAL = 5000
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialPriority
+ */
+export const AUTO_DIAL_PRIORITY = 0
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialMaxQueueLength
+ */
+export const AUTO_DIAL_MAX_QUEUE_LENGTH = 100
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/libp2p.index.unknown.ConnectionManagerInit.html#autoDialPeerRetryThreshold
+ */
+export const AUTO_DIAL_PEER_RETRY_THRESHOLD = 1000 * 60
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#inboundConnectionThreshold
+ */
+export const INBOUND_CONNECTION_THRESHOLD = 5
+
+/**
+ * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxIncomingPendingConnections
+ */
+export const MAX_INCOMING_PENDING_CONNECTIONS = 10
+
+/**
+ * Store as part of the peer store metadata for a given peer, the value for this
+ * key is a timestamp of the last time a dial attempted failed with the relevant
+ * peer stored as a string.
+ *
+ * Used to insure we do not endlessly try to auto dial peers we have recently
+ * failed to dial.
+ */
+export const LAST_DIAL_FAILURE_KEY = 'last-dial-failure'

package/src/connection-manager/constants.ts

@@ -1,28 +1,10 @@
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#dialTimeout
- */
-export const DIAL_TIMEOUT = 30e3
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#inboundUpgradeTimeout
- */
-export const INBOUND_UPGRADE_TIMEOUT = 30e3
+export * from './constants.defaults.js'
 
 /**
  * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxParallelDials
  */
 export const MAX_PARALLEL_DIALS = 100
 
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxPeerAddrsToDial
- */
-export const MAX_PEER_ADDRS_TO_DIAL = 25
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxParallelDialsPerPeer
- */
-export const MAX_PARALLEL_DIALS_PER_PEER = 10
-
 /**
  * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#minConnections
  */
@@ -33,32 +15,7 @@ export const MIN_CONNECTIONS = 50
  */
 export const MAX_CONNECTIONS = 300
 
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialInterval
- */
-export const AUTO_DIAL_INTERVAL = 5000
-
 /**
  * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialConcurrency
  */
 export const AUTO_DIAL_CONCURRENCY = 25
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialPriority
- */
-export const AUTO_DIAL_PRIORITY = 0
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#autoDialMaxQueueLength
- */
-export const AUTO_DIAL_MAX_QUEUE_LENGTH = 100
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#inboundConnectionThreshold
- */
-export const INBOUND_CONNECTION_THRESHOLD = 5
-
-/**
- * @see https://libp2p.github.io/js-libp2p/interfaces/index._internal_.ConnectionManagerConfig.html#maxIncomingPendingConnections
- */
-export const MAX_INCOMING_PENDING_CONNECTIONS = 10

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

@@ -7,13 +7,15 @@ import { dnsaddrResolver } from '@multiformats/multiaddr/resolvers'
 import { type ClearableSignal, anySignal } from 'any-signal'
 import pDefer from 'p-defer'
 import PQueue from 'p-queue'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { codes } from '../errors.js'
 import { getPeerAddress } from '../get-peer.js'
 import {
   DIAL_TIMEOUT,
   MAX_PARALLEL_DIALS_PER_PEER,
   MAX_PARALLEL_DIALS,
-  MAX_PEER_ADDRS_TO_DIAL
+  MAX_PEER_ADDRS_TO_DIAL,
+  LAST_DIAL_FAILURE_KEY
 } from './constants.js'
 import { combineSignals, resolveMultiaddrs } from './utils.js'
 import type { AddressSorter, AbortOptions, PendingDial } from '@libp2p/interface'
@@ -230,9 +232,22 @@ export class DialQueue {
         // clean up abort signals/controllers
         signal.clear()
       })
-      .catch(err => {
+      .catch(async err => {
         log.error('dial failed to %s', pendingDial.multiaddrs.map(ma => ma.toString()).join(', '), err)
 
+        if (peerId != null) {
+          // record the last failed dial
+          try {
+            await this.peerStore.patch(peerId, {
+              metadata: {
+                [LAST_DIAL_FAILURE_KEY]: uint8ArrayFromString(Date.now().toString())
+              }
+            })
+          } catch (err: any) {
+            log.error('could not update last dial failure key for %p', peerId, err)
+          }
+        }
+
         // Error is a timeout
         if (signal.aborted) {
           const error = new CodeError(err.message, codes.ERR_TIMEOUT)

package/src/connection-manager/index.ts

@@ -20,7 +20,7 @@ import type { Metrics } from '@libp2p/interface/metrics'
 import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Peer, PeerStore } from '@libp2p/interface/peer-store'
 import type { Startable } from '@libp2p/interface/startable'
-import type { ConnectionManager } from '@libp2p/interface-internal/connection-manager'
+import type { ConnectionManager, OpenConnectionOptions } from '@libp2p/interface-internal/connection-manager'
 import type { TransportManager } from '@libp2p/interface-internal/transport-manager'
 
 const log = logger('libp2p:connection-manager')
@@ -66,6 +66,12 @@ export interface ConnectionManagerInit {
    */
   autoDialMaxQueueLength?: number
 
+  /**
+   * When we've failed to dial a peer, do not autodial them again within this
+   * number of ms. (default: 1 minute)
+   */
+  autoDialPeerRetryThreshold?: number
+
   /**
    * Sort the known addresses of a peer before trying to dial, By default public
    * addresses will be dialled before private (e.g. loopback or LAN) addresses.
@@ -154,10 +160,6 @@ export interface DefaultConnectionManagerComponents {
   events: EventEmitter<Libp2pEvents>
 }
 
-export interface OpenConnectionOptions extends AbortOptions {
-  priority?: number
-}
-
 /**
  * Responsible for managing known connections.
  */
@@ -492,7 +494,7 @@ export class DefaultConnectionManager implements ConnectionManager, Startable {
 
     const { peerId } = getPeerAddress(peerIdOrMultiaddr)
 
-    if (peerId != null) {
+    if (peerId != null && options.force !== true) {
       log('dial %p', peerId)
       const existingConnections = this.getConnections(peerId)