mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-02 05:11:42 +00:00
Compare commits
1 Commits
fix/interf
...
feat/use-p
Author | SHA1 | Date | |
---|---|---|---|
dc38263ec4 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,7 +12,6 @@ logs
|
|||||||
*.log
|
*.log
|
||||||
|
|
||||||
coverage
|
coverage
|
||||||
.nyc_output
|
|
||||||
|
|
||||||
# Runtime data
|
# Runtime data
|
||||||
pids
|
pids
|
||||||
|
52
.travis.yml
52
.travis.yml
@ -1,34 +1,32 @@
|
|||||||
language: node_js
|
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||||
cache: npm
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
language: node_js
|
||||||
|
|
||||||
stages:
|
matrix:
|
||||||
- check
|
include:
|
||||||
- test
|
- node_js: 6
|
||||||
- cov
|
env: CXX=g++-4.8
|
||||||
|
- node_js: 8
|
||||||
|
env: CXX=g++-4.8
|
||||||
|
# - node_js: stable
|
||||||
|
# env: CXX=g++-4.8
|
||||||
|
|
||||||
node_js:
|
script:
|
||||||
- '10'
|
- npm run lint
|
||||||
- '12'
|
- npm run test
|
||||||
|
- npm run coverage
|
||||||
os:
|
|
||||||
- linux
|
|
||||||
- osx
|
|
||||||
- windows
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'; fi
|
- export DISPLAY=:99.0
|
||||||
script: npx nyc -s npm run test:node -- --bail
|
- sh -e /etc/init.d/xvfb start
|
||||||
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
|
|
||||||
|
|
||||||
jobs:
|
after_success:
|
||||||
include:
|
- npm run coverage-publish
|
||||||
- stage: check
|
|
||||||
os: linux
|
|
||||||
script:
|
|
||||||
- npx aegir build --bundlesize
|
|
||||||
- npx aegir dep-check
|
|
||||||
- npm run lint
|
|
||||||
|
|
||||||
notifications:
|
addons:
|
||||||
email: false
|
firefox: 'latest'
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- ubuntu-toolchain-r-test
|
||||||
|
packages:
|
||||||
|
- g++-4.8
|
||||||
|
15
CHANGELOG.md
15
CHANGELOG.md
@ -1,18 +1,3 @@
|
|||||||
<a name="0.13.1"></a>
|
|
||||||
## [0.13.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.13.0...v0.13.1) (2019-08-08)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<a name="0.13.0"></a>
|
|
||||||
# [0.13.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.1...v0.13.0) (2018-09-12)
|
|
||||||
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* add support for dialing over dns ([eba0b48](https://github.com/libp2p/js-libp2p-tcp/commit/eba0b48))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<a name="0.12.1"></a>
|
<a name="0.12.1"></a>
|
||||||
## [0.12.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.0...v0.12.1) (2018-07-31)
|
## [0.12.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.0...v0.12.1) (2018-07-31)
|
||||||
|
|
||||||
|
52
README.md
52
README.md
@ -1,19 +1,19 @@
|
|||||||
# js-libp2p-tcp
|
# js-libp2p-tcp
|
||||||
|
|
||||||
[](http://protocol.ai)
|
[](http://ipn.io)
|
||||||
[](http://libp2p.io/)
|
[](http://webchat.freenode.net/?channels=%23ipfs)
|
||||||
[](http://webchat.freenode.net/?channels=%23libp2p)
|
[](https://travis-ci.org/libp2p/js-libp2p-tcp)
|
||||||
[](https://discuss.libp2p.io)
|
[](https://coveralls.io/github/libp2p/js-libp2p-tcp?branch=master)
|
||||||
[](https://codecov.io/gh/libp2p/js-libp2p-tcp)
|
|
||||||
[](https://travis-ci.com/libp2p/js-libp2p-tcp)
|
|
||||||
[](https://david-dm.org/libp2p/js-libp2p-tcp)
|
[](https://david-dm.org/libp2p/js-libp2p-tcp)
|
||||||
[](https://github.com/feross/standard)
|
[](https://github.com/feross/standard)
|
||||||
|

|
||||||
|

|
||||||
|
|
||||||
[](https://github.com/libp2p/interface-transport)
|
[](https://github.com/libp2p/interface-transport)
|
||||||
[](https://github.com/libp2p/interface-connection)
|
[](https://github.com/libp2p/interface-connection)
|
||||||
|
|
||||||
|
|
||||||
> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/interface-connection) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other transports.
|
> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/interface-connection) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other different transports.
|
||||||
|
|
||||||
## Lead Maintainer
|
## Lead Maintainer
|
||||||
|
|
||||||
@ -41,33 +41,37 @@
|
|||||||
```js
|
```js
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const pipe = require('it-pipe')
|
const pull = require('pull-stream')
|
||||||
const { collect } = require('streaming-iterables')
|
|
||||||
|
|
||||||
const addr = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||||
|
|
||||||
const tcp = new TCP()
|
const tcp = new TCP()
|
||||||
|
|
||||||
const listener = tcp.createListener((socket) => {
|
const listener = tcp.createListener((socket) => {
|
||||||
console.log('new connection opened')
|
console.log('new connection opened')
|
||||||
pipe(
|
pull(
|
||||||
['hello'],
|
pull.values(['hello']),
|
||||||
socket
|
socket
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
await listener.listen(addr)
|
listener.listen(mh, () => {
|
||||||
console.log('listening')
|
console.log('listening')
|
||||||
|
|
||||||
const socket = await tcp.dial(addr)
|
pull(
|
||||||
const values = await pipe(
|
tcp.dial(mh),
|
||||||
socket,
|
pull.collect((err, values) => {
|
||||||
collect
|
if (!err) {
|
||||||
)
|
console.log(`Value: ${values.toString()}`)
|
||||||
console.log(`Value: ${values.toString()}`)
|
} else {
|
||||||
|
console.log(`Error: ${err}`)
|
||||||
|
}
|
||||||
|
|
||||||
// Close connection after reading
|
// Close connection after reading
|
||||||
await listener.close()
|
listener.close()
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
Outputs:
|
Outputs:
|
||||||
@ -84,12 +88,12 @@ Value: hello
|
|||||||
|
|
||||||
[](https://github.com/libp2p/interface-transport)
|
[](https://github.com/libp2p/interface-transport)
|
||||||
|
|
||||||
`libp2p-tcp` accepts TCP addresses as both IPFS and non IPFS encapsulated addresses, i.e:
|
`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:
|
||||||
|
|
||||||
`/ip4/127.0.0.1/tcp/4001`
|
`/ip4/127.0.0.1/tcp/4001`
|
||||||
`/ip4/127.0.0.1/tcp/4001/ipfs/QmHash`
|
`/ip4/127.0.0.1/tcp/4001/ipfs/QmHash`
|
||||||
|
|
||||||
(both for dialing and listening)
|
Both for dialing and listening.
|
||||||
|
|
||||||
### Connection
|
### Connection
|
||||||
|
|
||||||
|
29
appveyor.yml
Normal file
29
appveyor.yml
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||||
|
version: "{build}"
|
||||||
|
|
||||||
|
environment:
|
||||||
|
matrix:
|
||||||
|
- nodejs_version: "6"
|
||||||
|
- nodejs_version: "8"
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
|
install:
|
||||||
|
# Install Node.js
|
||||||
|
- ps: Install-Product node $env:nodejs_version
|
||||||
|
|
||||||
|
# Upgrade npm
|
||||||
|
- npm install -g npm
|
||||||
|
|
||||||
|
# Output our current versions for debugging
|
||||||
|
- node --version
|
||||||
|
- npm --version
|
||||||
|
|
||||||
|
# Install our package dependencies
|
||||||
|
- npm install
|
||||||
|
|
||||||
|
test_script:
|
||||||
|
- npm run test:node
|
||||||
|
|
||||||
|
build: off
|
2
ci/Jenkinsfile
vendored
Normal file
2
ci/Jenkinsfile
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
// Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||||
|
javascript()
|
15
circle.yml
Normal file
15
circle.yml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||||
|
machine:
|
||||||
|
node:
|
||||||
|
version: stable
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
pre:
|
||||||
|
- google-chrome --version
|
||||||
|
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
|
||||||
|
- sudo dpkg -i google-chrome.deb || true
|
||||||
|
- sudo apt-get update
|
||||||
|
- sudo apt-get install -f
|
||||||
|
- sudo apt-get install --only-upgrade lsb-base
|
||||||
|
- sudo dpkg -i google-chrome.deb
|
||||||
|
- google-chrome --version
|
44
package.json
44
package.json
@ -1,22 +1,21 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p-tcp",
|
"name": "libp2p-tcp",
|
||||||
"version": "0.13.1",
|
"version": "0.12.1",
|
||||||
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
|
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
|
||||||
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
"leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "aegir lint",
|
"lint": "aegir lint",
|
||||||
"test": "aegir test -t node",
|
"test": "aegir test -t node -f test/**/*.js",
|
||||||
"test:node": "aegir test -t node",
|
|
||||||
"build": "aegir build",
|
|
||||||
"docs": "aegir docs",
|
|
||||||
"release": "aegir release -t node --no-build",
|
"release": "aegir release -t node --no-build",
|
||||||
"release-minor": "aegir release -t node --type minor --no-build",
|
"release-minor": "aegir release -t node --type minor --no-build",
|
||||||
"release-major": "aegir-release -t node --type major --no-build",
|
"release-major": "aegir-release -t node --type major --no-build",
|
||||||
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node"
|
"coverage": "aegir coverage",
|
||||||
|
"coverage-publish": "aegir coverage --provider coveralls"
|
||||||
},
|
},
|
||||||
"pre-push": [
|
"pre-push": [
|
||||||
"lint"
|
"lint",
|
||||||
|
"test"
|
||||||
],
|
],
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -35,26 +34,25 @@
|
|||||||
"npm": ">=3.0.0"
|
"npm": ">=3.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"aegir": "^20.0.0",
|
"aegir": "^15.1.0",
|
||||||
"chai": "^4.2.0",
|
"chai": "^4.1.2",
|
||||||
"dirty-chai": "^2.0.1",
|
"dirty-chai": "^2.0.1",
|
||||||
"pull-stream": "^3.6.9",
|
"interface-transport": "~0.3.6",
|
||||||
"sinon": "^7.4.1"
|
"lodash.isfunction": "^3.0.9",
|
||||||
|
"pull-stream": "^3.6.7"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"abortable-iterator": "^2.1.0",
|
|
||||||
"class-is": "^1.1.0",
|
"class-is": "^1.1.0",
|
||||||
"debug": "^4.1.1",
|
"debug": "^3.1.0",
|
||||||
"err-code": "^1.1.2",
|
"interface-connection": "~0.3.2",
|
||||||
"interface-connection": "~0.3.3",
|
"ip-address": "^5.8.9",
|
||||||
"interface-transport": "~0.6.0",
|
|
||||||
"ip-address": "^6.1.0",
|
|
||||||
"it-pipe": "^1.0.1",
|
|
||||||
"lodash.includes": "^4.3.0",
|
"lodash.includes": "^4.3.0",
|
||||||
"lodash.isfunction": "^3.0.9",
|
"lodash.isfunction": "^3.0.9",
|
||||||
"mafmt": "^6.0.8",
|
"mafmt": "^6.0.0",
|
||||||
"multiaddr": "^6.1.0",
|
"multiaddr": "^4.0.0",
|
||||||
"streaming-iterables": "^4.1.0"
|
"once": "^1.4.0",
|
||||||
|
"pull-net": "github:mkg20001/pull-net",
|
||||||
|
"stream-to-pull-stream": "^1.7.2"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Alan Shaw <alan@tableflip.io>",
|
"Alan Shaw <alan@tableflip.io>",
|
||||||
@ -68,12 +66,10 @@
|
|||||||
"Jacob Heun <jacobheun@gmail.com>",
|
"Jacob Heun <jacobheun@gmail.com>",
|
||||||
"Jacob Heun <jake@andyet.net>",
|
"Jacob Heun <jake@andyet.net>",
|
||||||
"João Antunes <j.goncalo.antunes@gmail.com>",
|
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||||
"Linus Unnebäck <linus@folkdatorn.se>",
|
|
||||||
"Pedro Teixeira <i@pgte.me>",
|
"Pedro Teixeira <i@pgte.me>",
|
||||||
"Prashanth Chandra <coolshanth94@gmail.com>",
|
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||||
"Richard Littauer <richard.littauer@gmail.com>",
|
"Richard Littauer <richard.littauer@gmail.com>",
|
||||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
||||||
"TomCoded <tomtinkerer@gmail.com>",
|
"TomCoded <tomtinkerer@gmail.com>"
|
||||||
"Vasco Santos <vasco.santos@moxy.studio>"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
const { Adapter } = require('interface-transport')
|
|
||||||
const withIs = require('class-is')
|
|
||||||
const TCP = require('.')
|
|
||||||
|
|
||||||
// Legacy adapter to old transport & connection interface
|
|
||||||
class TcpAdapter extends Adapter {
|
|
||||||
constructor (options) {
|
|
||||||
super(new TCP(options))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = withIs(TcpAdapter, {
|
|
||||||
className: 'TCP',
|
|
||||||
symbolName: '@libp2p/js-libp2p-tcp/tcp'
|
|
||||||
})
|
|
@ -1,8 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
// IPFS multi-address code
|
|
||||||
module.exports.IPFS_MA_CODE = 421
|
|
||||||
|
|
||||||
// Time to wait for a connection to close gracefully before destroying it
|
|
||||||
// manually
|
|
||||||
module.exports.CLOSE_TIMEOUT = 2000
|
|
@ -9,22 +9,22 @@ module.exports = (socket) => {
|
|||||||
let ma
|
let ma
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (socket.remoteFamily === 'IPv6') {
|
if (socket.remoteAddress.family === 'IPv6') {
|
||||||
const addr = new Address6(socket.remoteAddress)
|
const addr = new Address6(socket.remoteAddress.address)
|
||||||
|
|
||||||
if (addr.v4) {
|
if (addr.v4) {
|
||||||
const ip4 = addr.to4().correctForm()
|
const ip4 = addr.to4().correctForm()
|
||||||
ma = multiaddr('/ip4/' + ip4 +
|
ma = multiaddr('/ip4/' + ip4 +
|
||||||
'/tcp/' + socket.remotePort
|
'/tcp/' + socket.remoteAddress.port
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
ma = multiaddr('/ip6/' + socket.remoteAddress +
|
ma = multiaddr('/ip6/' + socket.remoteAddress.address +
|
||||||
'/tcp/' + socket.remotePort
|
'/tcp/' + socket.remoteAddress.port
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ma = multiaddr('/ip4/' + socket.remoteAddress +
|
ma = multiaddr('/ip4/' + socket.remoteAddress.address +
|
||||||
'/tcp/' + socket.remotePort)
|
'/tcp/' + socket.remoteAddress.port)
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log(err)
|
log(err)
|
||||||
|
79
src/index.js
79
src/index.js
@ -1,82 +1,38 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const net = require('net')
|
const {connect} = require('pull-net')
|
||||||
const mafmt = require('mafmt')
|
const mafmt = require('mafmt')
|
||||||
const withIs = require('class-is')
|
const withIs = require('class-is')
|
||||||
const includes = require('lodash.includes')
|
const includes = require('lodash.includes')
|
||||||
const isFunction = require('lodash.isfunction')
|
const isFunction = require('lodash.isfunction')
|
||||||
const errcode = require('err-code')
|
const Connection = require('interface-connection').Connection
|
||||||
|
const once = require('once')
|
||||||
const debug = require('debug')
|
const debug = require('debug')
|
||||||
const log = debug('libp2p:tcp:dial')
|
const log = debug('libp2p:tcp:dial')
|
||||||
const assert = require('assert')
|
|
||||||
|
|
||||||
const Libp2pSocket = require('./socket')
|
|
||||||
const createListener = require('./listener')
|
const createListener = require('./listener')
|
||||||
const { AbortError } = require('interface-transport')
|
|
||||||
|
|
||||||
function noop () {}
|
function noop () {}
|
||||||
|
|
||||||
class TCP {
|
class TCP {
|
||||||
constructor (options) {
|
dial (ma, options, callback) {
|
||||||
assert(options && options.upgrader, 'An Upgrader must be provided')
|
if (isFunction(options)) {
|
||||||
this.upgrader = options.upgrader
|
callback = options
|
||||||
}
|
options = {}
|
||||||
|
}
|
||||||
|
|
||||||
|
callback = once(callback || noop)
|
||||||
|
|
||||||
async dial (ma, options) {
|
|
||||||
const cOpts = ma.toOptions()
|
const cOpts = ma.toOptions()
|
||||||
log('Dialing %s:%s', cOpts.host, cOpts.port)
|
log('Connecting to %s %s', cOpts.port, cOpts.host)
|
||||||
|
|
||||||
const rawSocket = await this._connect(cOpts, options)
|
const conn = new Connection(connect(cOpts.port, cOpts.host, callback))
|
||||||
return this.upgrader.upgradeOutbound(new Libp2pSocket(rawSocket, ma, options))
|
|
||||||
}
|
|
||||||
|
|
||||||
_connect (cOpts, options = {}) {
|
conn.getObservedAddrs = (callback) => {
|
||||||
return new Promise((resolve, reject) => {
|
return callback(null, [ma])
|
||||||
if ((options.signal || {}).aborted) {
|
}
|
||||||
return reject(new AbortError())
|
|
||||||
}
|
|
||||||
|
|
||||||
const start = Date.now()
|
return conn
|
||||||
const rawSocket = net.connect(cOpts)
|
|
||||||
|
|
||||||
const onError = (err) => {
|
|
||||||
const msg = `Error dialing ${cOpts.host}:${cOpts.port}: ${err.message}`
|
|
||||||
done(errcode(msg, err.code))
|
|
||||||
}
|
|
||||||
|
|
||||||
const onTimeout = () => {
|
|
||||||
log('Timeout dialing %s:%s', cOpts.host, cOpts.port)
|
|
||||||
const err = errcode(`Timeout after ${Date.now() - start}ms`, 'ETIMEDOUT')
|
|
||||||
// Note: this will result in onError() being called
|
|
||||||
rawSocket.emit('error', err)
|
|
||||||
}
|
|
||||||
|
|
||||||
const onConnect = () => {
|
|
||||||
log('Connected to %s:%s', cOpts.host, cOpts.port)
|
|
||||||
done(null, rawSocket)
|
|
||||||
}
|
|
||||||
|
|
||||||
const onAbort = () => {
|
|
||||||
log('Dial to %s:%s aborted', cOpts.host, cOpts.port)
|
|
||||||
rawSocket.destroy()
|
|
||||||
done(new AbortError())
|
|
||||||
}
|
|
||||||
|
|
||||||
const done = (err, res) => {
|
|
||||||
rawSocket.removeListener('error', onError)
|
|
||||||
rawSocket.removeListener('timeout', onTimeout)
|
|
||||||
rawSocket.removeListener('connect', onConnect)
|
|
||||||
|
|
||||||
options.signal && options.signal.removeEventListener('abort', onAbort)
|
|
||||||
|
|
||||||
err ? reject(err) : resolve(res)
|
|
||||||
}
|
|
||||||
|
|
||||||
rawSocket.once('error', onError)
|
|
||||||
rawSocket.once('timeout', onTimeout)
|
|
||||||
rawSocket.once('connect', onConnect)
|
|
||||||
options.signal && options.signal.addEventListener('abort', onAbort)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
createListener (options, handler) {
|
createListener (options, handler) {
|
||||||
@ -86,7 +42,8 @@ class TCP {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handler = handler || noop
|
handler = handler || noop
|
||||||
return createListener(handler, this.upgrader)
|
|
||||||
|
return createListener(handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
filter (multiaddrs) {
|
filter (multiaddrs) {
|
||||||
|
@ -1,30 +1,26 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
|
const Connection = require('interface-connection').Connection
|
||||||
const os = require('os')
|
const os = require('os')
|
||||||
const includes = require('lodash.includes')
|
const includes = require('lodash.includes')
|
||||||
const net = require('net')
|
const {createServer} = require('pull-net')
|
||||||
const EventEmitter = require('events').EventEmitter
|
const EventEmitter = require('events').EventEmitter
|
||||||
const debug = require('debug')
|
const debug = require('debug')
|
||||||
const log = debug('libp2p:tcp:listen')
|
const log = debug('libp2p:tcp:listen')
|
||||||
const logError = debug('libp2p:tcp:listen:error')
|
|
||||||
|
|
||||||
const Libp2pSocket = require('./socket')
|
|
||||||
const getMultiaddr = require('./get-multiaddr')
|
const getMultiaddr = require('./get-multiaddr')
|
||||||
const c = require('./constants')
|
const IPFS_CODE = 421
|
||||||
|
|
||||||
module.exports = (handler, upgrader) => {
|
function noop () {}
|
||||||
|
|
||||||
|
module.exports = (handler) => {
|
||||||
const listener = new EventEmitter()
|
const listener = new EventEmitter()
|
||||||
|
|
||||||
const server = net.createServer((socket) => {
|
const server = createServer((stream) => {
|
||||||
// Avoid uncaught errors caused by unstable connections
|
const addr = getMultiaddr(stream)
|
||||||
socket.on('error', (err) => {
|
|
||||||
logError('Error emitted by server handler socket: ' + err.message)
|
|
||||||
})
|
|
||||||
|
|
||||||
const addr = getMultiaddr(socket)
|
|
||||||
if (!addr) {
|
if (!addr) {
|
||||||
if (socket.remoteAddress === undefined) {
|
if (stream.remoteAddress === undefined || stream.remoteAddress.address === 'undefined') {
|
||||||
log('connection closed before p2p connection made')
|
log('connection closed before p2p connection made')
|
||||||
} else {
|
} else {
|
||||||
log('error interpreting incoming p2p connection')
|
log('error interpreting incoming p2p connection')
|
||||||
@ -34,50 +30,35 @@ module.exports = (handler, upgrader) => {
|
|||||||
|
|
||||||
log('new connection', addr.toString())
|
log('new connection', addr.toString())
|
||||||
|
|
||||||
const s = new Libp2pSocket(socket, addr)
|
stream.getObservedAddrs = (cb) => {
|
||||||
trackSocket(server, socket)
|
cb(null, [addr])
|
||||||
|
}
|
||||||
|
|
||||||
const conn = upgrader.upgradeInbound(s)
|
const conn = new Connection(stream)
|
||||||
handler && handler(conn)
|
handler(conn)
|
||||||
listener.emit('connection', conn)
|
listener.emit('connection', conn)
|
||||||
})
|
})
|
||||||
|
|
||||||
server.on('listening', () => listener.emit('listening'))
|
listener.emit('listening')
|
||||||
server.on('error', (err) => listener.emit('error', err))
|
|
||||||
server.on('close', () => listener.emit('close'))
|
|
||||||
|
|
||||||
// Keep track of open connections to destroy in case of timeout
|
listener.close = (options, callback) => {
|
||||||
server.__connections = {}
|
if (typeof options === 'function') {
|
||||||
|
callback = options
|
||||||
listener.close = (options = {}) => {
|
options = {}
|
||||||
if (!server.listening) {
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
callback = callback || noop
|
||||||
|
options = options || {}
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
server.close((err, ...a) => {
|
||||||
const start = Date.now()
|
listener.emit('close')
|
||||||
|
callback(err, ...a)
|
||||||
// Attempt to stop the server. If it takes longer than the timeout,
|
|
||||||
// destroy all the underlying sockets manually.
|
|
||||||
const timeout = setTimeout(() => {
|
|
||||||
log('Timeout closing server after %dms, destroying connections manually', Date.now() - start)
|
|
||||||
Object.keys(server.__connections).forEach((key) => {
|
|
||||||
log('destroying %s', key)
|
|
||||||
server.__connections[key].destroy()
|
|
||||||
})
|
|
||||||
resolve()
|
|
||||||
}, options.timeout || c.CLOSE_TIMEOUT)
|
|
||||||
|
|
||||||
server.once('close', () => clearTimeout(timeout))
|
|
||||||
|
|
||||||
server.close((err) => err ? reject(err) : resolve())
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
let ipfsId
|
let ipfsId
|
||||||
let listeningAddr
|
let listeningAddr
|
||||||
|
|
||||||
listener.listen = (ma) => {
|
listener.listen = (ma, callback) => {
|
||||||
listeningAddr = ma
|
listeningAddr = ma
|
||||||
if (includes(ma.protoNames(), 'ipfs')) {
|
if (includes(ma.protoNames(), 'ipfs')) {
|
||||||
ipfsId = getIpfsId(ma)
|
ipfsId = getIpfsId(ma)
|
||||||
@ -85,24 +66,16 @@ module.exports = (handler, upgrader) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const lOpts = listeningAddr.toOptions()
|
const lOpts = listeningAddr.toOptions()
|
||||||
return new Promise((resolve, reject) => {
|
log('Listening on %s %s', lOpts.port, lOpts.host)
|
||||||
server.listen(lOpts.port, lOpts.host, (err) => {
|
return server.listen(lOpts.port, lOpts.host, callback)
|
||||||
if (err) {
|
|
||||||
return reject(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
log('Listening on %s %s', lOpts.port, lOpts.host)
|
|
||||||
resolve()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
listener.getAddrs = () => {
|
listener.getAddrs = (callback) => {
|
||||||
const multiaddrs = []
|
const multiaddrs = []
|
||||||
const address = server.address()
|
const address = server.address()
|
||||||
|
|
||||||
if (!address) {
|
if (!address) {
|
||||||
throw new Error('Listener is not ready yet')
|
return callback(new Error('Listener is not ready yet'))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Because TCP will only return the IPv6 version
|
// Because TCP will only return the IPv6 version
|
||||||
@ -137,7 +110,7 @@ module.exports = (handler, upgrader) => {
|
|||||||
multiaddrs.push(ma)
|
multiaddrs.push(ma)
|
||||||
}
|
}
|
||||||
|
|
||||||
return multiaddrs
|
callback(null, multiaddrs)
|
||||||
}
|
}
|
||||||
|
|
||||||
return listener
|
return listener
|
||||||
@ -145,15 +118,6 @@ module.exports = (handler, upgrader) => {
|
|||||||
|
|
||||||
function getIpfsId (ma) {
|
function getIpfsId (ma) {
|
||||||
return ma.stringTuples().filter((tuple) => {
|
return ma.stringTuples().filter((tuple) => {
|
||||||
return tuple[0] === c.IPFS_MA_CODE
|
return tuple[0] === IPFS_CODE
|
||||||
})[0][1]
|
})[0][1]
|
||||||
}
|
}
|
||||||
|
|
||||||
function trackSocket (server, socket) {
|
|
||||||
const key = `${socket.remoteAddress}:${socket.remotePort}`
|
|
||||||
server.__connections[key] = socket
|
|
||||||
|
|
||||||
socket.once('close', () => {
|
|
||||||
delete server.__connections[key]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
@ -1,87 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
const abortable = require('abortable-iterator')
|
|
||||||
const debug = require('debug')
|
|
||||||
const log = debug('libp2p:tcp:socket')
|
|
||||||
|
|
||||||
const c = require('./constants')
|
|
||||||
|
|
||||||
class Libp2pSocket {
|
|
||||||
constructor (rawSocket, ma, opts = {}) {
|
|
||||||
this._rawSocket = rawSocket
|
|
||||||
this._ma = ma
|
|
||||||
this.remoteAddr = ma
|
|
||||||
this.conn = rawSocket
|
|
||||||
|
|
||||||
this.sink = this._sink(opts)
|
|
||||||
this.source = opts.signal ? abortable(rawSocket, opts.signal) : rawSocket
|
|
||||||
}
|
|
||||||
|
|
||||||
_sink (opts) {
|
|
||||||
// By default, close when the source is exhausted
|
|
||||||
const closeOnEnd = opts.closeOnEnd !== false
|
|
||||||
|
|
||||||
return async (source) => {
|
|
||||||
try {
|
|
||||||
const src = opts.signal ? abortable(source, opts.signal) : source
|
|
||||||
await this._write(src, closeOnEnd)
|
|
||||||
} catch (err) {
|
|
||||||
// If the connection is aborted just close the socket
|
|
||||||
if (err.type === 'aborted') {
|
|
||||||
return this.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
throw err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async _write (source, closeOnEnd) {
|
|
||||||
for await (const data of source) {
|
|
||||||
if (this._rawSocket.destroyed) {
|
|
||||||
const cOpts = this._ma.toOptions()
|
|
||||||
throw new Error('Cannot write %d bytes to destroyed socket %s:%s',
|
|
||||||
data.length, cOpts.host, cOpts.port)
|
|
||||||
}
|
|
||||||
|
|
||||||
const flushed = this._rawSocket.write(data)
|
|
||||||
if (!flushed) {
|
|
||||||
await new Promise((resolve) => this._rawSocket.once('drain', resolve))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (closeOnEnd) {
|
|
||||||
await this.close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
close (opts = {}) {
|
|
||||||
if (this._rawSocket.pending || this._rawSocket.destroyed) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const start = Date.now()
|
|
||||||
|
|
||||||
// Attempt to end the socket. If it takes longer to close than the
|
|
||||||
// timeout, destroy it manually.
|
|
||||||
const timeout = setTimeout(() => {
|
|
||||||
const cOpts = this._ma.toOptions()
|
|
||||||
log('Timeout closing socket to %s:%s after %dms, destroying it manually',
|
|
||||||
cOpts.host, cOpts.port, Date.now() - start)
|
|
||||||
this._rawSocket.destroy()
|
|
||||||
resolve()
|
|
||||||
}, opts.timeout || c.CLOSE_TIMEOUT)
|
|
||||||
|
|
||||||
this._rawSocket.once('close', () => clearTimeout(timeout))
|
|
||||||
|
|
||||||
this._rawSocket.end((err) => err ? reject(err) : resolve())
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
getObservedAddrs () {
|
|
||||||
return [this._ma]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = Libp2pSocket
|
|
@ -1,112 +0,0 @@
|
|||||||
/* eslint-env mocha */
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
const pull = require('pull-stream')
|
|
||||||
const chai = require('chai')
|
|
||||||
const dirtyChai = require('dirty-chai')
|
|
||||||
const expect = chai.expect
|
|
||||||
chai.use(dirtyChai)
|
|
||||||
const TCP = require('../../src/adapter')
|
|
||||||
const multiaddr = require('multiaddr')
|
|
||||||
const upgrader = require('../utils/upgrader')
|
|
||||||
|
|
||||||
describe('valid Connection', () => {
|
|
||||||
let tcp
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
tcp = new TCP({ upgrader })
|
|
||||||
})
|
|
||||||
|
|
||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
|
||||||
|
|
||||||
it('get observed addrs', (done) => {
|
|
||||||
let dialerObsAddrs
|
|
||||||
|
|
||||||
const listener = tcp.createListener((conn) => {
|
|
||||||
expect(conn).to.exist()
|
|
||||||
conn.getObservedAddrs((err, addrs) => {
|
|
||||||
expect(err).to.not.exist()
|
|
||||||
dialerObsAddrs = addrs
|
|
||||||
pull(pull.empty(), conn)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
listener.listen(ma, () => {
|
|
||||||
const conn = tcp.dial(ma)
|
|
||||||
pull(
|
|
||||||
conn,
|
|
||||||
pull.onEnd(endHandler)
|
|
||||||
)
|
|
||||||
|
|
||||||
function endHandler () {
|
|
||||||
conn.getObservedAddrs((err, addrs) => {
|
|
||||||
expect(err).to.not.exist()
|
|
||||||
pull(pull.empty(), conn)
|
|
||||||
closeAndAssert(listener, addrs)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeAndAssert (listener, addrs) {
|
|
||||||
listener.close(() => {
|
|
||||||
expect(addrs[0]).to.deep.equal(ma)
|
|
||||||
expect(dialerObsAddrs.length).to.equal(1)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('get Peer Info', (done) => {
|
|
||||||
const listener = tcp.createListener((conn) => {
|
|
||||||
expect(conn).to.exist()
|
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
|
||||||
expect(err).to.exist()
|
|
||||||
expect(peerInfo).to.not.exist()
|
|
||||||
pull(pull.empty(), conn)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
listener.listen(ma, () => {
|
|
||||||
const conn = tcp.dial(ma)
|
|
||||||
|
|
||||||
pull(conn, pull.onEnd(endHandler))
|
|
||||||
|
|
||||||
function endHandler () {
|
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
|
||||||
expect(err).to.exist()
|
|
||||||
expect(peerInfo).to.not.exist()
|
|
||||||
|
|
||||||
listener.close(done)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('set Peer Info', (done) => {
|
|
||||||
const listener = tcp.createListener((conn) => {
|
|
||||||
expect(conn).to.exist()
|
|
||||||
conn.setPeerInfo('batatas')
|
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
|
||||||
expect(err).to.not.exist()
|
|
||||||
expect(peerInfo).to.equal('batatas')
|
|
||||||
pull(pull.empty(), conn)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
listener.listen(ma, () => {
|
|
||||||
const conn = tcp.dial(ma)
|
|
||||||
|
|
||||||
pull(conn, pull.onEnd(endHandler))
|
|
||||||
|
|
||||||
function endHandler () {
|
|
||||||
conn.setPeerInfo('arroz')
|
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
|
||||||
expect(err).to.not.exist()
|
|
||||||
expect(peerInfo).to.equal('arroz')
|
|
||||||
|
|
||||||
listener.close(done)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,43 +1,23 @@
|
|||||||
/* eslint-env mocha */
|
/* eslint-env mocha */
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const sinon = require('sinon')
|
|
||||||
const tests = require('interface-transport')
|
const tests = require('interface-transport')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const net = require('net')
|
|
||||||
const TCP = require('../src')
|
const TCP = require('../src')
|
||||||
|
|
||||||
describe('interface-transport compliance', () => {
|
describe('interface-transport compliance', () => {
|
||||||
tests({
|
tests({
|
||||||
setup (options) {
|
setup (cb) {
|
||||||
const tcp = new TCP(options)
|
let tcp = new TCP()
|
||||||
const addrs = [
|
const addrs = [
|
||||||
multiaddr('/ip4/127.0.0.1/tcp/9091'),
|
multiaddr('/ip4/127.0.0.1/tcp/9091'),
|
||||||
multiaddr('/ip4/127.0.0.1/tcp/9092'),
|
multiaddr('/ip4/127.0.0.1/tcp/9092'),
|
||||||
multiaddr('/ip4/127.0.0.1/tcp/9093'),
|
multiaddr('/ip4/127.0.0.1/tcp/9093')
|
||||||
multiaddr('/dns4/ipfs.io')
|
|
||||||
]
|
]
|
||||||
|
cb(null, tcp, addrs)
|
||||||
// Used by the dial tests to simulate a delayed connect
|
},
|
||||||
const connector = {
|
teardown (cb) {
|
||||||
delay (delayMs) {
|
cb()
|
||||||
const netConnect = net.connect
|
|
||||||
sinon.replace(net, 'connect', (opts) => {
|
|
||||||
const socket = netConnect(opts)
|
|
||||||
const socketEmit = socket.emit.bind(socket)
|
|
||||||
sinon.replace(socket, 'emit', (...args) => {
|
|
||||||
const time = args[0] === 'connect' ? delayMs : 0
|
|
||||||
setTimeout(() => socketEmit(...args), time)
|
|
||||||
})
|
|
||||||
return socket
|
|
||||||
})
|
|
||||||
},
|
|
||||||
restore () {
|
|
||||||
sinon.restore()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { transport: tcp, addrs, connector }
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -6,10 +6,9 @@ const chai = require('chai')
|
|||||||
const dirtyChai = require('dirty-chai')
|
const dirtyChai = require('dirty-chai')
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
chai.use(dirtyChai)
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../../src/adapter')
|
const TCP = require('../src')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const Connection = require('interface-connection').Connection
|
const Connection = require('interface-connection').Connection
|
||||||
const upgrader = require('../utils/upgrader')
|
|
||||||
|
|
||||||
describe('Connection Wrap', () => {
|
describe('Connection Wrap', () => {
|
||||||
let tcp
|
let tcp
|
||||||
@ -17,7 +16,7 @@ describe('Connection Wrap', () => {
|
|||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||||
|
|
||||||
beforeEach((done) => {
|
beforeEach((done) => {
|
||||||
tcp = new TCP({ upgrader })
|
tcp = new TCP()
|
||||||
listener = tcp.createListener((conn) => {
|
listener = tcp.createListener((conn) => {
|
||||||
pull(conn, conn)
|
pull(conn, conn)
|
||||||
})
|
})
|
@ -1,56 +1,111 @@
|
|||||||
/* eslint-env mocha */
|
/* eslint-env mocha */
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
|
const pull = require('pull-stream')
|
||||||
const chai = require('chai')
|
const chai = require('chai')
|
||||||
const dirtyChai = require('dirty-chai')
|
const dirtyChai = require('dirty-chai')
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
chai.use(dirtyChai)
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../src')
|
const TCP = require('../src')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const upgrader = require('./utils/upgrader')
|
|
||||||
|
|
||||||
describe('valid Connection', () => {
|
describe('valid Connection', () => {
|
||||||
let tcp
|
let tcp
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
tcp = new TCP({ upgrader })
|
tcp = new TCP()
|
||||||
})
|
})
|
||||||
|
|
||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||||
|
|
||||||
it('get observed addrs', async () => {
|
it('get observed addrs', (done) => {
|
||||||
// Create a Promise that resolves when a connection is handled
|
let dialerObsAddrs
|
||||||
let handled
|
|
||||||
const handlerPromise = new Promise((resolve) => {
|
const listener = tcp.createListener((conn) => {
|
||||||
handled = resolve
|
expect(conn).to.exist()
|
||||||
|
conn.getObservedAddrs((err, addrs) => {
|
||||||
|
expect(err).to.not.exist()
|
||||||
|
dialerObsAddrs = addrs
|
||||||
|
pull(pull.empty(), conn)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
const handler = async (conn) => {
|
listener.listen(ma, () => {
|
||||||
|
const conn = tcp.dial(ma)
|
||||||
|
pull(
|
||||||
|
conn,
|
||||||
|
pull.onEnd(endHandler)
|
||||||
|
)
|
||||||
|
|
||||||
|
function endHandler () {
|
||||||
|
conn.getObservedAddrs((err, addrs) => {
|
||||||
|
expect(err).to.not.exist()
|
||||||
|
pull(pull.empty(), conn)
|
||||||
|
closeAndAssert(listener, addrs)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeAndAssert (listener, addrs) {
|
||||||
|
listener.close(() => {
|
||||||
|
expect(addrs[0]).to.deep.equal(ma)
|
||||||
|
expect(dialerObsAddrs.length).to.equal(1)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('get Peer Info', (done) => {
|
||||||
|
const listener = tcp.createListener((conn) => {
|
||||||
expect(conn).to.exist()
|
expect(conn).to.exist()
|
||||||
const dialerObsAddrs = await conn.getObservedAddrs()
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
handled(dialerObsAddrs)
|
expect(err).to.exist()
|
||||||
}
|
expect(peerInfo).to.not.exist()
|
||||||
|
pull(pull.empty(), conn)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
// Create a listener with the handler
|
listener.listen(ma, () => {
|
||||||
const listener = tcp.createListener(handler)
|
const conn = tcp.dial(ma)
|
||||||
|
|
||||||
// Listen on the multi-address
|
pull(conn, pull.onEnd(endHandler))
|
||||||
await listener.listen(ma)
|
|
||||||
|
|
||||||
// Dial to that same address
|
function endHandler () {
|
||||||
const conn = await tcp.dial(ma)
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
const addrs = await conn.getObservedAddrs()
|
expect(err).to.exist()
|
||||||
|
expect(peerInfo).to.not.exist()
|
||||||
|
|
||||||
// Wait for the incoming dial to be handled
|
listener.close(done)
|
||||||
const dialerObsAddrs = await handlerPromise
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
// Close the listener
|
it('set Peer Info', (done) => {
|
||||||
await listener.close()
|
const listener = tcp.createListener((conn) => {
|
||||||
|
expect(conn).to.exist()
|
||||||
|
conn.setPeerInfo('batatas')
|
||||||
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
|
expect(err).to.not.exist()
|
||||||
|
expect(peerInfo).to.equal('batatas')
|
||||||
|
pull(pull.empty(), conn)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
// The addresses should match
|
listener.listen(ma, () => {
|
||||||
expect(addrs.length).to.equal(1)
|
const conn = tcp.dial(ma)
|
||||||
expect(addrs[0]).to.deep.equal(ma)
|
|
||||||
expect(dialerObsAddrs.length).to.equal(1)
|
pull(conn, pull.onEnd(endHandler))
|
||||||
expect(dialerObsAddrs[0]).to.exist()
|
|
||||||
|
function endHandler () {
|
||||||
|
conn.setPeerInfo('arroz')
|
||||||
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
|
expect(err).to.not.exist()
|
||||||
|
expect(peerInfo).to.equal('arroz')
|
||||||
|
|
||||||
|
listener.close(done)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -6,11 +6,10 @@ const dirtyChai = require('dirty-chai')
|
|||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
chai.use(dirtyChai)
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../src')
|
const TCP = require('../src')
|
||||||
const upgrader = require('./utils/upgrader')
|
|
||||||
|
|
||||||
describe('Constructor', () => {
|
describe('Constructor', () => {
|
||||||
it('create an instance', () => {
|
it('create an instance', () => {
|
||||||
const tcp = new TCP({ upgrader })
|
const tcp = new TCP()
|
||||||
expect(tcp).to.exist()
|
expect(tcp).to.exist()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -7,7 +7,6 @@ const expect = chai.expect
|
|||||||
chai.use(dirtyChai)
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../src')
|
const TCP = require('../src')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const upgrader = require('./utils/upgrader')
|
|
||||||
|
|
||||||
describe('filter addrs', () => {
|
describe('filter addrs', () => {
|
||||||
const base = '/ip4/127.0.0.1'
|
const base = '/ip4/127.0.0.1'
|
||||||
@ -16,7 +15,7 @@ describe('filter addrs', () => {
|
|||||||
let tcp
|
let tcp
|
||||||
|
|
||||||
before(() => {
|
before(() => {
|
||||||
tcp = new TCP({ upgrader })
|
tcp = new TCP()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('filter valid addrs for this transport', () => {
|
it('filter valid addrs for this transport', () => {
|
||||||
@ -26,11 +25,9 @@ describe('filter addrs', () => {
|
|||||||
const ma4 = multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
const ma4 = multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||||
const ma5 = multiaddr(base + '/tcp/9090/http' + ipfs)
|
const ma5 = multiaddr(base + '/tcp/9090/http' + ipfs)
|
||||||
const ma6 = multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
|
const ma6 = multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
|
||||||
const ma7 = multiaddr('/dns4/libp2p.io/tcp/9090')
|
|
||||||
const ma8 = multiaddr('/dnsaddr/libp2p.io/tcp/9090')
|
|
||||||
|
|
||||||
const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6, ma7, ma8])
|
const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6])
|
||||||
expect(valid.length).to.equal(4)
|
expect(valid.length).to.equal(2)
|
||||||
expect(valid[0]).to.deep.equal(ma1)
|
expect(valid[0]).to.deep.equal(ma1)
|
||||||
expect(valid[1]).to.deep.equal(ma4)
|
expect(valid[1]).to.deep.equal(ma4)
|
||||||
})
|
})
|
||||||
|
@ -6,17 +6,16 @@ const chai = require('chai')
|
|||||||
const dirtyChai = require('dirty-chai')
|
const dirtyChai = require('dirty-chai')
|
||||||
const expect = chai.expect
|
const expect = chai.expect
|
||||||
chai.use(dirtyChai)
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../../src/adapter')
|
const TCP = require('../src')
|
||||||
const net = require('net')
|
const net = require('net')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const upgrader = require('../utils/upgrader')
|
|
||||||
const isCI = process.env.CI
|
const isCI = process.env.CI
|
||||||
|
|
||||||
describe('listen', () => {
|
describe('listen', () => {
|
||||||
let tcp
|
let tcp
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
tcp = new TCP({ upgrader })
|
tcp = new TCP()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('close listener with connections, through timeout', (done) => {
|
it('close listener with connections, through timeout', (done) => {
|
||||||
@ -135,7 +134,7 @@ describe('dial', () => {
|
|||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||||
|
|
||||||
beforeEach((done) => {
|
beforeEach((done) => {
|
||||||
tcp = new TCP({ upgrader })
|
tcp = new TCP()
|
||||||
listener = tcp.createListener((conn) => {
|
listener = tcp.createListener((conn) => {
|
||||||
pull(
|
pull(
|
||||||
conn,
|
conn,
|
@ -1,242 +0,0 @@
|
|||||||
/* eslint-env mocha */
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
const chai = require('chai')
|
|
||||||
const dirtyChai = require('dirty-chai')
|
|
||||||
const expect = chai.expect
|
|
||||||
chai.use(dirtyChai)
|
|
||||||
|
|
||||||
const TCP = require('../src')
|
|
||||||
const net = require('net')
|
|
||||||
const multiaddr = require('multiaddr')
|
|
||||||
const pipe = require('it-pipe')
|
|
||||||
const { collect, map } = require('streaming-iterables')
|
|
||||||
const isCI = process.env.CI
|
|
||||||
const upgrader = require('./utils/upgrader')
|
|
||||||
|
|
||||||
describe('listen', () => {
|
|
||||||
let tcp
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
tcp = new TCP({ upgrader })
|
|
||||||
})
|
|
||||||
|
|
||||||
it('close listener with connections, through timeout', async () => {
|
|
||||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
|
||||||
const listener = tcp.createListener((conn) => {
|
|
||||||
pipe(conn, conn)
|
|
||||||
})
|
|
||||||
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const socket1 = net.connect(9090)
|
|
||||||
const socket2 = net.connect(9090)
|
|
||||||
|
|
||||||
socket1.write('Some data that is never handled')
|
|
||||||
socket1.end()
|
|
||||||
socket1.on('error', () => {})
|
|
||||||
socket2.on('error', () => {})
|
|
||||||
|
|
||||||
await new Promise((resolve) => {
|
|
||||||
socket1.on('connect', async () => {
|
|
||||||
await listener.close({ timeout: 100 })
|
|
||||||
resolve()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('listen on port 0', async () => {
|
|
||||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('listen on IPv6 addr', async () => {
|
|
||||||
if (isCI) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const mh = multiaddr('/ip6/::/tcp/9090')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('listen on any Interface', async () => {
|
|
||||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('getAddrs', async () => {
|
|
||||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const multiaddrs = listener.getAddrs()
|
|
||||||
expect(multiaddrs.length).to.equal(1)
|
|
||||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('getAddrs on port 0 listen', async () => {
|
|
||||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const multiaddrs = listener.getAddrs()
|
|
||||||
expect(multiaddrs.length).to.equal(1)
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('getAddrs from listening on 0.0.0.0', async () => {
|
|
||||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const multiaddrs = listener.getAddrs()
|
|
||||||
expect(multiaddrs.length > 0).to.equal(true)
|
|
||||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
|
|
||||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/0')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const multiaddrs = listener.getAddrs()
|
|
||||||
expect(multiaddrs.length > 0).to.equal(true)
|
|
||||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('getAddrs preserves IPFS Id', async () => {
|
|
||||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
|
||||||
const listener = tcp.createListener((conn) => {})
|
|
||||||
await listener.listen(mh)
|
|
||||||
|
|
||||||
const multiaddrs = listener.getAddrs()
|
|
||||||
expect(multiaddrs.length).to.equal(1)
|
|
||||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('dial', () => {
|
|
||||||
let tcp
|
|
||||||
let listener
|
|
||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
tcp = new TCP({ upgrader })
|
|
||||||
listener = tcp.createListener((conn) => {
|
|
||||||
pipe(
|
|
||||||
conn,
|
|
||||||
map((x) => Buffer.from(x.toString() + '!')),
|
|
||||||
conn
|
|
||||||
)
|
|
||||||
})
|
|
||||||
await listener.listen(ma)
|
|
||||||
})
|
|
||||||
|
|
||||||
afterEach(() => listener.close())
|
|
||||||
|
|
||||||
it('dial on IPv4', async () => {
|
|
||||||
const values = await pipe(
|
|
||||||
['hey'],
|
|
||||||
await tcp.dial(ma),
|
|
||||||
collect
|
|
||||||
)
|
|
||||||
expect(values).to.eql([Buffer.from('hey!')])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('dial on IPv6', async () => {
|
|
||||||
if (isCI) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const ma = multiaddr('/ip6/::/tcp/9066')
|
|
||||||
const listener = tcp.createListener((conn) => {
|
|
||||||
pipe(conn, conn)
|
|
||||||
})
|
|
||||||
await listener.listen(ma)
|
|
||||||
|
|
||||||
const values = await pipe(
|
|
||||||
['hey'],
|
|
||||||
await tcp.dial(ma),
|
|
||||||
collect
|
|
||||||
)
|
|
||||||
expect(values).to.be.eql([Buffer.from('hey')])
|
|
||||||
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('dial and destroy on listener', async () => {
|
|
||||||
let handled
|
|
||||||
const handledPromise = new Promise((resolve) => {
|
|
||||||
handled = resolve
|
|
||||||
})
|
|
||||||
|
|
||||||
const ma = multiaddr('/ip6/::/tcp/0')
|
|
||||||
|
|
||||||
const listener = tcp.createListener(async (conn) => {
|
|
||||||
await pipe(
|
|
||||||
[],
|
|
||||||
conn
|
|
||||||
)
|
|
||||||
handled()
|
|
||||||
})
|
|
||||||
|
|
||||||
await listener.listen(ma)
|
|
||||||
const addrs = listener.getAddrs()
|
|
||||||
await pipe(await tcp.dial(addrs[0]))
|
|
||||||
|
|
||||||
await handledPromise
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('dial and destroy on dialer', async () => {
|
|
||||||
if (isCI) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let handled
|
|
||||||
const handledPromise = new Promise((resolve) => {
|
|
||||||
handled = resolve
|
|
||||||
})
|
|
||||||
|
|
||||||
const ma = multiaddr('/ip6/::/tcp/0')
|
|
||||||
|
|
||||||
const listener = tcp.createListener(async (conn) => {
|
|
||||||
// pull(conn, pull.onEnd(destroyed))
|
|
||||||
await pipe(conn)
|
|
||||||
handled()
|
|
||||||
})
|
|
||||||
|
|
||||||
await listener.listen(ma)
|
|
||||||
const addrs = listener.getAddrs()
|
|
||||||
await pipe(await tcp.dial(addrs[0]))
|
|
||||||
|
|
||||||
await handledPromise
|
|
||||||
await listener.close()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('dial on IPv4 with IPFS Id', async () => {
|
|
||||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
|
||||||
const conn = await tcp.dial(ma)
|
|
||||||
|
|
||||||
const res = await pipe(
|
|
||||||
['hey'],
|
|
||||||
conn,
|
|
||||||
collect
|
|
||||||
)
|
|
||||||
expect(res).to.be.eql([Buffer.from('hey!')])
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,6 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
upgradeOutbound: (conn) => conn,
|
|
||||||
upgradeInbound: (conn) => conn
|
|
||||||
}
|
|
Reference in New Issue
Block a user