bump dependencies 2

Get interfaces only once per run

.gitignore

@@ -1,46 +1,5 @@
-docs
-**/node_modules/
-**/*.log
-test/repo-tests*
-**/bundle.js
-
-# yarn
-yarn.lock
-
-# Logs
-logs
-*.log
-
-coverage
-
-# 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
-
-build
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
-
-lib
-dist
-test/test-data/go-ipfs-repo/LOCK
-test/test-data/go-ipfs-repo/LOG
-test/test-data/go-ipfs-repo/LOG.old
-
-# while testing npm5
 package-lock.json
+coverage
+.nyc_output
+docs

.travis.yml

@@ -18,6 +18,7 @@ os:
 
 before_script:
   - 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
 
@@ -26,8 +27,6 @@ jobs:
     - stage: check
       os: linux
       script:
-        - npx aegir build --bundlesize
-        - npx aegir commitlint --travis
         - npx aegir dep-check
         - npm run lint
 

CHANGELOG.md

@@ -1,3 +1,143 @@
+<a name="0.15.3"></a>
+## [0.15.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.15.2...v0.15.3) (2021-02-03)
+
+
+### Bug Fixes
+
+* hanging close promise ([#140](https://github.com/libp2p/js-libp2p-tcp/issues/140)) ([3813100](https://github.com/libp2p/js-libp2p-tcp/commit/3813100))
+
+
+
+<a name="0.15.2"></a>
+## [0.15.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.2...v0.15.2) (2020-12-28)
+
+
+### Bug Fixes
+
+* catch error from maConn.close ([#128](https://github.com/libp2p/js-libp2p-tcp/issues/128)) ([0fe0815](https://github.com/libp2p/js-libp2p-tcp/commit/0fe0815))
+* catch thrown maConn errors in listener ([#122](https://github.com/libp2p/js-libp2p-tcp/issues/122)) ([86db568](https://github.com/libp2p/js-libp2p-tcp/commit/86db568)), closes [#121](https://github.com/libp2p/js-libp2p-tcp/issues/121)
+* intermittent error when asking for interfaces ([#137](https://github.com/libp2p/js-libp2p-tcp/issues/137)) ([af9804e](https://github.com/libp2p/js-libp2p-tcp/commit/af9804e))
+* remove use of assert module ([#123](https://github.com/libp2p/js-libp2p-tcp/issues/123)) ([6272876](https://github.com/libp2p/js-libp2p-tcp/commit/6272876))
+* transport should not handle connection if upgradeInbound throws ([#119](https://github.com/libp2p/js-libp2p-tcp/issues/119)) ([21f8747](https://github.com/libp2p/js-libp2p-tcp/commit/21f8747))
+
+
+### Chores
+
+* update deps ([#134](https://github.com/libp2p/js-libp2p-tcp/issues/134)) ([d9f9912](https://github.com/libp2p/js-libp2p-tcp/commit/d9f9912))
+
+
+### BREAKING CHANGES
+
+* - The multiaddr dep used by this module returns Uint8Arrays and may
+  not be compatible with previous versions
+
+* chore: update utils
+
+* chore: remove gh dep url
+
+
+
+<a name="0.15.1"></a>
+## [0.15.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.15.0...v0.15.1) (2020-08-11)
+
+
+
+<a name="0.15.0"></a>
+# [0.15.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.6...v0.15.0) (2020-08-07)
+
+
+### Chores
+
+* update deps ([#134](https://github.com/libp2p/js-libp2p-tcp/issues/134)) ([d9f9912](https://github.com/libp2p/js-libp2p-tcp/commit/d9f9912))
+
+
+### BREAKING CHANGES
+
+* - The multiaddr dep used by this module returns Uint8Arrays and may
+  not be compatible with previous versions
+
+* chore: update utils
+
+* chore: remove gh dep url
+
+
+
+<a name="0.14.6"></a>
+## [0.14.6](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.5...v0.14.6) (2020-07-17)
+
+
+
+<a name="0.14.5"></a>
+## [0.14.5](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.4...v0.14.5) (2020-04-28)
+
+
+### Bug Fixes
+
+* catch error from maConn.close ([#128](https://github.com/libp2p/js-libp2p-tcp/issues/128)) ([0fe0815](https://github.com/libp2p/js-libp2p-tcp/commit/0fe0815))
+
+
+
+<a name="0.14.4"></a>
+## [0.14.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.3...v0.14.4) (2020-02-24)
+
+
+### Bug Fixes
+
+* catch thrown maConn errors in listener ([#122](https://github.com/libp2p/js-libp2p-tcp/issues/122)) ([86db568](https://github.com/libp2p/js-libp2p-tcp/commit/86db568)), closes [#121](https://github.com/libp2p/js-libp2p-tcp/issues/121)
+* remove use of assert module ([#123](https://github.com/libp2p/js-libp2p-tcp/issues/123)) ([6272876](https://github.com/libp2p/js-libp2p-tcp/commit/6272876))
+
+
+
+<a name="0.14.3"></a>
+## [0.14.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.2...v0.14.3) (2019-12-20)
+
+
+### Bug Fixes
+
+* transport should not handle connection if upgradeInbound throws ([#119](https://github.com/libp2p/js-libp2p-tcp/issues/119)) ([21f8747](https://github.com/libp2p/js-libp2p-tcp/commit/21f8747))
+
+
+
+<a name="0.14.2"></a>
+## [0.14.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.1...v0.14.2) (2019-12-06)
+
+
+### Bug Fixes
+
+* **log:** log the bound port and host ([#117](https://github.com/libp2p/js-libp2p-tcp/issues/117)) ([7702646](https://github.com/libp2p/js-libp2p-tcp/commit/7702646))
+
+
+### Features
+
+* add path multiaddr support ([#118](https://github.com/libp2p/js-libp2p-tcp/issues/118)) ([d76a1f2](https://github.com/libp2p/js-libp2p-tcp/commit/d76a1f2))
+
+
+
+<a name="0.14.1"></a>
+## [0.14.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.14.0...v0.14.1) (2019-09-20)
+
+
+### Bug Fixes
+
+* ensure timeline.close is set ([#113](https://github.com/libp2p/js-libp2p-tcp/issues/113)) ([605ee27](https://github.com/libp2p/js-libp2p-tcp/commit/605ee27))
+
+
+
+<a name="0.14.0"></a>
+# [0.14.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.13.1...v0.14.0) (2019-09-16)
+
+
+### Features
+
+* change api to async / await ([#112](https://github.com/libp2p/js-libp2p-tcp/issues/112)) ([cf7d1b8](https://github.com/libp2p/js-libp2p-tcp/commit/cf7d1b8))
+
+
+### BREAKING CHANGES
+
+* All places in the API that used callbacks are now replaced with async/await. The API has also been updated according to the latest `interface-transport` version, https://github.com/libp2p/interface-transport/tree/v0.6.0#api.
+
+
+
 <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)
 

README.md

@@ -9,11 +9,11 @@
 [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
 
-[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
-[![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)](https://github.com/libp2p/interface-connection)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/transport/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/connection/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/connection)
 
 
-> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/interface-connection) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other different transports.
+> JavaScript implementation of the TCP module for libp2p. It exposes the [interface-transport](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport) for dial/listen. `libp2p-tcp` is a very thin shim that adds support for dialing to a `multiaddr`. This small shim will enable libp2p to use other transports.
 
 ## Lead Maintainer
 
@@ -41,37 +41,38 @@
 ```js
 const TCP = require('libp2p-tcp')
 const multiaddr = require('multiaddr')
-const pull = require('pull-stream')
+const pipe = require('it-pipe')
+const { collect } = require('streaming-iterables')
 
-const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
+// A simple upgrader that just returns the MultiaddrConnection
+const upgrader = {
+  upgradeInbound: maConn => maConn,
+  upgradeOutbound: maConn => maConn
+}
 
-const tcp = new TCP()
+const tcp = new TCP({ upgrader })
 
 const listener = tcp.createListener((socket) => {
   console.log('new connection opened')
-  pull(
-    pull.values(['hello']),
+  pipe(
+    ['hello'],
     socket
   )
 })
 
-listener.listen(mh, () => {
-  console.log('listening')
+const addr = multiaddr('/ip4/127.0.0.1/tcp/9090')
+await listener.listen(addr)
+console.log('listening')
 
-  pull(
-    tcp.dial(mh),
-    pull.collect((err, values) => {
-      if (!err) {
-        console.log(`Value: ${values.toString()}`)
-      } else {
-        console.log(`Error: ${err}`)
-      }
+const socket = await tcp.dial(addr)
+const values = await pipe(
+  socket,
+  collect
+)
+console.log(`Value: ${values.toString()}`)
 
-      // Close connection after reading
-      listener.close()
-    }),
-  )
-})
+// Close connection after reading
+await listener.close()
 ```
 
 Outputs:
@@ -86,18 +87,19 @@ Value: hello
 
 ### Transport
 
-[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/transport/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/transport)
 
-`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:
+`libp2p-tcp` accepts TCP addresses as both IPFS and non IPFS encapsulated addresses, i.e:
 
 `/ip4/127.0.0.1/tcp/4001`
 `/ip4/127.0.0.1/tcp/4001/ipfs/QmHash`
 
-Both for dialing and listening.
+(both for dialing and listening)
 
 ### Connection
 
-[![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)](https://github.com/libp2p/interface-connection)
+[![](https://raw.githubusercontent.com/libp2p/js-libp2p-interfaces/master/src/connection/img/badge.png)](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/connection)
+
 
 ## Contribute
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p-tcp",
-  "version": "0.13.1",
+  "version": "0.15.3",
   "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",
@@ -11,12 +11,10 @@
     "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"
+    "coverage": "nyc --reporter=text --reporter=lcov npm run test:node"
   },
   "pre-push": [
-    "lint",
-    "test"
+    "lint"
   ],
   "repository": {
     "type": "git",
@@ -35,42 +33,41 @@
     "npm": ">=3.0.0"
   },
   "devDependencies": {
-    "aegir": "^20.0.0",
-    "chai": "^4.2.0",
-    "dirty-chai": "^2.0.1",
-    "interface-transport": "~0.3.6",
-    "pull-stream": "^3.6.14"
+    "aegir": "^25.0.0",
+    "it-pipe": "^1.1.0",
+    "libp2p-interfaces": "fluencelabs/js-libp2p-interfaces",
+    "sinon": "^9.0.0",
+    "streaming-iterables": "^5.0.2"
   },
   "dependencies": {
+    "abortable-iterator": "^3.0.0",
     "class-is": "^1.1.0",
     "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.7",
-    "multiaddr": "^6.1.0",
-    "once": "^1.4.0",
-    "stream-to-pull-stream": "^1.7.3"
+    "err-code": "^2.0.0",
+    "libp2p-utils": "fluencelabs/js-libp2p-utils",
+    "mafmt": "fluencelabs/js-mafmt",
+    "multiaddr": "^9.0.1",
+    "stream-to-it": "^0.2.2"
   },
   "contributors": [
-    "Alan Shaw <alan@tableflip.io>",
     "David Dias <daviddias.p@gmail.com>",
+    "Jacob Heun <jacobheun@gmail.com>",
+    "Stephen Whitmore <stephen.whitmore@gmail.com>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
+    "Vasco Santos <vasco.santos@moxy.studio>",
+    "Alex Potsides <alex@achingbrain.net>",
+    "Richard Littauer <richard.littauer@gmail.com>",
+    "Tom White <tomtinkerer@gmail.com>",
+    "Alan Shaw <alan@tableflip.io>",
+    "Pedro Teixeira <i@pgte.me>",
+    "Prashanth Chandra <coolshanth94@gmail.com>",
+    "João Antunes <j.goncalo.antunes@gmail.com>",
+    "Cayman <caymannava@gmail.com>",
     "Diogo Silva <fsdiogo@gmail.com>",
     "Dmitriy Ryajov <dryajov@gmail.com>",
     "Drew Stone <drewstone329@gmail.com>",
     "Evan Schwartz <evan.mark.schwartz@gmail.com>",
-    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
-    "Greenkeeper <support@greenkeeper.io>",
-    "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>",
-    "Vasco Santos <vasco.santos@moxy.studio>"
+    "Mikeal Rogers <mikeal.rogers@gmail.com>"
   ]
 }

src/constants.js

@@ -0,0 +1,8 @@
+'use strict'
+
+// p2p multi-address code
+exports.CODE_P2P = 421
+exports.CODE_CIRCUIT = 290
+
+// Time to wait for a connection to close gracefully before destroying it manually
+exports.CLOSE_TIMEOUT = 2000

src/get-multiaddr.js

@@ -1,33 +0,0 @@
-'use strict'
-
-const multiaddr = require('multiaddr')
-const Address6 = require('ip-address').Address6
-const debug = require('debug')
-const log = debug('libp2p:tcp:get-multiaddr')
-
-module.exports = (socket) => {
-  let ma
-
-  try {
-    if (socket.remoteFamily === 'IPv6') {
-      const addr = new Address6(socket.remoteAddress)
-
-      if (addr.v4) {
-        const ip4 = addr.to4().correctForm()
-        ma = multiaddr('/ip4/' + ip4 +
-          '/tcp/' + socket.remotePort
-        )
-      } else {
-        ma = multiaddr('/ip6/' + socket.remoteAddress +
-          '/tcp/' + socket.remotePort
-        )
-      }
-    } else {
-      ma = multiaddr('/ip4/' + socket.remoteAddress +
-        '/tcp/' + socket.remotePort)
-    }
-  } catch (err) {
-    log(err)
-  }
-  return ma
-}

src/index.js

@@ -1,83 +1,139 @@
 'use strict'
 
 const net = require('net')
-const toPull = require('stream-to-pull-stream')
 const mafmt = require('mafmt')
 const withIs = require('class-is')
-const includes = require('lodash.includes')
-const isFunction = require('lodash.isfunction')
-const Connection = require('interface-connection').Connection
-const once = require('once')
-const debug = require('debug')
-const log = debug('libp2p:tcp:dial')
-
+const errCode = require('err-code')
+const log = require('debug')('libp2p:tcp')
+const toConnection = require('./socket-to-conn')
 const createListener = require('./listener')
+const { multiaddrToNetConfig } = require('./utils')
+const { AbortError } = require('abortable-iterator')
+const { CODE_CIRCUIT, CODE_P2P } = require('./constants')
 
-function noop () {}
-
+/**
+ * @class TCP
+ */
 class TCP {
-  dial (ma, options, callback) {
-    if (isFunction(options)) {
-      callback = options
-      options = {}
-    }
-
-    callback = once(callback || noop)
-
-    const cOpts = ma.toOptions()
-    log('Connecting to %s %s', cOpts.port, cOpts.host)
-
-    const rawSocket = net.connect(cOpts)
-
-    rawSocket.once('timeout', () => {
-      log('timeout')
-      rawSocket.emit('error', new Error('Timeout'))
-    })
-
-    rawSocket.once('error', callback)
-
-    rawSocket.once('connect', () => {
-      rawSocket.removeListener('error', callback)
-      callback()
-    })
-
-    const socket = toPull.duplex(rawSocket)
-
-    const conn = new Connection(socket)
-
-    conn.getObservedAddrs = (callback) => {
-      return callback(null, [ma])
+  /**
+   * @constructor
+   * @param {object} options
+   * @param {Upgrader} options.upgrader
+   */
+  constructor ({ upgrader }) {
+    if (!upgrader) {
+      throw new Error('An upgrader must be provided. See https://github.com/libp2p/interface-transport#upgrader.')
     }
+    this._upgrader = upgrader
+  }
 
+  /**
+   * @async
+   * @param {Multiaddr} ma
+   * @param {object} options
+   * @param {AbortSignal} options.signal Used to abort dial requests
+   * @returns {Connection} An upgraded Connection
+   */
+  async dial (ma, options) {
+    options = options || {}
+    const socket = await this._connect(ma, options)
+    const maConn = toConnection(socket, { remoteAddr: ma, signal: options.signal })
+    log('new outbound connection %s', maConn.remoteAddr)
+    const conn = await this._upgrader.upgradeOutbound(maConn)
+    log('outbound connection %s upgraded', maConn.remoteAddr)
     return conn
   }
 
+  /**
+   * @private
+   * @param {Multiaddr} ma
+   * @param {object} options
+   * @param {AbortSignal} options.signal Used to abort dial requests
+   * @returns {Promise<Socket>} Resolves a TCP Socket
+   */
+  _connect (ma, options = {}) {
+    if (options.signal && options.signal.aborted) {
+      throw new AbortError()
+    }
+
+    return new Promise((resolve, reject) => {
+      const start = Date.now()
+      const cOpts = multiaddrToNetConfig(ma)
+
+      log('dialing %j', cOpts)
+      const rawSocket = net.connect(cOpts)
+
+      const onError = err => {
+        err.message = `connection error ${cOpts.host}:${cOpts.port}: ${err.message}`
+        done(err)
+      }
+
+      const onTimeout = () => {
+        log('connnection timeout %s:%s', cOpts.host, cOpts.port)
+        const err = errCode(new Error(`connection timeout after ${Date.now() - start}ms`), 'ERR_CONNECT_TIMEOUT')
+        // Note: this will result in onError() being called
+        rawSocket.emit('error', err)
+      }
+
+      const onConnect = () => {
+        log('connection opened %j', cOpts)
+        done()
+      }
+
+      const onAbort = () => {
+        log('connection aborted %j', cOpts)
+        rawSocket.destroy()
+        done(new AbortError())
+      }
+
+      const done = err => {
+        rawSocket.removeListener('error', onError)
+        rawSocket.removeListener('timeout', onTimeout)
+        rawSocket.removeListener('connect', onConnect)
+        options.signal && options.signal.removeEventListener('abort', onAbort)
+
+        if (err) return reject(err)
+        resolve(rawSocket)
+      }
+
+      rawSocket.on('error', onError)
+      rawSocket.on('timeout', onTimeout)
+      rawSocket.on('connect', onConnect)
+      options.signal && options.signal.addEventListener('abort', onAbort)
+    })
+  }
+
+  /**
+   * Creates a TCP listener. The provided `handler` function will be called
+   * anytime a new incoming Connection has been successfully upgraded via
+   * `upgrader.upgradeInbound`.
+   * @param {*} [options]
+   * @param {function(Connection)} handler
+   * @returns {Listener} A TCP listener
+   */
   createListener (options, handler) {
-    if (isFunction(options)) {
+    if (typeof options === 'function') {
       handler = options
       options = {}
     }
-
-    handler = handler || noop
-
-    return createListener(handler)
+    options = options || {}
+    return createListener({ handler, upgrader: this._upgrader }, options)
   }
 
+  /**
+   * Takes a list of `Multiaddr`s and returns only valid TCP addresses
+   * @param {Multiaddr[]} multiaddrs
+   * @returns {Multiaddr[]} Valid TCP multiaddrs
+   */
   filter (multiaddrs) {
-    if (!Array.isArray(multiaddrs)) {
-      multiaddrs = [multiaddrs]
-    }
+    multiaddrs = Array.isArray(multiaddrs) ? multiaddrs : [multiaddrs]
 
-    return multiaddrs.filter((ma) => {
-      if (includes(ma.protoNames(), 'p2p-circuit')) {
+    return multiaddrs.filter(ma => {
+      if (ma.protoCodes().includes(CODE_CIRCUIT)) {
         return false
       }
 
-      if (includes(ma.protoNames(), 'ipfs')) {
-        ma = ma.decapsulate('ipfs')
-      }
-
-      return mafmt.TCP.matches(ma)
+      return mafmt.TCP.matches(ma.decapsulateCode(CODE_P2P))
     })
   }
 }

src/listener.js

@@ -1,156 +1,122 @@
 'use strict'
 
-const multiaddr = require('multiaddr')
-const Connection = require('interface-connection').Connection
-const os = require('os')
-const includes = require('lodash.includes')
 const net = require('net')
-const toPull = require('stream-to-pull-stream')
-const EventEmitter = require('events').EventEmitter
+const EventEmitter = require('events')
 const debug = require('debug')
-const log = debug('libp2p:tcp:listen')
+const log = debug('libp2p:tcp:listener')
+log.error = debug('libp2p:tcp:listener:error')
 
-const getMultiaddr = require('./get-multiaddr')
+const toConnection = require('./socket-to-conn')
+const { CODE_P2P } = require('./constants')
+const {
+  getMultiaddrs,
+  multiaddrToNetConfig
+} = require('./utils')
 
-const IPFS_CODE = 421
-const CLOSE_TIMEOUT = 2000
+/**
+ * Attempts to close the given maConn. If a failure occurs, it will be logged.
+ * @private
+ * @param {MultiaddrConnection} maConn
+ */
+async function attemptClose (maConn) {
+  try {
+    maConn && await maConn.close()
+  } catch (err) {
+    log.error('an error occurred closing the connection', err)
+  }
+}
 
-function noop () {}
-
-module.exports = (handler) => {
+module.exports = ({ handler, upgrader }, options) => {
   const listener = new EventEmitter()
 
-  const server = net.createServer((socket) => {
-    // Avoid uncaught errors cause by unstable connections
-    socket.on('error', noop)
+  const server = net.createServer(async socket => {
+    // Avoid uncaught errors caused by unstable connections
+    socket.on('error', err => log('socket error', err))
 
-    const addr = getMultiaddr(socket)
-    if (!addr) {
-      if (socket.remoteAddress === undefined) {
-        log('connection closed before p2p connection made')
-      } else {
-        log('error interpreting incoming p2p connection')
-      }
-      return
+    let maConn
+    let conn
+    try {
+      maConn = toConnection(socket, { listeningAddr })
+      log('new inbound connection %s', maConn.remoteAddr)
+      conn = await upgrader.upgradeInbound(maConn)
+    } catch (err) {
+      log.error('inbound connection failed', err)
+      return attemptClose(maConn)
     }
 
-    log('new connection', addr.toString())
+    log('inbound connection %s upgraded', maConn.remoteAddr)
 
-    const s = toPull.duplex(socket)
+    trackConn(server, maConn)
 
-    s.getObservedAddrs = (cb) => {
-      cb(null, [addr])
-    }
-
-    trackSocket(server, socket)
-
-    const conn = new Connection(s)
-    handler(conn)
+    if (handler) handler(conn)
     listener.emit('connection', conn)
   })
 
-  server.on('listening', () => listener.emit('listening'))
-  server.on('error', (err) => listener.emit('error', err))
-  server.on('close', () => listener.emit('close'))
+  server
+    .on('listening', () => listener.emit('listening'))
+    .on('error', err => listener.emit('error', err))
+    .on('close', () => listener.emit('close'))
 
   // Keep track of open connections to destroy in case of timeout
-  server.__connections = {}
+  server.__connections = []
 
-  listener.close = (options, callback) => {
-    if (typeof options === 'function') {
-      callback = options
-      options = {}
-    }
-    callback = callback || noop
-    options = options || {}
+  listener.close = () => {
+    if (!server.listening) 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)
+    return new Promise((resolve, reject) => {
+      server.__connections.forEach(maConn => attemptClose(maConn))
+      server.close(err => err ? reject(err) : resolve())
     })
   }
 
-  let ipfsId
-  let listeningAddr
+  let peerId, listeningAddr
 
-  listener.listen = (ma, callback) => {
+  listener.listen = ma => {
     listeningAddr = ma
-    if (includes(ma.protoNames(), 'ipfs')) {
-      ipfsId = getIpfsId(ma)
-      listeningAddr = ma.decapsulate('ipfs')
+    peerId = ma.getPeerId()
+
+    if (peerId) {
+      listeningAddr = ma.decapsulateCode(CODE_P2P)
     }
 
-    const lOpts = listeningAddr.toOptions()
-    log('Listening on %s %s', lOpts.port, lOpts.host)
-    return server.listen(lOpts.port, lOpts.host, callback)
+    return new Promise((resolve, reject) => {
+      const options = multiaddrToNetConfig(listeningAddr)
+      server.listen(options, err => {
+        if (err) return reject(err)
+        log('Listening on %s', server.address())
+        resolve()
+      })
+    })
   }
 
-  listener.getAddrs = (callback) => {
-    const multiaddrs = []
+  listener.getAddrs = () => {
+    let addrs = []
     const address = server.address()
 
     if (!address) {
-      return callback(new Error('Listener is not ready yet'))
+      throw new Error('Listener is not ready yet')
     }
 
     // Because TCP will only return the IPv6 version
     // we need to capture from the passed multiaddr
-    if (listeningAddr.toString().indexOf('ip4') !== -1) {
-      let m = listeningAddr.decapsulate('tcp')
-      m = m.encapsulate('/tcp/' + address.port)
-      if (ipfsId) {
-        m = m.encapsulate('/ipfs/' + ipfsId)
-      }
-
-      if (m.toString().indexOf('0.0.0.0') !== -1) {
-        const netInterfaces = os.networkInterfaces()
-        Object.keys(netInterfaces).forEach((niKey) => {
-          netInterfaces[niKey].forEach((ni) => {
-            if (ni.family === 'IPv4') {
-              multiaddrs.push(multiaddr(m.toString().replace('0.0.0.0', ni.address)))
-            }
-          })
-        })
-      } else {
-        multiaddrs.push(m)
-      }
+    if (listeningAddr.toString().startsWith('/ip4')) {
+      addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port))
+    } else if (address.family === 'IPv6') {
+      addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port))
     }
 
-    if (address.family === 'IPv6') {
-      let ma = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
-      if (ipfsId) {
-        ma = ma.encapsulate('/ipfs/' + ipfsId)
-      }
-
-      multiaddrs.push(ma)
-    }
-
-    callback(null, multiaddrs)
+    return addrs.map(ma => peerId ? ma.encapsulate(`/p2p/${peerId}`) : ma)
   }
 
   return listener
 }
 
-function getIpfsId (ma) {
-  return ma.stringTuples().filter((tuple) => {
-    return tuple[0] === IPFS_CODE
-  })[0][1]
-}
+function trackConn (server, maConn) {
+  server.__connections.push(maConn)
 
-function trackSocket (server, socket) {
-  const key = `${socket.remoteAddress}:${socket.remotePort}`
-  server.__connections[key] = socket
+  const untrackConn = () => {
+    server.__connections = server.__connections.filter(c => c !== maConn)
+  }
 
-  socket.on('close', () => {
-    delete server.__connections[key]
-  })
+  maConn.conn.once('close', untrackConn)
 }

src/socket-to-conn.js

@@ -0,0 +1,104 @@
+'use strict'
+
+const abortable = require('abortable-iterator')
+const log = require('debug')('libp2p:tcp:socket')
+const toIterable = require('stream-to-it')
+const toMultiaddr = require('libp2p-utils/src/ip-port-to-multiaddr')
+const { CLOSE_TIMEOUT } = require('./constants')
+
+// Convert a socket into a MultiaddrConnection
+// https://github.com/libp2p/interface-transport#multiaddrconnection
+module.exports = (socket, options) => {
+  options = options || {}
+
+  // Check if we are connected on a unix path
+  if (options.listeningAddr && options.listeningAddr.getPath()) {
+    options.remoteAddr = options.listeningAddr
+  }
+
+  if (options.remoteAddr && options.remoteAddr.getPath()) {
+    options.localAddr = options.remoteAddr
+  }
+
+  const { sink, source } = toIterable.duplex(socket)
+  const maConn = {
+    async sink (source) {
+      if (options.signal) {
+        source = abortable(source, options.signal)
+      }
+
+      try {
+        await sink((async function * () {
+          for await (const chunk of source) {
+            // Convert BufferList to Buffer
+            yield Buffer.isBuffer(chunk) ? chunk : chunk.slice()
+          }
+        })())
+      } catch (err) {
+        // If aborted we can safely ignore
+        if (err.type !== 'aborted') {
+          // If the source errored the socket will already have been destroyed by
+          // toIterable.duplex(). If the socket errored it will already be
+          // destroyed. There's nothing to do here except log the error & return.
+          log(err)
+        }
+      }
+    },
+
+    source: options.signal ? abortable(source, options.signal) : source,
+
+    conn: socket,
+
+    localAddr: options.localAddr || toMultiaddr(socket.localAddress, socket.localPort),
+
+    // If the remote address was passed, use it - it may have the peer ID encapsulated
+    remoteAddr: options.remoteAddr || toMultiaddr(socket.remoteAddress, socket.remotePort),
+
+    timeline: { open: Date.now() },
+
+    close () {
+      if (socket.destroyed) return
+
+      return new Promise((resolve, reject) => {
+        const start = Date.now()
+
+        // Attempt to end the socket. If it takes longer to close than the
+        // timeout, destroy it manually.
+        const timeout = setTimeout(() => {
+          const { host, port } = maConn.remoteAddr.toOptions()
+          log('timeout closing socket to %s:%s after %dms, destroying it manually',
+            host, port, Date.now() - start)
+
+          if (socket.destroyed) {
+            log('%s:%s is already destroyed', host, port)
+          } else {
+            socket.destroy()
+          }
+
+          resolve()
+        }, CLOSE_TIMEOUT)
+
+        socket.once('close', () => {
+          clearTimeout(timeout)
+          resolve()
+        })
+        socket.end(err => {
+          maConn.timeline.close = Date.now()
+          if (err) return reject(err)
+          resolve()
+        })
+      })
+    }
+  }
+
+  socket.once('close', () => {
+    // In instances where `close` was not explicitly called,
+    // such as an iterable stream ending, ensure we have set the close
+    // timeline
+    if (!maConn.timeline.close) {
+      maConn.timeline.close = Date.now()
+    }
+  })
+
+  return maConn
+}

src/utils.js

@@ -0,0 +1,47 @@
+'use strict'
+
+const multiaddr = require('multiaddr')
+const os = require('os')
+const { resolve } = require('path')
+const ProtoFamily = { ip4: 'IPv4', ip6: 'IPv6' }
+
+function multiaddrToNetConfig (addr) {
+  const listenPath = addr.getPath()
+  // unix socket listening
+  if (listenPath) {
+    return resolve(listenPath)
+  }
+  // tcp listening
+  return addr.toOptions()
+}
+
+function getMultiaddrs (proto, ip, port) {
+  const toMa = ip => new multiaddr.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
+ */
+const networks = os.networkInterfaces()
+function getNetworkAddrs (family) {
+  return Object.values(networks).reduce((addresses, netAddrs) => {
+    netAddrs.forEach(netAddr => {
+      // Add the ip of each matching network interface
+      if (netAddr.family === family) addresses.push(netAddr.address)
+    })
+    return addresses
+  }, [])
+}
+
+module.exports = {
+  multiaddrToNetConfig,
+  isAnyAddr,
+  getMultiaddrs
+}

test/compliance.spec.js

@@ -1,24 +1,42 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('interface-transport')
+const sinon = require('sinon')
+const tests = require('libp2p-interfaces/src/transport/tests')
 const multiaddr = require('multiaddr')
+const net = require('net')
 const TCP = require('../src')
 
 describe('interface-transport compliance', () => {
   tests({
-    setup (cb) {
-      const tcp = new TCP()
+    setup ({ upgrader }) {
+      const tcp = new TCP({ upgrader })
       const addrs = [
-        multiaddr('/ip4/127.0.0.1/tcp/9091'),
-        multiaddr('/ip4/127.0.0.1/tcp/9092'),
-        multiaddr('/ip4/127.0.0.1/tcp/9093'),
-        multiaddr('/dns4/ipfs.io')
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9092'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9093')
       ]
-      cb(null, tcp, addrs)
-    },
-    teardown (cb) {
-      cb()
+
+      // Used by the dial tests to simulate a delayed connect
+      const connector = {
+        delay (delayMs) {
+          const netConnect = net.connect
+          sinon.replace(net, 'connect', (opts) => {
+            const socket = netConnect(opts)
+            const socketEmit = socket.emit.bind(socket)
+            sinon.replace(socket, 'emit', (...args) => {
+              const time = args[0] === 'connect' ? delayMs : 0
+              setTimeout(() => socketEmit(...args), time)
+            })
+            return socket
+          })
+        },
+        restore () {
+          sinon.restore()
+        }
+      }
+
+      return { transport: tcp, addrs, connector }
     }
   })
 })

test/connection-wrap.spec.js

@@ -1,121 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const pull = require('pull-stream')
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-const TCP = require('../src')
-const multiaddr = require('multiaddr')
-const Connection = require('interface-connection').Connection
-
-describe('Connection Wrap', () => {
-  let tcp
-  let listener
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
-
-  beforeEach((done) => {
-    tcp = new TCP()
-    listener = tcp.createListener((conn) => {
-      pull(conn, conn)
-    })
-    listener.on('listening', done)
-    listener.listen(ma)
-  })
-
-  afterEach((done) => {
-    listener.close(done)
-  })
-
-  it('simple wrap', (done) => {
-    const conn = tcp.dial(ma)
-    conn.setPeerInfo('peerInfo')
-    const connWrap = new Connection(conn)
-    pull(
-      pull.values(['hey']),
-      connWrap,
-      pull.collect((err, chunks) => {
-        expect(err).to.not.exist()
-        expect(chunks).to.be.eql([Buffer.from('hey')])
-
-        connWrap.getPeerInfo((err, peerInfo) => {
-          expect(err).to.not.exist()
-          expect(peerInfo).to.equal('peerInfo')
-          done()
-        })
-      })
-    )
-  })
-
-  it('buffer wrap', (done) => {
-    const conn = tcp.dial(ma)
-    const connWrap = new Connection()
-    pull(
-      pull.values(['hey']),
-      connWrap,
-      pull.collect((err, chunks) => {
-        expect(err).to.not.exist()
-        expect(chunks).to.be.eql([Buffer.from('hey')])
-        done()
-      })
-    )
-
-    connWrap.setInnerConn(conn)
-  })
-
-  it('overload wrap', (done) => {
-    const conn = tcp.dial(ma)
-    const connWrap = new Connection(conn)
-    connWrap.getPeerInfo = (callback) => {
-      callback(null, 'none')
-    }
-    conn.getPeerInfo((err, peerInfo) => {
-      expect(err).to.exist()
-    })
-    connWrap.getPeerInfo((err, peerInfo) => {
-      expect(err).to.not.exist()
-      expect(peerInfo).to.equal('none')
-    })
-    pull(
-      pull.values(['hey']),
-      connWrap,
-      pull.collect((err, chunks) => {
-        expect(err).to.not.exist()
-        expect(chunks).to.be.eql([Buffer.from('hey')])
-        done()
-      })
-    )
-  })
-
-  it('dial error', (done) => {
-    tcp.dial(multiaddr('/ip4/127.0.0.1/tcp/22234'), (err) => {
-      expect(err).to.exist()
-      done()
-    })
-  })
-
-  it('matryoshka wrap', (done) => {
-    const conn = tcp.dial(ma)
-    const connWrap1 = new Connection(conn)
-    const connWrap2 = new Connection(connWrap1)
-    const connWrap3 = new Connection(connWrap2)
-
-    conn.getPeerInfo = (callback) => {
-      callback(null, 'inner doll')
-    }
-    pull(
-      pull.values(['hey']),
-      connWrap3,
-      pull.collect((err, chunks) => {
-        expect(err).to.not.exist()
-        expect(chunks).to.eql([Buffer.from('hey')])
-        connWrap3.getPeerInfo((err, peerInfo) => {
-          expect(err).to.not.exist()
-          expect(peerInfo).to.equal('inner doll')
-          done()
-        })
-      })
-    )
-  })
-})

test/connection.spec.js

@@ -1,111 +1,85 @@
 /* eslint-env mocha */
 'use strict'
 
-const pull = require('pull-stream')
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('aegir/utils/chai')
 const TCP = require('../src')
 const multiaddr = require('multiaddr')
 
-describe('valid Connection', () => {
+describe('valid localAddr and remoteAddr', () => {
   let tcp
 
+  const mockUpgrader = {
+    upgradeInbound: maConn => maConn,
+    upgradeOutbound: maConn => maConn
+  }
+
   beforeEach(() => {
-    tcp = new TCP()
+    tcp = new TCP({ upgrader: mockUpgrader })
   })
 
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
 
-  it('get observed addrs', (done) => {
-    let dialerObsAddrs
+  it('should resolve port 0', async () => {
+    // Create a Promise that resolves when a connection is handled
+    let handled
+    const handlerPromise = new Promise(resolve => { handled = resolve })
 
-    const listener = tcp.createListener((conn) => {
-      expect(conn).to.exist()
-      conn.getObservedAddrs((err, addrs) => {
-        expect(err).to.not.exist()
-        dialerObsAddrs = addrs
-        pull(pull.empty(), conn)
-      })
-    })
+    const handler = conn => handled(conn)
 
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
-      pull(
-        conn,
-        pull.onEnd(endHandler)
-      )
+    // Create a listener with the handler
+    const listener = tcp.createListener(handler)
 
-      function endHandler () {
-        conn.getObservedAddrs((err, addrs) => {
-          expect(err).to.not.exist()
-          pull(pull.empty(), conn)
-          closeAndAssert(listener, addrs)
-        })
-      }
+    // Listen on the multi-address
+    await listener.listen(ma)
 
-      function closeAndAssert (listener, addrs) {
-        listener.close(() => {
-          expect(addrs[0]).to.deep.equal(ma)
-          expect(dialerObsAddrs.length).to.equal(1)
-          done()
-        })
-      }
-    })
+    const localAddrs = listener.getAddrs()
+    expect(localAddrs.length).to.equal(1)
+
+    // Dial to that address
+    const dialerConn = await tcp.dial(localAddrs[0])
+
+    // Wait for the incoming dial to be handled
+    const listenerConn = await handlerPromise
+
+    // Close the listener
+    await listener.close()
+
+    expect(dialerConn.localAddr.toString())
+      .to.equal(listenerConn.remoteAddr.toString())
+
+    expect(dialerConn.remoteAddr.toString())
+      .to.equal(listenerConn.localAddr.toString())
   })
 
-  it('get Peer Info', (done) => {
-    const listener = tcp.createListener((conn) => {
-      expect(conn).to.exist()
-      conn.getPeerInfo((err, peerInfo) => {
-        expect(err).to.exist()
-        expect(peerInfo).to.not.exist()
-        pull(pull.empty(), conn)
-      })
-    })
+  it('should handle multiple simultaneous closes', async () => {
+    // Create a Promise that resolves when a connection is handled
+    let handled
+    const handlerPromise = new Promise(resolve => { handled = resolve })
 
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
+    const handler = conn => handled(conn)
 
-      pull(conn, pull.onEnd(endHandler))
+    // Create a listener with the handler
+    const listener = tcp.createListener(handler)
 
-      function endHandler () {
-        conn.getPeerInfo((err, peerInfo) => {
-          expect(err).to.exist()
-          expect(peerInfo).to.not.exist()
+    // Listen on the multi-address
+    await listener.listen(ma)
 
-          listener.close(done)
-        })
-      }
-    })
-  })
+    const localAddrs = listener.getAddrs()
+    expect(localAddrs.length).to.equal(1)
 
-  it('set Peer Info', (done) => {
-    const listener = tcp.createListener((conn) => {
-      expect(conn).to.exist()
-      conn.setPeerInfo('batatas')
-      conn.getPeerInfo((err, peerInfo) => {
-        expect(err).to.not.exist()
-        expect(peerInfo).to.equal('batatas')
-        pull(pull.empty(), conn)
-      })
-    })
+    // Dial to that address
+    const dialerConn = await tcp.dial(localAddrs[0])
 
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
+    // Wait for the incoming dial to be handled
+    await handlerPromise
 
-      pull(conn, pull.onEnd(endHandler))
-
-      function endHandler () {
-        conn.setPeerInfo('arroz')
-        conn.getPeerInfo((err, peerInfo) => {
-          expect(err).to.not.exist()
-          expect(peerInfo).to.equal('arroz')
-
-          listener.close(done)
-        })
-      }
-    })
+    // Close the listener with two simultaneous calls to `close`
+    await Promise.race([
+      new Promise((resolve, reject) => setTimeout(() => reject(new Error('Timed out waiting for connection close')), 500)),
+      await Promise.all([
+        dialerConn.close(),
+        dialerConn.close()
+      ])
+    ])
   })
 })

test/constructor.spec.js

@@ -1,15 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-const TCP = require('../src')
-
-describe('Constructor', () => {
-  it('create an instance', () => {
-    const tcp = new TCP()
-    expect(tcp).to.exist()
-  })
-})

test/filter.spec.js

@@ -1,10 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('aegir/utils/chai')
 const TCP = require('../src')
 const multiaddr = require('multiaddr')
 
@@ -15,18 +12,18 @@ describe('filter addrs', () => {
   let tcp
 
   before(() => {
-    tcp = new TCP()
+    tcp = new TCP({ upgrader: {} })
   })
 
   it('filter valid addrs for this transport', () => {
-    const ma1 = multiaddr(base + '/tcp/9090')
-    const ma2 = multiaddr(base + '/udp/9090')
-    const ma3 = multiaddr(base + '/tcp/9090/http')
-    const ma4 = multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const ma5 = multiaddr(base + '/tcp/9090/http' + ipfs)
-    const ma6 = multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
-    const ma7 = multiaddr('/dns4/libp2p.io/tcp/9090')
-    const ma8 = multiaddr('/dnsaddr/libp2p.io/tcp/9090')
+    const ma1 = new multiaddr.Multiaddr(base + '/tcp/9090')
+    const ma2 = new multiaddr.Multiaddr(base + '/udp/9090')
+    const ma3 = new multiaddr.Multiaddr(base + '/tcp/9090/http')
+    const ma4 = new multiaddr.Multiaddr(base + '/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const ma5 = new multiaddr.Multiaddr(base + '/tcp/9090/http' + ipfs)
+    const ma6 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-circuit' + ipfs)
+    const ma7 = new multiaddr.Multiaddr('/dns4/libp2p.io/tcp/9090')
+    const ma8 = new multiaddr.Multiaddr('/dnsaddr/libp2p.io/tcp/9090')
 
     const valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6, ma7, ma8])
     expect(valid.length).to.equal(4)
@@ -35,7 +32,7 @@ describe('filter addrs', () => {
   })
 
   it('filter a single addr for this transport', () => {
-    const ma1 = multiaddr(base + '/tcp/9090')
+    const ma1 = new multiaddr.Multiaddr(base + '/tcp/9090')
 
     const valid = tcp.filter(ma1)
     expect(valid.length).to.equal(1)

test/get-multiaddr.spec.js

@@ -1,54 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-const getMultiaddr = require('../src/get-multiaddr')
-
-const goodSocket4 = {
-  remoteAddress: '127.0.0.1',
-  remotePort: '9090',
-  remoteFamily: 'IPv4'
-}
-
-const goodSocket6 = {
-  remoteAddress: '::1',
-  remotePort: '9090',
-  remoteFamily: 'IPv6'
-}
-
-const badSocket = {}
-
-const badSocketData = {
-  remoteAddress: 'aewmrn4awoew',
-  remotePort: '234',
-  remoteFamily: 'Hufflepuff'
-}
-
-describe('getMultiaddr multiaddr creation', () => {
-  it('creates multiaddr from valid socket data', (done) => {
-    expect(getMultiaddr(goodSocket4))
-      .to.exist()
-    done()
-  })
-
-  it('creates multiaddr from valid IPv6 socket data', (done) => {
-    expect(getMultiaddr(goodSocket6))
-      .to.exist()
-    done()
-  })
-
-  it('returns undefined multiaddr from missing socket data', (done) => {
-    expect(getMultiaddr(badSocket))
-      .to.equal(undefined)
-    done()
-  })
-
-  it('returns undefined multiaddr from unparseable socket data', (done) => {
-    expect(getMultiaddr(badSocketData))
-      .to.equal(undefined)
-    done()
-  })
-})

test/listen-dial.spec.js

@@ -1,259 +1,278 @@
 /* eslint-env mocha */
 'use strict'
 
-const pull = require('pull-stream')
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('aegir/utils/chai')
 const TCP = require('../src')
 const net = require('net')
+const os = require('os')
+const path = require('path')
 const multiaddr = require('multiaddr')
+const pipe = require('it-pipe')
+const { collect, map } = require('streaming-iterables')
 const isCI = process.env.CI
+const isWindows = os.platform() === 'win32'
+
+const skipOnWindows = isWindows ? it.skip : it
+
+describe('construction', () => {
+  it('requires an upgrader', () => {
+    expect(() => new TCP()).to.throw()
+  })
+})
 
 describe('listen', () => {
   let tcp
+  let listener
 
   beforeEach(() => {
-    tcp = new TCP()
+    tcp = new TCP({
+      upgrader: {
+        upgradeOutbound: maConn => maConn,
+        upgradeInbound: maConn => maConn
+      }
+    })
+  })
+  afterEach(async () => {
+    listener && await listener.close()
   })
 
-  it('close listener with connections, through timeout', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const listener = tcp.createListener((conn) => {
-      pull(conn, conn)
+  it('close listener with connections, through timeout', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    listener = tcp.createListener((conn) => {
+      pipe(conn, conn)
     })
 
-    listener.listen(mh, () => {
-      const socket1 = net.connect(9090)
-      const socket2 = net.connect(9090)
+    await listener.listen(mh)
 
-      socket1.write('Some data that is never handled')
-      socket1.end()
-      socket1.on('error', () => {})
-      socket2.on('error', () => {})
-      socket1.on('connect', () => {
-        listener.close(done)
+    const socket1 = net.connect(9090)
+    const socket2 = net.connect(9090)
+
+    socket1.write('Some data that is never handled')
+    socket1.end()
+    socket1.on('error', () => {})
+    socket2.on('error', () => {})
+
+    await new Promise((resolve) => {
+      socket1.on('connect', async () => {
+        await listener.close({ timeout: 100 })
+        resolve()
       })
     })
   })
 
-  it('listen on port 0', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
+  // Windows doesn't support unix paths
+  skipOnWindows('listen on path', async () => {
+    const mh = new multiaddr.Multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
+
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
   })
 
-  it('listen on IPv6 addr', (done) => {
-    if (isCI) { return done() }
-    const mh = multiaddr('/ip6/::/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
+  it('listen on port 0', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
   })
 
-  it('listen on any Interface', (done) => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
+  it('listen on IPv6 addr', async () => {
+    if (isCI) {
+      return
+    }
+    const mh = new multiaddr.Multiaddr('/ip6/::/tcp/9090')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
   })
 
-  it('getAddrs', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.getAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs.length).to.equal(1)
-        expect(multiaddrs[0]).to.deep.equal(mh)
-        listener.close(done)
-      })
-    })
+  it('listen on any Interface', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9090')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
   })
 
-  it('getAddrs on port 0 listen', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.getAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs.length).to.equal(1)
-        listener.close(done)
-      })
-    })
+  it('getAddrs', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length).to.equal(1)
+    expect(multiaddrs[0]).to.deep.equal(mh)
   })
 
-  it('getAddrs from listening on 0.0.0.0', (done) => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.getAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs.length > 0).to.equal(true)
-        expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
-        listener.close(done)
-      })
-    })
+  it('getAddrs on port 0 listen', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length).to.equal(1)
   })
 
-  it('getAddrs from listening on 0.0.0.0 and port 0', (done) => {
-    const mh = multiaddr('/ip4/0.0.0.0/tcp/0')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.getAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs.length > 0).to.equal(true)
-        expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
-        listener.close(done)
-      })
-    })
+  it('getAddrs from listening on 0.0.0.0', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9090')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length > 0).to.equal(true)
+    expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
   })
 
-  it('getAddrs preserves IPFS Id', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.getAddrs((err, multiaddrs) => {
-        expect(err).to.not.exist()
-        expect(multiaddrs.length).to.equal(1)
-        expect(multiaddrs[0]).to.deep.equal(mh)
-        listener.close(done)
-      })
-    })
+  it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length > 0).to.equal(true)
+    expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
+  })
+
+  it('getAddrs preserves IPFS Id', async () => {
+    const mh = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length).to.equal(1)
+    expect(multiaddrs[0]).to.deep.equal(mh)
   })
 })
 
 describe('dial', () => {
   let tcp
   let listener
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
 
-  beforeEach((done) => {
-    tcp = new TCP()
+  beforeEach(async () => {
+    tcp = new TCP({
+      upgrader: {
+        upgradeOutbound: maConn => maConn,
+        upgradeInbound: maConn => maConn
+      }
+    })
     listener = tcp.createListener((conn) => {
-      pull(
+      pipe(
         conn,
-        pull.map((x) => Buffer.from(x.toString() + '!')),
+        map((x) => Buffer.from(x.toString() + '!')),
         conn
       )
     })
-    listener.listen(ma, done)
+    await listener.listen(ma)
   })
 
-  afterEach((done) => {
-    listener.close(done)
-  })
+  afterEach(() => listener.close())
 
-  it('dial on IPv4', (done) => {
-    pull(
-      pull.values(['hey']),
-      tcp.dial(ma),
-      pull.collect((err, values) => {
-        expect(err).to.not.exist()
-        expect(values).to.eql([Buffer.from('hey!')])
-        done()
-      })
+  it('dial on IPv4', async () => {
+    const values = await pipe(
+      ['hey'],
+      await tcp.dial(ma),
+      collect
     )
+    expect(values).to.eql([Buffer.from('hey!')])
   })
 
-  it('dial to non existent listener', (done) => {
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/8989')
-    pull(
-      tcp.dial(ma),
-      pull.onEnd((err) => {
-        expect(err).to.exist()
-        done()
-      })
+  it('dial on IPv6', async () => {
+    if (isCI) {
+      return
+    }
+
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/9066')
+    const listener = tcp.createListener((conn) => {
+      pipe(conn, conn)
+    })
+    await listener.listen(ma)
+
+    const values = await pipe(
+      ['hey'],
+      await tcp.dial(ma),
+      collect
     )
+    expect(values).to.be.eql([Buffer.from('hey')])
+
+    await listener.close()
   })
 
-  it('dial on IPv6', (done) => {
-    if (isCI) { return done() }
+  // Windows doesn't support unix paths
+  skipOnWindows('dial on path', async () => {
+    const ma = new multiaddr.Multiaddr(`/unix${path.resolve(os.tmpdir(), '/tmp/p2pd.sock')}`)
 
-    const ma = multiaddr('/ip6/::/tcp/9066')
     const listener = tcp.createListener((conn) => {
-      pull(conn, conn)
+      pipe(conn, conn)
     })
-    listener.listen(ma, () => {
-      pull(
-        pull.values(['hey']),
-        tcp.dial(ma),
-        pull.collect((err, values) => {
-          expect(err).to.not.exist()
+    await listener.listen(ma)
 
-          expect(values).to.be.eql([Buffer.from('hey')])
+    const connection = await tcp.dial(ma)
 
-          listener.close(done)
-        })
-      )
-    })
+    const values = await pipe(
+      ['hey'],
+      connection,
+      collect
+    )
+
+    expect(values).to.be.eql([Buffer.from('hey')])
+    await listener.close()
   })
 
-  it('dial and destroy on listener', (done) => {
-    let count = 0
-    const closed = () => ++count === 2 ? finish() : null
+  it('dial and destroy on listener', async () => {
+    let handled
+    const handledPromise = new Promise((resolve) => {
+      handled = resolve
+    })
 
-    const ma = multiaddr('/ip6/::/tcp/9067')
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/0')
 
-    const listener = tcp.createListener((conn) => {
-      pull(
-        pull.empty(),
-        conn,
-        pull.onEnd(closed)
+    const listener = tcp.createListener(async (conn) => {
+      await pipe(
+        [],
+        conn
       )
+      handled()
     })
 
-    listener.listen(ma, () => {
-      pull(tcp.dial(ma), pull.onEnd(closed))
-    })
+    await listener.listen(ma)
+    const addrs = listener.getAddrs()
+    await pipe(await tcp.dial(addrs[0]))
 
-    function finish () {
-      listener.close(done)
+    await handledPromise
+    await listener.close()
+  })
+
+  it('dial and destroy on dialer', async () => {
+    if (isCI) {
+      return
     }
-  })
 
-  it('dial and destroy on dialer', (done) => {
-    if (isCI) { return done() }
-
-    let count = 0
-    const destroyed = () => ++count === 2 ? finish() : null
-
-    const ma = multiaddr('/ip6/::/tcp/9068')
-
-    const listener = tcp.createListener((conn) => {
-      pull(conn, pull.onEnd(destroyed))
+    let handled
+    const handledPromise = new Promise((resolve) => {
+      handled = resolve
     })
 
-    listener.listen(ma, () => {
-      pull(
-        pull.empty(),
-        tcp.dial(ma),
-        pull.onEnd(destroyed)
-      )
+    const ma = new multiaddr.Multiaddr('/ip6/::/tcp/0')
+
+    const listener = tcp.createListener(async (conn) => {
+      // pull(conn, pull.onEnd(destroyed))
+      await pipe(conn)
+      handled()
     })
 
-    function finish () {
-      listener.close(done)
-    }
+    await listener.listen(ma)
+    const addrs = listener.getAddrs()
+    await pipe(await tcp.dial(addrs[0]))
+
+    await handledPromise
+    await listener.close()
   })
 
-  it('dial on IPv4 with IPFS Id', (done) => {
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const conn = tcp.dial(ma)
+  it('dial on IPv4 with IPFS Id', async () => {
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const conn = await tcp.dial(ma)
 
-    pull(
-      pull.values(['hey']),
+    const res = await pipe(
+      ['hey'],
       conn,
-      pull.collect((err, res) => {
-        expect(err).to.not.exist()
-        expect(res).to.be.eql([Buffer.from('hey!')])
-        done()
-      })
+      collect
     )
+    expect(res).to.be.eql([Buffer.from('hey!')])
   })
 })

test/turbolence.spec.js

@@ -1,16 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-// const TCP = require('../src')
-
-describe.skip('turbolence', () => {
-  it('dialer - emits error on the other end is terminated abruptly', (done) => {
-    expect('ok').to.equal('ok')
-  })
-
-  it('listener - emits error on the other end is terminated abruptly', (done) => {})
-})