mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-02 05:01:34 +00:00
Compare commits
57 Commits
Author | SHA1 | Date | |
---|---|---|---|
7572279838 | |||
181ce4eef2 | |||
f8075be92a | |||
a54bb83657 | |||
ef45cc9a34 | |||
ce5f023508 | |||
2f9b1fe7fe | |||
46672b669f | |||
31f69ec3c2 | |||
afed19439a | |||
4b78faae3f | |||
e204517a51 | |||
4694f9dd47 | |||
dd6e067125 | |||
fb382a3e2a | |||
fd741367a2 | |||
4d4f295dd5 | |||
0edc487b23 | |||
c3ad8ce47a | |||
665b755922 | |||
1a550bac26 | |||
51c5594d49 | |||
d5476caee1 | |||
4b211f5cd6 | |||
433188f182 | |||
f3de45d198 | |||
2afaed5f2a | |||
308dead134 | |||
1c8603b721 | |||
c883475a4f | |||
515c6a32ec | |||
a107e1da57 | |||
2ec97b3c8c | |||
cb449a6c5c | |||
1773efecdf | |||
49e23f1961 | |||
10b35b22f6 | |||
5677e12592 | |||
9524e8670a | |||
32dc4fa5c6 | |||
9d697f66a4 | |||
fb6c61abe9 | |||
114998db1c | |||
4a94e3ca01 | |||
e451201848 | |||
e7524e1747 | |||
06689e3ff0 | |||
376f938cc0 | |||
a2958b9bca | |||
7b7e521e57 | |||
2330732ed5 | |||
7b7e7f6344 | |||
850a414e6f | |||
f6df6cfa40 | |||
c16376f567 | |||
0025407a5b | |||
48708ac4d2 |
18
.gitignore
vendored
18
.gitignore
vendored
@ -1,7 +1,14 @@
|
|||||||
|
**/node_modules/
|
||||||
|
**/*.log
|
||||||
|
test/repo-tests*
|
||||||
|
**/bundle.js
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
logs
|
logs
|
||||||
*.log
|
*.log
|
||||||
|
|
||||||
|
coverage
|
||||||
|
|
||||||
# Runtime data
|
# Runtime data
|
||||||
pids
|
pids
|
||||||
*.pid
|
*.pid
|
||||||
@ -19,12 +26,17 @@ coverage
|
|||||||
# node-waf configuration
|
# node-waf configuration
|
||||||
.lock-wscript
|
.lock-wscript
|
||||||
|
|
||||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
build
|
||||||
build/Release
|
|
||||||
|
|
||||||
# Dependency directory
|
# Dependency directory
|
||||||
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
|
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
|
||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
lib
|
lib
|
||||||
dist
|
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
|
||||||
|
29
.travis.yml
29
.travis.yml
@ -1,21 +1,20 @@
|
|||||||
sudo: false
|
sudo: false
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
|
||||||
- 4
|
|
||||||
- 5
|
|
||||||
- stable
|
|
||||||
|
|
||||||
# Make sure we have new NPM.
|
matrix:
|
||||||
before_install:
|
include:
|
||||||
- npm install -g npm
|
- node_js: 6
|
||||||
|
env: CXX=g++-4.8
|
||||||
|
- node_js: 8
|
||||||
|
env: CXX=g++-4.8
|
||||||
|
# - node_js: stable
|
||||||
|
# env: CXX=g++-4.8
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- npm run lint
|
- npm run lint
|
||||||
- npm test
|
- npm run test
|
||||||
- npm run coverage
|
- npm run coverage
|
||||||
|
- make test
|
||||||
addons:
|
|
||||||
firefox: 'latest'
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
@ -23,3 +22,11 @@ before_script:
|
|||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- npm run coverage-publish
|
- npm run coverage-publish
|
||||||
|
|
||||||
|
addons:
|
||||||
|
firefox: 'latest'
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- ubuntu-toolchain-r-test
|
||||||
|
packages:
|
||||||
|
- g++-4.8
|
||||||
|
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2015 David Dias
|
Copyright (c) 2015-2016 David Dias
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
70
README.md
70
README.md
@ -3,22 +3,44 @@
|
|||||||
[](http://ipn.io)
|
[](http://ipn.io)
|
||||||
[](http://webchat.freenode.net/?channels=%23ipfs)
|
[](http://webchat.freenode.net/?channels=%23ipfs)
|
||||||
[](https://travis-ci.org/libp2p/js-libp2p-tcp)
|
[](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://david-dm.org/libp2p/js-libp2p-tcp)
|
||||||
[](https://github.com/feross/standard)
|
[](https://github.com/feross/standard)
|
||||||
|

|
||||||
|

|
||||||
|
|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
> Node.js implementation of the TCP module that libp2p uses, which implements the [interface-connection](https://github.com/libp2p/interface-connection) interface for dial/listen.
|
> Node.js implementation of the TCP module that libp2p uses, which implements the [interface-connection](https://github.com/libp2p/interface-connection) interface for dial/listen.
|
||||||
|
|
||||||
## Description
|
|
||||||
|
|
||||||
`libp2p-tcp` in Node.js is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other different transports.
|
`libp2p-tcp` in Node.js is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other different transports.
|
||||||
|
|
||||||
**Note:** This module uses [pull-streams](https://pull-stream.github.io) for all stream based interfaces.
|
**Note:** This module uses [pull-streams](https://pull-stream.github.io) for all stream based interfaces.
|
||||||
|
|
||||||
## Example
|
## Table of Contents
|
||||||
|
|
||||||
|
- [Install](#install)
|
||||||
|
- [npm](#npm)
|
||||||
|
- [Usage](#usage)
|
||||||
|
- [Example](#example)
|
||||||
|
- [This module uses `pull-streams`](#this-module-uses-pull-streams)
|
||||||
|
- [Converting `pull-streams` to Node.js Streams](#converting-pull-streams-to-nodejs-streams)
|
||||||
|
- [API](#api)
|
||||||
|
- [Contribute](#contribute)
|
||||||
|
- [License](#license)
|
||||||
|
|
||||||
|
## Install
|
||||||
|
|
||||||
|
### npm
|
||||||
|
|
||||||
|
```sh
|
||||||
|
> npm i libp2p-tcp
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### Example
|
||||||
|
|
||||||
```js
|
```js
|
||||||
const TCP = require('libp2p-tcp')
|
const TCP = require('libp2p-tcp')
|
||||||
@ -51,25 +73,17 @@ listener.listen(() => {
|
|||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
outputs
|
Outputs:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
listening
|
listening
|
||||||
new connection opened
|
new connection opened
|
||||||
hello
|
hello
|
||||||
```
|
```
|
||||||
|
|
||||||
## Installation
|
### This module uses `pull-streams`
|
||||||
|
|
||||||
### npm
|
We expose a streaming interface based on `pull-streams`, rather then on the Node.js core streams implementation (aka Node.js streams). `pull-streams` offers us a better mechanism for error handling and flow control guarantees. If you would like to know more about why we did this, see the discussion at this [issue](https://github.com/ipfs/js-ipfs/issues/362).
|
||||||
|
|
||||||
```sh
|
|
||||||
> npm i libp2p-tcp
|
|
||||||
```
|
|
||||||
|
|
||||||
## This module uses `pull-streams`
|
|
||||||
|
|
||||||
We expose a streaming interface based on `pull-streams`, rather then on the Node.js core streams implementation (aka Node.js streams). `pull-streams` offers us a better mechanism for error handling and flow control guarantees. If you would like to know more about what took us to make this migration, see the discussion at this [issue](https://github.com/ipfs/js-ipfs/issues/362).
|
|
||||||
|
|
||||||
You can learn more about pull-streams at:
|
You can learn more about pull-streams at:
|
||||||
|
|
||||||
@ -78,22 +92,22 @@ You can learn more about pull-streams at:
|
|||||||
- [pull-streams, the simple streaming primitive](http://dominictarr.com/post/149248845122/pull-streams-pull-streams-are-a-very-simple)
|
- [pull-streams, the simple streaming primitive](http://dominictarr.com/post/149248845122/pull-streams-pull-streams-are-a-very-simple)
|
||||||
- [pull-streams documentation](https://pull-stream.github.io/)
|
- [pull-streams documentation](https://pull-stream.github.io/)
|
||||||
|
|
||||||
### Converting `pull-streams` to Node.js Streams
|
#### Converting `pull-streams` to Node.js Streams
|
||||||
|
|
||||||
If you are a Node.js streams user, you can convert a pull-stream to Node.js Stream using the module `pull-stream-to-stream`, giving you an instance of a Node.js stream that is linked to the pull-stream. Example:
|
If you are a Node.js streams user, you can convert a pull-stream to a Node.js stream using the module [`pull-stream-to-stream`](https://github.com/dominictarr/pull-stream-to-stream), giving you an instance of a Node.js stream that is linked to the pull-stream. For example:
|
||||||
|
|
||||||
```
|
```js
|
||||||
const pullToStream = require('pull-stream-to-stream')
|
const pullToStream = require('pull-stream-to-stream')
|
||||||
|
|
||||||
const nodeStreamInstance = pullToStream(pullStreamInstance)
|
const nodeStreamInstance = pullToStream(pullStreamInstance)
|
||||||
// nodeStreamInstance is an instance of a Node.js Stream
|
// nodeStreamInstance is an instance of a Node.js Stream
|
||||||
```
|
```
|
||||||
|
|
||||||
To learn more about his utility, visit https://pull-stream.github.io/#pull-stream-to-stream
|
To learn more about this utility, visit https://pull-stream.github.io/#pull-stream-to-stream.
|
||||||
|
|
||||||
## API
|
## API
|
||||||
|
|
||||||
[](https://github.com/diasdavid/interface-transport)
|
[](https://github.com/libp2p/interface-transport)
|
||||||
|
|
||||||
`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:
|
`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:
|
||||||
|
|
||||||
@ -102,6 +116,18 @@ To learn more about his utility, visit https://pull-stream.github.io/#pull-strea
|
|||||||
|
|
||||||
Both for dialing and listening.
|
Both for dialing and listening.
|
||||||
|
|
||||||
|
## Contribute
|
||||||
|
|
||||||
|
Contributions are welcome! The libp2p implementation in JavaScript is a work in progress. As such, there's a few things you can do right now to help out:
|
||||||
|
|
||||||
|
- [Check out the existing issues](//github.com/libp2p/js-libp2p-tcp/issues).
|
||||||
|
- **Perform code reviews**.
|
||||||
|
- **Add tests**. There can never be enough tests.
|
||||||
|
|
||||||
|
Please be aware that all interactions related to libp2p are subject to the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
|
||||||
|
|
||||||
|
Small note: If editing the README, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
MIT
|
[MIT](LICENSE) © 2015-2016 David Dias
|
||||||
|
@ -5,8 +5,10 @@ machine:
|
|||||||
dependencies:
|
dependencies:
|
||||||
pre:
|
pre:
|
||||||
- google-chrome --version
|
- google-chrome --version
|
||||||
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
|
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
|
||||||
- sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
|
- sudo dpkg -i google-chrome.deb || true
|
||||||
- sudo apt-get update
|
- sudo apt-get update
|
||||||
- sudo apt-get --only-upgrade install google-chrome-stable
|
- sudo apt-get install -f
|
||||||
|
- sudo apt-get install --only-upgrade lsb-base
|
||||||
|
- sudo dpkg -i google-chrome.deb
|
||||||
- google-chrome --version
|
- google-chrome --version
|
||||||
|
54
package.json
54
package.json
@ -1,16 +1,14 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p-tcp",
|
"name": "libp2p-tcp",
|
||||||
"version": "0.8.0",
|
"version": "0.11.0",
|
||||||
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
|
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
|
||||||
"main": "lib/index.js",
|
"main": "src/index.js",
|
||||||
"jsnext:main": "src/index.js",
|
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "aegir-lint",
|
"lint": "aegir-lint",
|
||||||
"build": "aegir-build --env node",
|
|
||||||
"test": "aegir-test --env node",
|
"test": "aegir-test --env node",
|
||||||
"release": "aegir-release --env node",
|
"release": "aegir-release --env no-build",
|
||||||
"release-minor": "aegir-release --type minor --env node",
|
"release-minor": "aegir-release --type minor --env no-build",
|
||||||
"release-major": "aegir-release --type major --env node",
|
"release-major": "aegir-release --type major --env no-build",
|
||||||
"coverage": "aegir-coverage",
|
"coverage": "aegir-coverage",
|
||||||
"coverage-publish": "aegir-coverage publish"
|
"coverage-publish": "aegir-coverage publish"
|
||||||
},
|
},
|
||||||
@ -20,7 +18,7 @@
|
|||||||
],
|
],
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/diasdavid/js-libp2p-tcp.git"
|
"url": "https://github.com/libp2p/js-libp2p-tcp.git"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"IPFS"
|
"IPFS"
|
||||||
@ -28,32 +26,40 @@
|
|||||||
"author": "David Dias <daviddias@ipfs.io>",
|
"author": "David Dias <daviddias@ipfs.io>",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/diasdavid/js-libp2p-tcp/issues"
|
"url": "https://github.com/libp2p/js-libp2p-tcp/issues"
|
||||||
|
},
|
||||||
|
"homepage": "https://github.com/libp2p/js-libp2p-tcp",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=6.0.0",
|
||||||
|
"npm": ">=3.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/diasdavid/js-libp2p-tcp",
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"aegir": "^6.0.1",
|
"aegir": "^11.0.2",
|
||||||
"chai": "^3.5.0",
|
"chai": "^4.1.2",
|
||||||
"interface-transport": "^0.3.3",
|
"dirty-chai": "^2.0.1",
|
||||||
|
"interface-transport": "~0.3.5",
|
||||||
"lodash.isfunction": "^3.0.8",
|
"lodash.isfunction": "^3.0.8",
|
||||||
"pre-commit": "^1.1.2"
|
"pre-commit": "^1.2.2",
|
||||||
|
"pull-stream": "^3.6.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"interface-connection": "0.2.1",
|
"interface-connection": "~0.3.2",
|
||||||
"ip-address": "^5.8.0",
|
"ip-address": "^5.8.8",
|
||||||
"lodash.contains": "^2.4.3",
|
"lodash.includes": "^4.3.0",
|
||||||
"mafmt": "^2.1.2",
|
"lodash.isfunction": "^3.0.8",
|
||||||
"multiaddr": "^2.0.2",
|
"mafmt": "^3.0.0",
|
||||||
"pull": "^2.1.1",
|
"multiaddr": "^3.0.0",
|
||||||
"stream-to-pull-stream": "^1.7.0"
|
"once": "^1.4.0",
|
||||||
|
"stream-to-pull-stream": "^1.7.2"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"David Dias <daviddias.p@gmail.com>",
|
"David Dias <daviddias.p@gmail.com>",
|
||||||
"Evan Schwartz <evan.mark.schwartz@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>",
|
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||||
|
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||||
"Richard Littauer <richard.littauer@gmail.com>",
|
"Richard Littauer <richard.littauer@gmail.com>",
|
||||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
"Stephen Whitmore <stephen.whitmore@gmail.com>"
|
||||||
"dignifiedquire <dignifiedquire@gmail.com>",
|
|
||||||
"greenkeeperio-bot <support@greenkeeper.io>"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
@ -4,7 +4,7 @@ const multiaddr = require('multiaddr')
|
|||||||
const Address6 = require('ip-address').Address6
|
const Address6 = require('ip-address').Address6
|
||||||
|
|
||||||
module.exports = (socket) => {
|
module.exports = (socket) => {
|
||||||
var mh
|
let mh
|
||||||
|
|
||||||
if (socket.remoteFamily === 'IPv6') {
|
if (socket.remoteFamily === 'IPv6') {
|
||||||
var addr = new Address6(socket.remoteAddress)
|
var addr = new Address6(socket.remoteAddress)
|
||||||
|
33
src/index.js
33
src/index.js
@ -3,41 +3,50 @@
|
|||||||
const net = require('net')
|
const net = require('net')
|
||||||
const toPull = require('stream-to-pull-stream')
|
const toPull = require('stream-to-pull-stream')
|
||||||
const mafmt = require('mafmt')
|
const mafmt = require('mafmt')
|
||||||
const contains = require('lodash.contains')
|
const includes = require('lodash.includes')
|
||||||
const isFunction = require('lodash.isfunction')
|
const isFunction = require('lodash.isfunction')
|
||||||
const Connection = require('interface-connection').Connection
|
const Connection = require('interface-connection').Connection
|
||||||
|
const once = require('once')
|
||||||
const debug = require('debug')
|
const debug = require('debug')
|
||||||
const log = debug('libp2p:tcp:dial')
|
const log = debug('libp2p:tcp:dial')
|
||||||
|
|
||||||
const createListener = require('./listener')
|
const createListener = require('./listener')
|
||||||
|
|
||||||
module.exports = class TCP {
|
function noop () {}
|
||||||
dial (ma, options, cb) {
|
|
||||||
|
class TCP {
|
||||||
|
dial (ma, options, callback) {
|
||||||
if (isFunction(options)) {
|
if (isFunction(options)) {
|
||||||
cb = options
|
callback = options
|
||||||
options = {}
|
options = {}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cb) {
|
callback = callback || noop
|
||||||
cb = () => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
callback = once(callback)
|
||||||
const cOpts = ma.toOptions()
|
const cOpts = ma.toOptions()
|
||||||
log('Connecting to %s %s', cOpts.port, cOpts.host)
|
log('Connecting to %s %s', cOpts.port, cOpts.host)
|
||||||
|
|
||||||
const rawSocket = net.connect(cOpts, cb)
|
const rawSocket = net.connect(cOpts)
|
||||||
|
|
||||||
rawSocket.once('timeout', () => {
|
rawSocket.once('timeout', () => {
|
||||||
log('timeout')
|
log('timeout')
|
||||||
rawSocket.emit('error', new Error('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 socket = toPull.duplex(rawSocket)
|
||||||
|
|
||||||
const conn = new Connection(socket)
|
const conn = new Connection(socket)
|
||||||
|
|
||||||
conn.getObservedAddrs = (cb) => {
|
conn.getObservedAddrs = (callback) => {
|
||||||
return cb(null, [ma])
|
return callback(null, [ma])
|
||||||
}
|
}
|
||||||
|
|
||||||
return conn
|
return conn
|
||||||
@ -59,10 +68,12 @@ module.exports = class TCP {
|
|||||||
multiaddrs = [multiaddrs]
|
multiaddrs = [multiaddrs]
|
||||||
}
|
}
|
||||||
return multiaddrs.filter((ma) => {
|
return multiaddrs.filter((ma) => {
|
||||||
if (contains(ma.protoNames(), 'ipfs')) {
|
if (includes(ma.protoNames(), 'ipfs')) {
|
||||||
ma = ma.decapsulate('ipfs')
|
ma = ma.decapsulate('ipfs')
|
||||||
}
|
}
|
||||||
return mafmt.TCP.matches(ma)
|
return mafmt.TCP.matches(ma)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module.exports = TCP
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
const Connection = require('interface-connection').Connection
|
const Connection = require('interface-connection').Connection
|
||||||
const os = require('os')
|
const os = require('os')
|
||||||
const contains = require('lodash.contains')
|
const includes = require('lodash.includes')
|
||||||
const net = require('net')
|
const net = require('net')
|
||||||
const toPull = require('stream-to-pull-stream')
|
const toPull = require('stream-to-pull-stream')
|
||||||
const EventEmitter = require('events').EventEmitter
|
const EventEmitter = require('events').EventEmitter
|
||||||
@ -15,16 +15,22 @@ const getMultiaddr = require('./get-multiaddr')
|
|||||||
const IPFS_CODE = 421
|
const IPFS_CODE = 421
|
||||||
const CLOSE_TIMEOUT = 2000
|
const CLOSE_TIMEOUT = 2000
|
||||||
|
|
||||||
|
function noop () {}
|
||||||
|
|
||||||
module.exports = (handler) => {
|
module.exports = (handler) => {
|
||||||
const listener = new EventEmitter()
|
const listener = new EventEmitter()
|
||||||
|
|
||||||
const server = net.createServer((socket) => {
|
const server = net.createServer((socket) => {
|
||||||
|
// Avoid uncaught errors cause by unstable connections
|
||||||
|
socket.on('error', noop)
|
||||||
|
|
||||||
const addr = getMultiaddr(socket)
|
const addr = getMultiaddr(socket)
|
||||||
log('new connection', addr.toString())
|
log('new connection', addr.toString())
|
||||||
|
|
||||||
const s = toPull.duplex(socket)
|
const s = toPull.duplex(socket)
|
||||||
|
|
||||||
s.getObservedAddrs = (cb) => {
|
s.getObservedAddrs = (cb) => {
|
||||||
return cb(null, [addr])
|
cb(null, [addr])
|
||||||
}
|
}
|
||||||
|
|
||||||
trackSocket(server, socket)
|
trackSocket(server, socket)
|
||||||
@ -34,36 +40,31 @@ module.exports = (handler) => {
|
|||||||
listener.emit('connection', conn)
|
listener.emit('connection', conn)
|
||||||
})
|
})
|
||||||
|
|
||||||
server.on('listening', () => {
|
server.on('listening', () => listener.emit('listening'))
|
||||||
listener.emit('listening')
|
server.on('error', (err) => listener.emit('error', err))
|
||||||
})
|
server.on('close', () => listener.emit('close'))
|
||||||
|
|
||||||
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
|
// Keep track of open connections to destroy in case of timeout
|
||||||
server.__connections = {}
|
server.__connections = {}
|
||||||
|
|
||||||
listener.close = (options, cb) => {
|
listener.close = (options, callback) => {
|
||||||
if (typeof options === 'function') {
|
if (typeof options === 'function') {
|
||||||
cb = options
|
callback = options
|
||||||
options = {}
|
options = {}
|
||||||
}
|
}
|
||||||
cb = cb || (() => {})
|
callback = callback || noop
|
||||||
options = options || {}
|
options = options || {}
|
||||||
|
|
||||||
let closed = false
|
let closed = false
|
||||||
server.close(cb)
|
server.close(callback)
|
||||||
|
|
||||||
server.once('close', () => {
|
server.once('close', () => {
|
||||||
closed = true
|
closed = true
|
||||||
})
|
})
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (closed) return
|
if (closed) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
log('unable to close graciously, destroying conns')
|
log('unable to close graciously, destroying conns')
|
||||||
Object.keys(server.__connections).forEach((key) => {
|
Object.keys(server.__connections).forEach((key) => {
|
||||||
@ -76,24 +77,24 @@ module.exports = (handler) => {
|
|||||||
let ipfsId
|
let ipfsId
|
||||||
let listeningAddr
|
let listeningAddr
|
||||||
|
|
||||||
listener.listen = (ma, cb) => {
|
listener.listen = (ma, callback) => {
|
||||||
listeningAddr = ma
|
listeningAddr = ma
|
||||||
if (contains(ma.protoNames(), 'ipfs')) {
|
if (includes(ma.protoNames(), 'ipfs')) {
|
||||||
ipfsId = getIpfsId(ma)
|
ipfsId = getIpfsId(ma)
|
||||||
listeningAddr = ma.decapsulate('ipfs')
|
listeningAddr = ma.decapsulate('ipfs')
|
||||||
}
|
}
|
||||||
|
|
||||||
const lOpts = listeningAddr.toOptions()
|
const lOpts = listeningAddr.toOptions()
|
||||||
log('Listening on %s %s', lOpts.port, lOpts.host)
|
log('Listening on %s %s', lOpts.port, lOpts.host)
|
||||||
return server.listen(lOpts.port, lOpts.host, cb)
|
return server.listen(lOpts.port, lOpts.host, callback)
|
||||||
}
|
}
|
||||||
|
|
||||||
listener.getAddrs = (cb) => {
|
listener.getAddrs = (callback) => {
|
||||||
const multiaddrs = []
|
const multiaddrs = []
|
||||||
const address = server.address()
|
const address = server.address()
|
||||||
|
|
||||||
if (!address) {
|
if (!address) {
|
||||||
return cb(new Error('Listener is not ready yet'))
|
return callback(new Error('Listener is not ready yet'))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Because TCP will only return the IPv6 version
|
// Because TCP will only return the IPv6 version
|
||||||
@ -128,7 +129,7 @@ module.exports = (handler) => {
|
|||||||
multiaddrs.push(ma)
|
multiaddrs.push(ma)
|
||||||
}
|
}
|
||||||
|
|
||||||
cb(null, multiaddrs)
|
callback(null, multiaddrs)
|
||||||
}
|
}
|
||||||
|
|
||||||
return listener
|
return listener
|
||||||
|
@ -2,7 +2,10 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const pull = require('pull-stream')
|
const pull = require('pull-stream')
|
||||||
const expect = require('chai').expect
|
const chai = require('chai')
|
||||||
|
const dirtyChai = require('dirty-chai')
|
||||||
|
const expect = chai.expect
|
||||||
|
chai.use(dirtyChai)
|
||||||
const TCP = require('../src')
|
const TCP = require('../src')
|
||||||
const net = require('net')
|
const net = require('net')
|
||||||
const multiaddr = require('multiaddr')
|
const multiaddr = require('multiaddr')
|
||||||
@ -11,7 +14,7 @@ const Connection = require('interface-connection').Connection
|
|||||||
describe('instantiate the transport', () => {
|
describe('instantiate the transport', () => {
|
||||||
it('create', () => {
|
it('create', () => {
|
||||||
const tcp = new TCP()
|
const tcp = new TCP()
|
||||||
expect(tcp).to.exist
|
expect(tcp).to.exist()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -71,7 +74,7 @@ describe('listen', () => {
|
|||||||
const listener = tcp.createListener((conn) => {})
|
const listener = tcp.createListener((conn) => {})
|
||||||
listener.listen(mh, () => {
|
listener.listen(mh, () => {
|
||||||
listener.getAddrs((err, multiaddrs) => {
|
listener.getAddrs((err, multiaddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(multiaddrs.length).to.equal(1)
|
expect(multiaddrs.length).to.equal(1)
|
||||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
expect(multiaddrs[0]).to.deep.equal(mh)
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
@ -84,7 +87,7 @@ describe('listen', () => {
|
|||||||
const listener = tcp.createListener((conn) => {})
|
const listener = tcp.createListener((conn) => {})
|
||||||
listener.listen(mh, () => {
|
listener.listen(mh, () => {
|
||||||
listener.getAddrs((err, multiaddrs) => {
|
listener.getAddrs((err, multiaddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(multiaddrs.length).to.equal(1)
|
expect(multiaddrs.length).to.equal(1)
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
})
|
})
|
||||||
@ -96,7 +99,7 @@ describe('listen', () => {
|
|||||||
const listener = tcp.createListener((conn) => {})
|
const listener = tcp.createListener((conn) => {})
|
||||||
listener.listen(mh, () => {
|
listener.listen(mh, () => {
|
||||||
listener.getAddrs((err, multiaddrs) => {
|
listener.getAddrs((err, multiaddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(multiaddrs.length > 0).to.equal(true)
|
expect(multiaddrs.length > 0).to.equal(true)
|
||||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
@ -109,7 +112,7 @@ describe('listen', () => {
|
|||||||
const listener = tcp.createListener((conn) => {})
|
const listener = tcp.createListener((conn) => {})
|
||||||
listener.listen(mh, () => {
|
listener.listen(mh, () => {
|
||||||
listener.getAddrs((err, multiaddrs) => {
|
listener.getAddrs((err, multiaddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(multiaddrs.length > 0).to.equal(true)
|
expect(multiaddrs.length > 0).to.equal(true)
|
||||||
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
@ -122,7 +125,7 @@ describe('listen', () => {
|
|||||||
const listener = tcp.createListener((conn) => {})
|
const listener = tcp.createListener((conn) => {})
|
||||||
listener.listen(mh, () => {
|
listener.listen(mh, () => {
|
||||||
listener.getAddrs((err, multiaddrs) => {
|
listener.getAddrs((err, multiaddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(multiaddrs.length).to.equal(1)
|
expect(multiaddrs.length).to.equal(1)
|
||||||
expect(multiaddrs[0]).to.deep.equal(mh)
|
expect(multiaddrs[0]).to.deep.equal(mh)
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
@ -157,12 +160,8 @@ describe('dial', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
tcp.dial(ma),
|
tcp.dial(ma),
|
||||||
pull.collect((err, values) => {
|
pull.collect((err, values) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(
|
expect(values).to.eql([new Buffer('hey!')])
|
||||||
values
|
|
||||||
).to.be.eql(
|
|
||||||
[new Buffer('hey!')]
|
|
||||||
)
|
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@ -173,7 +172,7 @@ describe('dial', () => {
|
|||||||
pull(
|
pull(
|
||||||
tcp.dial(ma),
|
tcp.dial(ma),
|
||||||
pull.onEnd((err) => {
|
pull.onEnd((err) => {
|
||||||
expect(err).to.exist
|
expect(err).to.exist()
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@ -189,13 +188,9 @@ describe('dial', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
tcp.dial(ma),
|
tcp.dial(ma),
|
||||||
pull.collect((err, values) => {
|
pull.collect((err, values) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
|
|
||||||
expect(
|
expect(values).to.be.eql([new Buffer('hey')])
|
||||||
values
|
|
||||||
).to.be.eql([
|
|
||||||
new Buffer('hey')
|
|
||||||
])
|
|
||||||
|
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
})
|
})
|
||||||
@ -258,7 +253,7 @@ describe('dial', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
conn,
|
conn,
|
||||||
pull.collect((err, res) => {
|
pull.collect((err, res) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(res).to.be.eql([new Buffer('hey!')])
|
expect(res).to.be.eql([new Buffer('hey!')])
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
@ -307,9 +302,9 @@ describe('valid Connection', () => {
|
|||||||
let dialerObsAddrs
|
let dialerObsAddrs
|
||||||
|
|
||||||
const listener = tcp.createListener((conn) => {
|
const listener = tcp.createListener((conn) => {
|
||||||
expect(conn).to.exist
|
expect(conn).to.exist()
|
||||||
conn.getObservedAddrs((err, addrs) => {
|
conn.getObservedAddrs((err, addrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
dialerObsAddrs = addrs
|
dialerObsAddrs = addrs
|
||||||
pull(pull.empty(), conn)
|
pull(pull.empty(), conn)
|
||||||
})
|
})
|
||||||
@ -324,7 +319,7 @@ describe('valid Connection', () => {
|
|||||||
|
|
||||||
function endHandler () {
|
function endHandler () {
|
||||||
conn.getObservedAddrs((err, addrs) => {
|
conn.getObservedAddrs((err, addrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
pull(pull.empty(), conn)
|
pull(pull.empty(), conn)
|
||||||
closeAndAssert(listener, addrs)
|
closeAndAssert(listener, addrs)
|
||||||
})
|
})
|
||||||
@ -342,10 +337,10 @@ describe('valid Connection', () => {
|
|||||||
|
|
||||||
it('get Peer Info', (done) => {
|
it('get Peer Info', (done) => {
|
||||||
const listener = tcp.createListener((conn) => {
|
const listener = tcp.createListener((conn) => {
|
||||||
expect(conn).to.exist
|
expect(conn).to.exist()
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.exist
|
expect(err).to.exist()
|
||||||
expect(peerInfo).to.not.exist
|
expect(peerInfo).to.not.exist()
|
||||||
pull(pull.empty(), conn)
|
pull(pull.empty(), conn)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -356,8 +351,8 @@ describe('valid Connection', () => {
|
|||||||
pull(conn, pull.onEnd(endHandler))
|
pull(conn, pull.onEnd(endHandler))
|
||||||
function endHandler () {
|
function endHandler () {
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.exist
|
expect(err).to.exist()
|
||||||
expect(peerInfo).to.not.exist
|
expect(peerInfo).to.not.exist()
|
||||||
|
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
})
|
})
|
||||||
@ -367,10 +362,10 @@ describe('valid Connection', () => {
|
|||||||
|
|
||||||
it('set Peer Info', (done) => {
|
it('set Peer Info', (done) => {
|
||||||
const listener = tcp.createListener((conn) => {
|
const listener = tcp.createListener((conn) => {
|
||||||
expect(conn).to.exist
|
expect(conn).to.exist()
|
||||||
conn.setPeerInfo('batatas')
|
conn.setPeerInfo('batatas')
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(peerInfo).to.equal('batatas')
|
expect(peerInfo).to.equal('batatas')
|
||||||
pull(pull.empty(), conn)
|
pull(pull.empty(), conn)
|
||||||
})
|
})
|
||||||
@ -383,7 +378,7 @@ describe('valid Connection', () => {
|
|||||||
function endHandler () {
|
function endHandler () {
|
||||||
conn.setPeerInfo('arroz')
|
conn.setPeerInfo('arroz')
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(peerInfo).to.equal('arroz')
|
expect(peerInfo).to.equal('arroz')
|
||||||
|
|
||||||
listener.close(done)
|
listener.close(done)
|
||||||
@ -424,11 +419,11 @@ describe('Connection wrap', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
connWrap,
|
connWrap,
|
||||||
pull.collect((err, chunks) => {
|
pull.collect((err, chunks) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||||
|
|
||||||
connWrap.getPeerInfo((err, peerInfo) => {
|
connWrap.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(peerInfo).to.equal('peerInfo')
|
expect(peerInfo).to.equal('peerInfo')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
@ -443,7 +438,7 @@ describe('Connection wrap', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
connWrap,
|
connWrap,
|
||||||
pull.collect((err, chunks) => {
|
pull.collect((err, chunks) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
@ -459,23 +454,30 @@ describe('Connection wrap', () => {
|
|||||||
callback(null, 'none')
|
callback(null, 'none')
|
||||||
}
|
}
|
||||||
conn.getPeerInfo((err, peerInfo) => {
|
conn.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.exist
|
expect(err).to.exist()
|
||||||
})
|
})
|
||||||
connWrap.getPeerInfo((err, peerInfo) => {
|
connWrap.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(peerInfo).to.equal('none')
|
expect(peerInfo).to.equal('none')
|
||||||
})
|
})
|
||||||
pull(
|
pull(
|
||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
connWrap,
|
connWrap,
|
||||||
pull.collect((err, chunks) => {
|
pull.collect((err, chunks) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||||
done()
|
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) => {
|
it('matryoshka wrap', (done) => {
|
||||||
const conn = tcp.dial(ma)
|
const conn = tcp.dial(ma)
|
||||||
const connWrap1 = new Connection(conn)
|
const connWrap1 = new Connection(conn)
|
||||||
@ -489,10 +491,10 @@ describe('Connection wrap', () => {
|
|||||||
pull.values(['hey']),
|
pull.values(['hey']),
|
||||||
connWrap3,
|
connWrap3,
|
||||||
pull.collect((err, chunks) => {
|
pull.collect((err, chunks) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(chunks).to.be.eql([new Buffer('hey')])
|
expect(chunks).to.be.eql([new Buffer('hey')])
|
||||||
connWrap3.getPeerInfo((err, peerInfo) => {
|
connWrap3.getPeerInfo((err, peerInfo) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(peerInfo).to.equal('inner doll')
|
expect(peerInfo).to.equal('inner doll')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user