mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-07-10 14:21:33 +00:00
Compare commits
98 Commits
v0.31.0-rc
...
chore/use-
Author | SHA1 | Date | |
---|---|---|---|
7781075a7a | |||
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 | |||
f7183e8afd | |||
b9988adce9 | |||
b291bc06ec | |||
755eb909f2 | |||
afe0f854e8 | |||
50f7f32e53 | |||
052aad4e06 | |||
2c4b567b00 | |||
2a6a635f13 | |||
cd152f122f | |||
2959794796 | |||
2068c845cb | |||
d8ba284883 | |||
869d35d852 | |||
d6540bf01d | |||
478963ad2d | |||
d22ad83890 | |||
538f296b0a | |||
7bac2045cc | |||
818d2b2a98 | |||
d163ffd224 | |||
b29d6c9304 | |||
890dd05941 | |||
a79c6b50d7 | |||
d372a68692 | |||
4e3fc19623 | |||
2fa82b387c | |||
8fc6f8af81 | |||
924585b143 | |||
556f0203db | |||
b5a9eb2087 | |||
e5187d02ba | |||
150e4f97c1 | |||
302bb90058 | |||
f860ffb3e7 | |||
2572f3e034 | |||
d76356e56a | |||
e9543eb2e1 | |||
5282708263 | |||
ed494f03ae | |||
ac370fc967 | |||
ef4393649f | |||
f23fd4b7c7 | |||
5372f7af2f | |||
97da0ba740 | |||
88b04156bf | |||
64f3af897b | |||
54e502afcb | |||
086b0ec0df | |||
cc1f4af879 | |||
6456a0fff8 | |||
44463b9145 | |||
3ffeb4ebe6 | |||
828a32d4f5 | |||
b4fb9b7bf2 |
@ -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
|
||||||
|
|
||||||
|
5
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
5
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
|
contact_links:
|
||||||
|
- name: libp2p Official Forum
|
||||||
|
url: https://discuss.libp2p.io
|
||||||
|
about: For general questions, support requests and discussions
|
55
.github/ISSUE_TEMPLATE/open_an_issue.md
vendored
Normal file
55
.github/ISSUE_TEMPLATE/open_an_issue.md
vendored
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
---
|
||||||
|
name: Open an issue
|
||||||
|
about: For reporting bugs or errors in the JavaScript libp2p implementation
|
||||||
|
title: ''
|
||||||
|
labels: need/triage
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Thank you for reporting an issue.
|
||||||
|
|
||||||
|
This issue tracker is for bugs found within the JavaScript implementation of libp2p.
|
||||||
|
|
||||||
|
If you are asking a question about how to use libp2p, please ask on https://discuss.libp2p.io
|
||||||
|
|
||||||
|
Otherwise please fill in as much of the template below as possible.
|
||||||
|
-->
|
||||||
|
|
||||||
|
- **Version**:
|
||||||
|
<!--
|
||||||
|
Check package.json version
|
||||||
|
-->
|
||||||
|
|
||||||
|
- **Platform**:
|
||||||
|
<!--
|
||||||
|
Output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows). If using in a Browser, please share the browser version as well
|
||||||
|
-->
|
||||||
|
|
||||||
|
- **Subsystem**:
|
||||||
|
<!--
|
||||||
|
If known, please specify affected core module name (e.g Dialer, Pubsub, Relay etc)
|
||||||
|
-->
|
||||||
|
|
||||||
|
#### Severity:
|
||||||
|
<!--
|
||||||
|
One of following:
|
||||||
|
Critical - System crash, application panic.
|
||||||
|
High - The main functionality of the application does not work, API breakage, repo format breakage, etc.
|
||||||
|
Medium - A non-essential functionality does not work, performance issues, etc.
|
||||||
|
Low - An optional functionality does not work.
|
||||||
|
Very Low - Translation or documentation mistake. Something that won't give anyone a bad day.
|
||||||
|
-->
|
||||||
|
|
||||||
|
#### Description:
|
||||||
|
<!--
|
||||||
|
- What you did
|
||||||
|
- What happened
|
||||||
|
- What you expected to happen
|
||||||
|
-->
|
||||||
|
|
||||||
|
#### Steps to reproduce the error:
|
||||||
|
<!--
|
||||||
|
If possible, please provide code that demonstrates the problem, keeping it as simple and free of external dependencies as you are able
|
||||||
|
-->
|
||||||
|
|
@ -25,7 +25,6 @@
|
|||||||
- [ ] [js-ipfs](https://github.com/ipfs/js-ipfs)
|
- [ ] [js-ipfs](https://github.com/ipfs/js-ipfs)
|
||||||
- Documentation
|
- Documentation
|
||||||
- [ ] Ensure that README.md is up to date
|
- [ ] Ensure that README.md is up to date
|
||||||
- [ ] Ensure [libp2p/js-libp2p-examples](https://github.com/libp2p/js-libp2p-examples) is updated
|
|
||||||
- [ ] Ensure that [libp2p/docs](https://github.com/libp2p/docs) is updated
|
- [ ] Ensure that [libp2p/docs](https://github.com/libp2p/docs) is updated
|
||||||
- Communication
|
- Communication
|
||||||
- [ ] Create the release issue
|
- [ ] Create the release issue
|
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
|
24
.github/workflows/examples.yml
vendored
24
.github/workflows/examples.yml
vendored
@ -22,81 +22,81 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- auto-relay
|
- run: cd examples && npm install && npm run test -- auto-relay
|
||||||
test-chat-example:
|
test-chat-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- chat
|
- run: cd examples && npm install && npm run test -- chat
|
||||||
test-connection-encryption-example:
|
test-connection-encryption-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- connection-encryption
|
- run: cd examples && npm install && npm run test -- connection-encryption
|
||||||
test-discovery-mechanisms-example:
|
test-discovery-mechanisms-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- discovery-mechanisms
|
- run: cd examples && npm install && npm run test -- discovery-mechanisms
|
||||||
test-echo-example:
|
test-echo-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- echo
|
- run: cd examples && npm install && npm run test -- echo
|
||||||
test-libp2p-in-the-browser-example:
|
test-libp2p-in-the-browser-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- libp2p-in-the-browser
|
- run: cd examples && npm install && npm run test -- libp2p-in-the-browser
|
||||||
test-peer-and-content-routing-example:
|
test-peer-and-content-routing-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- peer-and-content-routing
|
- run: cd examples && npm install && npm run test -- peer-and-content-routing
|
||||||
test-pnet-example:
|
test-pnet-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- pnet
|
- run: cd examples && npm install && npm run test -- pnet
|
||||||
test-protocol-and-stream-muxing-example:
|
test-protocol-and-stream-muxing-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- protocol-and-stream-muxing
|
- run: cd examples && npm install && npm run test -- protocol-and-stream-muxing
|
||||||
test-pubsub-example:
|
test-pubsub-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- pubsub
|
- run: cd examples && npm install && npm run test -- pubsub
|
||||||
test-transports-example:
|
test-transports-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- transports
|
- run: cd examples && npm install && npm run test -- transports
|
||||||
test-webrtc-direct-example:
|
test-webrtc-direct-example:
|
||||||
needs: check
|
needs: check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: cd examples && yarn && npm run test -- webrtc-direct
|
- run: cd examples && npm install && npm run test -- webrtc-direct
|
11
.github/workflows/main.yml
vendored
11
.github/workflows/main.yml
vendored
@ -12,12 +12,15 @@ 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: 14
|
||||||
- run: npm install
|
- run: npm install
|
||||||
- run: npx aegir lint
|
- run: npx aegir lint
|
||||||
- uses: gozala/typescript-error-reporter-action@v1.0.8
|
- 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@v32.1.0
|
||||||
name: size
|
name: size
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@ -27,11 +30,11 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, ubuntu-latest, macos-latest]
|
os: [windows-latest, ubuntu-latest, macos-latest]
|
||||||
node: [14]
|
node: [14, 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
|
||||||
@ -64,4 +67,4 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- 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: cd node_modules/interop-libp2p && yarn && LIBP2P_JS=${GITHUB_WORKSPACE}/src/index.js npx aegir test -t node --bail -- --exit
|
||||||
|
176
CHANGELOG.md
176
CHANGELOG.md
@ -1,3 +1,179 @@
|
|||||||
|
# [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)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* chat example with new multiaddr ([#946](https://github.com/libp2p/js-libp2p/issues/946)) ([d8ba284](https://github.com/libp2p/js-libp2p/commit/d8ba2848833d9fb8a963d1b7c8d27062c6f829da))
|
||||||
|
* dialer leaking resources after stopping ([#947](https://github.com/libp2p/js-libp2p/issues/947)) ([b291bc0](https://github.com/libp2p/js-libp2p/commit/b291bc06ec13feeb6e010730edfad754a3b2dc1b))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.6](https://github.com/libp2p/js-libp2p/compare/v0.31.5...v0.31.6) (2021-05-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* keychain rotate passphrase ([#944](https://github.com/libp2p/js-libp2p/issues/944)) ([478963a](https://github.com/libp2p/js-libp2p/commit/478963ad2d195444494c0acc54cb3847a29e117c))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.5](https://github.com/libp2p/js-libp2p/compare/v0.31.4...v0.31.5) (2021-05-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* store remote agent and protocol version during identify ([#943](https://github.com/libp2p/js-libp2p/issues/943)) ([818d2b2](https://github.com/libp2p/js-libp2p/commit/818d2b2a98736f4242694479089396f6070cdad5))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.4](https://github.com/libp2p/js-libp2p/compare/v0.31.3...v0.31.4) (2021-05-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* peerRouting.findPeer() trying to find self ([#941](https://github.com/libp2p/js-libp2p/issues/941)) ([a79c6b5](https://github.com/libp2p/js-libp2p/commit/a79c6b50d7fddbcdb1af53efae922cecad4c9a83))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.3](https://github.com/libp2p/js-libp2p/compare/v0.31.2...v0.31.3) (2021-05-04)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.2](https://github.com/libp2p/js-libp2p/compare/v0.31.1...v0.31.2) (2021-04-30)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* moving averages record types ([#935](https://github.com/libp2p/js-libp2p/issues/935)) ([b5a9eb2](https://github.com/libp2p/js-libp2p/commit/b5a9eb208763efa027d0b4caae87c515b6f5869b))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [0.31.1](https://github.com/libp2p/js-libp2p/compare/v0.31.0...v0.31.1) (2021-04-30)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* event emitter and interfaces types for discovery and routing ([#934](https://github.com/libp2p/js-libp2p/issues/934)) ([302bb90](https://github.com/libp2p/js-libp2p/commit/302bb9005891aa06b70a5f354bfac6b2d5a3c3b8))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.31.0](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.7...v0.31.0) (2021-04-28)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.31.0-rc.7](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.6...v0.31.0-rc.7) (2021-04-27)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* address book guarantees no replicated entries are added ([#927](https://github.com/libp2p/js-libp2p/issues/927)) ([ac370fc](https://github.com/libp2p/js-libp2p/commit/ac370fc9679b51da8cee3791b6dd268d0695d136))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.31.0-rc.6](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.5...v0.31.0-rc.6) (2021-04-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* keychain optional pw and use interfaces for validators and selectors instead ([#924](https://github.com/libp2p/js-libp2p/issues/924)) ([88b0415](https://github.com/libp2p/js-libp2p/commit/88b04156bf614650c2b14d49b12e969c5eecf04d))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# [0.31.0-rc.5](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.4...v0.31.0-rc.5) (2021-04-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* address book should not emit peer event if no addresses are known ([b4fb9b7](https://github.com/libp2p/js-libp2p/commit/b4fb9b7bf266ba03c4462c0a41b1c2691e4e88d4))
|
||||||
|
* demand pubsub subclass instead of pubsub instance ([#922](https://github.com/libp2p/js-libp2p/issues/922)) ([086b0ec](https://github.com/libp2p/js-libp2p/commit/086b0ec0df2fac93845d0a0a6b2e2464e869afcd))
|
||||||
|
* dht configuration selectors and validators ([#919](https://github.com/libp2p/js-libp2p/issues/919)) ([cc1f4af](https://github.com/libp2p/js-libp2p/commit/cc1f4af879a58e94538591851d0085ff98cd2641))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# [0.31.0-rc.4](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.3...v0.31.0-rc.4) (2021-04-20)
|
# [0.31.0-rc.4](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.3...v0.31.0-rc.4) (2021-04-20)
|
||||||
|
|
||||||
|
|
||||||
|
@ -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) |
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Configuration
|
#
|
||||||
|
|
||||||
- [Configuration](#configuration)
|
- [Configuration](#configuration)
|
||||||
- [Overview](#overview)
|
- [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.
|
||||||
@ -282,7 +282,7 @@ const node = await Libp2p.create({
|
|||||||
interval: 1000,
|
interval: 1000,
|
||||||
enabled: true
|
enabled: true
|
||||||
},
|
},
|
||||||
[Bootstrap.tag:] {
|
[Bootstrap.tag]: {
|
||||||
list: [ // A list of bootstrap peers to connect to starting up the node
|
list: [ // A list of bootstrap peers to connect to starting up the node
|
||||||
"/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
|
"/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
|
||||||
"/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
|
"/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
|
||||||
@ -373,7 +373,7 @@ const node = await Libp2p.create({
|
|||||||
config: {
|
config: {
|
||||||
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,
|
enabled: true, // This flag is required for DHT to run (disabled by default)
|
||||||
randomWalk: {
|
randomWalk: {
|
||||||
enabled: true, // Allows to disable discovery (enabled by default)
|
enabled: true, // Allows to disable discovery (enabled by default)
|
||||||
interval: 300e3,
|
interval: 300e3,
|
||||||
@ -399,13 +399,13 @@ const PeerId = require('peer-id')
|
|||||||
// create a peerId
|
// create a peerId
|
||||||
const peerId = await PeerId.create()
|
const peerId = await PeerId.create()
|
||||||
|
|
||||||
const delegatedPeerRouting = new DelegatedPeerRouter(ipfsHttpClient({
|
const delegatedPeerRouting = new DelegatedPeerRouter(ipfsHttpClient.create({
|
||||||
host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
|
host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
|
||||||
protocol: 'https',
|
protocol: 'https',
|
||||||
port: 443
|
port: 443
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const delegatedContentRouting = new DelegatedContentRouter(peerId, ipfsHttpClient({
|
const delegatedContentRouting = new DelegatedContentRouter(peerId, ipfsHttpClient.create({
|
||||||
host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
|
host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
|
||||||
protocol: 'https',
|
protocol: 'https',
|
||||||
port: 443
|
port: 443
|
||||||
@ -503,6 +503,9 @@ const MPLEX = require('libp2p-mplex')
|
|||||||
const { NOISE } = require('libp2p-noise')
|
const { NOISE } = require('libp2p-noise')
|
||||||
const LevelStore = require('datastore-level')
|
const LevelStore = require('datastore-level')
|
||||||
|
|
||||||
|
const datastore = new LevelStore('path/to/store')
|
||||||
|
await datastore.open()
|
||||||
|
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
modules: {
|
modules: {
|
||||||
transport: [TCP],
|
transport: [TCP],
|
||||||
@ -511,11 +514,11 @@ const node = await Libp2p.create({
|
|||||||
},
|
},
|
||||||
keychain: {
|
keychain: {
|
||||||
pass: 'notsafepassword123456789',
|
pass: 'notsafepassword123456789',
|
||||||
datastore: new LevelStore('path/to/store')
|
datastore: dsInstant,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
await libp2p.loadKeychain()
|
await node.loadKeychain()
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Configuring Dialing
|
#### Configuring Dialing
|
||||||
@ -525,6 +528,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 +553,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,16 +676,18 @@ 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 LevelStore = require('datastore-level')
|
||||||
|
|
||||||
|
const datastore = new LevelStore('path/to/store')
|
||||||
|
const dsInstant = await datastore.open()
|
||||||
|
|
||||||
const node = await Libp2p.create({
|
const node = await Libp2p.create({
|
||||||
modules: {
|
modules: {
|
||||||
transport: [TCP],
|
transport: [TCP],
|
||||||
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 +786,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:
|
||||||
|
123
doc/migrations/v0.30-v0.31.md
Normal file
123
doc/migrations/v0.30-v0.31.md
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
<!--Specify versions for migration below-->
|
||||||
|
# Migrating to libp2p@31
|
||||||
|
|
||||||
|
A migration guide for refactoring your application code from libp2p v0.30.x to v0.31.0.
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [Types](#types)
|
||||||
|
- [API](#api)
|
||||||
|
- [Module Updates](#module-updates)
|
||||||
|
|
||||||
|
## Types
|
||||||
|
|
||||||
|
Most of the type definitions in the libp2p configuration were `any` or were not included before this release. This might cause breaking changes on upstream projects relying on the previous provided types, as well as to libp2p modules implemented by the libp2p community.
|
||||||
|
|
||||||
|
## API
|
||||||
|
|
||||||
|
### Core API
|
||||||
|
|
||||||
|
`libp2p.dialProtocol` does not accept empty or null protocols returning a connection anymore and `dial` must be used instead.
|
||||||
|
|
||||||
|
```js
|
||||||
|
const connection = await libp2p.dialProtocol(peerId)
|
||||||
|
```
|
||||||
|
|
||||||
|
**After**
|
||||||
|
|
||||||
|
```js
|
||||||
|
const connection = await libp2p.dial(peerId)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Connection Manager Options
|
||||||
|
|
||||||
|
We updated the connection manager options naming in `libp2p@0.29` but kept it backward compatible until now.
|
||||||
|
|
||||||
|
**Before**
|
||||||
|
|
||||||
|
```js
|
||||||
|
const node = await Libp2p.create({
|
||||||
|
connectionManager: {
|
||||||
|
minPeers: 0
|
||||||
|
}
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
**After**
|
||||||
|
|
||||||
|
```js
|
||||||
|
const node = await Libp2p.create({
|
||||||
|
connectionManager: {
|
||||||
|
minConnections: 0
|
||||||
|
}
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
You can see full details on how to configure the connection manager [here](https://github.com/libp2p/js-libp2p/blob/master/doc/CONFIGURATION.md#configuring-connection-manager).
|
||||||
|
|
||||||
|
### Dialer and Keychain components
|
||||||
|
|
||||||
|
Internal property names to create a libp2p `Dialer` and `Keychain` were updated to reflect the properties naming in the libp2p configuration. These are internal modules of libp2p core and should not impact most of the users, but as it is possible to use them separately here follow the changes:
|
||||||
|
|
||||||
|
***Before**
|
||||||
|
|
||||||
|
```js
|
||||||
|
const dialer = new Dialer({
|
||||||
|
transportManager,
|
||||||
|
peerStore,
|
||||||
|
concurrency,
|
||||||
|
perPeerLimit,
|
||||||
|
timeout,
|
||||||
|
resolvers,
|
||||||
|
addressSorter
|
||||||
|
})
|
||||||
|
|
||||||
|
const keychain = new Keychain(datastore, {
|
||||||
|
passPhrase
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
**After**
|
||||||
|
|
||||||
|
```js
|
||||||
|
this.dialer = new Dialer({
|
||||||
|
transportManager,
|
||||||
|
peerStore,
|
||||||
|
maxParallelDials,
|
||||||
|
maxDialsPerPeer,
|
||||||
|
dialTimeout,
|
||||||
|
resolvers,
|
||||||
|
addressSorter
|
||||||
|
})
|
||||||
|
|
||||||
|
const keychain = new Keychain(datastore, {
|
||||||
|
pass
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
## 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.12.3",
|
||||||
|
"libp2p-crypto": "^0.19.4",
|
||||||
|
"libp2p-interfaces": "^0.10.0",
|
||||||
|
"libp2p-delegated-content-routing": "^0.10.0",
|
||||||
|
"libp2p-delegated-peer-routing": "^0.9.0",
|
||||||
|
"libp2p-floodsub": "^0.25.1",
|
||||||
|
"libp2p-gossipsub": "^0.9.0",
|
||||||
|
"libp2p-kad-dht": "^0.22.0",
|
||||||
|
"libp2p-mdns": "^0.16.0",
|
||||||
|
"libp2p-noise": "^3.0.0",
|
||||||
|
"libp2p-tcp": "^0.15.4",
|
||||||
|
"libp2p-webrtc-star": "^0.22.2",
|
||||||
|
"libp2p-websockets": "^0.15.6"
|
||||||
|
```
|
||||||
|
|
||||||
|
One of the main changes in this new release is the update to `multiaddr@9.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.
|
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], {
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
/* eslint-disable no-console */
|
/* eslint-disable no-console */
|
||||||
|
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
const multiaddr = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
const createLibp2p = require('./libp2p')
|
const createLibp2p = require('./libp2p')
|
||||||
const { stdinToStream, streamToConsole } = require('./stream')
|
const { stdinToStream, streamToConsole } = require('./stream')
|
||||||
|
|
||||||
async function run() {
|
async function run () {
|
||||||
const [idDialer, idListener] = await Promise.all([
|
const [idDialer, idListener] = await Promise.all([
|
||||||
PeerId.createFromJSON(require('./peer-id-dialer')),
|
PeerId.createFromJSON(require('./peer-id-dialer')),
|
||||||
PeerId.createFromJSON(require('./peer-id-listener'))
|
PeerId.createFromJSON(require('./peer-id-listener'))
|
||||||
@ -30,7 +30,7 @@ async function run() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// Dial to the remote peer (the "listener")
|
// Dial to the remote peer (the "listener")
|
||||||
const listenerMa = multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toB58String()}`)
|
const listenerMa = new Multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toB58String()}`)
|
||||||
const { stream } = await nodeDialer.dialProtocol(listenerMa, '/chat/1.0.0')
|
const { stream } = await nodeDialer.dialProtocol(listenerMa, '/chat/1.0.0')
|
||||||
|
|
||||||
console.log('Dialer dialed to listener on protocol: /chat/1.0.0')
|
console.log('Dialer dialed to listener on protocol: /chat/1.0.0')
|
||||||
|
@ -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('../../..')
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ const PeerId = require('peer-id')
|
|||||||
const createLibp2p = require('./libp2p.js')
|
const createLibp2p = require('./libp2p.js')
|
||||||
const { stdinToStream, streamToConsole } = require('./stream')
|
const { stdinToStream, streamToConsole } = require('./stream')
|
||||||
|
|
||||||
async function run() {
|
async function run () {
|
||||||
// Create a new libp2p node with the given multi-address
|
// Create a new libp2p node with the given multi-address
|
||||||
const idListener = await PeerId.createFromJSON(require('./peer-id-listener'))
|
const idListener = await PeerId.createFromJSON(require('./peer-id-listener'))
|
||||||
const nodeListener = await createLibp2p({
|
const nodeListener = await createLibp2p({
|
||||||
|
@ -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()
|
||||||
|
@ -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')
|
||||||
|
@ -168,7 +168,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)], {
|
||||||
|
@ -4,9 +4,13 @@ This example leverages the [Parcel.js bundler](https://parceljs.org/) to compile
|
|||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
In order to run the example, first install the dependencies from same directory as this README:
|
In order to run the example:
|
||||||
|
|
||||||
|
- Install dependencey at the root of the js-libp2p repository (if not already done),
|
||||||
|
- then, install the dependencies from same directory as this README:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
npm install
|
||||||
cd ./examples/libp2p-in-the-browser
|
cd ./examples/libp2p-in-the-browser
|
||||||
npm install
|
npm install
|
||||||
```
|
```
|
||||||
|
@ -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",
|
||||||
|
@ -10,12 +10,16 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"execa": "^2.1.0",
|
"execa": "^2.1.0",
|
||||||
"fs-extra": "^8.1.0",
|
"fs-extra": "^8.1.0",
|
||||||
"libp2p-pubsub-peer-discovery": "^3.0.0",
|
"libp2p": "../src",
|
||||||
"libp2p-relay-server": "^0.1.2",
|
"libp2p-pubsub-peer-discovery": "^4.0.0",
|
||||||
|
"libp2p-relay-server": "^0.3.0",
|
||||||
|
"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": {
|
||||||
|
"https": "^1.0.0",
|
||||||
"playwright": "^1.7.1"
|
"playwright": "^1.7.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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({
|
||||||
|
@ -8,6 +8,10 @@ We've seen many interesting use cases appear with this, here are some highlights
|
|||||||
- [IPFS PubSub (using libp2p-floodsub) for IoT](https://www.youtube.com/watch?v=qLpM5pBDGiE).
|
- [IPFS PubSub (using libp2p-floodsub) for IoT](https://www.youtube.com/watch?v=qLpM5pBDGiE).
|
||||||
- [Real Time distributed Applications](https://www.youtube.com/watch?v=vQrbxyDPSXg)
|
- [Real Time distributed Applications](https://www.youtube.com/watch?v=vQrbxyDPSXg)
|
||||||
|
|
||||||
|
## 0. Set up the example
|
||||||
|
|
||||||
|
Before moving into the examples, you should run `npm install` on the top level `js-libp2p` folder, in order to install all the dependencies needed for this example. In addition, you will need to install the example related dependencies by doing `cd examples && npm install`. Once the install finishes, you should move into the example folder with `cd pubsub`.
|
||||||
|
|
||||||
## 1. Setting up a simple PubSub network on top of libp2p
|
## 1. Setting up a simple PubSub network on top of libp2p
|
||||||
|
|
||||||
For this example, we will use MulticastDNS for automatic Peer Discovery. This example is based the previous examples found in [Discovery Mechanisms](../discovery-mechanisms). You can find the complete version at [1.js](./1.js).
|
For this example, we will use MulticastDNS for automatic Peer Discovery. This example is based the previous examples found in [Discovery Mechanisms](../discovery-mechanisms). You can find the complete version at [1.js](./1.js).
|
||||||
|
@ -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')
|
||||||
|
89
examples/transports/4.js
Normal file
89
examples/transports/4.js
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
/* eslint-disable no-console */
|
||||||
|
'use strict'
|
||||||
|
|
||||||
|
const Libp2p = require('../..')
|
||||||
|
const TCP = require('libp2p-tcp')
|
||||||
|
const WebSockets = require('libp2p-websockets')
|
||||||
|
const { NOISE } = require('@chainsafe/libp2p-noise')
|
||||||
|
const MPLEX = require('libp2p-mplex')
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
const https = require('https');
|
||||||
|
const pipe = require('it-pipe')
|
||||||
|
|
||||||
|
const transportKey = WebSockets.prototype[Symbol.toStringTag];
|
||||||
|
|
||||||
|
const httpServer = https.createServer({
|
||||||
|
cert: fs.readFileSync('./test_certs/cert.pem'),
|
||||||
|
key: fs.readFileSync('./test_certs/key.pem'),
|
||||||
|
});
|
||||||
|
|
||||||
|
const createNode = async (addresses = []) => {
|
||||||
|
if (!Array.isArray(addresses)) {
|
||||||
|
addresses = [addresses]
|
||||||
|
}
|
||||||
|
|
||||||
|
const node = await Libp2p.create({
|
||||||
|
addresses: {
|
||||||
|
listen: addresses
|
||||||
|
},
|
||||||
|
modules: {
|
||||||
|
transport: [WebSockets],
|
||||||
|
connEncryption: [NOISE],
|
||||||
|
streamMuxer: [MPLEX]
|
||||||
|
},
|
||||||
|
config: {
|
||||||
|
peerDiscovery: {
|
||||||
|
// Disable autoDial as it would fail because we are using a self-signed cert.
|
||||||
|
// `dialProtocol` does not fail because we pass `rejectUnauthorized: false`.
|
||||||
|
autoDial: false
|
||||||
|
},
|
||||||
|
transport: {
|
||||||
|
[transportKey]: {
|
||||||
|
listenerOptions: { server: httpServer },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
await node.start()
|
||||||
|
return node
|
||||||
|
}
|
||||||
|
|
||||||
|
function printAddrs(node, number) {
|
||||||
|
console.log('node %s is listening on:', number)
|
||||||
|
node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
|
||||||
|
}
|
||||||
|
|
||||||
|
function print ({ stream }) {
|
||||||
|
pipe(
|
||||||
|
stream,
|
||||||
|
async function (source) {
|
||||||
|
for await (const msg of source) {
|
||||||
|
console.log(msg.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
;(async () => {
|
||||||
|
const [node1, node2] = await Promise.all([
|
||||||
|
createNode('/ip4/127.0.0.1/tcp/10000/wss'),
|
||||||
|
createNode([])
|
||||||
|
])
|
||||||
|
|
||||||
|
printAddrs(node1, '1')
|
||||||
|
printAddrs(node2, '2')
|
||||||
|
|
||||||
|
node1.handle('/print', print)
|
||||||
|
node2.handle('/print', print)
|
||||||
|
|
||||||
|
const targetAddr = `${node1.multiaddrs[0]}/p2p/${node1.peerId.toB58String()}`;
|
||||||
|
|
||||||
|
// node 2 (Secure WebSockets) dials to node 1 (Secure Websockets)
|
||||||
|
const { stream } = await node2.dialProtocol(targetAddr, '/print', { websocket: { rejectUnauthorized: false } })
|
||||||
|
await pipe(
|
||||||
|
['node 2 dialed to node 1 successfully'],
|
||||||
|
stream
|
||||||
|
)
|
||||||
|
})();
|
@ -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({
|
||||||
|
@ -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()
|
||||||
|
33
examples/transports/test-4.js
Normal file
33
examples/transports/test-4.js
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
'use strict'
|
||||||
|
|
||||||
|
const path = require('path')
|
||||||
|
const execa = require('execa')
|
||||||
|
const pDefer = require('p-defer')
|
||||||
|
const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
|
|
||||||
|
async function test () {
|
||||||
|
const deferNode1 = pDefer()
|
||||||
|
|
||||||
|
process.stdout.write('4.js\n')
|
||||||
|
|
||||||
|
const proc = execa('node', [path.join(__dirname, '4.js')], {
|
||||||
|
cwd: path.resolve(__dirname),
|
||||||
|
all: true
|
||||||
|
})
|
||||||
|
|
||||||
|
proc.all.on('data', async (data) => {
|
||||||
|
process.stdout.write(data)
|
||||||
|
const line = uint8ArrayToString(data)
|
||||||
|
|
||||||
|
if (line.includes('node 2 dialed to node 1 successfully')) {
|
||||||
|
deferNode1.resolve()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
deferNode1.promise,
|
||||||
|
])
|
||||||
|
proc.kill()
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = test
|
@ -3,11 +3,13 @@
|
|||||||
const test1 = require('./test-1')
|
const test1 = require('./test-1')
|
||||||
const test2 = require('./test-2')
|
const test2 = require('./test-2')
|
||||||
const test3 = require('./test-3')
|
const test3 = require('./test-3')
|
||||||
|
const test4 = require('./test-4')
|
||||||
|
|
||||||
async function test() {
|
async function test() {
|
||||||
await test1()
|
await test1()
|
||||||
await test2()
|
await test2()
|
||||||
await test3()
|
await test3()
|
||||||
|
await test4()
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = test
|
module.exports = test
|
||||||
|
32
examples/transports/test_certs/cert.pem
Normal file
32
examples/transports/test_certs/cert.pem
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFlzCCA3+gAwIBAgIUMYedwb9L/BtvZ7Lhu71iSKrXsa4wDQYJKoZIhvcNAQEL
|
||||||
|
BQAwajELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlZBMREwDwYDVQQHDAhTb21lQ2l0
|
||||||
|
eTESMBAGA1UECgwJTXlDb21wYW55MRMwEQYDVQQLDApNeURpdmlzaW9uMRIwEAYD
|
||||||
|
VQQDDAkxMjcuMC4wLjEwHhcNMjEwNDI4MDIzMjA5WhcNMjIwNDI4MDIzMjA5WjBq
|
||||||
|
MQswCQYDVQQGEwJVUzELMAkGA1UECAwCVkExETAPBgNVBAcMCFNvbWVDaXR5MRIw
|
||||||
|
EAYDVQQKDAlNeUNvbXBhbnkxEzARBgNVBAsMCk15RGl2aXNpb24xEjAQBgNVBAMM
|
||||||
|
CTEyNy4wLjAuMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANNhXBu0
|
||||||
|
GH1Kzl9iaQxCxEnyyAShS5FYScdKxqpYsgJT4poLWLQBZQEFLEqbdillIlTZqMss
|
||||||
|
jWqkFL2xmjqdcnOKFEZUarntVE2hxFYYQex2Fi8MYwFj+Pvt74d02xPyfzFNFgyX
|
||||||
|
a1EakoGBwClaf3I7jW7raPudjcf4HnwQ7r/NwiO8FqHFZgLcTnwI8bk+cxDoDAqu
|
||||||
|
mhqMB5nnerqvKEyR9Fb2PoL+8PwOPJOOKTDVwLMeMJu2WLR8AU2FzOj5SVI2qsu9
|
||||||
|
Ps5azysD8KQAMcw4y9s6do36SaMQS85fbvXBV7XBqMD34HPBUbFiCoFoaCzK9Zfb
|
||||||
|
pCXyVJMUNmw5hyq9nbjUt4Kvr/58bU2gjUKSdPf6KhBxFnDZwl+2qqPdVIb/qtwz
|
||||||
|
HExtJWq3upklXNOg3HoR6vcr1O9ReJHrzLRMEb51WP1aN/qJ2/lRskcZ4A806qwr
|
||||||
|
W67BvnOg6s3ZtxHN9v3bsyfsvC66w8PEfCnCVxugC7cUW0gtW54AU75T3ukg7X+m
|
||||||
|
vECr/+qIzNEBIxxCPgefCG/JAdJhQ5SCvoARAVPStUIWDmigDeOt7go5nKbdVIJ4
|
||||||
|
7bbBFUhHT2mTHu30fHhRqSDcHzwE7Zz6YJIJmKq29UmzUazFnKlLU67MjLJwiDPm
|
||||||
|
fC3GyOdAWkkZE5hjtkiy+3yWoEHhaJYRI1u3AgMBAAGjNTAzMAsGA1UdDwQEAwIE
|
||||||
|
MDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3
|
||||||
|
DQEBCwUAA4ICAQCx/ynu4iCQAK8VId/QQe7GqgOpFgx+6Mce9GQC6ZVEjAPgapsS
|
||||||
|
Pl+l6+11cFjHKv0+Z/iN2JgkFmNXfwJcfYI0tHbMK+0U9hgKb1eFgiIwCqb4cPOz
|
||||||
|
wMwusZ95BjIbtcEbL/+pMUpNhmjPz1fOILJZtDVq++lqJCv7t8+SoAmMVYtlcLNg
|
||||||
|
muuV/UYR3uqvnAJmjgJVWs4otDGrxCYJE48M+9L2Gm05Htpi9WL1bZaQ+fJ85m85
|
||||||
|
daedLc6R1/ZRTIH6i73sD4rYs0bx1fCJvkbcgXtKMHEkiHuG/MzR7Pa4cJAVKCx9
|
||||||
|
lRTgrO7Gkllt2+jp4qg0YhdNq89e0DNA5cyB9H4udRgHQOcrlVRiX9OD/Kz+F5m/
|
||||||
|
fQwMdbnqdg3ar5DSa8Q5g3bdLbNSCcI9sjCLTkNxUC/XTWGdG03RCVIt1qvBvZHk
|
||||||
|
JaG6xGpbRZ5CN0T9eindd38JBrkPAPfgl6qhwvcqh6uVFYua+7KmF9K+mKarlmMw
|
||||||
|
6RWaw2j4sMgUyRIS6fR9vDc20SrtoNvKQM1U6+0VYs1nizfkmsqqqRODmERKbKwc
|
||||||
|
ahKJFubXfr8gz+PipAKFZbxr2EPAyoiNkx+0eM6Eedo55oP2BoGHEfXEoAonyMFM
|
||||||
|
F/xTbpFtdRYE2hwsZCk86fpbcPTmdCY8txeZ7+4Bme2d9XXsTAxF64usqQ==
|
||||||
|
-----END CERTIFICATE-----
|
52
examples/transports/test_certs/key.pem
Normal file
52
examples/transports/test_certs/key.pem
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
-----BEGIN PRIVATE KEY-----
|
||||||
|
MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDTYVwbtBh9Ss5f
|
||||||
|
YmkMQsRJ8sgEoUuRWEnHSsaqWLICU+KaC1i0AWUBBSxKm3YpZSJU2ajLLI1qpBS9
|
||||||
|
sZo6nXJzihRGVGq57VRNocRWGEHsdhYvDGMBY/j77e+HdNsT8n8xTRYMl2tRGpKB
|
||||||
|
gcApWn9yO41u62j7nY3H+B58EO6/zcIjvBahxWYC3E58CPG5PnMQ6AwKrpoajAeZ
|
||||||
|
53q6ryhMkfRW9j6C/vD8DjyTjikw1cCzHjCbtli0fAFNhczo+UlSNqrLvT7OWs8r
|
||||||
|
A/CkADHMOMvbOnaN+kmjEEvOX271wVe1wajA9+BzwVGxYgqBaGgsyvWX26Ql8lST
|
||||||
|
FDZsOYcqvZ241LeCr6/+fG1NoI1CknT3+ioQcRZw2cJftqqj3VSG/6rcMxxMbSVq
|
||||||
|
t7qZJVzToNx6Eer3K9TvUXiR68y0TBG+dVj9Wjf6idv5UbJHGeAPNOqsK1uuwb5z
|
||||||
|
oOrN2bcRzfb927Mn7LwuusPDxHwpwlcboAu3FFtILVueAFO+U97pIO1/prxAq//q
|
||||||
|
iMzRASMcQj4HnwhvyQHSYUOUgr6AEQFT0rVCFg5ooA3jre4KOZym3VSCeO22wRVI
|
||||||
|
R09pkx7t9Hx4Uakg3B88BO2c+mCSCZiqtvVJs1GsxZypS1OuzIyycIgz5nwtxsjn
|
||||||
|
QFpJGROYY7ZIsvt8lqBB4WiWESNbtwIDAQABAoICAQCpGV3iG7Trpohp7gQzdsYo
|
||||||
|
kjxI1+/oGkULVVqQs9vT2N+SdDlF50eyBT1lgfCJNQq97lIGF2IaSaD+D7Jd6c7B
|
||||||
|
d1i42pd2ndGvORYj+cvjKqSchsA9QIjSoYnZRzZrQrdV7WESOZ/0hdlmGTJs4qTJ
|
||||||
|
8bI3ZcPaZjQiIO/iOHmGn0gL5lAEojH1X+C5gT4+/yJ2B+x6LyvAyPzbtj6MUctf
|
||||||
|
VfOuDdf8W47VVV5IfJWfJ6C8qg4gw0M7P2ibZ8qBJcvuJSWFT6OK2UKaGtDLogw0
|
||||||
|
X8tVWfO1qOB3vnWmZtoRZ9aO5JnnpWS9tY1w5gmZdLjB/Kt0DJXIdZALCURwV6U0
|
||||||
|
q5XR0SETEgdRrNX92PA2lmxO9fAgXRSjP/OoeDjAVhnRfYyShDbEIb8GHk7nE+is
|
||||||
|
6ak5ufxKE53S8wB9L7MTPqTvxusBHi8saLevdnPBMQPvtEVkg2Iw/iPBsegUuUjD
|
||||||
|
uzXlq4WUMCUBJEMVPuYEsaQizxpp2oM6AZj/ecuTKFX5CirFFWKOQ4cp+O8lrfI5
|
||||||
|
ruwHrMkfjowDYcQaOLHq13anvt8+8LBlngVw+jiAGB/bGwrAwEZWUc8i1HbH/G8e
|
||||||
|
sm0kMuCqV1GbRyMCUO3pWjzrsz8LEy74Jr0z7KZn52vLWrTkiD4NRXahxTBhHpXb
|
||||||
|
AVclJ+a4BKk2rRJVRFRRQQKCAQEA7+uTl2ZHp1v7A8/I2zPIxoVz0fiwxwAjuv34
|
||||||
|
cV+uxG0n5Tko4PKMxavddRFKNeGvrz0aO/GNX8NIW7pDqZ2CwHyskgUX/bFAqGKF
|
||||||
|
Z/z2DmiZ2rdSUH89O3ysq+OF3RjX/FBNJ0SVdwtrpz3kCSWpa4PnmN7+IevL6zxY
|
||||||
|
8gLrs07Ge+ci94FZaDHBNrkGQ00krbOmwIvnc90hyRPCKfMS+u2/ejKZ5QDyRG+H
|
||||||
|
jbQ008ZV2OqUdS6h1twfoJ1Q4QhHijB6PegRLGdZGuUXIQfFP8dIUsQluKSUFyOy
|
||||||
|
bL9W2yBwtbn3EwYDHLJQnLICxfcTBWg/2vOIucsSjxG7KNY0yQKCAQEA4YwcVpi3
|
||||||
|
D+8OcnbpRBRlHo84DRZorp0RO8vhxevvB1CcBnkLRIYXlS2JIfrnhZAI/5jBk1ei
|
||||||
|
FmgRFyAjZ8gDdkDCiDMQMDUwUhLGSVurI9sk16B4TQKCM+iE0LDrXIy9ezJRJkj0
|
||||||
|
rOt8sqo2/TOttm2KEXY8Cco59tU4bMZg5Tr9l7SMTTj4skTO6Jn6/6hX3XuFkJw7
|
||||||
|
B0DsSzIqXyRHAzOidagIEoIr7k4cEGXsrSWoSiHg/eky1ihCyUw3vDDOmoViBR7s
|
||||||
|
h5nLjQNNAzOtyoKLqST7B7uXkdUo5nV2IUHSGD5LNxlTaNp0XL9Ph3EBtcuwNuB6
|
||||||
|
zyKXc+O5iNfMfwKCAQEA5/RJKCnRgsORxpif5xWEujIRzOHz/yFqagHarbnFHNEv
|
||||||
|
rhT6Kak2YnIL1H/X0IoWsYSQlX2uofQKQ+ysOBM5c2HV8gKMtFAnY+SEeAn/1eRZ
|
||||||
|
QzTTl1G84INj6Xc6V40KXD1CqoFLQ+G9vd4/Vnyb9H99bLXC2wa+ivo4QBqEyEGT
|
||||||
|
8fyAOOxMhUj9NSvjGzQ9DtbOk/9u0PztChtZL/d61TEAW2MKmHW2xGVTl7OvE0QA
|
||||||
|
gYwh5b0k6La+uSj/JeE8USUXOjzgRZ7RbggouV1q3YOMr8BFe+NZ7Zksiqjej1Io
|
||||||
|
xfk6H6FDZv4ao7QSrFR4hlTIz6V9/aqQkdOhsBSQyQKCAQEAzHwz4Qr5xVduGLbY
|
||||||
|
S6HV/7vHDI6Jf+3lBvqUidWa013w5yls3sZXsSckkgshRoVMszayIbystnXJMNcx
|
||||||
|
YlEDWn3iIItzHNHMKkzdOvsCETMIlvnkt6UTmK4xY+dSq4jp7Ty0N+qi8fdaCb2q
|
||||||
|
tyrYTnHHYId6bUHMBY5QZsYAaTNvYNAO96A0UaNyl42q84iTiLkJYg9SsQPad15W
|
||||||
|
7gU84Jk6rEMYdndQDvEAHpnZ1y0yA2vtySZYsbK0wj34tgTl+0/8izn7JgF4ezNH
|
||||||
|
6iQ7Z0OuDT763IrmIxBH0ZEi9YnwSYyIsr6iUYjlQIUuPFRnQYQXEdm5Xfw1pZsL
|
||||||
|
xhYoTwKCAQB9edDe4LX+0z9i4qr0iHV8H/WoyI5UD/Pc217PKkYM3+ewR9SL9D9z
|
||||||
|
TS78Sl7HgRgEmIu+MR/u5B2ePf7jkvB/oxyPwqAzJeJ72mV3Mevm27G/Ndd8lt5W
|
||||||
|
FBCGOx7ZeP4/Cv4mvPD979ix2IalDoWMSWJnpQPN+B1jGeCrUYAXQc1k/vU99gLa
|
||||||
|
8Tuu3WfBpVAsO7hAC9mu6tuLyfKVqiMOVs2aky9xLqiqW/6uIcGu+owrr+gkDDY/
|
||||||
|
JfBSUfxYKcjtJiHOEbFGrrRe93XsngmaTz/Hv9A/QLVCuJgWEHlt4WHSc+BtAtaV
|
||||||
|
9avp6VlyVNfe4KEKW7IekrI0cmfMdXkl
|
||||||
|
-----END PRIVATE KEY-----
|
@ -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 () => {
|
||||||
|
@ -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 () => {
|
||||||
|
@ -21,11 +21,11 @@
|
|||||||
},
|
},
|
||||||
"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.15.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 = []) {
|
||||||
|
@ -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"],
|
||||||
|
140
package.json
140
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p",
|
"name": "libp2p",
|
||||||
"version": "0.31.0-rc.4",
|
"version": "0.33.0",
|
||||||
"description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
|
"description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
|
||||||
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@ -78,20 +78,20 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"abortable-iterator": "^3.0.0",
|
||||||
"@motrix/nat-api": "^0.3.1",
|
"@motrix/nat-api": "^0.3.1",
|
||||||
|
"@vascosantos/moving-average": "^1.1.0",
|
||||||
"abort-controller": "^3.0.0",
|
"abort-controller": "^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",
|
||||||
"ipfs-utils": "^6.0.0",
|
|
||||||
"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,18 +100,16 @@
|
|||||||
"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.0",
|
"libp2p-crypto": "^0.19.4",
|
||||||
"libp2p-interfaces": "^0.10.1",
|
"libp2p-interfaces": "^1.0.0",
|
||||||
"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",
|
||||||
"moving-average": "^1.0.0",
|
"multiaddr": "^10.0.0",
|
||||||
"multiaddr": "^9.0.1",
|
"multiformats": "^9.0.0",
|
||||||
"multicodec": "^3.0.1",
|
|
||||||
"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",
|
||||||
"node-forge": "^0.10.0",
|
"node-forge": "^0.10.0",
|
||||||
@ -119,61 +117,61 @@
|
|||||||
"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.15.0",
|
||||||
"private-ip": "^2.1.0",
|
"private-ip": "^2.1.0",
|
||||||
"protobufjs": "^6.10.2",
|
"protobufjs": "^6.10.2",
|
||||||
"retimer": "^3.0.0",
|
"retimer": "^3.0.0",
|
||||||
"sanitize-filename": "^1.6.3",
|
"sanitize-filename": "^1.6.3",
|
||||||
"set-delayed-interval": "^1.0.0",
|
"set-delayed-interval": "^1.0.0",
|
||||||
"streaming-iterables": "^5.0.2",
|
"streaming-iterables": "^6.0.0",
|
||||||
"timeout-abort-controller": "^1.1.1",
|
"timeout-abort-controller": "^1.1.1",
|
||||||
|
"uint8arrays": "^3.0.0",
|
||||||
"varint": "^6.0.0",
|
"varint": "^6.0.0",
|
||||||
|
"wherearewe": "^1.0.0",
|
||||||
"xsalsa20": "^1.1.0"
|
"xsalsa20": "^1.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@chainsafe/libp2p-noise": "^4.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": "^33.1.1",
|
||||||
"aegir": "^33.0.0",
|
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"chai-bytes": "^0.1.2",
|
"datastore-core": "^6.0.7",
|
||||||
"chai-string": "^1.5.0",
|
|
||||||
"delay": "^5.0.0",
|
"delay": "^5.0.0",
|
||||||
"interop-libp2p": "^0.3.0",
|
"interop-libp2p": "^0.4.0",
|
||||||
"into-stream": "^6.0.0",
|
"into-stream": "^7.0.0",
|
||||||
"ipfs-http-client": "^49.0.4",
|
"ipfs-http-client": "^52.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.13.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.10.0",
|
||||||
"libp2p-floodsub": "^0.25.0",
|
"libp2p-floodsub": "^0.27.0",
|
||||||
"libp2p-gossipsub": "^0.8.0",
|
"libp2p-gossipsub": "^0.11.0",
|
||||||
"libp2p-kad-dht": "^0.21.0",
|
"libp2p-interfaces-compliance-tests": "^1.0.0",
|
||||||
"libp2p-mdns": "^0.16.0",
|
"libp2p-kad-dht": "^0.24.2",
|
||||||
|
"libp2p-mdns": "^0.17.0",
|
||||||
"libp2p-mplex": "^0.10.1",
|
"libp2p-mplex": "^0.10.1",
|
||||||
"libp2p-noise": "^2.0.0",
|
"libp2p-tcp": "^0.17.0",
|
||||||
"libp2p-tcp": "^0.15.1",
|
"libp2p-webrtc-star": "^0.23.0",
|
||||||
"libp2p-webrtc-star": "^0.22.0",
|
"libp2p-websockets": "^0.16.0",
|
||||||
"libp2p-websockets": "^0.15.0",
|
|
||||||
"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": "^11.1.1",
|
||||||
"uint8arrays": "^2.1.3",
|
|
||||||
"util": "^0.12.3"
|
"util": "^0.12.3"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
|
"Vasco Santos <vasco.santos@moxy.studio>",
|
||||||
"David Dias <daviddias.p@gmail.com>",
|
"David Dias <daviddias.p@gmail.com>",
|
||||||
"Jacob Heun <jacobheun@gmail.com>",
|
"Jacob Heun <jacobheun@gmail.com>",
|
||||||
"Vasco Santos <vasco.santos@moxy.studio>",
|
|
||||||
"Alex Potsides <alex@achingbrain.net>",
|
"Alex Potsides <alex@achingbrain.net>",
|
||||||
"Alan Shaw <alan@tableflip.io>",
|
"Alan Shaw <alan@tableflip.io>",
|
||||||
"Cayman <caymannava@gmail.com>",
|
"Cayman <caymannava@gmail.com>",
|
||||||
@ -181,49 +179,69 @@
|
|||||||
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
||||||
"Maciej Krüger <mkg20001@gmail.com>",
|
"Maciej Krüger <mkg20001@gmail.com>",
|
||||||
"Hugo Dias <mail@hugodias.me>",
|
"Hugo Dias <mail@hugodias.me>",
|
||||||
"Volker Mische <volker.mische@gmail.com>",
|
"Chris Dostert <chrisdostert@users.noreply.github.com>",
|
||||||
"dirkmc <dirkmdev@gmail.com>",
|
"dirkmc <dirkmdev@gmail.com>",
|
||||||
|
"Volker Mische <volker.mische@gmail.com>",
|
||||||
|
"zeim839 <50573884+zeim839@users.noreply.github.com>",
|
||||||
"Richard Littauer <richard.littauer@gmail.com>",
|
"Richard Littauer <richard.littauer@gmail.com>",
|
||||||
"a1300 <matthias-knopp@gmx.net>",
|
"a1300 <matthias-knopp@gmx.net>",
|
||||||
|
"Ryan Bell <ryan@piing.net>",
|
||||||
|
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
||||||
|
"Franck Royer <franck@royer.one>",
|
||||||
|
"Thomas Eizinger <thomas@eizinger.io>",
|
||||||
|
"Giovanni T. Parra <fiatjaf@gmail.com>",
|
||||||
|
"acolytec3 <17355484+acolytec3@users.noreply.github.com>",
|
||||||
"Elven <mon.samuel@qq.com>",
|
"Elven <mon.samuel@qq.com>",
|
||||||
"Andrew Nesbitt <andrewnez@gmail.com>",
|
"Andrew Nesbitt <andrewnez@gmail.com>",
|
||||||
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
|
|
||||||
"Giovanni T. Parra <fiatjaf@gmail.com>",
|
|
||||||
"Ryan Bell <ryan@piing.net>",
|
|
||||||
"Thomas Eizinger <thomas@eizinger.io>",
|
|
||||||
"Samlior <samlior@foxmail.com>",
|
"Samlior <samlior@foxmail.com>",
|
||||||
"Didrik Nordström <didrik@betamos.se>",
|
"Didrik Nordström <didrik.nordstrom@gmail.com>",
|
||||||
"Julien Bouquillon <contact@revolunet.com>",
|
|
||||||
"Kevin Kwok <antimatter15@gmail.com>",
|
|
||||||
"Kevin Lacker <lacker@gmail.com>",
|
|
||||||
"Miguel Mota <miguelmota2@gmail.com>",
|
|
||||||
"Nuno Nogueira <nunofmn@gmail.com>",
|
|
||||||
"Philipp Muens <raute1337@gmx.de>",
|
|
||||||
"RasmusErik Voel Jensen <github@solsort.com>",
|
"RasmusErik Voel Jensen <github@solsort.com>",
|
||||||
|
"Robert Kiel <robert.kiel@hoprnet.org>",
|
||||||
"Smite Chow <xiaopengyou@live.com>",
|
"Smite Chow <xiaopengyou@live.com>",
|
||||||
"Soeren <nikorpoulsen@gmail.com>",
|
"Soeren <nikorpoulsen@gmail.com>",
|
||||||
"Sönke Hahn <soenkehahn@gmail.com>",
|
"Sönke Hahn <soenkehahn@gmail.com>",
|
||||||
"TJKoury <TJKoury@gmail.com>",
|
"TJKoury <TJKoury@gmail.com>",
|
||||||
"Tiago Alves <alvesjtiago@gmail.com>",
|
"Tiago Alves <alvesjtiago@gmail.com>",
|
||||||
"Daijiro Wachi <daijiro.wachi@gmail.com>",
|
"XiaoZhang <zxinmyth@gmail.com>",
|
||||||
"Cindy Wu <ciindy.wu@gmail.com>",
|
|
||||||
"Chris Bratlien <chrisbratlien@gmail.com>",
|
|
||||||
"Yusef Napora <yusef@napora.org>",
|
"Yusef Napora <yusef@napora.org>",
|
||||||
"Zane Starr <zcstarr@gmail.com>",
|
"Zane Starr <zcstarr@gmail.com>",
|
||||||
"Bernd Strehl <bernd.strehl@gmail.com>",
|
|
||||||
"ebinks <elizabethjbinks@gmail.com>",
|
"ebinks <elizabethjbinks@gmail.com>",
|
||||||
"Ethan Lam <elmemphis2000@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>",
|
||||||
|
"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>",
|
||||||
|
"Chris Bratlien <chrisbratlien@gmail.com>",
|
||||||
|
"Cindy Wu <ciindy.wu@gmail.com>",
|
||||||
|
"Daijiro Wachi <daijiro.wachi@gmail.com>",
|
||||||
|
"Diogo Silva <fsdiogo@gmail.com>",
|
||||||
|
"Dmitriy Ryajov <dryajov@gmail.com>",
|
||||||
|
"Ethan Lam <elmemphis2000@gmail.com>",
|
||||||
"Fei Liu <liu.feiwood@gmail.com>",
|
"Fei Liu <liu.feiwood@gmail.com>",
|
||||||
"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>",
|
||||||
"Dmitriy Ryajov <dryajov@gmail.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>",
|
||||||
"Diogo Silva <fsdiogo@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>",
|
||||||
|
"Kevin Kwok <antimatter15@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>",
|
||||||
|
"Michael Burns <5170+mburns@users.noreply.github.com>",
|
||||||
|
"Miguel Mota <miguelmota2@gmail.com>",
|
||||||
|
"Nuno Nogueira <nunofmn@gmail.com>",
|
||||||
|
"Philipp Muens <raute1337@gmx.de>"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
|
@ -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')
|
||||||
|
|
||||||
@ -31,6 +31,7 @@ const {
|
|||||||
*
|
*
|
||||||
* @typedef {Object} AutoRelayOptions
|
* @typedef {Object} AutoRelayOptions
|
||||||
* @property {number} [maxListeners = 1] - maximum number of relays to listen.
|
* @property {number} [maxListeners = 1] - maximum number of relays to listen.
|
||||||
|
* @property {(error: Error, msg?: string) => {}} [onError]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class AutoRelay {
|
class AutoRelay {
|
||||||
@ -40,7 +41,7 @@ class AutoRelay {
|
|||||||
* @class
|
* @class
|
||||||
* @param {AutoRelayProperties & AutoRelayOptions} props
|
* @param {AutoRelayProperties & AutoRelayOptions} props
|
||||||
*/
|
*/
|
||||||
constructor ({ libp2p, maxListeners = 1 }) {
|
constructor ({ libp2p, maxListeners = 1, onError }) {
|
||||||
this._libp2p = libp2p
|
this._libp2p = libp2p
|
||||||
this._peerId = libp2p.peerId
|
this._peerId = libp2p.peerId
|
||||||
this._peerStore = libp2p.peerStore
|
this._peerStore = libp2p.peerStore
|
||||||
@ -60,6 +61,15 @@ class AutoRelay {
|
|||||||
|
|
||||||
this._peerStore.on('change:protocols', this._onProtocolChange)
|
this._peerStore.on('change:protocols', this._onProtocolChange)
|
||||||
this._connectionManager.on('peer:disconnect', this._onPeerDisconnected)
|
this._connectionManager.on('peer:disconnect', this._onPeerDisconnected)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Error} error
|
||||||
|
* @param {string} [msg]
|
||||||
|
*/
|
||||||
|
this._onError = (error, msg) => {
|
||||||
|
log.error(msg || error)
|
||||||
|
onError && onError(error, msg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -107,7 +117,7 @@ class AutoRelay {
|
|||||||
await this._addListenRelay(connection, id)
|
await this._addListenRelay(connection, id)
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.error(err)
|
this._onError(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,7 +170,7 @@ class AutoRelay {
|
|||||||
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 (err) {
|
||||||
log.error(err)
|
this._onError(err)
|
||||||
this._listenRelays.delete(id)
|
this._listenRelays.delete(id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -212,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.
|
||||||
@ -231,8 +241,7 @@ class AutoRelay {
|
|||||||
|
|
||||||
// Try to listen on known peers that are not connected
|
// Try to listen on known peers that are not connected
|
||||||
for (const peerId of knownHopsToDial) {
|
for (const peerId of knownHopsToDial) {
|
||||||
const connection = await this._libp2p.dial(peerId)
|
await this._tryToListenOnRelay(peerId)
|
||||||
await this._addListenRelay(connection, peerId.toB58String())
|
|
||||||
|
|
||||||
// Check if already listening on enough relays
|
// Check if already listening on enough relays
|
||||||
if (this._listenRelays.size >= this.maxListeners) {
|
if (this._listenRelays.size >= this.maxListeners) {
|
||||||
@ -247,12 +256,11 @@ class AutoRelay {
|
|||||||
if (!provider.multiaddrs.length) {
|
if (!provider.multiaddrs.length) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
const peerId = provider.id
|
const peerId = provider.id
|
||||||
|
|
||||||
this._peerStore.addressBook.add(peerId, provider.multiaddrs)
|
this._peerStore.addressBook.add(peerId, provider.multiaddrs)
|
||||||
const connection = await this._libp2p.dial(peerId)
|
|
||||||
|
|
||||||
await this._addListenRelay(connection, peerId.toB58String())
|
await this._tryToListenOnRelay(peerId)
|
||||||
|
|
||||||
// Check if already listening on enough relays
|
// Check if already listening on enough relays
|
||||||
if (this._listenRelays.size >= this.maxListeners) {
|
if (this._listenRelays.size >= this.maxListeners) {
|
||||||
@ -260,7 +268,19 @@ class AutoRelay {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.error(err)
|
this._onError(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {PeerId} peerId
|
||||||
|
*/
|
||||||
|
async _tryToListenOnRelay (peerId) {
|
||||||
|
try {
|
||||||
|
const connection = await this._libp2p.dial(peerId)
|
||||||
|
await this._addListenRelay(connection, peerId.toB58String())
|
||||||
|
} catch (err) {
|
||||||
|
this._onError(err, `could not connect and listen on known hop relay ${peerId.toB58String()}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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)
|
||||||
|
@ -1,9 +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')
|
||||||
|
|
||||||
const TextEncoder = require('ipfs-utils/src/text-encoder')
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert a namespace string into a cid.
|
* Convert a namespace string into a cid.
|
||||||
@ -13,7 +11,7 @@ const TextEncoder = require('ipfs-utils/src/text-encoder')
|
|||||||
*/
|
*/
|
||||||
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,6 +57,7 @@ const DefaultConfig = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
|
protocolPrefix: 'ipfs',
|
||||||
dht: {
|
dht: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
kBucketSize: 20,
|
kBucketSize: 20,
|
||||||
|
@ -11,7 +11,7 @@ const LatencyMonitor = require('./latency-monitor')
|
|||||||
// @ts-ignore retimer does not have types
|
// @ts-ignore retimer does not have types
|
||||||
const retimer = require('retimer')
|
const retimer = require('retimer')
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
|
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
@ -97,6 +97,11 @@ class ConnectionManager extends EventEmitter {
|
|||||||
this._autoDialTimeout = null
|
this._autoDialTimeout = null
|
||||||
this._checkMetrics = this._checkMetrics.bind(this)
|
this._checkMetrics = this._checkMetrics.bind(this)
|
||||||
this._autoDial = this._autoDial.bind(this)
|
this._autoDial = this._autoDial.bind(this)
|
||||||
|
|
||||||
|
this._latencyMonitor = new LatencyMonitor({
|
||||||
|
latencyCheckIntervalMs: this._options.pollInterval,
|
||||||
|
dataEmitIntervalMs: this._options.pollInterval
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -117,10 +122,7 @@ class ConnectionManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// latency monitor
|
// latency monitor
|
||||||
this._latencyMonitor = new LatencyMonitor({
|
this._latencyMonitor.start()
|
||||||
latencyCheckIntervalMs: this._options.pollInterval,
|
|
||||||
dataEmitIntervalMs: this._options.pollInterval
|
|
||||||
})
|
|
||||||
this._onLatencyMeasure = this._onLatencyMeasure.bind(this)
|
this._onLatencyMeasure = this._onLatencyMeasure.bind(this)
|
||||||
this._latencyMonitor.on('data', this._onLatencyMeasure)
|
this._latencyMonitor.on('data', this._onLatencyMeasure)
|
||||||
|
|
||||||
@ -138,7 +140,9 @@ class ConnectionManager extends EventEmitter {
|
|||||||
async stop () {
|
async stop () {
|
||||||
this._autoDialTimeout && this._autoDialTimeout.clear()
|
this._autoDialTimeout && this._autoDialTimeout.clear()
|
||||||
this._timer && this._timer.clear()
|
this._timer && this._timer.clear()
|
||||||
this._latencyMonitor && this._latencyMonitor.removeListener('data', this._onLatencyMeasure)
|
|
||||||
|
this._latencyMonitor.removeListener('data', this._onLatencyMeasure)
|
||||||
|
this._latencyMonitor.stop()
|
||||||
|
|
||||||
this._started = false
|
this._started = false
|
||||||
await this._close()
|
await this._close()
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* This code is based on `latency-monitor` (https://github.com/mlucool/latency-monitor) by `mlucool` (https://github.com/mlucool), available under Apache License 2.0 (https://github.com/mlucool/latency-monitor/blob/master/LICENSE)
|
* This code is based on `latency-monitor` (https://github.com/mlucool/latency-monitor) by `mlucool` (https://github.com/mlucool), available under Apache License 2.0 (https://github.com/mlucool/latency-monitor/blob/master/LICENSE)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
const VisibilityChangeEmitter = require('./visibility-change-emitter')
|
const VisibilityChangeEmitter = require('./visibility-change-emitter')
|
||||||
const debug = require('debug')('latency-monitor:LatencyMonitor')
|
const debug = require('debug')('latency-monitor:LatencyMonitor')
|
||||||
|
|
||||||
@ -69,49 +69,55 @@ class LatencyMonitor extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
that.asyncTestFn = asyncTestFn // If there is no asyncFn, we measure latency
|
that.asyncTestFn = asyncTestFn // If there is no asyncFn, we measure latency
|
||||||
|
}
|
||||||
|
|
||||||
|
start () {
|
||||||
// If process: use high resolution timer
|
// If process: use high resolution timer
|
||||||
if (globalThis.process && globalThis.process.hrtime) { // eslint-disable-line no-undef
|
if (globalThis.process && globalThis.process.hrtime) { // eslint-disable-line no-undef
|
||||||
debug('Using process.hrtime for timing')
|
debug('Using process.hrtime for timing')
|
||||||
that.now = globalThis.process.hrtime // eslint-disable-line no-undef
|
this.now = globalThis.process.hrtime // eslint-disable-line no-undef
|
||||||
that.getDeltaMS = (startTime) => {
|
this.getDeltaMS = (startTime) => {
|
||||||
const hrtime = that.now(startTime)
|
const hrtime = this.now(startTime)
|
||||||
return (hrtime[0] * 1000) + (hrtime[1] / 1000000)
|
return (hrtime[0] * 1000) + (hrtime[1] / 1000000)
|
||||||
}
|
}
|
||||||
// Let's try for a timer that only monotonically increases
|
// Let's try for a timer that only monotonically increases
|
||||||
} else if (typeof window !== 'undefined' && window.performance && window.performance.now) {
|
} else if (typeof window !== 'undefined' && window.performance && window.performance.now) {
|
||||||
debug('Using performance.now for timing')
|
debug('Using performance.now for timing')
|
||||||
that.now = window.performance.now.bind(window.performance)
|
this.now = window.performance.now.bind(window.performance)
|
||||||
that.getDeltaMS = (startTime) => Math.round(that.now() - startTime)
|
this.getDeltaMS = (startTime) => Math.round(this.now() - startTime)
|
||||||
} else {
|
} else {
|
||||||
debug('Using Date.now for timing')
|
debug('Using Date.now for timing')
|
||||||
that.now = Date.now
|
this.now = Date.now
|
||||||
that.getDeltaMS = (startTime) => that.now() - startTime
|
this.getDeltaMS = (startTime) => this.now() - startTime
|
||||||
}
|
}
|
||||||
|
|
||||||
that._latencyData = that._initLatencyData()
|
this._latencyData = this._initLatencyData()
|
||||||
|
|
||||||
// We check for isBrowser because of browsers set max rates of timeouts when a page is hidden,
|
// We check for isBrowser because of browsers set max rates of timeouts when a page is hidden,
|
||||||
// so we fall back to another library
|
// so we fall back to another library
|
||||||
// See: http://stackoverflow.com/questions/6032429/chrome-timeouts-interval-suspended-in-background-tabs
|
// See: http://stackoverflow.com/questions/6032429/chrome-timeouts-interval-suspended-in-background-tabs
|
||||||
if (isBrowser()) {
|
if (isBrowser()) {
|
||||||
that._visibilityChangeEmitter = new VisibilityChangeEmitter()
|
this._visibilityChangeEmitter = new VisibilityChangeEmitter()
|
||||||
|
|
||||||
that._visibilityChangeEmitter.on('visibilityChange', (pageInFocus) => {
|
this._visibilityChangeEmitter.on('visibilityChange', (pageInFocus) => {
|
||||||
if (pageInFocus) {
|
if (pageInFocus) {
|
||||||
that._startTimers()
|
this._startTimers()
|
||||||
} else {
|
} else {
|
||||||
that._emitSummary()
|
this._emitSummary()
|
||||||
that._stopTimers()
|
this._stopTimers()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!that._visibilityChangeEmitter || that._visibilityChangeEmitter.isVisible()) {
|
if (!this._visibilityChangeEmitter || this._visibilityChangeEmitter.isVisible()) {
|
||||||
that._startTimers()
|
this._startTimers()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stop () {
|
||||||
|
this._stopTimers()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start internal timers
|
* Start internal timers
|
||||||
*
|
*
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
|
|
||||||
const debug = require('debug')('latency-monitor:VisibilityChangeEmitter')
|
const debug = require('debug')('latency-monitor:VisibilityChangeEmitter')
|
||||||
|
|
||||||
|
@ -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,
|
||||||
|
@ -15,8 +15,8 @@ const { pipe } = require('it-pipe')
|
|||||||
/**
|
/**
|
||||||
* @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')} ContentRoutingModule
|
* @typedef {import('libp2p-interfaces/src/content-routing/types').ContentRouting} ContentRoutingModule
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,6 +8,7 @@ const errCode = require('err-code')
|
|||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
// @ts-ignore timeout-abourt-controles does not export types
|
// @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 { anySignal } = require('any-signal')
|
const { anySignal } = require('any-signal')
|
||||||
|
|
||||||
const DialRequest = require('./dial-request')
|
const DialRequest = require('./dial-request')
|
||||||
@ -18,7 +19,8 @@ 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')
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -39,6 +41,7 @@ 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
|
||||||
@ -64,6 +67,7 @@ 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 = {}
|
||||||
@ -72,10 +76,12 @@ class Dialer {
|
|||||||
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()
|
||||||
|
|
||||||
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)
|
||||||
@ -94,6 +100,11 @@ class Dialer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
this._pendingDials.clear()
|
this._pendingDials.clear()
|
||||||
|
|
||||||
|
for (const pendingTarget of this._pendingDialTargets.values()) {
|
||||||
|
pendingTarget.reject(new AbortError('Dialer was destroyed'))
|
||||||
|
}
|
||||||
|
this._pendingDialTargets.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -107,7 +118,7 @@ class Dialer {
|
|||||||
* @returns {Promise<Connection>}
|
* @returns {Promise<Connection>}
|
||||||
*/
|
*/
|
||||||
async connectToPeer (peer, options = {}) {
|
async connectToPeer (peer, options = {}) {
|
||||||
const dialTarget = await this._createDialTarget(peer)
|
const dialTarget = await this._createCancellableDialTarget(peer)
|
||||||
|
|
||||||
if (!dialTarget.addrs.length) {
|
if (!dialTarget.addrs.length) {
|
||||||
throw errCode(new Error('The dial request has no valid addresses'), codes.ERR_NO_VALID_ADDRESSES)
|
throw errCode(new Error('The dial request has no valid addresses'), codes.ERR_NO_VALID_ADDRESSES)
|
||||||
@ -130,6 +141,31 @@ class Dialer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Connects to a given `peer` by dialing all of its known addresses.
|
||||||
|
* The dial to the first address that is successfully able to upgrade a connection
|
||||||
|
* will be used.
|
||||||
|
*
|
||||||
|
* @param {PeerId|Multiaddr|string} peer - The peer to dial
|
||||||
|
* @returns {Promise<DialTarget>}
|
||||||
|
*/
|
||||||
|
async _createCancellableDialTarget (peer) {
|
||||||
|
// Make dial target promise cancellable
|
||||||
|
const id = `${(parseInt(String(Math.random() * 1e9), 10)).toString() + Date.now()}`
|
||||||
|
const cancellablePromise = new Promise((resolve, reject) => {
|
||||||
|
this._pendingDialTargets.set(id, { resolve, reject })
|
||||||
|
})
|
||||||
|
|
||||||
|
const dialTarget = await Promise.race([
|
||||||
|
this._createDialTarget(peer),
|
||||||
|
cancellablePromise
|
||||||
|
])
|
||||||
|
|
||||||
|
this._pendingDialTargets.delete(id)
|
||||||
|
|
||||||
|
return dialTarget
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a DialTarget. The DialTarget is used to create and track
|
* Creates a DialTarget. The DialTarget is used to create and track
|
||||||
* the DialRequest to a given peer.
|
* the DialRequest to a given peer.
|
||||||
@ -166,6 +202,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
|
||||||
|
@ -16,6 +16,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',
|
||||||
|
@ -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({
|
||||||
@ -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,
|
||||||
@ -189,6 +207,8 @@ class IdentifyService {
|
|||||||
const envelope = await Envelope.openAndCertify(signedPeerRecord, PeerRecord.DOMAIN)
|
const envelope = await Envelope.openAndCertify(signedPeerRecord, PeerRecord.DOMAIN)
|
||||||
if (this.peerStore.addressBook.consumePeerRecord(envelope)) {
|
if (this.peerStore.addressBook.consumePeerRecord(envelope)) {
|
||||||
this.peerStore.protoBook.set(id, protocols)
|
this.peerStore.protoBook.set(id, protocols)
|
||||||
|
this.peerStore.metadataBook.set(id, 'AgentVersion', uint8ArrayFromString(message.agentVersion))
|
||||||
|
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@ -204,6 +224,7 @@ class IdentifyService {
|
|||||||
|
|
||||||
this.peerStore.protoBook.set(id, protocols)
|
this.peerStore.protoBook.set(id, protocols)
|
||||||
this.peerStore.metadataBook.set(id, 'AgentVersion', uint8ArrayFromString(message.agentVersion))
|
this.peerStore.metadataBook.set(id, 'AgentVersion', uint8ArrayFromString(message.agentVersion))
|
||||||
|
this.peerStore.metadataBook.set(id, 'ProtocolVersion', uint8ArrayFromString(message.protocolVersion))
|
||||||
|
|
||||||
// TODO: Add and score our observed addr
|
// TODO: Add and score our observed addr
|
||||||
log('received observed address of %s', cleanObservedAddr)
|
log('received observed address of %s', cleanObservedAddr)
|
||||||
@ -221,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)
|
||||||
|
21
src/index.js
21
src/index.js
@ -4,7 +4,7 @@ const debug = require('debug')
|
|||||||
const log = Object.assign(debug('libp2p'), {
|
const log = Object.assign(debug('libp2p'), {
|
||||||
error: debug('libp2p:err')
|
error: debug('libp2p:err')
|
||||||
})
|
})
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
|
|
||||||
const errCode = require('err-code')
|
const errCode = require('err-code')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
@ -31,7 +31,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')
|
||||||
|
|
||||||
@ -40,9 +39,9 @@ const { updateSelfPeerRecord } = require('./record/utils')
|
|||||||
* @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxedStream} MuxedStream
|
* @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxedStream} MuxedStream
|
||||||
* @typedef {import('libp2p-interfaces/src/transport/types').TransportFactory<any, any>} TransportFactory
|
* @typedef {import('libp2p-interfaces/src/transport/types').TransportFactory<any, any>} TransportFactory
|
||||||
* @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxerFactory} MuxerFactory
|
* @typedef {import('libp2p-interfaces/src/stream-muxer/types').MuxerFactory} MuxerFactory
|
||||||
* @typedef {import('libp2p-interfaces/src/content-routing/types')} ContentRoutingModule
|
* @typedef {import('libp2p-interfaces/src/content-routing/types').ContentRouting} ContentRoutingModule
|
||||||
* @typedef {import('libp2p-interfaces/src/peer-discovery/types')} PeerDiscoveryModule
|
* @typedef {import('libp2p-interfaces/src/peer-discovery/types').PeerDiscoveryFactory} PeerDiscoveryFactory
|
||||||
* @typedef {import('libp2p-interfaces/src/peer-routing/types')} PeerRoutingModule
|
* @typedef {import('libp2p-interfaces/src/peer-routing/types').PeerRouting} PeerRoutingModule
|
||||||
* @typedef {import('libp2p-interfaces/src/crypto/types').Crypto} Crypto
|
* @typedef {import('libp2p-interfaces/src/crypto/types').Crypto} Crypto
|
||||||
* @typedef {import('libp2p-interfaces/src/pubsub')} Pubsub
|
* @typedef {import('libp2p-interfaces/src/pubsub')} Pubsub
|
||||||
* @typedef {import('libp2p-interfaces/src/pubsub').PubsubOptions} PubsubOptions
|
* @typedef {import('libp2p-interfaces/src/pubsub').PubsubOptions} PubsubOptions
|
||||||
@ -67,6 +66,8 @@ const { updateSelfPeerRecord } = require('./record/utils')
|
|||||||
* @property {number} [kBucketSize = 20]
|
* @property {number} [kBucketSize = 20]
|
||||||
* @property {RandomWalkOptions} [randomWalk]
|
* @property {RandomWalkOptions} [randomWalk]
|
||||||
* @property {boolean} [clientMode]
|
* @property {boolean} [clientMode]
|
||||||
|
* @property {import('libp2p-interfaces/src/types').DhtSelectors} [selectors]
|
||||||
|
* @property {import('libp2p-interfaces/src/types').DhtValidators} [validators]
|
||||||
*
|
*
|
||||||
* @typedef {Object} KeychainOptions
|
* @typedef {Object} KeychainOptions
|
||||||
* @property {Datastore} [datastore]
|
* @property {Datastore} [datastore]
|
||||||
@ -98,11 +99,11 @@ const { updateSelfPeerRecord } = require('./record/utils')
|
|||||||
* @property {TransportFactory[]} transport
|
* @property {TransportFactory[]} transport
|
||||||
* @property {MuxerFactory[]} streamMuxer
|
* @property {MuxerFactory[]} streamMuxer
|
||||||
* @property {Crypto[]} connEncryption
|
* @property {Crypto[]} connEncryption
|
||||||
* @property {PeerDiscoveryModule[]} [peerDiscovery]
|
* @property {PeerDiscoveryFactory[]} [peerDiscovery]
|
||||||
* @property {PeerRoutingModule[]} [peerRouting]
|
* @property {PeerRoutingModule[]} [peerRouting]
|
||||||
* @property {ContentRoutingModule[]} [contentRouting]
|
* @property {ContentRoutingModule[]} [contentRouting]
|
||||||
* @property {Object} [dht]
|
* @property {Object} [dht]
|
||||||
* @property {Pubsub} [pubsub]
|
* @property {{new(...args: any[]): Pubsub}} [pubsub]
|
||||||
* @property {Protector} [connProtector]
|
* @property {Protector} [connProtector]
|
||||||
*
|
*
|
||||||
* @typedef {Object} Libp2pOptions
|
* @typedef {Object} Libp2pOptions
|
||||||
@ -287,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
|
||||||
@ -698,7 +699,7 @@ class Libp2p extends EventEmitter {
|
|||||||
try {
|
try {
|
||||||
await this.dialer.connectToPeer(peerId)
|
await this.dialer.connectToPeer(peerId)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.error('could not connect to discovered peer', err)
|
log.error(`could not connect to discovered peer ${peerId.toB58String()} with ${err}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -712,7 +713,7 @@ class Libp2p extends EventEmitter {
|
|||||||
*/
|
*/
|
||||||
async _setupPeerDiscovery () {
|
async _setupPeerDiscovery () {
|
||||||
/**
|
/**
|
||||||
* @param {PeerDiscoveryModule} DiscoveryService
|
* @param {PeerDiscoveryFactory} DiscoveryService
|
||||||
*/
|
*/
|
||||||
const setupService = (DiscoveryService) => {
|
const setupService = (DiscoveryService) => {
|
||||||
let config = {
|
let config = {
|
||||||
|
@ -8,8 +8,8 @@ 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 privates = new WeakMap()
|
const privates = new WeakMap()
|
||||||
|
|
||||||
|
@ -1,14 +1,17 @@
|
|||||||
/* eslint max-nested-callbacks: ["error", 5] */
|
/* eslint max-nested-callbacks: ["error", 5] */
|
||||||
'use strict'
|
'use strict'
|
||||||
|
const debug = require('debug')
|
||||||
|
const log = Object.assign(debug('libp2p:keychain'), {
|
||||||
|
error: debug('libp2p:keychain:err')
|
||||||
|
})
|
||||||
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 { toString: uint8ArrayToString } = require('uint8arrays/to-string')
|
||||||
const uint8ArrayFromString = require('uint8arrays/from-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')
|
||||||
@ -26,7 +29,7 @@ require('node-forge/lib/sha512')
|
|||||||
* @property {number} keyLength
|
* @property {number} keyLength
|
||||||
*
|
*
|
||||||
* @typedef {Object} KeychainOptions
|
* @typedef {Object} KeychainOptions
|
||||||
* @property {string} pass
|
* @property {string} [pass]
|
||||||
* @property {DekOptions} [dek]
|
* @property {DekOptions} [dek]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -503,6 +506,55 @@ class Keychain {
|
|||||||
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
|
return throwDelayed(errcode(new Error(`Key '${name}' does not exist. ${err.message}`), 'ERR_KEY_NOT_FOUND'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rotate keychain password and re-encrypt all assosciated keys
|
||||||
|
*
|
||||||
|
* @param {string} oldPass - The old local keychain password
|
||||||
|
* @param {string} newPass - The new local keychain password
|
||||||
|
*/
|
||||||
|
async rotateKeychainPass (oldPass, newPass) {
|
||||||
|
if (typeof oldPass !== 'string') {
|
||||||
|
return throwDelayed(errcode(new Error(`Invalid old pass type '${typeof oldPass}'`), 'ERR_INVALID_OLD_PASS_TYPE'))
|
||||||
|
}
|
||||||
|
if (typeof newPass !== 'string') {
|
||||||
|
return throwDelayed(errcode(new Error(`Invalid new pass type '${typeof newPass}'`), 'ERR_INVALID_NEW_PASS_TYPE'))
|
||||||
|
}
|
||||||
|
if (newPass.length < 20) {
|
||||||
|
return throwDelayed(errcode(new Error(`Invalid pass length ${newPass.length}`), 'ERR_INVALID_PASS_LENGTH'))
|
||||||
|
}
|
||||||
|
log('recreating keychain')
|
||||||
|
const oldDek = privates.get(this).dek
|
||||||
|
this.opts.pass = newPass
|
||||||
|
const newDek = newPass
|
||||||
|
? crypto.pbkdf2(
|
||||||
|
newPass,
|
||||||
|
this.opts.dek.salt,
|
||||||
|
this.opts.dek.iterationCount,
|
||||||
|
this.opts.dek.keyLength,
|
||||||
|
this.opts.dek.hash)
|
||||||
|
: ''
|
||||||
|
privates.set(this, { dek: newDek })
|
||||||
|
const keys = await this.listKeys()
|
||||||
|
for (const key of keys) {
|
||||||
|
const res = await this.store.get(DsName(key.name))
|
||||||
|
const pem = uint8ArrayToString(res)
|
||||||
|
const privateKey = await crypto.keys.import(pem, oldDek)
|
||||||
|
const password = newDek.toString()
|
||||||
|
const keyAsPEM = await privateKey.export(password)
|
||||||
|
|
||||||
|
// Update stored key
|
||||||
|
const batch = this.store.batch()
|
||||||
|
const keyInfo = {
|
||||||
|
name: key.name,
|
||||||
|
id: key.id
|
||||||
|
}
|
||||||
|
batch.put(DsName(key.name), uint8ArrayFromString(keyAsPEM))
|
||||||
|
batch.put(DsInfoName(key.name), uint8ArrayFromString(JSON.stringify(keyInfo)))
|
||||||
|
await batch.commit()
|
||||||
|
}
|
||||||
|
log('keychain reconstructed')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = Keychain
|
module.exports = Keychain
|
||||||
|
@ -1,11 +1,15 @@
|
|||||||
// @ts-nocheck
|
// @ts-nocheck
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
const { BigNumber: Big } = require('bignumber.js')
|
const { BigNumber: Big } = require('bignumber.js')
|
||||||
const MovingAverage = require('moving-average')
|
const MovingAverage = require('@vascosantos/moving-average')
|
||||||
const retimer = require('retimer')
|
const retimer = require('retimer')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {import('@vascosantos/moving-average').IMovingAverage} IMovingAverage
|
||||||
|
*/
|
||||||
|
|
||||||
class Stats extends EventEmitter {
|
class Stats extends EventEmitter {
|
||||||
/**
|
/**
|
||||||
* A queue based manager for stat processing
|
* A queue based manager for stat processing
|
||||||
@ -29,7 +33,7 @@ class Stats extends EventEmitter {
|
|||||||
this._frequencyLastTime = Date.now()
|
this._frequencyLastTime = Date.now()
|
||||||
this._frequencyAccumulators = {}
|
this._frequencyAccumulators = {}
|
||||||
|
|
||||||
/** @type {{ dataReceived: MovingAverage[], dataSent: MovingAverage[] }} */
|
/** @type {{ dataReceived: IMovingAverage[], dataSent: IMovingAverage[] }} */
|
||||||
this._movingAverages = {}
|
this._movingAverages = {}
|
||||||
|
|
||||||
this._update = this._update.bind(this)
|
this._update = this._update.bind(this)
|
||||||
|
@ -8,9 +8,8 @@ const { Multiaddr } = require('multiaddr')
|
|||||||
const log = Object.assign(debug('libp2p:nat'), {
|
const log = Object.assign(debug('libp2p:nat'), {
|
||||||
error: debug('libp2p:nat:err')
|
error: debug('libp2p:nat:err')
|
||||||
})
|
})
|
||||||
const { isBrowser } = require('ipfs-utils/src/env')
|
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-ignore isPrivate has no call signatures
|
||||||
if (isPrivateIp(publicIp)) {
|
if (isPrivateIp(publicIp)) {
|
||||||
throw new Error(`${publicIp} is private - please set config.nat.externalIp to an externally routable IP or ensure you are not behind a double NAT`)
|
throw new Error(`${publicIp} is private - please set config.nat.externalIp to an externally routable IP or ensure you are not behind a double NAT`)
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ const {
|
|||||||
/**
|
/**
|
||||||
* @typedef {import('peer-id')} PeerId
|
* @typedef {import('peer-id')} PeerId
|
||||||
* @typedef {import('multiaddr').Multiaddr} Multiaddr
|
* @typedef {import('multiaddr').Multiaddr} Multiaddr
|
||||||
* @typedef {import('libp2p-interfaces/src/peer-routing/types')} PeerRoutingModule
|
* @typedef {import('libp2p-interfaces/src/peer-routing/types').PeerRouting} PeerRoutingModule
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -104,6 +104,10 @@ class PeerRouting {
|
|||||||
throw errCode(new Error('No peer routers available'), 'NO_ROUTERS_AVAILABLE')
|
throw errCode(new Error('No peer routers available'), 'NO_ROUTERS_AVAILABLE')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (id.toB58String() === this._peerId.toB58String()) {
|
||||||
|
throw errCode(new Error('Should not try to find self'), '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 => [router.findPeer(id, options)])
|
||||||
|
@ -229,6 +229,11 @@ class AddressBook extends Book {
|
|||||||
const addresses = this._toAddresses(multiaddrs)
|
const addresses = this._toAddresses(multiaddrs)
|
||||||
const id = peerId.toB58String()
|
const id = peerId.toB58String()
|
||||||
|
|
||||||
|
// No addresses to be added
|
||||||
|
if (!addresses.length) {
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
const entry = this.data.get(id)
|
const entry = this.data.get(id)
|
||||||
|
|
||||||
if (entry && entry.addresses) {
|
if (entry && entry.addresses) {
|
||||||
@ -302,10 +307,13 @@ class AddressBook extends Book {
|
|||||||
throw errcode(new Error(`multiaddr ${addr} must be an instance of multiaddr`), ERR_INVALID_PARAMETERS)
|
throw errcode(new Error(`multiaddr ${addr} must be an instance of multiaddr`), ERR_INVALID_PARAMETERS)
|
||||||
}
|
}
|
||||||
|
|
||||||
addresses.push({
|
// Guarantee no replicates
|
||||||
multiaddr: addr,
|
if (!addresses.find((a) => a.multiaddr.equals(addr))) {
|
||||||
isCertified
|
addresses.push({
|
||||||
})
|
multiaddr: addr,
|
||||||
|
isCertified
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
return addresses
|
return addresses
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
const errcode = require('err-code')
|
const errcode = require('err-code')
|
||||||
|
|
||||||
const EventEmitter = require('events')
|
const { EventEmitter } = require('events')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
|
||||||
const AddressBook = require('./address-book')
|
const AddressBook = require('./address-book')
|
||||||
@ -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')
|
||||||
|
|
||||||
|
@ -4,9 +4,10 @@ const debug = require('debug')
|
|||||||
const log = Object.assign(debug('libp2p:persistent-peer-store'), {
|
const log = Object.assign(debug('libp2p:persistent-peer-store'), {
|
||||||
error: debug('libp2p:persistent-peer-store:err')
|
error: debug('libp2p:persistent-peer-store:err')
|
||||||
})
|
})
|
||||||
const { Key } = require('interface-datastore')
|
const { Key } = require('interface-datastore/key')
|
||||||
const { Multiaddr } = require('multiaddr')
|
const { Multiaddr } = require('multiaddr')
|
||||||
const PeerId = require('peer-id')
|
const PeerId = require('peer-id')
|
||||||
|
const { base32 } = require('multiformats/bases/base32')
|
||||||
|
|
||||||
const PeerStore = require('..')
|
const PeerStore = require('..')
|
||||||
|
|
||||||
@ -195,7 +196,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
const batch = this._datastore.batch()
|
const batch = this._datastore.batch()
|
||||||
for (const peerIdStr of commitPeers) {
|
for (const peerIdStr of commitPeers) {
|
||||||
// PeerId
|
// PeerId
|
||||||
const peerId = this.keyBook.data.get(peerIdStr) || PeerId.createFromCID(peerIdStr)
|
const peerId = this.keyBook.data.get(peerIdStr) || PeerId.createFromB58String(peerIdStr)
|
||||||
|
|
||||||
// Address Book
|
// Address Book
|
||||||
this._batchAddressBook(peerId, batch)
|
this._batchAddressBook(peerId, batch)
|
||||||
@ -346,7 +347,7 @@ class PersistentPeerStore extends PeerStore {
|
|||||||
async _processDatastoreEntry ({ key, value }) {
|
async _processDatastoreEntry ({ key, value }) {
|
||||||
try {
|
try {
|
||||||
const keyParts = key.toString().split('/')
|
const keyParts = key.toString().split('/')
|
||||||
const peerId = PeerId.createFromCID(keyParts[3])
|
const peerId = PeerId.createFromBytes(base32.decode(keyParts[3]))
|
||||||
|
|
||||||
let decoded
|
let decoded
|
||||||
switch (keyParts[2]) {
|
switch (keyParts[2]) {
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
PROTOCOL: '/ipfs/ping/1.0.0',
|
PROTOCOL: '/ipfs/ping/1.0.0', // deprecated
|
||||||
PING_LENGTH: 32
|
PING_LENGTH: 32,
|
||||||
|
PROTOCOL_VERSION: '1.0.0',
|
||||||
|
PROTOCOL_NAME: 'ping'
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user