chore: release version v0.6.2

fix: destroy hanging connections after timeout

.gitignore

@@ -25,3 +25,6 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+lib
+dist

.npmignore

@@ -0,0 +1,29 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+
+test

.travis.yml

@@ -1,11 +1,25 @@
 sudo: false
 language: node_js
 node_js:
-  - "4.0"
+  - 4
+  - 5
+  - stable
 
 # Make sure we have new NPM.
 before_install:
   - npm install -g npm
 
 script:
+  - npm run lint
   - npm test
+  - npm run coverage
+
+addons:
+  firefox: 'latest'
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+after_success:
+  - npm run coverage-publish

circle.yml

@@ -1,8 +1,12 @@
-dependencies:
-  pre:
-    # setup ipv6
-    - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 net.ipv6.conf.default.disable_ipv6=0 net.ipv6.conf.all.disable_ipv6=0
-
 machine:
   node:
     version: stable
+
+dependencies:
+  pre:
+    - google-chrome --version
+    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo apt-get update
+    - sudo apt-get --only-upgrade install google-chrome-stable
+    - google-chrome --version

package.json

@@ -1,15 +1,18 @@
 {
   "name": "libp2p-tcp",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
-  "main": "src/index.js",
+  "main": "lib/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
-    "test:compliance:connection": "node tests/connection.js",
-    "test:compliance:transport": "node tests/transport.js",
-    "test:specific": "mocha tests/*-test.js",
-    "test": "npm run test:specific",
-    "test-2": "npm run test:specific && npm run test:compliance:transport && npm run test:compliance:connection",
-    "lint": "standard"
+    "lint": "aegir-lint",
+    "build": "aegir-build --env node",
+    "test": "aegir-test --env node",
+    "release": "aegir-release --env node",
+    "release-minor": "aegir-release --type minor --env node",
+    "release-major": "aegir-release --type major --env node",
+    "coverage": "aegir-coverage",
+    "coverage-publish": "aegir-coverage publish"
   },
   "pre-commit": [
     "lint",
@@ -29,18 +32,25 @@
   },
   "homepage": "https://github.com/diasdavid/js-libp2p-tcp",
   "devDependencies": {
+    "aegir": "^3.0.4",
     "chai": "^3.5.0",
     "interface-connection": "0.0.3",
     "interface-transport": "^0.1.1",
-    "istanbul": "^0.4.2",
-    "mocha": "^2.4.5",
     "pre-commit": "^1.1.2",
-    "standard": "^6.0.7",
-    "tape": "^4.2.0"
+    "tape": "^4.5.1"
   },
   "dependencies": {
     "ip-address": "^5.8.0",
-    "mafmt": "^1.0.1",
-    "multiaddr": "^1.1.1"
-  }
-}
+    "lodash.contains": "^2.4.3",
+    "mafmt": "^2.1.0",
+    "multiaddr": "^2.0.2",
+    "run-parallel": "^1.1.6"
+  },
+  "contributors": [
+    "David Dias <daviddias.p@gmail.com>",
+    "João Antunes <j.goncalo.antunes@gmail.com>",
+    "Richard Littauer <richard.littauer@gmail.com>",
+    "Stephen Whitmore <stephen.whitmore@gmail.com>",
+    "dignifiedquire <dignifiedquire@gmail.com>"
+  ]
+}

src/index.js

@@ -1,12 +1,19 @@
+'use strict'
+
 const debug = require('debug')
 const log = debug('libp2p:tcp')
 const tcp = require('net')
 const multiaddr = require('multiaddr')
 const Address6 = require('ip-address').Address6
 const mafmt = require('mafmt')
+const parallel = require('run-parallel')
+const contains = require('lodash.contains')
 
 exports = module.exports = TCP
 
+const IPFS_CODE = 421
+const CLOSE_TIMEOUT = 300
+
 function TCP () {
   if (!(this instanceof TCP)) {
     return new TCP()
@@ -31,49 +38,82 @@ function TCP () {
       multiaddrs = [multiaddrs]
     }
 
-    var count = 0
     const freshMultiaddrs = []
 
-    multiaddrs.forEach((m) => {
+    parallel(multiaddrs.map((m) => (cb) => {
+      let ipfsHashId
+      if (contains(m.protoNames(), 'ipfs')) {
+        ipfsHashId = m.stringTuples().filter((tuple) => {
+          if (tuple[0] === IPFS_CODE) {
+            return true
+          }
+        })[0][1]
+        m = m.decapsulate('ipfs')
+      }
+
       const listener = tcp.createServer((conn) => {
         conn.getObservedAddrs = () => {
           return [getMultiaddr(conn)]
         }
         handler(conn)
       })
+
+      listener.__connections = {}
+      listener.on('connection', (conn) => {
+        const key = `${conn.remoteAddress}:${conn.remotePort}`
+        listener.__connections[key] = conn
+
+        conn.on('close', () => {
+          delete listener.__connections[key]
+        })
+      })
+
       listener.listen(m.toOptions(), () => {
         // Node.js likes to convert addr to IPv6 (when 0.0.0.0 for e.g)
         const address = listener.address()
         if (m.toString().indexOf('ip4')) {
           m = m.decapsulate('tcp')
           m = m.encapsulate('/tcp/' + address.port)
+          if (ipfsHashId) {
+            m = m.encapsulate('/ipfs/' + ipfsHashId)
+          }
           freshMultiaddrs.push(m)
         }
+
         if (address.family === 'IPv6') {
-          freshMultiaddrs.push(multiaddr('/ip6/' + address.address + '/tcp/' + address.port))
+          let mh = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
+          if (ipfsHashId) {
+            mh = mh.encapsulate('/ipfs/' + ipfsHashId)
+          }
+
+          freshMultiaddrs.push(mh)
         }
 
-        if (++count === multiaddrs.length) {
-          callback(null, freshMultiaddrs)
-        }
+        cb()
       })
       listeners.push(listener)
+    }), (err) => {
+      callback(err, freshMultiaddrs)
     })
   }
 
   this.close = (callback) => {
+    log('closing')
     if (listeners.length === 0) {
       log('Called close with no active listeners')
       return callback()
     }
-    var count = 0
-    listeners.forEach((listener) => {
-      listener.close(() => {
-        if (++count === listeners.length && callback) {
-          callback()
-        }
-      })
-    })
+
+    parallel(listeners.map((listener) => (cb) => {
+      setTimeout(() => {
+        Object.keys(listener.__connections).forEach((key) => {
+          log('destroying %s', key)
+          listener.__connections[key].destroy()
+        })
+      }, CLOSE_TIMEOUT)
+
+      listener.close(cb)
+    }), callback)
   }
 
   this.filter = (multiaddrs) => {
@@ -81,6 +121,9 @@ function TCP () {
       multiaddrs = [multiaddrs]
     }
     return multiaddrs.filter((ma) => {
+      if (contains(ma.protoNames(), 'ipfs')) {
+        ma = ma.decapsulate('ipfs')
+      }
       return mafmt.TCP.matches(ma)
     })
   }

test/index.spec.js

@@ -1,4 +1,5 @@
 /* eslint-env mocha */
+'use strict'
 
 const expect = require('chai').expect
 const TCPlibp2p = require('../src')
@@ -36,12 +37,30 @@ describe('libp2p-tcp', function () {
       tcp.close(() => {
         done()
       })
-    }, () => {
+    }, (err, freshMultiaddrs) => {
+      expect(err).to.not.exist
+      expect(mh).to.deep.equal(freshMultiaddrs[0])
       const socket = net.connect({ host: '127.0.0.1', port: 9090 })
       socket.end()
     })
   })
 
+  it('listen on addr with /ipfs/QmHASH', (done) => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/14090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    tcp.createListener(mh, (socket) => {
+      expect(socket).to.exist
+      socket.end()
+      tcp.close(() => {
+        done()
+      })
+    }, (err, freshMultiaddrs) => {
+      expect(err).to.not.exist
+      expect(mh).to.deep.equal(freshMultiaddrs[0])
+      const socket = net.connect({ host: '127.0.0.1', port: 14090 })
+      socket.end()
+    })
+  })
+
   it('dial', (done) => {
     const server = net.createServer((socket) => {
       expect(socket).to.exist
@@ -113,9 +132,10 @@ describe('libp2p-tcp', function () {
     const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
     const mh2 = multiaddr('/ip4/127.0.0.1/udp/9090')
     const mh3 = multiaddr('/ip4/127.0.0.1/tcp/9090/http')
+    const mh4 = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
-    const valid = tcp.filter([mh1, mh2, mh3])
-    expect(valid.length).to.equal(1)
+    const valid = tcp.filter([mh1, mh2, mh3, mh4])
+    expect(valid.length).to.equal(2)
     expect(valid[0]).to.deep.equal(mh1)
     done()
   })
@@ -128,4 +148,35 @@ describe('libp2p-tcp', function () {
     expect(valid[0]).to.deep.equal(mh1)
     done()
   })
+
+  it('destroys after timeout', (done) => {
+    const server = new TCPlibp2p()
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
+    server.createListener(mh, (conn) => {
+      const i = setInterval(() => {
+        conn.read()
+        conn.write('hi\n')
+      }, 100)
+      i.unref()
+    }, () => {
+      let connected = 0
+      const connectHandler = () => {
+        connected++
+        if (connected === 10) {
+          setTimeout(() => {
+            server.close(done)
+          }, 1)
+        }
+      }
+      const errorHandler = () => {}
+
+      for (let i = 0; i < 10; i++) {
+        const client = net.connect(9090)
+        client.on('connect', connectHandler)
+
+        // just ignore the resets
+        client.on('error', errorHandler)
+      }
+    })
+  })
 })

test/interface-transport.spec.js

@@ -0,0 +1,23 @@
+/* eslint-env mocha */
+'use strict'
+
+const tape = require('tape')
+const tests = require('interface-transport/tests')
+const TCP = require('../src')
+
+// Not adhering to this interface anymore!
+describe.skip('interface-transport', () => {
+  it('works', (done) => {
+    const common = {
+      setup (t, cb) {
+        cb(null, new TCP())
+      },
+      teardown (t, cb) {
+        cb()
+      }
+    }
+
+    tape.onFinish(done)
+    tests(tape, common)
+  })
+})

tests/transport.js

@@ -1,14 +0,0 @@
-var tape = require('tape')
-var tests = require('interface-transport/tests')
-var conn = require('../src')
-
-var common = {
-  setup: function (t, cb) {
-    cb(null, conn)
-  },
-  teardown: function (t, cb) {
-    cb()
-  }
-}
-
-tests(tape, common)