Compare commits

..

12 Commits

5 changed files with 22 additions and 94 deletions

2
.gitignore vendored
View File

@ -25,5 +25,3 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
docs

View File

@ -26,5 +26,4 @@ build/Release
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
test
docs
test

View File

@ -1,15 +1,14 @@
{
"name": "libp2p-tcp",
"version": "0.9.1",
"version": "0.9.2",
"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 --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",
"release": "aegir-release --env no-build",
"release-minor": "aegir-release --type minor --env no-build",
"release-major": "aegir-release --type major --env no-build",
"coverage": "aegir-coverage",
"coverage-publish": "aegir-coverage publish"
},
@ -34,28 +33,29 @@
"node": ">=4.0.0"
},
"devDependencies": {
"aegir": "^9.2.0",
"interface-transport": "~0.3.3",
"aegir": "^10.0.0",
"chai": "^3.5.0",
"interface-transport": "^0.3.3",
"lodash.isfunction": "^3.0.8",
"pre-commit": "^1.1.3",
"pre-commit": "^1.2.2",
"pull-stream": "^3.5.0"
},
"dependencies": {
"interface-connection": "0.3.0",
"ip-address": "^5.8.2",
"interface-connection": "~0.3.0",
"mafmt": "^2.1.6",
"multiaddr": "^2.2.1",
"ip-address": "^5.8.6",
"lodash.includes": "^4.3.0",
"mafmt": "^2.1.2",
"multiaddr": "^2.1.1",
"stream-to-pull-stream": "^1.7.2"
},
"contributors": [
"David Dias <daviddias.p@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>",
"greenkeeperio-bot <support@greenkeeper.io>"
"Stephen Whitmore <stephen.whitmore@gmail.com>"
]
}
}

View File

@ -11,32 +11,21 @@ const log = debug('libp2p:tcp:dial')
const createListener = require('./listener')
/**
*
*/
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) {
module.exports = class TCP {
dial (ma, options, cb) {
if (isFunction(options)) {
callback = options
cb = options
options = {}
}
if (!callback) {
callback = () => {}
if (!cb) {
cb = () => {}
}
const cOpts = ma.toOptions()
log('Connecting to %s %s', cOpts.port, cOpts.host)
const rawSocket = net.connect(cOpts, callback)
const rawSocket = net.connect(cOpts, cb)
rawSocket.once('timeout', () => {
log('timeout')
@ -54,13 +43,6 @@ class TCP {
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
@ -72,13 +54,6 @@ 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]
@ -91,5 +66,3 @@ class TCP {
})
}
}
module.exports = TCP

View File

@ -15,49 +15,7 @@ const getMultiaddr = require('./get-multiaddr')
const IPFS_CODE = 421
const CLOSE_TIMEOUT = 2000
/**
* 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) => {