chore: add osx back

License: MIT
Signed-off-by: Jacob Heun <jacobheun@gmail.com>

.gitignore

@@ -1,7 +1,18 @@
+docs
+**/node_modules/
+**/*.log
+test/repo-tests*
+**/bundle.js
+
+# yarn
+yarn.lock
+
 # Logs
 logs
 *.log
 
+coverage
+
 # Runtime data
 pids
 *.pid
@@ -19,12 +30,17 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+build
-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
+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

.travis.yml

@@ -1,25 +1,36 @@
-sudo: false
 language: node_js
+cache: npm
+
+stages:
+  - check
+  - test
+  - cov
+
 node_js:
-  - 4
+  - '10'
-  - 5
-  - stable
 
-# Make sure we have new NPM.
+script: npx nyc -s npm run test:node -- --bail
-before_install:
+after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
-  - npm install -g npm
 
-script:
+jobs:
-  - npm run lint
+  include:
-  - npm test
+    - os: linux
-  - npm run coverage
+      sudo: false
+      before_script: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
 
-addons:
+    - os: windows
-  firefox: 'latest'
+      filter_secrets: false
+      cache: false
 
-before_script:
+    - os: osx
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 
-after_success:
+    - stage: check
-  - npm run coverage-publish
+      os: linux
+      script:
+        - npx aegir build --bundlesize
+        - npx aegir commitlint --travis
+        - npx aegir dep-check
+        - npm run lint
+
+notifications:
+  email: false

CHANGELOG.md

@@ -0,0 +1,263 @@
+<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)
+
+
+### Features
+
+* add support for dialing over dns ([eba0b48](https://github.com/libp2p/js-libp2p-tcp/commit/eba0b48))
+
+
+
+<a name="0.12.1"></a>
+## [0.12.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.12.0...v0.12.1) (2018-07-31)
+
+
+### Bug Fixes
+
+* invalid ip address and daemon can be crashed by remote user ([4b04b17](https://github.com/libp2p/js-libp2p-tcp/commit/4b04b17))
+
+
+
+<a name="0.12.0"></a>
+# [0.12.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.6...v0.12.0) (2018-04-05)
+
+
+### Features
+
+* add class-is module ([ded1f68](https://github.com/libp2p/js-libp2p-tcp/commit/ded1f68))
+
+
+
+<a name="0.11.6"></a>
+## [0.11.6](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.5...v0.11.6) (2018-02-20)
+
+
+
+<a name="0.11.5"></a>
+## [0.11.5](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.4...v0.11.5) (2018-02-07)
+
+
+
+<a name="0.11.4"></a>
+## [0.11.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.11.3...v0.11.4) (2018-02-07)
+
+
+
+<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)
+
+
+### Features
+
+* relay filtering  ([11c4f45](https://github.com/libp2p/js-libp2p-tcp/commit/11c4f45))
+
+
+
+<a name="0.11.0"></a>
+# [0.11.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.2...v0.11.0) (2017-09-03)
+
+
+### Features
+
+* p2p addrs situation ([#82](https://github.com/libp2p/js-libp2p-tcp/issues/82)) ([a54bb83](https://github.com/libp2p/js-libp2p-tcp/commit/a54bb83))
+
+
+
+<a name="0.10.2"></a>
+## [0.10.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.1...v0.10.2) (2017-07-22)
+
+
+
+<a name="0.10.1"></a>
+## [0.10.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.10.0...v0.10.1) (2017-04-13)
+
+
+### Bug Fixes
+
+* catch errors on incomming sockets ([e204517](https://github.com/libp2p/js-libp2p-tcp/commit/e204517))
+
+
+
+<a name="0.10.0"></a>
+# [0.10.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.4...v0.10.0) (2017-03-27)
+
+
+### Bug Fixes
+
+* **dial:** proper error handling on dial ([#77](https://github.com/libp2p/js-libp2p-tcp/issues/77)) ([4d4f295](https://github.com/libp2p/js-libp2p-tcp/commit/4d4f295))
+
+
+
+<a name="0.9.4"></a>
+## [0.9.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.3...v0.9.4) (2017-03-21)
+
+
+
+<a name="0.9.3"></a>
+## [0.9.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.2...v0.9.3) (2017-02-09)
+
+
+
+<a name="0.9.2"></a>
+## [0.9.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.1...v0.9.2) (2017-02-09)
+
+
+
+<a name="0.9.1"></a>
+## [0.9.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.9.0...v0.9.1) (2016-11-03)
+
+
+
+<a name="0.9.0"></a>
+# [0.9.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.8.1...v0.9.0) (2016-11-03)
+
+
+### Bug Fixes
+
+* **deps:** remove unused pull dep ([06689e3](https://github.com/libp2p/js-libp2p-tcp/commit/06689e3))
+
+
+
+<a name="0.8.1"></a>
+## [0.8.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.8.0...v0.8.1) (2016-09-06)
+
+
+
+<a name="0.8.0"></a>
+# [0.8.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.4...v0.8.0) (2016-09-06)
+
+
+### Features
+
+* **deps:** update to published deps ([da8ee21](https://github.com/libp2p/js-libp2p-tcp/commit/da8ee21))
+* **pull:** migration to pull-streams ([5e89a26](https://github.com/libp2p/js-libp2p-tcp/commit/5e89a26))
+* **readme:** add pull-streams documentation ([d9f65e0](https://github.com/libp2p/js-libp2p-tcp/commit/d9f65e0))
+
+
+
+<a name="0.7.4"></a>
+## [0.7.4](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.3...v0.7.4) (2016-08-03)
+
+
+
+<a name="0.7.3"></a>
+## [0.7.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.2...v0.7.3) (2016-06-26)
+
+
+
+<a name="0.7.2"></a>
+## [0.7.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.1...v0.7.2) (2016-06-23)
+
+
+
+<a name="0.7.1"></a>
+## [0.7.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.7.0...v0.7.1) (2016-06-23)
+
+
+### Bug Fixes
+
+* error was passed in duplicate ([9ac5cca](https://github.com/libp2p/js-libp2p-tcp/commit/9ac5cca))
+
+
+
+<a name="0.7.0"></a>
+# [0.7.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.2...v0.7.0) (2016-06-22)
+
+
+
+<a name="0.6.2"></a>
+## [0.6.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.1...v0.6.2) (2016-06-01)
+
+
+### Bug Fixes
+
+* address cr ([2ed01e8](https://github.com/libp2p/js-libp2p-tcp/commit/2ed01e8))
+* destroy hanging connections after timeout ([4a12169](https://github.com/libp2p/js-libp2p-tcp/commit/4a12169))
+
+
+
+<a name="0.6.1"></a>
+## [0.6.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.6.0...v0.6.1) (2016-05-29)
+
+
+
+<a name="0.6.0"></a>
+# [0.6.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.3...v0.6.0) (2016-05-22)
+
+
+
+<a name="0.5.3"></a>
+## [0.5.3](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.2...v0.5.3) (2016-05-22)
+
+
+
+<a name="0.5.2"></a>
+## [0.5.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.1...v0.5.2) (2016-05-09)
+
+
+
+<a name="0.5.1"></a>
+## [0.5.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.5.0...v0.5.1) (2016-05-08)
+
+
+
+<a name="0.5.0"></a>
+# [0.5.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.4.0...v0.5.0) (2016-04-25)
+
+
+
+<a name="0.4.0"></a>
+# [0.4.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.3.0...v0.4.0) (2016-03-14)
+
+
+
+<a name="0.3.0"></a>
+# [0.3.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.2.1...v0.3.0) (2016-03-10)
+
+
+
+<a name="0.2.1"></a>
+## [0.2.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.2.0...v0.2.1) (2016-03-04)
+
+
+
+<a name="0.2.0"></a>
+# [0.2.0](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.2...v0.2.0) (2016-03-04)
+
+
+
+<a name="0.1.2"></a>
+## [0.1.2](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.1...v0.1.2) (2015-10-29)
+
+
+
+<a name="0.1.1"></a>
+## [0.1.1](https://github.com/libp2p/js-libp2p-tcp/compare/v0.1.0...v0.1.1) (2015-09-17)
+
+
+
+<a name="0.1.0"></a>
+# 0.1.0 (2015-09-16)
+
+
+

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 David Dias
+Copyright (c) 2015-2016 David Dias
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,81 +1,112 @@
-js-libp2p-tcp
+# js-libp2p-tcp
-===============
 
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
 [![Build Status](https://travis-ci.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://travis-ci.org/libp2p/js-libp2p-tcp)
-![](https://img.shields.io/badge/coverage-%3F-yellow.svg?style=flat-square)
+[![Coverage Status](https://coveralls.io/repos/github/libp2p/js-libp2p-tcp/badge.svg?branch=master)](https://coveralls.io/github/libp2p/js-libp2p-tcp?branch=master)
 [![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://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square)
 
-![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)
+[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
-![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)
+[![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)](https://github.com/libp2p/interface-connection)
 
-> Node.js implementation of the TCP module that libp2p uses, which implements
-> the [interface-connection](https://github.com/libp2p/interface-connection)
-> interface for dial/listen.
 
-## Description
+> 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 transports.
 
-`libp2p-tcp` in Node.js is a very thin shim that adds support for dialing to a
+## Lead Maintainer
-`multiaddr`. This small shim will enable libp2p to use other different
-transports.
 
-## Example
+[Jacob Heun](https://github.com/jacobheun)
 
-```js
+## Table of Contents
-const TCP = require('libp2p-tcp')
-const multiaddr = require('multiaddr')
 
-const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+- [Install](#install)
-const mh2 = multiaddr('/ip6/::/tcp/9092')
+  - [npm](#npm)
+- [Usage](#usage)
+- [API](#api)
+- [Contribute](#contribute)
+- [License](#license)
 
-const tcp = new Tcp()
+## Install
-
-var listener = tcp.createListener(mh1, function handler (socket) {
-  console.log('connection')
-  socket.end('bye')
-})
-
-var listener.listen(function ready () {
-  console.log('ready')
-
-  const client = tcp.dial(mh1)
-  client.pipe(process.stdout)
-  client.on('end', () => {
-    tcp.close()
-  })
-})
-
-```
-
-outputs
-
-```
-ready
-connection
-bye
-```
-
-## Installation
 
 ### npm
 
 ```sh
-> npm i libp2p-tcp
+> npm install libp2p-tcp
+```
+
+## Usage
+
+```js
+const TCP = require('libp2p-tcp')
+const multiaddr = require('multiaddr')
+const pipe = require('it-pipe')
+const { collect } = require('streaming-iterables')
+
+const addr = multiaddr('/ip4/127.0.0.1/tcp/9090')
+
+const tcp = new TCP()
+
+const listener = tcp.createListener((socket) => {
+  console.log('new connection opened')
+  pipe(
+    ['hello'],
+    socket
+  )
+})
+
+await listener.listen([addr])
+console.log('listening')
+
+const socket = await tcp.dial(addr)
+const values = await pipe(
+  socket,
+  collect
+)
+console.log(`Value: ${values.toString()}`)
+
+// Close connection after reading
+await listener.close()
+```
+
+Outputs:
+
+```sh
+listening
+new connection opened
+Value: hello
 ```
 
 ## API
 
-[![](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)](https://github.com/diasdavid/interface-transport)
+### Transport
 
-`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:
+[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
+
+`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)
+
+## Contribute
+
+Contributions are welcome! The libp2p implementation in JavaScript is a work in progress. As such, there's a few things you can do right now to help out:
+
+- [Check out the existing issues](//github.com/libp2p/js-libp2p-tcp/issues).
+- **Perform code reviews**.
+- **Add tests**. There can never be enough tests.
+
+Please be aware that all interactions related to libp2p are subject to the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
+
+Small note: If editing the README, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
 
 ## License
 
-MIT
+[MIT](LICENSE) © 2015-2016 David Dias

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
@@ -5,8 +6,10 @@ machine:
 dependencies:
   pre:
     - google-chrome --version
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo dpkg -i google-chrome.deb || true
     - sudo apt-get update
-    - sudo apt-get --only-upgrade install google-chrome-stable
+    - sudo apt-get install -f
+    - sudo apt-get install --only-upgrade lsb-base
+    - sudo dpkg -i google-chrome.deb
     - google-chrome --version

package.json

@@ -1,57 +1,80 @@
 {
   "name": "libp2p-tcp",
-  "version": "0.7.1",
+  "version": "0.13.0",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
-  "main": "lib/index.js",
+  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
-  "jsnext:main": "src/index.js",
+  "main": "src/index.js",
   "scripts": {
-    "lint": "aegir-lint",
+    "lint": "aegir lint",
-    "build": "aegir-build --env node",
+    "test": "aegir test -t node",
-    "test": "aegir-test --env node",
+    "test:node": "aegir test -t node",
-    "release": "aegir-release --env node",
+    "build": "aegir build",
-    "release-minor": "aegir-release --type minor --env node",
+    "docs": "aegir docs",
-    "release-major": "aegir-release --type major --env node",
+    "release": "aegir release --docs -t node",
-    "coverage": "aegir-coverage",
+    "release-minor": "aegir release --type minor --docs -t node",
+    "release-major": "aegir release --type major --docs -t node",
+    "coverage": "aegir coverage",
     "coverage-publish": "aegir-coverage publish"
   },
-  "pre-commit": [
+  "pre-push": [
     "lint",
     "test"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/diasdavid/js-libp2p-tcp.git"
+    "url": "https://github.com/libp2p/js-libp2p-tcp.git"
   },
   "keywords": [
     "IPFS"
   ],
-  "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/diasdavid/js-libp2p-tcp/issues"
+    "url": "https://github.com/libp2p/js-libp2p-tcp/issues"
+  },
+  "homepage": "https://github.com/libp2p/js-libp2p-tcp",
+  "engines": {
+    "node": ">=6.0.0",
+    "npm": ">=3.0.0"
   },
-  "homepage": "https://github.com/diasdavid/js-libp2p-tcp",
   "devDependencies": {
-    "aegir": "^3.0.4",
+    "aegir": "^18.1.1",
-    "chai": "^3.5.0",
+    "chai": "^4.1.2",
-    "interface-transport": "^0.2.0",
+    "dirty-chai": "^2.0.1",
-    "pre-commit": "^1.1.2",
+    "lodash.isfunction": "^3.0.9",
-    "tape": "^4.5.1"
+    "pull-stream": "^3.6.9",
+    "sinon": "^7.3.1"
   },
   "dependencies": {
-    "duplexify": "^3.4.3",
+    "abort-controller": "^3.0.0",
-    "interface-connection": "0.1.2",
+    "class-is": "^1.1.0",
-    "ip-address": "^5.8.0",
+    "debug": "^4.1.1",
-    "lodash.contains": "^2.4.3",
+    "err-code": "^1.1.2",
-    "mafmt": "^2.1.0",
+    "interface-connection": "~0.3.3",
-    "multiaddr": "^2.0.2",
+    "interface-transport": "~0.4.0",
-    "run-parallel": "^1.1.6"
+    "ip-address": "^5.8.9",
+    "it-pipe": "^1.0.0",
+    "lodash.includes": "^4.3.0",
+    "lodash.isfunction": "^3.0.9",
+    "mafmt": "^6.0.7",
+    "multiaddr": "^6.0.6",
+    "streaming-iterables": "^4.1.0"
   },
   "contributors": [
+    "Alan Shaw <alan@tableflip.io>",
     "David Dias <daviddias.p@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>",
+    "Pedro Teixeira <i@pgte.me>",
+    "Prashanth Chandra <coolshanth94@gmail.com>",
     "Richard Littauer <richard.littauer@gmail.com>",
     "Stephen Whitmore <stephen.whitmore@gmail.com>",
-    "dignifiedquire <dignifiedquire@gmail.com>"
+    "TomCoded <tomtinkerer@gmail.com>"
   ]
-}
+}

src/adapter.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const { Adapter } = require('interface-transport')
+const withIs = require('class-is')
+const TCP = require('.')
+
+// Legacy adapter to old transport & connection interface
+class TcpAdapter extends Adapter {
+  constructor () {
+    super(new TCP())
+  }
+}
+
+module.exports = withIs(TcpAdapter, {
+  className: 'TCP',
+  symbolName: '@libp2p/js-libp2p-tcp/tcp'
+})

src/constants.js

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

src/get-multiaddr.js

@@ -0,0 +1,33 @@
+'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,220 +1,103 @@
 'use strict'
 
-const debug = require('debug')
+const net = require('net')
-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 withIs = require('class-is')
-const contains = require('lodash.contains')
+const includes = require('lodash.includes')
-const os = require('os')
+const isFunction = require('lodash.isfunction')
-const Connection = require('interface-connection').Connection
+const errcode = require('err-code')
+const debug = require('debug')
+const log = debug('libp2p:tcp:dial')
 
-exports = module.exports = TCP
+const Libp2pSocket = require('./socket')
+const createListener = require('./listener')
+const { AbortError } = require('interface-transport')
 
-const IPFS_CODE = 421
+function noop () {}
-const CLOSE_TIMEOUT = 2000
 
-function TCP () {
+class TCP {
-  if (!(this instanceof TCP)) {
+  async dial (ma, options) {
-    return new TCP()
+    const cOpts = ma.toOptions()
+    log('Connecting to %s:%s', cOpts.host, cOpts.port)
+
+    const rawSocket = await this._connect(cOpts, options)
+    return new Libp2pSocket(rawSocket, ma, options)
   }
 
-  this.dial = function (ma, options, callback) {
+  _connect (cOpts, options = {}) {
-    if (typeof options === 'function') {
+    return new Promise((resolve, reject) => {
-      callback = options
+      if ((options.signal || {}).aborted) {
-      options = {}
+        return reject(new AbortError())
-    }
+      }
 
-    if (!callback) {
+      const start = Date.now()
-      callback = function noop () {}
+      const rawSocket = net.connect(cOpts)
-    }
 
-    const socket = tcp.connect(ma.toOptions())
+      const onError = (err) => {
-    const conn = new Connection(socket)
+        const msg = `Error connecting to ${cOpts.host}:${cOpts.port}: ${err.message}`
+        done(errcode(msg, err.code))
+      }
 
-    socket.on('timeout', () => {
+      const onTimeout = () => {
-      conn.emit('timeout')
+        log('Timeout connecting to %s:%s', cOpts.host, cOpts.port)
+        const err = errcode(`Timeout after ${Date.now() - start}ms`, 'ETIMEDOUT')
+        rawSocket.emit('error', err)
+      }
+
+      const onConnect = () => {
+        log('Connected to %s:%s', cOpts.host, cOpts.port)
+        done(null, rawSocket)
+      }
+
+      const onAbort = () => {
+        log('Connect to %s:%s aborted', cOpts.host, cOpts.port)
+        rawSocket.destroy()
+        done(new AbortError())
+      }
+
+      const done = (err, res) => {
+        rawSocket.removeListener('error', onError)
+        rawSocket.removeListener('timeout', onTimeout)
+        rawSocket.removeListener('connect', onConnect)
+        options.signal && options.signal.removeEventListener(onAbort)
+
+        err ? reject(err) : resolve(res)
+      }
+
+      rawSocket.once('error', onError)
+      rawSocket.once('timeout', onTimeout)
+      rawSocket.once('connect', onConnect)
+      options.signal && options.signal.addEventListener('abort', onAbort)
     })
-
-    socket.on('connect', () => {
-      callback(null, conn)
-      conn.emit('connect')
-    })
-
-    conn.getObservedAddrs = (cb) => {
-      return cb(null, [ma])
-    }
-
-    return conn
   }
 
-  this.createListener = (options, handler) => {
+  createListener (options, handler) {
-    if (typeof options === 'function') {
+    if (isFunction(options)) {
       handler = options
       options = {}
     }
 
-    const listener = tcp.createServer((socket) => {
+    handler = handler || noop
-      const conn = new Connection(socket)
+    return createListener(options, handler)
-
-      conn.getObservedAddrs = (cb) => {
-        return cb(null, [getMultiaddr(socket)])
-      }
-      handler(conn)
-    })
-
-    let ipfsId
-    let listeningMultiaddr
-
-    listener._listen = listener.listen
-    listener.listen = (ma, callback) => {
-      listeningMultiaddr = ma
-      if (contains(ma.protoNames(), 'ipfs')) {
-        ipfsId = ma.stringTuples().filter((tuple) => {
-          if (tuple[0] === IPFS_CODE) {
-            return true
-          }
-        })[0][1]
-        listeningMultiaddr = ma.decapsulate('ipfs')
-      }
-
-      listener._listen(listeningMultiaddr.toOptions(), callback)
-    }
-
-    listener._close = listener.close
-    listener.close = (options, callback) => {
-      if (typeof options === 'function') {
-        callback = options
-        options = {}
-      }
-      if (!callback) { callback = function noop () {} }
-      if (!options) { options = {} }
-
-      let closed = false
-      listener._close(callback)
-      listener.once('close', () => {
-        closed = true
-      })
-      setTimeout(() => {
-        if (closed) {
-          return
-        }
-        log('unable to close graciously, destroying conns')
-        Object.keys(listener.__connections).forEach((key) => {
-          log('destroying %s', key)
-          listener.__connections[key].destroy()
-        })
-      }, options.timeout || CLOSE_TIMEOUT)
-    }
-
-    // Keep track of open connections to destroy in case of timeout
-    listener.__connections = {}
-    listener.on('connection', (socket) => {
-      const key = `${socket.remoteAddress}:${socket.remotePort}`
-      listener.__connections[key] = socket
-
-      socket.on('close', () => {
-        delete listener.__connections[key]
-      })
-    })
-
-    listener.getAddrs = (callback) => {
-      const multiaddrs = []
-      const address = listener.address()
-
-      // Because TCP will only return the IPv6 version
-      // we need to capture from the passed multiaddr
-      if (listeningMultiaddr.toString().indexOf('ip4') !== -1) {
-        let m = listeningMultiaddr.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 (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 listener
-    /*
-      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') {
-          let mh = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
-          if (ipfsHashId) {
-            mh = mh.encapsulate('/ipfs/' + ipfsHashId)
-          }
-
-          freshMultiaddrs.push(mh)
-        }
-
-        cb()
-      })
-      listeners.push(listener)
-    */
   }
 
-  this.filter = (multiaddrs) => {
+  filter (multiaddrs) {
     if (!Array.isArray(multiaddrs)) {
       multiaddrs = [multiaddrs]
     }
+
     return multiaddrs.filter((ma) => {
-      if (contains(ma.protoNames(), 'ipfs')) {
+      if (includes(ma.protoNames(), 'p2p-circuit')) {
+        return false
+      }
+
+      if (includes(ma.protoNames(), 'ipfs')) {
         ma = ma.decapsulate('ipfs')
       }
+
       return mafmt.TCP.matches(ma)
     })
   }
 }
 
-function getMultiaddr (socket) {
+module.exports = withIs(TCP, { className: 'TCP', symbolName: '@libp2p/js-libp2p-tcp/tcp' })
-  var mh
-
-  if (socket.remoteFamily === 'IPv6') {
-    var addr = new Address6(socket.remoteAddress)
-    if (addr.v4) {
-      var ip4 = addr.to4().correctForm()
-      mh = multiaddr('/ip4/' + ip4 + '/tcp/' + socket.remotePort)
-    } else {
-      mh = multiaddr('/ip6/' + socket.remoteAddress + '/tcp/' + socket.remotePort)
-    }
-  } else {
-    mh = multiaddr('/ip4/' + socket.remoteAddress + '/tcp/' + socket.remotePort)
-  }
-
-  return mh
-}

src/listener.js

@@ -0,0 +1,212 @@
+'use strict'
+
+const multiaddr = require('multiaddr')
+const os = require('os')
+const net = require('net')
+const EventEmitter = require('events').EventEmitter
+const { AllListenersFailedError } = require('interface-transport')
+const debug = require('debug')
+const log = debug('libp2p:tcp:listen')
+log.error = debug('libp2p:tcp:listen:error')
+
+const Libp2pSocket = require('./socket')
+const getMultiaddr = require('./get-multiaddr')
+const c = require('./constants')
+
+function noop () {}
+
+class Listener extends EventEmitter {
+  /**
+   *
+   * @param {object} options
+   * @param {function(Connection)} handler
+   */
+  constructor (options, handler) {
+    super()
+    this._options = options
+    this._connectionHandler = handler
+    this._servers = new Set()
+    this.__connections = new Map()
+  }
+
+  /**
+   * Closes all open servers
+   * @param {object} options
+   * @param {number} options.timeout how long before closure is forced, defaults to 2000 ms
+   * @returns {Promise}
+   */
+  close (options = {}) {
+    if ([...this._servers].filter(server => server.listening).length === 0) {
+      return
+    }
+
+    // Close all running servers in parallel
+    return Promise.all(
+      [...this._servers].map(server => {
+        return new Promise((resolve, reject) => {
+          const start = Date.now()
+
+          // Attempt to stop the server. If it takes longer than the timeout,
+          // destroy all the underlying sockets manually.
+          const timeout = setTimeout(() => {
+            log('Timeout closing server after %dms, destroying connections manually', Date.now() - start)
+            resolve()
+          }, options.timeout || c.CLOSE_TIMEOUT)
+
+          server.once('close', () => {
+            clearTimeout(timeout)
+            this._servers.delete(server)
+          })
+
+          server.close((err) => err ? reject(err) : resolve())
+        })
+      })
+    ).then(() => {
+      this.__connections.forEach((connection, key) => {
+        log('destroying %s', key)
+        connection.destroy()
+      })
+      this.__connections.clear()
+      this._servers.clear()
+    })
+  }
+
+  /**
+   * Creates servers listening on the given `addrs`
+   * @async
+   * @param {Array<Multiaddr>} addrs
+   */
+  async listen (addrs) {
+    addrs = Array.isArray(addrs) ? addrs : [addrs]
+
+    let listeners = []
+    let errors = []
+
+    // Filter out duplicate ports, unless it's port 0
+    addrs = uniqueBy(addrs, (addr) => {
+      const port = Number(addr.toOptions().port)
+      return isNaN(port) || port === 0 ? addr.toString() : port
+    })
+
+    for (const ma of addrs) {
+      const lOpts = ma.toOptions()
+
+      listeners.push(
+        new Promise((resolve) => {
+          const server = net.createServer(this._onSocket.bind(this))
+          this._servers.add(server)
+          // TODO: clean these up
+          server.on('listening', () => this.emit('listening'))
+          server.on('close', () => this.emit('close'))
+          server.on('error', (err) => this.emit('error', err))
+
+          server.listen(lOpts.port, lOpts.host, (err) => {
+            if (err) {
+              errors.push(err)
+              return resolve()
+            }
+
+            log('Listening on %s %s', lOpts.port, lOpts.host)
+            resolve()
+          })
+        })
+      )
+    }
+
+    return Promise.all(listeners)
+      .then(() => {
+        errors.forEach((err) => {
+          log.error('received an error while attempting to listen', err)
+        })
+
+        // All servers failed to listen, throw an error
+        if (errors.length === listeners.length) {
+          throw new AllListenersFailedError()
+        }
+      })
+  }
+
+  /**
+   * Return the addresses we are listening on
+   * @returns {Array<Multiaddr>}
+   */
+  getAddrs () {
+    const multiaddrs = []
+    this._servers.forEach(server => {
+      const address = server.address()
+
+      if (address.address === '0.0.0.0') {
+        const netInterfaces = os.networkInterfaces()
+        Object.keys(netInterfaces).forEach((niKey) => {
+          netInterfaces[niKey].forEach((ni) => {
+            if (ni.internal === false && ni.family === address.family) {
+              multiaddrs.push(
+                multiaddr.fromNodeAddress({
+                  ...address,
+                  address: ni.address
+                }, 'tcp')
+              )
+            }
+          })
+        })
+      // TODO: handle IPv6 wildcard
+      } else {
+        multiaddrs.push(multiaddr.fromNodeAddress(address, 'tcp'))
+      }
+    })
+
+    if (multiaddrs.length === 0) {
+      throw new Error('Listener is not ready yet')
+    }
+
+    return multiaddrs
+  }
+
+  /**
+   * Handler for new sockets from `net.createServer`
+   * @param {net.Socket} socket
+   */
+  _onSocket (socket) {
+    // Avoid uncaught errors caused by unstable connections
+    socket.on('error', noop)
+
+    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
+    }
+
+    log('new connection', addr.toString())
+
+    const s = new Libp2pSocket(socket, addr)
+
+    // Track the connection
+    const key = `${socket.remoteAddress}:${socket.remotePort}`
+    this.__connections.set(key, socket)
+    socket.once('close', () => {
+      this.__connections.delete(key)
+    })
+
+    this._connectionHandler(s)
+    this.emit('connection', s)
+  }
+}
+
+module.exports = (options, handler) => {
+  return new Listener(options, handler)
+}
+
+/**
+ * Get unique values from `arr` using `getValue` to determine
+ * what is used for uniqueness
+ * @param {Array} arr The array to get unique values for
+ * @param {function(value)} getValue The function to determine what is compared
+ * @returns {Array}
+ */
+function uniqueBy (arr, getValue) {
+  return [...new Map(arr.map((i) => [getValue(i), i])).values()]
+}

src/socket.js

@@ -0,0 +1,65 @@
+'use strict'
+
+const debug = require('debug')
+const log = debug('libp2p:tcp:socket')
+
+const c = require('./constants')
+
+class Libp2pSocket {
+  constructor (rawSocket, ma, opts) {
+    this._rawSocket = rawSocket
+    this._ma = ma
+
+    this.sink = this._sink(opts)
+    this.source = rawSocket
+  }
+
+  _sink (opts = {}) {
+    // By default, close when the source is exhausted
+    const closeOnEnd = opts.closeOnEnd !== false
+    return (source) => this._write(source, closeOnEnd)
+  }
+
+  async _write (source, closeOnEnd) {
+    for await (const data of source) {
+      const flushed = this._rawSocket.write(data)
+      if (!flushed) {
+        await new Promise((resolve) => this._rawSocket.once('drain', resolve))
+      }
+    }
+
+    if (closeOnEnd) {
+      await this.close()
+    }
+  }
+
+  close (opts = {}) {
+    if (this._rawSocket.pending || this._rawSocket.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 cOpts = this._ma.toOptions()
+        log('Timeout closing socket to %s:%s after %dms, destroying it manually',
+          cOpts.host, cOpts.port, Date.now() - start)
+        this._rawSocket.destroy()
+        resolve()
+      }, opts.timeout || c.CLOSE_TIMEOUT)
+
+      this._rawSocket.once('close', () => clearTimeout(timeout))
+
+      this._rawSocket.end((err) => err ? reject(err) : resolve())
+    })
+  }
+
+  getObservedAddrs () {
+    return [this._ma]
+  }
+}
+
+module.exports = Libp2pSocket

test/adapter/connection-wrap.spec.js

@@ -0,0 +1,121 @@
+/* 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/adapter')
+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/adapter/connection.spec.js

@@ -0,0 +1,111 @@
+/* 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/adapter')
+const multiaddr = require('multiaddr')
+
+describe('valid Connection', () => {
+  let tcp
+
+  beforeEach(() => {
+    tcp = new TCP()
+  })
+
+  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+
+  it('get observed addrs', (done) => {
+    let dialerObsAddrs
+
+    const listener = tcp.createListener((conn) => {
+      expect(conn).to.exist()
+      conn.getObservedAddrs((err, addrs) => {
+        expect(err).to.not.exist()
+        dialerObsAddrs = addrs
+        pull(pull.empty(), conn)
+      })
+    })
+
+    listener.listen(ma, () => {
+      const conn = tcp.dial(ma)
+      pull(
+        conn,
+        pull.onEnd(endHandler)
+      )
+
+      function endHandler () {
+        conn.getObservedAddrs((err, addrs) => {
+          expect(err).to.not.exist()
+          pull(pull.empty(), conn)
+          closeAndAssert(listener, addrs)
+        })
+      }
+
+      function closeAndAssert (listener, addrs) {
+        listener.close(() => {
+          expect(addrs[0]).to.deep.equal(ma)
+          expect(dialerObsAddrs.length).to.equal(1)
+          done()
+        })
+      }
+    })
+  })
+
+  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)
+      })
+    })
+
+    listener.listen(ma, () => {
+      const conn = tcp.dial(ma)
+
+      pull(conn, pull.onEnd(endHandler))
+
+      function endHandler () {
+        conn.getPeerInfo((err, peerInfo) => {
+          expect(err).to.exist()
+          expect(peerInfo).to.not.exist()
+
+          listener.close(done)
+        })
+      }
+    })
+  })
+
+  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)
+      })
+    })
+
+    listener.listen(ma, () => {
+      const conn = tcp.dial(ma)
+
+      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)
+        })
+      }
+    })
+  })
+})

test/adapter/listen-dial.spec.js

@@ -0,0 +1,259 @@
+/* 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/adapter')
+const net = require('net')
+const multiaddr = require('multiaddr')
+const isCI = process.env.CI
+
+describe('listen', () => {
+  let tcp
+
+  beforeEach(() => {
+    tcp = new TCP()
+  })
+
+  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)
+    })
+
+    listener.listen(mh, () => {
+      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', () => {})
+      socket1.on('connect', () => {
+        listener.close(done)
+      })
+    })
+  })
+
+  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)
+    })
+  })
+
+  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 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('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('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 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 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 does not preserve 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.decapsulate('ipfs'))
+        listener.close(done)
+      })
+    })
+  })
+})
+
+describe('dial', () => {
+  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,
+        pull.map((x) => Buffer.from(x.toString() + '!')),
+        conn
+      )
+    })
+    listener.listen(ma, done)
+  })
+
+  afterEach((done) => {
+    listener.close(done)
+  })
+
+  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 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', (done) => {
+    if (isCI) { return done() }
+
+    const ma = multiaddr('/ip6/::/tcp/9066')
+    const listener = tcp.createListener((conn) => {
+      pull(conn, conn)
+    })
+    listener.listen(ma, () => {
+      pull(
+        pull.values(['hey']),
+        tcp.dial(ma),
+        pull.collect((err, values) => {
+          expect(err).to.not.exist()
+
+          expect(values).to.be.eql([Buffer.from('hey')])
+
+          listener.close(done)
+        })
+      )
+    })
+  })
+
+  it('dial and destroy on listener', (done) => {
+    let count = 0
+    const closed = () => ++count === 2 ? finish() : null
+
+    const ma = multiaddr('/ip6/::/tcp/9067')
+
+    const listener = tcp.createListener((conn) => {
+      pull(
+        pull.empty(),
+        conn,
+        pull.onEnd(closed)
+      )
+    })
+
+    listener.listen(ma, () => {
+      pull(tcp.dial(ma), pull.onEnd(closed))
+    })
+
+    function finish () {
+      listener.close(done)
+    }
+  })
+
+  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))
+    })
+
+    listener.listen(ma, () => {
+      pull(
+        pull.empty(),
+        tcp.dial(ma),
+        pull.onEnd(destroyed)
+      )
+    })
+
+    function finish () {
+      listener.close(done)
+    }
+  })
+
+  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)
+
+    pull(
+      pull.values(['hey']),
+      conn,
+      pull.collect((err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.be.eql([Buffer.from('hey!')])
+        done()
+      })
+    )
+  })
+})

test/compliance.spec.js

@@ -0,0 +1,43 @@
+/* eslint-env mocha */
+'use strict'
+
+const sinon = require('sinon')
+const tests = require('interface-transport')
+const multiaddr = require('multiaddr')
+const net = require('net')
+const TCP = require('../src')
+
+describe('interface-transport compliance', () => {
+  tests({
+    setup () {
+      const tcp = new TCP()
+      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')
+      ]
+
+      // 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.spec.js

@@ -0,0 +1,55 @@
+/* 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')
+const multiaddr = require('multiaddr')
+
+describe('valid Connection', () => {
+  let tcp
+
+  beforeEach(() => {
+    tcp = new TCP()
+  })
+
+  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+
+  it('get observed addrs', async () => {
+    // Create a Promise that resolves when a connection is handled
+    let handled
+    const handlerPromise = new Promise((resolve) => {
+      handled = resolve
+    })
+
+    const handler = async (conn) => {
+      expect(conn).to.exist()
+      const dialerObsAddrs = await conn.getObservedAddrs()
+      handled(dialerObsAddrs)
+    }
+
+    // Create a listener with the handler
+    const listener = tcp.createListener(handler)
+
+    // Listen on the multi-address
+    await listener.listen(ma)
+
+    // Dial to that same address
+    const conn = await tcp.dial(ma)
+    const addrs = await conn.getObservedAddrs()
+
+    // Wait for the incoming dial to be handled
+    const dialerObsAddrs = await handlerPromise
+
+    // Close the listener
+    await listener.close()
+
+    // The addresses should match
+    expect(addrs.length).to.equal(1)
+    expect(addrs[0]).to.deep.equal(ma)
+    expect(dialerObsAddrs.length).to.equal(1)
+    expect(dialerObsAddrs[0]).to.exist()
+  })
+})

test/constructor.spec.js

@@ -0,0 +1,15 @@
+/* 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

@@ -0,0 +1,44 @@
+/* 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')
+const multiaddr = require('multiaddr')
+
+describe('filter addrs', () => {
+  const base = '/ip4/127.0.0.1'
+  const ipfs = '/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw'
+
+  let tcp
+
+  before(() => {
+    tcp = new TCP()
+  })
+
+  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 valid = tcp.filter([ma1, ma2, ma3, ma4, ma5, ma6, ma7, ma8])
+    expect(valid.length).to.equal(4)
+    expect(valid[0]).to.deep.equal(ma1)
+    expect(valid[1]).to.deep.equal(ma4)
+  })
+
+  it('filter a single addr for this transport', () => {
+    const ma1 = multiaddr(base + '/tcp/9090')
+
+    const valid = tcp.filter(ma1)
+    expect(valid.length).to.equal(1)
+    expect(valid[0]).to.eql(ma1)
+  })
+})

test/get-multiaddr.spec.js

@@ -0,0 +1,54 @@
+/* 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/interface-transport.spec.js

@@ -1,23 +0,0 @@
-/* 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)
-  })
-})

test/libp2p-tcp.spec.js

@@ -1,483 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const expect = require('chai').expect
-const TCP = require('../src')
-const net = require('net')
-const multiaddr = require('multiaddr')
-const Connection = require('interface-connection').Connection
-
-describe('instantiate the transport', () => {
-  it('create', (done) => {
-    const tcp = new TCP()
-    expect(tcp).to.exist
-    done()
-  })
-
-  it('create without new', (done) => {
-    const tcp = TCP()
-    expect(tcp).to.exist
-    done()
-  })
-})
-
-describe('listen', () => {
-  let tcp
-
-  beforeEach(() => {
-    tcp = new TCP()
-  })
-
-  it('listen, check for callback', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
-  })
-
-  it('listen, check for listening event', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.on('listening', () => {
-      listener.close(done)
-    })
-    listener.listen(mh)
-  })
-
-  it('listen, check for the close event', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.on('close', done)
-    listener.on('listening', () => {
-      listener.close()
-    })
-    listener.listen(mh)
-  })
-
-  it('listen on addr with /ipfs/QmHASH', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
-  })
-
-  it('close listener with connections, through timeout', (done) => {
-    const mh = multiaddr('/ip4/127.0.0.1/tcp/9091/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-    const listener = tcp.createListener((conn) => {
-      conn.pipe(conn)
-    })
-    listener.listen(mh, () => {
-      const socket1 = net.connect(9091)
-      const socket2 = net.connect(9091)
-      socket1.write('Some data that is never handled')
-      socket1.end()
-      socket1.on('error', () => {})
-      socket2.on('error', () => {})
-      socket1.on('connect', () => {
-        listener.close(done)
-      })
-    })
-  })
-
-  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)
-    })
-  })
-
-  it('listen on IPv6 addr', (done) => {
-    const mh = multiaddr('/ip6/::/tcp/9090')
-    const listener = tcp.createListener((conn) => {})
-    listener.listen(mh, () => {
-      listener.close(done)
-    })
-  })
-
-  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('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)
-        // multiaddrs.forEach((ma) => {
-        //  console.log(ma.toString())
-        // })
-        expect(multiaddrs[0]).to.deep.equal(mh)
-        listener.close(done)
-      })
-    })
-  })
-
-  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)
-        // multiaddrs.forEach((ma) => {
-        //  console.log(ma.toString())
-        // })
-
-        listener.close(done)
-      })
-    })
-  })
-
-  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)
-        // multiaddrs.forEach((ma) => {
-        //  console.log(ma.toString())
-        // })
-        listener.close(done)
-      })
-    })
-  })
-
-  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)
-        // multiaddrs.forEach((ma) => {
-        //  console.log(ma.toString())
-        // })
-        listener.close(done)
-      })
-    })
-  })
-
-  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)
-        // multiaddrs.forEach((ma) => {
-        //  console.log(ma.toString())
-        // })
-        expect(multiaddrs[0]).to.deep.equal(mh)
-        listener.close(done)
-      })
-    })
-  })
-})
-
-describe('dial', () => {
-  let tcp
-  let listener
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
-
-  beforeEach((done) => {
-    tcp = new TCP()
-    listener = tcp.createListener((conn) => {
-      conn.pipe(conn)
-    })
-    listener.on('listening', done)
-    listener.listen(ma)
-  })
-
-  afterEach((done) => {
-    listener.close(done)
-  })
-
-  it('dial on IPv4', (done) => {
-    const conn = tcp.dial(ma)
-    conn.write('hey')
-    conn.end()
-    conn.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    conn.on('end', done)
-  })
-
-  it('dial to non existent listener', (done) => {
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/8989')
-    const conn = tcp.dial(ma)
-    conn.on('error', (err) => {
-      expect(err).to.exist
-      done()
-    })
-  })
-
-  it('dial on IPv6', (done) => {
-    const ma = multiaddr('/ip6/::/tcp/9066')
-    const listener = tcp.createListener((conn) => {
-      conn.pipe(conn)
-    })
-    listener.listen(ma, dialStep)
-
-    function dialStep () {
-      const conn = tcp.dial(ma)
-      conn.write('hey')
-      conn.end()
-      conn.on('data', (chunk) => {
-        expect(chunk.toString()).to.equal('hey')
-      })
-      conn.on('end', () => {
-        listener.close(done)
-      })
-    }
-  })
-
-  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)
-    conn.write('hey')
-    conn.end()
-    conn.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    conn.on('end', done)
-  })
-})
-
-describe('filter addrs', () => {
-  let tcp
-
-  before(() => {
-    tcp = new TCP()
-  })
-
-  it('filter valid addrs for this transport', (done) => {
-    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, mh4])
-    expect(valid.length).to.equal(2)
-    expect(valid[0]).to.deep.equal(mh1)
-    expect(valid[1]).to.deep.equal(mh4)
-    done()
-  })
-
-  it('filter a single addr for this transport', (done) => {
-    const mh1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
-
-    const valid = tcp.filter(mh1)
-    expect(valid.length).to.equal(1)
-    expect(valid[0]).to.deep.equal(mh1)
-    done()
-  })
-})
-
-describe('valid Connection', () => {
-  let tcp
-
-  beforeEach(() => {
-    tcp = new TCP()
-  })
-
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
-
-  it('get observed addrs', (done) => {
-    var dialerObsAddrs
-    var listenerObsAddrs
-
-    const listener = tcp.createListener((conn) => {
-      expect(conn).to.exist
-      conn.getObservedAddrs((err, addrs) => {
-        expect(err).to.not.exist
-        dialerObsAddrs = addrs
-        conn.end()
-      })
-    })
-
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
-
-      conn.resume()
-      conn.on('end', () => {
-        conn.getObservedAddrs((err, addrs) => {
-          expect(err).to.not.exist
-          listenerObsAddrs = addrs
-          conn.end()
-
-          listener.close(() => {
-            expect(listenerObsAddrs[0]).to.deep.equal(ma)
-            expect(dialerObsAddrs.length).to.equal(1)
-            done()
-          })
-        })
-      })
-    })
-  })
-
-  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
-        conn.end()
-      })
-    })
-
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
-
-      conn.resume()
-      conn.on('end', () => {
-        conn.getPeerInfo((err, peerInfo) => {
-          expect(err).to.exist
-          expect(peerInfo).to.not.exist
-          conn.end()
-
-          listener.close(done)
-        })
-      })
-    })
-  })
-
-  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')
-        conn.end()
-      })
-    })
-
-    listener.listen(ma, () => {
-      const conn = tcp.dial(ma)
-
-      conn.resume()
-      conn.on('end', () => {
-        conn.setPeerInfo('arroz')
-        conn.getPeerInfo((err, peerInfo) => {
-          expect(err).to.not.exist
-          expect(peerInfo).to.equal('arroz')
-          conn.end()
-
-          listener.close(done)
-        })
-      })
-    })
-  })
-})
-
-describe.skip('turbolence', () => {
-  it('dialer - emits error on the other end is terminated abruptly', (done) => {})
-  it('listener - emits error on the other end is terminated abruptly', (done) => {})
-})
-
-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) => {
-      conn.pipe(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)
-    connWrap.write('hey')
-    connWrap.end()
-    connWrap.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    connWrap.on('end', () => {
-      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()
-    connWrap.write('hey')
-    connWrap.end()
-    connWrap.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    connWrap.on('end', 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')
-    })
-    connWrap.write('hey')
-    connWrap.end()
-    connWrap.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    connWrap.on('end', 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')
-    }
-
-    connWrap3.write('hey')
-    connWrap3.end()
-    connWrap3.on('data', (chunk) => {
-      expect(chunk.toString()).to.equal('hey')
-    })
-    connWrap3.on('end', () => {
-      connWrap3.getPeerInfo((err, peerInfo) => {
-        expect(err).to.not.exist
-        expect(peerInfo).to.equal('inner doll')
-        done()
-      })
-    })
-  })
-})

test/listen-dial.spec.js

@@ -0,0 +1,241 @@
+/* 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')
+const net = require('net')
+const multiaddr = require('multiaddr')
+const pipe = require('it-pipe')
+const { collect, map } = require('streaming-iterables')
+const isCI = process.env.CI
+
+describe('listen', () => {
+  let tcp
+
+  beforeEach(() => {
+    tcp = new TCP()
+  })
+
+  it('close listener with connections, through timeout', async () => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const listener = tcp.createListener((conn) => {
+      pipe(conn, conn)
+    })
+
+    await listener.listen(mh)
+
+    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()
+        resolve()
+      })
+    })
+  })
+
+  it('listen on port 0', async () => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
+    const listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+    await listener.close()
+  })
+
+  it('listen on IPv6 addr', async () => {
+    if (isCI) {
+      return
+    }
+    const mh = multiaddr('/ip6/::/tcp/9090')
+    const listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+    await listener.close()
+  })
+
+  it('listen on any Interface', async () => {
+    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
+    const listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+    await listener.close()
+  })
+
+  it('getAddrs', async () => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090')
+    const 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)
+
+    await listener.close()
+  })
+
+  it('getAddrs on port 0 listen', async () => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/0')
+    const listener = tcp.createListener((conn) => {})
+    await listener.listen(mh)
+
+    const multiaddrs = listener.getAddrs()
+    expect(multiaddrs.length).to.equal(1)
+
+    await listener.close()
+  })
+
+  it('getAddrs from listening on 0.0.0.0', async () => {
+    const mh = multiaddr('/ip4/0.0.0.0/tcp/9090')
+    const 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)
+
+    await listener.close()
+  })
+
+  it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
+    const mh = multiaddr('/ip4/0.0.0.0/tcp/0')
+    const 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)
+
+    await listener.close()
+  })
+
+  it('getAddrs does not preserve IPFS Id', async () => {
+    const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const 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.decapsulate('ipfs'))
+
+    await listener.close()
+  })
+})
+
+describe('dial', () => {
+  let tcp
+  let listener
+  const ma = multiaddr('/ip4/127.0.0.1/tcp/9090')
+
+  beforeEach(async () => {
+    tcp = new TCP()
+    listener = tcp.createListener((conn) => {
+      pipe(
+        conn,
+        map((x) => Buffer.from(x.toString() + '!')),
+        conn
+      )
+    })
+    await listener.listen(ma)
+  })
+
+  afterEach(() => listener.close())
+
+  it('dial on IPv4', async () => {
+    const values = await pipe(
+      ['hey'],
+      await tcp.dial(ma),
+      collect
+    )
+    expect(values).to.eql([Buffer.from('hey!')])
+  })
+
+  it('dial on IPv6', async () => {
+    if (isCI) {
+      return
+    }
+
+    const ma = 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 and destroy on listener', async () => {
+    let handled
+    const handledPromise = new Promise((resolve) => {
+      handled = resolve
+    })
+
+    const ma = multiaddr('/ip6/::/tcp/0')
+
+    const listener = tcp.createListener(async (conn) => {
+      await pipe(
+        [],
+        conn
+      )
+      handled()
+    })
+
+    await listener.listen(ma)
+    const addrs = listener.getAddrs()
+    await pipe(await tcp.dial(addrs[0]))
+
+    await handledPromise
+    await listener.close()
+  })
+
+  it('dial and destroy on dialer', async () => {
+    if (isCI) {
+      return
+    }
+
+    let handled
+    const handledPromise = new Promise((resolve) => {
+      handled = resolve
+    })
+
+    const ma = multiaddr('/ip6/::/tcp/0')
+
+    const listener = tcp.createListener(async (conn) => {
+      // pull(conn, pull.onEnd(destroyed))
+      await pipe(conn)
+      handled()
+    })
+
+    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', async () => {
+    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const conn = await tcp.dial(ma)
+
+    const res = await pipe(
+      ['hey'],
+      conn,
+      collect
+    )
+    expect(res).to.be.eql([Buffer.from('hey!')])
+  })
+})

test/turbolence.spec.js

@@ -0,0 +1,16 @@
+/* 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) => {})
+})