feat!: update libp2p deps (#453)

BREAKING CHANGE: uses libp2p with protocol stream limiting

Author: achingbrain

README.md

@@ -1,22 +1,16 @@
 # ipfs-bitswap <!-- omit in toc -->
 
-[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
-[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
-[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
-[![Build Status](https://github.com/ipfs/js-ipfs-bitswap/actions/workflows/js-test-and-release.yml/badge.svg?branch=master)](https://github.com/ipfs/js-ipfs-bitswap/actions/workflows/js-test-and-release.yml)
-[![](https://coveralls.io/repos/github/ipfs/js-ipfs-bitswap/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-ipfs-bitswap?branch=master)
-[![](https://david-dm.org/ipfs/js-ipfs-bitswap.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-bitswap)
-[![](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
-[![](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
-![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
-![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
+[![ipfs.io](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io)
+[![IRC](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
+[![Discord](https://img.shields.io/discord/806902334369824788?style=flat-square)](https://discord.gg/ipfs)
+[![codecov](https://img.shields.io/codecov/c/github/ipfs/js-ipfs-bitswap.svg?style=flat-square)](https://codecov.io/gh/ipfs/js-ipfs-bitswap)
+[![CI](https://img.shields.io/github/workflow/status/libp2p/js-libp2p-interfaces/test%20&%20maybe%20release/master?style=flat-square)](https://github.com/ipfs/js-ipfs-bitswap/actions/workflows/js-test-and-release.yml)
 
-> JavaScript implementation of the Bitswap 'data exchange' protocol used by IPFS
+> JavaScript implementation of the Bitswap data exchange protocol used by IPFS
 
-## Table of Contents <!-- omit in toc -->
+## Table of contents <!-- omit in toc -->
 
 - [Install](#install)
-  - [npm](#npm)
   - [Use in Node.js or in the browser with browserify, webpack or any other bundler](#use-in-nodejs-or-in-the-browser-with-browserify-webpack-or-any-other-bundler)
   - [Use in a browser using a script tag](#use-in-a-browser-using-a-script-tag)
 - [API](#api)
@@ -28,12 +22,14 @@
   - [Structure](#structure)
 - [Performance tests](#performance-tests)
   - [Profiling](#profiling)
-- [Contribute](#contribute)
 - [License](#license)
+- [Contribute](#contribute)
 
 ## Install
 
-### npm
+```console
+$ npm i ipfs-bitswap
+```
 
 ```bash
 > npm install ipfs-bitswap
@@ -57,7 +53,7 @@ Loading this module through a script tag will make the `IpfsBitswap` object avai
 
 ## API
 
-See https://ipfs.github.io/js-ipfs-bitswap
+See <https://ipfs.github.io/js-ipfs-bitswap>
 
 ### Stats
 
@@ -119,25 +115,25 @@ const movingAverages = stats.movingAverages
 
 This object contains these properties:
 
-* 'blocksReceived',
-* 'dataReceived',
-* 'dupBlksReceived',
-* 'dupDataReceived',
-* 'blocksSent',
-* 'dataSent',
-* 'providesBufferLength',
-* 'wantListLength',
-* 'peerCount'
+- 'blocksReceived',
+- 'dataReceived',
+- 'dupBlksReceived',
+- 'dupDataReceived',
+- 'blocksSent',
+- 'dataSent',
+- 'providesBufferLength',
+- 'wantListLength',
+- 'peerCount'
 
 ```js
 const dataReceivedMovingAverages = movingAverages.dataReceived
 ```
 
 Each one of these will contain one key per interval (miliseconds), being the default intervals defined:
 
-* 60000 (1 minute)
-* 300000 (5 minutes)
-* 900000 (15 minutes)
+- 60000 (1 minute)
+- 300000 (5 minutes)
+- 900000 (15 minutes)
 
 You can then select one of them
 
@@ -158,19 +154,19 @@ This object will be a [movingAverage](https://github.com/pgte/moving-average#rea
 src
 ├── constants.js
 ├── decision-engine
-│   ├── index.js
-│   └── ledger.js
+│   ├── index.js
+│   └── ledger.js
 ├── index.js
 ├── network.js             # Handles peerSet and open new conns
 ├── notifications.js       # Handles tracking of incomning blocks and wants/unwants.
 ├─── want-manager          # Keeps track of all blocks the peer (self) wants
-│   ├── index.js
-│   └── msg-queue.js       # Messages to send queue, one per peer
+│   ├── index.js
+│   └── msg-queue.js       # Messages to send queue, one per peer
 └─── types
     ├── message            # (Type) message that is put in the wire
-    │   ├── entry.js
-    │   ├── index.js
-    │   └── message.proto.js
+    │   ├── entry.js
+    │   ├── index.js
+    │   └── message.proto.js
     └── wantlist           # (Type) track wanted blocks
         ├── entry.js
         └── index.js
@@ -180,9 +176,7 @@ src
 
 You can run performance tests like this:
 
-```
-$ npm run benchmarks
-```
+    $ npm run benchmarks
 
 ### Profiling
 
@@ -205,14 +199,17 @@ Use the browser Chrome to open and inspect the generated graph.
 
 ![Flame graph](https://ipfs.io/ipfs/QmVbyLgYfkLewNtzTAFwAEMmP2hTJgs8sSqsRTBNBjyQ1y)
 
+## License
+
+Licensed under either of
+
+- Apache 2.0, ([LICENSE-APACHE](LICENSE-APACHE) / <http://www.apache.org/licenses/LICENSE-2.0>)
+- MIT ([LICENSE-MIT](LICENSE-MIT) / <http://opensource.org/licenses/MIT>)
+
 ## Contribute
 
-Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/js-ipfs-bitswap/issues)!
+Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/js-ipfs-unixfs-importer/issues)!
 
 This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
 [![](https://cdn.rawgit.com/jbenet/contribute-ipfs-gif/master/img/contribute.gif)](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md)
-
-## License
-
-[MIT](LICENSE)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipfs-bitswap",
   "version": "11.0.4",
-  "description": "Node.js implementation of the Bitswap data exchange protocol used by IPFS",
+  "description": "JavaScript implementation of the Bitswap data exchange protocol used by IPFS",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "repository": {
@@ -21,7 +21,6 @@
     "node": ">=16.0.0",
     "npm": ">=7.0.0"
   },
-  "main": "src/index.js",
   "type": "module",
   "types": "./dist/src/index.d.ts",
   "typesVersions": {
@@ -41,13 +40,14 @@
     }
   },
   "files": [
-    "dist",
     "src",
-    "!**/*.tsbuildinfo",
-    "!dist/test"
+    "dist",
+    "!dist/test",
+    "!**/*.tsbuildinfo"
   ],
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "import": "./src/index.js"
     }
   },
@@ -161,8 +161,10 @@
     "generate:proto-types": "pbts -o src/message/message.d.ts src/message/message.js"
   },
   "dependencies": {
-    "@libp2p/interfaces": "^2.0.2",
-    "@libp2p/topology": "^1.1.6",
+    "@libp2p/interface-connection": "^2.1.1",
+    "@libp2p/interface-peer-id": "^1.0.4",
+    "@libp2p/interface-peer-store": "^1.2.0",
+    "@libp2p/topology": "^3.0.0",
     "@libp2p/tracked-map": "^1.0.4",
     "@multiformats/multiaddr": "^10.1.8",
     "@vascosantos/moving-average": "^1.1.0",
@@ -176,18 +178,18 @@
     "just-debounce-it": "^3.0.1",
     "multiformats": "^9.0.4",
     "protobufjs": "^6.10.2",
-    "readable-stream": "^3.6.0",
+    "readable-stream": "^4.0.0",
     "uint8arrays": "^3.0.0",
     "varint": "^6.0.0",
     "varint-decoder": "^1.0.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^6.2.0",
-    "@libp2p/kad-dht": "^1.0.3",
-    "@libp2p/mplex": "^1.0.2",
+    "@chainsafe/libp2p-noise": "^7.0.1",
+    "@libp2p/kad-dht": "^3.0.0",
+    "@libp2p/mplex": "^3.0.0",
     "@libp2p/peer-id": "^1.1.8",
     "@libp2p/peer-id-factory": "^1.0.8",
-    "@libp2p/tcp": "^1.0.6",
+    "@libp2p/tcp": "^3.0.1",
     "@nodeutils/defaults-deep": "^1.1.0",
     "@types/debug": "^4.1.5",
     "@types/stats-lite": "^2.2.0",
@@ -200,7 +202,7 @@
     "iso-random-stream": "^2.0.0",
     "it-all": "^1.0.5",
     "it-drain": "^1.0.4",
-    "libp2p": "^0.37.3",
+    "libp2p": "next",
     "lodash.difference": "^4.5.0",
     "lodash.flatten": "^4.4.0",
     "lodash.range": "^3.2.0",

src/bitswap.js

@@ -12,7 +12,7 @@ import { CID } from 'multiformats/cid'
  * @typedef {import('./types').IPFSBitswap} IPFSBitswap
  * @typedef {import('./types').MultihashHasherLoader} MultihashHasherLoader
  * @typedef {import('./message').BitswapMessage} BitswapMessage
- * @typedef {import('@libp2p/interfaces/peer-id').PeerId} PeerId
+ * @typedef {import('@libp2p/interface-peer-id').PeerId} PeerId
  * @typedef {import('interface-blockstore').Blockstore} Blockstore
  * @typedef {import('interface-blockstore').Pair} Pair
  * @typedef {import('interface-blockstore').Options} Options
@@ -49,6 +49,8 @@ export class Bitswap extends BaseBlockstore {
    * @param {boolean} [options.statsEnabled=false]
    * @param {number} [options.statsComputeThrottleTimeout=1000]
    * @param {number} [options.statsComputeThrottleMaxQueueSize=1000]
+   * @param {number} [options.maxInboundStreams=32]
+   * @param {number} [options.maxOutboundStreams=32]
    * @param {MultihashHasherLoader} [options.hashLoader]
    */
   constructor (libp2p, blockstore, options = {}) {
@@ -68,7 +70,9 @@ export class Bitswap extends BaseBlockstore {
 
     // the network delivers messages
     this.network = new Network(libp2p, this, this._stats, {
-      hashLoader: options.hashLoader
+      hashLoader: options.hashLoader,
+      maxInboundStreams: options.maxInboundStreams,
+      maxOutboundStreams: options.maxOutboundStreams
     })
 
     // local database

src/decision-engine/index.js

@@ -10,7 +10,7 @@ import { trackedMap } from '@libp2p/tracked-map'
 
 /**
  * @typedef {import('../message/entry').BitswapMessageEntry} BitswapMessageEntry
- * @typedef {import('@libp2p/interfaces/peer-id').PeerId} PeerId
+ * @typedef {import('@libp2p/interface-peer-id').PeerId} PeerId
  */
 
 const WantType = Message.WantType

src/decision-engine/ledger.js

@@ -6,7 +6,7 @@ import { Wantlist } from '../wantlist/index.js'
 
 export class Ledger {
   /**
-   * @param {import('@libp2p/interfaces/peer-id').PeerId} peerId
+   * @param {import('@libp2p/interface-peer-id').PeerId} peerId
    */
   constructor (peerId) {
     this.partner = peerId

src/decision-engine/req-queue.js

@@ -10,7 +10,7 @@ import { SortedMap } from '../utils/sorted-map.js'
  * @property {number} created
  * @property {Task} task
  *
- * @typedef {import('@libp2p/interfaces/peer-id').PeerId} PeerId
+ * @typedef {import('@libp2p/interface-peer-id').PeerId} PeerId
  * @typedef {import('./types').Task} Task
  * @typedef {import('./types').TaskMerger} TaskMerger
  */

src/index.js

@@ -3,7 +3,7 @@ import { Bitswap } from './bitswap.js'
 /**
  * @typedef {import('./types').IPFSBitswap} IPFSBitswap
  * @typedef {import('./types').MultihashHasherLoader} MultihashHasherLoader
- * @typedef {import('@libp2p/interfaces/peer-id').PeerId} PeerId
+ * @typedef {import('@libp2p/interface-peer-id').PeerId} PeerId
  * @typedef {import('./message')} BitswapMessage
  * @typedef {import('interface-blockstore').Blockstore} Blockstore
  * @typedef {import('interface-blockstore').Pair} Pair
@@ -17,6 +17,8 @@ import { Bitswap } from './bitswap.js'
  * @param {boolean} [options.statsEnabled=false]
  * @param {number} [options.statsComputeThrottleTimeout=1000]
  * @param {number} [options.statsComputeThrottleMaxQueueSize=1000]
+ * @param {number} [options.maxInboundStreams=32]
+ * @param {number} [options.maxOutboundStreams=128]
  * @param {MultihashHasherLoader} [options.hashLoader]
  * @returns {IPFSBitswap}
  */