mirror of
https://github.com/fluencelabs/js-libp2p-tcp
synced 2025-07-01 23:01:44 +00:00
Compare commits
4 Commits
fix/p2p-pr
...
v0.13.1
Author | SHA1 | Date | |
---|---|---|---|
49c7f33375 | |||
89bceb461f | |||
44f9e32d07 | |||
c26cc70c65 |
53
.travis.yml
53
.travis.yml
@ -1,32 +1,35 @@
|
||||
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||
sudo: false
|
||||
language: node_js
|
||||
cache: npm
|
||||
sudo: false
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- node_js: 6
|
||||
env: CXX=g++-4.8
|
||||
- node_js: 8
|
||||
env: CXX=g++-4.8
|
||||
# - node_js: stable
|
||||
# env: CXX=g++-4.8
|
||||
stages:
|
||||
- check
|
||||
- test
|
||||
- cov
|
||||
|
||||
script:
|
||||
- npm run lint
|
||||
- npm run test
|
||||
- npm run coverage
|
||||
node_js:
|
||||
- '10'
|
||||
- '12'
|
||||
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
- windows
|
||||
|
||||
before_script:
|
||||
- export DISPLAY=:99.0
|
||||
- sh -e /etc/init.d/xvfb start
|
||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'; fi
|
||||
script: npx nyc -s npm run test:node -- --bail
|
||||
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
|
||||
|
||||
after_success:
|
||||
- npm run coverage-publish
|
||||
jobs:
|
||||
include:
|
||||
- stage: check
|
||||
os: linux
|
||||
script:
|
||||
- npx aegir build --bundlesize
|
||||
- npx aegir commitlint --travis
|
||||
- npx aegir dep-check
|
||||
- npm run lint
|
||||
|
||||
addons:
|
||||
firefox: 'latest'
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-4.8
|
||||
notifications:
|
||||
email: false
|
||||
|
@ -1,3 +1,8 @@
|
||||
<a name="0.13.1"></a>
|
||||
## [0.13.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.13.0...v0.13.1) (2019-08-08)
|
||||
|
||||
|
||||
|
||||
<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)
|
||||
|
||||
|
12
README.md
12
README.md
@ -1,13 +1,13 @@
|
||||
# js-libp2p-tcp
|
||||
|
||||
[](http://ipn.io)
|
||||
[](http://webchat.freenode.net/?channels=%23ipfs)
|
||||
[](https://travis-ci.org/libp2p/js-libp2p-tcp)
|
||||
[](https://coveralls.io/github/libp2p/js-libp2p-tcp?branch=master)
|
||||
[](http://protocol.ai)
|
||||
[](http://libp2p.io/)
|
||||
[](http://webchat.freenode.net/?channels=%23libp2p)
|
||||
[](https://discuss.libp2p.io)
|
||||
[](https://codecov.io/gh/libp2p/js-libp2p-tcp)
|
||||
[](https://travis-ci.com/libp2p/js-libp2p-tcp)
|
||||
[](https://david-dm.org/libp2p/js-libp2p-tcp)
|
||||
[](https://github.com/feross/standard)
|
||||

|
||||

|
||||
|
||||
[](https://github.com/libp2p/interface-transport)
|
||||
[](https://github.com/libp2p/interface-connection)
|
||||
|
29
appveyor.yml
29
appveyor.yml
@ -1,29 +0,0 @@
|
||||
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||
version: "{build}"
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- nodejs_version: "6"
|
||||
- nodejs_version: "8"
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
|
||||
install:
|
||||
# Install Node.js
|
||||
- ps: Install-Product node $env:nodejs_version
|
||||
|
||||
# Upgrade npm
|
||||
- npm install -g npm
|
||||
|
||||
# Output our current versions for debugging
|
||||
- node --version
|
||||
- npm --version
|
||||
|
||||
# Install our package dependencies
|
||||
- npm install
|
||||
|
||||
test_script:
|
||||
- npm run test:node
|
||||
|
||||
build: off
|
2
ci/Jenkinsfile
vendored
2
ci/Jenkinsfile
vendored
@ -1,2 +0,0 @@
|
||||
// Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||
javascript()
|
15
circle.yml
15
circle.yml
@ -1,15 +0,0 @@
|
||||
# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
|
||||
machine:
|
||||
node:
|
||||
version: stable
|
||||
|
||||
dependencies:
|
||||
pre:
|
||||
- google-chrome --version
|
||||
- curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
|
||||
- sudo dpkg -i google-chrome.deb || true
|
||||
- sudo apt-get update
|
||||
- sudo apt-get install -f
|
||||
- sudo apt-get install --only-upgrade lsb-base
|
||||
- sudo dpkg -i google-chrome.deb
|
||||
- google-chrome --version
|
26
package.json
26
package.json
@ -1,12 +1,13 @@
|
||||
{
|
||||
"name": "libp2p-tcp",
|
||||
"version": "0.13.0",
|
||||
"version": "0.13.1",
|
||||
"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",
|
||||
"scripts": {
|
||||
"lint": "aegir lint",
|
||||
"test": "aegir test -t node -f test/**/*.js",
|
||||
"test": "aegir test -t node",
|
||||
"test:node": "aegir test -t node",
|
||||
"release": "aegir release -t node --no-build",
|
||||
"release-minor": "aegir release -t node --type minor --no-build",
|
||||
"release-major": "aegir-release -t node --type major --no-build",
|
||||
@ -34,24 +35,23 @@
|
||||
"npm": ">=3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"aegir": "^17.1.1",
|
||||
"aegir": "^20.0.0",
|
||||
"chai": "^4.2.0",
|
||||
"dirty-chai": "^2.0.1",
|
||||
"interface-transport": "~0.3.6",
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"pull-stream": "^3.6.9"
|
||||
"pull-stream": "^3.6.14"
|
||||
},
|
||||
"dependencies": {
|
||||
"class-is": "^1.1.0",
|
||||
"debug": "^4.1.0",
|
||||
"interface-connection": "~0.3.2",
|
||||
"ip-address": "^5.8.9",
|
||||
"debug": "^4.1.1",
|
||||
"interface-connection": "~0.3.3",
|
||||
"ip-address": "^6.1.0",
|
||||
"lodash.includes": "^4.3.0",
|
||||
"lodash.isfunction": "^3.0.9",
|
||||
"mafmt": "^6.0.3",
|
||||
"multiaddr": "^6.0.1",
|
||||
"mafmt": "^6.0.7",
|
||||
"multiaddr": "^6.1.0",
|
||||
"once": "^1.4.0",
|
||||
"stream-to-pull-stream": "^1.7.2"
|
||||
"stream-to-pull-stream": "^1.7.3"
|
||||
},
|
||||
"contributors": [
|
||||
"Alan Shaw <alan@tableflip.io>",
|
||||
@ -65,10 +65,12 @@
|
||||
"Jacob Heun <jacobheun@gmail.com>",
|
||||
"Jacob Heun <jake@andyet.net>",
|
||||
"João Antunes <j.goncalo.antunes@gmail.com>",
|
||||
"Linus Unnebäck <linus@folkdatorn.se>",
|
||||
"Pedro Teixeira <i@pgte.me>",
|
||||
"Prashanth Chandra <coolshanth94@gmail.com>",
|
||||
"Richard Littauer <richard.littauer@gmail.com>",
|
||||
"Stephen Whitmore <stephen.whitmore@gmail.com>",
|
||||
"TomCoded <tomtinkerer@gmail.com>"
|
||||
"TomCoded <tomtinkerer@gmail.com>",
|
||||
"Vasco Santos <vasco.santos@moxy.studio>"
|
||||
]
|
||||
}
|
||||
|
@ -73,8 +73,8 @@ class TCP {
|
||||
return false
|
||||
}
|
||||
|
||||
if (ma.protoNames().includes('p2p')) {
|
||||
ma = ma.decapsulate('p2p')
|
||||
if (includes(ma.protoNames(), 'ipfs')) {
|
||||
ma = ma.decapsulate('ipfs')
|
||||
}
|
||||
|
||||
return mafmt.TCP.matches(ma)
|
||||
|
@ -12,7 +12,7 @@ const log = debug('libp2p:tcp:listen')
|
||||
|
||||
const getMultiaddr = require('./get-multiaddr')
|
||||
|
||||
const P2P_CODE = 421
|
||||
const IPFS_CODE = 421
|
||||
const CLOSE_TIMEOUT = 2000
|
||||
|
||||
function noop () {}
|
||||
@ -79,14 +79,14 @@ module.exports = (handler) => {
|
||||
})
|
||||
}
|
||||
|
||||
let p2pId
|
||||
let ipfsId
|
||||
let listeningAddr
|
||||
|
||||
listener.listen = (ma, callback) => {
|
||||
listeningAddr = ma
|
||||
if (includes(ma.protoNames(), 'p2p')) {
|
||||
p2pId = getp2pId(ma)
|
||||
listeningAddr = ma.decapsulate('p2p')
|
||||
if (includes(ma.protoNames(), 'ipfs')) {
|
||||
ipfsId = getIpfsId(ma)
|
||||
listeningAddr = ma.decapsulate('ipfs')
|
||||
}
|
||||
|
||||
const lOpts = listeningAddr.toOptions()
|
||||
@ -107,8 +107,8 @@ module.exports = (handler) => {
|
||||
if (listeningAddr.toString().indexOf('ip4') !== -1) {
|
||||
let m = listeningAddr.decapsulate('tcp')
|
||||
m = m.encapsulate('/tcp/' + address.port)
|
||||
if (p2pId) {
|
||||
m = m.encapsulate('/p2p/' + p2pId)
|
||||
if (ipfsId) {
|
||||
m = m.encapsulate('/ipfs/' + ipfsId)
|
||||
}
|
||||
|
||||
if (m.toString().indexOf('0.0.0.0') !== -1) {
|
||||
@ -127,8 +127,8 @@ module.exports = (handler) => {
|
||||
|
||||
if (address.family === 'IPv6') {
|
||||
let ma = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
|
||||
if (p2pId) {
|
||||
ma = ma.encapsulate('/p2p/' + p2pId)
|
||||
if (ipfsId) {
|
||||
ma = ma.encapsulate('/ipfs/' + ipfsId)
|
||||
}
|
||||
|
||||
multiaddrs.push(ma)
|
||||
@ -140,9 +140,9 @@ module.exports = (handler) => {
|
||||
return listener
|
||||
}
|
||||
|
||||
function getp2pId (ma) {
|
||||
function getIpfsId (ma) {
|
||||
return ma.stringTuples().filter((tuple) => {
|
||||
return tuple[0] === P2P_CODE
|
||||
return tuple[0] === IPFS_CODE
|
||||
})[0][1]
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user