mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-02 04:41:45 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce4974b01c |
19
.gitignore
vendored
19
.gitignore
vendored
@ -1,14 +1,7 @@
|
||||
**/node_modules/
|
||||
**/*.log
|
||||
test/repo-tests*
|
||||
**/bundle.js
|
||||
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
|
||||
coverage
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
@ -26,17 +19,11 @@ coverage
|
||||
# node-waf configuration
|
||||
.lock-wscript
|
||||
|
||||
build
|
||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
||||
build/Release
|
||||
|
||||
# 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
|
||||
docs
|
||||
@ -26,4 +26,5 @@ build/Release
|
||||
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
|
||||
node_modules
|
||||
|
||||
test
|
||||
test
|
||||
docs
|
||||
17
.travis.yml
17
.travis.yml
@ -1,20 +1,22 @@
|
||||
sudo: false
|
||||
language: node_js
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- node_js: 4
|
||||
env: CXX=g++-4.8
|
||||
- node_js: 6
|
||||
env: CXX=g++-4.8
|
||||
- node_js: 8
|
||||
- node_js: stable
|
||||
env: CXX=g++-4.8
|
||||
# - node_js: stable
|
||||
# env: CXX=g++-4.8
|
||||
|
||||
# Make sure we have new NPM.
|
||||
before_install:
|
||||
- npm install -g npm
|
||||
|
||||
script:
|
||||
- npm run lint
|
||||
- npm run test
|
||||
- npm test
|
||||
- npm run coverage
|
||||
- make test
|
||||
|
||||
before_script:
|
||||
- export DISPLAY=:99.0
|
||||
@ -24,9 +26,8 @@ after_success:
|
||||
- npm run coverage-publish
|
||||
|
||||
addons:
|
||||
firefox: 'latest'
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-4.8
|
||||
- g++-4.8
|
||||
198
CHANGELOG.md
198
CHANGELOG.md
@ -1,198 +0,0 @@
|
||||
<a name="0.11.1"></a>
|
||||
## [0.11.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.0...v0.11.1) (2017-10-13)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* relay filtering ([11c4f45](https://github.com/libp2p/js-libp2p-tcp/commit/11c4f45))
|
||||
|
||||
|
||||
|
||||
<a name="0.11.0"></a>
|
||||
# [0.11.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.2...v0.11.0) (2017-09-03)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* p2p addrs situation ([#82](https://github.com/libp2p/js-libp2p-tcp/issues/82)) ([a54bb83](https://github.com/libp2p/js-libp2p-tcp/commit/a54bb83))
|
||||
|
||||
|
||||
|
||||
<a name="0.10.2"></a>
|
||||
## [0.10.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.1...v0.10.2) (2017-07-22)
|
||||
|
||||
|
||||
|
||||
<a name="0.10.1"></a>
|
||||
## [0.10.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.0...v0.10.1) (2017-04-13)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* catch errors on incomming sockets ([e204517](https://github.com/libp2p/js-libp2p-tcp/commit/e204517))
|
||||
|
||||
|
||||
|
||||
<a name="0.10.0"></a>
|
||||
# [0.10.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.4...v0.10.0) (2017-03-27)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **dial:** proper error handling on dial ([#77](https://github.com/libp2p/js-libp2p-tcp/issues/77)) ([4d4f295](https://github.com/libp2p/js-libp2p-tcp/commit/4d4f295))
|
||||
|
||||
|
||||
|
||||
<a name="0.9.4"></a>
|
||||
## [0.9.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.3...v0.9.4) (2017-03-21)
|
||||
|
||||
|
||||
|
||||
<a name="0.9.3"></a>
|
||||
## [0.9.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.2...v0.9.3) (2017-02-09)
|
||||
|
||||
|
||||
|
||||
<a name="0.9.2"></a>
|
||||
## [0.9.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.1...v0.9.2) (2017-02-09)
|
||||
|
||||
|
||||
|
||||
<a name="0.9.1"></a>
|
||||
## [0.9.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.0...v0.9.1) (2016-11-03)
|
||||
|
||||
|
||||
|
||||
<a name="0.9.0"></a>
|
||||
# [0.9.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.8.1...v0.9.0) (2016-11-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deps:** remove unused pull dep ([06689e3](https://github.com/libp2p/js-libp2p-tcp/commit/06689e3))
|
||||
|
||||
|
||||
|
||||
<a name="0.8.1"></a>
|
||||
## [0.8.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.8.0...v0.8.1) (2016-09-06)
|
||||
|
||||
|
||||
|
||||
<a name="0.8.0"></a>
|
||||
# [0.8.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.4...v0.8.0) (2016-09-06)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **deps:** update to published deps ([da8ee21](https://github.com/libp2p/js-libp2p-tcp/commit/da8ee21))
|
||||
* **pull:** migration to pull-streams ([5e89a26](https://github.com/libp2p/js-libp2p-tcp/commit/5e89a26))
|
||||
* **readme:** add pull-streams documentation ([d9f65e0](https://github.com/libp2p/js-libp2p-tcp/commit/d9f65e0))
|
||||
|
||||
|
||||
|
||||
<a name="0.7.4"></a>
|
||||
## [0.7.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.3...v0.7.4) (2016-08-03)
|
||||
|
||||
|
||||
|
||||
<a name="0.7.3"></a>
|
||||
## [0.7.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.2...v0.7.3) (2016-06-26)
|
||||
|
||||
|
||||
|
||||
<a name="0.7.2"></a>
|
||||
## [0.7.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.1...v0.7.2) (2016-06-23)
|
||||
|
||||
|
||||
|
||||
<a name="0.7.1"></a>
|
||||
## [0.7.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.0...v0.7.1) (2016-06-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* error was passed in duplicate ([9ac5cca](https://github.com/libp2p/js-libp2p-tcp/commit/9ac5cca))
|
||||
|
||||
|
||||
|
||||
<a name="0.7.0"></a>
|
||||
# [0.7.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.2...v0.7.0) (2016-06-22)
|
||||
|
||||
|
||||
|
||||
<a name="0.6.2"></a>
|
||||
## [0.6.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.1...v0.6.2) (2016-06-01)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* address cr ([2ed01e8](https://github.com/libp2p/js-libp2p-tcp/commit/2ed01e8))
|
||||
* destroy hanging connections after timeout ([4a12169](https://github.com/libp2p/js-libp2p-tcp/commit/4a12169))
|
||||
|
||||
|
||||
|
||||
<a name="0.6.1"></a>
|
||||
## [0.6.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.0...v0.6.1) (2016-05-29)
|
||||
|
||||
|
||||
|
||||
<a name="0.6.0"></a>
|
||||
# [0.6.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.3...v0.6.0) (2016-05-22)
|
||||
|
||||
|
||||
|
||||
<a name="0.5.3"></a>
|
||||
## [0.5.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.2...v0.5.3) (2016-05-22)
|
||||
|
||||
|
||||
|
||||
<a name="0.5.2"></a>
|
||||
## [0.5.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.1...v0.5.2) (2016-05-09)
|
||||
|
||||
|
||||
|
||||
<a name="0.5.1"></a>
|
||||
## [0.5.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.0...v0.5.1) (2016-05-08)
|
||||
|
||||
|
||||
|
||||
<a name="0.5.0"></a>
|
||||
# [0.5.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.4.0...v0.5.0) (2016-04-25)
|
||||
|
||||
|
||||
|
||||
<a name="0.4.0"></a>
|
||||
# [0.4.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.3.0...v0.4.0) (2016-03-14)
|
||||
|
||||
|
||||
|
||||
<a name="0.3.0"></a>
|
||||
# [0.3.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.2.1...v0.3.0) (2016-03-10)
|
||||
|
||||
|
||||
|
||||
<a name="0.2.1"></a>
|
||||
## [0.2.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.2.0...v0.2.1) (2016-03-04)
|
||||
|
||||
|
||||
|
||||
<a name="0.2.0"></a>
|
||||
# [0.2.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.2...v0.2.0) (2016-03-04)
|
||||
|
||||
|
||||
|
||||
<a name="0.1.2"></a>
|
||||
## [0.1.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.1...v0.1.2) (2015-10-29)
|
||||
|
||||
|
||||
|
||||
<a name="0.1.1"></a>
|
||||
## [0.1.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.0...v0.1.1) (2015-09-17)
|
||||
|
||||
|
||||
|
||||
<a name="0.1.0"></a>
|
||||
# 0.1.0 (2015-09-16)
|
||||
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
[](https://david-dm.org/libp2p/js-libp2p-tcp)
|
||||
[](https://github.com/feross/standard)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
12
circle.yml
12
circle.yml
@ -5,14 +5,8 @@ machine:
|
||||
dependencies:
|
||||
pre:
|
||||
- google-chrome --version
|
||||
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
|
||||
- for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb
|
||||
- sudo dpkg -i google-chrome.deb || true
|
||||
- sudo dpkg -i libnss3*.deb || true
|
||||
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
|
||||
- sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
|
||||
- sudo apt-get update
|
||||
- sudo apt-get install -f || true
|
||||
- sudo dpkg -i libnss3*.deb
|
||||
- sudo apt-get install -f
|
||||
- sudo apt-get install --only-upgrade lsb-base
|
||||
- sudo dpkg -i google-chrome.deb
|
||||
- sudo apt-get --only-upgrade install google-chrome-stable
|
||||
- google-chrome --version
|
||||
|
||||
47
package.json
47
package.json
@ -1,16 +1,17 @@
|
||||
{
|
||||
"name": "libp2p-tcp",
|
||||
"version": "0.11.1",
|
||||
"version": "0.9.1",
|
||||
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
|
||||
"main": "src/index.js",
|
||||
"scripts": {
|
||||
"lint": "aegir lint",
|
||||
"test": "aegir test --target node",
|
||||
"release": "aegir release --no-build",
|
||||
"release-minor": "aegir release --type minor --no-build",
|
||||
"release-major": "aegir-release --type major --no-build",
|
||||
"coverage": "aegir coverage",
|
||||
"coverage-publish": "aegir coverage --provider coveralls"
|
||||
"lint": "aegir-lint",
|
||||
"test": "aegir-test --env node",
|
||||
"docs": "aegir-docs",
|
||||
"release": "aegir-release --env no-build --docs",
|
||||
"release-minor": "aegir-release --type minor --env no-build --docs",
|
||||
"release-major": "aegir-release --type major --env no-build --docs",
|
||||
"coverage": "aegir-coverage",
|
||||
"coverage-publish": "aegir-coverage publish"
|
||||
},
|
||||
"pre-commit": [
|
||||
"lint",
|
||||
@ -30,37 +31,31 @@
|
||||
},
|
||||
"homepage": "https://github.com/libp2p/js-libp2p-tcp",
|
||||
"engines": {
|
||||
"node": ">=6.0.0",
|
||||
"npm": ">=3.0.0"
|
||||
"node": ">=4.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"aegir": "^12.0.8",
|
||||
"chai": "^4.1.2",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"interface-transport": "~0.3.5",
|
||||
"aegir": "^9.2.0",
|
||||
"chai": "^3.5.0",
|
||||
"interface-transport": "^0.3.3",
|
||||
"lodash.isfunction": "^3.0.8",
|
||||
"pre-commit": "^1.2.2",
|
||||
"pull-stream": "^3.6.1"
|
||||
"pre-commit": "^1.1.3",
|
||||
"pull-stream": "^3.5.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"interface-connection": "~0.3.2",
|
||||
"ip-address": "^5.8.8",
|
||||
"interface-connection": "0.3.0",
|
||||
"ip-address": "^5.8.2",
|
||||
"lodash.includes": "^4.3.0",
|
||||
"lodash.isfunction": "^3.0.8",
|
||||
"mafmt": "^3.0.1",
|
||||
"multiaddr": "^3.0.1",
|
||||
"once": "^1.4.0",
|
||||
"mafmt": "^2.1.2",
|
||||
"multiaddr": "^2.1.1",
|
||||
"stream-to-pull-stream": "^1.7.2"
|
||||
},
|
||||
"contributors": [
|
||||
"David Dias <daviddias.p@gmail.com>",
|
||||
"Dmitriy Ryajov <dryajov@gmail.com>",
|
||||
"Evan Schwartz <evan.mark.schwartz@gmail.com>",
|
||||
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
|
||||
"Greenkeeper <support@greenkeeper.io>",
|
||||
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||
"Richard Littauer <richard.littauer@gmail.com>",
|
||||
"Stephen Whitmore <stephen.whitmore@gmail.com>"
|
||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
||||
"greenkeeperio-bot <support@greenkeeper.io>"
|
||||
]
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ const multiaddr = require('multiaddr')
|
||||
const Address6 = require('ip-address').Address6
|
||||
|
||||
module.exports = (socket) => {
|
||||
let mh
|
||||
var mh
|
||||
|
||||
if (socket.remoteFamily === 'IPv6') {
|
||||
var addr = new Address6(socket.remoteAddress)
|
||||
|
||||
52
src/index.js
52
src/index.js
@ -6,52 +6,61 @@ const mafmt = require('mafmt')
|
||||
const includes = require('lodash.includes')
|
||||
const isFunction = require('lodash.isfunction')
|
||||
const Connection = require('interface-connection').Connection
|
||||
const once = require('once')
|
||||
const debug = require('debug')
|
||||
const log = debug('libp2p:tcp:dial')
|
||||
|
||||
const createListener = require('./listener')
|
||||
|
||||
function noop () {}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class TCP {
|
||||
/**
|
||||
* Dial to another peer.
|
||||
*
|
||||
* @param {Multiaddr} ma - The address of the peer we want to dial to.
|
||||
* @param {Object} [options={}]
|
||||
* @param {function(Error?, Array<Multiaddr>?)} [callback]
|
||||
* @returns {Connection}
|
||||
*/
|
||||
dial (ma, options, callback) {
|
||||
if (isFunction(options)) {
|
||||
callback = options
|
||||
options = {}
|
||||
}
|
||||
|
||||
callback = callback || noop
|
||||
if (!callback) {
|
||||
callback = () => {}
|
||||
}
|
||||
|
||||
callback = once(callback)
|
||||
const cOpts = ma.toOptions()
|
||||
log('Connecting to %s %s', cOpts.port, cOpts.host)
|
||||
|
||||
const rawSocket = net.connect(cOpts)
|
||||
const rawSocket = net.connect(cOpts, callback)
|
||||
|
||||
rawSocket.once('timeout', () => {
|
||||
log('timeout')
|
||||
rawSocket.emit('error', new Error('Timeout'))
|
||||
})
|
||||
|
||||
rawSocket.once('error', callback)
|
||||
|
||||
rawSocket.once('connect', () => {
|
||||
rawSocket.removeListener('error', callback)
|
||||
callback()
|
||||
})
|
||||
|
||||
const socket = toPull.duplex(rawSocket)
|
||||
|
||||
const conn = new Connection(socket)
|
||||
|
||||
conn.getObservedAddrs = (callback) => {
|
||||
return callback(null, [ma])
|
||||
conn.getObservedAddrs = (cb) => {
|
||||
return cb(null, [ma])
|
||||
}
|
||||
|
||||
return conn
|
||||
}
|
||||
|
||||
/**
|
||||
* Listen for incoming `TCP` connetions.
|
||||
*
|
||||
* @param {Object} [options={}]
|
||||
* @param {function(Connection)} [handler] - Called with newly incomin connections.
|
||||
* @returns {Listener}
|
||||
*/
|
||||
createListener (options, handler) {
|
||||
if (isFunction(options)) {
|
||||
handler = options
|
||||
@ -63,20 +72,21 @@ class TCP {
|
||||
return createListener(handler)
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter a list of multiaddrs for those which contain
|
||||
* valid `TCP` addresses.
|
||||
*
|
||||
* @param {Multiaddr|Array<Multiaddr>} multiaddrs
|
||||
* @returns {Array<Multiaddr>}
|
||||
*/
|
||||
filter (multiaddrs) {
|
||||
if (!Array.isArray(multiaddrs)) {
|
||||
multiaddrs = [multiaddrs]
|
||||
}
|
||||
|
||||
return multiaddrs.filter((ma) => {
|
||||
if (includes(ma.protoNames(), 'p2p-circuit')) {
|
||||
return false
|
||||
}
|
||||
|
||||
if (includes(ma.protoNames(), 'ipfs')) {
|
||||
ma = ma.decapsulate('ipfs')
|
||||
}
|
||||
|
||||
return mafmt.TCP.matches(ma)
|
||||
})
|
||||
}
|
||||
|
||||
@ -15,22 +15,58 @@ const getMultiaddr = require('./get-multiaddr')
|
||||
const IPFS_CODE = 421
|
||||
const CLOSE_TIMEOUT = 2000
|
||||
|
||||
function noop () {}
|
||||
/**
|
||||
* Listening for incoming connections.
|
||||
*
|
||||
* @event listening
|
||||
* @instance
|
||||
* @memberof Listener
|
||||
*/
|
||||
|
||||
/**
|
||||
* The server closes.
|
||||
*
|
||||
* @event close
|
||||
* @instance
|
||||
* @memberof Listener
|
||||
*/
|
||||
|
||||
/**
|
||||
* New connection established.
|
||||
*
|
||||
* @event connection
|
||||
* @instance
|
||||
* @type {Connection}
|
||||
* @memberof Listener
|
||||
*/
|
||||
|
||||
/**
|
||||
* The underlying server encountered an error.
|
||||
*
|
||||
* @event error
|
||||
* @instance
|
||||
* @type {Error}
|
||||
* @memberof Listener
|
||||
*/
|
||||
|
||||
module.exports = (handler) => {
|
||||
/**
|
||||
* @alias Listener
|
||||
* @type {Eventemitter}
|
||||
* @fires Listener#listening
|
||||
* @fires Listener#close
|
||||
* @fires Listener#connection
|
||||
* @fires Listener#error
|
||||
*/
|
||||
const listener = new EventEmitter()
|
||||
|
||||
const server = net.createServer((socket) => {
|
||||
// Avoid uncaught errors cause by unstable connections
|
||||
socket.on('error', noop)
|
||||
|
||||
const addr = getMultiaddr(socket)
|
||||
log('new connection', addr.toString())
|
||||
|
||||
const s = toPull.duplex(socket)
|
||||
|
||||
s.getObservedAddrs = (cb) => {
|
||||
cb(null, [addr])
|
||||
return cb(null, [addr])
|
||||
}
|
||||
|
||||
trackSocket(server, socket)
|
||||
@ -40,31 +76,36 @@ module.exports = (handler) => {
|
||||
listener.emit('connection', conn)
|
||||
})
|
||||
|
||||
server.on('listening', () => listener.emit('listening'))
|
||||
server.on('error', (err) => listener.emit('error', err))
|
||||
server.on('close', () => listener.emit('close'))
|
||||
server.on('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
|
||||
server.__connections = {}
|
||||
|
||||
listener.close = (options, callback) => {
|
||||
listener.close = (options, cb) => {
|
||||
if (typeof options === 'function') {
|
||||
callback = options
|
||||
cb = options
|
||||
options = {}
|
||||
}
|
||||
callback = callback || noop
|
||||
cb = cb || (() => {})
|
||||
options = options || {}
|
||||
|
||||
let closed = false
|
||||
server.close(callback)
|
||||
|
||||
server.close(cb)
|
||||
server.once('close', () => {
|
||||
closed = true
|
||||
})
|
||||
setTimeout(() => {
|
||||
if (closed) {
|
||||
return
|
||||
}
|
||||
if (closed) return
|
||||
|
||||
log('unable to close graciously, destroying conns')
|
||||
Object.keys(server.__connections).forEach((key) => {
|
||||
@ -77,7 +118,7 @@ module.exports = (handler) => {
|
||||
let ipfsId
|
||||
let listeningAddr
|
||||
|
||||
listener.listen = (ma, callback) => {
|
||||
listener.listen = (ma, cb) => {
|
||||
listeningAddr = ma
|
||||
if (includes(ma.protoNames(), 'ipfs')) {
|
||||
ipfsId = getIpfsId(ma)
|
||||
@ -86,15 +127,15 @@ module.exports = (handler) => {
|
||||
|
||||
const lOpts = listeningAddr.toOptions()
|
||||
log('Listening on %s %s', lOpts.port, lOpts.host)
|
||||
return server.listen(lOpts.port, lOpts.host, callback)
|
||||
return server.listen(lOpts.port, lOpts.host, cb)
|
||||
}
|
||||
|
||||
listener.getAddrs = (callback) => {
|
||||
listener.getAddrs = (cb) => {
|
||||
const multiaddrs = []
|
||||
const address = server.address()
|
||||
|
||||
if (!address) {
|
||||
return callback(new Error('Listener is not ready yet'))
|
||||
return cb(new Error('Listener is not ready yet'))
|
||||
}
|
||||
|
||||
// Because TCP will only return the IPv6 version
|
||||
@ -129,7 +170,7 @@ module.exports = (handler) => {
|
||||
multiaddrs.push(ma)
|
||||
}
|
||||
|
||||
callback(null, multiaddrs)
|
||||
cb(null, multiaddrs)
|
||||
}
|
||||
|
||||
return listener
|
||||
|
||||
@ -2,10 +2,7 @@
|
||||
'use strict'
|
||||
|
||||
const pull = require('pull-stream')
|
||||
const chai = require('chai')
|
||||
const dirtyChai = require('dirty-chai')
|
||||
const expect = chai.expect
|
||||
chai.use(dirtyChai)
|
||||
const expect = require('chai').expect
|
||||
const TCP = require('../src')
|
||||
const net = require('net')
|
||||
const multiaddr = require('multiaddr')
|
||||
@ -14,7 +11,7 @@ const Connection = require('interface-connection').Connection
|
||||
describe('instantiate the transport', () => {
|
||||
it('create', () => {
|
||||
const tcp = new TCP()
|
||||
expect(tcp).to.exist()
|
||||
expect(tcp).to.exist
|
||||
})
|
||||
})
|
||||
|
||||
@ -74,7 +71,7 @@ describe('listen', () => {
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
||||
listener.close(done)
|
||||
@ -87,7 +84,7 @@ describe('listen', () => {
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
listener.close(done)
|
||||
})
|
||||
@ -99,7 +96,7 @@ describe('listen', () => {
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
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)
|
||||
@ -112,7 +109,7 @@ describe('listen', () => {
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
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)
|
||||
@ -125,7 +122,7 @@ describe('listen', () => {
|
||||
const listener = tcp.createListener((conn) => {})
|
||||
listener.listen(mh, () => {
|
||||
listener.getAddrs((err, multiaddrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(multiaddrs.length).to.equal(1)
|
||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
||||
listener.close(done)
|
||||
@ -144,7 +141,7 @@ describe('dial', () => {
|
||||
listener = tcp.createListener((conn) => {
|
||||
pull(
|
||||
conn,
|
||||
pull.map((x) => Buffer.from(x.toString() + '!')),
|
||||
pull.map((x) => new Buffer(x.toString() + '!')),
|
||||
conn
|
||||
)
|
||||
})
|
||||
@ -160,8 +157,12 @@ describe('dial', () => {
|
||||
pull.values(['hey']),
|
||||
tcp.dial(ma),
|
||||
pull.collect((err, values) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(values).to.eql([Buffer.from('hey!')])
|
||||
expect(err).to.not.exist
|
||||
expect(
|
||||
values
|
||||
).to.be.eql(
|
||||
[new Buffer('hey!')]
|
||||
)
|
||||
done()
|
||||
})
|
||||
)
|
||||
@ -172,7 +173,7 @@ describe('dial', () => {
|
||||
pull(
|
||||
tcp.dial(ma),
|
||||
pull.onEnd((err) => {
|
||||
expect(err).to.exist()
|
||||
expect(err).to.exist
|
||||
done()
|
||||
})
|
||||
)
|
||||
@ -188,9 +189,13 @@ describe('dial', () => {
|
||||
pull.values(['hey']),
|
||||
tcp.dial(ma),
|
||||
pull.collect((err, values) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
|
||||
expect(values).to.be.eql([Buffer.from('hey')])
|
||||
expect(
|
||||
values
|
||||
).to.be.eql([
|
||||
new Buffer('hey')
|
||||
])
|
||||
|
||||
listener.close(done)
|
||||
})
|
||||
@ -253,8 +258,8 @@ describe('dial', () => {
|
||||
pull.values(['hey']),
|
||||
conn,
|
||||
pull.collect((err, res) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(res).to.be.eql([Buffer.from('hey!')])
|
||||
expect(err).to.not.exist
|
||||
expect(res).to.be.eql([new Buffer('hey!')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
@ -273,11 +278,8 @@ describe('filter addrs', () => {
|
||||
const mh2 = multiaddr('/ip4/127.0.0.1/udp/9090')
|
||||
const mh3 = multiaddr('/ip4/127.0.0.1/tcp/9090/http')
|
||||
const mh4 = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const mh5 = multiaddr('/ip4/127.0.0.1/tcp/9090/http/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const mh6 = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
|
||||
'/p2p-circuit/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
|
||||
const valid = tcp.filter([mh1, mh2, mh3, mh4, mh5, mh6])
|
||||
const valid = tcp.filter([mh1, mh2, mh3, mh4])
|
||||
expect(valid.length).to.equal(2)
|
||||
expect(valid[0]).to.deep.equal(mh1)
|
||||
expect(valid[1]).to.deep.equal(mh4)
|
||||
@ -305,9 +307,9 @@ describe('valid Connection', () => {
|
||||
let dialerObsAddrs
|
||||
|
||||
const listener = tcp.createListener((conn) => {
|
||||
expect(conn).to.exist()
|
||||
expect(conn).to.exist
|
||||
conn.getObservedAddrs((err, addrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
dialerObsAddrs = addrs
|
||||
pull(pull.empty(), conn)
|
||||
})
|
||||
@ -322,7 +324,7 @@ describe('valid Connection', () => {
|
||||
|
||||
function endHandler () {
|
||||
conn.getObservedAddrs((err, addrs) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
pull(pull.empty(), conn)
|
||||
closeAndAssert(listener, addrs)
|
||||
})
|
||||
@ -340,10 +342,10 @@ describe('valid Connection', () => {
|
||||
|
||||
it('get Peer Info', (done) => {
|
||||
const listener = tcp.createListener((conn) => {
|
||||
expect(conn).to.exist()
|
||||
expect(conn).to.exist
|
||||
conn.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.exist()
|
||||
expect(peerInfo).to.not.exist()
|
||||
expect(err).to.exist
|
||||
expect(peerInfo).to.not.exist
|
||||
pull(pull.empty(), conn)
|
||||
})
|
||||
})
|
||||
@ -352,11 +354,10 @@ describe('valid Connection', () => {
|
||||
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()
|
||||
expect(err).to.exist
|
||||
expect(peerInfo).to.not.exist
|
||||
|
||||
listener.close(done)
|
||||
})
|
||||
@ -366,10 +367,10 @@ describe('valid Connection', () => {
|
||||
|
||||
it('set Peer Info', (done) => {
|
||||
const listener = tcp.createListener((conn) => {
|
||||
expect(conn).to.exist()
|
||||
expect(conn).to.exist
|
||||
conn.setPeerInfo('batatas')
|
||||
conn.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(peerInfo).to.equal('batatas')
|
||||
pull(pull.empty(), conn)
|
||||
})
|
||||
@ -379,11 +380,10 @@ describe('valid Connection', () => {
|
||||
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(err).to.not.exist
|
||||
expect(peerInfo).to.equal('arroz')
|
||||
|
||||
listener.close(done)
|
||||
@ -424,11 +424,11 @@ describe('Connection wrap', () => {
|
||||
pull.values(['hey']),
|
||||
connWrap,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
expect(err).to.not.exist
|
||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||
|
||||
connWrap.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(peerInfo).to.equal('peerInfo')
|
||||
done()
|
||||
})
|
||||
@ -443,8 +443,8 @@ describe('Connection wrap', () => {
|
||||
pull.values(['hey']),
|
||||
connWrap,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
expect(err).to.not.exist
|
||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
@ -459,30 +459,23 @@ describe('Connection wrap', () => {
|
||||
callback(null, 'none')
|
||||
}
|
||||
conn.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.exist()
|
||||
expect(err).to.exist
|
||||
})
|
||||
connWrap.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
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')])
|
||||
expect(err).to.not.exist
|
||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||
done()
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
it('dial error', (done) => {
|
||||
tcp.dial(multiaddr('/ip4/999.0.0.1/tcp/1234'), (err) => {
|
||||
expect(err).to.exist()
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('matryoshka wrap', (done) => {
|
||||
const conn = tcp.dial(ma)
|
||||
const connWrap1 = new Connection(conn)
|
||||
@ -496,10 +489,10 @@ describe('Connection wrap', () => {
|
||||
pull.values(['hey']),
|
||||
connWrap3,
|
||||
pull.collect((err, chunks) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(chunks).to.be.eql([Buffer.from('hey')])
|
||||
expect(err).to.not.exist
|
||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||
connWrap3.getPeerInfo((err, peerInfo) => {
|
||||
expect(err).to.not.exist()
|
||||
expect(err).to.not.exist
|
||||
expect(peerInfo).to.equal('inner doll')
|
||||
done()
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user