mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-02 05:11:42 +00:00
Compare commits
3 Commits
feat/use-p
...
v0.13.0
Author | SHA1 | Date | |
---|---|---|---|
3aad2ed243 | |||
01cfbda2e7 | |||
eba0b48744 |
10
CHANGELOG.md
10
CHANGELOG.md
@ -1,3 +1,13 @@
|
||||
<a name="0.13.0"></a>
|
||||
# [0.13.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.1...v0.13.0) (2018-09-12)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add support for dialing over dns ([eba0b48](https://github.com/libp2p/js-libp2p-tcp/commit/eba0b48))
|
||||
|
||||
|
||||
|
||||
<a name="0.12.1"></a>
|
||||
## [0.12.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.0...v0.12.1) (2018-07-31)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libp2p-tcp",
|
||||
"version": "0.12.1",
|
||||
"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",
|
||||
@ -39,7 +39,7 @@
|
||||
"dirty-chai": "^2.0.1",
|
||||
"interface-transport": "~0.3.6",
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"pull-stream": "^3.6.7"
|
||||
"pull-stream": "^3.6.9"
|
||||
},
|
||||
"dependencies": {
|
||||
"class-is": "^1.1.0",
|
||||
@ -48,10 +48,9 @@
|
||||
"ip-address": "^5.8.9",
|
||||
"lodash.includes": "^4.3.0",
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"mafmt": "^6.0.0",
|
||||
"multiaddr": "^4.0.0",
|
||||
"mafmt": "^6.0.2",
|
||||
"multiaddr": "^5.0.0",
|
||||
"once": "^1.4.0",
|
||||
"pull-net": "github:mkg20001/pull-net",
|
||||
"stream-to-pull-stream": "^1.7.2"
|
||||
},
|
||||
"contributors": [
|
||||
|
@ -9,22 +9,22 @@ module.exports = (socket) => {
|
||||
let ma
|
||||
|
||||
try {
|
||||
if (socket.remoteAddress.family === 'IPv6') {
|
||||
const addr = new Address6(socket.remoteAddress.address)
|
||||
if (socket.remoteFamily === 'IPv6') {
|
||||
const addr = new Address6(socket.remoteAddress)
|
||||
|
||||
if (addr.v4) {
|
||||
const ip4 = addr.to4().correctForm()
|
||||
ma = multiaddr('/ip4/' + ip4 +
|
||||
'/tcp/' + socket.remoteAddress.port
|
||||
'/tcp/' + socket.remotePort
|
||||
)
|
||||
} else {
|
||||
ma = multiaddr('/ip6/' + socket.remoteAddress.address +
|
||||
'/tcp/' + socket.remoteAddress.port
|
||||
ma = multiaddr('/ip6/' + socket.remoteAddress +
|
||||
'/tcp/' + socket.remotePort
|
||||
)
|
||||
}
|
||||
} else {
|
||||
ma = multiaddr('/ip4/' + socket.remoteAddress.address +
|
||||
'/tcp/' + socket.remoteAddress.port)
|
||||
ma = multiaddr('/ip4/' + socket.remoteAddress +
|
||||
'/tcp/' + socket.remotePort)
|
||||
}
|
||||
} catch (err) {
|
||||
log(err)
|
||||
|
21
src/index.js
21
src/index.js
@ -1,6 +1,7 @@
|
||||
'use strict'
|
||||
|
||||
const {connect} = require('pull-net')
|
||||
const net = require('net')
|
||||
const toPull = require('stream-to-pull-stream')
|
||||
const mafmt = require('mafmt')
|
||||
const withIs = require('class-is')
|
||||
const includes = require('lodash.includes')
|
||||
@ -26,7 +27,23 @@ class TCP {
|
||||
const cOpts = ma.toOptions()
|
||||
log('Connecting to %s %s', cOpts.port, cOpts.host)
|
||||
|
||||
const conn = new Connection(connect(cOpts.port, cOpts.host, callback))
|
||||
const rawSocket = net.connect(cOpts)
|
||||
|
||||
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])
|
||||
|
@ -4,23 +4,29 @@ const multiaddr = require('multiaddr')
|
||||
const Connection = require('interface-connection').Connection
|
||||
const os = require('os')
|
||||
const includes = require('lodash.includes')
|
||||
const {createServer} = require('pull-net')
|
||||
const net = require('net')
|
||||
const toPull = require('stream-to-pull-stream')
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const debug = require('debug')
|
||||
const log = debug('libp2p:tcp:listen')
|
||||
|
||||
const getMultiaddr = require('./get-multiaddr')
|
||||
|
||||
const IPFS_CODE = 421
|
||||
const CLOSE_TIMEOUT = 2000
|
||||
|
||||
function noop () {}
|
||||
|
||||
module.exports = (handler) => {
|
||||
const listener = new EventEmitter()
|
||||
|
||||
const server = createServer((stream) => {
|
||||
const addr = getMultiaddr(stream)
|
||||
const server = net.createServer((socket) => {
|
||||
// Avoid uncaught errors cause by unstable connections
|
||||
socket.on('error', noop)
|
||||
|
||||
const addr = getMultiaddr(socket)
|
||||
if (!addr) {
|
||||
if (stream.remoteAddress === undefined || stream.remoteAddress.address === 'undefined') {
|
||||
if (socket.remoteAddress === undefined) {
|
||||
log('connection closed before p2p connection made')
|
||||
} else {
|
||||
log('error interpreting incoming p2p connection')
|
||||
@ -30,16 +36,25 @@ module.exports = (handler) => {
|
||||
|
||||
log('new connection', addr.toString())
|
||||
|
||||
stream.getObservedAddrs = (cb) => {
|
||||
const s = toPull.duplex(socket)
|
||||
|
||||
s.getObservedAddrs = (cb) => {
|
||||
cb(null, [addr])
|
||||
}
|
||||
|
||||
const conn = new Connection(stream)
|
||||
trackSocket(server, socket)
|
||||
|
||||
const conn = new Connection(s)
|
||||
handler(conn)
|
||||
listener.emit('connection', conn)
|
||||
})
|
||||
|
||||
listener.emit('listening')
|
||||
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) => {
|
||||
if (typeof options === 'function') {
|
||||
@ -49,9 +64,18 @@ module.exports = (handler) => {
|
||||
callback = callback || noop
|
||||
options = options || {}
|
||||
|
||||
server.close((err, ...a) => {
|
||||
listener.emit('close')
|
||||
callback(err, ...a)
|
||||
const timeout = setTimeout(() => {
|
||||
log('unable to close graciously, destroying conns')
|
||||
Object.keys(server.__connections).forEach((key) => {
|
||||
log('destroying %s', key)
|
||||
server.__connections[key].destroy()
|
||||
})
|
||||
}, options.timeout || CLOSE_TIMEOUT)
|
||||
|
||||
server.close(callback)
|
||||
|
||||
server.once('close', () => {
|
||||
clearTimeout(timeout)
|
||||
})
|
||||
}
|
||||
|
||||
@ -121,3 +145,12 @@ function getIpfsId (ma) {
|
||||
return tuple[0] === IPFS_CODE
|
||||
})[0][1]
|
||||
}
|
||||
|
||||
function trackSocket (server, socket) {
|
||||
const key = `${socket.remoteAddress}:${socket.remotePort}`
|
||||
server.__connections[key] = socket
|
||||
|
||||
socket.on('close', () => {
|
||||
delete server.__connections[key]
|
||||
})
|
||||
}
|
||||
|
@ -12,7 +12,8 @@ describe('interface-transport compliance', () => {
|
||||
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')
|
||||
]
|
||||
cb(null, tcp, addrs)
|
||||
},
|
||||
|
@ -25,9 +25,11 @@ describe('filter addrs', () => {
|
||||
const ma4 = multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
|
||||
const ma5 = multiaddr(base + '/tcp/9090/http' + ipfs)
|
||||
const ma6 = multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
|
||||
const ma7 = multiaddr('/dns4/libp2p.io/tcp/9090')
|
||||
const ma8 = multiaddr('/dnsaddr/libp2p.io/tcp/9090')
|
||||
|
||||
const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6])
|
||||
expect(valid.length).to.equal(2)
|
||||
const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6, ma7, ma8])
|
||||
expect(valid.length).to.equal(4)
|
||||
expect(valid[0]).to.deep.equal(ma1)
|
||||
expect(valid[1]).to.deep.equal(ma4)
|
||||
})
|
||||
|
Reference in New Issue
Block a user