fix: exclude dht from search-for-self

The peer routing module starts a recurring process that searches for peers close to our peer id. This makes the DHT module query the network for peers. Thing is the DHT module is already doing this because periodically searching for peers close to us is in the DHT spec so this ends up making redundant queries. This PR excludes the DHT from the search-for-self task
chore: switch to nat api (#1052 )
2025-08-01 00:41:57 +00:00 · 2021-12-07 14:36:29 +00:00 · 2021-12-07 09:37:12 +00:00 · 2021-12-06 21:12:38 +01:00 · 2021-12-06 21:07:39 +01:00 · 2021-12-06 21:07:38 +01:00
13 changed files with 257 additions and 93 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
    - uses: actions/checkout@v2
    - uses: actions/setup-node@v2
      with:
-        node-version: 14
+        node-version: 16
    - run: npm install
    - run: npx aegir lint
    - run: npx aegir build
@@ -29,7 +29,7 @@ jobs:
    strategy:
      matrix:
        os: [windows-latest, ubuntu-latest, macos-latest]
-        node: [14, 16]
+        node: [16]
      fail-fast: true
    steps:
      - uses: actions/checkout@v2
@@ -44,6 +44,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: lts/*
      - run: npm install
      - run: npx aegir test -t browser -t webworker --bail
  test-firefox:
@@ -51,6 +54,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: lts/*
      - run: npm install
      - run: npx aegir test -t browser -t webworker --bail -- --browser firefox
  test-ts:
@@ -58,6 +64,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: lts/*
      - run: npm install
      - run: npm run test:ts
  test-interop:
@@ -65,5 +74,8 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: lts/*
      - run: npm install
      - run: npm run test:interop -- --bail -- --exit
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,59 @@
+## [0.35.2](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.35.2) (2021-12-06)
+
+
+### Bug Fixes
+
+* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
+* increase maxlisteners on event target ([#1050](https://github.com/libp2p/js-libp2p/issues/1050)) ([b70fb43](https://github.com/libp2p/js-libp2p/commit/b70fb43427b47df079b55929ec8956f69cbda966)), closes [#900](https://github.com/libp2p/js-libp2p/issues/900)
+* private ip ts compile has no call signatures ([#1020](https://github.com/libp2p/js-libp2p/issues/1020)) ([77d7cb8](https://github.com/libp2p/js-libp2p/commit/77d7cb8f0815f2cdd3bfdfa8b641a7a186fe9520))
+* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
+
+
+### chore
+
+* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
+
+
+### Features
+
+* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
+
+
+### BREAKING CHANGES
+
+* requires node 15+
+* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
+
+
+
+## [0.35.1](https://github.com/libp2p/js-libp2p/compare/v0.35.0...v0.35.1) (2021-12-03)
+
+
+### Bug Fixes
+
+* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
+
+
+
+# [0.35.0](https://github.com/libp2p/js-libp2p/compare/v0.34.0...v0.35.0) (2021-12-02)
+
+
+### Bug Fixes
+
+* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
+
+
+### chore
+
+* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
+
+
+### BREAKING CHANGES
+
+* requires node 15+
+
+
+
 # [0.34.0](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.34.0) (2021-11-25)


--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@@ -41,13 +41,13 @@ const createNode = async () => {
  node1.pubsub.on(topic, (msg) => {
    console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
  })
-  await node1.pubsub.subscribe(topic)
+  node1.pubsub.subscribe(topic)

  // Will not receive own published messages by default
  node2.pubsub.on(topic, (msg) => {
    console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
  })
-  await node2.pubsub.subscribe(topic)
+  node2.pubsub.subscribe(topic)

  // node2 publishes "news" every second
  setInterval(() => {
--- a/examples/webrtc-direct/package.json
+++ b/examples/webrtc-direct/package.json
@@ -24,7 +24,7 @@
    "libp2p-mplex": "^0.10.4",
    "@chainsafe/libp2p-noise": "^4.1.0",
    "libp2p-webrtc-direct": "^0.7.0",
-    "peer-id": "^0.15.4"
+    "peer-id": "^0.16.0"
  },
  "browser": {
    "ipfs": "ipfs/dist/index.min.js"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "libp2p",
-  "version": "0.34.0",
+  "version": "0.35.2",
  "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
  "main": "src/index.js",
@@ -66,10 +66,10 @@
  "homepage": "https://libp2p.io",
  "license": "MIT",
  "engines": {
-    "node": ">=14.0.0"
+    "node": ">=15.0.0"
  },
  "browser": {
-    "@motrix/nat-api": false
+    "nat-api": false
  },
  "eslintConfig": {
    "extends": "ipfs",
@@ -80,10 +80,9 @@
    ]
  },
  "dependencies": {
-    "abortable-iterator": "^3.0.0",
-    "@motrix/nat-api": "^0.3.1",
    "@vascosantos/moving-average": "^1.1.0",
    "abort-controller": "^3.0.0",
+    "abortable-iterator": "^3.0.0",
    "aggregate-error": "^3.1.0",
    "any-signal": "^2.1.1",
    "bignumber.js": "^9.0.1",
@@ -105,8 +104,8 @@
    "it-merge": "^1.0.0",
    "it-pipe": "^1.1.0",
    "it-take": "^1.0.0",
-    "libp2p-crypto": "^0.20.0",
-    "libp2p-interfaces": "^1.3.1",
+    "libp2p-crypto": "^0.21.0",
+    "libp2p-interfaces": "^2.0.1",
    "libp2p-utils": "^0.4.0",
    "mafmt": "^10.0.0",
    "merge-options": "^3.0.4",
@@ -114,19 +113,20 @@
    "multiformats": "^9.0.0",
    "multistream-select": "^2.0.0",
    "mutable-proxy": "^1.0.0",
+    "nat-api": "^0.3.1",
    "node-forge": "^0.10.0",
    "p-any": "^3.0.0",
    "p-fifo": "^1.0.0",
    "p-retry": "^4.4.0",
    "p-settle": "^4.1.1",
-    "peer-id": "^0.15.4",
+    "peer-id": "^0.16.0",
    "private-ip": "^2.1.0",
    "protobufjs": "^6.10.2",
    "retimer": "^3.0.0",
    "sanitize-filename": "^1.6.3",
    "set-delayed-interval": "^1.0.0",
    "streaming-iterables": "^6.0.0",
-    "timeout-abort-controller": "^1.1.1",
+    "timeout-abort-controller": "^2.0.0",
    "uint8arrays": "^3.0.0",
    "varint": "^6.0.0",
    "wherearewe": "^1.0.0",
@@ -149,25 +149,25 @@
    "it-pair": "^1.0.0",
    "it-pushable": "^1.4.0",
    "libp2p": ".",
-    "libp2p-bootstrap": "^0.13.0",
+    "libp2p-bootstrap": "^0.14.0",
    "libp2p-delegated-content-routing": "^0.11.0",
-    "libp2p-delegated-peer-routing": "^0.10.0",
+    "libp2p-delegated-peer-routing": "^0.11.0",
    "libp2p-floodsub": "^0.27.0",
    "libp2p-gossipsub": "^0.11.0",
-    "libp2p-interfaces-compliance-tests": "^1.2.1",
+    "libp2p-interfaces-compliance-tests": "^2.0.1",
    "libp2p-interop": "^0.5.0",
-    "libp2p-kad-dht": "^0.26.6",
-    "libp2p-mdns": "^0.17.0",
+    "libp2p-kad-dht": "^0.27.1",
+    "libp2p-mdns": "^0.18.0",
    "libp2p-mplex": "^0.10.1",
    "libp2p-tcp": "^0.17.0",
-    "libp2p-webrtc-star": "^0.24.0",
+    "libp2p-webrtc-star": "^0.25.0",
    "libp2p-websockets": "^0.16.0",
    "nock": "^13.0.3",
    "p-defer": "^3.0.0",
    "p-times": "^3.0.0",
    "p-wait-for": "^3.2.0",
    "rimraf": "^3.0.2",
-    "sinon": "^11.1.1",
+    "sinon": "^12.0.1",
    "util": "^0.12.3"
  },
  "contributors": [
@@ -181,24 +181,23 @@
    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
    "Maciej Krüger <mkg20001@gmail.com>",
    "Hugo Dias <mail@hugodias.me>",
-    "Chris Dostert <chrisdostert@users.noreply.github.com>",
    "dirkmc <dirkmdev@gmail.com>",
+    "Chris Dostert <chrisdostert@users.noreply.github.com>",
    "Volker Mische <volker.mische@gmail.com>",
    "zeim839 <50573884+zeim839@users.noreply.github.com>",
    "Richard Littauer <richard.littauer@gmail.com>",
    "a1300 <matthias-knopp@gmx.net>",
    "Ryan Bell <ryan@piing.net>",
-    "Elven <mon.samuel@qq.com>",
    "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
-    "Thomas Eizinger <thomas@eizinger.io>",
+    "Giovanni T. Parra <fiatjaf@gmail.com>",
+    "acolytec3 <17355484+acolytec3@users.noreply.github.com>",
+    "Franck Royer <franck@royer.one>",
+    "Elven <mon.samuel@qq.com>",
    "Robert Kiel <robert.kiel@hoprnet.org>",
    "Andrew Nesbitt <andrewnez@gmail.com>",
    "Samlior <samlior@foxmail.com>",
-    "acolytec3 <17355484+acolytec3@users.noreply.github.com>",
-    "Franck Royer <franck@royer.one>",
-    "Giovanni T. Parra <fiatjaf@gmail.com>",
+    "Thomas Eizinger <thomas@eizinger.io>",
    "Didrik Nordström <didrik.nordstrom@gmail.com>",
-    "RasmusErik Voel Jensen <github@solsort.com>",
    "Smite Chow <xiaopengyou@live.com>",
    "Soeren <nikorpoulsen@gmail.com>",
    "Sönke Hahn <soenkehahn@gmail.com>",
@@ -247,6 +246,7 @@
    "Michael Burns <5170+mburns@users.noreply.github.com>",
    "Miguel Mota <miguelmota2@gmail.com>",
    "Nuno Nogueira <nunofmn@gmail.com>",
-    "Philipp Muens <raute1337@gmx.de>"
+    "Philipp Muens <raute1337@gmx.de>",
+    "RasmusErik Voel Jensen <github@solsort.com>"
  ]
 }
--- a/src/connection-manager/auto-dialler.js
+++ b/src/connection-manager/auto-dialler.js
@@ -0,0 +1,118 @@
+'use strict'
+
+const debug = require('debug')
+const mergeOptions = require('merge-options')
+// @ts-ignore retimer does not have types
+const retimer = require('retimer')
+
+const log = Object.assign(debug('libp2p:connection-manager:auto-dialler'), {
+  error: debug('libp2p:connection-manager:auto-dialler:err')
+})
+
+const defaultOptions = {
+  enabled: true,
+  minConnections: 0,
+  autoDialInterval: 10000
+}
+
+/**
+ * @typedef {import('../index')} Libp2p
+ * @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
+ */
+
+/**
+ * @typedef {Object} AutoDiallerOptions
+ * @property {boolean} [enabled = true] - Should preemptively guarantee connections are above the low watermark
+ * @property {number} [minConnections = 0] - The minimum number of connections to avoid pruning
+ * @property {number} [autoDialInterval = 10000] - How often, in milliseconds, it should preemptively guarantee connections are above the low watermark
+ */
+
+class AutoDialler {
+  /**
+   * Proactively tries to connect to known peers stored in the PeerStore.
+   * It will keep the number of connections below the upper limit and sort
+   * the peers to connect based on wether we know their keys and protocols.
+   *
+   * @class
+   * @param {Libp2p} libp2p
+   * @param {AutoDiallerOptions} options
+   */
+  constructor (libp2p, options = {}) {
+    this._options = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, options)
+    this._libp2p = libp2p
+    this._running = false
+    this._autoDialTimeout = null
+    this._autoDial = this._autoDial.bind(this)
+
+    log('options: %j', this._options)
+  }
+
+  /**
+   * Starts the auto dialer
+   */
+  start () {
+    if (!this._options.enabled) {
+      log('not enabled')
+      return
+    }
+
+    this._running = true
+    this._autoDial()
+    log('started')
+  }
+
+  /**
+   * Stops the auto dialler
+   */
+  async stop () {
+    if (!this._options.enabled) {
+      log('not enabled')
+      return
+    }
+
+    this._running = false
+    this._autoDialTimeout && this._autoDialTimeout.clear()
+    log('stopped')
+  }
+
+  async _autoDial () {
+    const minConnections = this._options.minConnections
+
+    // Already has enough connections
+    if (this._libp2p.connections.size >= minConnections) {
+      this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
+      return
+    }
+
+    // Sort peers on wether we know protocols of public keys for them
+    const peers = Array.from(this._libp2p.peerStore.peers.values())
+      .sort((a, b) => {
+        if (b.protocols && b.protocols.length && (!a.protocols || !a.protocols.length)) {
+          return 1
+        } else if (b.id.pubKey && !a.id.pubKey) {
+          return 1
+        }
+        return -1
+      })
+
+    for (let i = 0; this._running && i < peers.length && this._libp2p.connections.size < minConnections; i++) {
+      if (!this._libp2p.connectionManager.get(peers[i].id)) {
+        log('connecting to a peerStore stored peer %s', peers[i].id.toB58String())
+        try {
+          await this._libp2p.dialer.connectToPeer(peers[i].id)
+        } catch (/** @type {any} */ err) {
+          log.error('could not connect to peerStore stored peer', err)
+        }
+      }
+    }
+
+    // Connection Manager was stopped
+    if (!this._running) {
+      return
+    }
+
+    this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
+  }
+}
+
+module.exports = AutoDialler
--- a/src/connection-manager/index.js
+++ b/src/connection-manager/index.js
@@ -94,9 +94,7 @@ class ConnectionManager extends EventEmitter {

    this._started = false
    this._timer = null
-    this._autoDialTimeout = null
    this._checkMetrics = this._checkMetrics.bind(this)
-    this._autoDial = this._autoDial.bind(this)

    this._latencyMonitor = new LatencyMonitor({
      latencyCheckIntervalMs: this._options.pollInterval,
@@ -128,8 +126,6 @@ class ConnectionManager extends EventEmitter {

    this._started = true
    log('started')
-
-    this._options.autoDial && this._autoDial()
  }

  /**
@@ -138,7 +134,6 @@ class ConnectionManager extends EventEmitter {
   * @async
   */
  async stop () {
-    this._autoDialTimeout && this._autoDialTimeout.clear()
    this._timer && this._timer.clear()

    this._latencyMonitor.removeListener('data', this._onLatencyMeasure)
@@ -312,53 +307,6 @@ class ConnectionManager extends EventEmitter {
    }
  }

-  /**
-   * Proactively tries to connect to known peers stored in the PeerStore.
-   * It will keep the number of connections below the upper limit and sort
-   * the peers to connect based on wether we know their keys and protocols.
-   *
-   * @async
-   * @private
-   */
-  async _autoDial () {
-    const minConnections = this._options.minConnections
-
-    // Already has enough connections
-    if (this.size >= minConnections) {
-      this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
-      return
-    }
-
-    // Sort peers on wether we know protocols of public keys for them
-    const peers = Array.from(this._libp2p.peerStore.peers.values())
-      .sort((a, b) => {
-        if (b.protocols && b.protocols.length && (!a.protocols || !a.protocols.length)) {
-          return 1
-        } else if (b.id.pubKey && !a.id.pubKey) {
-          return 1
-        }
-        return -1
-      })
-
-    for (let i = 0; i < peers.length && this.size < minConnections && this._started; i++) {
-      if (!this.get(peers[i].id)) {
-        log('connecting to a peerStore stored peer %s', peers[i].id.toB58String())
-        try {
-          await this._libp2p.dialer.connectToPeer(peers[i].id)
-        } catch (/** @type {any} */ err) {
-          log.error('could not connect to peerStore stored peer', err)
-        }
-      }
-    }
-
-    // Connection Manager was stopped
-    if (!this._started) {
-      return
-    }
-
-    this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
-  }
-
  /**
   * If we have more connections than our maximum, close a connection
   * to the lowest valued peer.
--- a/src/dialer/dial-request.js
+++ b/src/dialer/dial-request.js
@@ -1,11 +1,12 @@
 'use strict'

 const errCode = require('err-code')
-const AbortController = require('abort-controller').default
 const { anySignal } = require('any-signal')
 // @ts-ignore p-fifo does not export types
 const FIFO = require('p-fifo')
 const pAny = require('p-any')
+// @ts-expect-error setMaxListeners is missing from the types
+const { setMaxListeners } = require('events')

 /**
 * @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
@@ -59,7 +60,12 @@ class DialRequest {

    const tokenHolder = new FIFO()
    tokens.forEach(token => tokenHolder.push(token))
-    const dialAbortControllers = this.addrs.map(() => new AbortController())
+    const dialAbortControllers = this.addrs.map(() => {
+      const controller = new AbortController()
+      setMaxListeners && setMaxListeners(Infinity, controller.signal)
+
+      return controller
+    })
    let completedDials = 0

    try {
--- a/src/dialer/index.js
+++ b/src/dialer/index.js
@@ -6,8 +6,7 @@ const log = Object.assign(debug('libp2p:dialer'), {
 })
 const errCode = require('err-code')
 const { Multiaddr } = require('multiaddr')
-// @ts-ignore timeout-abourt-controles does not export types
-const TimeoutController = require('timeout-abort-controller')
+const { TimeoutController } = require('timeout-abort-controller')
 const { AbortError } = require('abortable-iterator')
 const { anySignal } = require('any-signal')

--- a/src/index.js
+++ b/src/index.js
@@ -18,6 +18,7 @@ const { codes, messages } = require('./errors')

 const AddressManager = require('./address-manager')
 const ConnectionManager = require('./connection-manager')
+const AutoDialler = require('./connection-manager/auto-dialler')
 const Circuit = require('./circuit/transport')
 const Relay = require('./circuit')
 const Dialer = require('./dialer')
@@ -193,9 +194,13 @@ class Libp2p extends EventEmitter {

    // Create the Connection Manager
    this.connectionManager = new ConnectionManager(this, {
-      autoDial: this._config.peerDiscovery.autoDial,
      ...this._options.connectionManager
    })
+    this._autodialler = new AutoDialler(this, {
+      enabled: this._config.peerDiscovery.autoDial,
+      minConnections: this._options.connectionManager.minConnections,
+      autoDialInterval: this._options.connectionManager.autoDialInterval
+    })

    // Create Metrics
    if (this._options.metrics.enabled) {
@@ -380,6 +385,8 @@ class Libp2p extends EventEmitter {

      this.relay && this.relay.stop()
      this.peerRouting.stop()
+      this._autodialler.stop()
+      await (this._dht && this._dht.stop())

      for (const service of this._discovery.values()) {
        service.removeListener('peer', this._onDiscoveryPeer)
@@ -394,7 +401,6 @@ class Libp2p extends EventEmitter {

      await Promise.all([
        this.pubsub && this.pubsub.stop(),
-        this._dht && this._dht.stop(),
        this.metrics && this.metrics.stop()
      ])

@@ -650,6 +656,7 @@ class Libp2p extends EventEmitter {
    }

    this.connectionManager.start()
+    this._autodialler.start()

    // Peer discovery
    await this._setupPeerDiscovery()
--- a/src/nat-manager.js
+++ b/src/nat-manager.js
@@ -1,7 +1,7 @@
 'use strict'

 // @ts-ignore nat-api does not export types
-const NatAPI = require('@motrix/nat-api')
+const NatAPI = require('nat-api')
 const debug = require('debug')
 const { promisify } = require('es6-promisify')
 const { Multiaddr } = require('multiaddr')
--- a/src/peer-routing.js
+++ b/src/peer-routing.js
@@ -10,11 +10,11 @@ const {
  uniquePeers,
  requirePeers
 } = require('./content-routing/utils')
+const { TimeoutController } = require('timeout-abort-controller')

 const merge = require('it-merge')
 const { pipe } = require('it-pipe')
 const first = require('it-first')
-const drain = require('it-drain')
 const filter = require('it-filter')
 const {
  setDelayedInterval,
@@ -34,6 +34,7 @@ const { DHTPeerRouting } = require('./dht/dht-peer-routing')
 * @property {boolean} [enabled = true] - Whether to enable the Refresh manager
 * @property {number} [bootDelay = 6e5] - Boot delay to start the Refresh Manager (in ms)
 * @property {number} [interval = 10e3] - Interval between each Refresh Manager run (in ms)
+ * @property {number} [timeout = 10e3] - How long to let each refresh run (in ms)
 *
 * @typedef {Object} PeerRoutingOptions
 * @property {RefreshManagerOptions} [refreshManager]
@@ -75,13 +76,25 @@ class PeerRouting {

  /**
   * Recurrent task to find closest peers and add their addresses to the Address Book.
+   * Does not include the DHT (if present) as it has it's own method of periodically
+   * finding the closest peers
   */
  async _findClosestPeersTask () {
+    const timeout = new TimeoutController(this._refreshManagerOptions.timeout || 10e3)
+
    try {
-      // nb getClosestPeers adds the addresses to the address book
-      await drain(this.getClosestPeers(this._peerId.id))
+      const routers = this._routers.filter(router => !(router instanceof DHTPeerRouting))
+
+      await pipe(
+        merge(
+          ...routers.map(router => router.getClosestPeers(this._peerId.id, { signal: timeout.signal }))
+        ),
+        (source) => storeAddresses(source, this._peerStore)
+      )
    } catch (/** @type {any} */ err) {
      log.error(err)
+    } finally {
+      timeout.clear()
    }
  }

@@ -131,7 +144,8 @@ class PeerRouting {
   *
   * @param {Uint8Array} key - A CID like key
   * @param {Object} [options]
-   * @param {number} [options.timeout=30e3] - How long the query can take.
+   * @param {number} [options.timeout=30e3] - How long the query can take
+   * @param {AbortSignal} [options.signal] - An AbortSignal to abort the request
   * @returns {AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }>}
   */
  async * getClosestPeers (key, options = { timeout: 30e3 }) {
@@ -139,6 +153,10 @@ class PeerRouting {
      throw errCode(new Error('No peer routers available'), 'NO_ROUTERS_AVAILABLE')
    }

+    if (options.timeout) {
+      options.signal = new TimeoutController(options.timeout).signal
+    }
+
    yield * pipe(
      merge(
        ...this._routers.map(router => router.getClosestPeers(key, options))
--- a/test/ts-use/package.json
+++ b/test/ts-use/package.json
@@ -16,7 +16,7 @@
    "libp2p-record": "^0.10.4",
    "libp2p-tcp": "^0.17.1",
    "libp2p-websockets": "^0.16.1",
-    "peer-id": "^0.15.4"
+    "peer-id": "^0.16.0"
  },
  "scripts": {
    "build": "npx tsc",
Author	SHA1	Message	Date
achingbrain	1650d7b7a3	fix: exclude dht from search-for-self The peer routing module starts a recurring process that searches for peers close to our peer id. This makes the DHT module query the network for peers. Thing is the DHT module is already doing this because periodically searching for peers close to us is in the DHT spec so this ends up making redundant queries. This PR excludes the DHT from the search-for-self task	2021-12-07 14:36:29 +00:00
Alex Potsides	cbaa5a2ef3	chore: switch to nat api (#1052 ) @motrix/nat-api is a fork, nat-api has the fix from https://github.com/alxhotel/nat-api/pull/25	2021-12-07 09:37:12 +00:00
Alan Smithee	51dabb1724	chore: pubsub example subscribe returns void (#1048 ) Seems like the correct return type of `Libp2p.pubsub.subscribe` is `void`, so the `await` can be removed: `ae21299ade/src/pubsub-adapter.js (L29)`	2021-12-06 21:12:38 +01:00
Vasco Santos	b9339bccaa	chore: release version v0.35.2	2021-12-06 21:07:39 +01:00
Vasco Santos	9b21893b64	chore: update contributors	2021-12-06 21:07:38 +01:00
Alex Potsides	b70fb43427	fix: increase maxlisteners on event target (#1050 ) Sometimes you encounter peers with lots of addresses. When this happens you can attach more than 10x event listeners to the abort signal we use to abort all the dials - this causes node to print a warning which is misleading. This PR increases the default number of listeners on the signal. Fixes #900	2021-12-06 20:54:44 +01:00
achingbrain	ae21299ade	chore: release version v0.35.1	2021-12-03 16:24:14 +00:00
achingbrain	149120bebc	chore: update contributors	2021-12-03 16:24:13 +00:00
Alex Potsides	91c2ec9856	fix: do not let closest peers run forever (#1047 ) The DHT takes a `signal` not a timeout so if a timeout is passed, create a `TimeoutController` that will abort the query after the timeout.	2021-12-03 15:47:30 +00:00
achingbrain	6d0ac819f1	chore: release version v0.35.0	2021-12-02 10:44:07 +00:00
achingbrain	15a0b1dbf2	chore: update contributors	2021-12-02 10:44:07 +00:00
Alex Potsides	9cbf36fcb5	chore: update peer id and libp2p crypto (#1042 ) BREAKING CHANGE: requires node 15+	2021-12-02 10:11:23 +00:00
Alex Potsides	3a9d5f64d9	fix: stop dht before connection manager (#1041 ) Stop the dht before the connection manager, otherwise in-flight eviction pings fail and we move on to the next one when we should just abort them all. Also pulls in the fix from #1039 and splits the auto-dialler out from the connection manager as during shutdown it can get into a weird state where it's simultaneously killing and creating connections so stop auto-dialling things before we cause connections to dip below the low watermark by killing existing connections. Fixes: https://github.com/ipfs/js-ipfs/issues/3923	2021-11-30 18:07:57 +00:00