mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-02 06:21:54 +00:00
Compare commits
12 Commits
v0.14.4
...
test/travi
| Author | SHA1 | Date | |
|---|---|---|---|
| b38b57bdca | |||
| fde9cd40d3 | |||
| 09e5752cb4 | |||
| 1eca9d656e | |||
| 330853f470 | |||
| 9d5ccd17a2 | |||
| 6bc505d73a | |||
| 431219db93 | |||
| 1ffd549dab | |||
| 776a5246b5 | |||
| 65c1888f54 | |||
| 6cf8f71d10 |
49
.gitignore
vendored
49
.gitignore
vendored
@ -1,5 +1,46 @@
|
||||
node_modules
|
||||
package-lock.json
|
||||
coverage
|
||||
.nyc_output
|
||||
docs
|
||||
**/node_modules/
|
||||
**/*.log
|
||||
test/repo-tests*
|
||||
**/bundle.js
|
||||
|
||||
# yarn
|
||||
yarn.lock
|
||||
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
|
||||
coverage
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
*.seed
|
||||
|
||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||
lib-cov
|
||||
|
||||
# Coverage directory used by tools like istanbul
|
||||
coverage
|
||||
|
||||
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
||||
.grunt
|
||||
|
||||
# node-waf configuration
|
||||
.lock-wscript
|
||||
|
||||
build
|
||||
|
||||
# Dependency directory
|
||||
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
|
||||
node_modules
|
||||
|
||||
lib
|
||||
dist
|
||||
test/test-data/go-ipfs-repo/LOCK
|
||||
test/test-data/go-ipfs-repo/LOG
|
||||
test/test-data/go-ipfs-repo/LOG.old
|
||||
|
||||
# while testing npm5
|
||||
package-lock.json
|
||||
|
||||
21
.travis.yml
21
.travis.yml
@ -1,6 +1,5 @@
|
||||
language: node_js
|
||||
cache: npm
|
||||
sudo: false
|
||||
|
||||
stages:
|
||||
- check
|
||||
@ -9,25 +8,27 @@ stages:
|
||||
|
||||
node_js:
|
||||
- '10'
|
||||
- '12'
|
||||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
- windows
|
||||
|
||||
before_script:
|
||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'; fi
|
||||
|
||||
script: npx nyc -s npm run test:node -- --bail
|
||||
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- os: linux
|
||||
sudo: false
|
||||
before_script: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
|
||||
|
||||
- os: windows
|
||||
filter_secrets: false
|
||||
cache: false
|
||||
|
||||
- os: osx
|
||||
|
||||
- stage: check
|
||||
os: linux
|
||||
script:
|
||||
- npx aegir build --bundlesize
|
||||
- npx aegir commitlint --travis
|
||||
- npx aegir dep-check
|
||||
- npm run lint
|
||||
|
||||
|
||||
66
CHANGELOG.md
66
CHANGELOG.md
@ -1,69 +1,3 @@
|
||||
<a name="0.14.4"></a>
|
||||
## [0.14.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.3...v0.14.4) (2020-02-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* catch thrown maConn errors in listener ([#122](https://github.com/libp2p/js-libp2p-tcp/issues/122)) ([86db568](https://github.com/libp2p/js-libp2p-tcp/commit/86db568)), closes [#121](https://github.com/libp2p/js-libp2p-tcp/issues/121)
|
||||
* remove use of assert module ([#123](https://github.com/libp2p/js-libp2p-tcp/issues/123)) ([6272876](https://github.com/libp2p/js-libp2p-tcp/commit/6272876))
|
||||
|
||||
|
||||
|
||||
<a name="0.14.3"></a>
|
||||
## [0.14.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.2...v0.14.3) (2019-12-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* transport should not handle connection if upgradeInbound throws ([#119](https://github.com/libp2p/js-libp2p-tcp/issues/119)) ([21f8747](https://github.com/libp2p/js-libp2p-tcp/commit/21f8747))
|
||||
|
||||
|
||||
|
||||
<a name="0.14.2"></a>
|
||||
## [0.14.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.1...v0.14.2) (2019-12-06)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **log:** log the bound port and host ([#117](https://github.com/libp2p/js-libp2p-tcp/issues/117)) ([7702646](https://github.com/libp2p/js-libp2p-tcp/commit/7702646))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add path multiaddr support ([#118](https://github.com/libp2p/js-libp2p-tcp/issues/118)) ([d76a1f2](https://github.com/libp2p/js-libp2p-tcp/commit/d76a1f2))
|
||||
|
||||
|
||||
|
||||
<a name="0.14.1"></a>
|
||||
## [0.14.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.0...v0.14.1) (2019-09-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ensure timeline.close is set ([#113](https://github.com/libp2p/js-libp2p-tcp/issues/113)) ([605ee27](https://github.com/libp2p/js-libp2p-tcp/commit/605ee27))
|
||||
|
||||
|
||||
|
||||
<a name="0.14.0"></a>
|
||||
# [0.14.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.13.1...v0.14.0) (2019-09-16)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* change api to async / await ([#112](https://github.com/libp2p/js-libp2p-tcp/issues/112)) ([cf7d1b8](https://github.com/libp2p/js-libp2p-tcp/commit/cf7d1b8))
|
||||
|
||||
|
||||
### BREAKING CHANGES
|
||||
|
||||
* All places in the API that used callbacks are now replaced with async/await. The API has also been updated according to the latest `interface-transport` version, https://github.com/libp2p/interface-transport/tree/v0.6.0#api.
|
||||
|
||||
|
||||
|
||||
<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)
|
||||
|
||||
|
||||
23
README.md
23
README.md
@ -1,13 +1,13 @@
|
||||
# js-libp2p-tcp
|
||||
|
||||
[](http://protocol.ai)
|
||||
[](http://libp2p.io/)
|
||||
[](http://webchat.freenode.net/?channels=%23libp2p)
|
||||
[](https://discuss.libp2p.io)
|
||||
[](https://codecov.io/gh/libp2p/js-libp2p-tcp)
|
||||
[](https://travis-ci.com/libp2p/js-libp2p-tcp)
|
||||
[](http://ipn.io)
|
||||
[](http://webchat.freenode.net/?channels=%23ipfs)
|
||||
[](https://travis-ci.org/libp2p/js-libp2p-tcp)
|
||||
[](https://coveralls.io/github/libp2p/js-libp2p-tcp?branch=master)
|
||||
[](https://david-dm.org/libp2p/js-libp2p-tcp)
|
||||
[](https://github.com/feross/standard)
|
||||
|
||||
|
||||
|
||||
[](https://github.com/libp2p/interface-transport)
|
||||
[](https://github.com/libp2p/interface-connection)
|
||||
@ -44,13 +44,9 @@ const multiaddr = require('multiaddr')
|
||||
const pipe = require('it-pipe')
|
||||
const { collect } = require('streaming-iterables')
|
||||
|
||||
// A simple upgrader that just returns the MultiaddrConnection
|
||||
const upgrader = {
|
||||
upgradeInbound: maConn => maConn,
|
||||
upgradeOutbound: maConn => maConn
|
||||
}
|
||||
const addr = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
|
||||
const tcp = new TCP({ upgrader })
|
||||
const tcp = new TCP()
|
||||
|
||||
const listener = tcp.createListener((socket) => {
|
||||
console.log('new connection opened')
|
||||
@ -60,8 +56,7 @@ const listener = tcp.createListener((socket) => {
|
||||
)
|
||||
})
|
||||
|
||||
const addr = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
await listener.listen(addr)
|
||||
await listener.listen([addr])
|
||||
console.log('listening')
|
||||
|
||||
const socket = await tcp.dial(addr)
|
||||
|
||||
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
|
||||
67
package.json
67
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libp2p-tcp",
|
||||
"version": "0.14.4",
|
||||
"version": "0.13.0",
|
||||
"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>",
|
||||
"main": "src/index.js",
|
||||
@ -8,13 +8,17 @@
|
||||
"lint": "aegir lint",
|
||||
"test": "aegir test -t node",
|
||||
"test:node": "aegir test -t node",
|
||||
"release": "aegir release -t node --no-build",
|
||||
"release-minor": "aegir release -t node --type minor --no-build",
|
||||
"release-major": "aegir-release -t node --type major --no-build",
|
||||
"coverage": "nyc --reporter=text --reporter=lcov npm run test:node"
|
||||
"build": "aegir build",
|
||||
"docs": "aegir docs",
|
||||
"release": "aegir release --docs -t node",
|
||||
"release-minor": "aegir release --type minor --docs -t node",
|
||||
"release-major": "aegir release --type major --docs -t node",
|
||||
"coverage": "aegir coverage",
|
||||
"coverage-publish": "aegir-coverage publish"
|
||||
},
|
||||
"pre-push": [
|
||||
"lint"
|
||||
"lint",
|
||||
"test"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@ -33,41 +37,44 @@
|
||||
"npm": ">=3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"aegir": "^21.0.2",
|
||||
"chai": "^4.2.0",
|
||||
"aegir": "^18.1.1",
|
||||
"chai": "^4.1.2",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"libp2p-interfaces": "^0.2.0",
|
||||
"it-pipe": "^1.1.0",
|
||||
"sinon": "^9.0.0",
|
||||
"streaming-iterables": "^4.1.1"
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"pull-stream": "^3.6.9",
|
||||
"sinon": "^7.3.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"abortable-iterator": "^3.0.0",
|
||||
"abort-controller": "^3.0.0",
|
||||
"class-is": "^1.1.0",
|
||||
"debug": "^4.1.1",
|
||||
"err-code": "^2.0.0",
|
||||
"libp2p-utils": "~0.1.0",
|
||||
"mafmt": "^7.0.0",
|
||||
"multiaddr": "^7.2.1",
|
||||
"stream-to-it": "^0.2.0"
|
||||
"err-code": "^1.1.2",
|
||||
"interface-connection": "~0.3.3",
|
||||
"interface-transport": "~0.4.0",
|
||||
"ip-address": "^5.8.9",
|
||||
"it-pipe": "^1.0.0",
|
||||
"lodash.includes": "^4.3.0",
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"mafmt": "^6.0.7",
|
||||
"multiaddr": "^6.0.6",
|
||||
"streaming-iterables": "^4.1.0"
|
||||
},
|
||||
"contributors": [
|
||||
"David Dias <daviddias.p@gmail.com>",
|
||||
"Jacob Heun <jacobheun@gmail.com>",
|
||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
||||
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
||||
"Vasco Santos <vasco.santos@moxy.studio>",
|
||||
"Richard Littauer <richard.littauer@gmail.com>",
|
||||
"Tom White <tomtinkerer@gmail.com>",
|
||||
"Alan Shaw <alan@tableflip.io>",
|
||||
"Pedro Teixeira <i@pgte.me>",
|
||||
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||
"Alex Potsides <alex@achingbrain.net>",
|
||||
"David Dias <daviddias.p@gmail.com>",
|
||||
"Diogo Silva <fsdiogo@gmail.com>",
|
||||
"Dmitriy Ryajov <dryajov@gmail.com>",
|
||||
"Drew Stone <drewstone329@gmail.com>",
|
||||
"Evan Schwartz <evan.mark.schwartz@gmail.com>",
|
||||
"Linus Unnebäck <linus@folkdatorn.se>"
|
||||
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
||||
"Greenkeeper <support@greenkeeper.io>",
|
||||
"Jacob Heun <jacobheun@gmail.com>",
|
||||
"Jacob Heun <jake@andyet.net>",
|
||||
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||
"Pedro Teixeira <i@pgte.me>",
|
||||
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||
"Richard Littauer <richard.littauer@gmail.com>",
|
||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
||||
"TomCoded <tomtinkerer@gmail.com>"
|
||||
]
|
||||
}
|
||||
|
||||
17
src/adapter.js
Normal file
17
src/adapter.js
Normal file
@ -0,0 +1,17 @@
|
||||
'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 () {
|
||||
super(new TCP())
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = withIs(TcpAdapter, {
|
||||
className: 'TCP',
|
||||
symbolName: '@libp2p/js-libp2p-tcp/tcp'
|
||||
})
|
||||
@ -1,8 +1,8 @@
|
||||
'use strict'
|
||||
|
||||
// p2p multi-address code
|
||||
exports.CODE_P2P = 421
|
||||
exports.CODE_CIRCUIT = 290
|
||||
// IPFS multi-address code
|
||||
module.exports.IPFS_MA_CODE = 421
|
||||
|
||||
// Time to wait for a connection to close gracefully before destroying it manually
|
||||
exports.CLOSE_TIMEOUT = 2000
|
||||
// Time to wait for a connection to close gracefully before destroying it
|
||||
// manually
|
||||
module.exports.CLOSE_TIMEOUT = 2000
|
||||
|
||||
33
src/get-multiaddr.js
Normal file
33
src/get-multiaddr.js
Normal file
@ -0,0 +1,33 @@
|
||||
'use strict'
|
||||
|
||||
const multiaddr = require('multiaddr')
|
||||
const Address6 = require('ip-address').Address6
|
||||
const debug = require('debug')
|
||||
const log = debug('libp2p:tcp:get-multiaddr')
|
||||
|
||||
module.exports = (socket) => {
|
||||
let ma
|
||||
|
||||
try {
|
||||
if (socket.remoteFamily === 'IPv6') {
|
||||
const addr = new Address6(socket.remoteAddress)
|
||||
|
||||
if (addr.v4) {
|
||||
const ip4 = addr.to4().correctForm()
|
||||
ma = multiaddr('/ip4/' + ip4 +
|
||||
'/tcp/' + socket.remotePort
|
||||
)
|
||||
} else {
|
||||
ma = multiaddr('/ip6/' + socket.remoteAddress +
|
||||
'/tcp/' + socket.remotePort
|
||||
)
|
||||
}
|
||||
} else {
|
||||
ma = multiaddr('/ip4/' + socket.remoteAddress +
|
||||
'/tcp/' + socket.remotePort)
|
||||
}
|
||||
} catch (err) {
|
||||
log(err)
|
||||
}
|
||||
return ma
|
||||
}
|
||||
134
src/index.js
134
src/index.js
@ -3,137 +3,99 @@
|
||||
const net = require('net')
|
||||
const mafmt = require('mafmt')
|
||||
const withIs = require('class-is')
|
||||
const errCode = require('err-code')
|
||||
const log = require('debug')('libp2p:tcp')
|
||||
const toConnection = require('./socket-to-conn')
|
||||
const includes = require('lodash.includes')
|
||||
const isFunction = require('lodash.isfunction')
|
||||
const errcode = require('err-code')
|
||||
const debug = require('debug')
|
||||
const log = debug('libp2p:tcp:dial')
|
||||
|
||||
const Libp2pSocket = require('./socket')
|
||||
const createListener = require('./listener')
|
||||
const { multiaddrToNetConfig } = require('./utils')
|
||||
const { AbortError } = require('abortable-iterator')
|
||||
const { CODE_CIRCUIT, CODE_P2P } = require('./constants')
|
||||
const { AbortError } = require('interface-transport')
|
||||
|
||||
function noop () {}
|
||||
|
||||
/**
|
||||
* @class TCP
|
||||
*/
|
||||
class TCP {
|
||||
/**
|
||||
* @constructor
|
||||
* @param {object} options
|
||||
* @param {Upgrader} options.upgrader
|
||||
*/
|
||||
constructor ({ upgrader }) {
|
||||
if (!upgrader) {
|
||||
throw new Error('An upgrader must be provided. See https://github.com/libp2p/interface-transport#upgrader.')
|
||||
}
|
||||
this._upgrader = upgrader
|
||||
}
|
||||
|
||||
/**
|
||||
* @async
|
||||
* @param {Multiaddr} ma
|
||||
* @param {object} options
|
||||
* @param {AbortSignal} options.signal Used to abort dial requests
|
||||
* @returns {Connection} An upgraded Connection
|
||||
*/
|
||||
async dial (ma, options) {
|
||||
options = options || {}
|
||||
const socket = await this._connect(ma, options)
|
||||
const maConn = toConnection(socket, { remoteAddr: ma, signal: options.signal })
|
||||
log('new outbound connection %s', maConn.remoteAddr)
|
||||
const conn = await this._upgrader.upgradeOutbound(maConn)
|
||||
log('outbound connection %s upgraded', maConn.remoteAddr)
|
||||
return conn
|
||||
const cOpts = ma.toOptions()
|
||||
log('Connecting to %s:%s', cOpts.host, cOpts.port)
|
||||
|
||||
const rawSocket = await this._connect(cOpts, options)
|
||||
return new Libp2pSocket(rawSocket, ma, options)
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @param {Multiaddr} ma
|
||||
* @param {object} options
|
||||
* @param {AbortSignal} options.signal Used to abort dial requests
|
||||
* @returns {Promise<Socket>} Resolves a TCP Socket
|
||||
*/
|
||||
_connect (ma, options = {}) {
|
||||
if (options.signal && options.signal.aborted) {
|
||||
throw new AbortError()
|
||||
}
|
||||
|
||||
_connect (cOpts, options = {}) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const start = Date.now()
|
||||
const cOpts = multiaddrToNetConfig(ma)
|
||||
if ((options.signal || {}).aborted) {
|
||||
return reject(new AbortError())
|
||||
}
|
||||
|
||||
log('dialing %j', cOpts)
|
||||
const start = Date.now()
|
||||
const rawSocket = net.connect(cOpts)
|
||||
|
||||
const onError = err => {
|
||||
err.message = `connection error ${cOpts.host}:${cOpts.port}: ${err.message}`
|
||||
done(err)
|
||||
const onError = (err) => {
|
||||
const msg = `Error connecting to ${cOpts.host}:${cOpts.port}: ${err.message}`
|
||||
done(errcode(msg, err.code))
|
||||
}
|
||||
|
||||
const onTimeout = () => {
|
||||
log('connnection timeout %s:%s', cOpts.host, cOpts.port)
|
||||
const err = errCode(new Error(`connection timeout after ${Date.now() - start}ms`), 'ERR_CONNECT_TIMEOUT')
|
||||
// Note: this will result in onError() being called
|
||||
log('Timeout connecting to %s:%s', cOpts.host, cOpts.port)
|
||||
const err = errcode(`Timeout after ${Date.now() - start}ms`, 'ETIMEDOUT')
|
||||
rawSocket.emit('error', err)
|
||||
}
|
||||
|
||||
const onConnect = () => {
|
||||
log('connection opened %j', cOpts)
|
||||
done()
|
||||
log('Connected to %s:%s', cOpts.host, cOpts.port)
|
||||
done(null, rawSocket)
|
||||
}
|
||||
|
||||
const onAbort = () => {
|
||||
log('connection aborted %j', cOpts)
|
||||
log('Connect to %s:%s aborted', cOpts.host, cOpts.port)
|
||||
rawSocket.destroy()
|
||||
done(new AbortError())
|
||||
}
|
||||
|
||||
const done = err => {
|
||||
const done = (err, res) => {
|
||||
rawSocket.removeListener('error', onError)
|
||||
rawSocket.removeListener('timeout', onTimeout)
|
||||
rawSocket.removeListener('connect', onConnect)
|
||||
options.signal && options.signal.removeEventListener('abort', onAbort)
|
||||
options.signal && options.signal.removeEventListener(onAbort)
|
||||
|
||||
if (err) return reject(err)
|
||||
resolve(rawSocket)
|
||||
err ? reject(err) : resolve(res)
|
||||
}
|
||||
|
||||
rawSocket.on('error', onError)
|
||||
rawSocket.on('timeout', onTimeout)
|
||||
rawSocket.on('connect', onConnect)
|
||||
rawSocket.once('error', onError)
|
||||
rawSocket.once('timeout', onTimeout)
|
||||
rawSocket.once('connect', onConnect)
|
||||
options.signal && options.signal.addEventListener('abort', onAbort)
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a TCP listener. The provided `handler` function will be called
|
||||
* anytime a new incoming Connection has been successfully upgraded via
|
||||
* `upgrader.upgradeInbound`.
|
||||
* @param {*} [options]
|
||||
* @param {function(Connection)} handler
|
||||
* @returns {Listener} A TCP listener
|
||||
*/
|
||||
createListener (options, handler) {
|
||||
if (typeof options === 'function') {
|
||||
if (isFunction(options)) {
|
||||
handler = options
|
||||
options = {}
|
||||
}
|
||||
options = options || {}
|
||||
return createListener({ handler, upgrader: this._upgrader }, options)
|
||||
|
||||
handler = handler || noop
|
||||
return createListener(options, handler)
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes a list of `Multiaddr`s and returns only valid TCP addresses
|
||||
* @param {Multiaddr[]} multiaddrs
|
||||
* @returns {Multiaddr[]} Valid TCP multiaddrs
|
||||
*/
|
||||
filter (multiaddrs) {
|
||||
multiaddrs = Array.isArray(multiaddrs) ? multiaddrs : [multiaddrs]
|
||||
if (!Array.isArray(multiaddrs)) {
|
||||
multiaddrs = [multiaddrs]
|
||||
}
|
||||
|
||||
return multiaddrs.filter(ma => {
|
||||
if (ma.protoCodes().includes(CODE_CIRCUIT)) {
|
||||
return multiaddrs.filter((ma) => {
|
||||
if (includes(ma.protoNames(), 'p2p-circuit')) {
|
||||
return false
|
||||
}
|
||||
|
||||
return mafmt.TCP.matches(ma.decapsulateCode(CODE_P2P))
|
||||
if (includes(ma.protoNames(), 'ipfs')) {
|
||||
ma = ma.decapsulate('ipfs')
|
||||
}
|
||||
|
||||
return mafmt.TCP.matches(ma)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
271
src/listener.js
271
src/listener.js
@ -1,109 +1,212 @@
|
||||
'use strict'
|
||||
|
||||
const multiaddr = require('multiaddr')
|
||||
const os = require('os')
|
||||
const net = require('net')
|
||||
const EventEmitter = require('events')
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const { AllListenersFailedError } = require('interface-transport')
|
||||
const debug = require('debug')
|
||||
const log = debug('libp2p:tcp:listener')
|
||||
log.error = debug('libp2p:tcp:listener:error')
|
||||
const log = debug('libp2p:tcp:listen')
|
||||
log.error = debug('libp2p:tcp:listen:error')
|
||||
|
||||
const toConnection = require('./socket-to-conn')
|
||||
const { CODE_P2P } = require('./constants')
|
||||
const {
|
||||
getMultiaddrs,
|
||||
multiaddrToNetConfig
|
||||
} = require('./utils')
|
||||
const Libp2pSocket = require('./socket')
|
||||
const getMultiaddr = require('./get-multiaddr')
|
||||
const c = require('./constants')
|
||||
|
||||
module.exports = ({ handler, upgrader }, options) => {
|
||||
const listener = new EventEmitter()
|
||||
function noop () {}
|
||||
|
||||
const server = net.createServer(async socket => {
|
||||
// Avoid uncaught errors caused by unstable connections
|
||||
socket.on('error', err => log('socket error', err))
|
||||
|
||||
let maConn
|
||||
let conn
|
||||
try {
|
||||
maConn = toConnection(socket, { listeningAddr })
|
||||
log('new inbound connection %s', maConn.remoteAddr)
|
||||
conn = await upgrader.upgradeInbound(maConn)
|
||||
} catch (err) {
|
||||
log.error('inbound connection failed', err)
|
||||
return maConn && maConn.close()
|
||||
}
|
||||
|
||||
log('inbound connection %s upgraded', maConn.remoteAddr)
|
||||
|
||||
trackConn(server, maConn)
|
||||
|
||||
if (handler) handler(conn)
|
||||
listener.emit('connection', conn)
|
||||
})
|
||||
|
||||
server
|
||||
.on('listening', () => listener.emit('listening'))
|
||||
.on('error', err => listener.emit('error', err))
|
||||
.on('close', () => listener.emit('close'))
|
||||
|
||||
// Keep track of open connections to destroy in case of timeout
|
||||
server.__connections = []
|
||||
|
||||
listener.close = () => {
|
||||
if (!server.listening) return
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
server.__connections.forEach(maConn => maConn.close())
|
||||
server.close(err => err ? reject(err) : resolve())
|
||||
})
|
||||
class Listener extends EventEmitter {
|
||||
/**
|
||||
*
|
||||
* @param {object} options
|
||||
* @param {function(Connection)} handler
|
||||
*/
|
||||
constructor (options, handler) {
|
||||
super()
|
||||
this._options = options
|
||||
this._connectionHandler = handler
|
||||
this._servers = new Set()
|
||||
this.__connections = new Map()
|
||||
}
|
||||
|
||||
let peerId, listeningAddr
|
||||
|
||||
listener.listen = ma => {
|
||||
listeningAddr = ma
|
||||
peerId = ma.getPeerId()
|
||||
|
||||
if (peerId) {
|
||||
listeningAddr = ma.decapsulateCode(CODE_P2P)
|
||||
/**
|
||||
* Closes all open servers
|
||||
* @param {object} options
|
||||
* @param {number} options.timeout how long before closure is forced, defaults to 2000 ms
|
||||
* @returns {Promise}
|
||||
*/
|
||||
close (options = {}) {
|
||||
if ([...this._servers].filter(server => server.listening).length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const options = multiaddrToNetConfig(listeningAddr)
|
||||
server.listen(options, err => {
|
||||
if (err) return reject(err)
|
||||
log('Listening on %s', server.address())
|
||||
resolve()
|
||||
// Close all running servers in parallel
|
||||
return Promise.all(
|
||||
[...this._servers].map(server => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const start = Date.now()
|
||||
|
||||
// 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)
|
||||
resolve()
|
||||
}, options.timeout || c.CLOSE_TIMEOUT)
|
||||
|
||||
server.once('close', () => {
|
||||
clearTimeout(timeout)
|
||||
this._servers.delete(server)
|
||||
})
|
||||
|
||||
server.close((err) => err ? reject(err) : resolve())
|
||||
})
|
||||
})
|
||||
).then(() => {
|
||||
this.__connections.forEach((connection, key) => {
|
||||
log('destroying %s', key)
|
||||
connection.destroy()
|
||||
})
|
||||
this.__connections.clear()
|
||||
this._servers.clear()
|
||||
})
|
||||
}
|
||||
|
||||
listener.getAddrs = () => {
|
||||
let addrs = []
|
||||
const address = server.address()
|
||||
/**
|
||||
* Creates servers listening on the given `addrs`
|
||||
* @async
|
||||
* @param {Array<Multiaddr>} addrs
|
||||
*/
|
||||
async listen (addrs) {
|
||||
addrs = Array.isArray(addrs) ? addrs : [addrs]
|
||||
|
||||
if (!address) {
|
||||
let listeners = []
|
||||
let errors = []
|
||||
|
||||
// Filter out duplicate ports, unless it's port 0
|
||||
addrs = uniqueBy(addrs, (addr) => {
|
||||
const port = Number(addr.toOptions().port)
|
||||
return isNaN(port) || port === 0 ? addr.toString() : port
|
||||
})
|
||||
|
||||
for (const ma of addrs) {
|
||||
const lOpts = ma.toOptions()
|
||||
|
||||
listeners.push(
|
||||
new Promise((resolve) => {
|
||||
const server = net.createServer(this._onSocket.bind(this))
|
||||
this._servers.add(server)
|
||||
// TODO: clean these up
|
||||
server.on('listening', () => this.emit('listening'))
|
||||
server.on('close', () => this.emit('close'))
|
||||
server.on('error', (err) => this.emit('error', err))
|
||||
|
||||
server.listen(lOpts.port, lOpts.host, (err) => {
|
||||
if (err) {
|
||||
errors.push(err)
|
||||
return resolve()
|
||||
}
|
||||
|
||||
log('Listening on %s %s', lOpts.port, lOpts.host)
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
return Promise.all(listeners)
|
||||
.then(() => {
|
||||
errors.forEach((err) => {
|
||||
log.error('received an error while attempting to listen', err)
|
||||
})
|
||||
|
||||
// All servers failed to listen, throw an error
|
||||
if (errors.length === listeners.length) {
|
||||
throw new AllListenersFailedError()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the addresses we are listening on
|
||||
* @returns {Array<Multiaddr>}
|
||||
*/
|
||||
getAddrs () {
|
||||
const multiaddrs = []
|
||||
this._servers.forEach(server => {
|
||||
const address = server.address()
|
||||
|
||||
if (address.address === '0.0.0.0') {
|
||||
const netInterfaces = os.networkInterfaces()
|
||||
Object.keys(netInterfaces).forEach((niKey) => {
|
||||
netInterfaces[niKey].forEach((ni) => {
|
||||
if (ni.internal === false && ni.family === address.family) {
|
||||
multiaddrs.push(
|
||||
multiaddr.fromNodeAddress({
|
||||
...address,
|
||||
address: ni.address
|
||||
}, 'tcp')
|
||||
)
|
||||
}
|
||||
})
|
||||
})
|
||||
// TODO: handle IPv6 wildcard
|
||||
} else {
|
||||
multiaddrs.push(multiaddr.fromNodeAddress(address, 'tcp'))
|
||||
}
|
||||
})
|
||||
|
||||
if (multiaddrs.length === 0) {
|
||||
throw new Error('Listener is not ready yet')
|
||||
}
|
||||
|
||||
// Because TCP will only return the IPv6 version
|
||||
// we need to capture from the passed multiaddr
|
||||
if (listeningAddr.toString().startsWith('/ip4')) {
|
||||
addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port))
|
||||
} else if (address.family === 'IPv6') {
|
||||
addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port))
|
||||
return multiaddrs
|
||||
}
|
||||
|
||||
/**
|
||||
* Handler for new sockets from `net.createServer`
|
||||
* @param {net.Socket} socket
|
||||
*/
|
||||
_onSocket (socket) {
|
||||
// Avoid uncaught errors caused by unstable connections
|
||||
socket.on('error', noop)
|
||||
|
||||
const addr = getMultiaddr(socket)
|
||||
if (!addr) {
|
||||
if (socket.remoteAddress === undefined) {
|
||||
log('connection closed before p2p connection made')
|
||||
} else {
|
||||
log('error interpreting incoming p2p connection')
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
return addrs.map(ma => peerId ? ma.encapsulate(`/p2p/${peerId}`) : ma)
|
||||
}
|
||||
log('new connection', addr.toString())
|
||||
|
||||
return listener
|
||||
const s = new Libp2pSocket(socket, addr)
|
||||
|
||||
// Track the connection
|
||||
const key = `${socket.remoteAddress}:${socket.remotePort}`
|
||||
this.__connections.set(key, socket)
|
||||
socket.once('close', () => {
|
||||
this.__connections.delete(key)
|
||||
})
|
||||
|
||||
this._connectionHandler(s)
|
||||
this.emit('connection', s)
|
||||
}
|
||||
}
|
||||
|
||||
function trackConn (server, maConn) {
|
||||
server.__connections.push(maConn)
|
||||
|
||||
const untrackConn = () => {
|
||||
server.__connections = server.__connections.filter(c => c !== maConn)
|
||||
}
|
||||
|
||||
maConn.conn.once('close', untrackConn)
|
||||
module.exports = (options, handler) => {
|
||||
return new Listener(options, handler)
|
||||
}
|
||||
|
||||
/**
|
||||
* Get unique values from `arr` using `getValue` to determine
|
||||
* what is used for uniqueness
|
||||
* @param {Array} arr The array to get unique values for
|
||||
* @param {function(value)} getValue The function to determine what is compared
|
||||
* @returns {Array}
|
||||
*/
|
||||
function uniqueBy (arr, getValue) {
|
||||
return [...new Map(arr.map((i) => [getValue(i), i])).values()]
|
||||
}
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
'use strict'
|
||||
|
||||
const abortable = require('abortable-iterator')
|
||||
const log = require('debug')('libp2p:tcp:socket')
|
||||
const toIterable = require('stream-to-it')
|
||||
const toMultiaddr = require('libp2p-utils/src/ip-port-to-multiaddr')
|
||||
const { CLOSE_TIMEOUT } = require('./constants')
|
||||
|
||||
// Convert a socket into a MultiaddrConnection
|
||||
// https://github.com/libp2p/interface-transport#multiaddrconnection
|
||||
module.exports = (socket, options) => {
|
||||
options = options || {}
|
||||
|
||||
// Check if we are connected on a unix path
|
||||
if (options.listeningAddr && options.listeningAddr.getPath()) {
|
||||
options.remoteAddr = options.listeningAddr
|
||||
}
|
||||
|
||||
if (options.remoteAddr && options.remoteAddr.getPath()) {
|
||||
options.localAddr = options.remoteAddr
|
||||
}
|
||||
|
||||
const { sink, source } = toIterable.duplex(socket)
|
||||
const maConn = {
|
||||
async sink (source) {
|
||||
if (options.signal) {
|
||||
source = abortable(source, options.signal)
|
||||
}
|
||||
|
||||
try {
|
||||
await sink((async function * () {
|
||||
for await (const chunk of source) {
|
||||
// Convert BufferList to Buffer
|
||||
yield Buffer.isBuffer(chunk) ? chunk : chunk.slice()
|
||||
}
|
||||
})())
|
||||
} catch (err) {
|
||||
// If aborted we can safely ignore
|
||||
if (err.type !== 'aborted') {
|
||||
// If the source errored the socket will already have been destroyed by
|
||||
// toIterable.duplex(). If the socket errored it will already be
|
||||
// destroyed. There's nothing to do here except log the error & return.
|
||||
log(err)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
source: options.signal ? abortable(source, options.signal) : source,
|
||||
|
||||
conn: socket,
|
||||
|
||||
localAddr: options.localAddr || toMultiaddr(socket.localAddress, socket.localPort),
|
||||
|
||||
// If the remote address was passed, use it - it may have the peer ID encapsulated
|
||||
remoteAddr: options.remoteAddr || toMultiaddr(socket.remoteAddress, socket.remotePort),
|
||||
|
||||
timeline: { open: Date.now() },
|
||||
|
||||
close () {
|
||||
if (socket.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 { host, port } = maConn.remoteAddr.toOptions()
|
||||
log('timeout closing socket to %s:%s after %dms, destroying it manually',
|
||||
host, port, Date.now() - start)
|
||||
|
||||
if (socket.destroyed) {
|
||||
log('%s:%s is already destroyed', host, port)
|
||||
} else {
|
||||
socket.destroy()
|
||||
}
|
||||
|
||||
resolve()
|
||||
}, CLOSE_TIMEOUT)
|
||||
|
||||
socket.once('close', () => clearTimeout(timeout))
|
||||
socket.end(err => {
|
||||
maConn.timeline.close = Date.now()
|
||||
if (err) return reject(err)
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
socket.once('close', () => {
|
||||
// In instances where `close` was not explicitly called,
|
||||
// such as an iterable stream ending, ensure we have set the close
|
||||
// timeline
|
||||
if (!maConn.timeline.close) {
|
||||
maConn.timeline.close = Date.now()
|
||||
}
|
||||
})
|
||||
|
||||
return maConn
|
||||
}
|
||||
65
src/socket.js
Normal file
65
src/socket.js
Normal file
@ -0,0 +1,65 @@
|
||||
'use strict'
|
||||
|
||||
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.sink = this._sink(opts)
|
||||
this.source = rawSocket
|
||||
}
|
||||
|
||||
_sink (opts = {}) {
|
||||
// By default, close when the source is exhausted
|
||||
const closeOnEnd = opts.closeOnEnd !== false
|
||||
return (source) => this._write(source, closeOnEnd)
|
||||
}
|
||||
|
||||
async _write (source, closeOnEnd) {
|
||||
for await (const data of source) {
|
||||
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
|
||||
46
src/utils.js
46
src/utils.js
@ -1,46 +0,0 @@
|
||||
'use strict'
|
||||
|
||||
const multiaddr = require('multiaddr')
|
||||
const os = require('os')
|
||||
const { resolve } = require('path')
|
||||
const ProtoFamily = { ip4: 'IPv4', ip6: 'IPv6' }
|
||||
|
||||
function multiaddrToNetConfig (addr) {
|
||||
const listenPath = addr.getPath()
|
||||
// unix socket listening
|
||||
if (listenPath) {
|
||||
return resolve(listenPath)
|
||||
}
|
||||
// tcp listening
|
||||
return addr.toOptions()
|
||||
}
|
||||
|
||||
function getMultiaddrs (proto, ip, port) {
|
||||
const toMa = ip => multiaddr(`/${proto}/${ip}/tcp/${port}`)
|
||||
return (isAnyAddr(ip) ? getNetworkAddrs(ProtoFamily[proto]) : [ip]).map(toMa)
|
||||
}
|
||||
|
||||
function isAnyAddr (ip) {
|
||||
return ['0.0.0.0', '::'].includes(ip)
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @param {string} family One of ['IPv6', 'IPv4']
|
||||
* @returns {string[]} an array of ip address strings
|
||||
*/
|
||||
function getNetworkAddrs (family) {
|
||||
return Object.values(os.networkInterfaces()).reduce((addresses, netAddrs) => {
|
||||
netAddrs.forEach(netAddr => {
|
||||
// Add the ip of each matching network interface
|
||||
if (netAddr.family === family) addresses.push(netAddr.address)
|
||||
})
|
||||
return addresses
|
||||
}, [])
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
multiaddrToNetConfig,
|
||||
isAnyAddr,
|
||||
getMultiaddrs
|
||||
}
|
||||
121
test/adapter/connection-wrap.spec.js
Normal file
121
test/adapter/connection-wrap.spec.js
Normal file
@ -0,0 +1,121 @@
|
||||
/* 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 Connection = require('interface-connection').Connection
|
||||
|
||||
describe('Connection Wrap', () => {
|
||||
let tcp
|
||||
let listener
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
|
||||
beforeEach((done) => {
|
||||
tcp = new TCP()
|
||||
listener = tcp.createListener((conn) => {
|
||||
pull(conn, conn)
|
||||
})
|
||||
listener.on('listening', done)
|
||||
listener.listen(ma)
|
||||
})
|
||||
|
||||
afterEach((done) => {
|
||||
listener.close(done)
|
||||
})
|
||||
|
||||
it('simple wrap', (done) => {
|
||||
const conn = tcp.dial(ma)
|
||||
conn.setPeerInfo('peerInfo')
|
||||
const connWrap = new Connection(conn)
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
connWrap,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
|
||||
connWrap.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(peerInfo).to.equal('peerInfo')
|
||||
done()
|
||||
})
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('buffer wrap', (done) => {
|
||||
const conn = tcp.dial(ma)
|
||||
const connWrap = new Connection()
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
connWrap,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
|
||||
connWrap.setInnerConn(conn)
|
||||
})
|
||||
|
||||
it('overload wrap', (done) => {
|
||||
const conn = tcp.dial(ma)
|
||||
const connWrap = new Connection(conn)
|
||||
connWrap.getPeerInfo = (callback) => {
|
||||
callback(null, 'none')
|
||||
}
|
||||
conn.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.exist()
|
||||
})
|
||||
connWrap.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(peerInfo).to.equal('none')
|
||||
})
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
connWrap,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('dial error', (done) => {
|
||||
tcp.dial(multiaddr('/ip4/127.0.0.1/tcp/22234'), (err) => {
|
||||
expect(err).to.exist()
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('matryoshka wrap', (done) => {
|
||||
const conn = tcp.dial(ma)
|
||||
const connWrap1 = new Connection(conn)
|
||||
const connWrap2 = new Connection(connWrap1)
|
||||
const connWrap3 = new Connection(connWrap2)
|
||||
|
||||
conn.getPeerInfo = (callback) => {
|
||||
callback(null, 'inner doll')
|
||||
}
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
connWrap3,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.eql([Buffer.from('hey')])
|
||||
connWrap3.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(peerInfo).to.equal('inner doll')
|
||||
done()
|
||||
})
|
||||
})
|
||||
)
|
||||
})
|
||||
})
|
||||
111
test/adapter/connection.spec.js
Normal file
111
test/adapter/connection.spec.js
Normal file
@ -0,0 +1,111 @@
|
||||
/* 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')
|
||||
|
||||
describe('valid Connection', () => {
|
||||
let tcp
|
||||
|
||||
beforeEach(() => {
|
||||
tcp = new TCP()
|
||||
})
|
||||
|
||||
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)
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
259
test/adapter/listen-dial.spec.js
Normal file
259
test/adapter/listen-dial.spec.js
Normal file
@ -0,0 +1,259 @@
|
||||
/* 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 net = require('net')
|
||||
const multiaddr = require('multiaddr')
|
||||
const isCI = process.env.CI
|
||||
|
||||
describe('listen', () => {
|
||||
let tcp
|
||||
|
||||
beforeEach(() => {
|
||||
tcp = new TCP()
|
||||
})
|
||||
|
||||
it('close listener with connections, through timeout', (done) => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pull(conn, conn)
|
||||
})
|
||||
|
||||
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', () => {})
|
||||
socket1.on('connect', () => {
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('listen on port 0', (done) => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
|
||||
it('listen on IPv6 addr', (done) => {
|
||||
if (isCI) { return done() }
|
||||
const mh = multiaddr('/ip6/::/tcp/9090')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
|
||||
it('listen on any Interface', (done) => {
|
||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
|
||||
it('getAddrs', (done) => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('getAddrs on port 0 listen', (done) => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('getAddrs from listening on 0.0.0.0', (done) => {
|
||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(multiaddrs.length > 0).to.equal(true)
|
||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('getAddrs from listening on 0.0.0.0 and port 0', (done) => {
|
||||
const mh = multiaddr('/ip4/0.0.0.0/tcp/0')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(multiaddrs.length > 0).to.equal(true)
|
||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('getAddrs does not preserve IPFS Id', (done) => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
expect(multiaddrs[0]).to.deep.equal(mh.decapsulate('ipfs'))
|
||||
listener.close(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('dial', () => {
|
||||
let tcp
|
||||
let listener
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
|
||||
beforeEach((done) => {
|
||||
tcp = new TCP()
|
||||
listener = tcp.createListener((conn) => {
|
||||
pull(
|
||||
conn,
|
||||
pull.map((x) => Buffer.from(x.toString() + '!')),
|
||||
conn
|
||||
)
|
||||
})
|
||||
listener.listen(ma, done)
|
||||
})
|
||||
|
||||
afterEach((done) => {
|
||||
listener.close(done)
|
||||
})
|
||||
|
||||
it('dial on IPv4', (done) => {
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
tcp.dial(ma),
|
||||
pull.collect((err, values) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(values).to.eql([Buffer.from('hey!')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('dial to non existent listener', (done) => {
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/8989')
|
||||
pull(
|
||||
tcp.dial(ma),
|
||||
pull.onEnd((err) => {
|
||||
expect(err).to.exist()
|
||||
done()
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('dial on IPv6', (done) => {
|
||||
if (isCI) { return done() }
|
||||
|
||||
const ma = multiaddr('/ip6/::/tcp/9066')
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pull(conn, conn)
|
||||
})
|
||||
listener.listen(ma, () => {
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
tcp.dial(ma),
|
||||
pull.collect((err, values) => {
|
||||
expect(err).to.not.exist()
|
||||
|
||||
expect(values).to.be.eql([Buffer.from('hey')])
|
||||
|
||||
listener.close(done)
|
||||
})
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
it('dial and destroy on listener', (done) => {
|
||||
let count = 0
|
||||
const closed = () => ++count === 2 ? finish() : null
|
||||
|
||||
const ma = multiaddr('/ip6/::/tcp/9067')
|
||||
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pull(
|
||||
pull.empty(),
|
||||
conn,
|
||||
pull.onEnd(closed)
|
||||
)
|
||||
})
|
||||
|
||||
listener.listen(ma, () => {
|
||||
pull(tcp.dial(ma), pull.onEnd(closed))
|
||||
})
|
||||
|
||||
function finish () {
|
||||
listener.close(done)
|
||||
}
|
||||
})
|
||||
|
||||
it('dial and destroy on dialer', (done) => {
|
||||
if (isCI) { return done() }
|
||||
|
||||
let count = 0
|
||||
const destroyed = () => ++count === 2 ? finish() : null
|
||||
|
||||
const ma = multiaddr('/ip6/::/tcp/9068')
|
||||
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pull(conn, pull.onEnd(destroyed))
|
||||
})
|
||||
|
||||
listener.listen(ma, () => {
|
||||
pull(
|
||||
pull.empty(),
|
||||
tcp.dial(ma),
|
||||
pull.onEnd(destroyed)
|
||||
)
|
||||
})
|
||||
|
||||
function finish () {
|
||||
listener.close(done)
|
||||
}
|
||||
})
|
||||
|
||||
it('dial on IPv4 with IPFS Id', (done) => {
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const conn = tcp.dial(ma)
|
||||
|
||||
pull(
|
||||
pull.values(['hey']),
|
||||
conn,
|
||||
pull.collect((err, res) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(res).to.be.eql([Buffer.from('hey!')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
})
|
||||
})
|
||||
@ -2,19 +2,20 @@
|
||||
'use strict'
|
||||
|
||||
const sinon = require('sinon')
|
||||
const tests = require('libp2p-interfaces/src/transport/tests')
|
||||
const tests = require('interface-transport')
|
||||
const multiaddr = require('multiaddr')
|
||||
const net = require('net')
|
||||
const TCP = require('../src')
|
||||
|
||||
describe('interface-transport compliance', () => {
|
||||
tests({
|
||||
setup ({ upgrader }) {
|
||||
const tcp = new TCP({ upgrader })
|
||||
setup () {
|
||||
const tcp = new TCP()
|
||||
const addrs = [
|
||||
multiaddr('/ip4/127.0.0.1/tcp/9091'),
|
||||
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')
|
||||
]
|
||||
|
||||
// Used by the dial tests to simulate a delayed connect
|
||||
|
||||
@ -8,26 +8,27 @@ chai.use(dirtyChai)
|
||||
const TCP = require('../src')
|
||||
const multiaddr = require('multiaddr')
|
||||
|
||||
describe('valid localAddr and remoteAddr', () => {
|
||||
describe('valid Connection', () => {
|
||||
let tcp
|
||||
|
||||
const mockUpgrader = {
|
||||
upgradeInbound: maConn => maConn,
|
||||
upgradeOutbound: maConn => maConn
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
tcp = new TCP({ upgrader: mockUpgrader })
|
||||
tcp = new TCP()
|
||||
})
|
||||
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/0')
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
|
||||
it('should resolve port 0', async () => {
|
||||
it('get observed addrs', async () => {
|
||||
// Create a Promise that resolves when a connection is handled
|
||||
let handled
|
||||
const handlerPromise = new Promise(resolve => { handled = resolve })
|
||||
const handlerPromise = new Promise((resolve) => {
|
||||
handled = resolve
|
||||
})
|
||||
|
||||
const handler = conn => handled(conn)
|
||||
const handler = async (conn) => {
|
||||
expect(conn).to.exist()
|
||||
const dialerObsAddrs = await conn.getObservedAddrs()
|
||||
handled(dialerObsAddrs)
|
||||
}
|
||||
|
||||
// Create a listener with the handler
|
||||
const listener = tcp.createListener(handler)
|
||||
@ -35,22 +36,20 @@ describe('valid localAddr and remoteAddr', () => {
|
||||
// Listen on the multi-address
|
||||
await listener.listen(ma)
|
||||
|
||||
const localAddrs = listener.getAddrs()
|
||||
expect(localAddrs.length).to.equal(1)
|
||||
|
||||
// Dial to that address
|
||||
const dialerConn = await tcp.dial(localAddrs[0])
|
||||
// Dial to that same address
|
||||
const conn = await tcp.dial(ma)
|
||||
const addrs = await conn.getObservedAddrs()
|
||||
|
||||
// Wait for the incoming dial to be handled
|
||||
const listenerConn = await handlerPromise
|
||||
const dialerObsAddrs = await handlerPromise
|
||||
|
||||
// Close the listener
|
||||
await listener.close()
|
||||
|
||||
expect(dialerConn.localAddr.toString())
|
||||
.to.equal(listenerConn.remoteAddr.toString())
|
||||
|
||||
expect(dialerConn.remoteAddr.toString())
|
||||
.to.equal(listenerConn.localAddr.toString())
|
||||
// The addresses should match
|
||||
expect(addrs.length).to.equal(1)
|
||||
expect(addrs[0]).to.deep.equal(ma)
|
||||
expect(dialerObsAddrs.length).to.equal(1)
|
||||
expect(dialerObsAddrs[0]).to.exist()
|
||||
})
|
||||
})
|
||||
|
||||
15
test/constructor.spec.js
Normal file
15
test/constructor.spec.js
Normal file
@ -0,0 +1,15 @@
|
||||
/* 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')
|
||||
|
||||
describe('Constructor', () => {
|
||||
it('create an instance', () => {
|
||||
const tcp = new TCP()
|
||||
expect(tcp).to.exist()
|
||||
})
|
||||
})
|
||||
@ -15,7 +15,7 @@ describe('filter addrs', () => {
|
||||
let tcp
|
||||
|
||||
before(() => {
|
||||
tcp = new TCP({ upgrader: {} })
|
||||
tcp = new TCP()
|
||||
})
|
||||
|
||||
it('filter valid addrs for this transport', () => {
|
||||
|
||||
54
test/get-multiaddr.spec.js
Normal file
54
test/get-multiaddr.spec.js
Normal file
@ -0,0 +1,54 @@
|
||||
/* eslint-env mocha */
|
||||
'use strict'
|
||||
|
||||
const chai = require('chai')
|
||||
const dirtyChai = require('dirty-chai')
|
||||
const expect = chai.expect
|
||||
chai.use(dirtyChai)
|
||||
const getMultiaddr = require('../src/get-multiaddr')
|
||||
|
||||
const goodSocket4 = {
|
||||
remoteAddress: '127.0.0.1',
|
||||
remotePort: '9090',
|
||||
remoteFamily: 'IPv4'
|
||||
}
|
||||
|
||||
const goodSocket6 = {
|
||||
remoteAddress: '::1',
|
||||
remotePort: '9090',
|
||||
remoteFamily: 'IPv6'
|
||||
}
|
||||
|
||||
const badSocket = {}
|
||||
|
||||
const badSocketData = {
|
||||
remoteAddress: 'aewmrn4awoew',
|
||||
remotePort: '234',
|
||||
remoteFamily: 'Hufflepuff'
|
||||
}
|
||||
|
||||
describe('getMultiaddr multiaddr creation', () => {
|
||||
it('creates multiaddr from valid socket data', (done) => {
|
||||
expect(getMultiaddr(goodSocket4))
|
||||
.to.exist()
|
||||
done()
|
||||
})
|
||||
|
||||
it('creates multiaddr from valid IPv6 socket data', (done) => {
|
||||
expect(getMultiaddr(goodSocket6))
|
||||
.to.exist()
|
||||
done()
|
||||
})
|
||||
|
||||
it('returns undefined multiaddr from missing socket data', (done) => {
|
||||
expect(getMultiaddr(badSocket))
|
||||
.to.equal(undefined)
|
||||
done()
|
||||
})
|
||||
|
||||
it('returns undefined multiaddr from unparseable socket data', (done) => {
|
||||
expect(getMultiaddr(badSocketData))
|
||||
.to.equal(undefined)
|
||||
done()
|
||||
})
|
||||
})
|
||||
@ -5,43 +5,24 @@ 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 os = require('os')
|
||||
const path = require('path')
|
||||
const multiaddr = require('multiaddr')
|
||||
const pipe = require('it-pipe')
|
||||
const { collect, map } = require('streaming-iterables')
|
||||
const isCI = process.env.CI
|
||||
const isWindows = os.platform() === 'win32'
|
||||
|
||||
const skipOnWindows = isWindows ? it.skip : it
|
||||
|
||||
describe('construction', () => {
|
||||
it('requires an upgrader', () => {
|
||||
expect(() => new TCP()).to.throw()
|
||||
})
|
||||
})
|
||||
|
||||
describe('listen', () => {
|
||||
let tcp
|
||||
let listener
|
||||
|
||||
beforeEach(() => {
|
||||
tcp = new TCP({
|
||||
upgrader: {
|
||||
upgradeOutbound: maConn => maConn,
|
||||
upgradeInbound: maConn => maConn
|
||||
}
|
||||
})
|
||||
})
|
||||
afterEach(async () => {
|
||||
listener && await listener.close()
|
||||
tcp = new TCP()
|
||||
})
|
||||
|
||||
it('close listener with connections, through timeout', async () => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
listener = tcp.createListener((conn) => {
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pipe(conn, conn)
|
||||
})
|
||||
|
||||
@ -57,24 +38,17 @@ describe('listen', () => {
|
||||
|
||||
await new Promise((resolve) => {
|
||||
socket1.on('connect', async () => {
|
||||
await listener.close({ timeout: 100 })
|
||||
await listener.close()
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// Windows doesn't support unix paths
|
||||
skipOnWindows('listen on path', async () => {
|
||||
const mh = multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
|
||||
|
||||
listener = tcp.createListener((conn) => {})
|
||||
await listener.listen(mh)
|
||||
})
|
||||
|
||||
it('listen on port 0', async () => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
await listener.listen(mh)
|
||||
await listener.close()
|
||||
})
|
||||
|
||||
it('listen on IPv6 addr', async () => {
|
||||
@ -82,63 +56,75 @@ describe('listen', () => {
|
||||
return
|
||||
}
|
||||
const mh = multiaddr('/ip6/::/tcp/9090')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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 () => {
|
||||
it('getAddrs does not preserve IPFS Id', async () => {
|
||||
const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
listener = tcp.createListener((conn) => {})
|
||||
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)
|
||||
expect(multiaddrs[0]).to.deep.equal(mh.decapsulate('ipfs'))
|
||||
|
||||
await listener.close()
|
||||
})
|
||||
})
|
||||
|
||||
@ -148,12 +134,7 @@ describe('dial', () => {
|
||||
const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
|
||||
|
||||
beforeEach(async () => {
|
||||
tcp = new TCP({
|
||||
upgrader: {
|
||||
upgradeOutbound: maConn => maConn,
|
||||
upgradeInbound: maConn => maConn
|
||||
}
|
||||
})
|
||||
tcp = new TCP()
|
||||
listener = tcp.createListener((conn) => {
|
||||
pipe(
|
||||
conn,
|
||||
@ -196,27 +177,6 @@ describe('dial', () => {
|
||||
await listener.close()
|
||||
})
|
||||
|
||||
// Windows doesn't support unix paths
|
||||
skipOnWindows('dial on path', async () => {
|
||||
const ma = multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
|
||||
|
||||
const listener = tcp.createListener((conn) => {
|
||||
pipe(conn, conn)
|
||||
})
|
||||
await listener.listen(ma)
|
||||
|
||||
const connection = await tcp.dial(ma)
|
||||
|
||||
const values = await pipe(
|
||||
['hey'],
|
||||
connection,
|
||||
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) => {
|
||||
@ -261,7 +221,7 @@ describe('dial', () => {
|
||||
|
||||
await listener.listen(ma)
|
||||
const addrs = listener.getAddrs()
|
||||
await pipe(await tcp.dial(addrs[0]))
|
||||
await pipe([], await tcp.dial(addrs[0]))
|
||||
|
||||
await handledPromise
|
||||
await listener.close()
|
||||
|
||||
16
test/turbolence.spec.js
Normal file
16
test/turbolence.spec.js
Normal file
@ -0,0 +1,16 @@
|
||||
/* 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')
|
||||
|
||||
describe.skip('turbolence', () => {
|
||||
it('dialer - emits error on the other end is terminated abruptly', (done) => {
|
||||
expect('ok').to.equal('ok')
|
||||
})
|
||||
|
||||
it('listener - emits error on the other end is terminated abruptly', (done) => {})
|
||||
})
|
||||
Reference in New Issue
Block a user