fluencelabs/js-libp2p-tcp
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-tcp synced 2025-04-25 12:52:32 +00:00
Code Issues Projects Releases Wiki Activity

fix: add support for p2p protocol

Browse Source 
License: MIT
Signed-off-by: Jacob Heun <jacobheun@gmail.com>
This commit is contained in:
Jacob Heun 2018-12-17 18:18:55 +01:00
parent 3ab43a3604
commit 0d58e2bf5c
No known key found for this signature in database
GPG Key ID: CA5A94C15809879F
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -34,8 +34,8 @@
"npm": ">=3.0.0" "npm": ">=3.0.0"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^15.1.0", "aegir": "^17.1.1",
"chai": "^4.1.2", "chai": "^4.2.0",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"interface-transport": "~0.3.6", "interface-transport": "~0.3.6",
"lodash.isfunction": "^3.0.9", "lodash.isfunction": "^3.0.9",
@ -43,13 +43,13 @@
}, },
"dependencies": { "dependencies": {
"class-is": "^1.1.0", "class-is": "^1.1.0",
"debug": "^3.1.0", "debug": "^4.1.0",
"interface-connection": "~0.3.2", "interface-connection": "~0.3.2",
"ip-address": "^5.8.9", "ip-address": "^5.8.9",
"lodash.includes": "^4.3.0", "lodash.includes": "^4.3.0",
"lodash.isfunction": "^3.0.9", "lodash.isfunction": "^3.0.9",
"mafmt": "^6.0.2", "mafmt": "^6.0.3",
"multiaddr": "^5.0.0", "multiaddr": "^6.0.1",
"once": "^1.4.0", "once": "^1.4.0",
"stream-to-pull-stream": "^1.7.2" "stream-to-pull-stream": "^1.7.2"
}, },

4
src/index.js
View File

@ -73,8 +73,8 @@ class TCP {
return false return false
} }
if (includes(ma.protoNames(), 'ipfs')) { if (ma.protoNames().includes('p2p')) {
ma = ma.decapsulate('ipfs') ma = ma.decapsulate('p2p')
} }
return mafmt.TCP.matches(ma) return mafmt.TCP.matches(ma)

22
src/listener.js
View File

@ -12,7 +12,7 @@ const log = debug('libp2p:tcp:listen')
const getMultiaddr = require('./get-multiaddr') const getMultiaddr = require('./get-multiaddr')
const IPFS_CODE = 421 const P2P_CODE = 421
const CLOSE_TIMEOUT = 2000 const CLOSE_TIMEOUT = 2000
function noop () {} function noop () {}
@ -79,14 +79,14 @@ module.exports = (handler) => {
}) })
} }
let ipfsId let p2pId
let listeningAddr let listeningAddr
listener.listen = (ma, callback) => { listener.listen = (ma, callback) => {
listeningAddr = ma listeningAddr = ma
if (includes(ma.protoNames(), 'ipfs')) { if (includes(ma.protoNames(), 'p2p')) {
ipfsId = getIpfsId(ma) p2pId = getp2pId(ma)
listeningAddr = ma.decapsulate('ipfs') listeningAddr = ma.decapsulate('p2p')
} }
const lOpts = listeningAddr.toOptions() const lOpts = listeningAddr.toOptions()
@ -107,8 +107,8 @@ module.exports = (handler) => {
if (listeningAddr.toString().indexOf('ip4') !== -1) { if (listeningAddr.toString().indexOf('ip4') !== -1) {
let m = listeningAddr.decapsulate('tcp') let m = listeningAddr.decapsulate('tcp')
m = m.encapsulate('/tcp/' + address.port) m = m.encapsulate('/tcp/' + address.port)
if (ipfsId) { if (p2pId) {
m = m.encapsulate('/ipfs/' + ipfsId) m = m.encapsulate('/p2p/' + p2pId)
} }
if (m.toString().indexOf('0.0.0.0') !== -1) { if (m.toString().indexOf('0.0.0.0') !== -1) {
@ -127,8 +127,8 @@ module.exports = (handler) => {
if (address.family === 'IPv6') { if (address.family === 'IPv6') {
let ma = multiaddr('/ip6/' + address.address + '/tcp/' + address.port) let ma = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
if (ipfsId) { if (p2pId) {
ma = ma.encapsulate('/ipfs/' + ipfsId) ma = ma.encapsulate('/p2p/' + p2pId)
} }
multiaddrs.push(ma) multiaddrs.push(ma)
@ -140,9 +140,9 @@ module.exports = (handler) => {
return listener return listener
} }
function getIpfsId (ma) { function getp2pId (ma) {
return ma.stringTuples().filter((tuple) => { return ma.stringTuples().filter((tuple) => {
return tuple[0] === IPFS_CODE return tuple[0] === P2P_CODE
})[0][1] })[0][1]
} }