fluencelabs/js-libp2p-tcp
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-tcp synced 2025-07-04 20:01:49 +00:00
Code Issues Projects Releases Wiki Activity

feat: add path multiaddr support (#118)

Browse Source 
* chore: update deps
* test: skip paths on windows
This commit is contained in:
Jacob Heun
2019-12-06 09:42:43 +01:00
committed by GitHub
parent 7702646cfa
commit d76a1f27e7
7 changed files with 126 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/listener.js
View File

@ -1,13 +1,14 @@
'use strict'
const multiaddr = require('multiaddr')
const os = require('os')
const net = require('net')
const EventEmitter = require('events')
const log = require('debug')('libp2p:tcp:listener')
const toConnection = require('./socket-to-conn')
const { CODE_P2P } = require('./constants')
const ProtoFamily = { ip4: 'IPv4', ip6: 'IPv6' }
const {
getMultiaddrs,
multiaddrToNetConfig
} = require('./utils')
module.exports = ({ handler, upgrader }, options) => {
const listener = new EventEmitter()
@ -16,7 +17,7 @@ module.exports = ({ handler, upgrader }, options) => {
// Avoid uncaught errors caused by unstable connections
socket.on('error', err => log('socket error', err))
const maConn = toConnection(socket)
const maConn = toConnection(socket, { listeningAddr })
log('new inbound connection %s', maConn.remoteAddr)
const conn = await upgrader.upgradeInbound(maConn)
@ -56,8 +57,8 @@ module.exports = ({ handler, upgrader }, options) => {
}
return new Promise((resolve, reject) => {
const { host, port } = listeningAddr.toOptions()
server.listen(port, host, err => {
const options = multiaddrToNetConfig(listeningAddr)
server.listen(options, err => {
if (err) return reject(err)
log('Listening on %s', server.address())
resolve()
@ -76,9 +77,9 @@ module.exports = ({ handler, upgrader }, options) => {
// Because TCP will only return the IPv6 version
// we need to capture from the passed multiaddr
if (listeningAddr.toString().startsWith('/ip4')) {
addrs = addrs.concat(getMulitaddrs('ip4', address.address, address.port))
addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port))
} else if (address.family === 'IPv6') {
addrs = addrs.concat(getMulitaddrs('ip6', address.address, address.port))
addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port))
}
return addrs.map(ma => peerId ? ma.encapsulate(`/p2p/${peerId}`) : ma)
@ -87,30 +88,6 @@ module.exports = ({ handler, upgrader }, options) => {
return listener
}
function getMulitaddrs (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
}, [])
}
function trackConn (server, maConn) {
server.__connections.push(maConn)