Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit fc5bfac

Browse files
committed
feat: use pull-mplex instead of libp2p-mplex
test: shut off dht by default
1 parent 240c0b3 commit fc5bfac

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1036,13 +1036,13 @@ Listing of the main packages used in the IPFS ecosystem. There are also three sp
10361036
| [`libp2p-floodsub`](//github.com./libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-floodsub) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-floodsub.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:[email protected]) |
10371037
| [`libp2p-kad-dht`](//github.com./libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-kad-dht.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:[email protected]) |
10381038
| [`libp2p-mdns`](//github.com./libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mdns.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mdns) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mdns) | [Jacob Heun](mailto:[email protected]) |
1039-
| [`libp2p-mplex`](//github.com./libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-mplex) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mplex.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mplex) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mplex) | [Vasco Santos](mailto:[email protected]) |
10401039
| [`libp2p-bootstrap`](//github.com./libp2p/js-libp2p-bootstrap) | [![npm](https://img.shields.io/npm/v/libp2p-bootstrap.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-bootstrap/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-bootstrap.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-bootstrap) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-bootstrap.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-bootstrap) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-bootstrap) | [Vasco Santos](mailto:[email protected]) |
10411040
| [`libp2p-secio`](//github.com./libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-secio) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-secio.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-secio) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-secio) | [Friedel Ziegelmayer](mailto:[email protected]) |
10421041
| [`libp2p-tcp`](//github.com./libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/libp2p-tcp.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-tcp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-tcp) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-tcp.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-tcp) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-tcp) | [Jacob Heun](mailto:[email protected]) |
10431042
| [`libp2p-webrtc-star`](//github.com./libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-webrtc-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:[email protected]) |
10441043
| [`libp2p-websocket-star`](//github.com./libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websocket-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websocket-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:[email protected]) |
10451044
| [`libp2p-websockets`](//github.com./libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat)](//github.com./libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websockets.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websockets) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websockets) | [Jacob Heun](mailto:[email protected]) |
1045+
| [`pull-mplex`](//github.com./libp2p/pull-mplex) | [![npm](https://img.shields.io/npm/v/pull-mplex.svg?maxAge=86400&style=flat)](//github.com./libp2p/pull-mplex/releases) | [![Deps](https://david-dm.org/libp2p/pull-mplex.svg?style=flat)](https://david-dm.org/libp2p/pull-mplex) | [![Travis CI](https://travis-ci.com/libp2p/pull-mplex.svg?branch=master)](https://travis-ci.com/libp2p/pull-mplex) | [![codecov](https://codecov.io/gh/libp2p/pull-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/pull-mplex) | [Jacob Heun](mailto:[email protected]) |
10461046
| **Data Types** |
10471047
| [`ipfs-block`](//github.com./ipfs/js-ipfs-block) | [![npm](https://img.shields.io/npm/v/ipfs-block.svg?maxAge=86400&style=flat)](//github.com./ipfs/js-ipfs-block/releases) | [![Deps](https://david-dm.org/ipfs/js-ipfs-block.svg?style=flat)](https://david-dm.org/ipfs/js-ipfs-block) | [![Travis CI](https://travis-ci.com/ipfs/js-ipfs-block.svg?branch=master)](https://travis-ci.com/ipfs/js-ipfs-block) | [![codecov](https://codecov.io/gh/ipfs/js-ipfs-block/branch/master/graph/badge.svg)](https://codecov.io/gh/ipfs/js-ipfs-block) | [Volker Mische](mailto:[email protected]) |
10481048
| [`ipfs-unixfs`](//github.com./ipfs/js-ipfs-unixfs) | [![npm](https://img.shields.io/npm/v/ipfs-unixfs.svg?maxAge=86400&style=flat)](//github.com./ipfs/js-ipfs-unixfs/releases) | [![Deps](https://david-dm.org/ipfs/js-ipfs-unixfs.svg?style=flat)](https://david-dm.org/ipfs/js-ipfs-unixfs) | [![Travis CI](https://travis-ci.com/ipfs/js-ipfs-unixfs.svg?branch=master)](https://travis-ci.com/ipfs/js-ipfs-unixfs) | [![codecov](https://codecov.io/gh/ipfs/js-ipfs-unixfs/branch/master/graph/badge.svg)](https://codecov.io/gh/ipfs/js-ipfs-unixfs) | [Alex Potsides](mailto:[email protected]) |

examples/custom-libp2p/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const WebSocketStar = require('libp2p-websocket-star')
88
const Bootstrap = require('libp2p-bootstrap')
99
const SPDY = require('libp2p-spdy')
1010
const KadDHT = require('libp2p-kad-dht')
11-
const MPLEX = require('libp2p-mplex')
11+
const MPLEX = require('pull-mplex')
1212
const SECIO = require('libp2p-secio')
1313
const assert = require('assert')
1414

examples/custom-libp2p/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"libp2p-bootstrap": "~0.9.7",
1515
"libp2p-kad-dht": "~0.14.12",
1616
"libp2p-mdns": "~0.12.2",
17-
"libp2p-mplex": "~0.8.5",
1817
"libp2p-secio": "~0.11.1",
1918
"libp2p-spdy": "~0.13.3",
2019
"libp2p-tcp": "~0.13.0",
21-
"libp2p-websocket-star": "~0.10.2"
20+
"libp2p-websocket-star": "~0.10.2",
21+
"pull-mplex": "~0.1.0"
2222
}
2323
}

package-list.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
["libp2p/js-libp2p-floodsub", "libp2p-floodsub"],
3030
["libp2p/js-libp2p-kad-dht", "libp2p-kad-dht"],
3131
["libp2p/js-libp2p-mdns", "libp2p-mdns"],
32-
["libp2p/js-libp2p-mplex", "libp2p-mplex"],
3332
["libp2p/js-libp2p-bootstrap", "libp2p-bootstrap"],
3433
["libp2p/js-libp2p-secio", "libp2p-secio"],
3534
["libp2p/js-libp2p-tcp", "libp2p-tcp"],
3635
["libp2p/js-libp2p-webrtc-star", "libp2p-webrtc-star"],
3736
["libp2p/js-libp2p-websocket-star", "libp2p-websocket-star"],
3837
["libp2p/js-libp2p-websockets", "libp2p-websockets"],
38+
["libp2p/pull-mplex", "pull-mplex"],
3939

4040
"Data Types",
4141
["ipfs/js-ipfs-block", "ipfs-block"],

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,18 @@
140140
"libp2p-kad-dht": "~0.14.12",
141141
"libp2p-keychain": "~0.4.1",
142142
"libp2p-mdns": "~0.12.0",
143-
"libp2p-mplex": "~0.8.4",
144143
"libp2p-record": "~0.6.1",
145144
"libp2p-secio": "~0.11.0",
146145
"libp2p-tcp": "~0.13.0",
147-
"libp2p-webrtc-star": "~0.15.5",
148-
"libp2p-websocket-star-multi": "~0.4.0",
146+
"libp2p-webrtc-star": "~0.15.8",
147+
"libp2p-websocket-star-multi": "~0.4.3",
149148
"libp2p-websockets": "~0.12.2",
150149
"lodash": "^4.17.11",
151150
"mafmt": "^6.0.2",
152151
"merge-options": "^1.0.1",
153152
"mime-types": "^2.1.21",
154153
"mkdirp": "~0.5.1",
155-
"multiaddr": "^6.0.0",
154+
"multiaddr": "^6.0.5",
156155
"multiaddr-to-uri": "^4.0.1",
157156
"multibase": "~0.6.0",
158157
"multicodec": "~0.5.0",
@@ -169,6 +168,7 @@
169168
"pull-cat": "^1.1.11",
170169
"pull-defer": "~0.2.3",
171170
"pull-file": "^1.1.0",
171+
"pull-mplex": "~0.1.1",
172172
"pull-ndjson": "~0.1.1",
173173
"pull-pushable": "^2.2.0",
174174
"pull-sort": "^1.0.1",

src/core/runtime/libp2p-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const WS = require('libp2p-websockets')
44
const WebRTCStar = require('libp2p-webrtc-star')
55
const WebSocketStarMulti = require('libp2p-websocket-star-multi')
6-
const Multiplex = require('libp2p-mplex')
6+
const Multiplex = require('pull-mplex')
77
const SECIO = require('libp2p-secio')
88
const Bootstrap = require('libp2p-bootstrap')
99
const KadDHT = require('libp2p-kad-dht')

src/core/runtime/libp2p-nodejs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const WS = require('libp2p-websockets')
66
const WebSocketStarMulti = require('libp2p-websocket-star-multi')
77
const Bootstrap = require('libp2p-bootstrap')
88
const KadDHT = require('libp2p-kad-dht')
9-
const Multiplex = require('libp2p-mplex')
9+
const Multiplex = require('pull-mplex')
1010
const SECIO = require('libp2p-secio')
1111
const libp2p = require('libp2p')
1212
const mergeOptions = require('merge-options')

test/core/libp2p.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const MemoryStore = require('interface-datastore').MemoryDatastore
1111
const PeerInfo = require('peer-info')
1212
const PeerBook = require('peer-book')
1313
const WebSocketStar = require('libp2p-websocket-star')
14-
const Multiplex = require('libp2p-mplex')
14+
const Multiplex = require('pull-mplex')
1515
const SECIO = require('libp2p-secio')
1616
const KadDHT = require('libp2p-kad-dht')
1717
const Libp2p = require('libp2p')

0 commit comments

Comments
 (0)