mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-07-08 05:11:33 +00:00
Compare commits
1 Commits
v0.35.0
...
chore/use-
| Author | SHA1 | Date | |
|---|---|---|---|
| 7781075a7a |
65
.github/workflows/examples.yml
vendored
65
.github/workflows/examples.yml
vendored
@ -12,9 +12,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir lint
|
- run: npx aegir lint
|
||||||
- run: npx aegir ts -p check
|
- run: npx aegir ts -p check
|
||||||
@ -24,118 +21,82 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-chat-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-connection-encryption-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-discovery-mechanisms-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-echo-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-libp2p-in-the-browser-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-peer-and-content-routing-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-pnet-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-protocol-and-stream-muxing-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-pubsub-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && npm i && npm run test -- pubsub
|
- run: cd examples && npm install && npm run test -- pubsub
|
||||||
test-transports-example:
|
test-transports-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- run: npm install
|
- 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:
|
test-webrtc-direct-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- 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
|
|
||||||
19
.github/workflows/main.yml
vendored
19
.github/workflows/main.yml
vendored
@ -14,9 +14,10 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
- uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: 14
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir lint
|
- run: npx aegir lint
|
||||||
|
- uses: gozala/typescript-error-reporter-action@v1.0.8
|
||||||
- run: npx aegir build
|
- run: npx aegir build
|
||||||
- run: npx aegir dep-check
|
- run: npx aegir dep-check
|
||||||
- uses: ipfs/aegir/actions/bundle-size@v32.1.0
|
- uses: ipfs/aegir/actions/bundle-size@v32.1.0
|
||||||
@ -29,7 +30,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, ubuntu-latest, macos-latest]
|
os: [windows-latest, ubuntu-latest, macos-latest]
|
||||||
node: [16]
|
node: [14, 16]
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
@ -44,9 +45,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir test -t browser -t webworker --bail
|
- run: npx aegir test -t browser -t webworker --bail
|
||||||
test-firefox:
|
test-firefox:
|
||||||
@ -54,9 +52,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir test -t browser -t webworker --bail -- --browser firefox
|
- run: npx aegir test -t browser -t webworker --bail -- --browser firefox
|
||||||
test-ts:
|
test-ts:
|
||||||
@ -64,9 +59,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npm run test:ts
|
- run: npm run test:ts
|
||||||
test-interop:
|
test-interop:
|
||||||
@ -74,8 +66,5 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
- run: npm install
|
- 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
|
||||||
|
|||||||
38
CHANGELOG.md
38
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)
|
# [0.33.0](https://github.com/libp2p/js-libp2p/compare/v0.32.5...v0.33.0) (2021-09-24)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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
|
[address]: https://github.com/libp2p/js-libp2p/tree/master/src/peer-store/address-book.js
|
||||||
[cid]: https://github.com/multiformats/js-cid
|
[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
|
[multiaddr]: https://github.com/multiformats/js-multiaddr
|
||||||
[peer-id]: https://github.com/libp2p/js-peer-id
|
[peer-id]: https://github.com/libp2p/js-peer-id
|
||||||
[keys]: https://github.com/libp2p/js-libp2p-crypto/tree/master/src/keys
|
[keys]: https://github.com/libp2p/js-libp2p-crypto/tree/master/src/keys
|
||||||
|
|||||||
@ -1,37 +1,37 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
- [Overview](#overview)
|
- [Configuration](#configuration)
|
||||||
- [Modules](#modules)
|
- [Overview](#overview)
|
||||||
- [Transport](#transport)
|
- [Modules](#modules)
|
||||||
- [Stream Multiplexing](#stream-multiplexing)
|
- [Transport](#transport)
|
||||||
- [Connection Encryption](#connection-encryption)
|
- [Stream Multiplexing](#stream-multiplexing)
|
||||||
- [Peer Discovery](#peer-discovery)
|
- [Connection Encryption](#connection-encryption)
|
||||||
- [Content Routing](#content-routing)
|
- [Peer Discovery](#peer-discovery)
|
||||||
- [Peer Routing](#peer-routing)
|
- [Content Routing](#content-routing)
|
||||||
- [DHT](#dht)
|
- [Peer Routing](#peer-routing)
|
||||||
- [Pubsub](#pubsub)
|
- [DHT](#dht)
|
||||||
- [Customizing libp2p](#customizing-libp2p)
|
- [Pubsub](#pubsub)
|
||||||
- [Examples](#examples)
|
- [Customizing libp2p](#customizing-libp2p)
|
||||||
- [Basic setup](#basic-setup)
|
- [Examples](#examples)
|
||||||
- [Customizing Peer Discovery](#customizing-peer-discovery)
|
- [Basic setup](#basic-setup)
|
||||||
- [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
|
- [Customizing Peer Discovery](#customizing-peer-discovery)
|
||||||
- [Customizing Pubsub](#customizing-pubsub)
|
- [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
|
||||||
- [Customizing DHT](#customizing-dht)
|
- [Customizing Pubsub](#customizing-pubsub)
|
||||||
- [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
|
- [Customizing DHT](#customizing-dht)
|
||||||
- [Setup with Relay](#setup-with-relay)
|
- [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
|
||||||
- [Setup with Auto Relay](#setup-with-auto-relay)
|
- [Setup with Relay](#setup-with-relay)
|
||||||
- [Setup with Keychain](#setup-with-keychain)
|
- [Setup with Auto Relay](#setup-with-auto-relay)
|
||||||
- [Configuring Dialing](#configuring-dialing)
|
- [Setup with Keychain](#setup-with-keychain)
|
||||||
- [Configuring Connection Manager](#configuring-connection-manager)
|
- [Configuring Dialing](#configuring-dialing)
|
||||||
- [Configuring Transport Manager](#configuring-transport-manager)
|
- [Configuring Connection Manager](#configuring-connection-manager)
|
||||||
- [Configuring Metrics](#configuring-metrics)
|
- [Configuring Transport Manager](#configuring-transport-manager)
|
||||||
- [Configuring PeerStore](#configuring-peerstore)
|
- [Configuring Metrics](#configuring-metrics)
|
||||||
- [Customizing Transports](#customizing-transports)
|
- [Configuring PeerStore](#configuring-peerstore)
|
||||||
- [Configuring the NAT Manager](#configuring-the-nat-manager)
|
- [Customizing Transports](#customizing-transports)
|
||||||
- [Browser support](#browser-support)
|
- [Configuring the NAT Manager](#configuring-the-nat-manager)
|
||||||
- [UPnP and NAT-PMP](#upnp-and-nat-pmp)
|
- [Browser support](#browser-support)
|
||||||
- [Configuring protocol name](#configuring-protocol-name)
|
- [UPnP and NAT-PMP](#upnp-and-nat-pmp)
|
||||||
- [Configuration examples](#configuration-examples)
|
- [Configuration examples](#configuration-examples)
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
@ -374,7 +374,11 @@ const node = await Libp2p.create({
|
|||||||
dht: { // The DHT options (and defaults) can be found in its documentation
|
dht: { // The DHT options (and defaults) can be found in its documentation
|
||||||
kBucketSize: 20,
|
kBucketSize: 20,
|
||||||
enabled: true, // This flag is required for DHT to run (disabled by default)
|
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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -784,7 +788,7 @@ By default under nodejs libp2p will attempt to use [UPnP](https://en.wikipedia.o
|
|||||||
|
|
||||||
#### Configuring protocol name
|
#### Configuring protocol name
|
||||||
|
|
||||||
Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes.
|
Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
"libp2p": "github:libp2p/js-libp2p#master",
|
"libp2p": "github:libp2p/js-libp2p#master",
|
||||||
"libp2p-delegated-content-routing": "~0.2.2",
|
"libp2p-delegated-content-routing": "~0.2.2",
|
||||||
"libp2p-delegated-peer-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-mplex": "~0.8.5",
|
||||||
"libp2p-secio": "~0.11.1",
|
"libp2p-secio": "~0.11.1",
|
||||||
"libp2p-webrtc-star": "~0.15.8",
|
"libp2p-webrtc-star": "~0.15.8",
|
||||||
|
|||||||
@ -55,7 +55,7 @@ const node = await Libp2p.create({
|
|||||||
peerId,
|
peerId,
|
||||||
addresses: {
|
addresses: {
|
||||||
listen: ['/ip4/0.0.0.0/tcp/0']
|
listen: ['/ip4/0.0.0.0/tcp/0']
|
||||||
},
|
}
|
||||||
modules: {
|
modules: {
|
||||||
transport: [ TCP ],
|
transport: [ TCP ],
|
||||||
streamMuxer: [ Mplex ],
|
streamMuxer: [ Mplex ],
|
||||||
@ -117,7 +117,7 @@ const createNode = () => {
|
|||||||
return Libp2p.create({
|
return Libp2p.create({
|
||||||
addresses: {
|
addresses: {
|
||||||
listen: ['/ip4/0.0.0.0/tcp/0']
|
listen: ['/ip4/0.0.0.0/tcp/0']
|
||||||
},
|
}
|
||||||
modules: {
|
modules: {
|
||||||
transport: [ TCP ],
|
transport: [ TCP ],
|
||||||
streamMuxer: [ Mplex ],
|
streamMuxer: [ Mplex ],
|
||||||
@ -144,13 +144,8 @@ const [node1, node2] = await Promise.all([
|
|||||||
createNode()
|
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.
|
If you run this example, you will see the other peers being discovered.
|
||||||
|
|||||||
@ -28,6 +28,6 @@
|
|||||||
"babel-plugin-syntax-async-functions": "^6.13.0",
|
"babel-plugin-syntax-async-functions": "^6.13.0",
|
||||||
"babel-plugin-transform-regenerator": "^6.26.0",
|
"babel-plugin-transform-regenerator": "^6.26.0",
|
||||||
"babel-polyfill": "^6.26.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"parcel": "^2.0.1"
|
"parcel": "next"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,7 +38,7 @@ async function run() {
|
|||||||
)
|
)
|
||||||
await browser.close();
|
await browser.close();
|
||||||
|
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@ -81,7 +81,7 @@ function print ({ stream }) {
|
|||||||
// node 3 (listening WebSockets) can dial node 1 (TCP)
|
// node 3 (listening WebSockets) can dial node 1 (TCP)
|
||||||
try {
|
try {
|
||||||
await node3.dialProtocol(node1.peerId, '/print')
|
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)
|
console.log('node 3 failed to dial to node 1 with:', err.message)
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|||||||
@ -91,7 +91,7 @@ const concat = require('it-concat')
|
|||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
```
|
```
|
||||||
|
|
||||||
We are going to reuse the `createNode` function from step 1, but this time add a stream multiplexer from `libp2p-mplex`.
|
We are going to reuse the `createNode` function from step 1, but this time add a stream multiplexer from `libp2p-mplex`.
|
||||||
```js
|
```js
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
|
|||||||
@ -9,7 +9,7 @@ async function isExecutable (command) {
|
|||||||
await fs.access(command, fs.constants.X_OK)
|
await fs.access(command, fs.constants.X_OK)
|
||||||
|
|
||||||
return true
|
return true
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
if (err.code === 'ENOENT') {
|
if (err.code === 'ENOENT') {
|
||||||
return isExecutable(await which(command))
|
return isExecutable(await which(command))
|
||||||
}
|
}
|
||||||
@ -49,7 +49,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await proc
|
await proc
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
if (!err.killed) {
|
if (!err.killed) {
|
||||||
throw err
|
throw err
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,6 +12,6 @@
|
|||||||
<main>
|
<main>
|
||||||
<pre id="output"></pre>
|
<pre id="output"></pre>
|
||||||
</main>
|
</main>
|
||||||
<script src="./dialer.js" type="module"></script>
|
<script src="./dialer.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "",
|
"description": "",
|
||||||
|
"main": "dist/index.html",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
"test": "echo \"Error: no test specified\" && exit 1",
|
||||||
"build": "parcel build index.html",
|
"build": "parcel build index.html",
|
||||||
@ -15,7 +16,7 @@
|
|||||||
"babel-plugin-syntax-async-functions": "^6.13.0",
|
"babel-plugin-syntax-async-functions": "^6.13.0",
|
||||||
"babel-plugin-transform-regenerator": "^6.26.0",
|
"babel-plugin-transform-regenerator": "^6.26.0",
|
||||||
"babel-polyfill": "^6.26.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"parcel": "^2.0.1",
|
"parcel-bundler": "1.12.3",
|
||||||
"util": "^0.12.3"
|
"util": "^0.12.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@ -24,7 +25,7 @@
|
|||||||
"libp2p-mplex": "^0.10.4",
|
"libp2p-mplex": "^0.10.4",
|
||||||
"@chainsafe/libp2p-noise": "^4.1.0",
|
"@chainsafe/libp2p-noise": "^4.1.0",
|
||||||
"libp2p-webrtc-direct": "^0.7.0",
|
"libp2p-webrtc-direct": "^0.7.0",
|
||||||
"peer-id": "^0.16.0"
|
"peer-id": "^0.15.0"
|
||||||
},
|
},
|
||||||
"browser": {
|
"browser": {
|
||||||
"ipfs": "ipfs/dist/index.min.js"
|
"ipfs": "ipfs/dist/index.min.js"
|
||||||
|
|||||||
@ -72,7 +72,7 @@ async function test () {
|
|||||||
{ timeout: 10000 }
|
{ timeout: 10000 }
|
||||||
)
|
)
|
||||||
await browser.close();
|
await browser.close();
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
55
package.json
55
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p",
|
"name": "libp2p",
|
||||||
"version": "0.35.0",
|
"version": "0.33.0",
|
||||||
"description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
|
"description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
|
||||||
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@ -41,7 +41,6 @@
|
|||||||
"test:node": "aegir test -t node -f \"./test/**/*.{node,spec}.js\"",
|
"test:node": "aegir test -t node -f \"./test/**/*.{node,spec}.js\"",
|
||||||
"test:browser": "aegir test -t browser",
|
"test:browser": "aegir test -t browser",
|
||||||
"test:examples": "cd examples && npm run test:all",
|
"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",
|
"prepare": "aegir build --no-bundle",
|
||||||
"release": "aegir release -t node -t browser",
|
"release": "aegir release -t node -t browser",
|
||||||
"release-minor": "aegir release --type minor -t node -t browser",
|
"release-minor": "aegir release --type minor -t node -t browser",
|
||||||
@ -66,7 +65,7 @@
|
|||||||
"homepage": "https://libp2p.io",
|
"homepage": "https://libp2p.io",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=15.0.0"
|
"node": ">=14.0.0"
|
||||||
},
|
},
|
||||||
"browser": {
|
"browser": {
|
||||||
"@motrix/nat-api": false
|
"@motrix/nat-api": false
|
||||||
@ -75,15 +74,14 @@
|
|||||||
"extends": "ipfs",
|
"extends": "ipfs",
|
||||||
"ignorePatterns": [
|
"ignorePatterns": [
|
||||||
"!.aegir.js",
|
"!.aegir.js",
|
||||||
"test/ts-use",
|
"test/ts-use"
|
||||||
"*.d.ts"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"abortable-iterator": "^3.0.0",
|
||||||
"@motrix/nat-api": "^0.3.1",
|
"@motrix/nat-api": "^0.3.1",
|
||||||
"@vascosantos/moving-average": "^1.1.0",
|
"@vascosantos/moving-average": "^1.1.0",
|
||||||
"abort-controller": "^3.0.0",
|
"abort-controller": "^3.0.0",
|
||||||
"abortable-iterator": "^3.0.0",
|
|
||||||
"aggregate-error": "^3.1.0",
|
"aggregate-error": "^3.1.0",
|
||||||
"any-signal": "^2.1.1",
|
"any-signal": "^2.1.1",
|
||||||
"bignumber.js": "^9.0.1",
|
"bignumber.js": "^9.0.1",
|
||||||
@ -105,8 +103,8 @@
|
|||||||
"it-merge": "^1.0.0",
|
"it-merge": "^1.0.0",
|
||||||
"it-pipe": "^1.1.0",
|
"it-pipe": "^1.1.0",
|
||||||
"it-take": "^1.0.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",
|
"libp2p-utils": "^0.4.0",
|
||||||
"mafmt": "^10.0.0",
|
"mafmt": "^10.0.0",
|
||||||
"merge-options": "^3.0.4",
|
"merge-options": "^3.0.4",
|
||||||
@ -119,14 +117,14 @@
|
|||||||
"p-fifo": "^1.0.0",
|
"p-fifo": "^1.0.0",
|
||||||
"p-retry": "^4.4.0",
|
"p-retry": "^4.4.0",
|
||||||
"p-settle": "^4.1.1",
|
"p-settle": "^4.1.1",
|
||||||
"peer-id": "^0.16.0",
|
"peer-id": "^0.15.0",
|
||||||
"private-ip": "^2.1.0",
|
"private-ip": "^2.1.0",
|
||||||
"protobufjs": "^6.10.2",
|
"protobufjs": "^6.10.2",
|
||||||
"retimer": "^3.0.0",
|
"retimer": "^3.0.0",
|
||||||
"sanitize-filename": "^1.6.3",
|
"sanitize-filename": "^1.6.3",
|
||||||
"set-delayed-interval": "^1.0.0",
|
"set-delayed-interval": "^1.0.0",
|
||||||
"streaming-iterables": "^6.0.0",
|
"streaming-iterables": "^6.0.0",
|
||||||
"timeout-abort-controller": "^2.0.0",
|
"timeout-abort-controller": "^1.1.1",
|
||||||
"uint8arrays": "^3.0.0",
|
"uint8arrays": "^3.0.0",
|
||||||
"varint": "^6.0.0",
|
"varint": "^6.0.0",
|
||||||
"wherearewe": "^1.0.0",
|
"wherearewe": "^1.0.0",
|
||||||
@ -139,35 +137,35 @@
|
|||||||
"@types/node": "^16.0.1",
|
"@types/node": "^16.0.1",
|
||||||
"@types/node-forge": "^0.10.1",
|
"@types/node-forge": "^0.10.1",
|
||||||
"@types/varint": "^6.0.0",
|
"@types/varint": "^6.0.0",
|
||||||
"aegir": "^36.0.0",
|
"aegir": "^33.1.1",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"datastore-core": "^6.0.7",
|
"datastore-core": "^6.0.7",
|
||||||
"delay": "^5.0.0",
|
"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-concat": "^2.0.0",
|
||||||
"it-pair": "^1.0.0",
|
"it-pair": "^1.0.0",
|
||||||
"it-pushable": "^1.4.0",
|
"it-pushable": "^1.4.0",
|
||||||
"libp2p": ".",
|
"libp2p": ".",
|
||||||
"libp2p-bootstrap": "^0.14.0",
|
"libp2p-bootstrap": "^0.13.0",
|
||||||
"libp2p-delegated-content-routing": "^0.11.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-floodsub": "^0.27.0",
|
||||||
"libp2p-gossipsub": "^0.11.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-mplex": "^0.10.1",
|
||||||
"libp2p-tcp": "^0.17.0",
|
"libp2p-tcp": "^0.17.0",
|
||||||
"libp2p-webrtc-star": "^0.25.0",
|
"libp2p-webrtc-star": "^0.23.0",
|
||||||
"libp2p-websockets": "^0.16.0",
|
"libp2p-websockets": "^0.16.0",
|
||||||
"nock": "^13.0.3",
|
"nock": "^13.0.3",
|
||||||
"p-defer": "^3.0.0",
|
"p-defer": "^3.0.0",
|
||||||
"p-times": "^3.0.0",
|
"p-times": "^3.0.0",
|
||||||
"p-wait-for": "^3.2.0",
|
"p-wait-for": "^3.2.0",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"sinon": "^12.0.1",
|
"sinon": "^11.1.1",
|
||||||
"util": "^0.12.3"
|
"util": "^0.12.3"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
@ -181,28 +179,28 @@
|
|||||||
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
||||||
"Maciej Krüger <mkg20001@gmail.com>",
|
"Maciej Krüger <mkg20001@gmail.com>",
|
||||||
"Hugo Dias <mail@hugodias.me>",
|
"Hugo Dias <mail@hugodias.me>",
|
||||||
"dirkmc <dirkmdev@gmail.com>",
|
|
||||||
"Chris Dostert <chrisdostert@users.noreply.github.com>",
|
"Chris Dostert <chrisdostert@users.noreply.github.com>",
|
||||||
|
"dirkmc <dirkmdev@gmail.com>",
|
||||||
"Volker Mische <volker.mische@gmail.com>",
|
"Volker Mische <volker.mische@gmail.com>",
|
||||||
"zeim839 <50573884+zeim839@users.noreply.github.com>",
|
"zeim839 <50573884+zeim839@users.noreply.github.com>",
|
||||||
"Richard Littauer <richard.littauer@gmail.com>",
|
"Richard Littauer <richard.littauer@gmail.com>",
|
||||||
"a1300 <matthias-knopp@gmx.net>",
|
"a1300 <matthias-knopp@gmx.net>",
|
||||||
"Ryan Bell <ryan@piing.net>",
|
"Ryan Bell <ryan@piing.net>",
|
||||||
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
||||||
|
"Franck Royer <franck@royer.one>",
|
||||||
|
"Thomas Eizinger <thomas@eizinger.io>",
|
||||||
"Giovanni T. Parra <fiatjaf@gmail.com>",
|
"Giovanni T. Parra <fiatjaf@gmail.com>",
|
||||||
"acolytec3 <17355484+acolytec3@users.noreply.github.com>",
|
"acolytec3 <17355484+acolytec3@users.noreply.github.com>",
|
||||||
"Franck Royer <franck@royer.one>",
|
|
||||||
"Elven <mon.samuel@qq.com>",
|
"Elven <mon.samuel@qq.com>",
|
||||||
"Robert Kiel <robert.kiel@hoprnet.org>",
|
|
||||||
"Andrew Nesbitt <andrewnez@gmail.com>",
|
"Andrew Nesbitt <andrewnez@gmail.com>",
|
||||||
"Samlior <samlior@foxmail.com>",
|
"Samlior <samlior@foxmail.com>",
|
||||||
"Thomas Eizinger <thomas@eizinger.io>",
|
|
||||||
"Didrik Nordström <didrik.nordstrom@gmail.com>",
|
"Didrik Nordström <didrik.nordstrom@gmail.com>",
|
||||||
|
"RasmusErik Voel Jensen <github@solsort.com>",
|
||||||
|
"Robert Kiel <robert.kiel@hoprnet.org>",
|
||||||
"Smite Chow <xiaopengyou@live.com>",
|
"Smite Chow <xiaopengyou@live.com>",
|
||||||
"Soeren <nikorpoulsen@gmail.com>",
|
"Soeren <nikorpoulsen@gmail.com>",
|
||||||
"Sönke Hahn <soenkehahn@gmail.com>",
|
"Sönke Hahn <soenkehahn@gmail.com>",
|
||||||
"TJKoury <TJKoury@gmail.com>",
|
"TJKoury <TJKoury@gmail.com>",
|
||||||
"TheStarBoys <41286328+TheStarBoys@users.noreply.github.com>",
|
|
||||||
"Tiago Alves <alvesjtiago@gmail.com>",
|
"Tiago Alves <alvesjtiago@gmail.com>",
|
||||||
"XiaoZhang <zxinmyth@gmail.com>",
|
"XiaoZhang <zxinmyth@gmail.com>",
|
||||||
"Yusef Napora <yusef@napora.org>",
|
"Yusef Napora <yusef@napora.org>",
|
||||||
@ -212,13 +210,11 @@
|
|||||||
"isan_rivkin <isanrivkin@gmail.com>",
|
"isan_rivkin <isanrivkin@gmail.com>",
|
||||||
"mayerwin <mayerwin@users.noreply.github.com>",
|
"mayerwin <mayerwin@users.noreply.github.com>",
|
||||||
"mcclure <andi.m.mcclure@gmail.com>",
|
"mcclure <andi.m.mcclure@gmail.com>",
|
||||||
"patrickwoodhead <91056047+patrickwoodhead@users.noreply.github.com>",
|
|
||||||
"phillmac <phillmac@users.noreply.github.com>",
|
"phillmac <phillmac@users.noreply.github.com>",
|
||||||
"robertkiel <robert.kiel@validitylabs.org>",
|
"robertkiel <robert.kiel@validitylabs.org>",
|
||||||
"shresthagrawal <34920931+shresthagrawal@users.noreply.github.com>",
|
"shresthagrawal <34920931+shresthagrawal@users.noreply.github.com>",
|
||||||
"swedneck <40505480+swedneck@users.noreply.github.com>",
|
"swedneck <40505480+swedneck@users.noreply.github.com>",
|
||||||
"greenSnot <greenSnot@users.noreply.github.com>",
|
"greenSnot <greenSnot@users.noreply.github.com>",
|
||||||
"Alan Smithee <ggnore.alan.smithee@gmail.com>",
|
|
||||||
"Aleksei <vozhdb@gmail.com>",
|
"Aleksei <vozhdb@gmail.com>",
|
||||||
"Bernd Strehl <bernd.strehl@gmail.com>",
|
"Bernd Strehl <bernd.strehl@gmail.com>",
|
||||||
"Chris Bratlien <chrisbratlien@gmail.com>",
|
"Chris Bratlien <chrisbratlien@gmail.com>",
|
||||||
@ -246,7 +242,6 @@
|
|||||||
"Michael Burns <5170+mburns@users.noreply.github.com>",
|
"Michael Burns <5170+mburns@users.noreply.github.com>",
|
||||||
"Miguel Mota <miguelmota2@gmail.com>",
|
"Miguel Mota <miguelmota2@gmail.com>",
|
||||||
"Nuno Nogueira <nunofmn@gmail.com>",
|
"Nuno Nogueira <nunofmn@gmail.com>",
|
||||||
"Philipp Muens <raute1337@gmx.de>",
|
"Philipp Muens <raute1337@gmx.de>"
|
||||||
"RasmusErik Voel Jensen <github@solsort.com>"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -116,7 +116,7 @@ class AutoRelay {
|
|||||||
this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE))
|
this._peerStore.metadataBook.set(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE))
|
||||||
await this._addListenRelay(connection, id)
|
await this._addListenRelay(connection, id)
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
this._onError(err)
|
this._onError(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -169,7 +169,7 @@ class AutoRelay {
|
|||||||
try {
|
try {
|
||||||
await this._transportManager.listen([new Multiaddr(listenAddr)])
|
await this._transportManager.listen([new Multiaddr(listenAddr)])
|
||||||
// Announce multiaddrs will update on listen success by TransportManager event being triggered
|
// Announce multiaddrs will update on listen success by TransportManager event being triggered
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
this._onError(err)
|
this._onError(err)
|
||||||
this._listenRelays.delete(id)
|
this._listenRelays.delete(id)
|
||||||
}
|
}
|
||||||
@ -267,7 +267,7 @@ class AutoRelay {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
this._onError(err)
|
this._onError(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -279,7 +279,7 @@ class AutoRelay {
|
|||||||
try {
|
try {
|
||||||
const connection = await this._libp2p.dial(peerId)
|
const connection = await this._libp2p.dial(peerId)
|
||||||
await this._addListenRelay(connection, peerId.toB58String())
|
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()}`)
|
this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,7 +54,7 @@ async function handleHop ({
|
|||||||
// Validate the HOP request has the required input
|
// Validate the HOP request has the required input
|
||||||
try {
|
try {
|
||||||
validateAddrs(request, streamHandler)
|
validateAddrs(request, streamHandler)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err)
|
return log.error('invalid hop request via peer %s', connection.remotePeer.toB58String(), err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ async function handleHop ({
|
|||||||
connection: destinationConnection,
|
connection: destinationConnection,
|
||||||
request: stopRequest
|
request: stopRequest
|
||||||
})
|
})
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return log.error(err)
|
return log.error(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ module.exports.handleStop = function handleStop ({
|
|||||||
// Validate the STOP request has the required input
|
// Validate the STOP request has the required input
|
||||||
try {
|
try {
|
||||||
validateAddrs(request, streamHandler)
|
validateAddrs(request, streamHandler)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err)
|
return log.error('invalid stop request via peer %s', connection.remotePeer.toB58String(), err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@ function validateAddrs (msg, streamHandler) {
|
|||||||
return new Multiaddr(addr)
|
return new Multiaddr(addr)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
|
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
|
||||||
? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID
|
? CircuitRelay.Status.HOP_DST_MULTIADDR_INVALID
|
||||||
: CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID)
|
: CircuitRelay.Status.STOP_DST_MULTIADDR_INVALID)
|
||||||
@ -47,7 +47,7 @@ function validateAddrs (msg, streamHandler) {
|
|||||||
return new Multiaddr(addr)
|
return new Multiaddr(addr)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
|
writeResponse(streamHandler, msg.type === CircuitRelay.Type.HOP
|
||||||
? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID
|
? CircuitRelay.Status.HOP_SRC_MULTIADDR_INVALID
|
||||||
: CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID)
|
: CircuitRelay.Status.STOP_SRC_MULTIADDR_INVALID)
|
||||||
|
|||||||
@ -87,7 +87,7 @@ class Relay {
|
|||||||
try {
|
try {
|
||||||
const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS)
|
const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS)
|
||||||
await this._libp2p.contentRouting.provide(cid)
|
await this._libp2p.contentRouting.provide(cid)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
if (err.code === 'NO_ROUTERS_AVAILABLE') {
|
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)
|
log.error('a content router, such as a DHT, must be provided in order to advertise the relay service', err)
|
||||||
// Stop the advertise
|
// Stop the advertise
|
||||||
|
|||||||
@ -171,7 +171,7 @@ class Circuit {
|
|||||||
log('new outbound connection %s', maConn.remoteAddr)
|
log('new outbound connection %s', maConn.remoteAddr)
|
||||||
|
|
||||||
return this._upgrader.upgradeOutbound(maConn)
|
return this._upgrader.upgradeOutbound(maConn)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('Circuit relay dial failed', err)
|
log.error('Circuit relay dial failed', err)
|
||||||
disconnectOnFailure && await relayConnection.close()
|
disconnectOnFailure && await relayConnection.close()
|
||||||
throw err
|
throw err
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -94,7 +94,9 @@ class ConnectionManager extends EventEmitter {
|
|||||||
|
|
||||||
this._started = false
|
this._started = false
|
||||||
this._timer = null
|
this._timer = null
|
||||||
|
this._autoDialTimeout = null
|
||||||
this._checkMetrics = this._checkMetrics.bind(this)
|
this._checkMetrics = this._checkMetrics.bind(this)
|
||||||
|
this._autoDial = this._autoDial.bind(this)
|
||||||
|
|
||||||
this._latencyMonitor = new LatencyMonitor({
|
this._latencyMonitor = new LatencyMonitor({
|
||||||
latencyCheckIntervalMs: this._options.pollInterval,
|
latencyCheckIntervalMs: this._options.pollInterval,
|
||||||
@ -126,6 +128,8 @@ class ConnectionManager extends EventEmitter {
|
|||||||
|
|
||||||
this._started = true
|
this._started = true
|
||||||
log('started')
|
log('started')
|
||||||
|
|
||||||
|
this._options.autoDial && this._autoDial()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -134,6 +138,7 @@ class ConnectionManager extends EventEmitter {
|
|||||||
* @async
|
* @async
|
||||||
*/
|
*/
|
||||||
async stop () {
|
async stop () {
|
||||||
|
this._autoDialTimeout && this._autoDialTimeout.clear()
|
||||||
this._timer && this._timer.clear()
|
this._timer && this._timer.clear()
|
||||||
|
|
||||||
this._latencyMonitor.removeListener('data', this._onLatencyMeasure)
|
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
|
* If we have more connections than our maximum, close a connection
|
||||||
* to the lowest valued peer.
|
* to the lowest valued peer.
|
||||||
|
|||||||
@ -8,10 +8,9 @@ const {
|
|||||||
requirePeers,
|
requirePeers,
|
||||||
maybeLimitSource
|
maybeLimitSource
|
||||||
} = require('./utils')
|
} = require('./utils')
|
||||||
const drain = require('it-drain')
|
|
||||||
const merge = require('it-merge')
|
const merge = require('it-merge')
|
||||||
const { pipe } = require('it-pipe')
|
const { pipe } = require('it-pipe')
|
||||||
const { DHTContentRouting } = require('../dht/dht-content-routing')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {import('peer-id')} PeerId
|
* @typedef {import('peer-id')} PeerId
|
||||||
@ -39,7 +38,7 @@ class ContentRouting {
|
|||||||
|
|
||||||
// If we have the dht, add it to the available content routers
|
// If we have the dht, add it to the available content routers
|
||||||
if (this.dht && libp2p._config.dht.enabled) {
|
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
|
* @param {number} [options.minPeers] - minimum number of peers required to successfully put
|
||||||
* @returns {Promise<void>}
|
* @returns {Promise<void>}
|
||||||
*/
|
*/
|
||||||
async put (key, value, options) {
|
put (key, value, options) {
|
||||||
if (!this.libp2p.isStarted() || !this.dht.isStarted) {
|
if (!this.libp2p.isStarted() || !this.dht.isStarted) {
|
||||||
throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
|
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)
|
* @param {number} [options.timeout] - optional timeout (default: 60000)
|
||||||
* @returns {Promise<GetData>}
|
* @returns {Promise<GetData>}
|
||||||
*/
|
*/
|
||||||
async get (key, options) {
|
get (key, options) {
|
||||||
if (!this.libp2p.isStarted() || !this.dht.isStarted) {
|
if (!this.libp2p.isStarted() || !this.dht.isStarted) {
|
||||||
throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
|
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 {number} nVals
|
||||||
* @param {Object} [options] - get options
|
* @param {Object} [options] - get options
|
||||||
* @param {number} [options.timeout] - optional timeout (default: 60000)
|
* @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) {
|
if (!this.libp2p.isStarted() || !this.dht.isStarted) {
|
||||||
throw errCode(new Error(messages.NOT_STARTED_YET), codes.DHT_NOT_STARTED)
|
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)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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 }
|
|
||||||
@ -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 }
|
|
||||||
@ -6,7 +6,8 @@ const log = Object.assign(debug('libp2p:dialer'), {
|
|||||||
})
|
})
|
||||||
const errCode = require('err-code')
|
const errCode = require('err-code')
|
||||||
const { Multiaddr } = require('multiaddr')
|
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 { AbortError } = require('abortable-iterator')
|
||||||
const { anySignal } = require('any-signal')
|
const { anySignal } = require('any-signal')
|
||||||
|
|
||||||
@ -94,7 +95,7 @@ class Dialer {
|
|||||||
for (const dial of this._pendingDials.values()) {
|
for (const dial of this._pendingDials.values()) {
|
||||||
try {
|
try {
|
||||||
dial.controller.abort()
|
dial.controller.abort()
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -128,7 +129,7 @@ class Dialer {
|
|||||||
const connection = await pendingDial.promise
|
const connection = await pendingDial.promise
|
||||||
log('dial succeeded to %s', dialTarget.id)
|
log('dial succeeded to %s', dialTarget.id)
|
||||||
return connection
|
return connection
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
// Error is a timeout
|
// Error is a timeout
|
||||||
if (pendingDial.controller.signal.aborted) {
|
if (pendingDial.controller.signal.aborted) {
|
||||||
err.code = codes.ERR_TIMEOUT
|
err.code = codes.ERR_TIMEOUT
|
||||||
|
|||||||
@ -3,8 +3,7 @@
|
|||||||
exports.messages = {
|
exports.messages = {
|
||||||
NOT_STARTED_YET: 'The libp2p node is not started yet',
|
NOT_STARTED_YET: 'The libp2p node is not started yet',
|
||||||
DHT_DISABLED: 'DHT is not available',
|
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 = {
|
exports.codes = {
|
||||||
@ -30,7 +29,6 @@ exports.codes = {
|
|||||||
ERR_INVALID_PARAMETERS: 'ERR_INVALID_PARAMETERS',
|
ERR_INVALID_PARAMETERS: 'ERR_INVALID_PARAMETERS',
|
||||||
ERR_INVALID_PEER: 'ERR_INVALID_PEER',
|
ERR_INVALID_PEER: 'ERR_INVALID_PEER',
|
||||||
ERR_MUXER_UNAVAILABLE: 'ERR_MUXER_UNAVAILABLE',
|
ERR_MUXER_UNAVAILABLE: 'ERR_MUXER_UNAVAILABLE',
|
||||||
ERR_NOT_FOUND: 'ERR_NOT_FOUND',
|
|
||||||
ERR_TIMEOUT: 'ERR_TIMEOUT',
|
ERR_TIMEOUT: 'ERR_TIMEOUT',
|
||||||
ERR_TRANSPORT_UNAVAILABLE: 'ERR_TRANSPORT_UNAVAILABLE',
|
ERR_TRANSPORT_UNAVAILABLE: 'ERR_TRANSPORT_UNAVAILABLE',
|
||||||
ERR_TRANSPORT_DIAL_FAILED: 'ERR_TRANSPORT_DIAL_FAILED',
|
ERR_TRANSPORT_DIAL_FAILED: 'ERR_TRANSPORT_DIAL_FAILED',
|
||||||
|
|||||||
@ -32,7 +32,7 @@ function getPeer (peer) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
peer = PeerId.createFromB58String(idStr)
|
peer = PeerId.createFromB58String(idStr)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(
|
throw errCode(
|
||||||
new Error(`${peer} is not a valid peer type`),
|
new Error(`${peer} is not a valid peer type`),
|
||||||
codes.ERR_INVALID_MULTIADDR
|
codes.ERR_INVALID_MULTIADDR
|
||||||
|
|||||||
@ -124,7 +124,7 @@ class IdentifyService {
|
|||||||
stream,
|
stream,
|
||||||
consume
|
consume
|
||||||
)
|
)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
// Just log errors
|
// Just log errors
|
||||||
log.error('could not push identify update to peer', err)
|
log.error('could not push identify update to peer', err)
|
||||||
}
|
}
|
||||||
@ -182,7 +182,7 @@ class IdentifyService {
|
|||||||
let message
|
let message
|
||||||
try {
|
try {
|
||||||
message = Message.Identify.decode(data)
|
message = Message.Identify.decode(data)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_INVALID_MESSAGE)
|
throw errCode(err, codes.ERR_INVALID_MESSAGE)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -211,14 +211,14 @@ class IdentifyService {
|
|||||||
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
|
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
|
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// LEGACY: Update peers data in PeerStore
|
// LEGACY: Update peers data in PeerStore
|
||||||
try {
|
try {
|
||||||
this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr)))
|
this.peerStore.addressBook.set(id, listenAddrs.map((addr) => new Multiaddr(addr)))
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('received invalid addrs', err)
|
log.error('received invalid addrs', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -287,7 +287,7 @@ class IdentifyService {
|
|||||||
stream,
|
stream,
|
||||||
consume
|
consume
|
||||||
)
|
)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('could not respond to identify request', err)
|
log.error('could not respond to identify request', err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -313,7 +313,7 @@ class IdentifyService {
|
|||||||
collect
|
collect
|
||||||
)
|
)
|
||||||
message = Message.Identify.decode(data)
|
message = Message.Identify.decode(data)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return log.error('received invalid message', err)
|
return log.error('received invalid message', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -325,7 +325,7 @@ class IdentifyService {
|
|||||||
this.peerStore.protoBook.set(id, message.protocols)
|
this.peerStore.protoBook.set(id, message.protocols)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
|
log('received invalid envelope, discard it and fallback to listenAddrs is available', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -333,7 +333,7 @@ class IdentifyService {
|
|||||||
try {
|
try {
|
||||||
this.peerStore.addressBook.set(id,
|
this.peerStore.addressBook.set(id,
|
||||||
message.listenAddrs.map((addr) => new Multiaddr(addr)))
|
message.listenAddrs.map((addr) => new Multiaddr(addr)))
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('received invalid addrs', err)
|
log.error('received invalid addrs', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
30
src/index.js
30
src/index.js
@ -18,7 +18,6 @@ const { codes, messages } = require('./errors')
|
|||||||
|
|
||||||
const AddressManager = require('./address-manager')
|
const AddressManager = require('./address-manager')
|
||||||
const ConnectionManager = require('./connection-manager')
|
const ConnectionManager = require('./connection-manager')
|
||||||
const AutoDialler = require('./connection-manager/auto-dialler')
|
|
||||||
const Circuit = require('./circuit/transport')
|
const Circuit = require('./circuit/transport')
|
||||||
const Relay = require('./circuit')
|
const Relay = require('./circuit')
|
||||||
const Dialer = require('./dialer')
|
const Dialer = require('./dialer')
|
||||||
@ -194,13 +193,9 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
// Create the Connection Manager
|
// Create the Connection Manager
|
||||||
this.connectionManager = new ConnectionManager(this, {
|
this.connectionManager = new ConnectionManager(this, {
|
||||||
|
autoDial: this._config.peerDiscovery.autoDial,
|
||||||
...this._options.connectionManager
|
...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
|
// Create Metrics
|
||||||
if (this._options.metrics.enabled) {
|
if (this._options.metrics.enabled) {
|
||||||
@ -306,9 +301,14 @@ class Libp2p extends EventEmitter {
|
|||||||
// dht provided components (peerRouting, contentRouting, dht)
|
// dht provided components (peerRouting, contentRouting, dht)
|
||||||
if (this._modules.dht) {
|
if (this._modules.dht) {
|
||||||
const DHT = 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,
|
libp2p: this,
|
||||||
|
dialer: this.dialer,
|
||||||
|
peerId: this.peerId,
|
||||||
|
peerStore: this.peerStore,
|
||||||
|
registrar: this.registrar,
|
||||||
|
datastore: this.datastore,
|
||||||
...this._config.dht
|
...this._config.dht
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -363,7 +363,7 @@ class Libp2p extends EventEmitter {
|
|||||||
await this._onStarting()
|
await this._onStarting()
|
||||||
await this._onDidStart()
|
await this._onDidStart()
|
||||||
log('libp2p has started')
|
log('libp2p has started')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
this.emit('error', err)
|
this.emit('error', err)
|
||||||
log.error('An error occurred starting libp2p', err)
|
log.error('An error occurred starting libp2p', err)
|
||||||
await this.stop()
|
await this.stop()
|
||||||
@ -385,8 +385,6 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
this.relay && this.relay.stop()
|
this.relay && this.relay.stop()
|
||||||
this.peerRouting.stop()
|
this.peerRouting.stop()
|
||||||
this._autodialler.stop()
|
|
||||||
await (this._dht && this._dht.stop())
|
|
||||||
|
|
||||||
for (const service of this._discovery.values()) {
|
for (const service of this._discovery.values()) {
|
||||||
service.removeListener('peer', this._onDiscoveryPeer)
|
service.removeListener('peer', this._onDiscoveryPeer)
|
||||||
@ -401,6 +399,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
this.pubsub && this.pubsub.stop(),
|
this.pubsub && this.pubsub.stop(),
|
||||||
|
this._dht && this._dht.stop(),
|
||||||
this.metrics && this.metrics.stop()
|
this.metrics && this.metrics.stop()
|
||||||
])
|
])
|
||||||
|
|
||||||
@ -409,7 +408,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
ping.unmount(this)
|
ping.unmount(this)
|
||||||
this.dialer.destroy()
|
this.dialer.destroy()
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
this.emit('error', err)
|
this.emit('error', err)
|
||||||
@ -432,7 +431,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await this.keychain.findKeyByName('self')
|
await this.keychain.findKeyByName('self')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
await this.keychain.importPeer('self', this.peerId)
|
await this.keychain.importPeer('self', this.peerId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -625,7 +624,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
// DHT subsystem
|
// DHT subsystem
|
||||||
if (this._config.dht.enabled) {
|
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
|
// TODO: this should be modified once random-walk is used as
|
||||||
// the other discovery modules
|
// the other discovery modules
|
||||||
@ -656,7 +655,6 @@ class Libp2p extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.connectionManager.start()
|
this.connectionManager.start()
|
||||||
this._autodialler.start()
|
|
||||||
|
|
||||||
// Peer discovery
|
// Peer discovery
|
||||||
await this._setupPeerDiscovery()
|
await this._setupPeerDiscovery()
|
||||||
@ -700,7 +698,7 @@ class Libp2p extends EventEmitter {
|
|||||||
log('connecting to discovered peer %s', peerId.toB58String())
|
log('connecting to discovered peer %s', peerId.toB58String())
|
||||||
try {
|
try {
|
||||||
await this.dialer.connectToPeer(peerId)
|
await this.dialer.connectToPeer(peerId)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
|
log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -55,7 +55,7 @@ async function encrypt (localId, conn, remoteId) {
|
|||||||
let peerId
|
let peerId
|
||||||
try {
|
try {
|
||||||
peerId = await PeerId.createFromPubKey(id.pubkey.Data)
|
peerId = await PeerId.createFromPubKey(id.pubkey.Data)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
throw new InvalidCryptoExchangeError('Remote did not provide its public key')
|
throw new InvalidCryptoExchangeError('Remote did not provide its public key')
|
||||||
}
|
}
|
||||||
|
|||||||
@ -90,7 +90,7 @@ class CMS {
|
|||||||
const obj = forge.asn1.fromDer(buf)
|
const obj = forge.asn1.fromDer(buf)
|
||||||
// @ts-ignore not defined
|
// @ts-ignore not defined
|
||||||
cms = forge.pkcs7.messageFromAsn1(obj)
|
cms = forge.pkcs7.messageFromAsn1(obj)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
|
throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ class CMS {
|
|||||||
try {
|
try {
|
||||||
const key = await this.keychain.findKeyById(recipient.keyId)
|
const key = await this.keychain.findKeyById(recipient.keyId)
|
||||||
if (key) return true
|
if (key) return true
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
|||||||
@ -248,7 +248,7 @@ class Keychain {
|
|||||||
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
|
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
|
||||||
|
|
||||||
await batch.commit()
|
await batch.commit()
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -284,7 +284,7 @@ class Keychain {
|
|||||||
try {
|
try {
|
||||||
const keys = await this.listKeys()
|
const keys = await this.listKeys()
|
||||||
return keys.find((k) => k.id === id)
|
return keys.find((k) => k.id === id)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -304,7 +304,7 @@ class Keychain {
|
|||||||
try {
|
try {
|
||||||
const res = await this.store.get(dsname)
|
const res = await this.store.get(dsname)
|
||||||
return JSON.parse(uint8ArrayToString(res))
|
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'))
|
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)
|
batch.delete(oldInfoName)
|
||||||
await batch.commit()
|
await batch.commit()
|
||||||
return keyInfo
|
return keyInfo
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -393,7 +393,7 @@ class Keychain {
|
|||||||
const dek = privates.get(this).dek
|
const dek = privates.get(this).dek
|
||||||
const privateKey = await crypto.keys.import(pem, dek)
|
const privateKey = await crypto.keys.import(pem, dek)
|
||||||
return privateKey.export(password)
|
return privateKey.export(password)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -421,7 +421,7 @@ class Keychain {
|
|||||||
let privateKey
|
let privateKey
|
||||||
try {
|
try {
|
||||||
privateKey = await crypto.keys.import(pem, password)
|
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'))
|
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} */
|
/** @type {string} */
|
||||||
const dek = privates.get(this).dek
|
const dek = privates.get(this).dek
|
||||||
pem = await privateKey.export(dek)
|
pem = await privateKey.export(dek)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -482,7 +482,7 @@ class Keychain {
|
|||||||
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
|
batch.put(DsInfoName(name), uint8ArrayFromString(JSON.stringify(keyInfo)))
|
||||||
await batch.commit()
|
await batch.commit()
|
||||||
return keyInfo
|
return keyInfo
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -502,7 +502,7 @@ class Keychain {
|
|||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
const res = await this.store.get(dsname)
|
const res = await this.store.get(dsname)
|
||||||
return uint8ArrayToString(res)
|
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'))
|
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -114,7 +114,7 @@ class NatManager {
|
|||||||
const client = this._getClient()
|
const client = this._getClient()
|
||||||
const publicIp = this._externalIp || await client.externalIp()
|
const publicIp = this._externalIp || await client.externalIp()
|
||||||
|
|
||||||
// @ts-expect-error types are wrong
|
// @ts-ignore isPrivate has no call signatures
|
||||||
if (isPrivateIp(publicIp)) {
|
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`)
|
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 {
|
try {
|
||||||
await this._client.destroy()
|
await this._client.destroy()
|
||||||
this._client = null
|
this._client = null
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,6 @@ const {
|
|||||||
clearDelayedInterval
|
clearDelayedInterval
|
||||||
// @ts-ignore module with no types
|
// @ts-ignore module with no types
|
||||||
} = require('set-delayed-interval')
|
} = require('set-delayed-interval')
|
||||||
const { DHTPeerRouting } = require('./dht/dht-peer-routing')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {import('peer-id')} PeerId
|
* @typedef {import('peer-id')} PeerId
|
||||||
@ -52,7 +51,7 @@ class PeerRouting {
|
|||||||
|
|
||||||
// If we have the dht, add it to the available peer routers
|
// If we have the dht, add it to the available peer routers
|
||||||
if (libp2p._dht && libp2p._config.dht.enabled) {
|
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
|
this._refreshManagerOptions = libp2p._options.peerRouting.refreshManager
|
||||||
@ -80,7 +79,7 @@ class PeerRouting {
|
|||||||
try {
|
try {
|
||||||
// nb getClosestPeers adds the addresses to the address book
|
// nb getClosestPeers adds the addresses to the address book
|
||||||
await drain(this.getClosestPeers(this._peerId.id))
|
await drain(this.getClosestPeers(this._peerId.id))
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -83,7 +83,7 @@ class AddressBook extends Book {
|
|||||||
let peerRecord
|
let peerRecord
|
||||||
try {
|
try {
|
||||||
peerRecord = PeerRecord.createFromProtobuf(envelope.payload)
|
peerRecord = PeerRecord.createFromProtobuf(envelope.payload)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('invalid peer record received')
|
log.error('invalid peer record received')
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@ -80,11 +80,10 @@ class MetadataBook extends Book {
|
|||||||
/**
|
/**
|
||||||
* Set data into the datastructure
|
* Set data into the datastructure
|
||||||
*
|
*
|
||||||
|
* @override
|
||||||
* @param {PeerId} peerId
|
* @param {PeerId} peerId
|
||||||
* @param {string} key
|
* @param {string} key
|
||||||
* @param {Uint8Array} value
|
* @param {Uint8Array} value
|
||||||
* @param {object} [opts]
|
|
||||||
* @param {boolean} [opts.emit]
|
|
||||||
*/
|
*/
|
||||||
_setValue (peerId, key, value, { emit = true } = {}) {
|
_setValue (peerId, key, value, { emit = true } = {}) {
|
||||||
const id = peerId.toB58String()
|
const id = peerId.toB58String()
|
||||||
|
|||||||
@ -249,7 +249,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
}).finish()
|
}).finish()
|
||||||
|
|
||||||
batch.put(key, encodedData)
|
batch.put(key, encodedData)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -275,7 +275,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
const encodedData = peerId.marshalPubKey()
|
const encodedData = peerId.marshalPubKey()
|
||||||
|
|
||||||
batch.put(key, encodedData)
|
batch.put(key, encodedData)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -302,7 +302,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
batch.delete(key)
|
batch.delete(key)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -330,7 +330,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
const encodedData = Protocols.encode({ protocols }).finish()
|
const encodedData = Protocols.encode({ protocols }).finish()
|
||||||
|
|
||||||
batch.put(key, encodedData)
|
batch.put(key, encodedData)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -399,7 +399,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
default:
|
default:
|
||||||
log('invalid data persisted for: ', key.toString())
|
log('invalid data persisted for: ', key.toString())
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,7 +77,7 @@ module.exports.decodeV1PSK = (pskBuffer) => {
|
|||||||
codecName: codec,
|
codecName: codec,
|
||||||
psk: psk
|
psk: psk
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
throw new Error(Errors.INVALID_PSK)
|
throw new Error(Errors.INVALID_PSK)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,6 +28,6 @@ try {
|
|||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
generate(process.stdout)
|
generate(process.stdout)
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ error) {
|
} catch (error) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -109,7 +109,7 @@ class TransportManager {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
return await transport.dial(ma, options)
|
return await transport.dial(ma, options)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
|
if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
|
||||||
throw err
|
throw err
|
||||||
}
|
}
|
||||||
|
|||||||
@ -106,7 +106,7 @@ class Upgrader {
|
|||||||
} else {
|
} else {
|
||||||
upgradedConn = encryptedConn
|
upgradedConn = encryptedConn
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('Failed to upgrade inbound connection', err)
|
log.error('Failed to upgrade inbound connection', err)
|
||||||
await maConn.close(err)
|
await maConn.close(err)
|
||||||
throw err
|
throw err
|
||||||
@ -181,7 +181,7 @@ class Upgrader {
|
|||||||
} else {
|
} else {
|
||||||
upgradedConn = encryptedConn
|
upgradedConn = encryptedConn
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('Failed to upgrade outbound connection', err)
|
log.error('Failed to upgrade outbound connection', err)
|
||||||
await maConn.close(err)
|
await maConn.close(err)
|
||||||
throw err
|
throw err
|
||||||
@ -245,7 +245,7 @@ class Upgrader {
|
|||||||
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
|
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
|
||||||
connection.addStream(muxedStream, { protocol })
|
connection.addStream(muxedStream, { protocol })
|
||||||
this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol })
|
this._onStream({ connection, stream: { ...muxedStream, ...stream }, protocol })
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -263,7 +263,7 @@ class Upgrader {
|
|||||||
const { stream, protocol } = await mss.select(protocols)
|
const { stream, protocol } = await mss.select(protocols)
|
||||||
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
|
if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
|
||||||
return { stream: { ...muxedStream, ...stream }, protocol }
|
return { stream: { ...muxedStream, ...stream }, protocol }
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error('could not create new stream', err)
|
log.error('could not create new stream', err)
|
||||||
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
|
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
|
||||||
}
|
}
|
||||||
@ -283,7 +283,7 @@ class Upgrader {
|
|||||||
if (connection.stat.status === 'open') {
|
if (connection.stat.status === 'open') {
|
||||||
await connection.close()
|
await connection.close()
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
} finally {
|
} finally {
|
||||||
this.onConnectionEnd(connection)
|
this.onConnectionEnd(connection)
|
||||||
@ -371,7 +371,7 @@ class Upgrader {
|
|||||||
...await crypto.secureInbound(localPeer, stream),
|
...await crypto.secureInbound(localPeer, stream),
|
||||||
protocol
|
protocol
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
|
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -406,7 +406,7 @@ class Upgrader {
|
|||||||
...await crypto.secureOutbound(localPeer, stream, remotePeerId),
|
...await crypto.secureOutbound(localPeer, stream, remotePeerId),
|
||||||
protocol
|
protocol
|
||||||
}
|
}
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
|
throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -430,7 +430,7 @@ class Upgrader {
|
|||||||
log('%s selected as muxer protocol', protocol)
|
log('%s selected as muxer protocol', protocol)
|
||||||
const Muxer = muxers.get(protocol)
|
const Muxer = muxers.get(protocol)
|
||||||
return { stream, Muxer }
|
return { stream, Muxer }
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
|
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -453,7 +453,7 @@ class Upgrader {
|
|||||||
const { stream, protocol } = await listener.handle(protocols)
|
const { stream, protocol } = await listener.handle(protocols)
|
||||||
const Muxer = muxers.get(protocol)
|
const Muxer = muxers.get(protocol)
|
||||||
return { stream, Muxer }
|
return { stream, Muxer }
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
|
throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,7 +34,7 @@ describe('content-routing', () => {
|
|||||||
try {
|
try {
|
||||||
for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line
|
for await (const _ of node.contentRouting.findProviders('a cid')) {} // eslint-disable-line
|
||||||
throw new Error('.findProviders should return an error')
|
throw new Error('.findProviders should return an error')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
|
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
|
||||||
}
|
}
|
||||||
@ -238,7 +238,7 @@ describe('content-routing', () => {
|
|||||||
try {
|
try {
|
||||||
for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line
|
for await (const _ of node.contentRouting.findProviders(cid)) { } // eslint-disable-line
|
||||||
throw new Error('should handle errors when finding providers')
|
throw new Error('should handle errors when finding providers')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -125,7 +125,7 @@ describe('Dial Request', () => {
|
|||||||
try {
|
try {
|
||||||
await dialRequest.run({ signal: controller.signal })
|
await dialRequest.run({ signal: controller.signal })
|
||||||
expect.fail('Should have thrown')
|
expect.fail('Should have thrown')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.be.an.instanceof(AggregateError)
|
expect(err).to.be.an.instanceof(AggregateError)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,7 +162,7 @@ describe('Dial Request', () => {
|
|||||||
try {
|
try {
|
||||||
await dialRequest.run({ signal: controller.signal })
|
await dialRequest.run({ signal: controller.signal })
|
||||||
expect.fail('Should have thrown')
|
expect.fail('Should have thrown')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.be.an.instanceof(AggregateError)
|
expect(err).to.be.an.instanceof(AggregateError)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -212,7 +212,7 @@ describe('Dial Request', () => {
|
|||||||
setTimeout(() => controller.abort(), 100)
|
setTimeout(() => controller.abort(), 100)
|
||||||
await dialRequest.run({ signal: controller.signal })
|
await dialRequest.run({ signal: controller.signal })
|
||||||
expect.fail('dial should have failed')
|
expect.fail('dial should have failed')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.be.an.instanceof(AggregateError)
|
expect(err).to.be.an.instanceof(AggregateError)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -277,7 +277,7 @@ describe('Dialing (direct, TCP)', () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0])
|
await libp2p.dial(remoteLibp2p.transportManager.getAddrs()[0])
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR)
|
expect(err).to.have.property('code', ErrorCodes.ERR_INVALID_MULTIADDR)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -304,7 +304,7 @@ describe('Dialing (direct, WebSockets)', () => {
|
|||||||
dialer.destroy()
|
dialer.destroy()
|
||||||
await dialPromise
|
await dialPromise
|
||||||
expect.fail('should have failed')
|
expect.fail('should have failed')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.be.an.instanceof(AggregateError)
|
expect(err).to.be.an.instanceof(AggregateError)
|
||||||
expect(dialer._pendingDials.size).to.equal(0) // 1 dial request
|
expect(dialer._pendingDials.size).to.equal(0) // 1 dial request
|
||||||
}
|
}
|
||||||
|
|||||||
@ -519,7 +519,7 @@ describe('keychain', () => {
|
|||||||
it('should validate newPass is a string', async () => {
|
it('should validate newPass is a string', async () => {
|
||||||
try {
|
try {
|
||||||
await kc.rotateKeychainPass(oldPass, 1234567890)
|
await kc.rotateKeychainPass(oldPass, 1234567890)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -527,7 +527,7 @@ describe('keychain', () => {
|
|||||||
it('should validate oldPass is a string', async () => {
|
it('should validate oldPass is a string', async () => {
|
||||||
try {
|
try {
|
||||||
await kc.rotateKeychainPass(1234, 'newInsecurePassword1')
|
await kc.rotateKeychainPass(1234, 'newInsecurePassword1')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -535,7 +535,7 @@ describe('keychain', () => {
|
|||||||
it('should validate newPass is at least 20 characters', async () => {
|
it('should validate newPass is at least 20 characters', async () => {
|
||||||
try {
|
try {
|
||||||
await kc.rotateKeychainPass(oldPass, 'not20Chars')
|
await kc.rotateKeychainPass(oldPass, 'not20Chars')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -586,7 +586,7 @@ describe('libp2p.keychain', () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await libp2p.keychain.createKey('keyName', 'rsa', 2048)
|
await libp2p.keychain.createKey('keyName', 'rsa', 2048)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,7 +43,7 @@ describe('peer-routing', () => {
|
|||||||
try {
|
try {
|
||||||
for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line
|
for await (const _ of node.peerRouting.getClosestPeers('a cid')) { } // eslint-disable-line
|
||||||
throw new Error('.getClosestPeers should return an error')
|
throw new Error('.getClosestPeers should return an error')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
|
expect(err.code).to.equal('NO_ROUTERS_AVAILABLE')
|
||||||
}
|
}
|
||||||
@ -275,7 +275,7 @@ describe('peer-routing', () => {
|
|||||||
try {
|
try {
|
||||||
for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line
|
for await (const _ of node.peerRouting.getClosestPeers(peerId.id)) { } // eslint-disable-line
|
||||||
throw new Error('should handle errors when getting the closest peers')
|
throw new Error('should handle errors when getting the closest peers')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.set('invalid peerId')
|
ab.set('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if no addresses provided', () => {
|
it('throwns invalid parameters error if no addresses provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.set(peerId)
|
ab.set(peerId)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -65,7 +65,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
|
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.set(peerId, ['invalid multiaddr'])
|
ab.set(peerId, ['invalid multiaddr'])
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -159,7 +159,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.add('invalid peerId')
|
ab.add('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -169,7 +169,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if no addresses provided', () => {
|
it('throwns invalid parameters error if no addresses provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.add(peerId)
|
ab.add(peerId)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -179,7 +179,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
|
it('throwns invalid parameters error if invalid multiaddrs are provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.add(peerId, ['invalid multiaddr'])
|
ab.add(peerId, ['invalid multiaddr'])
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -308,7 +308,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.get('invalid peerId')
|
ab.get('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -343,7 +343,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.getMultiaddrsForPeer('invalid peerId')
|
ab.getMultiaddrsForPeer('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -391,7 +391,7 @@ describe('addressBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
ab.delete('invalid peerId')
|
ab.delete('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,7 +23,7 @@ describe('keyBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided in set', () => {
|
it('throws invalid parameters error if invalid PeerId is provided in set', () => {
|
||||||
try {
|
try {
|
||||||
kb.set('invalid peerId')
|
kb.set('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -33,7 +33,7 @@ describe('keyBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided in get', () => {
|
it('throws invalid parameters error if invalid PeerId is provided in get', () => {
|
||||||
try {
|
try {
|
||||||
kb.get('invalid peerId')
|
kb.get('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,7 +34,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.set('invalid peerId')
|
mb.set('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -44,7 +44,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if no key provided', () => {
|
it('throws invalid parameters error if no key provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.set(peerId)
|
mb.set(peerId)
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -54,7 +54,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if no value provided', () => {
|
it('throws invalid parameters error if no value provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.set(peerId, 'location')
|
mb.set(peerId, 'location')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -64,7 +64,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if value is not a buffer', () => {
|
it('throws invalid parameters error if value is not a buffer', () => {
|
||||||
try {
|
try {
|
||||||
mb.set(peerId, 'location', 'mars')
|
mb.set(peerId, 'location', 'mars')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -163,7 +163,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.get('invalid peerId')
|
mb.get('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -199,7 +199,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.getValue('invalid peerId')
|
mb.getValue('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ describe('metadataBook', () => {
|
|||||||
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
it('throwns invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.delete('invalid peerId')
|
mb.delete('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -305,7 +305,7 @@ describe('metadataBook', () => {
|
|||||||
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
it('throws invalid parameters error if invalid PeerId is provided', () => {
|
||||||
try {
|
try {
|
||||||
mb.deleteValue('invalid peerId')
|
mb.deleteValue('invalid peerId')
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
expect(err.code).to.equal(ERR_INVALID_PARAMETERS)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -201,7 +201,7 @@ describe('libp2p.transportManager (dial only)', () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await libp2p.start()
|
await libp2p.start()
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
expect(err).to.exist()
|
expect(err).to.exist()
|
||||||
expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES)
|
expect(err.code).to.equal(ErrorCodes.ERR_NO_VALID_ADDRESSES)
|
||||||
return
|
return
|
||||||
|
|||||||
@ -10,13 +10,13 @@
|
|||||||
"libp2p-delegated-peer-routing": "^0.10.0",
|
"libp2p-delegated-peer-routing": "^0.10.0",
|
||||||
"libp2p-gossipsub": "^0.9.0",
|
"libp2p-gossipsub": "^0.9.0",
|
||||||
"libp2p-interfaces": "^1.0.1",
|
"libp2p-interfaces": "^1.0.1",
|
||||||
"libp2p-kad-dht": "^0.26.5",
|
"libp2p-kad-dht": "^0.23.1",
|
||||||
"libp2p-mplex": "^0.10.4",
|
"libp2p-mplex": "^0.10.4",
|
||||||
"@chainsafe/libp2p-noise": "^4.1.0",
|
"@chainsafe/libp2p-noise": "^4.1.0",
|
||||||
"libp2p-record": "^0.10.4",
|
"libp2p-record": "^0.10.4",
|
||||||
"libp2p-tcp": "^0.17.1",
|
"libp2p-tcp": "^0.17.1",
|
||||||
"libp2p-websockets": "^0.16.1",
|
"libp2p-websockets": "^0.16.1",
|
||||||
"peer-id": "^0.16.0"
|
"peer-id": "^0.15.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "npx tsc",
|
"build": "npx tsc",
|
||||||
|
|||||||
@ -108,7 +108,7 @@ function createConnection ({
|
|||||||
// Need to be able to notify a peer of this this._onStream({ connection, stream, protocol })
|
// Need to be able to notify a peer of this this._onStream({ connection, stream, protocol })
|
||||||
const handler = protocols.get(protocol)
|
const handler = protocols.get(protocol)
|
||||||
handler({ connection, stream, protocol })
|
handler({ connection, stream, protocol })
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -124,7 +124,7 @@ function createConnection ({
|
|||||||
try {
|
try {
|
||||||
const { stream, protocol } = await mss.select(protocols)
|
const { stream, protocol } = await mss.select(protocols)
|
||||||
return { stream: { ...muxedStream, ...stream }, protocol }
|
return { stream: { ...muxedStream, ...stream }, protocol }
|
||||||
} catch (/** @type {any} */ err) {
|
} catch (err) {
|
||||||
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
|
throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"extends": "aegir/src/config/tsconfig.aegir.json",
|
"extends": "./node_modules/aegir/src/config/tsconfig.aegir.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "dist"
|
"outDir": "dist"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user