chore: release version v0.11.3

* test: do not run IPv6 tests on CI

* Updating CI files (#83)

This commit updates all CI scripts to the latest version

* chore: use env variable instead

* skip the other IPv6 tests

.gitignore

@@ -1,3 +1,4 @@
+docs
 **/node_modules/
 **/*.log
 test/repo-tests*

.travis.yml

@@ -1,3 +1,4 @@
+# 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
 
@@ -14,7 +15,6 @@ script:
   - npm run lint
   - npm run test
   - npm run coverage
-  - make test
 
 before_script:
   - export DISPLAY=:99.0

CHANGELOG.md

@@ -1,3 +1,23 @@
+<a name="0.11.3"></a>
+## [0.11.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.2...v0.11.3) (2018-02-07)
+
+
+### Bug Fixes
+
+* clearing timeout when closes ([#87](https://github.com/libp2p/js-libp2p-tcp/issues/87)) ([f8f5266](https://github.com/libp2p/js-libp2p-tcp/commit/f8f5266))
+
+
+
+<a name="0.11.2"></a>
+## [0.11.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.1...v0.11.2) (2018-01-12)
+
+
+### Bug Fixes
+
+* missing dependency debug, fixes [#84](https://github.com/libp2p/js-libp2p-tcp/issues/84) ([74a88f6](https://github.com/libp2p/js-libp2p-tcp/commit/74a88f6))
+
+
+
 <a name="0.11.1"></a>
 ## [0.11.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.0...v0.11.1) (2017-10-13)
 

appveyor.yml

@@ -0,0 +1,29 @@
+# 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

ci/Jenkinsfile

@@ -0,0 +1,2 @@
+// 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()

circle.yml

@@ -1,3 +1,4 @@
+# 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
@@ -6,12 +7,8 @@ dependencies:
   pre:
     - google-chrome --version
     - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb
     - sudo dpkg -i google-chrome.deb || true
-    - sudo dpkg -i libnss3*.deb || true
     - sudo apt-get update
-    - sudo apt-get install -f || true
-    - sudo dpkg -i libnss3*.deb
     - sudo apt-get install -f
     - sudo apt-get install --only-upgrade lsb-base
     - sudo dpkg -i google-chrome.deb

package.json

@@ -1,18 +1,18 @@
 {
   "name": "libp2p-tcp",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
   "main": "src/index.js",
   "scripts": {
     "lint": "aegir lint",
-    "test": "aegir test --target node",
-    "release": "aegir release --no-build",
-    "release-minor": "aegir release --type minor --no-build",
-    "release-major": "aegir-release --type major --no-build",
+    "test": "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",
     "coverage": "aegir coverage",
     "coverage-publish": "aegir coverage --provider coveralls"
   },
-  "pre-commit": [
+  "pre-push": [
     "lint",
     "test"
   ],
@@ -34,31 +34,34 @@
     "npm": ">=3.0.0"
   },
   "devDependencies": {
-    "aegir": "^12.0.8",
+    "aegir": "^12.4.0",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "interface-transport": "~0.3.5",
-    "lodash.isfunction": "^3.0.8",
+    "lodash.isfunction": "^3.0.9",
     "pre-commit": "^1.2.2",
     "pull-stream": "^3.6.1"
   },
   "dependencies": {
+    "debug": "^3.1.0",
     "interface-connection": "~0.3.2",
-    "ip-address": "^5.8.8",
+    "ip-address": "^5.8.9",
     "lodash.includes": "^4.3.0",
-    "lodash.isfunction": "^3.0.8",
-    "mafmt": "^3.0.1",
-    "multiaddr": "^3.0.1",
+    "lodash.isfunction": "^3.0.9",
+    "mafmt": "^3.0.2",
+    "multiaddr": "^3.0.2",
     "once": "^1.4.0",
     "stream-to-pull-stream": "^1.7.2"
   },
   "contributors": [
+    "Alan Shaw <alan@tableflip.io>",
     "David Dias <daviddias.p@gmail.com>",
     "Dmitriy Ryajov <dryajov@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>",
+    "Pedro Teixeira <i@pgte.me>",
     "Prashanth Chandra <coolshanth94@gmail.com>",
     "Richard Littauer <richard.littauer@gmail.com>",
     "Stephen Whitmore <stephen.whitmore@gmail.com>"

src/listener.js

@@ -55,23 +55,19 @@ module.exports = (handler) => {
     callback = callback || noop
     options = options || {}
 
-    let closed = false
-    server.close(callback)
-
-    server.once('close', () => {
-      closed = true
-    })
-    setTimeout(() => {
-      if (closed) {
-        return
-      }
-
+    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)
+    })
   }
 
   let ipfsId

test/index.spec.js

@@ -10,6 +10,7 @@ const TCP = require('../src')
 const net = require('net')
 const multiaddr = require('multiaddr')
 const Connection = require('interface-connection').Connection
+const isCI = process.env.CI
 
 describe('instantiate the transport', () => {
   it('create', () => {
@@ -54,6 +55,7 @@ describe('listen', () => {
   })
 
   it('listen on IPv6 addr', (done) => {
+    if (isCI) { return done() }
     const mh = multiaddr('/ip6/::/tcp/9090')
     const listener = tcp.createListener((conn) => {})
     listener.listen(mh, () => {
@@ -179,6 +181,8 @@ describe('dial', () => {
   })
 
   it('dial on IPv6', (done) => {
+    if (isCI) { return done() }
+
     const ma = multiaddr('/ip6/::/tcp/9066')
     const listener = tcp.createListener((conn) => {
       pull(conn, conn)
@@ -198,8 +202,8 @@ describe('dial', () => {
     })
   })
 
+  // TODO: figure out why is this failing
   it.skip('dial and destroy on listener', (done) => {
-    // TODO: why is this failing
     let count = 0
     const closed = ++count === 2 ? finish() : null
 
@@ -223,6 +227,8 @@ describe('dial', () => {
   })
 
   it('dial and destroy on dialer', (done) => {
+    if (isCI) { return done() }
+
     let count = 0
     const destroyed = () => ++count === 2 ? finish() : null