chore: use npm install for examples

.github/workflows/examples.yml

@@ -12,9 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 16
     - run: npm install
     - run: npx aegir lint
     - run: npx aegir ts -p check
@@ -24,118 +21,82 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- auto-relay
+      - run: cd examples && npm install && npm run test -- auto-relay
   test-chat-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- chat
+      - run: cd examples && npm install && npm run test -- chat
   test-connection-encryption-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- connection-encryption
+      - run: cd examples && npm install && npm run test -- connection-encryption
   test-discovery-mechanisms-example:
     needs: check
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- discovery-mechanisms
+      - run: cd examples && npm install && npm run test -- discovery-mechanisms
   test-echo-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- echo
+      - run: cd examples && npm install && npm run test -- echo
   test-libp2p-in-the-browser-example:
     needs: check
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- libp2p-in-the-browser
+      - run: cd examples && npm install && npm run test -- libp2p-in-the-browser
   test-peer-and-content-routing-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- peer-and-content-routing
+      - run: cd examples && npm install && npm run test -- peer-and-content-routing
   test-pnet-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- pnet
+      - run: cd examples && npm install && npm run test -- pnet
   test-protocol-and-stream-muxing-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- protocol-and-stream-muxing
+      - run: cd examples && npm install && npm run test -- protocol-and-stream-muxing
   test-pubsub-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- pubsub
+      - run: cd examples && npm install && npm run test -- pubsub
   test-transports-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
       - run: npm install
-      - run: cd examples && npm i && npm run test -- transports
+      - run: cd examples && npm install && npm run test -- transports
   test-webrtc-direct-example:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - run: npm install
-        with:
+      - run: cd examples && npm install && npm run test -- webrtc-direct
-            node-version: 16
-      - run: npm install -g @mapbox/node-pre-gyp && npm install
-      - run: cd examples && npm i && npm run test -- webrtc-direct

.github/workflows/main.yml

@@ -14,9 +14,10 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: 14
     - run: npm install
     - run: npx aegir lint
+    - uses: gozala/typescript-error-reporter-action@v1.0.8
     - run: npx aegir build
     - run: npx aegir dep-check
     - uses: ipfs/aegir/actions/bundle-size@v32.1.0
@@ -29,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        node: [16]
+        node: [14, 16]
       fail-fast: true
     steps:
       - uses: actions/checkout@v2
@@ -44,9 +45,6 @@ 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:
@@ -54,9 +52,6 @@ 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:
@@ -64,9 +59,6 @@ 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:
@@ -74,8 +66,5 @@ 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
+      - run: cd node_modules/interop-libp2p && yarn && LIBP2P_JS=${GITHUB_WORKSPACE}/src/index.js npx aegir test -t node --bail -- --exit

CHANGELOG.md

@@ -1,41 +1,3 @@
-# [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)
-
-
-### Bug Fixes
-
-* 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))
-
-
-### Features
-
-* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
-
-
-### BREAKING CHANGES
-
-* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
-
-
-
 # [0.33.0](https://github.com/libp2p/js-libp2p/compare/v0.32.5...v0.33.0) (2021-09-24)
 
 

doc/API.md

@@ -2086,7 +2086,7 @@ the NatManager performing NAT hole punching.
 
 [address]: https://github.com/libp2p/js-libp2p/tree/master/src/peer-store/address-book.js
 [cid]: https://github.com/multiformats/js-cid
-[connection]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/interfaces/src/connection
+[connection]: https://github.com/libp2p/js-interfaces/tree/master/src/connection
 [multiaddr]: https://github.com/multiformats/js-multiaddr
 [peer-id]: https://github.com/libp2p/js-peer-id
 [keys]: https://github.com/libp2p/js-libp2p-crypto/tree/master/src/keys

doc/CONFIGURATION.md

@@ -1,7 +1,8 @@
 # 
 
-- [Overview](#overview)
+- [Configuration](#configuration)
-- [Modules](#modules)
+  - [Overview](#overview)
+  - [Modules](#modules)
     - [Transport](#transport)
     - [Stream Multiplexing](#stream-multiplexing)
     - [Connection Encryption](#connection-encryption)
@@ -10,7 +11,7 @@
     - [Peer Routing](#peer-routing)
     - [DHT](#dht)
     - [Pubsub](#pubsub)
-- [Customizing libp2p](#customizing-libp2p)
+  - [Customizing libp2p](#customizing-libp2p)
     - [Examples](#examples)
       - [Basic setup](#basic-setup)
       - [Customizing Peer Discovery](#customizing-peer-discovery)
@@ -30,8 +31,7 @@
       - [Configuring the NAT Manager](#configuring-the-nat-manager)
         - [Browser support](#browser-support)
         - [UPnP and NAT-PMP](#upnp-and-nat-pmp)
-    - [Configuring protocol name](#configuring-protocol-name)
+  - [Configuration examples](#configuration-examples)
-- [Configuration examples](#configuration-examples)
 
 ## Overview
 
@@ -374,7 +374,11 @@ const node = await Libp2p.create({
     dht: {                        // The DHT options (and defaults) can be found in its documentation
       kBucketSize: 20,
       enabled: true,              // This flag is required for DHT to run (disabled by default)
-      clientMode: false           // Whether to run the WAN DHT in client or server mode (default: client mode)
+      randomWalk: {
+        enabled: true,            // Allows to disable discovery (enabled by default)
+        interval: 300e3,
+        timeout: 10e3
+      }
     }
   }
 })

examples/delegated-routing/package.json

@@ -7,7 +7,7 @@
     "libp2p": "github:libp2p/js-libp2p#master",
     "libp2p-delegated-content-routing": "~0.2.2",
     "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "^0.26.5",
+    "libp2p-kad-dht": "~0.14.12",
     "libp2p-mplex": "~0.8.5",
     "libp2p-secio": "~0.11.1",
     "libp2p-webrtc-star": "~0.15.8",

examples/discovery-mechanisms/README.md

@@ -55,7 +55,7 @@ const node = await Libp2p.create({
   peerId,
   addresses: {
     listen: ['/ip4/0.0.0.0/tcp/0']
-  },
+  }
   modules: {
     transport: [ TCP ],
     streamMuxer: [ Mplex ],
@@ -117,7 +117,7 @@ const createNode = () => {
   return Libp2p.create({
     addresses: {
       listen: ['/ip4/0.0.0.0/tcp/0']
-    },
+    }
     modules: {
       transport: [ TCP ],
       streamMuxer: [ Mplex ],
@@ -144,13 +144,8 @@ const [node1, node2] = await Promise.all([
   createNode()
 ])
 
-node1.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
+node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
-node2.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
+node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
-
-await Promise.all([
-  node1.start(),
-  node2.start()
-])
 ```
 
 If you run this example, you will see the other peers being discovered.

examples/libp2p-in-the-browser/package.json

@@ -28,6 +28,6 @@
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-polyfill": "^6.26.0",
-    "parcel": "^2.0.1"
+    "parcel": "next"
   }
 }

examples/libp2p-in-the-browser/test.js

@@ -38,7 +38,7 @@ async function run() {
         )
         await browser.close();
 
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         console.error(err)
         process.exit(1)
       } finally {

examples/transports/3.js

@@ -81,7 +81,7 @@ function print ({ stream }) {
   // node 3 (listening WebSockets) can dial node 1 (TCP)
   try {
     await node3.dialProtocol(node1.peerId, '/print')
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     console.log('node 3 failed to dial to node 1 with:', err.message)
   }
 })();

examples/utils.js

@@ -9,7 +9,7 @@ async function isExecutable (command) {
     await fs.access(command, fs.constants.X_OK)
 
     return true
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     if (err.code === 'ENOENT') {
       return isExecutable(await which(command))
     }
@@ -49,7 +49,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
 
   try {
     await proc
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     if (!err.killed) {
       throw err
     }

examples/webrtc-direct/index.html

@@ -12,6 +12,6 @@
   <main>
     <pre id="output"></pre>
   </main>
-  <script src="./dialer.js" type="module"></script>
+  <script src="./dialer.js"></script>
 </body>
 </html>

examples/webrtc-direct/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "description": "",
+  "main": "dist/index.html",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "parcel build index.html",
@@ -15,7 +16,7 @@
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-polyfill": "^6.26.0",
-    "parcel": "^2.0.1",
+    "parcel-bundler": "1.12.3",
     "util": "^0.12.3"
   },
   "dependencies": {
@@ -24,7 +25,7 @@
     "libp2p-mplex": "^0.10.4",
     "@chainsafe/libp2p-noise": "^4.1.0",
     "libp2p-webrtc-direct": "^0.7.0",
-    "peer-id": "^0.16.0"
+    "peer-id": "^0.15.0"
   },
   "browser": {
     "ipfs": "ipfs/dist/index.min.js"

examples/webrtc-direct/test.js

@@ -72,7 +72,7 @@ async function test () {
                   { timeout: 10000 }
                 )
                 await browser.close();
-            } catch (/** @type {any} */ err) {
+            } catch (err) {
                 console.error(err)
                 process.exit(1)
             } finally {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.35.0",
+  "version": "0.33.0",
   "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
   "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
   "main": "src/index.js",
@@ -41,7 +41,6 @@
     "test:node": "aegir test -t node -f \"./test/**/*.{node,spec}.js\"",
     "test:browser": "aegir test -t browser",
     "test:examples": "cd examples && npm run test:all",
-    "test:interop": "LIBP2P_JS=$PWD npx aegir test -t node -f ./node_modules/libp2p-interop/test/*",
     "prepare": "aegir build --no-bundle",
     "release": "aegir release -t node -t browser",
     "release-minor": "aegir release --type minor -t node -t browser",
@@ -66,7 +65,7 @@
   "homepage": "https://libp2p.io",
   "license": "MIT",
   "engines": {
-    "node": ">=15.0.0"
+    "node": ">=14.0.0"
   },
   "browser": {
     "@motrix/nat-api": false
@@ -75,15 +74,14 @@
     "extends": "ipfs",
     "ignorePatterns": [
       "!.aegir.js",
-      "test/ts-use",
+      "test/ts-use"
-      "*.d.ts"
     ]
   },
   "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 +103,8 @@
     "it-merge": "^1.0.0",
     "it-pipe": "^1.1.0",
     "it-take": "^1.0.0",
-    "libp2p-crypto": "^0.21.0",
+    "libp2p-crypto": "^0.19.4",
-    "libp2p-interfaces": "^2.0.1",
+    "libp2p-interfaces": "^1.0.0",
     "libp2p-utils": "^0.4.0",
     "mafmt": "^10.0.0",
     "merge-options": "^3.0.4",
@@ -119,14 +117,14 @@
     "p-fifo": "^1.0.0",
     "p-retry": "^4.4.0",
     "p-settle": "^4.1.1",
-    "peer-id": "^0.16.0",
+    "peer-id": "^0.15.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": "^2.0.0",
+    "timeout-abort-controller": "^1.1.1",
     "uint8arrays": "^3.0.0",
     "varint": "^6.0.0",
     "wherearewe": "^1.0.0",
@@ -139,35 +137,35 @@
     "@types/node": "^16.0.1",
     "@types/node-forge": "^0.10.1",
     "@types/varint": "^6.0.0",
-    "aegir": "^36.0.0",
+    "aegir": "^33.1.1",
     "buffer": "^6.0.3",
     "datastore-core": "^6.0.7",
     "delay": "^5.0.0",
-    "into-stream": "^6.0.0",
+    "interop-libp2p": "^0.4.0",
-    "ipfs-http-client": "^54.0.2",
+    "into-stream": "^7.0.0",
+    "ipfs-http-client": "^52.0.2",
     "it-concat": "^2.0.0",
     "it-pair": "^1.0.0",
     "it-pushable": "^1.4.0",
     "libp2p": ".",
-    "libp2p-bootstrap": "^0.14.0",
+    "libp2p-bootstrap": "^0.13.0",
     "libp2p-delegated-content-routing": "^0.11.0",
-    "libp2p-delegated-peer-routing": "^0.11.0",
+    "libp2p-delegated-peer-routing": "^0.10.0",
     "libp2p-floodsub": "^0.27.0",
     "libp2p-gossipsub": "^0.11.0",
-    "libp2p-interfaces-compliance-tests": "^2.0.1",
+    "libp2p-interfaces-compliance-tests": "^1.0.0",
-    "libp2p-interop": "^0.5.0",
+    "libp2p-kad-dht": "^0.24.2",
-    "libp2p-kad-dht": "^0.27.1",
+    "libp2p-mdns": "^0.17.0",
-    "libp2p-mdns": "^0.18.0",
     "libp2p-mplex": "^0.10.1",
     "libp2p-tcp": "^0.17.0",
-    "libp2p-webrtc-star": "^0.25.0",
+    "libp2p-webrtc-star": "^0.23.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": "^12.0.1",
+    "sinon": "^11.1.1",
     "util": "^0.12.3"
   },
   "contributors": [
@@ -181,28 +179,28 @@
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Maciej Krüger <mkg20001@gmail.com>",
     "Hugo Dias <mail@hugodias.me>",
-    "dirkmc <dirkmdev@gmail.com>",
     "Chris Dostert <chrisdostert@users.noreply.github.com>",
+    "dirkmc <dirkmdev@gmail.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>",
     "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
+    "Franck Royer <franck@royer.one>",
+    "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>",
-    "Thomas Eizinger <thomas@eizinger.io>",
     "Didrik Nordström <didrik.nordstrom@gmail.com>",
+    "RasmusErik Voel Jensen <github@solsort.com>",
+    "Robert Kiel <robert.kiel@hoprnet.org>",
     "Smite Chow <xiaopengyou@live.com>",
     "Soeren <nikorpoulsen@gmail.com>",
     "Sönke Hahn <soenkehahn@gmail.com>",
     "TJKoury <TJKoury@gmail.com>",
-    "TheStarBoys <41286328+TheStarBoys@users.noreply.github.com>",
     "Tiago Alves <alvesjtiago@gmail.com>",
     "XiaoZhang <zxinmyth@gmail.com>",
     "Yusef Napora <yusef@napora.org>",
@@ -212,13 +210,11 @@
     "isan_rivkin <isanrivkin@gmail.com>",
     "mayerwin <mayerwin@users.noreply.github.com>",
     "mcclure <andi.m.mcclure@gmail.com>",
-    "patrickwoodhead <91056047+patrickwoodhead@users.noreply.github.com>",
     "phillmac <phillmac@users.noreply.github.com>",
     "robertkiel <robert.kiel@validitylabs.org>",
     "shresthagrawal <34920931+shresthagrawal@users.noreply.github.com>",
     "swedneck <40505480+swedneck@users.noreply.github.com>",
     "greenSnot <greenSnot@users.noreply.github.com>",
-    "Alan Smithee <ggnore.alan.smithee@gmail.com>",
     "Aleksei <vozhdb@gmail.com>",
     "Bernd Strehl <bernd.strehl@gmail.com>",
     "Chris Bratlien <chrisbratlien@gmail.com>",
@@ -246,7 +242,6 @@
     "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>"
   ]
 }

src/circuit/auto-relay.js

@@ -116,7 +116,7 @@ class AutoRelay {
         this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE))
         await this._addListenRelay(connection, id)
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       this._onError(err)
     }
   }
@@ -169,7 +169,7 @@ class AutoRelay {
     try {
       await this._transportManager.listen([new Multiaddr(listenAddr)])
       // Announce multiaddrs will update on listen success by TransportManager event being triggered
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       this._onError(err)
       this._listenRelays.delete(id)
     }
@@ -267,7 +267,7 @@ class AutoRelay {
           return
         }
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       this._onError(err)
     }
   }
@@ -279,7 +279,7 @@ class AutoRelay {
     try {
       const connection = await this._libp2p.dial(peerId)
       await this._addListenRelay(connection, peerId.toB58String())
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`)
     }
   }

src/circuit/circuit/hop.js

@@ -54,7 +54,7 @@ async function handleHop ({
   // Validate the HOP request has the required input
   try {
     validateAddrs(request, streamHandler)
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err)
   }
 
@@ -93,7 +93,7 @@ async function handleHop ({
       connection: destinationConnection,
       request: stopRequest
     })
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     return log.error(err)
   }
 

src/circuit/circuit/stop.js

@@ -34,7 +34,7 @@ module.exports.handleStop = function handleStop ({
   // Validate the STOP request has the required input
   try {
     validateAddrs(request, streamHandler)
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err)
   }
 

src/circuit/circuit/utils.js

@@ -34,7 +34,7 @@ function validateAddrs (msg, streamHandler) {
         return new Multiaddr(addr)
       })
     }
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
       ? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID
       : CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID)
@@ -47,7 +47,7 @@ function validateAddrs (msg, streamHandler) {
         return new Multiaddr(addr)
       })
     }
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
       ? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID
       : CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID)

src/circuit/index.js

@@ -87,7 +87,7 @@ class Relay {
     try {
       const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS)
       await this._libp2p.contentRouting.provide(cid)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       if (err.code === 'NO_ROUTERS_AVAILABLE') {
         log.error('a content router, such as a DHT, must be provided in order to advertise the relay service', err)
         // Stop the advertise

src/circuit/transport.js

@@ -171,7 +171,7 @@ class Circuit {
       log('new outbound connection %s', maConn.remoteAddr)
 
       return this._upgrader.upgradeOutbound(maConn)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('Circuit relay dial failed', err)
       disconnectOnFailure && await relayConnection.close()
       throw err

src/connection-manager/auto-dialler.js

@@ -1,118 +0,0 @@
-'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

src/connection-manager/index.js

@@ -94,7 +94,9 @@ 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,
@@ -126,6 +128,8 @@ class ConnectionManager extends EventEmitter {
 
     this._started = true
     log('started')
+
+    this._options.autoDial && this._autoDial()
   }
 
   /**
@@ -134,6 +138,7 @@ class ConnectionManager extends EventEmitter {
    * @async
    */
   async stop () {
+    this._autoDialTimeout && this._autoDialTimeout.clear()
     this._timer && this._timer.clear()
 
     this._latencyMonitor.removeListener('data', this._onLatencyMeasure)
@@ -307,6 +312,53 @@ 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; 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)
+
+          // Connection Manager was stopped
+          if (!this._started) {
+            return
+          }
+        } catch (err) {
+          log.error('could not connect to peerStore stored peer', err)
+        }
+      }
+    }
+
+    this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
+  }
+
   /**
    * If we have more connections than our maximum, close a connection
    * to the lowest valued peer.

src/content-routing/index.js

@@ -8,10 +8,9 @@ const {
   requirePeers,
   maybeLimitSource
 } = require('./utils')
-const drain = require('it-drain')
+
 const merge = require('it-merge')
 const { pipe } = require('it-pipe')
-const { DHTContentRouting } = require('../dht/dht-content-routing')
 
 /**
  * @typedef {import('peer-id')} PeerId
@@ -39,7 +38,7 @@ class ContentRouting {
 
     // If we have the dht, add it to the available content routers
     if (this.dht && libp2p._config.dht.enabled) {
-      this.routers.push(new DHTContentRouting(this.dht))
+      this.routers.push(this.dht)
     }
   }
 
@@ -92,12 +91,12 @@ class ContentRouting {
    * @param {number} [options.minPeers] - minimum number of peers required to successfully put
    * @returns {Promise<void>}
    */
-  async put (key, value, options) {
+  put (key, value, options) {
     if (!this.libp2p.isStarted() || !this.dht.isStarted) {
       throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
     }
 
-    await drain(this.dht.put(key, value, options))
+    return this.dht.put(key, value, options)
   }
 
   /**
@@ -109,18 +108,12 @@ class ContentRouting {
    * @param {number} [options.timeout] - optional timeout (default: 60000)
    * @returns {Promise<GetData>}
    */
-  async get (key, options) {
+  get (key, options) {
     if (!this.libp2p.isStarted() || !this.dht.isStarted) {
       throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
     }
 
-    for await (const event of this.dht.get(key, options)) {
+    return this.dht.get(key, options)
-      if (event.name === 'VALUE') {
-        return { from: event.peerId, val: event.value }
-      }
-    }
-
-    throw errCode(new Error(messages.NOT_FOUND), codes.ERR_NOT_FOUND)
   }
 
   /**
@@ -130,33 +123,14 @@ class ContentRouting {
    * @param {number} nVals
    * @param {Object} [options] - get options
    * @param {number} [options.timeout] - optional timeout (default: 60000)
+   * @returns {Promise<GetData[]>}
    */
-  async * getMany (key, nVals, options) { // eslint-disable-line require-await
+  async getMany (key, nVals, options) { // eslint-disable-line require-await
     if (!this.libp2p.isStarted() || !this.dht.isStarted) {
       throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
     }
 
-    if (!nVals) {
+    return this.dht.getMany(key, nVals, options)
-      return
-    }
-
-    let gotValues = 0
-
-    for await (const event of this.dht.get(key, options)) {
-      if (event.name === 'VALUE') {
-        yield { from: event.peerId, val: event.value }
-
-        gotValues++
-
-        if (gotValues === nVals) {
-          break
-        }
-      }
-    }
-
-    if (gotValues === 0) {
-      throw errCode(new Error(messages.NOT_FOUND), codes.ERR_NOT_FOUND)
-    }
   }
 }
 

src/dht/dht-content-routing.js

@@ -1,44 +0,0 @@
-'use strict'
-
-const drain = require('it-drain')
-
-/**
- * @typedef {import('peer-id')} PeerId
- * @typedef {import('libp2p-interfaces/src/content-routing/types').ContentRouting} ContentRoutingModule
- * @typedef {import('multiformats/cid').CID} CID
- */
-
-/**
- * Wrapper class to convert events into returned values
- *
- * @implements {ContentRoutingModule}
- */
-class DHTContentRouting {
-  /**
-   * @param {import('libp2p-kad-dht').DHT} dht
-   */
-  constructor (dht) {
-    this._dht = dht
-  }
-
-  /**
-   * @param {CID} cid
-   */
-  async provide (cid) {
-    await drain(this._dht.provide(cid))
-  }
-
-  /**
-   * @param {CID} cid
-   * @param {*} options
-   */
-  async * findProviders (cid, options) {
-    for await (const event of this._dht.findProviders(cid, options)) {
-      if (event.name === 'PROVIDER') {
-        yield * event.providers
-      }
-    }
-  }
-}
-
-module.exports = { DHTContentRouting }

src/dht/dht-peer-routing.js

@@ -1,51 +0,0 @@
-'use strict'
-
-const errCode = require('err-code')
-const { messages, codes } = require('../errors')
-
-/**
- * @typedef {import('peer-id')} PeerId
- * @typedef {import('libp2p-interfaces/src/peer-routing/types').PeerRouting} PeerRoutingModule
- */
-
-/**
- * Wrapper class to convert events into returned values
- *
- * @implements {PeerRoutingModule}
- */
-class DHTPeerRouting {
-  /**
-   * @param {import('libp2p-kad-dht').DHT} dht
-   */
-  constructor (dht) {
-    this._dht = dht
-  }
-
-  /**
-   * @param {PeerId} peerId
-   * @param {any} options
-   */
-  async findPeer (peerId, options = {}) {
-    for await (const event of this._dht.findPeer(peerId, options)) {
-      if (event.name === 'FINAL_PEER') {
-        return event.peer
-      }
-    }
-
-    throw errCode(new Error(messages.NOT_FOUND), codes.ERR_NOT_FOUND)
-  }
-
-  /**
-   * @param {Uint8Array} key
-   * @param {any} options
-   */
-  async * getClosestPeers (key, options = {}) {
-    for await (const event of this._dht.getClosestPeers(key, options)) {
-      if (event.name === 'PEER_RESPONSE') {
-        yield * event.closer
-      }
-    }
-  }
-}
-
-module.exports = { DHTPeerRouting }

src/dialer/index.js

@@ -6,7 +6,8 @@ const log = Object.assign(debug('libp2p:dialer'), {
 })
 const errCode = require('err-code')
 const { Multiaddr } = require('multiaddr')
-const { TimeoutController } = require('timeout-abort-controller')
+// @ts-ignore timeout-abourt-controles does not export types
+const TimeoutController = require('timeout-abort-controller')
 const { AbortError } = require('abortable-iterator')
 const { anySignal } = require('any-signal')
 
@@ -94,7 +95,7 @@ class Dialer {
     for (const dial of this._pendingDials.values()) {
       try {
         dial.controller.abort()
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         log.error(err)
       }
     }
@@ -128,7 +129,7 @@ class Dialer {
       const connection = await pendingDial.promise
       log('dial succeeded to %s', dialTarget.id)
       return connection
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       // Error is a timeout
       if (pendingDial.controller.signal.aborted) {
         err.code = codes.ERR_TIMEOUT

src/errors.js

@@ -3,8 +3,7 @@
 exports.messages = {
   NOT_STARTED_YET: 'The libp2p node is not started yet',
   DHT_DISABLED: 'DHT is not available',
-  CONN_ENCRYPTION_REQUIRED: 'At least one connection encryption module is required',
+  CONN_ENCRYPTION_REQUIRED: 'At least one connection encryption module is required'
-  NOT_FOUND: 'Not found'
 }
 
 exports.codes = {
@@ -30,7 +29,6 @@ exports.codes = {
   ERR_INVALID_PARAMETERS: 'ERR_INVALID_PARAMETERS',
   ERR_INVALID_PEER: 'ERR_INVALID_PEER',
   ERR_MUXER_UNAVAILABLE: 'ERR_MUXER_UNAVAILABLE',
-  ERR_NOT_FOUND: 'ERR_NOT_FOUND',
   ERR_TIMEOUT: 'ERR_TIMEOUT',
   ERR_TRANSPORT_UNAVAILABLE: 'ERR_TRANSPORT_UNAVAILABLE',
   ERR_TRANSPORT_DIAL_FAILED: 'ERR_TRANSPORT_DIAL_FAILED',

src/get-peer.js

@@ -32,7 +32,7 @@ function getPeer (peer) {
 
     try {
       peer = PeerId.createFromB58String(idStr)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(
         new Error(`${peer} is not a valid peer type`),
         codes.ERR_INVALID_MULTIADDR

src/identify/index.js

@@ -124,7 +124,7 @@ class IdentifyService {
           stream,
           consume
         )
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         // Just log errors
         log.error('could not push identify update to peer', err)
       }
@@ -182,7 +182,7 @@ class IdentifyService {
     let message
     try {
       message = Message.Identify.decode(data)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_INVALID_MESSAGE)
     }
 
@@ -211,14 +211,14 @@ class IdentifyService {
         this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
         return
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
     }
 
     // LEGACY: Update peers data in PeerStore
     try {
       this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr)))
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('received invalid addrs', err)
     }
 
@@ -287,7 +287,7 @@ class IdentifyService {
         stream,
         consume
       )
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('could not respond to identify request', err)
     }
   }
@@ -313,7 +313,7 @@ class IdentifyService {
         collect
       )
       message = Message.Identify.decode(data)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return log.error('received invalid message', err)
     }
 
@@ -325,7 +325,7 @@ class IdentifyService {
         this.peerStore.protoBook.set(id, message.protocols)
         return
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
     }
 
@@ -333,7 +333,7 @@ class IdentifyService {
     try {
       this.peerStore.addressBook.set(id,
         message.listenAddrs.map((addr) => new Multiaddr(addr)))
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('received invalid addrs', err)
     }
 

src/index.js

@@ -18,7 +18,6 @@ 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')
@@ -194,13 +193,9 @@ 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) {
@@ -306,9 +301,14 @@ class Libp2p extends EventEmitter {
     // dht provided components (peerRouting, contentRouting, dht)
     if (this._modules.dht) {
       const DHT = this._modules.dht
-      // @ts-ignore TODO: types need fixing - DHT is an `object` which has no `create` method
+      // @ts-ignore Object is not constructable
-      this._dht = DHT.create({
+      this._dht = new DHT({
         libp2p: this,
+        dialer: this.dialer,
+        peerId: this.peerId,
+        peerStore: this.peerStore,
+        registrar: this.registrar,
+        datastore: this.datastore,
         ...this._config.dht
       })
     }
@@ -363,7 +363,7 @@ class Libp2p extends EventEmitter {
       await this._onStarting()
       await this._onDidStart()
       log('libp2p has started')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       this.emit('error', err)
       log.error('An error occurred starting libp2p', err)
       await this.stop()
@@ -385,8 +385,6 @@ 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)
@@ -401,6 +399,7 @@ class Libp2p extends EventEmitter {
 
       await Promise.all([
         this.pubsub && this.pubsub.stop(),
+        this._dht && this._dht.stop(),
         this.metrics && this.metrics.stop()
       ])
 
@@ -409,7 +408,7 @@ class Libp2p extends EventEmitter {
 
       ping.unmount(this)
       this.dialer.destroy()
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       if (err) {
         log.error(err)
         this.emit('error', err)
@@ -432,7 +431,7 @@ class Libp2p extends EventEmitter {
 
     try {
       await this.keychain.findKeyByName('self')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       await this.keychain.importPeer('self', this.peerId)
     }
   }
@@ -625,7 +624,7 @@ class Libp2p extends EventEmitter {
 
     // DHT subsystem
     if (this._config.dht.enabled) {
-      this._dht && await this._dht.start()
+      this._dht && this._dht.start()
 
       // TODO: this should be modified once random-walk is used as
       // the other discovery modules
@@ -656,7 +655,6 @@ class Libp2p extends EventEmitter {
     }
 
     this.connectionManager.start()
-    this._autodialler.start()
 
     // Peer discovery
     await this._setupPeerDiscovery()
@@ -700,7 +698,7 @@ class Libp2p extends EventEmitter {
         log('connecting to discovered peer %s', peerId.toB58String())
         try {
           await this.dialer.connectToPeer(peerId)
-        } catch (/** @type {any} */ err) {
+        } catch (err) {
           log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
         }
       }

src/insecure/plaintext.js

@@ -55,7 +55,7 @@ async function encrypt (localId, conn, remoteId) {
   let peerId
   try {
     peerId = await PeerId.createFromPubKey(id.pubkey.Data)
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     log.error(err)
     throw new InvalidCryptoExchangeError('Remote did not provide its public key')
   }

src/keychain/cms.js

@@ -90,7 +90,7 @@ class CMS {
       const obj = forge.asn1.fromDer(buf)
       // @ts-ignore not defined
       cms = forge.pkcs7.messageFromAsn1(obj)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
     }
 
@@ -114,7 +114,7 @@ class CMS {
       try {
         const key = await this.keychain.findKeyById(recipient.keyId)
         if (key) return true
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         return false
       }
       return false

src/keychain/index.js

@@ -248,7 +248,7 @@ class Keychain {
       batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
 
       await batch.commit()
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
 
@@ -284,7 +284,7 @@ class Keychain {
     try {
       const keys = await this.listKeys()
       return keys.find((k) => k.id === id)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
   }
@@ -304,7 +304,7 @@ class Keychain {
     try {
       const res = await this.store.get(dsname)
       return JSON.parse(uint8ArrayToString(res))
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
     }
   }
@@ -365,7 +365,7 @@ class Keychain {
       batch.delete(oldInfoName)
       await batch.commit()
       return keyInfo
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
   }
@@ -393,7 +393,7 @@ class Keychain {
       const dek = privates.get(this).dek
       const privateKey = await crypto.keys.import(pem, dek)
       return privateKey.export(password)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
   }
@@ -421,7 +421,7 @@ class Keychain {
     let privateKey
     try {
       privateKey = await crypto.keys.import(pem, password)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(errcode(new Error('Cannot read the key, most likely the password is wrong'), 'ERR_CANNOT_READ_KEY'))
     }
 
@@ -431,7 +431,7 @@ class Keychain {
       /** @type {string} */
       const dek = privates.get(this).dek
       pem = await privateKey.export(dek)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
 
@@ -482,7 +482,7 @@ class Keychain {
       batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
       await batch.commit()
       return keyInfo
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(err)
     }
   }
@@ -502,7 +502,7 @@ class Keychain {
       const dsname = DsName(name)
       const res = await this.store.get(dsname)
       return uint8ArrayToString(res)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
     }
   }

src/nat-manager.js

@@ -114,7 +114,7 @@ class NatManager {
       const client = this._getClient()
       const publicIp = this._externalIp || await client.externalIp()
 
-      // @ts-expect-error types are wrong
+      // @ts-ignore isPrivate has no call signatures
       if (isPrivateIp(publicIp)) {
         throw new Error(`${publicIp} is private - please set config.nat.externalIp to an externally routable IP or ensure you are not behind a double NAT`)
       }
@@ -188,7 +188,7 @@ class NatManager {
     try {
       await this._client.destroy()
       this._client = null
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }

src/peer-routing.js

@@ -21,7 +21,6 @@ const {
   clearDelayedInterval
 // @ts-ignore module with no types
 } = require('set-delayed-interval')
-const { DHTPeerRouting } = require('./dht/dht-peer-routing')
 
 /**
  * @typedef {import('peer-id')} PeerId
@@ -52,7 +51,7 @@ class PeerRouting {
 
     // If we have the dht, add it to the available peer routers
     if (libp2p._dht && libp2p._config.dht.enabled) {
-      this._routers.push(new DHTPeerRouting(libp2p._dht))
+      this._routers.push(libp2p._dht)
     }
 
     this._refreshManagerOptions = libp2p._options.peerRouting.refreshManager
@@ -80,7 +79,7 @@ class PeerRouting {
     try {
       // nb getClosestPeers adds the addresses to the address book
       await drain(this.getClosestPeers(this._peerId.id))
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }

src/peer-store/address-book.js

@@ -83,7 +83,7 @@ class AddressBook extends Book {
     let peerRecord
     try {
       peerRecord = PeerRecord.createFromProtobuf(envelope.payload)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('invalid peer record received')
       return false
     }

src/peer-store/metadata-book.js

@@ -80,11 +80,10 @@ class MetadataBook extends Book {
   /**
    * Set data into the datastructure
    *
+   * @override
    * @param {PeerId} peerId
    * @param {string} key
    * @param {Uint8Array} value
-   * @param {object} [opts]
-   * @param {boolean} [opts.emit]
    */
   _setValue (peerId, key, value, { emit = true } = {}) {
     const id = peerId.toB58String()

src/peer-store/persistent/index.js

@@ -249,7 +249,7 @@ class PersistentPeerStore extends PeerStore {
       }).finish()
 
       batch.put(key, encodedData)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }
@@ -275,7 +275,7 @@ class PersistentPeerStore extends PeerStore {
       const encodedData = peerId.marshalPubKey()
 
       batch.put(key, encodedData)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }
@@ -302,7 +302,7 @@ class PersistentPeerStore extends PeerStore {
           batch.delete(key)
         }
       })
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }
@@ -330,7 +330,7 @@ class PersistentPeerStore extends PeerStore {
       const encodedData = Protocols.encode({ protocols }).finish()
 
       batch.put(key, encodedData)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }
@@ -399,7 +399,7 @@ class PersistentPeerStore extends PeerStore {
         default:
           log('invalid data persisted for: ', key.toString())
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error(err)
     }
   }

src/pnet/crypto.js

@@ -77,7 +77,7 @@ module.exports.decodeV1PSK = (pskBuffer) => {
       codecName: codec,
       psk: psk
     }
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
     log.error(err)
     throw new Error(Errors.INVALID_PSK)
   }

src/pnet/key-generator.js

@@ -28,6 +28,6 @@ try {
     // @ts-ignore
     generate(process.stdout)
   }
-} catch (/** @type {any} */ error) {
+} catch (error) {
 
 }

src/transport-manager.js

@@ -109,7 +109,7 @@ class TransportManager {
 
     try {
       return await transport.dial(ma, options)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
       throw err
     }

src/upgrader.js

@@ -106,7 +106,7 @@ class Upgrader {
       } else {
         upgradedConn = encryptedConn
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('Failed to upgrade inbound connection', err)
       await maConn.close(err)
       throw err
@@ -181,7 +181,7 @@ class Upgrader {
       } else {
         upgradedConn = encryptedConn
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       log.error('Failed to upgrade outbound connection', err)
       await maConn.close(err)
       throw err
@@ -245,7 +245,7 @@ class Upgrader {
             if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
             connection.addStream(muxedStream, { protocol })
             this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol })
-          } catch (/** @type {any} */ err) {
+          } catch (err) {
             log.error(err)
           }
         },
@@ -263,7 +263,7 @@ class Upgrader {
           const { stream, protocol } = await mss.select(protocols)
           if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
           return { stream: { ...muxedStream, ...stream }, protocol }
-        } catch (/** @type {any} */ err) {
+        } catch (err) {
           log.error('could not create new stream', err)
           throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
         }
@@ -283,7 +283,7 @@ class Upgrader {
               if (connection.stat.status === 'open') {
                 await connection.close()
               }
-            } catch (/** @type {any} */ err) {
+            } catch (err) {
               log.error(err)
             } finally {
               this.onConnectionEnd(connection)
@@ -371,7 +371,7 @@ class Upgrader {
         ...await crypto.secureInbound(localPeer, stream),
         protocol
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
     }
   }
@@ -406,7 +406,7 @@ class Upgrader {
         ...await crypto.secureOutbound(localPeer, stream, remotePeerId),
         protocol
       }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
     }
   }
@@ -430,7 +430,7 @@ class Upgrader {
       log('%s selected as muxer protocol', protocol)
       const Muxer = muxers.get(protocol)
       return { stream, Muxer }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
     }
   }
@@ -453,7 +453,7 @@ class Upgrader {
       const { stream, protocol } = await listener.handle(protocols)
       const Muxer = muxers.get(protocol)
       return { stream, Muxer }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
     }
   }

test/content-routing/content-routing.node.js

@@ -34,7 +34,7 @@ describe('content-routing', () => {
       try {
         for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line
         throw new Error('.findProviders should return an error')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
         expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
       }
@@ -238,7 +238,7 @@ describe('content-routing', () => {
       try {
         for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line
         throw new Error('should handle errors when finding providers')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
       }
 

test/dialing/dial-request.spec.js

@@ -125,7 +125,7 @@ describe('Dial Request', () => {
     try {
       await dialRequest.run({ signal: controller.signal })
       expect.fail('Should have thrown')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.be.an.instanceof(AggregateError)
     }
 
@@ -162,7 +162,7 @@ describe('Dial Request', () => {
     try {
       await dialRequest.run({ signal: controller.signal })
       expect.fail('Should have thrown')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.be.an.instanceof(AggregateError)
     }
 
@@ -212,7 +212,7 @@ describe('Dial Request', () => {
       setTimeout(() => controller.abort(), 100)
       await dialRequest.run({ signal: controller.signal })
       expect.fail('dial should have failed')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.be.an.instanceof(AggregateError)
     }
 

test/dialing/direct.node.js

@@ -277,7 +277,7 @@ describe('Dialing (direct, TCP)', () => {
 
       try {
         await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0])
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR)
         return
       }

test/dialing/direct.spec.js

@@ -304,7 +304,7 @@ describe('Dialing (direct, WebSockets)', () => {
       dialer.destroy()
       await dialPromise
       expect.fail('should have failed')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.be.an.instanceof(AggregateError)
       expect(dialer._pendingDials.size).to.equal(0) // 1 dial request
     }

test/keychain/keychain.spec.js

@@ -519,7 +519,7 @@ describe('keychain', () => {
     it('should validate newPass is a string', async () => {
       try {
         await kc.rotateKeychainPass(oldPass, 1234567890)
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
       }
     })
@@ -527,7 +527,7 @@ describe('keychain', () => {
     it('should validate oldPass is a string', async () => {
       try {
         await kc.rotateKeychainPass(1234, 'newInsecurePassword1')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
       }
     })
@@ -535,7 +535,7 @@ describe('keychain', () => {
     it('should validate newPass is at least 20 characters', async () => {
       try {
         await kc.rotateKeychainPass(oldPass, 'not20Chars')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
       }
     })
@@ -586,7 +586,7 @@ describe('libp2p.keychain', () => {
 
     try {
       await libp2p.keychain.createKey('keyName', 'rsa', 2048)
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.exist()
       return
     }

test/peer-routing/peer-routing.node.js

@@ -43,7 +43,7 @@ describe('peer-routing', () => {
       try {
         for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line
         throw new Error('.getClosestPeers should return an error')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
         expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
       }
@@ -275,7 +275,7 @@ describe('peer-routing', () => {
       try {
         for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line
         throw new Error('should handle errors when getting the closest peers')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err).to.exist()
       }
 

test/peer-store/address-book.spec.js

@@ -45,7 +45,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         ab.set('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -55,7 +55,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if no addresses provided', () => {
       try {
         ab.set(peerId)
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -65,7 +65,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
       try {
         ab.set(peerId, ['invalid multiaddr'])
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -159,7 +159,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         ab.add('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -169,7 +169,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if no addresses provided', () => {
       try {
         ab.add(peerId)
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -179,7 +179,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
       try {
         ab.add(peerId, ['invalid multiaddr'])
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -308,7 +308,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         ab.get('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -343,7 +343,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         ab.getMultiaddrsForPeer('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -391,7 +391,7 @@ describe('addressBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         ab.delete('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }

test/peer-store/key-book.spec.js

@@ -23,7 +23,7 @@ describe('keyBook', () => {
   it('throws invalid parameters error if invalid PeerId is provided in set', () => {
     try {
       kb.set('invalid peerId')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
       return
     }
@@ -33,7 +33,7 @@ describe('keyBook', () => {
   it('throws invalid parameters error if invalid PeerId is provided in get', () => {
     try {
       kb.get('invalid peerId')
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
       return
     }

test/peer-store/metadata-book.spec.js

@@ -34,7 +34,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if invalid PeerId is provided', () => {
       try {
         mb.set('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -44,7 +44,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if no key provided', () => {
       try {
         mb.set(peerId)
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -54,7 +54,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if no value provided', () => {
       try {
         mb.set(peerId, 'location')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -64,7 +64,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if value is not a buffer', () => {
       try {
         mb.set(peerId, 'location', 'mars')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -163,7 +163,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if invalid PeerId is provided', () => {
       try {
         mb.get('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -199,7 +199,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if invalid PeerId is provided', () => {
       try {
         mb.getValue('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -248,7 +248,7 @@ describe('metadataBook', () => {
     it('throwns invalid parameters error if invalid PeerId is provided', () => {
       try {
         mb.delete('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }
@@ -305,7 +305,7 @@ describe('metadataBook', () => {
     it('throws invalid parameters error if invalid PeerId is provided', () => {
       try {
         mb.deleteValue('invalid peerId')
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
         return
       }

test/transports/transport-manager.spec.js

@@ -201,7 +201,7 @@ describe('libp2p.transportManager (dial only)', () => {
 
     try {
       await libp2p.start()
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       expect(err).to.exist()
       expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES)
       return

test/ts-use/package.json

@@ -10,13 +10,13 @@
     "libp2p-delegated-peer-routing": "^0.10.0",
     "libp2p-gossipsub": "^0.9.0",
     "libp2p-interfaces": "^1.0.1",
-    "libp2p-kad-dht": "^0.26.5",
+    "libp2p-kad-dht": "^0.23.1",
     "libp2p-mplex": "^0.10.4",
     "@chainsafe/libp2p-noise": "^4.1.0",
     "libp2p-record": "^0.10.4",
     "libp2p-tcp": "^0.17.1",
     "libp2p-websockets": "^0.16.1",
-    "peer-id": "^0.16.0"
+    "peer-id": "^0.15.0"
   },
   "scripts": {
     "build": "npx tsc",

test/utils/mockConnection.js

@@ -108,7 +108,7 @@ function createConnection ({
         // Need to be able to notify a peer of this this._onStream({ connection, stream, protocol })
         const handler = protocols.get(protocol)
         handler({ connection, stream, protocol })
-      } catch (/** @type {any} */ err) {
+      } catch (err) {
         // Do nothing
       }
     },
@@ -124,7 +124,7 @@ function createConnection ({
     try {
       const { stream, protocol } = await mss.select(protocols)
       return { stream: { ...muxedStream, ...stream }, protocol }
-    } catch (/** @type {any} */ err) {
+    } catch (err) {
       throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
     }
   }

tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "aegir/src/config/tsconfig.aegir.json",
+  "extends": "./node_modules/aegir/src/config/tsconfig.aegir.json",
   "compilerOptions": {
     "outDir": "dist"
   },