mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-07-10 14:21:33 +00:00
Compare commits
79 Commits
Author | SHA1 | Date | |
---|---|---|---|
8ce2f08589 | |||
fe0d9828bb | |||
c8e1b08c19 | |||
faf1f89d9e | |||
76f4ea5e8a | |||
2f0b311df7 | |||
d172d0d952 | |||
f8e8023aed | |||
bdc9f16d0c | |||
1b46f47fdb | |||
b539f9b655 | |||
103818733e | |||
1f1bbc0ee6 | |||
3b683e7156 | |||
b25e0fe531 | |||
cbaa5a2ef3 | |||
51dabb1724 | |||
b9339bccaa | |||
9b21893b64 | |||
b70fb43427 | |||
ae21299ade | |||
149120bebc | |||
91c2ec9856 | |||
6d0ac819f1 | |||
15a0b1dbf2 | |||
9cbf36fcb5 | |||
3a9d5f64d9 | |||
eacd7e8f76 | |||
7f2cc4dc44 | |||
5cc5a8749a | |||
ee60e18213 | |||
a4a2fac41e | |||
2f598eba09 | |||
443a102528 | |||
3bed7b4cb2 | |||
3fb424914f | |||
bb0ca28195 | |||
01a8b8da9b | |||
77d7cb8f08 | |||
a335fda852 | |||
43e3af0c12 | |||
2c9c3cf6d5 | |||
4d6587539c | |||
83734ef520 | |||
1c2e4d89ac | |||
c635b08d2f | |||
3aedf55115 | |||
ede653cad9 | |||
2ab811d708 | |||
122c89dd0d | |||
97107c4ef7 | |||
d3f78edffe | |||
f8e3cf10b0 | |||
f342c1ff50 | |||
fe63990a16 | |||
e82b6e414b | |||
1d62ead8e5 | |||
3d25ff7fd0 | |||
0f389a7828 | |||
9f0582f372 | |||
266f2c3c86 | |||
7783edb059 | |||
ba2b4d4b28 | |||
06c3a6d407 | |||
833f789714 | |||
ef24fabf02 | |||
3b33fb4b73 | |||
a07fb7960b | |||
b11126ca89 | |||
df53ab4e65 | |||
0701de40b1 | |||
d6bb967243 | |||
d48005b8b7 | |||
67b97e32da | |||
664ba2d1e7 | |||
608564b033 | |||
af723b355e | |||
13cf476148 | |||
39b03586e8 |
@ -7,7 +7,7 @@ const Peers = require('./test/fixtures/peers')
|
|||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
const WebSockets = require('libp2p-websockets')
|
const WebSockets = require('libp2p-websockets')
|
||||||
const Muxer = require('libp2p-mplex')
|
const Muxer = require('libp2p-mplex')
|
||||||
const { NOISE: Crypto } = require('libp2p-noise')
|
const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
let libp2p
|
let libp2p
|
||||||
|
|
||||||
|
8
.github/dependabot.yml
vendored
Normal file
8
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: npm
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
time: "11:00"
|
||||||
|
open-pull-requests-limit: 10
|
65
.github/workflows/examples.yml
vendored
65
.github/workflows/examples.yml
vendored
@ -12,6 +12,9 @@ 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
|
||||||
@ -21,82 +24,118 @@ 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 && yarn && npm run test -- auto-relay
|
- run: cd examples && npm i && 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 && yarn && npm run test -- chat
|
- run: cd examples && npm i && 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 && yarn && npm run test -- connection-encryption
|
- run: cd examples && npm i && 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 && yarn && npm run test -- discovery-mechanisms
|
- run: cd examples && npm i && 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 && yarn && npm run test -- echo
|
- run: cd examples && npm i && 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 && yarn && npm run test -- libp2p-in-the-browser
|
- run: cd examples && npm i && 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 && yarn && npm run test -- peer-and-content-routing
|
- run: cd examples && npm i && 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 && yarn && npm run test -- pnet
|
- run: cd examples && npm i && 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 && yarn && npm run test -- protocol-and-stream-muxing
|
- run: cd examples && npm i && 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 && yarn && npm run test -- pubsub
|
- run: cd examples && npm i && 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 && yarn && npm run test -- transports
|
- run: cd examples && npm i && 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
|
||||||
- run: npm install
|
- uses: actions/setup-node@v2
|
||||||
- run: cd examples && yarn && npm run test -- webrtc-direct
|
with:
|
||||||
|
node-version: 16
|
||||||
|
- run: npm install -g @mapbox/node-pre-gyp && npm install
|
||||||
|
- run: cd examples && npm i && npm run test -- webrtc-direct
|
30
.github/workflows/main.yml
vendored
30
.github/workflows/main.yml
vendored
@ -12,12 +12,14 @@ 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
|
||||||
- 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@master
|
- uses: ipfs/aegir/actions/bundle-size
|
||||||
name: size
|
name: size
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@ -27,35 +29,44 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, ubuntu-latest, macos-latest]
|
os: [windows-latest, ubuntu-latest, macos-latest]
|
||||||
node: [14, 16]
|
node: [16]
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v1
|
- uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node }}
|
node-version: ${{ matrix.node }}
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir test -t node --cov --bail
|
- run: npm run test:node -- --cov --bail
|
||||||
- uses: codecov/codecov-action@v1
|
- uses: codecov/codecov-action@v1
|
||||||
test-chrome:
|
test-chrome:
|
||||||
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: lts/*
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir test -t browser -t webworker --bail
|
- run: npm run test:browser -- -t browser -t webworker --bail
|
||||||
test-firefox:
|
test-firefox:
|
||||||
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: lts/*
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir test -t browser -t webworker --bail -- --browser firefox
|
- run: npm run test:browser -- -t browser -t webworker --bail -- --browser firefox
|
||||||
test-ts:
|
test-ts:
|
||||||
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: lts/*
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npm run test:ts
|
- run: npm run test:ts
|
||||||
test-interop:
|
test-interop:
|
||||||
@ -63,5 +74,8 @@ 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: cd node_modules/interop-libp2p && yarn && LIBP2P_JS=${GITHUB_WORKSPACE}/src/index.js npx aegir test -t node --bail
|
- run: npm run test:interop -- --bail -- --exit
|
||||||
|
183
CHANGELOG.md
183
CHANGELOG.md
@ -1,3 +1,186 @@
|
|||||||
|
## [0.35.5](https://github.com/libp2p/js-libp2p/compare/v0.35.4...v0.35.5) (2021-12-15)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.35.4](https://github.com/libp2p/js-libp2p/compare/v0.35.3...v0.35.4) (2021-12-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* allow per-component metrics to be collected ([#1061](https://github.com/libp2p/js-libp2p/issues/1061)) ([2f0b311](https://github.com/libp2p/js-libp2p/commit/2f0b311df7127aa44512c2008142d4ca30268986)), closes [#1060](https://github.com/libp2p/js-libp2p/issues/1060)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.35.3](https://github.com/libp2p/js-libp2p/compare/v0.35.2...v0.35.3) (2021-12-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* clean up pending dial targets ([#1059](https://github.com/libp2p/js-libp2p/issues/1059)) ([bdc9f16](https://github.com/libp2p/js-libp2p/commit/bdc9f16d0cbe56ccf26822f11068e7795bcef046))
|
||||||
|
* fix uncaught promise rejection when finding peers ([#1044](https://github.com/libp2p/js-libp2p/issues/1044)) ([3b683e7](https://github.com/libp2p/js-libp2p/commit/3b683e715686163e229b7b5c3a892327dfd4fc63))
|
||||||
|
* make error codes consistent ([#1054](https://github.com/libp2p/js-libp2p/issues/1054)) ([b25e0fe](https://github.com/libp2p/js-libp2p/commit/b25e0fe5312db58a06c39500ae84c50fed3a93bd))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.35.2](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.35.2) (2021-12-06)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
|
||||||
|
* increase maxlisteners on event target ([#1050](https://github.com/libp2p/js-libp2p/issues/1050)) ([b70fb43](https://github.com/libp2p/js-libp2p/commit/b70fb43427b47df079b55929ec8956f69cbda966)), closes [#900](https://github.com/libp2p/js-libp2p/issues/900)
|
||||||
|
* private ip ts compile has no call signatures ([#1020](https://github.com/libp2p/js-libp2p/issues/1020)) ([77d7cb8](https://github.com/libp2p/js-libp2p/commit/77d7cb8f0815f2cdd3bfdfa8b641a7a186fe9520))
|
||||||
|
* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
|
||||||
|
|
||||||
|
|
||||||
|
### chore
|
||||||
|
|
||||||
|
* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
|
||||||
|
|
||||||
|
|
||||||
|
### BREAKING CHANGES
|
||||||
|
|
||||||
|
* requires node 15+
|
||||||
|
* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.35.1](https://github.com/libp2p/js-libp2p/compare/v0.35.0...v0.35.1) (2021-12-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.35.0](https://github.com/libp2p/js-libp2p/compare/v0.34.0...v0.35.0) (2021-12-02)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
|
||||||
|
|
||||||
|
|
||||||
|
### chore
|
||||||
|
|
||||||
|
* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
|
||||||
|
|
||||||
|
|
||||||
|
### BREAKING CHANGES
|
||||||
|
|
||||||
|
* requires node 15+
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.34.0](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.34.0) (2021-11-25)
|
||||||
|
|
||||||
|
|
||||||
|
### 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)
|
||||||
|
|
||||||
|
|
||||||
|
### chore
|
||||||
|
|
||||||
|
* update datastore ([#990](https://github.com/libp2p/js-libp2p/issues/990)) ([83734ef](https://github.com/libp2p/js-libp2p/commit/83734ef52061ad61ddb5ca49aae27e3a8b937058))
|
||||||
|
|
||||||
|
|
||||||
|
### BREAKING CHANGES
|
||||||
|
|
||||||
|
* datastore implementations provided to libp2p must be compliant with interface-datastore@6.0.0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.32.5](https://github.com/libp2p/js-libp2p/compare/v0.32.4...v0.32.5) (2021-09-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* move abortable-iterator to dependencies ([#992](https://github.com/libp2p/js-libp2p/issues/992)) ([122c89d](https://github.com/libp2p/js-libp2p/commit/122c89dd0df55a59edaae078e3dc7c31b5603715)), closes [#986](https://github.com/libp2p/js-libp2p/issues/986)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.32.4](https://github.com/libp2p/js-libp2p/compare/v0.32.3...v0.32.4) (2021-08-20)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.32.3](https://github.com/libp2p/js-libp2p/compare/v0.32.2...v0.32.3) (2021-08-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* uint8arrays is a dep ([#964](https://github.com/libp2p/js-libp2p/issues/964)) ([ba2b4d4](https://github.com/libp2p/js-libp2p/commit/ba2b4d4b28f1d9940b457de344aed44537f9eabd))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.32.2](https://github.com/libp2p/js-libp2p/compare/v0.32.1...v0.32.2) (2021-08-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* browser example ci ([3b33fb4](https://github.com/libp2p/js-libp2p/commit/3b33fb4b73ba8065e432fb59f758fe138fd23d9e))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* custom protocol name ([#962](https://github.com/libp2p/js-libp2p/issues/962)) ([ef24fab](https://github.com/libp2p/js-libp2p/commit/ef24fabf0269fd079888e92eedb458e23ef1c733))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.32.1](https://github.com/libp2p/js-libp2p/compare/v0.32.0...v0.32.1) (2021-07-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* turn compliance tests into devDependency ([#960](https://github.com/libp2p/js-libp2p/issues/960)) ([0701de4](https://github.com/libp2p/js-libp2p/commit/0701de40b1ebdf319959846d8c4fdd30b3cf34a4))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.32.0](https://github.com/libp2p/js-libp2p/compare/v0.32.0-rc.0...v0.32.0) (2021-07-15)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.32.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.31.7...v0.32.0-rc.0) (2021-07-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* do not allow dial to large number of multiaddrs ([#954](https://github.com/libp2p/js-libp2p/issues/954)) ([af723b3](https://github.com/libp2p/js-libp2p/commit/af723b355e1ddf4aecf439f81c3aa67613d45fa4))
|
||||||
|
|
||||||
|
|
||||||
|
### chore
|
||||||
|
|
||||||
|
* update to new multiformats ([#948](https://github.com/libp2p/js-libp2p/issues/948)) ([13cf476](https://github.com/libp2p/js-libp2p/commit/13cf4761489d59b22924bb8ec2ec6dbe207b280c))
|
||||||
|
|
||||||
|
|
||||||
|
### BREAKING CHANGES
|
||||||
|
|
||||||
|
* uses the CID class from the new multiformats module
|
||||||
|
|
||||||
|
Co-authored-by: Vasco Santos <vasco.santos@moxy.studio>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [0.31.7](https://github.com/libp2p/js-libp2p/compare/v0.31.6...v0.31.7) (2021-06-14)
|
## [0.31.7](https://github.com/libp2p/js-libp2p/compare/v0.31.6...v0.31.7) (2021-06-14)
|
||||||
|
|
||||||
|
|
||||||
|
@ -163,9 +163,9 @@ List of packages currently in existence for libp2p
|
|||||||
| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [](//github.com/libp2p/js-libp2p-kad-dht/releases) | [](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
|
| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [](//github.com/libp2p/js-libp2p-kad-dht/releases) | [](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
|
||||||
| **utilities** |
|
| **utilities** |
|
||||||
| [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [](//github.com/libp2p/js-libp2p-crypto/releases) | [](https://david-dm.org/libp2p/js-libp2p-crypto) | [](https://travis-ci.com/libp2p/js-libp2p-crypto) | [](https://codecov.io/gh/libp2p/js-libp2p-crypto) | [Jacob Heun](mailto:jacobheun@gmail.com) |
|
| [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [](//github.com/libp2p/js-libp2p-crypto/releases) | [](https://david-dm.org/libp2p/js-libp2p-crypto) | [](https://travis-ci.com/libp2p/js-libp2p-crypto) | [](https://codecov.io/gh/libp2p/js-libp2p-crypto) | [Jacob Heun](mailto:jacobheun@gmail.com) |
|
||||||
| [`libp2p-crypto-secp256k1`](//github.com/libp2p/js-libp2p-crypto-secp256k1) | [](//github.com/libp2p/js-libp2p-crypto-secp256k1/releases) | [](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1) | [](https://travis-ci.com/libp2p/js-libp2p-crypto-secp256k1) | [](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
|
|
||||||
| **data types** |
|
| **data types** |
|
||||||
| [`peer-id`](//github.com/libp2p/js-peer-id) | [](//github.com/libp2p/js-peer-id/releases) | [](https://david-dm.org/libp2p/js-peer-id) | [](https://travis-ci.com/libp2p/js-peer-id) | [](https://codecov.io/gh/libp2p/js-peer-id) | [Vasco Santos](mailto:santos.vasco10@gmail.com) |
|
| [`peer-id`](//github.com/libp2p/js-peer-id) | [](//github.com/libp2p/js-peer-id/releases) | [](https://david-dm.org/libp2p/js-peer-id) | [](https://travis-ci.com/libp2p/js-peer-id) | [](https://codecov.io/gh/libp2p/js-peer-id) | [Vasco Santos](mailto:santos.vasco10@gmail.com) |
|
||||||
|
| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [](//github.com/libp2p/js-libp2p-record/releases) | [](https://david-dm.org/libp2p/js-libp2p-record) | [](https://travis-ci.com/libp2p/js-libp2p-record) | [](https://codecov.io/gh/libp2p/js-libp2p-record) | [Jacob Heun](mailto:santos.vasco10@gmail.com) |
|
||||||
| **pubsub** |
|
| **pubsub** |
|
||||||
| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [](//github.com/libp2p/js-libp2p-floodsub/releases) | [](https://david-dm.org/libp2p/js-libp2p-floodsub) | [](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
|
| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [](//github.com/libp2p/js-libp2p-floodsub/releases) | [](https://david-dm.org/libp2p/js-libp2p-floodsub) | [](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
|
||||||
| [`libp2p-gossipsub`](//github.com/ChainSafe/js-libp2p-gossipsub) | [](//github.com/ChainSafe/js-libp2p-gossipsub/releases) | [](https://david-dm.org/ChainSafe/js-libp2p-gossipsub) | [](https://travis-ci.com/ChainSafe/js-libp2p-gossipsub) | [](https://codecov.io/gh/ChainSafe/js-libp2p-gossipsub) | [Cayman Nava](mailto:caymannava@gmail.com) |
|
| [`libp2p-gossipsub`](//github.com/ChainSafe/js-libp2p-gossipsub) | [](//github.com/ChainSafe/js-libp2p-gossipsub/releases) | [](https://david-dm.org/ChainSafe/js-libp2p-gossipsub) | [](https://travis-ci.com/ChainSafe/js-libp2p-gossipsub) | [](https://codecov.io/gh/ChainSafe/js-libp2p-gossipsub) | [Cayman Nava](mailto:caymannava@gmail.com) |
|
||||||
|
@ -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-interfaces/tree/master/src/connection
|
[connection]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/interfaces/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 @@
|
|||||||
# Configuration
|
#
|
||||||
|
|
||||||
- [Configuration](#configuration)
|
- [Overview](#overview)
|
||||||
- [Overview](#overview)
|
- [Modules](#modules)
|
||||||
- [Modules](#modules)
|
- [Transport](#transport)
|
||||||
- [Transport](#transport)
|
- [Stream Multiplexing](#stream-multiplexing)
|
||||||
- [Stream Multiplexing](#stream-multiplexing)
|
- [Connection Encryption](#connection-encryption)
|
||||||
- [Connection Encryption](#connection-encryption)
|
- [Peer Discovery](#peer-discovery)
|
||||||
- [Peer Discovery](#peer-discovery)
|
- [Content Routing](#content-routing)
|
||||||
- [Content Routing](#content-routing)
|
- [Peer Routing](#peer-routing)
|
||||||
- [Peer Routing](#peer-routing)
|
- [DHT](#dht)
|
||||||
- [DHT](#dht)
|
- [Pubsub](#pubsub)
|
||||||
- [Pubsub](#pubsub)
|
- [Customizing libp2p](#customizing-libp2p)
|
||||||
- [Customizing libp2p](#customizing-libp2p)
|
- [Examples](#examples)
|
||||||
- [Examples](#examples)
|
- [Basic setup](#basic-setup)
|
||||||
- [Basic setup](#basic-setup)
|
- [Customizing Peer Discovery](#customizing-peer-discovery)
|
||||||
- [Customizing Peer Discovery](#customizing-peer-discovery)
|
- [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
|
||||||
- [Setup webrtc transport and discovery](#setup-webrtc-transport-and-discovery)
|
- [Customizing Pubsub](#customizing-pubsub)
|
||||||
- [Customizing Pubsub](#customizing-pubsub)
|
- [Customizing DHT](#customizing-dht)
|
||||||
- [Customizing DHT](#customizing-dht)
|
- [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
|
||||||
- [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
|
- [Setup with Relay](#setup-with-relay)
|
||||||
- [Setup with Relay](#setup-with-relay)
|
- [Setup with Auto Relay](#setup-with-auto-relay)
|
||||||
- [Setup with Auto Relay](#setup-with-auto-relay)
|
- [Setup with Keychain](#setup-with-keychain)
|
||||||
- [Setup with Keychain](#setup-with-keychain)
|
- [Configuring Dialing](#configuring-dialing)
|
||||||
- [Configuring Dialing](#configuring-dialing)
|
- [Configuring Connection Manager](#configuring-connection-manager)
|
||||||
- [Configuring Connection Manager](#configuring-connection-manager)
|
- [Configuring Transport Manager](#configuring-transport-manager)
|
||||||
- [Configuring Transport Manager](#configuring-transport-manager)
|
- [Configuring Metrics](#configuring-metrics)
|
||||||
- [Configuring Metrics](#configuring-metrics)
|
- [Configuring PeerStore](#configuring-peerstore)
|
||||||
- [Configuring PeerStore](#configuring-peerstore)
|
- [Customizing Transports](#customizing-transports)
|
||||||
- [Customizing Transports](#customizing-transports)
|
- [Configuring the NAT Manager](#configuring-the-nat-manager)
|
||||||
- [Configuring the NAT Manager](#configuring-the-nat-manager)
|
- [Browser support](#browser-support)
|
||||||
- [Browser support](#browser-support)
|
- [UPnP and NAT-PMP](#upnp-and-nat-pmp)
|
||||||
- [UPnP and NAT-PMP](#upnp-and-nat-pmp)
|
- [Configuring protocol name](#configuring-protocol-name)
|
||||||
- [Configuration examples](#configuration-examples)
|
- [Configuration examples](#configuration-examples)
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
@ -210,7 +210,7 @@ const modules = {
|
|||||||
Moreover, the majority of the modules can be customized via option parameters. This way, it is also possible to provide this options through a `config` object. This config object should have the property name of each building block to configure, the same way as the modules specification.
|
Moreover, the majority of the modules can be customized via option parameters. This way, it is also possible to provide this options through a `config` object. This config object should have the property name of each building block to configure, the same way as the modules specification.
|
||||||
|
|
||||||
Besides the `modules` and `config`, libp2p allows other internal options and configurations:
|
Besides the `modules` and `config`, libp2p allows other internal options and configurations:
|
||||||
- `datastore`: an instance of [ipfs/interface-datastore](https://github.com/ipfs/interface-datastore/) modules.
|
- `datastore`: an instance of [ipfs/interface-datastore](https://github.com/ipfs/js-ipfs-interfaces/tree/master/packages/interface-datastore) modules.
|
||||||
- This is used in modules such as the DHT. If it is not provided, `js-libp2p` will use an in memory datastore.
|
- This is used in modules such as the DHT. If it is not provided, `js-libp2p` will use an in memory datastore.
|
||||||
- `peerId`: the identity of the node, an instance of [libp2p/js-peer-id](https://github.com/libp2p/js-peer-id).
|
- `peerId`: the identity of the node, an instance of [libp2p/js-peer-id](https://github.com/libp2p/js-peer-id).
|
||||||
- This is particularly useful if you want to reuse the same `peer-id`, as well as for modules like `libp2p-delegated-content-routing`, which need a `peer-id` in their instantiation.
|
- This is particularly useful if you want to reuse the same `peer-id`, as well as for modules like `libp2p-delegated-content-routing`, which need a `peer-id` in their instantiation.
|
||||||
@ -374,11 +374,7 @@ 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)
|
||||||
randomWalk: {
|
clientMode: false // Whether to run the WAN DHT in client or server mode (default: client mode)
|
||||||
enabled: true, // Allows to disable discovery (enabled by default)
|
|
||||||
interval: 300e3,
|
|
||||||
timeout: 10e3
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -501,7 +497,10 @@ const Libp2p = require('libp2p')
|
|||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('libp2p-noise')
|
||||||
const LevelStore = require('datastore-level')
|
const LevelDatastore = require('datastore-level')
|
||||||
|
|
||||||
|
const datastore = new LevelDatastore('path/to/store')
|
||||||
|
await datastore.open()
|
||||||
|
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
modules: {
|
modules: {
|
||||||
@ -511,7 +510,7 @@ const node = await Libp2p.create({
|
|||||||
},
|
},
|
||||||
keychain: {
|
keychain: {
|
||||||
pass: 'notsafepassword123456789',
|
pass: 'notsafepassword123456789',
|
||||||
datastore: new LevelStore('path/to/store')
|
datastore: dsInstant,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -525,6 +524,7 @@ Dialing in libp2p can be configured to limit the rate of dialing, and how long d
|
|||||||
| Name | Type | Description |
|
| Name | Type | Description |
|
||||||
|------|------|-------------|
|
|------|------|-------------|
|
||||||
| maxParallelDials | `number` | How many multiaddrs we can dial in parallel. |
|
| maxParallelDials | `number` | How many multiaddrs we can dial in parallel. |
|
||||||
|
| maxAddrsToDial | `number` | How many multiaddrs is the dial allowed to dial for a single peer. |
|
||||||
| maxDialsPerPeer | `number` | How many multiaddrs we can dial per peer, in parallel. |
|
| maxDialsPerPeer | `number` | How many multiaddrs we can dial per peer, in parallel. |
|
||||||
| dialTimeout | `number` | Second dial timeout per peer in ms. |
|
| dialTimeout | `number` | Second dial timeout per peer in ms. |
|
||||||
| resolvers | `object` | Dial [Resolvers](https://github.com/multiformats/js-multiaddr/blob/master/src/resolvers/index.js) for resolving multiaddrs |
|
| resolvers | `object` | Dial [Resolvers](https://github.com/multiformats/js-multiaddr/blob/master/src/resolvers/index.js) for resolving multiaddrs |
|
||||||
@ -549,6 +549,7 @@ const node = await Libp2p.create({
|
|||||||
},
|
},
|
||||||
dialer: {
|
dialer: {
|
||||||
maxParallelDials: 100,
|
maxParallelDials: 100,
|
||||||
|
maxAddrsToDial: 25,
|
||||||
maxDialsPerPeer: 4,
|
maxDialsPerPeer: 4,
|
||||||
dialTimeout: 30e3,
|
dialTimeout: 30e3,
|
||||||
resolvers: {
|
resolvers: {
|
||||||
@ -671,8 +672,10 @@ const Libp2p = require('libp2p')
|
|||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('libp2p-noise')
|
||||||
|
const LevelDatastore = require('datastore-level')
|
||||||
|
|
||||||
const LevelStore = require('datastore-level')
|
const datastore = new LevelDatastore('path/to/store')
|
||||||
|
const dsInstant = await datastore.open()
|
||||||
|
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
modules: {
|
modules: {
|
||||||
@ -680,7 +683,7 @@ const node = await Libp2p.create({
|
|||||||
streamMuxer: [MPLEX],
|
streamMuxer: [MPLEX],
|
||||||
connEncryption: [NOISE]
|
connEncryption: [NOISE]
|
||||||
},
|
},
|
||||||
datastore: new LevelStore('path/to/store'),
|
datastore: dsInstant,
|
||||||
peerStore: {
|
peerStore: {
|
||||||
persistence: true,
|
persistence: true,
|
||||||
threshold: 5
|
threshold: 5
|
||||||
@ -779,6 +782,26 @@ By default under nodejs libp2p will attempt to use [UPnP](https://en.wikipedia.o
|
|||||||
|
|
||||||
[NAT-PMP](http://miniupnp.free.fr/nat-pmp.html) is a feature of some modern routers which performs a similar job to UPnP. NAT-PMP is disabled by default, if enabled libp2p will try to use NAT-PMP and will fall back to UPnP if it fails.
|
[NAT-PMP](http://miniupnp.free.fr/nat-pmp.html) is a feature of some modern routers which performs a similar job to UPnP. NAT-PMP is disabled by default, if enabled libp2p will try to use NAT-PMP and will fall back to UPnP if it fails.
|
||||||
|
|
||||||
|
#### Configuring protocol name
|
||||||
|
|
||||||
|
Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes.
|
||||||
|
|
||||||
|
```js
|
||||||
|
const node = await Libp2p.create({
|
||||||
|
config: {
|
||||||
|
protocolPrefix: 'ipfs' // default
|
||||||
|
}
|
||||||
|
})
|
||||||
|
/*
|
||||||
|
protocols: [
|
||||||
|
"/ipfs/id/1.0.0", // identify service protocol (if we have multiplexers)
|
||||||
|
"/ipfs/id/push/1.0.0", // identify service push protocol (if we have multiplexers)
|
||||||
|
"/ipfs/ping/1.0.0", // built-in ping protocol
|
||||||
|
]
|
||||||
|
*/
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## Configuration examples
|
## Configuration examples
|
||||||
|
|
||||||
As libp2p is designed to be a modular networking library, its usage will vary based on individual project needs. We've included links to some existing project configurations for your reference, in case you wish to replicate their configuration:
|
As libp2p is designed to be a modular networking library, its usage will vary based on individual project needs. We've included links to some existing project configurations for your reference, in case you wish to replicate their configuration:
|
||||||
|
36
doc/migrations/v0.31-v0.32.md
Normal file
36
doc/migrations/v0.31-v0.32.md
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<!--Specify versions for migration below-->
|
||||||
|
# Migrating to libp2p@32
|
||||||
|
|
||||||
|
A migration guide for refactoring your application code from libp2p v0.31.x to v0.32.0.
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [Module Updates](#module-updates)
|
||||||
|
|
||||||
|
## Module Updates
|
||||||
|
|
||||||
|
With this release you should update the following libp2p modules if you are relying on them:
|
||||||
|
|
||||||
|
<!--Specify module versions in JSON for migration below.
|
||||||
|
It's recommended to check package.json changes for this:
|
||||||
|
`git diff <release> <prev> -- package.json`
|
||||||
|
-->
|
||||||
|
|
||||||
|
```json
|
||||||
|
"libp2p-bootstrap": "^0.13.0",
|
||||||
|
"libp2p-crypto": "^0.19.4",
|
||||||
|
"libp2p-interfaces": "^1.0.0",
|
||||||
|
"libp2p-delegated-content-routing": "^0.11.0",
|
||||||
|
"libp2p-delegated-peer-routing": "^0.10.0",
|
||||||
|
"libp2p-floodsub": "^0.27.0",
|
||||||
|
"libp2p-gossipsub": "^0.11.0",
|
||||||
|
"libp2p-kad-dht": "^0.23.0",
|
||||||
|
"libp2p-mdns": "^0.17.0",
|
||||||
|
"libp2p-noise": "^4.0.0",
|
||||||
|
"libp2p-tcp": "^0.17.0",
|
||||||
|
"libp2p-webrtc-direct": "^0.7.0",
|
||||||
|
"libp2p-webrtc-star": "^0.23.0",
|
||||||
|
"libp2p-websockets": "^0.16.0"
|
||||||
|
```
|
||||||
|
|
||||||
|
One of the main changes in this new release is the update to `multiaddr@10.0.0`. This should also be updated in upstream projects to avoid several multiaddr versions in the bundle and to avoid potential problems when libp2p interacts with provided outdated multiaddr instances.
|
14
doc/migrations/v0.32-v0.33.md
Normal file
14
doc/migrations/v0.32-v0.33.md
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<!--Specify versions for migration below-->
|
||||||
|
# Migrating to libp2p@33
|
||||||
|
|
||||||
|
A migration guide for refactoring your application code from libp2p v0.32.x to v0.33.0.
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [Module Updates](#module-updates)
|
||||||
|
|
||||||
|
## Module Updates
|
||||||
|
|
||||||
|
Libp2p uses a datastore implementation for Peerstore persistence and for the DHT state. While libp2p defaults to a datastore implementation, it can receive any implementation of a datastore compliant with the [interface-datastore](https://github.com/ipfs/js-ipfs-interfaces/tree/master/packages/interface-datastore) via its configuration.
|
||||||
|
|
||||||
|
In this release, we updated to `interface-datastore@6.0.0`. As a result, libp2p users relying on a configured datastore should update it to a compliant implementation for updating libp2p.
|
@ -18,7 +18,7 @@ The relay node will need to have its relay subsystem enabled, as well as its HOP
|
|||||||
```js
|
```js
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
@ -76,7 +76,7 @@ One of the typical use cases for Auto Relay is nodes behind a NAT or browser nod
|
|||||||
```js
|
```js
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const relayAddr = process.argv[2]
|
const relayAddr = process.argv[2]
|
||||||
@ -125,7 +125,7 @@ As you can see in the code, we need to provide the relay address, `relayAddr`, a
|
|||||||
You should now run the following to start the node running Auto Relay:
|
You should now run the following to start the node running Auto Relay:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
node listener.js /ip4/192.168.1.120/tcp/58941/ws/p2p/QmQKCBm87HQMbFqy14oqC85pMmnRrj6iD46ggM6reqNpsd
|
node listener.js /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
|
||||||
```
|
```
|
||||||
|
|
||||||
This should print out something similar to the following:
|
This should print out something similar to the following:
|
||||||
@ -147,7 +147,7 @@ Now that you have a relay node and a node bound to that relay, you can test conn
|
|||||||
```js
|
```js
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const autoRelayNodeAddr = process.argv[2]
|
const autoRelayNodeAddr = process.argv[2]
|
||||||
@ -173,7 +173,7 @@ console.log(`Connected to the auto relay node via ${conn.remoteAddr.toString()}`
|
|||||||
You should now run the following to start the relay node using the listen address from step 2:
|
You should now run the following to start the relay node using the listen address from step 2:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
node dialer.js /ip4/192.168.1.120/tcp/58941/ws/p2p/QmQKCBm87HQMbFqy14oqC85pMmnRrj6iD46ggM6reqNpsd
|
node dialer.js /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
|
||||||
```
|
```
|
||||||
|
|
||||||
Once you start your test node, it should print out something similar to the following:
|
Once you start your test node, it should print out something similar to the following:
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
async function main () {
|
async function main () {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
async function main () {
|
async function main () {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const Websockets = require('libp2p-websockets')
|
const Websockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
async function main () {
|
async function main () {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
function startProcess (name, args = []) {
|
function startProcess (name, args = []) {
|
||||||
return execa('node', [path.join(__dirname, name), ...args], {
|
return execa('node', [path.join(__dirname, name), ...args], {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const WS = require('libp2p-websockets')
|
const WS = require('libp2p-websockets')
|
||||||
const mplex = require('libp2p-mplex')
|
const mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const defaultsDeep = require('@nodeutils/defaults-deep')
|
const defaultsDeep = require('@nodeutils/defaults-deep')
|
||||||
const libp2p = require('../../..')
|
const libp2p = require('../../..')
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
function startProcess(name) {
|
function startProcess(name) {
|
||||||
return execa('node', [path.join(__dirname, name)], {
|
return execa('node', [path.join(__dirname, name)], {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Libp2p = require('../..')
|
const Libp2p = require('../..')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
|
|
||||||
|
@ -8,13 +8,13 @@ A byproduct of having these encrypted communications modules is that we can auth
|
|||||||
|
|
||||||
# 1. Set up encrypted communications
|
# 1. Set up encrypted communications
|
||||||
|
|
||||||
We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `libp2p-noise` module to complete it, go ahead and `npm install libp2p-noise`.
|
We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `@chainsafe/libp2p-noise` module to complete it, go ahead and `npm install @chainsafe/libp2p-noise`.
|
||||||
|
|
||||||
To add them to your libp2p configuration, all you have to do is:
|
To add them to your libp2p configuration, all you have to do is:
|
||||||
|
|
||||||
```JavaScript
|
```JavaScript
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const createNode = () => {
|
const createNode = () => {
|
||||||
return Libp2p.create({
|
return Libp2p.create({
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const messageReceived = pDefer()
|
const messageReceived = pDefer()
|
||||||
|
@ -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.14.12",
|
"libp2p-kad-dht": "^0.26.5",
|
||||||
"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",
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Bootstrap = require('libp2p-bootstrap')
|
const Bootstrap = require('libp2p-bootstrap')
|
||||||
|
|
||||||
const bootstrapers = require('./bootstrapers')
|
const bootstrapers = require('./bootstrapers')
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MulticastDNS = require('libp2p-mdns')
|
const MulticastDNS = require('libp2p-mdns')
|
||||||
|
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Gossipsub = require('libp2p-gossipsub')
|
const Gossipsub = require('libp2p-gossipsub')
|
||||||
const Bootstrap = require('libp2p-bootstrap')
|
const Bootstrap = require('libp2p-bootstrap')
|
||||||
const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
|
const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
|
||||||
|
@ -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,8 +144,13 @@ const [node1, node2] = await Promise.all([
|
|||||||
createNode()
|
createNode()
|
||||||
])
|
])
|
||||||
|
|
||||||
node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
|
node1.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
|
||||||
node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
|
node2.on('peer:discovery', (peer) => console.log('Discovered:', peerId.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.
|
||||||
@ -168,7 +173,7 @@ You can create your libp2p nodes as follows:
|
|||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Gossipsub = require('libp2p-gossipsub')
|
const Gossipsub = require('libp2p-gossipsub')
|
||||||
const Bootstrap = require('libp2p-bootstrap')
|
const Bootstrap = require('libp2p-bootstrap')
|
||||||
const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
|
const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
const bootstrapers = require('./bootstrapers')
|
const bootstrapers = require('./bootstrapers')
|
||||||
|
|
||||||
const discoveredCopy = 'Discovered:'
|
const discoveredCopy = 'Discovered:'
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const discoveredCopy = 'Discovered:'
|
const discoveredCopy = 'Discovered:'
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const discoveredCopy = 'discovered:'
|
const discoveredCopy = 'discovered:'
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const WS = require('libp2p-websockets')
|
const WS = require('libp2p-websockets')
|
||||||
const mplex = require('libp2p-mplex')
|
const mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const defaultsDeep = require('@nodeutils/defaults-deep')
|
const defaultsDeep = require('@nodeutils/defaults-deep')
|
||||||
const libp2p = require('../../..')
|
const libp2p = require('../../..')
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
function startProcess(name) {
|
function startProcess(name) {
|
||||||
return execa('node', [path.join(__dirname, name)], {
|
return execa('node', [path.join(__dirname, name)], {
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<pre id="output"></pre>
|
<pre id="output"></pre>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<script src="./index.js"></script>
|
<script type="module" src="./index.js"></script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import 'babel-polyfill'
|
|||||||
import Libp2p from 'libp2p'
|
import Libp2p from 'libp2p'
|
||||||
import Websockets from 'libp2p-websockets'
|
import Websockets from 'libp2p-websockets'
|
||||||
import WebRTCStar from 'libp2p-webrtc-star'
|
import WebRTCStar from 'libp2p-webrtc-star'
|
||||||
import { NOISE } from 'libp2p-noise'
|
import { NOISE } from '@chainsafe/libp2p-noise'
|
||||||
import Mplex from 'libp2p-mplex'
|
import Mplex from 'libp2p-mplex'
|
||||||
import Bootstrap from 'libp2p-bootstrap'
|
import Bootstrap from 'libp2p-bootstrap'
|
||||||
|
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
"name": "libp2p-in-browser",
|
"name": "libp2p-in-browser",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "A libp2p node running in the browser",
|
"description": "A libp2p node running in the browser",
|
||||||
"main": "dist/index.html",
|
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 2 Chrome versions"
|
"last 2 Chrome versions"
|
||||||
],
|
],
|
||||||
@ -17,11 +16,11 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/preset-env": "^7.13.0",
|
"@babel/preset-env": "^7.13.0",
|
||||||
"libp2p": "../../",
|
"libp2p": "../../",
|
||||||
"libp2p-bootstrap": "^0.12.1",
|
"libp2p-bootstrap": "^0.13.0",
|
||||||
"libp2p-mplex": "^0.10.0",
|
"libp2p-mplex": "^0.10.4",
|
||||||
"libp2p-noise": "^2.0.0",
|
"@chainsafe/libp2p-noise": "^4.1.0",
|
||||||
"libp2p-webrtc-star": "^0.22.0",
|
"libp2p-webrtc-star": "^0.23.0",
|
||||||
"libp2p-websockets": "^0.15.0"
|
"libp2p-websockets": "^0.16.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "^7.13.10",
|
"@babel/cli": "^7.13.10",
|
||||||
@ -29,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": "next"
|
"parcel": "^2.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ async function run() {
|
|||||||
)
|
)
|
||||||
await browser.close();
|
await browser.close();
|
||||||
|
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -10,10 +10,12 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"execa": "^2.1.0",
|
"execa": "^2.1.0",
|
||||||
"fs-extra": "^8.1.0",
|
"fs-extra": "^8.1.0",
|
||||||
|
"libp2p": "../src",
|
||||||
"libp2p-pubsub-peer-discovery": "^4.0.0",
|
"libp2p-pubsub-peer-discovery": "^4.0.0",
|
||||||
"libp2p-relay-server": "^0.2.0",
|
"libp2p-relay-server": "^0.3.0",
|
||||||
"libp2p-gossipsub": "^0.9.1",
|
"libp2p-gossipsub": "^0.11.0",
|
||||||
"p-defer": "^3.0.0",
|
"p-defer": "^3.0.0",
|
||||||
|
"uint8arrays": "^3.0.0",
|
||||||
"which": "^2.0.1"
|
"which": "^2.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const KadDHT = require('libp2p-kad-dht')
|
const KadDHT = require('libp2p-kad-dht')
|
||||||
|
|
||||||
const delay = require('delay')
|
const delay = require('delay')
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const CID = require('cids')
|
const { CID } = require('multiformats/cid')
|
||||||
const KadDHT = require('libp2p-kad-dht')
|
const KadDHT = require('libp2p-kad-dht')
|
||||||
|
|
||||||
const all = require('it-all')
|
const all = require('it-all')
|
||||||
@ -51,10 +51,10 @@ const createNode = async () => {
|
|||||||
// Wait for onConnect handlers in the DHT
|
// Wait for onConnect handlers in the DHT
|
||||||
await delay(100)
|
await delay(100)
|
||||||
|
|
||||||
const cid = new CID('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
|
const cid = CID.parse('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
|
||||||
await node1.contentRouting.provide(cid)
|
await node1.contentRouting.provide(cid)
|
||||||
|
|
||||||
console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toBaseEncodedString())
|
console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toString())
|
||||||
|
|
||||||
// wait for propagation
|
// wait for propagation
|
||||||
await delay(300)
|
await delay(300)
|
||||||
|
@ -81,7 +81,7 @@ Instead of calling `peerRouting.findPeer`, we will use `contentRouting.provide`
|
|||||||
|
|
||||||
```JavaScript
|
```JavaScript
|
||||||
await node1.contentRouting.provide(cid)
|
await node1.contentRouting.provide(cid)
|
||||||
console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toBaseEncodedString())
|
console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toString())
|
||||||
|
|
||||||
const provs = await all(node3.contentRouting.findProviders(cid, { timeout: 5000 }))
|
const provs = await all(node3.contentRouting.findProviders(cid, { timeout: 5000 }))
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test() {
|
async function test() {
|
||||||
process.stdout.write('1.js\n')
|
process.stdout.write('1.js\n')
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const providedCopy = 'is providing'
|
const providedCopy = 'is providing'
|
||||||
const foundCopy = 'Found provider:'
|
const foundCopy = 'Found provider:'
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Protector = require('libp2p/src/pnet')
|
const Protector = require('libp2p/src/pnet')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const messageReceived = pDefer()
|
const messageReceived = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test() {
|
async function test() {
|
||||||
const messageDefer = pDefer()
|
const messageDefer = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const messages = [
|
const messages = [
|
||||||
'protocol (a)',
|
'protocol (a)',
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pWaitFor = require('p-wait-for')
|
const pWaitFor = require('p-wait-for')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const messages = [
|
const messages = [
|
||||||
'from 1 to 2',
|
'from 1 to 2',
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
const Libp2p = require('../../')
|
const Libp2p = require('../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Gossipsub = require('libp2p-gossipsub')
|
const Gossipsub = require('libp2p-gossipsub')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
@ -41,13 +41,13 @@ const createNode = async () => {
|
|||||||
node1.pubsub.on(topic, (msg) => {
|
node1.pubsub.on(topic, (msg) => {
|
||||||
console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
|
console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
|
||||||
})
|
})
|
||||||
await node1.pubsub.subscribe(topic)
|
node1.pubsub.subscribe(topic)
|
||||||
|
|
||||||
// Will not receive own published messages by default
|
// Will not receive own published messages by default
|
||||||
node2.pubsub.on(topic, (msg) => {
|
node2.pubsub.on(topic, (msg) => {
|
||||||
console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
|
console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
|
||||||
})
|
})
|
||||||
await node2.pubsub.subscribe(topic)
|
node2.pubsub.subscribe(topic)
|
||||||
|
|
||||||
// node2 publishes "news" every second
|
// node2 publishes "news" every second
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
|
@ -4,10 +4,10 @@
|
|||||||
const Libp2p = require('../../../')
|
const Libp2p = require('../../../')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Gossipsub = require('libp2p-gossipsub')
|
const Gossipsub = require('libp2p-gossipsub')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
const stdout = [
|
const stdout = [
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const defer = pDefer()
|
const defer = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
const Libp2p = require('../..')
|
const Libp2p = require('../..')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
const Libp2p = require('../..')
|
const Libp2p = require('../..')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../..')
|
const Libp2p = require('../..')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const WebSockets = require('libp2p-websockets')
|
const WebSockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const pipe = require('it-pipe')
|
const pipe = require('it-pipe')
|
||||||
@ -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 (err) {
|
} catch (/** @type {any} */ 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)
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const Libp2p = require('../..')
|
const Libp2p = require('../..')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const WebSockets = require('libp2p-websockets')
|
const WebSockets = require('libp2p-websockets')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const MPLEX = require('libp2p-mplex')
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
@ -13,7 +13,7 @@ When using libp2p, you need properly configure it, that is, pick your set of mod
|
|||||||
You will need 4 dependencies total, so go ahead and install all of them with:
|
You will need 4 dependencies total, so go ahead and install all of them with:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
> npm install libp2p libp2p-tcp libp2p-noise
|
> npm install libp2p libp2p-tcp @chainsafe/libp2p-noise
|
||||||
```
|
```
|
||||||
|
|
||||||
Then, in your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.
|
Then, in your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.
|
||||||
@ -25,7 +25,7 @@ First thing is to create our own libp2p node! Insert:
|
|||||||
|
|
||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
|
||||||
const createNode = async () => {
|
const createNode = async () => {
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
@ -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({
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const deferStarted = pDefer()
|
const deferStarted = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const defer = pDefer()
|
const defer = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const deferNode1 = pDefer()
|
const deferNode1 = pDefer()
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
async function test () {
|
async function test () {
|
||||||
const deferNode1 = pDefer()
|
const deferNode1 = pDefer()
|
||||||
|
@ -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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
if (!err.killed) {
|
if (!err.killed) {
|
||||||
throw err
|
throw err
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ import 'babel-polyfill'
|
|||||||
const Libp2p = require('libp2p')
|
const Libp2p = require('libp2p')
|
||||||
const WebRTCDirect = require('libp2p-webrtc-direct')
|
const WebRTCDirect = require('libp2p-webrtc-direct')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const {NOISE} = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const Bootstrap = require('libp2p-bootstrap')
|
const Bootstrap = require('libp2p-bootstrap')
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', async () => {
|
document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
@ -12,6 +12,6 @@
|
|||||||
<main>
|
<main>
|
||||||
<pre id="output"></pre>
|
<pre id="output"></pre>
|
||||||
</main>
|
</main>
|
||||||
<script src="./dialer.js"></script>
|
<script src="./dialer.js" type="module"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -2,7 +2,7 @@ const Libp2p = require('libp2p')
|
|||||||
const Bootstrap = require('libp2p-bootstrap')
|
const Bootstrap = require('libp2p-bootstrap')
|
||||||
const WebRTCDirect = require('libp2p-webrtc-direct')
|
const WebRTCDirect = require('libp2p-webrtc-direct')
|
||||||
const Mplex = require('libp2p-mplex')
|
const Mplex = require('libp2p-mplex')
|
||||||
const {NOISE} = require('libp2p-noise')
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
;(async () => {
|
;(async () => {
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
"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",
|
||||||
@ -16,16 +15,16 @@
|
|||||||
"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-bundler": "1.12.3",
|
"parcel": "^2.0.1",
|
||||||
"util": "^0.12.3"
|
"util": "^0.12.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"libp2p": "../../",
|
"libp2p": "../../",
|
||||||
"libp2p-bootstrap": "^0.12.1",
|
"libp2p-bootstrap": "^0.13.0",
|
||||||
"libp2p-mplex": "^0.10.1",
|
"libp2p-mplex": "^0.10.4",
|
||||||
"libp2p-noise": "^2.0.1",
|
"@chainsafe/libp2p-noise": "^4.1.0",
|
||||||
"libp2p-webrtc-direct": "^0.6.0",
|
"libp2p-webrtc-direct": "^0.7.0",
|
||||||
"peer-id": "^0.14.3"
|
"peer-id": "^0.16.0"
|
||||||
},
|
},
|
||||||
"browser": {
|
"browser": {
|
||||||
"ipfs": "ipfs/dist/index.min.js"
|
"ipfs": "ipfs/dist/index.min.js"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const execa = require('execa')
|
const execa = require('execa')
|
||||||
const pDefer = require('p-defer')
|
const pDefer = require('p-defer')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
const { chromium } = require('playwright');
|
const { chromium } = require('playwright');
|
||||||
|
|
||||||
function startNode (name, args = []) {
|
function startNode (name, args = []) {
|
||||||
@ -72,7 +72,7 @@ async function test () {
|
|||||||
{ timeout: 10000 }
|
{ timeout: 10000 }
|
||||||
)
|
)
|
||||||
await browser.close();
|
await browser.close();
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -44,10 +44,10 @@
|
|||||||
|
|
||||||
"utilities",
|
"utilities",
|
||||||
["libp2p/js-libp2p-crypto", "libp2p-crypto"],
|
["libp2p/js-libp2p-crypto", "libp2p-crypto"],
|
||||||
["libp2p/js-libp2p-crypto-secp256k1", "libp2p-crypto-secp256k1"],
|
|
||||||
|
|
||||||
"data types",
|
"data types",
|
||||||
["libp2p/js-peer-id", "peer-id"],
|
["libp2p/js-peer-id", "peer-id"],
|
||||||
|
["libp2p/js-libp2p-record", "libp2p-record"],
|
||||||
|
|
||||||
"pubsub",
|
"pubsub",
|
||||||
["libp2p/js-libp2p-floodsub", "libp2p-floodsub"],
|
["libp2p/js-libp2p-floodsub", "libp2p-floodsub"],
|
||||||
|
118
package.json
118
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p",
|
"name": "libp2p",
|
||||||
"version": "0.31.7",
|
"version": "0.35.5",
|
||||||
"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,6 +41,7 @@
|
|||||||
"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",
|
||||||
@ -65,33 +66,33 @@
|
|||||||
"homepage": "https://libp2p.io",
|
"homepage": "https://libp2p.io",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14.0.0"
|
"node": ">=15.0.0"
|
||||||
},
|
},
|
||||||
"browser": {
|
"browser": {
|
||||||
"@motrix/nat-api": false
|
"nat-api": false
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": "ipfs",
|
"extends": "ipfs",
|
||||||
"ignorePatterns": [
|
"ignorePatterns": [
|
||||||
"!.aegir.js",
|
"!.aegir.js",
|
||||||
"test/ts-use"
|
"test/ts-use",
|
||||||
|
"*.d.ts"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@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",
|
||||||
"cids": "^1.1.5",
|
|
||||||
"class-is": "^1.1.0",
|
"class-is": "^1.1.0",
|
||||||
"debug": "^4.3.1",
|
"debug": "^4.3.1",
|
||||||
"err-code": "^3.0.0",
|
"err-code": "^3.0.0",
|
||||||
"es6-promisify": "^6.1.1",
|
"es6-promisify": "^7.0.0",
|
||||||
"events": "^3.3.0",
|
"events": "^3.3.0",
|
||||||
"hashlru": "^2.3.0",
|
"hashlru": "^2.3.0",
|
||||||
"interface-datastore": "^4.0.0",
|
"interface-datastore": "^6.0.2",
|
||||||
"it-all": "^1.0.4",
|
"it-all": "^1.0.4",
|
||||||
"it-buffer": "^0.1.2",
|
"it-buffer": "^0.1.2",
|
||||||
"it-drain": "^1.0.3",
|
"it-drain": "^1.0.3",
|
||||||
@ -100,77 +101,78 @@
|
|||||||
"it-handshake": "^2.0.0",
|
"it-handshake": "^2.0.0",
|
||||||
"it-length-prefixed": "^5.0.2",
|
"it-length-prefixed": "^5.0.2",
|
||||||
"it-map": "^1.0.4",
|
"it-map": "^1.0.4",
|
||||||
"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.19.4",
|
"libp2p-crypto": "^0.21.0",
|
||||||
"libp2p-interfaces": "^0.10.4",
|
"libp2p-interfaces": "^2.0.1",
|
||||||
"libp2p-utils": "^0.3.1",
|
"libp2p-utils": "^0.4.0",
|
||||||
"mafmt": "^9.0.0",
|
"mafmt": "^10.0.0",
|
||||||
"merge-options": "^3.0.4",
|
"merge-options": "^3.0.4",
|
||||||
"multiaddr": "^9.0.1",
|
"multiaddr": "^10.0.0",
|
||||||
"multicodec": "^3.0.1",
|
"multiformats": "^9.0.0",
|
||||||
"multihashing-async": "^2.1.2",
|
|
||||||
"multistream-select": "^2.0.0",
|
"multistream-select": "^2.0.0",
|
||||||
"mutable-proxy": "^1.0.0",
|
"mutable-proxy": "^1.0.0",
|
||||||
|
"nat-api": "^0.3.1",
|
||||||
"node-forge": "^0.10.0",
|
"node-forge": "^0.10.0",
|
||||||
"p-any": "^3.0.0",
|
"p-any": "^3.0.0",
|
||||||
"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.14.2",
|
"peer-id": "^0.16.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": "^5.0.2",
|
"streaming-iterables": "^6.0.0",
|
||||||
"timeout-abort-controller": "^1.1.1",
|
"timeout-abort-controller": "^2.0.0",
|
||||||
|
"uint8arrays": "^3.0.0",
|
||||||
"varint": "^6.0.0",
|
"varint": "^6.0.0",
|
||||||
"wherearewe": "^1.0.0",
|
"wherearewe": "^1.0.0",
|
||||||
"xsalsa20": "^1.1.0"
|
"xsalsa20": "^1.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@chainsafe/libp2p-noise": "^5.0.0",
|
||||||
"@nodeutils/defaults-deep": "^1.1.0",
|
"@nodeutils/defaults-deep": "^1.1.0",
|
||||||
"@types/es6-promisify": "^6.0.0",
|
"@types/es6-promisify": "^6.0.0",
|
||||||
"@types/node-forge": "^0.9.7",
|
"@types/node": "^16.0.1",
|
||||||
|
"@types/node-forge": "^0.10.1",
|
||||||
"@types/varint": "^6.0.0",
|
"@types/varint": "^6.0.0",
|
||||||
"abortable-iterator": "^3.0.0",
|
"aegir": "^36.0.0",
|
||||||
"aegir": "^33.1.1",
|
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
|
"datastore-core": "^6.0.7",
|
||||||
"delay": "^5.0.0",
|
"delay": "^5.0.0",
|
||||||
"interop-libp2p": "^0.4.0",
|
|
||||||
"into-stream": "^6.0.0",
|
"into-stream": "^6.0.0",
|
||||||
"ipfs-http-client": "^50.1.1",
|
"ipfs-http-client": "^54.0.2",
|
||||||
"it-concat": "^1.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.12.3",
|
"libp2p-bootstrap": "^0.14.0",
|
||||||
"libp2p-delegated-content-routing": "^0.10.0",
|
"libp2p-delegated-content-routing": "^0.11.0",
|
||||||
"libp2p-delegated-peer-routing": "^0.9.0",
|
"libp2p-delegated-peer-routing": "^0.11.1",
|
||||||
"libp2p-floodsub": "^0.25.0",
|
"libp2p-floodsub": "^0.27.0",
|
||||||
"libp2p-gossipsub": "^0.9.0",
|
"libp2p-gossipsub": "^0.12.1",
|
||||||
"libp2p-kad-dht": "^0.22.0",
|
"libp2p-interfaces-compliance-tests": "^2.0.1",
|
||||||
"libp2p-mdns": "^0.16.0",
|
"libp2p-interop": "^0.5.0",
|
||||||
|
"libp2p-kad-dht": "^0.27.1",
|
||||||
|
"libp2p-mdns": "^0.18.0",
|
||||||
"libp2p-mplex": "^0.10.1",
|
"libp2p-mplex": "^0.10.1",
|
||||||
"libp2p-noise": "^3.0.0",
|
"libp2p-tcp": "^0.17.0",
|
||||||
"libp2p-tcp": "^0.15.4",
|
"libp2p-webrtc-star": "^0.25.0",
|
||||||
"libp2p-webrtc-star": "^0.22.2",
|
"libp2p-websockets": "^0.16.0",
|
||||||
"libp2p-websockets": "^0.15.8",
|
|
||||||
"multihashes": "^4.0.2",
|
|
||||||
"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": "^10.0.0",
|
"sinon": "^12.0.1",
|
||||||
"uint8arrays": "^2.1.3",
|
|
||||||
"util": "^0.12.3"
|
"util": "^0.12.3"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"David Dias <daviddias.p@gmail.com>",
|
|
||||||
"Vasco Santos <vasco.santos@moxy.studio>",
|
"Vasco Santos <vasco.santos@moxy.studio>",
|
||||||
|
"David Dias <daviddias.p@gmail.com>",
|
||||||
"Jacob Heun <jacobheun@gmail.com>",
|
"Jacob Heun <jacobheun@gmail.com>",
|
||||||
"Alex Potsides <alex@achingbrain.net>",
|
"Alex Potsides <alex@achingbrain.net>",
|
||||||
"Alan Shaw <alan@tableflip.io>",
|
"Alan Shaw <alan@tableflip.io>",
|
||||||
@ -180,30 +182,42 @@
|
|||||||
"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>",
|
"dirkmc <dirkmdev@gmail.com>",
|
||||||
|
"Chris Dostert <chrisdostert@users.noreply.github.com>",
|
||||||
"Volker Mische <volker.mische@gmail.com>",
|
"Volker Mische <volker.mische@gmail.com>",
|
||||||
|
"Robert Kiel <robert.kiel@hoprnet.org>",
|
||||||
"Richard Littauer <richard.littauer@gmail.com>",
|
"Richard Littauer <richard.littauer@gmail.com>",
|
||||||
"Ryan Bell <ryan@piing.net>",
|
"zeim839 <50573884+zeim839@users.noreply.github.com>",
|
||||||
"a1300 <matthias-knopp@gmx.net>",
|
"a1300 <matthias-knopp@gmx.net>",
|
||||||
|
"Ryan Bell <ryan@piing.net>",
|
||||||
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
||||||
"Samlior <samlior@foxmail.com>",
|
|
||||||
"Andrew Nesbitt <andrewnez@gmail.com>",
|
"Andrew Nesbitt <andrewnez@gmail.com>",
|
||||||
"Thomas Eizinger <thomas@eizinger.io>",
|
|
||||||
"Franck Royer <franck@royer.one>",
|
"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>",
|
||||||
|
"Alan Smithee <ggnore.alan.smithee@gmail.com>",
|
||||||
"Elven <mon.samuel@qq.com>",
|
"Elven <mon.samuel@qq.com>",
|
||||||
|
"Samlior <samlior@foxmail.com>",
|
||||||
"Didrik Nordström <didrik.nordstrom@gmail.com>",
|
"Didrik Nordström <didrik.nordstrom@gmail.com>",
|
||||||
"RasmusErik Voel Jensen <github@solsort.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>",
|
||||||
"Yusef Napora <yusef@napora.org>",
|
"Yusef Napora <yusef@napora.org>",
|
||||||
"Zane Starr <zcstarr@gmail.com>",
|
"Zane Starr <zcstarr@gmail.com>",
|
||||||
"ebinks <elizabethjbinks@gmail.com>",
|
"ebinks <elizabethjbinks@gmail.com>",
|
||||||
|
"Aditya Bose <13054902+adbose@users.noreply.github.com>",
|
||||||
"isan_rivkin <isanrivkin@gmail.com>",
|
"isan_rivkin <isanrivkin@gmail.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>",
|
||||||
"robertkiel <robert.kiel@validitylabs.org>",
|
"robertkiel <robert.kiel@validitylabs.org>",
|
||||||
|
"shresthagrawal <34920931+shresthagrawal@users.noreply.github.com>",
|
||||||
|
"swedneck <40505480+swedneck@users.noreply.github.com>",
|
||||||
|
"greenSnot <greenSnot@users.noreply.github.com>",
|
||||||
"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>",
|
||||||
@ -216,14 +230,24 @@
|
|||||||
"Felipe Martins <felipebrasil93@gmail.com>",
|
"Felipe Martins <felipebrasil93@gmail.com>",
|
||||||
"Florian-Merle <florian.david.merle@gmail.com>",
|
"Florian-Merle <florian.david.merle@gmail.com>",
|
||||||
"Francis Gulotta <wizard@roborooter.com>",
|
"Francis Gulotta <wizard@roborooter.com>",
|
||||||
|
"Guy Sviry <32539816+guysv@users.noreply.github.com>",
|
||||||
"Henrique Dias <hacdias@gmail.com>",
|
"Henrique Dias <hacdias@gmail.com>",
|
||||||
"Irakli Gozalishvili <rfobic@gmail.com>",
|
"Irakli Gozalishvili <rfobic@gmail.com>",
|
||||||
"Joel Gustafson <joelg@mit.edu>",
|
"Joel Gustafson <joelg@mit.edu>",
|
||||||
|
"John Rees <johnrees@users.noreply.github.com>",
|
||||||
|
"João Santos <joaosantos15@users.noreply.github.com>",
|
||||||
"Julien Bouquillon <contact@revolunet.com>",
|
"Julien Bouquillon <contact@revolunet.com>",
|
||||||
"Kevin Kwok <antimatter15@gmail.com>",
|
"Kevin Kwok <antimatter15@gmail.com>",
|
||||||
"Kevin Lacker <lacker@gmail.com>",
|
"Kevin Lacker <lacker@gmail.com>",
|
||||||
|
"Lars Gierth <lgierth@users.noreply.github.com>",
|
||||||
|
"Leask Wong <i@leaskh.com>",
|
||||||
|
"Marcin Tojek <mtojek@users.noreply.github.com>",
|
||||||
|
"Marston Connell <34043723+TheMarstonConnell@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>",
|
||||||
|
"Smite Chow <xiaopengyou@live.com>"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,8 @@ const log = Object.assign(debug('libp2p:auto-relay'), {
|
|||||||
error: debug('libp2p:auto-relay:err')
|
error: debug('libp2p:auto-relay:err')
|
||||||
})
|
})
|
||||||
|
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
@ -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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
this._onError(err)
|
this._onError(err)
|
||||||
this._listenRelays.delete(id)
|
this._listenRelays.delete(id)
|
||||||
}
|
}
|
||||||
@ -222,7 +222,7 @@ class AutoRelay {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
const peerId = PeerId.createFromCID(id)
|
const peerId = PeerId.createFromB58String(id)
|
||||||
const connection = this._connectionManager.get(peerId)
|
const connection = this._connectionManager.get(peerId)
|
||||||
|
|
||||||
// If not connected, store for possible later use.
|
// If not connected, store for possible later use.
|
||||||
@ -267,7 +267,7 @@ class AutoRelay {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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)
|
||||||
|
@ -4,7 +4,7 @@ const debug = require('debug')
|
|||||||
const log = Object.assign(debug('libp2p:relay'), {
|
const log = Object.assign(debug('libp2p:relay'), {
|
||||||
error: debug('libp2p:relay:err')
|
error: debug('libp2p:relay:err')
|
||||||
})
|
})
|
||||||
|
const { codes } = require('./../errors')
|
||||||
const {
|
const {
|
||||||
setDelayedInterval,
|
setDelayedInterval,
|
||||||
clearDelayedInterval
|
clearDelayedInterval
|
||||||
@ -87,8 +87,8 @@ 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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
if (err.code === 'NO_ROUTERS_AVAILABLE') {
|
if (err.code === codes.ERR_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
|
||||||
this.stop()
|
this.stop()
|
||||||
|
@ -136,8 +136,8 @@ class Circuit {
|
|||||||
throw errCode(new Error(errMsg), codes.ERR_RELAYED_DIAL)
|
throw errCode(new Error(errMsg), codes.ERR_RELAYED_DIAL)
|
||||||
}
|
}
|
||||||
|
|
||||||
const relayPeer = PeerId.createFromCID(relayId)
|
const relayPeer = PeerId.createFromB58String(relayId)
|
||||||
const destinationPeer = PeerId.createFromCID(destinationId)
|
const destinationPeer = PeerId.createFromB58String(destinationId)
|
||||||
|
|
||||||
let disconnectOnFailure = false
|
let disconnectOnFailure = false
|
||||||
let relayConnection = this._connectionManager.get(relayPeer)
|
let relayConnection = this._connectionManager.get(relayPeer)
|
||||||
@ -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 (err) {
|
} catch (/** @type {any} */ 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,7 +1,7 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const CID = require('cids')
|
const { CID } = require('multiformats/cid')
|
||||||
const multihashing = require('multihashing-async')
|
const { sha256 } = require('multiformats/hashes/sha2')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert a namespace string into a cid.
|
* Convert a namespace string into a cid.
|
||||||
@ -11,7 +11,7 @@ const multihashing = require('multihashing-async')
|
|||||||
*/
|
*/
|
||||||
module.exports.namespaceToCid = async (namespace) => {
|
module.exports.namespaceToCid = async (namespace) => {
|
||||||
const bytes = new TextEncoder().encode(namespace)
|
const bytes = new TextEncoder().encode(namespace)
|
||||||
const hash = await multihashing(bytes, 'sha2-256')
|
const hash = await sha256.digest(bytes)
|
||||||
|
|
||||||
return new CID(hash)
|
return CID.createV0(hash)
|
||||||
}
|
}
|
||||||
|
@ -57,15 +57,10 @@ const DefaultConfig = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
|
protocolPrefix: 'ipfs',
|
||||||
dht: {
|
dht: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
kBucketSize: 20,
|
kBucketSize: 20
|
||||||
randomWalk: {
|
|
||||||
enabled: false, // disabled waiting for https://github.com/libp2p/js-libp2p-kad-dht/issues/86
|
|
||||||
queriesPerPeriod: 1,
|
|
||||||
interval: 300e3,
|
|
||||||
timeout: 10e3
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
nat: {
|
nat: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
|
118
src/connection-manager/auto-dialler.js
Normal file
118
src/connection-manager/auto-dialler.js
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
'use strict'
|
||||||
|
|
||||||
|
const debug = require('debug')
|
||||||
|
const mergeOptions = require('merge-options')
|
||||||
|
// @ts-ignore retimer does not have types
|
||||||
|
const retimer = require('retimer')
|
||||||
|
|
||||||
|
const log = Object.assign(debug('libp2p:connection-manager:auto-dialler'), {
|
||||||
|
error: debug('libp2p:connection-manager:auto-dialler:err')
|
||||||
|
})
|
||||||
|
|
||||||
|
const defaultOptions = {
|
||||||
|
enabled: true,
|
||||||
|
minConnections: 0,
|
||||||
|
autoDialInterval: 10000
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {import('../index')} Libp2p
|
||||||
|
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {Object} AutoDiallerOptions
|
||||||
|
* @property {boolean} [enabled = true] - Should preemptively guarantee connections are above the low watermark
|
||||||
|
* @property {number} [minConnections = 0] - The minimum number of connections to avoid pruning
|
||||||
|
* @property {number} [autoDialInterval = 10000] - How often, in milliseconds, it should preemptively guarantee connections are above the low watermark
|
||||||
|
*/
|
||||||
|
|
||||||
|
class AutoDialler {
|
||||||
|
/**
|
||||||
|
* Proactively tries to connect to known peers stored in the PeerStore.
|
||||||
|
* It will keep the number of connections below the upper limit and sort
|
||||||
|
* the peers to connect based on wether we know their keys and protocols.
|
||||||
|
*
|
||||||
|
* @class
|
||||||
|
* @param {Libp2p} libp2p
|
||||||
|
* @param {AutoDiallerOptions} options
|
||||||
|
*/
|
||||||
|
constructor (libp2p, options = {}) {
|
||||||
|
this._options = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, options)
|
||||||
|
this._libp2p = libp2p
|
||||||
|
this._running = false
|
||||||
|
this._autoDialTimeout = null
|
||||||
|
this._autoDial = this._autoDial.bind(this)
|
||||||
|
|
||||||
|
log('options: %j', this._options)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the auto dialer
|
||||||
|
*/
|
||||||
|
start () {
|
||||||
|
if (!this._options.enabled) {
|
||||||
|
log('not enabled')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this._running = true
|
||||||
|
this._autoDial()
|
||||||
|
log('started')
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the auto dialler
|
||||||
|
*/
|
||||||
|
async stop () {
|
||||||
|
if (!this._options.enabled) {
|
||||||
|
log('not enabled')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this._running = false
|
||||||
|
this._autoDialTimeout && this._autoDialTimeout.clear()
|
||||||
|
log('stopped')
|
||||||
|
}
|
||||||
|
|
||||||
|
async _autoDial () {
|
||||||
|
const minConnections = this._options.minConnections
|
||||||
|
|
||||||
|
// Already has enough connections
|
||||||
|
if (this._libp2p.connections.size >= minConnections) {
|
||||||
|
this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort peers on wether we know protocols of public keys for them
|
||||||
|
const peers = Array.from(this._libp2p.peerStore.peers.values())
|
||||||
|
.sort((a, b) => {
|
||||||
|
if (b.protocols && b.protocols.length && (!a.protocols || !a.protocols.length)) {
|
||||||
|
return 1
|
||||||
|
} else if (b.id.pubKey && !a.id.pubKey) {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
})
|
||||||
|
|
||||||
|
for (let i = 0; this._running && i < peers.length && this._libp2p.connections.size < minConnections; i++) {
|
||||||
|
if (!this._libp2p.connectionManager.get(peers[i].id)) {
|
||||||
|
log('connecting to a peerStore stored peer %s', peers[i].id.toB58String())
|
||||||
|
try {
|
||||||
|
await this._libp2p.dialer.connectToPeer(peers[i].id)
|
||||||
|
} catch (/** @type {any} */ err) {
|
||||||
|
log.error('could not connect to peerStore stored peer', err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connection Manager was stopped
|
||||||
|
if (!this._running) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = AutoDialler
|
@ -32,6 +32,10 @@ const defaultOptions = {
|
|||||||
defaultPeerValue: 1
|
defaultPeerValue: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const METRICS_COMPONENT = 'connection-manager'
|
||||||
|
const METRICS_PEER_CONNECTIONS = 'peer-connections'
|
||||||
|
const METRICS_ALL_CONNECTIONS = 'all-connections'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {import('../')} Libp2p
|
* @typedef {import('../')} Libp2p
|
||||||
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
||||||
@ -94,9 +98,7 @@ 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,
|
||||||
@ -128,8 +130,6 @@ class ConnectionManager extends EventEmitter {
|
|||||||
|
|
||||||
this._started = true
|
this._started = true
|
||||||
log('started')
|
log('started')
|
||||||
|
|
||||||
this._options.autoDial && this._autoDial()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -138,7 +138,6 @@ 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)
|
||||||
@ -165,6 +164,8 @@ class ConnectionManager extends EventEmitter {
|
|||||||
|
|
||||||
await Promise.all(tasks)
|
await Promise.all(tasks)
|
||||||
this.connections.clear()
|
this.connections.clear()
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PEER_CONNECTIONS, 0)
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_ALL_CONNECTIONS, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -216,10 +217,13 @@ class ConnectionManager extends EventEmitter {
|
|||||||
const storedConn = this.connections.get(peerIdStr)
|
const storedConn = this.connections.get(peerIdStr)
|
||||||
|
|
||||||
this.emit('peer:connect', connection)
|
this.emit('peer:connect', connection)
|
||||||
|
|
||||||
if (storedConn) {
|
if (storedConn) {
|
||||||
storedConn.push(connection)
|
storedConn.push(connection)
|
||||||
} else {
|
} else {
|
||||||
this.connections.set(peerIdStr, [connection])
|
this.connections.set(peerIdStr, [connection])
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PEER_CONNECTIONS, this.connections.size)
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_ALL_CONNECTIONS, this.size)
|
||||||
}
|
}
|
||||||
|
|
||||||
this._libp2p.peerStore.keyBook.set(peerId, peerId.pubKey)
|
this._libp2p.peerStore.keyBook.set(peerId, peerId.pubKey)
|
||||||
@ -248,7 +252,12 @@ class ConnectionManager extends EventEmitter {
|
|||||||
this.connections.delete(peerId)
|
this.connections.delete(peerId)
|
||||||
this._peerValues.delete(connection.remotePeer.toB58String())
|
this._peerValues.delete(connection.remotePeer.toB58String())
|
||||||
this.emit('peer:disconnect', connection)
|
this.emit('peer:disconnect', connection)
|
||||||
|
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.onPeerDisconnected(connection.remotePeer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PEER_CONNECTIONS, this.connections.size)
|
||||||
|
this._libp2p.metrics && this._libp2p.metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_ALL_CONNECTIONS, this.size)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -312,53 +321,6 @@ class ConnectionManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Proactively tries to connect to known peers stored in the PeerStore.
|
|
||||||
* It will keep the number of connections below the upper limit and sort
|
|
||||||
* the peers to connect based on wether we know their keys and protocols.
|
|
||||||
*
|
|
||||||
* @async
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
async _autoDial () {
|
|
||||||
const minConnections = this._options.minConnections
|
|
||||||
|
|
||||||
// Already has enough connections
|
|
||||||
if (this.size >= minConnections) {
|
|
||||||
this._autoDialTimeout = retimer(this._autoDial, this._options.autoDialInterval)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort peers on wether we know protocols of public keys for them
|
|
||||||
const peers = Array.from(this._libp2p.peerStore.peers.values())
|
|
||||||
.sort((a, b) => {
|
|
||||||
if (b.protocols && b.protocols.length && (!a.protocols || !a.protocols.length)) {
|
|
||||||
return 1
|
|
||||||
} else if (b.id.pubKey && !a.id.pubKey) {
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
return -1
|
|
||||||
})
|
|
||||||
|
|
||||||
for (let i = 0; i < peers.length && this.size < minConnections; 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.
|
||||||
|
@ -4,6 +4,7 @@ module.exports = {
|
|||||||
DIAL_TIMEOUT: 30e3, // How long in ms a dial attempt is allowed to take
|
DIAL_TIMEOUT: 30e3, // How long in ms a dial attempt is allowed to take
|
||||||
MAX_PARALLEL_DIALS: 100, // Maximum allowed concurrent dials
|
MAX_PARALLEL_DIALS: 100, // Maximum allowed concurrent dials
|
||||||
MAX_PER_PEER_DIALS: 4, // Allowed parallel dials per DialRequest
|
MAX_PER_PEER_DIALS: 4, // Allowed parallel dials per DialRequest
|
||||||
|
MAX_ADDRS_TO_DIAL: 25, // Maximum number of allowed addresses to attempt to dial
|
||||||
METRICS: {
|
METRICS: {
|
||||||
computeThrottleMaxQueueSize: 1000,
|
computeThrottleMaxQueueSize: 1000,
|
||||||
computeThrottleTimeout: 2000,
|
computeThrottleTimeout: 2000,
|
||||||
|
@ -8,14 +8,15 @@ 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
|
||||||
* @typedef {import('multiaddr').Multiaddr} Multiaddr
|
* @typedef {import('multiaddr').Multiaddr} Multiaddr
|
||||||
* @typedef {import('cids')} CID
|
* @typedef {import('multiformats/cid').CID} CID
|
||||||
* @typedef {import('libp2p-interfaces/src/content-routing/types').ContentRouting} ContentRoutingModule
|
* @typedef {import('libp2p-interfaces/src/content-routing/types').ContentRouting} ContentRoutingModule
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -38,7 +39,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(this.dht)
|
this.routers.push(new DHTContentRouting(this.dht))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +54,7 @@ class ContentRouting {
|
|||||||
*/
|
*/
|
||||||
async * findProviders (key, options = {}) {
|
async * findProviders (key, options = {}) {
|
||||||
if (!this.routers.length) {
|
if (!this.routers.length) {
|
||||||
throw errCode(new Error('No content this.routers available'), 'NO_ROUTERS_AVAILABLE')
|
throw errCode(new Error('No content this.routers available'), codes.ERR_NO_ROUTERS_AVAILABLE)
|
||||||
}
|
}
|
||||||
|
|
||||||
yield * pipe(
|
yield * pipe(
|
||||||
@ -76,7 +77,7 @@ class ContentRouting {
|
|||||||
*/
|
*/
|
||||||
async provide (key) {
|
async provide (key) {
|
||||||
if (!this.routers.length) {
|
if (!this.routers.length) {
|
||||||
throw errCode(new Error('No content routers available'), 'NO_ROUTERS_AVAILABLE')
|
throw errCode(new Error('No content routers available'), codes.ERR_NO_ROUTERS_AVAILABLE)
|
||||||
}
|
}
|
||||||
|
|
||||||
await Promise.all(this.routers.map((router) => router.provide(key)))
|
await Promise.all(this.routers.map((router) => router.provide(key)))
|
||||||
@ -91,12 +92,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>}
|
||||||
*/
|
*/
|
||||||
put (key, value, options) {
|
async 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.dht.put(key, value, options)
|
await drain(this.dht.put(key, value, options))
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -108,12 +109,18 @@ class ContentRouting {
|
|||||||
* @param {number} [options.timeout] - optional timeout (default: 60000)
|
* @param {number} [options.timeout] - optional timeout (default: 60000)
|
||||||
* @returns {Promise<GetData>}
|
* @returns {Promise<GetData>}
|
||||||
*/
|
*/
|
||||||
get (key, options) {
|
async 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.dht.get(key, options)
|
for await (const event of 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -123,14 +130,33 @@ 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.dht.getMany(key, nVals, options)
|
if (!nVals) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
44
src/dht/dht-content-routing.js
Normal file
44
src/dht/dht-content-routing.js
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
'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 }
|
55
src/dht/dht-peer-routing.js
Normal file
55
src/dht/dht-peer-routing.js
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
'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 === 'PEER_RESPONSE') {
|
||||||
|
const peer = event.closer.find(peerData => peerData.id.equals(peerId))
|
||||||
|
|
||||||
|
if (peer) {
|
||||||
|
return 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 }
|
@ -1,11 +1,13 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const errCode = require('err-code')
|
const errCode = require('err-code')
|
||||||
const AbortController = require('abort-controller').default
|
|
||||||
const { anySignal } = require('any-signal')
|
const { anySignal } = require('any-signal')
|
||||||
// @ts-ignore p-fifo does not export types
|
// @ts-ignore p-fifo does not export types
|
||||||
const FIFO = require('p-fifo')
|
const FIFO = require('p-fifo')
|
||||||
const pAny = require('p-any')
|
const pAny = require('p-any')
|
||||||
|
// @ts-expect-error setMaxListeners is missing from the types
|
||||||
|
const { setMaxListeners } = require('events')
|
||||||
|
const { codes } = require('../errors')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
||||||
@ -54,12 +56,17 @@ class DialRequest {
|
|||||||
const tokens = this.dialer.getTokens(this.addrs.length)
|
const tokens = this.dialer.getTokens(this.addrs.length)
|
||||||
// If no tokens are available, throw
|
// If no tokens are available, throw
|
||||||
if (tokens.length < 1) {
|
if (tokens.length < 1) {
|
||||||
throw errCode(new Error('No dial tokens available'), 'ERR_NO_DIAL_TOKENS')
|
throw errCode(new Error('No dial tokens available'), codes.ERR_NO_DIAL_TOKENS)
|
||||||
}
|
}
|
||||||
|
|
||||||
const tokenHolder = new FIFO()
|
const tokenHolder = new FIFO()
|
||||||
tokens.forEach(token => tokenHolder.push(token))
|
tokens.forEach(token => tokenHolder.push(token))
|
||||||
const dialAbortControllers = this.addrs.map(() => new AbortController())
|
const dialAbortControllers = this.addrs.map(() => {
|
||||||
|
const controller = new AbortController()
|
||||||
|
setMaxListeners && setMaxListeners(Infinity, controller.signal)
|
||||||
|
|
||||||
|
return controller
|
||||||
|
})
|
||||||
let completedDials = 0
|
let completedDials = 0
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -6,8 +6,7 @@ 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')
|
||||||
// @ts-ignore timeout-abourt-controles does not export types
|
const { TimeoutController } = require('timeout-abort-controller')
|
||||||
const TimeoutController = require('timeout-abort-controller')
|
|
||||||
const { AbortError } = require('abortable-iterator')
|
const { AbortError } = require('abortable-iterator')
|
||||||
const { anySignal } = require('any-signal')
|
const { anySignal } = require('any-signal')
|
||||||
|
|
||||||
@ -19,9 +18,14 @@ const { codes } = require('../errors')
|
|||||||
const {
|
const {
|
||||||
DIAL_TIMEOUT,
|
DIAL_TIMEOUT,
|
||||||
MAX_PARALLEL_DIALS,
|
MAX_PARALLEL_DIALS,
|
||||||
MAX_PER_PEER_DIALS
|
MAX_PER_PEER_DIALS,
|
||||||
|
MAX_ADDRS_TO_DIAL
|
||||||
} = require('../constants')
|
} = require('../constants')
|
||||||
|
|
||||||
|
const METRICS_COMPONENT = 'dialler'
|
||||||
|
const METRICS_PENDING_DIALS = 'pending-dials'
|
||||||
|
const METRICS_PENDING_DIAL_TARGETS = 'pending-dial-targets'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
* @typedef {import('libp2p-interfaces/src/connection').Connection} Connection
|
||||||
* @typedef {import('peer-id')} PeerId
|
* @typedef {import('peer-id')} PeerId
|
||||||
@ -40,9 +44,11 @@ const {
|
|||||||
* @typedef {Object} DialerOptions
|
* @typedef {Object} DialerOptions
|
||||||
* @property {(addresses: Address[]) => Address[]} [options.addressSorter = publicAddressesFirst] - Sort the known addresses of a peer before trying to dial.
|
* @property {(addresses: Address[]) => Address[]} [options.addressSorter = publicAddressesFirst] - Sort the known addresses of a peer before trying to dial.
|
||||||
* @property {number} [maxParallelDials = MAX_PARALLEL_DIALS] - Number of max concurrent dials.
|
* @property {number} [maxParallelDials = MAX_PARALLEL_DIALS] - Number of max concurrent dials.
|
||||||
|
* @property {number} [maxAddrsToDial = MAX_ADDRS_TO_DIAL] - Number of max addresses to dial for a given peer.
|
||||||
* @property {number} [maxDialsPerPeer = MAX_PER_PEER_DIALS] - Number of max concurrent dials per peer.
|
* @property {number} [maxDialsPerPeer = MAX_PER_PEER_DIALS] - Number of max concurrent dials per peer.
|
||||||
* @property {number} [dialTimeout = DIAL_TIMEOUT] - How long a dial attempt is allowed to take.
|
* @property {number} [dialTimeout = DIAL_TIMEOUT] - How long a dial attempt is allowed to take.
|
||||||
* @property {Record<string, Resolver>} [resolvers = {}] - multiaddr resolvers to use when dialing
|
* @property {Record<string, Resolver>} [resolvers = {}] - multiaddr resolvers to use when dialing
|
||||||
|
* @property {import('../metrics')} [metrics]
|
||||||
*
|
*
|
||||||
* @typedef DialTarget
|
* @typedef DialTarget
|
||||||
* @property {string} id
|
* @property {string} id
|
||||||
@ -65,19 +71,23 @@ class Dialer {
|
|||||||
peerStore,
|
peerStore,
|
||||||
addressSorter = publicAddressesFirst,
|
addressSorter = publicAddressesFirst,
|
||||||
maxParallelDials = MAX_PARALLEL_DIALS,
|
maxParallelDials = MAX_PARALLEL_DIALS,
|
||||||
|
maxAddrsToDial = MAX_ADDRS_TO_DIAL,
|
||||||
dialTimeout = DIAL_TIMEOUT,
|
dialTimeout = DIAL_TIMEOUT,
|
||||||
maxDialsPerPeer = MAX_PER_PEER_DIALS,
|
maxDialsPerPeer = MAX_PER_PEER_DIALS,
|
||||||
resolvers = {}
|
resolvers = {},
|
||||||
|
metrics
|
||||||
}) {
|
}) {
|
||||||
this.transportManager = transportManager
|
this.transportManager = transportManager
|
||||||
this.peerStore = peerStore
|
this.peerStore = peerStore
|
||||||
this.addressSorter = addressSorter
|
this.addressSorter = addressSorter
|
||||||
this.maxParallelDials = maxParallelDials
|
this.maxParallelDials = maxParallelDials
|
||||||
|
this.maxAddrsToDial = maxAddrsToDial
|
||||||
this.timeout = dialTimeout
|
this.timeout = dialTimeout
|
||||||
this.maxDialsPerPeer = maxDialsPerPeer
|
this.maxDialsPerPeer = maxDialsPerPeer
|
||||||
this.tokens = [...new Array(maxParallelDials)].map((_, index) => index)
|
this.tokens = [...new Array(maxParallelDials)].map((_, index) => index)
|
||||||
this._pendingDials = new Map()
|
this._pendingDials = new Map()
|
||||||
this._pendingDialTargets = new Map()
|
this._pendingDialTargets = new Map()
|
||||||
|
this._metrics = metrics
|
||||||
|
|
||||||
for (const [key, value] of Object.entries(resolvers)) {
|
for (const [key, value] of Object.entries(resolvers)) {
|
||||||
Multiaddr.resolvers.set(key, value)
|
Multiaddr.resolvers.set(key, value)
|
||||||
@ -91,7 +101,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,6 +111,9 @@ class Dialer {
|
|||||||
pendingTarget.reject(new AbortError('Dialer was destroyed'))
|
pendingTarget.reject(new AbortError('Dialer was destroyed'))
|
||||||
}
|
}
|
||||||
this._pendingDialTargets.clear()
|
this._pendingDialTargets.clear()
|
||||||
|
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIALS, 0)
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIAL_TARGETS, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -125,7 +138,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 (err) {
|
} catch (/** @type {any} */ 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
|
||||||
@ -150,16 +163,20 @@ class Dialer {
|
|||||||
const id = `${(parseInt(String(Math.random() * 1e9), 10)).toString() + Date.now()}`
|
const id = `${(parseInt(String(Math.random() * 1e9), 10)).toString() + Date.now()}`
|
||||||
const cancellablePromise = new Promise((resolve, reject) => {
|
const cancellablePromise = new Promise((resolve, reject) => {
|
||||||
this._pendingDialTargets.set(id, { resolve, reject })
|
this._pendingDialTargets.set(id, { resolve, reject })
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIAL_TARGETS, this._pendingDialTargets.size)
|
||||||
})
|
})
|
||||||
|
|
||||||
const dialTarget = await Promise.race([
|
try {
|
||||||
this._createDialTarget(peer),
|
const dialTarget = await Promise.race([
|
||||||
cancellablePromise
|
this._createDialTarget(peer),
|
||||||
])
|
cancellablePromise
|
||||||
|
])
|
||||||
|
|
||||||
this._pendingDialTargets.delete(id)
|
return dialTarget
|
||||||
|
} finally {
|
||||||
return dialTarget
|
this._pendingDialTargets.delete(id)
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIAL_TARGETS, this._pendingDialTargets.size)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -198,6 +215,11 @@ class Dialer {
|
|||||||
// Multiaddrs not supported by the available transports will be filtered out.
|
// Multiaddrs not supported by the available transports will be filtered out.
|
||||||
const supportedAddrs = addrs.filter(a => this.transportManager.transportForMultiaddr(a))
|
const supportedAddrs = addrs.filter(a => this.transportManager.transportForMultiaddr(a))
|
||||||
|
|
||||||
|
if (supportedAddrs.length > this.maxAddrsToDial) {
|
||||||
|
this.peerStore.delete(id)
|
||||||
|
throw errCode(new Error('dial with more addresses than allowed'), codes.ERR_TOO_MANY_ADDRESSES)
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: id.toB58String(),
|
id: id.toB58String(),
|
||||||
addrs: supportedAddrs
|
addrs: supportedAddrs
|
||||||
@ -242,9 +264,13 @@ class Dialer {
|
|||||||
destroy: () => {
|
destroy: () => {
|
||||||
timeoutController.clear()
|
timeoutController.clear()
|
||||||
this._pendingDials.delete(dialTarget.id)
|
this._pendingDials.delete(dialTarget.id)
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIALS, this._pendingDials.size)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this._pendingDials.set(dialTarget.id, pendingDial)
|
this._pendingDials.set(dialTarget.id, pendingDial)
|
||||||
|
|
||||||
|
this._metrics && this._metrics.updateComponentMetric(METRICS_COMPONENT, METRICS_PENDING_DIALS, this._pendingDials.size)
|
||||||
|
|
||||||
return pendingDial
|
return pendingDial
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
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 = {
|
||||||
@ -16,6 +17,7 @@ exports.codes = {
|
|||||||
ERR_CONNECTION_FAILED: 'ERR_CONNECTION_FAILED',
|
ERR_CONNECTION_FAILED: 'ERR_CONNECTION_FAILED',
|
||||||
ERR_NODE_NOT_STARTED: 'ERR_NODE_NOT_STARTED',
|
ERR_NODE_NOT_STARTED: 'ERR_NODE_NOT_STARTED',
|
||||||
ERR_ALREADY_ABORTED: 'ERR_ALREADY_ABORTED',
|
ERR_ALREADY_ABORTED: 'ERR_ALREADY_ABORTED',
|
||||||
|
ERR_TOO_MANY_ADDRESSES: 'ERR_TOO_MANY_ADDRESSES',
|
||||||
ERR_NO_VALID_ADDRESSES: 'ERR_NO_VALID_ADDRESSES',
|
ERR_NO_VALID_ADDRESSES: 'ERR_NO_VALID_ADDRESSES',
|
||||||
ERR_RELAYED_DIAL: 'ERR_RELAYED_DIAL',
|
ERR_RELAYED_DIAL: 'ERR_RELAYED_DIAL',
|
||||||
ERR_DIALED_SELF: 'ERR_DIALED_SELF',
|
ERR_DIALED_SELF: 'ERR_DIALED_SELF',
|
||||||
@ -28,10 +30,35 @@ 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',
|
||||||
ERR_UNSUPPORTED_PROTOCOL: 'ERR_UNSUPPORTED_PROTOCOL',
|
ERR_UNSUPPORTED_PROTOCOL: 'ERR_UNSUPPORTED_PROTOCOL',
|
||||||
ERR_INVALID_MULTIADDR: 'ERR_INVALID_MULTIADDR',
|
ERR_INVALID_MULTIADDR: 'ERR_INVALID_MULTIADDR',
|
||||||
ERR_SIGNATURE_NOT_VALID: 'ERR_SIGNATURE_NOT_VALID'
|
ERR_SIGNATURE_NOT_VALID: 'ERR_SIGNATURE_NOT_VALID',
|
||||||
|
ERR_FIND_SELF: 'ERR_FIND_SELF',
|
||||||
|
ERR_NO_ROUTERS_AVAILABLE: 'ERR_NO_ROUTERS_AVAILABLE',
|
||||||
|
ERR_CONNECTION_NOT_MULTIPLEXED: 'ERR_CONNECTION_NOT_MULTIPLEXED',
|
||||||
|
ERR_NO_DIAL_TOKENS: 'ERR_NO_DIAL_TOKENS',
|
||||||
|
ERR_KEYCHAIN_REQUIRED: 'ERR_KEYCHAIN_REQUIRED',
|
||||||
|
ERR_INVALID_CMS: 'ERR_INVALID_CMS',
|
||||||
|
ERR_MISSING_KEYS: 'ERR_MISSING_KEYS',
|
||||||
|
ERR_NO_KEY: 'ERR_NO_KEY',
|
||||||
|
ERR_INVALID_KEY_NAME: 'ERR_INVALID_KEY_NAME',
|
||||||
|
ERR_INVALID_KEY_TYPE: 'ERR_INVALID_KEY_TYPE',
|
||||||
|
ERR_KEY_ALREADY_EXISTS: 'ERR_KEY_ALREADY_EXISTS',
|
||||||
|
ERR_INVALID_KEY_SIZE: 'ERR_INVALID_KEY_SIZE',
|
||||||
|
ERR_KEY_NOT_FOUND: 'ERR_KEY_NOT_FOUND',
|
||||||
|
ERR_OLD_KEY_NAME_INVALID: 'ERR_OLD_KEY_NAME_INVALID',
|
||||||
|
ERR_NEW_KEY_NAME_INVALID: 'ERR_NEW_KEY_NAME_INVALID',
|
||||||
|
ERR_PASSWORD_REQUIRED: 'ERR_PASSWORD_REQUIRED',
|
||||||
|
ERR_PEM_REQUIRED: 'ERR_PEM_REQUIRED',
|
||||||
|
ERR_CANNOT_READ_KEY: 'ERR_CANNOT_READ_KEY',
|
||||||
|
ERR_MISSING_PRIVATE_KEY: 'ERR_MISSING_PRIVATE_KEY',
|
||||||
|
ERR_INVALID_OLD_PASS_TYPE: 'ERR_INVALID_OLD_PASS_TYPE',
|
||||||
|
ERR_INVALID_NEW_PASS_TYPE: 'ERR_INVALID_NEW_PASS_TYPE',
|
||||||
|
ERR_INVALID_PASS_LENGTH: 'ERR_INVALID_PASS_LENGTH',
|
||||||
|
ERR_NOT_IMPLEMENTED: 'ERR_NOT_IMPLEMENTED',
|
||||||
|
ERR_WRONG_PING_ACK: 'ERR_WRONG_PING_ACK'
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ function getPeer (peer) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
peer = PeerId.createFromB58String(idStr)
|
peer = PeerId.createFromB58String(idStr)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ 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
|
||||||
|
@ -3,7 +3,13 @@
|
|||||||
// @ts-ignore file not listed within the file list of projects
|
// @ts-ignore file not listed within the file list of projects
|
||||||
const libp2pVersion = require('../../package.json').version
|
const libp2pVersion = require('../../package.json').version
|
||||||
|
|
||||||
module.exports.PROTOCOL_VERSION = 'ipfs/0.1.0'
|
module.exports.PROTOCOL_VERSION = 'ipfs/0.1.0' // deprecated
|
||||||
module.exports.AGENT_VERSION = `js-libp2p/${libp2pVersion}`
|
module.exports.AGENT_VERSION = `js-libp2p/${libp2pVersion}`
|
||||||
module.exports.MULTICODEC_IDENTIFY = '/ipfs/id/1.0.0'
|
module.exports.MULTICODEC_IDENTIFY = '/ipfs/id/1.0.0' // deprecated
|
||||||
module.exports.MULTICODEC_IDENTIFY_PUSH = '/ipfs/id/push/1.0.0'
|
module.exports.MULTICODEC_IDENTIFY_PUSH = '/ipfs/id/push/1.0.0' // deprecated
|
||||||
|
|
||||||
|
module.exports.IDENTIFY_PROTOCOL_VERSION = '0.1.0'
|
||||||
|
module.exports.MULTICODEC_IDENTIFY_PROTOCOL_NAME = 'id'
|
||||||
|
module.exports.MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME = 'id/push'
|
||||||
|
module.exports.MULTICODEC_IDENTIFY_PROTOCOL_VERSION = '1.0.0'
|
||||||
|
module.exports.MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION = '1.0.0'
|
||||||
|
@ -8,7 +8,7 @@ const errCode = require('err-code')
|
|||||||
const lp = require('it-length-prefixed')
|
const lp = require('it-length-prefixed')
|
||||||
const { pipe } = require('it-pipe')
|
const { pipe } = require('it-pipe')
|
||||||
const { collect, take, consume } = require('streaming-iterables')
|
const { collect, take, consume } = require('streaming-iterables')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
|
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
@ -23,7 +23,11 @@ const PeerRecord = require('../record/peer-record')
|
|||||||
const {
|
const {
|
||||||
MULTICODEC_IDENTIFY,
|
MULTICODEC_IDENTIFY,
|
||||||
MULTICODEC_IDENTIFY_PUSH,
|
MULTICODEC_IDENTIFY_PUSH,
|
||||||
PROTOCOL_VERSION
|
IDENTIFY_PROTOCOL_VERSION,
|
||||||
|
MULTICODEC_IDENTIFY_PROTOCOL_NAME,
|
||||||
|
MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME,
|
||||||
|
MULTICODEC_IDENTIFY_PROTOCOL_VERSION,
|
||||||
|
MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION
|
||||||
} = require('./consts')
|
} = require('./consts')
|
||||||
|
|
||||||
const { codes } = require('../errors')
|
const { codes } = require('../errors')
|
||||||
@ -39,6 +43,16 @@ const { codes } = require('../errors')
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
class IdentifyService {
|
class IdentifyService {
|
||||||
|
/**
|
||||||
|
* @param {import('../')} libp2p
|
||||||
|
*/
|
||||||
|
static getProtocolStr (libp2p) {
|
||||||
|
return {
|
||||||
|
identifyProtocolStr: `/${libp2p._config.protocolPrefix}/${MULTICODEC_IDENTIFY_PROTOCOL_NAME}/${MULTICODEC_IDENTIFY_PROTOCOL_VERSION}`,
|
||||||
|
identifyPushProtocolStr: `/${libp2p._config.protocolPrefix}/${MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME}/${MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class
|
* @class
|
||||||
* @param {Object} options
|
* @param {Object} options
|
||||||
@ -53,9 +67,13 @@ class IdentifyService {
|
|||||||
|
|
||||||
this.handleMessage = this.handleMessage.bind(this)
|
this.handleMessage = this.handleMessage.bind(this)
|
||||||
|
|
||||||
|
const protocolStr = IdentifyService.getProtocolStr(libp2p)
|
||||||
|
this.identifyProtocolStr = protocolStr.identifyProtocolStr
|
||||||
|
this.identifyPushProtocolStr = protocolStr.identifyPushProtocolStr
|
||||||
|
|
||||||
// Store self host metadata
|
// Store self host metadata
|
||||||
this._host = {
|
this._host = {
|
||||||
protocolVersion: PROTOCOL_VERSION,
|
protocolVersion: `${libp2p._config.protocolPrefix}/${IDENTIFY_PROTOCOL_VERSION}`,
|
||||||
...libp2p._options.host
|
...libp2p._options.host
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,7 +112,7 @@ class IdentifyService {
|
|||||||
|
|
||||||
const pushes = connections.map(async connection => {
|
const pushes = connections.map(async connection => {
|
||||||
try {
|
try {
|
||||||
const { stream } = await connection.newStream(MULTICODEC_IDENTIFY_PUSH)
|
const { stream } = await connection.newStream(this.identifyPushProtocolStr)
|
||||||
|
|
||||||
await pipe(
|
await pipe(
|
||||||
[Message.Identify.encode({
|
[Message.Identify.encode({
|
||||||
@ -106,7 +124,7 @@ class IdentifyService {
|
|||||||
stream,
|
stream,
|
||||||
consume
|
consume
|
||||||
)
|
)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ 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)
|
||||||
}
|
}
|
||||||
@ -129,7 +147,7 @@ class IdentifyService {
|
|||||||
const connections = []
|
const connections = []
|
||||||
let connection
|
let connection
|
||||||
for (const peer of this.peerStore.peers.values()) {
|
for (const peer of this.peerStore.peers.values()) {
|
||||||
if (peer.protocols.includes(MULTICODEC_IDENTIFY_PUSH) && (connection = this.connectionManager.get(peer.id))) {
|
if (peer.protocols.includes(this.identifyPushProtocolStr) && (connection = this.connectionManager.get(peer.id))) {
|
||||||
connections.push(connection)
|
connections.push(connection)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -147,7 +165,7 @@ class IdentifyService {
|
|||||||
* @returns {Promise<void>}
|
* @returns {Promise<void>}
|
||||||
*/
|
*/
|
||||||
async identify (connection) {
|
async identify (connection) {
|
||||||
const { stream } = await connection.newStream(MULTICODEC_IDENTIFY)
|
const { stream } = await connection.newStream(this.identifyProtocolStr)
|
||||||
const [data] = await pipe(
|
const [data] = await pipe(
|
||||||
[],
|
[],
|
||||||
stream,
|
stream,
|
||||||
@ -164,7 +182,7 @@ class IdentifyService {
|
|||||||
let message
|
let message
|
||||||
try {
|
try {
|
||||||
message = Message.Identify.decode(data)
|
message = Message.Identify.decode(data)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
throw errCode(err, codes.ERR_INVALID_MESSAGE)
|
throw errCode(err, codes.ERR_INVALID_MESSAGE)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -193,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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error('received invalid addrs', err)
|
log.error('received invalid addrs', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -224,9 +242,9 @@ class IdentifyService {
|
|||||||
*/
|
*/
|
||||||
handleMessage ({ connection, stream, protocol }) {
|
handleMessage ({ connection, stream, protocol }) {
|
||||||
switch (protocol) {
|
switch (protocol) {
|
||||||
case MULTICODEC_IDENTIFY:
|
case this.identifyProtocolStr:
|
||||||
return this._handleIdentify({ connection, stream })
|
return this._handleIdentify({ connection, stream })
|
||||||
case MULTICODEC_IDENTIFY_PUSH:
|
case this.identifyPushProtocolStr:
|
||||||
return this._handlePush({ connection, stream })
|
return this._handlePush({ connection, stream })
|
||||||
default:
|
default:
|
||||||
log.error('cannot handle unknown protocol %s', protocol)
|
log.error('cannot handle unknown protocol %s', protocol)
|
||||||
@ -269,7 +287,7 @@ class IdentifyService {
|
|||||||
stream,
|
stream,
|
||||||
consume
|
consume
|
||||||
)
|
)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error('could not respond to identify request', err)
|
log.error('could not respond to identify request', err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -295,7 +313,7 @@ class IdentifyService {
|
|||||||
collect
|
collect
|
||||||
)
|
)
|
||||||
message = Message.Identify.decode(data)
|
message = Message.Identify.decode(data)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return log.error('received invalid message', err)
|
return log.error('received invalid message', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,7 +325,7 @@ class IdentifyService {
|
|||||||
this.peerStore.protoBook.set(id, message.protocols)
|
this.peerStore.protoBook.set(id, message.protocols)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -315,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error('received invalid addrs', err)
|
log.error('received invalid addrs', err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
48
src/index.js
48
src/index.js
@ -18,6 +18,7 @@ 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')
|
||||||
@ -31,7 +32,6 @@ const PersistentPeerStore = require('./peer-store/persistent')
|
|||||||
const Registrar = require('./registrar')
|
const Registrar = require('./registrar')
|
||||||
const ping = require('./ping')
|
const ping = require('./ping')
|
||||||
const IdentifyService = require('./identify')
|
const IdentifyService = require('./identify')
|
||||||
const IDENTIFY_PROTOCOLS = IdentifyService.multicodecs
|
|
||||||
const NatManager = require('./nat-manager')
|
const NatManager = require('./nat-manager')
|
||||||
const { updateSelfPeerRecord } = require('./record/utils')
|
const { updateSelfPeerRecord } = require('./record/utils')
|
||||||
|
|
||||||
@ -56,16 +56,9 @@ const { updateSelfPeerRecord } = require('./record/utils')
|
|||||||
* @property {MuxedStream} stream
|
* @property {MuxedStream} stream
|
||||||
* @property {string} protocol
|
* @property {string} protocol
|
||||||
*
|
*
|
||||||
* @typedef {Object} RandomWalkOptions
|
|
||||||
* @property {boolean} [enabled = false]
|
|
||||||
* @property {number} [queriesPerPeriod = 1]
|
|
||||||
* @property {number} [interval = 300e3]
|
|
||||||
* @property {number} [timeout = 10e3]
|
|
||||||
*
|
|
||||||
* @typedef {Object} DhtOptions
|
* @typedef {Object} DhtOptions
|
||||||
* @property {boolean} [enabled = false]
|
* @property {boolean} [enabled = false]
|
||||||
* @property {number} [kBucketSize = 20]
|
* @property {number} [kBucketSize = 20]
|
||||||
* @property {RandomWalkOptions} [randomWalk]
|
|
||||||
* @property {boolean} [clientMode]
|
* @property {boolean} [clientMode]
|
||||||
* @property {import('libp2p-interfaces/src/types').DhtSelectors} [selectors]
|
* @property {import('libp2p-interfaces/src/types').DhtSelectors} [selectors]
|
||||||
* @property {import('libp2p-interfaces/src/types').DhtValidators} [validators]
|
* @property {import('libp2p-interfaces/src/types').DhtValidators} [validators]
|
||||||
@ -194,16 +187,21 @@ 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) {
|
||||||
this.metrics = new Metrics({
|
const metrics = new Metrics({
|
||||||
...this._options.metrics,
|
...this._options.metrics
|
||||||
connectionManager: this.connectionManager
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
this.metrics = metrics
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create keychain
|
// Create keychain
|
||||||
@ -265,6 +263,7 @@ class Libp2p extends EventEmitter {
|
|||||||
this.dialer = new Dialer({
|
this.dialer = new Dialer({
|
||||||
transportManager: this.transportManager,
|
transportManager: this.transportManager,
|
||||||
peerStore: this.peerStore,
|
peerStore: this.peerStore,
|
||||||
|
metrics: this.metrics,
|
||||||
...this._options.dialer
|
...this._options.dialer
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -289,7 +288,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
// Add the identify service since we can multiplex
|
// Add the identify service since we can multiplex
|
||||||
this.identifyService = new IdentifyService({ libp2p: this })
|
this.identifyService = new IdentifyService({ libp2p: this })
|
||||||
this.handle(Object.values(IDENTIFY_PROTOCOLS), this.identifyService.handleMessage)
|
this.handle(Object.values(IdentifyService.getProtocolStr(this)), this.identifyService.handleMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Attach private network protector
|
// Attach private network protector
|
||||||
@ -302,14 +301,9 @@ 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 Object is not constructable
|
// @ts-ignore TODO: types need fixing - DHT is an `object` which has no `create` method
|
||||||
this._dht = new DHT({
|
this._dht = DHT.create({
|
||||||
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
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -364,7 +358,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 (err) {
|
} catch (/** @type {any} */ 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()
|
||||||
@ -386,6 +380,8 @@ 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)
|
||||||
@ -400,7 +396,6 @@ 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 +404,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
ping.unmount(this)
|
ping.unmount(this)
|
||||||
this.dialer.destroy()
|
this.dialer.destroy()
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
this.emit('error', err)
|
this.emit('error', err)
|
||||||
@ -432,7 +427,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await this.keychain.findKeyByName('self')
|
await this.keychain.findKeyByName('self')
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
await this.keychain.importPeer('self', this.peerId)
|
await this.keychain.importPeer('self', this.peerId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -625,7 +620,7 @@ class Libp2p extends EventEmitter {
|
|||||||
|
|
||||||
// DHT subsystem
|
// DHT subsystem
|
||||||
if (this._config.dht.enabled) {
|
if (this._config.dht.enabled) {
|
||||||
this._dht && this._dht.start()
|
this._dht && await 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,6 +651,7 @@ class Libp2p extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.connectionManager.start()
|
this.connectionManager.start()
|
||||||
|
this._autodialler.start()
|
||||||
|
|
||||||
// Peer discovery
|
// Peer discovery
|
||||||
await this._setupPeerDiscovery()
|
await this._setupPeerDiscovery()
|
||||||
@ -699,7 +695,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 (err) {
|
} catch (/** @type {any} */ 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 (err) {
|
} catch (/** @type {any} */ 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')
|
||||||
}
|
}
|
||||||
|
@ -8,8 +8,9 @@ require('node-forge/lib/pbe')
|
|||||||
const forge = require('node-forge/lib/forge')
|
const forge = require('node-forge/lib/forge')
|
||||||
const { certificateForKey, findAsync } = require('./util')
|
const { certificateForKey, findAsync } = require('./util')
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
const { codes } = require('../errors')
|
||||||
|
|
||||||
const privates = new WeakMap()
|
const privates = new WeakMap()
|
||||||
|
|
||||||
@ -31,7 +32,7 @@ class CMS {
|
|||||||
*/
|
*/
|
||||||
constructor (keychain, dek) {
|
constructor (keychain, dek) {
|
||||||
if (!keychain) {
|
if (!keychain) {
|
||||||
throw errcode(new Error('keychain is required'), 'ERR_KEYCHAIN_REQUIRED')
|
throw errcode(new Error('keychain is required'), codes.ERR_KEYCHAIN_REQUIRED)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.keychain = keychain
|
this.keychain = keychain
|
||||||
@ -49,7 +50,7 @@ class CMS {
|
|||||||
*/
|
*/
|
||||||
async encrypt (name, plain) {
|
async encrypt (name, plain) {
|
||||||
if (!(plain instanceof Uint8Array)) {
|
if (!(plain instanceof Uint8Array)) {
|
||||||
throw errcode(new Error('Plain data must be a Uint8Array'), 'ERR_INVALID_PARAMS')
|
throw errcode(new Error('Plain data must be a Uint8Array'), codes.ERR_INVALID_PARAMETERS)
|
||||||
}
|
}
|
||||||
|
|
||||||
const key = await this.keychain.findKeyByName(name)
|
const key = await this.keychain.findKeyByName(name)
|
||||||
@ -81,7 +82,7 @@ class CMS {
|
|||||||
*/
|
*/
|
||||||
async decrypt (cmsData) {
|
async decrypt (cmsData) {
|
||||||
if (!(cmsData instanceof Uint8Array)) {
|
if (!(cmsData instanceof Uint8Array)) {
|
||||||
throw errcode(new Error('CMS data is required'), 'ERR_INVALID_PARAMS')
|
throw errcode(new Error('CMS data is required'), codes.ERR_INVALID_PARAMETERS)
|
||||||
}
|
}
|
||||||
|
|
||||||
let cms
|
let cms
|
||||||
@ -90,8 +91,8 @@ 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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
throw errcode(new Error('Invalid CMS: ' + err.message), 'ERR_INVALID_CMS')
|
throw errcode(new Error('Invalid CMS: ' + err.message), codes.ERR_INVALID_CMS)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find a recipient whose key we hold. We only deal with recipient certs
|
// Find a recipient whose key we hold. We only deal with recipient certs
|
||||||
@ -114,7 +115,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
@ -123,7 +124,7 @@ class CMS {
|
|||||||
if (!r) {
|
if (!r) {
|
||||||
// @ts-ignore cms types not defined
|
// @ts-ignore cms types not defined
|
||||||
const missingKeys = recipients.map(r => r.keyId)
|
const missingKeys = recipients.map(r => r.keyId)
|
||||||
throw errcode(new Error('Decryption needs one of the key(s): ' + missingKeys.join(', ')), 'ERR_MISSING_KEYS', {
|
throw errcode(new Error('Decryption needs one of the key(s): ' + missingKeys.join(', ')), codes.ERR_MISSING_KEYS, {
|
||||||
missingKeys
|
missingKeys
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -131,7 +132,7 @@ class CMS {
|
|||||||
const key = await this.keychain.findKeyById(r.keyId)
|
const key = await this.keychain.findKeyById(r.keyId)
|
||||||
|
|
||||||
if (!key) {
|
if (!key) {
|
||||||
throw errcode(new Error('No key available to decrypto'), 'ERR_NO_KEY')
|
throw errcode(new Error('No key available to decrypto'), codes.ERR_NO_KEY)
|
||||||
}
|
}
|
||||||
|
|
||||||
const pem = await this.keychain._getPrivateKey(key.name)
|
const pem = await this.keychain._getPrivateKey(key.name)
|
||||||
|
@ -7,11 +7,12 @@ const log = Object.assign(debug('libp2p:keychain'), {
|
|||||||
const sanitize = require('sanitize-filename')
|
const sanitize = require('sanitize-filename')
|
||||||
const mergeOptions = require('merge-options')
|
const mergeOptions = require('merge-options')
|
||||||
const crypto = require('libp2p-crypto')
|
const crypto = require('libp2p-crypto')
|
||||||
const { Key } = require('interface-datastore')
|
const { Key } = require('interface-datastore/key')
|
||||||
const CMS = require('./cms')
|
const CMS = require('./cms')
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
const uint8ArrayToString = require('uint8arrays/to-string')
|
const { codes } = require('../errors')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-string')
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
|
||||||
|
|
||||||
// @ts-ignore node-forge sha512 types not exported
|
// @ts-ignore node-forge sha512 types not exported
|
||||||
require('node-forge/lib/sha512')
|
require('node-forge/lib/sha512')
|
||||||
@ -210,21 +211,21 @@ class Keychain {
|
|||||||
const self = this
|
const self = this
|
||||||
|
|
||||||
if (!validateKeyName(name) || name === 'self') {
|
if (!validateKeyName(name) || name === 'self') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof type !== 'string') {
|
if (typeof type !== 'string') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key type '${type}'`), 'ERR_INVALID_KEY_TYPE'))
|
return throwDelayed(errcode(new Error(`Invalid key type '${type}'`), codes.ERR_INVALID_KEY_TYPE))
|
||||||
}
|
}
|
||||||
|
|
||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
const exists = await self.store.has(dsname)
|
const exists = await self.store.has(dsname)
|
||||||
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), 'ERR_KEY_ALREADY_EXISTS'))
|
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), codes.ERR_KEY_ALREADY_EXISTS))
|
||||||
|
|
||||||
switch (type.toLowerCase()) {
|
switch (type.toLowerCase()) {
|
||||||
case 'rsa':
|
case 'rsa':
|
||||||
if (!Number.isSafeInteger(size) || size < 2048) {
|
if (!Number.isSafeInteger(size) || size < 2048) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid RSA key size ${size}`), 'ERR_INVALID_KEY_SIZE'))
|
return throwDelayed(errcode(new Error(`Invalid RSA key size ${size}`), codes.ERR_INVALID_KEY_SIZE))
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
@ -248,7 +249,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -284,7 +285,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -297,15 +298,15 @@ class Keychain {
|
|||||||
*/
|
*/
|
||||||
async findKeyByName (name) {
|
async findKeyByName (name) {
|
||||||
if (!validateKeyName(name)) {
|
if (!validateKeyName(name)) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
|
|
||||||
const dsname = DsInfoName(name)
|
const dsname = DsInfoName(name)
|
||||||
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 (err) {
|
} catch (/** @type {any} */ 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}`), codes.ERR_KEY_NOT_FOUND))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -318,7 +319,7 @@ class Keychain {
|
|||||||
async removeKey (name) {
|
async removeKey (name) {
|
||||||
const self = this
|
const self = this
|
||||||
if (!validateKeyName(name) || name === 'self') {
|
if (!validateKeyName(name) || name === 'self') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
const keyInfo = await self.findKeyByName(name)
|
const keyInfo = await self.findKeyByName(name)
|
||||||
@ -339,10 +340,10 @@ class Keychain {
|
|||||||
async renameKey (oldName, newName) {
|
async renameKey (oldName, newName) {
|
||||||
const self = this
|
const self = this
|
||||||
if (!validateKeyName(oldName) || oldName === 'self') {
|
if (!validateKeyName(oldName) || oldName === 'self') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid old key name '${oldName}'`), 'ERR_OLD_KEY_NAME_INVALID'))
|
return throwDelayed(errcode(new Error(`Invalid old key name '${oldName}'`), codes.ERR_OLD_KEY_NAME_INVALID))
|
||||||
}
|
}
|
||||||
if (!validateKeyName(newName) || newName === 'self') {
|
if (!validateKeyName(newName) || newName === 'self') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid new key name '${newName}'`), 'ERR_NEW_KEY_NAME_INVALID'))
|
return throwDelayed(errcode(new Error(`Invalid new key name '${newName}'`), codes.ERR_NEW_KEY_NAME_INVALID))
|
||||||
}
|
}
|
||||||
const oldDsname = DsName(oldName)
|
const oldDsname = DsName(oldName)
|
||||||
const newDsname = DsName(newName)
|
const newDsname = DsName(newName)
|
||||||
@ -350,7 +351,7 @@ class Keychain {
|
|||||||
const newInfoName = DsInfoName(newName)
|
const newInfoName = DsInfoName(newName)
|
||||||
|
|
||||||
const exists = await self.store.has(newDsname)
|
const exists = await self.store.has(newDsname)
|
||||||
if (exists) return throwDelayed(errcode(new Error(`Key '${newName}' already exists`), 'ERR_KEY_ALREADY_EXISTS'))
|
if (exists) return throwDelayed(errcode(new Error(`Key '${newName}' already exists`), codes.ERR_KEY_ALREADY_EXISTS))
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const pem = await self.store.get(oldDsname)
|
const pem = await self.store.get(oldDsname)
|
||||||
@ -365,7 +366,7 @@ class Keychain {
|
|||||||
batch.delete(oldInfoName)
|
batch.delete(oldInfoName)
|
||||||
await batch.commit()
|
await batch.commit()
|
||||||
return keyInfo
|
return keyInfo
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -379,10 +380,10 @@ class Keychain {
|
|||||||
*/
|
*/
|
||||||
async exportKey (name, password) {
|
async exportKey (name, password) {
|
||||||
if (!validateKeyName(name)) {
|
if (!validateKeyName(name)) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
if (!password) {
|
if (!password) {
|
||||||
return throwDelayed(errcode(new Error('Password is required'), 'ERR_PASSWORD_REQUIRED'))
|
return throwDelayed(errcode(new Error('Password is required'), codes.ERR_PASSWORD_REQUIRED))
|
||||||
}
|
}
|
||||||
|
|
||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
@ -393,7 +394,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -409,20 +410,20 @@ class Keychain {
|
|||||||
async importKey (name, pem, password) {
|
async importKey (name, pem, password) {
|
||||||
const self = this
|
const self = this
|
||||||
if (!validateKeyName(name) || name === 'self') {
|
if (!validateKeyName(name) || name === 'self') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
if (!pem) {
|
if (!pem) {
|
||||||
return throwDelayed(errcode(new Error('PEM encoded key is required'), 'ERR_PEM_REQUIRED'))
|
return throwDelayed(errcode(new Error('PEM encoded key is required'), codes.ERR_PEM_REQUIRED))
|
||||||
}
|
}
|
||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
const exists = await self.store.has(dsname)
|
const exists = await self.store.has(dsname)
|
||||||
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), 'ERR_KEY_ALREADY_EXISTS'))
|
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), codes.ERR_KEY_ALREADY_EXISTS))
|
||||||
|
|
||||||
let privateKey
|
let privateKey
|
||||||
try {
|
try {
|
||||||
privateKey = await crypto.keys.import(pem, password)
|
privateKey = await crypto.keys.import(pem, password)
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ 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'), codes.ERR_CANNOT_READ_KEY))
|
||||||
}
|
}
|
||||||
|
|
||||||
let kid
|
let kid
|
||||||
@ -431,7 +432,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -457,16 +458,16 @@ class Keychain {
|
|||||||
async importPeer (name, peer) {
|
async importPeer (name, peer) {
|
||||||
const self = this
|
const self = this
|
||||||
if (!validateKeyName(name)) {
|
if (!validateKeyName(name)) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
if (!peer || !peer.privKey) {
|
if (!peer || !peer.privKey) {
|
||||||
return throwDelayed(errcode(new Error('Peer.privKey is required'), 'ERR_MISSING_PRIVATE_KEY'))
|
return throwDelayed(errcode(new Error('Peer.privKey is required'), codes.ERR_MISSING_PRIVATE_KEY))
|
||||||
}
|
}
|
||||||
|
|
||||||
const privateKey = peer.privKey
|
const privateKey = peer.privKey
|
||||||
const dsname = DsName(name)
|
const dsname = DsName(name)
|
||||||
const exists = await self.store.has(dsname)
|
const exists = await self.store.has(dsname)
|
||||||
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), 'ERR_KEY_ALREADY_EXISTS'))
|
if (exists) return throwDelayed(errcode(new Error(`Key '${name}' already exists`), codes.ERR_KEY_ALREADY_EXISTS))
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const kid = await privateKey.id()
|
const kid = await privateKey.id()
|
||||||
@ -482,7 +483,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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
return throwDelayed(err)
|
return throwDelayed(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -495,15 +496,15 @@ class Keychain {
|
|||||||
*/
|
*/
|
||||||
async _getPrivateKey (name) {
|
async _getPrivateKey (name) {
|
||||||
if (!validateKeyName(name)) {
|
if (!validateKeyName(name)) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), 'ERR_INVALID_KEY_NAME'))
|
return throwDelayed(errcode(new Error(`Invalid key name '${name}'`), codes.ERR_INVALID_KEY_NAME))
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
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 (err) {
|
} catch (/** @type {any} */ 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}`), codes.ERR_KEY_NOT_FOUND))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -515,13 +516,13 @@ class Keychain {
|
|||||||
*/
|
*/
|
||||||
async rotateKeychainPass (oldPass, newPass) {
|
async rotateKeychainPass (oldPass, newPass) {
|
||||||
if (typeof oldPass !== 'string') {
|
if (typeof oldPass !== 'string') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid old pass type '${typeof oldPass}'`), 'ERR_INVALID_OLD_PASS_TYPE'))
|
return throwDelayed(errcode(new Error(`Invalid old pass type '${typeof oldPass}'`), codes.ERR_INVALID_OLD_PASS_TYPE))
|
||||||
}
|
}
|
||||||
if (typeof newPass !== 'string') {
|
if (typeof newPass !== 'string') {
|
||||||
return throwDelayed(errcode(new Error(`Invalid new pass type '${typeof newPass}'`), 'ERR_INVALID_NEW_PASS_TYPE'))
|
return throwDelayed(errcode(new Error(`Invalid new pass type '${typeof newPass}'`), codes.ERR_INVALID_NEW_PASS_TYPE))
|
||||||
}
|
}
|
||||||
if (newPass.length < 20) {
|
if (newPass.length < 20) {
|
||||||
return throwDelayed(errcode(new Error(`Invalid pass length ${newPass.length}`), 'ERR_INVALID_PASS_LENGTH'))
|
return throwDelayed(errcode(new Error(`Invalid pass length ${newPass.length}`), codes.ERR_INVALID_PASS_LENGTH))
|
||||||
}
|
}
|
||||||
log('recreating keychain')
|
log('recreating keychain')
|
||||||
const oldDek = privates.get(this).dek
|
const oldDek = privates.get(this).dek
|
||||||
|
@ -24,9 +24,6 @@ const directionToEvent = {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef MetricsProperties
|
|
||||||
* @property {import('../connection-manager')} connectionManager
|
|
||||||
*
|
|
||||||
* @typedef MetricsOptions
|
* @typedef MetricsOptions
|
||||||
* @property {number} [computeThrottleMaxQueueSize = defaultOptions.computeThrottleMaxQueueSize]
|
* @property {number} [computeThrottleMaxQueueSize = defaultOptions.computeThrottleMaxQueueSize]
|
||||||
* @property {number} [computeThrottleTimeout = defaultOptions.computeThrottleTimeout]
|
* @property {number} [computeThrottleTimeout = defaultOptions.computeThrottleTimeout]
|
||||||
@ -37,7 +34,7 @@ const directionToEvent = {
|
|||||||
class Metrics {
|
class Metrics {
|
||||||
/**
|
/**
|
||||||
* @class
|
* @class
|
||||||
* @param {MetricsProperties & MetricsOptions} options
|
* @param {MetricsOptions} options
|
||||||
*/
|
*/
|
||||||
constructor (options) {
|
constructor (options) {
|
||||||
this._options = mergeOptions(defaultOptions, options)
|
this._options = mergeOptions(defaultOptions, options)
|
||||||
@ -47,10 +44,7 @@ class Metrics {
|
|||||||
this._oldPeers = oldPeerLRU(this._options.maxOldPeersRetention)
|
this._oldPeers = oldPeerLRU(this._options.maxOldPeersRetention)
|
||||||
this._running = false
|
this._running = false
|
||||||
this._onMessage = this._onMessage.bind(this)
|
this._onMessage = this._onMessage.bind(this)
|
||||||
this._connectionManager = options.connectionManager
|
this._componentMetrics = new Map()
|
||||||
this._connectionManager.on('peer:disconnect', (connection) => {
|
|
||||||
this.onPeerDisconnected(connection.remotePeer)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -94,6 +88,22 @@ class Metrics {
|
|||||||
return Array.from(this._peerStats.keys())
|
return Array.from(this._peerStats.keys())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @returns {Map}
|
||||||
|
*/
|
||||||
|
getComponentMetrics () {
|
||||||
|
return this._componentMetrics
|
||||||
|
}
|
||||||
|
|
||||||
|
updateComponentMetric (component, metric, value) {
|
||||||
|
if (!this._componentMetrics.has(component)) {
|
||||||
|
this._componentMetrics.set(component, new Map())
|
||||||
|
}
|
||||||
|
|
||||||
|
const map = this._componentMetrics.get(component)
|
||||||
|
map.set(metric, value)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the `Stats` object for the given `PeerId` whether it
|
* Returns the `Stats` object for the given `PeerId` whether it
|
||||||
* is a live peer, or in the disconnected peer LRU cache.
|
* is a live peer, or in the disconnected peer LRU cache.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
// @ts-ignore nat-api does not export types
|
// @ts-ignore nat-api does not export types
|
||||||
const NatAPI = require('@motrix/nat-api')
|
const NatAPI = require('nat-api')
|
||||||
const debug = require('debug')
|
const debug = require('debug')
|
||||||
const { promisify } = require('es6-promisify')
|
const { promisify } = require('es6-promisify')
|
||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
@ -10,7 +10,6 @@ const log = Object.assign(debug('libp2p:nat'), {
|
|||||||
})
|
})
|
||||||
const { isBrowser } = require('wherearewe')
|
const { isBrowser } = require('wherearewe')
|
||||||
const retry = require('p-retry')
|
const retry = require('p-retry')
|
||||||
// @ts-ignore private-api does not export types
|
|
||||||
const isPrivateIp = require('private-ip')
|
const isPrivateIp = require('private-ip')
|
||||||
const pkg = require('../package.json')
|
const pkg = require('../package.json')
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
@ -115,6 +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
|
||||||
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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,11 +5,13 @@ const log = Object.assign(debug('libp2p:peer-routing'), {
|
|||||||
error: debug('libp2p:peer-routing:err')
|
error: debug('libp2p:peer-routing:err')
|
||||||
})
|
})
|
||||||
const errCode = require('err-code')
|
const errCode = require('err-code')
|
||||||
|
const errors = require('./errors')
|
||||||
const {
|
const {
|
||||||
storeAddresses,
|
storeAddresses,
|
||||||
uniquePeers,
|
uniquePeers,
|
||||||
requirePeers
|
requirePeers
|
||||||
} = require('./content-routing/utils')
|
} = require('./content-routing/utils')
|
||||||
|
const { TimeoutController } = require('timeout-abort-controller')
|
||||||
|
|
||||||
const merge = require('it-merge')
|
const merge = require('it-merge')
|
||||||
const { pipe } = require('it-pipe')
|
const { pipe } = require('it-pipe')
|
||||||
@ -21,6 +23,7 @@ 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
|
||||||
@ -33,6 +36,7 @@ const {
|
|||||||
* @property {boolean} [enabled = true] - Whether to enable the Refresh manager
|
* @property {boolean} [enabled = true] - Whether to enable the Refresh manager
|
||||||
* @property {number} [bootDelay = 6e5] - Boot delay to start the Refresh Manager (in ms)
|
* @property {number} [bootDelay = 6e5] - Boot delay to start the Refresh Manager (in ms)
|
||||||
* @property {number} [interval = 10e3] - Interval between each Refresh Manager run (in ms)
|
* @property {number} [interval = 10e3] - Interval between each Refresh Manager run (in ms)
|
||||||
|
* @property {number} [timeout = 10e3] - How long to let each refresh run (in ms)
|
||||||
*
|
*
|
||||||
* @typedef {Object} PeerRoutingOptions
|
* @typedef {Object} PeerRoutingOptions
|
||||||
* @property {RefreshManagerOptions} [refreshManager]
|
* @property {RefreshManagerOptions} [refreshManager]
|
||||||
@ -51,7 +55,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(libp2p._dht)
|
this._routers.push(new DHTPeerRouting(libp2p._dht))
|
||||||
}
|
}
|
||||||
|
|
||||||
this._refreshManagerOptions = libp2p._options.peerRouting.refreshManager
|
this._refreshManagerOptions = libp2p._options.peerRouting.refreshManager
|
||||||
@ -78,8 +82,8 @@ class PeerRouting {
|
|||||||
async _findClosestPeersTask () {
|
async _findClosestPeersTask () {
|
||||||
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, { timeout: this._refreshManagerOptions.timeout || 10e3 }))
|
||||||
} catch (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error(err)
|
log.error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,19 +105,24 @@ class PeerRouting {
|
|||||||
*/
|
*/
|
||||||
async findPeer (id, options) { // eslint-disable-line require-await
|
async findPeer (id, options) { // eslint-disable-line require-await
|
||||||
if (!this._routers.length) {
|
if (!this._routers.length) {
|
||||||
throw errCode(new Error('No peer routers available'), 'NO_ROUTERS_AVAILABLE')
|
throw errCode(new Error('No peer routers available'), errors.codes.ERR_NO_ROUTERS_AVAILABLE)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id.toB58String() === this._peerId.toB58String()) {
|
if (id.toB58String() === this._peerId.toB58String()) {
|
||||||
throw errCode(new Error('Should not try to find self'), 'ERR_FIND_SELF')
|
throw errCode(new Error('Should not try to find self'), errors.codes.ERR_FIND_SELF)
|
||||||
}
|
}
|
||||||
|
|
||||||
const output = await pipe(
|
const output = await pipe(
|
||||||
merge(
|
merge(
|
||||||
...this._routers.map(router => [router.findPeer(id, options)])
|
...this._routers.map(router => (async function * () {
|
||||||
|
try {
|
||||||
|
yield await router.findPeer(id, options)
|
||||||
|
} catch (err) {
|
||||||
|
log.error(err)
|
||||||
|
}
|
||||||
|
})())
|
||||||
),
|
),
|
||||||
(source) => filter(source, Boolean),
|
(source) => filter(source, Boolean),
|
||||||
// @ts-ignore findPeer resolves a Promise
|
|
||||||
(source) => storeAddresses(source, this._peerStore),
|
(source) => storeAddresses(source, this._peerStore),
|
||||||
(source) => first(source)
|
(source) => first(source)
|
||||||
)
|
)
|
||||||
@ -122,7 +131,7 @@ class PeerRouting {
|
|||||||
return output
|
return output
|
||||||
}
|
}
|
||||||
|
|
||||||
throw errCode(new Error('not found'), 'NOT_FOUND')
|
throw errCode(new Error(errors.messages.NOT_FOUND), errors.codes.ERR_NOT_FOUND)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -130,12 +139,17 @@ class PeerRouting {
|
|||||||
*
|
*
|
||||||
* @param {Uint8Array} key - A CID like key
|
* @param {Uint8Array} key - A CID like key
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {number} [options.timeout=30e3] - How long the query can take.
|
* @param {number} [options.timeout=30e3] - How long the query can take
|
||||||
|
* @param {AbortSignal} [options.signal] - An AbortSignal to abort the request
|
||||||
* @returns {AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }>}
|
* @returns {AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }>}
|
||||||
*/
|
*/
|
||||||
async * getClosestPeers (key, options = { timeout: 30e3 }) {
|
async * getClosestPeers (key, options = { timeout: 30e3 }) {
|
||||||
if (!this._routers.length) {
|
if (!this._routers.length) {
|
||||||
throw errCode(new Error('No peer routers available'), 'NO_ROUTERS_AVAILABLE')
|
throw errCode(new Error('No peer routers available'), errors.codes.ERR_NO_ROUTERS_AVAILABLE)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options.timeout) {
|
||||||
|
options.signal = new TimeoutController(options.timeout).signal
|
||||||
}
|
}
|
||||||
|
|
||||||
yield * pipe(
|
yield * pipe(
|
||||||
|
@ -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 (err) {
|
} catch (/** @type {any} */ err) {
|
||||||
log.error('invalid peer record received')
|
log.error('invalid peer record received')
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -2,10 +2,7 @@
|
|||||||
|
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
const { codes } = require('../errors')
|
||||||
const {
|
|
||||||
codes: { ERR_INVALID_PARAMETERS }
|
|
||||||
} = require('../errors')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {any} data
|
* @param {any} data
|
||||||
@ -48,7 +45,7 @@ class Book {
|
|||||||
* @param {any[]|any} data
|
* @param {any[]|any} data
|
||||||
*/
|
*/
|
||||||
set (peerId, data) {
|
set (peerId, data) {
|
||||||
throw errcode(new Error('set must be implemented by the subclass'), 'ERR_NOT_IMPLEMENTED')
|
throw errcode(new Error('set must be implemented by the subclass'), codes.ERR_NOT_IMPLEMENTED)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -94,7 +91,7 @@ class Book {
|
|||||||
*/
|
*/
|
||||||
get (peerId) {
|
get (peerId) {
|
||||||
if (!PeerId.isPeerId(peerId)) {
|
if (!PeerId.isPeerId(peerId)) {
|
||||||
throw errcode(new Error('peerId must be an instance of peer-id'), ERR_INVALID_PARAMETERS)
|
throw errcode(new Error('peerId must be an instance of peer-id'), codes.ERR_INVALID_PARAMETERS)
|
||||||
}
|
}
|
||||||
|
|
||||||
const rec = this.data.get(peerId.toB58String())
|
const rec = this.data.get(peerId.toB58String())
|
||||||
@ -111,7 +108,7 @@ class Book {
|
|||||||
*/
|
*/
|
||||||
delete (peerId) {
|
delete (peerId) {
|
||||||
if (!PeerId.isPeerId(peerId)) {
|
if (!PeerId.isPeerId(peerId)) {
|
||||||
throw errcode(new Error('peerId must be an instance of peer-id'), ERR_INVALID_PARAMETERS)
|
throw errcode(new Error('peerId must be an instance of peer-id'), codes.ERR_INVALID_PARAMETERS)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.data.delete(peerId.toB58String())) {
|
if (!this.data.delete(peerId.toB58String())) {
|
||||||
|
@ -99,7 +99,7 @@ class PeerStore extends EventEmitter {
|
|||||||
|
|
||||||
const peersData = new Map()
|
const peersData = new Map()
|
||||||
storedPeers.forEach((idStr) => {
|
storedPeers.forEach((idStr) => {
|
||||||
peersData.set(idStr, this.get(PeerId.createFromCID(idStr)))
|
peersData.set(idStr, this.get(PeerId.createFromB58String(idStr)))
|
||||||
})
|
})
|
||||||
|
|
||||||
return peersData
|
return peersData
|
||||||
|
@ -5,7 +5,7 @@ const log = Object.assign(debug('libp2p:peer-store:proto-book'), {
|
|||||||
error: debug('libp2p:peer-store:proto-book:err')
|
error: debug('libp2p:peer-store:proto-book:err')
|
||||||
})
|
})
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
const uint8ArrayEquals = require('uint8arrays/equals')
|
const { equals: uint8ArrayEquals } = require('uint8arrays/equals')
|
||||||
|
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
@ -80,10 +80,11 @@ 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()
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user