bump dependencies

* feat: custom address filter

BREAKING CHANGE: Only DNS+WSS addresses are now returned on filter by default in the browser. This can be overritten by the filter option and filters are provided in the module.

.aegir.js

@@ -10,23 +10,21 @@ const mockUpgrader = {
 }
 let listener
 
-async function boot () {
+async function before () {
   const ws = new WS({ upgrader: mockUpgrader })
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
   listener = ws.createListener(conn => pipe(conn, conn))
   await listener.listen(ma)
   listener.on('error', console.error)
 }
 
-function shutdown () {
+function after () {
   return listener.close()
 }
 
 module.exports = {
-  hooks: {
+  test: {
-    browser: {
+    before,
-      pre: boot,
+    after
-      post: shutdown
-    }
   }
 }

CHANGELOG.md

@@ -1,3 +1,51 @@
+## [0.15.4](https://github.com/libp2p/js-libp2p-websockets/compare/v0.15.3...v0.15.4) (2021-03-31)
+
+
+
+## [0.15.3](https://github.com/libp2p/js-libp2p-websockets/compare/v0.15.2...v0.15.3) (2021-02-22)
+
+
+
+## [0.15.2](https://github.com/libp2p/js-libp2p-websockets/compare/v0.15.1...v0.15.2) (2021-02-09)
+
+
+### Bug Fixes
+
+* add error event handler ([#118](https://github.com/libp2p/js-libp2p-websockets/issues/118)) ([577d350](https://github.com/libp2p/js-libp2p-websockets/commit/577d3505f559b153ec9e0bbca7d31d2f164712bc))
+
+
+
+## [0.15.1](https://github.com/libp2p/js-libp2p-websockets/compare/v0.15.0...v0.15.1) (2021-02-05)
+
+
+### Bug Fixes
+
+* incompatibility with @evanw/esbuild[#740](https://github.com/libp2p/js-libp2p-websockets/issues/740) ([#120](https://github.com/libp2p/js-libp2p-websockets/issues/120)) ([96244f0](https://github.com/libp2p/js-libp2p-websockets/commit/96244f048929c5225905327ae27a88961fe535f8))
+
+
+
+# [0.15.0](https://github.com/libp2p/js-libp2p-websockets/compare/v0.13.1...v0.15.0) (2020-11-24)
+
+
+### Bug Fixes
+
+* add buffer ([#112](https://github.com/libp2p/js-libp2p-websockets/issues/112)) ([8065e07](https://github.com/libp2p/js-libp2p-websockets/commit/8065e07bad57b5732cdcec5ce3829ac2361604cf))
+* catch thrown maConn errors in listener ([8bfb19a](https://github.com/libp2p/js-libp2p-websockets/commit/8bfb19a78f296c10d8e1a3c0ac608daa9ffcfefc))
+* remove use of assert module ([#101](https://github.com/libp2p/js-libp2p-websockets/issues/101)) ([89d3723](https://github.com/libp2p/js-libp2p-websockets/commit/89d37232b8f603804b6ce5cd8230cc75d2dd8e28))
+* replace node buffers with uint8arrays ([#115](https://github.com/libp2p/js-libp2p-websockets/issues/115)) ([a277bf6](https://github.com/libp2p/js-libp2p-websockets/commit/a277bf6bfbc7ad796e51f7646d7449c203384c06))
+
+
+### Features
+
+* custom address filter ([#116](https://github.com/libp2p/js-libp2p-websockets/issues/116)) ([711c721](https://github.com/libp2p/js-libp2p-websockets/commit/711c721b033d28b3c57c37bf9ca98d0f5d2a58b6))
+
+
+### BREAKING CHANGES
+
+* Only DNS+WSS addresses are now returned on filter by default in the browser. This can be overritten by the filter option and filters are provided in the module.
+
+
+
 <a name="0.14.0"></a>
 # [0.14.0](https://github.com/libp2p/js-libp2p-websockets/compare/v0.13.6...v0.14.0) (2020-08-11)
 

README.md

@@ -35,40 +35,63 @@
 > npm i libp2p-websockets
 ```
 
-### Example
+### Constructor properties
 
 ```js
 const WS = require('libp2p-websockets')
-const multiaddr = require('multiaddr')
-const pipe = require('it-pipe')
-const { collect } = require('streaming-iterables')
 
-const addr = multiaddr('/ip4/0.0.0.0/tcp/9090/ws')
+const properties = {
+  upgrader,
+  filter
+}
 
-const ws = new WS({ upgrader })
+const ws = new WS(properties)
-
-const listener = ws.createListener((socket) => {
-  console.log('new connection opened')
-  pipe(
-    ['hello'],
-    socket
-  )
-})
-
-await listener.listen(addr)
-console.log('listening')
-
-const socket = await ws.dial(addr)
-const values = await pipe(
-  socket,
-  collect
-)
-console.log(`Value: ${values.toString()}`)
-
-// Close connection after reading
-await listener.close()
 ```
 
+| Name | Type | Description | Default |
+|------|------|-------------|---------|
+| upgrader | [`Upgrader`](https://github.com/libp2p/interface-transport#upgrader) | connection upgrader object with `upgradeOutbound` and `upgradeInbound` | **REQUIRED** |
+| filter | `(multiaddrs: Array<Multiaddr>) => Array<Multiaddr>` | override transport addresses filter | **Browser:** DNS+WSS multiaddrs / **Node.js:** DNS+{WS, WSS} multiaddrs |
+
+You can create your own address filters for this transports, or rely in the filters [provided](./src/filters.js).
+
+The available filters are:
+
+- `filters.all`
+  - Returns all TCP and DNS based addresses, both with `ws` or `wss`.
+- `filters.dnsWss`
+  - Returns all DNS based addresses with `wss`.
+- `filters.dnsWsOrWss`
+  - Returns all DNS based addresses, both with `ws` or `wss`.
+
+## Libp2p Usage Example
+
+```js
+const Libp2p = require('libp2p')
+const Websockets = require('libp2p-websockets')
+const filters = require('libp2p-websockets/src/filters')
+const MPLEX = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+
+const transportKey = Websockets.prototype[Symbol.toStringTag]
+const node = await Libp2p.create({
+  modules: {
+    transport: [Websockets],
+    streamMuxer: [MPLEX],
+    connEncryption: [NOISE]
+  },
+  config: {
+    transport: {
+      [transportKey]: { // Transport properties -- Libp2p upgrader is automatically added
+        filter: filters.dnsWsOrWss
+      }
+    }
+  }
+})
+```
+
+For more information see [libp2p/js-libp2p/doc/CONFIGURATION.md#customizing-transports](https://github.com/libp2p/js-libp2p/blob/master/doc/CONFIGURATION.md#customizing-transports).
+
 ## API
 
 ### Transport

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p-websockets",
-  "version": "0.14.0",
+  "version": "0.15.4",
   "description": "JavaScript implementation of the WebSockets module that libp2p uses and that implements the interface-transport spec",
   "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
   "main": "src/index.js",
@@ -16,7 +16,7 @@
     "coverage": "nyc --reporter=lcov --reporter=text npm run test:node"
   },
   "browser": {
-    "src/listener": "./src/listener.browser.js"
+    "./src/listener.js": "./src/listener.browser.js"
   },
   "files": [
     "src",
@@ -40,38 +40,43 @@
   "dependencies": {
     "abortable-iterator": "^3.0.0",
     "class-is": "^1.1.0",
-    "debug": "^4.1.1",
+    "debug": "^4.2.0",
-    "err-code": "^2.0.0",
+    "err-code": "^3.0.1",
-    "it-ws": "^3.0.0",
+    "ipfs-utils": "^6.0.1",
-    "libp2p-utils": "^0.2.0",
+    "it-ws": "^4.0.0",
-    "mafmt": "^8.0.0",
+    "libp2p-utils": "^0.2.1",
-    "multiaddr": "^8.0.0",
+    "mafmt": "^8.0.1",
-    "multiaddr-to-uri": "^6.0.0",
+    "multiaddr": "^9.0.1",
-    "p-timeout": "^3.2.0"
+    "multiaddr-to-uri": "fluencelabs/js-multiaddr-to-uri",
+    "p-defer": "^3.0.0",
+    "p-timeout": "^4.1.0"
   },
   "devDependencies": {
     "abort-controller": "^3.0.0",
-    "aegir": "^25.0.0",
+    "aegir": "^32.2.0",
     "bl": "^4.0.0",
+    "is-loopback-addr": "^1.0.1",
     "it-goodbye": "^2.0.1",
     "it-pipe": "^1.0.1",
-    "libp2p-interfaces": "^0.4.0",
+    "libp2p-interfaces": "^0.8.3",
     "streaming-iterables": "^5.0.2",
-    "uint8arrays": "^1.1.0"
+    "uint8arrays": "^2.1.2",
+    "util": "^0.12.3"
   },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",
     "Jacob Heun <jacobheun@gmail.com>",
-    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Vasco Santos <vasco.santos@moxy.studio>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Francisco Baio Dias <xicombd@gmail.com>",
     "Dmitriy Ryajov <dryajov@gmail.com>",
-    "Hugo Dias <hugomrdias@gmail.com>",
     "Alex Potsides <alex@achingbrain.net>",
+    "Hugo Dias <hugomrdias@gmail.com>",
     "Maciej Krüger <mkg20001@gmail.com>",
     "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
     "Chris Campbell <christopher.d.campbell@gmail.com>",
     "Diogo Silva <fsdiogo@gmail.com>",
+    "Irakli Gozalishvili <contact@gozala.io>",
     "Jack Kleeman <jackkleeman@gmail.com>",
     "Marcin Rataj <lidel@lidel.org>",
     "Michael FIG <michael+github@fig.org>",

src/constants.js

@@ -4,5 +4,9 @@
 exports.CODE_P2P = 421
 exports.CODE_CIRCUIT = 290
 
+exports.CODE_TCP = 6
+exports.CODE_WS = 477
+exports.CODE_WSS = 478
+
 // Time to wait for a connection to close gracefully before destroying it manually
 exports.CLOSE_TIMEOUT = 2000

src/filters.js

@@ -0,0 +1,49 @@
+'use strict'
+
+const mafmt = require('mafmt')
+const {
+  CODE_CIRCUIT,
+  CODE_P2P,
+  CODE_TCP,
+  CODE_WS,
+  CODE_WSS
+} = require('./constants')
+
+module.exports = {
+  all: (multiaddrs) => multiaddrs.filter((ma) => {
+    if (ma.protoCodes().includes(CODE_CIRCUIT)) {
+      return false
+    }
+
+    const testMa = ma.decapsulateCode(CODE_P2P)
+
+    return mafmt.WebSockets.matches(testMa) ||
+      mafmt.WebSocketsSecure.matches(testMa)
+  }),
+  dnsWss: (multiaddrs) => multiaddrs.filter((ma) => {
+    if (ma.protoCodes().includes(CODE_CIRCUIT)) {
+      return false
+    }
+
+    const testMa = ma.decapsulateCode(CODE_P2P)
+
+    return mafmt.WebSocketsSecure.matches(testMa) &&
+      mafmt.DNS.matches(testMa.decapsulateCode(CODE_TCP).decapsulateCode(CODE_WSS))
+  }),
+  dnsWsOrWss: (multiaddrs) => multiaddrs.filter((ma) => {
+    if (ma.protoCodes().includes(CODE_CIRCUIT)) {
+      return false
+    }
+
+    const testMa = ma.decapsulateCode(CODE_P2P)
+
+    // WS
+    if (mafmt.WebSockets.matches(testMa)) {
+      return mafmt.DNS.matches(testMa.decapsulateCode(CODE_TCP).decapsulateCode(CODE_WS))
+    }
+
+    // WSS
+    return mafmt.WebSocketsSecure.matches(testMa) &&
+      mafmt.DNS.matches(testMa.decapsulateCode(CODE_TCP).decapsulateCode(CODE_WSS))
+  })
+}

src/index.js

@@ -1,38 +1,43 @@
 'use strict'
 
 const connect = require('it-ws/client')
-const mafmt = require('mafmt')
 const withIs = require('class-is')
 const toUri = require('multiaddr-to-uri')
 const { AbortError } = require('abortable-iterator')
+const pDefer = require('p-defer')
 
-const log = require('debug')('libp2p:websockets')
+const debug = require('debug')
+const log = debug('libp2p:websockets')
+log.error = debug('libp2p:websockets:error')
+const env = require('ipfs-utils/src/env')
 
 const createListener = require('./listener')
 const toConnection = require('./socket-to-conn')
-const { CODE_CIRCUIT, CODE_P2P } = require('./constants')
+const filters = require('./filters')
 
 /**
  * @class WebSockets
  */
 class WebSockets {
   /**
-   * @constructor
+   * @class
    * @param {object} options
    * @param {Upgrader} options.upgrader
+   * @param {(multiaddrs: Array<Multiaddr>) => Array<Multiaddr>} options.filter - override transport addresses filter
    */
-  constructor ({ upgrader }) {
+  constructor ({ upgrader, filter }) {
     if (!upgrader) {
       throw new Error('An upgrader must be provided. See https://github.com/libp2p/interface-transport#upgrader.')
     }
     this._upgrader = upgrader
+    this._filter = filter
   }
 
   /**
    * @async
    * @param {Multiaddr} ma
    * @param {object} [options]
-   * @param {AbortSignal} [options.signal] Used to abort dial requests
+   * @param {AbortSignal} [options.signal] - Used to abort dial requests
    * @returns {Connection} An upgraded Connection
    */
   async dial (ma, options = {}) {
@@ -51,7 +56,7 @@ class WebSockets {
    * @private
    * @param {Multiaddr} ma
    * @param {object} [options]
-   * @param {AbortSignal} [options.signal] Used to abort dial requests
+   * @param {AbortSignal} [options.signal] - Used to abort dial requests
    * @returns {Promise<WebSocket>} Resolves a extended duplex iterable on top of a WebSocket
    */
   async _connect (ma, options = {}) {
@@ -61,10 +66,24 @@ class WebSockets {
     const cOpts = ma.toOptions()
     log('dialing %s:%s', cOpts.host, cOpts.port)
 
+    const errorPromise = pDefer()
+    const errfn = (err) => {
+      const msg = `connection error: ${err.message}`
+      log.error(msg)
+
+      errorPromise.reject(err)
+    }
+
     const rawSocket = connect(toUri(ma), Object.assign({ binary: true }, options))
 
+    if (rawSocket.socket.on) {
+      rawSocket.socket.on('error', errfn)
+    } else {
+      rawSocket.socket.onerror = errfn
+    }
+
     if (!options.signal) {
-      await rawSocket.connected()
+      await Promise.race([rawSocket.connected(), errorPromise.promise])
 
       log('connected %s', ma)
       return rawSocket
@@ -75,7 +94,10 @@ class WebSockets {
     const abort = new Promise((resolve, reject) => {
       onAbort = () => {
         reject(new AbortError())
-        rawSocket.close()
+        // FIXME: https://github.com/libp2p/js-libp2p-websockets/issues/121
+        setTimeout(() => {
+          rawSocket.close()
+        })
       }
 
       // Already aborted?
@@ -84,7 +106,7 @@ class WebSockets {
     })
 
     try {
-      await Promise.race([abort, rawSocket.connected()])
+      await Promise.race([abort, errorPromise.promise, rawSocket.connected()])
     } finally {
       options.signal.removeEventListener('abort', onAbort)
     }
@@ -97,8 +119,9 @@ class WebSockets {
    * Creates a Websockets listener. The provided `handler` function will be called
    * anytime a new incoming Connection has been successfully upgraded via
    * `upgrader.upgradeInbound`.
+   *
    * @param {object} [options]
-   * @param {http.Server} [options.server] A pre-created Node.js HTTP/S server.
+   * @param {http.Server} [options.server] - A pre-created Node.js HTTP/S server.
    * @param {function (Connection)} handler
    * @returns {Listener} A Websockets listener
    */
@@ -112,21 +135,26 @@ class WebSockets {
   }
 
   /**
-   * Takes a list of `Multiaddr`s and returns only valid Websockets addresses
+   * Takes a list of `Multiaddr`s and returns only valid Websockets addresses.
+   * By default, in a browser environment only DNS+WSS multiaddr is accepted,
+   * while in a Node.js environment DNS+{WS, WSS} multiaddrs are accepted.
+   *
    * @param {Multiaddr[]} multiaddrs
    * @returns {Multiaddr[]} Valid Websockets multiaddrs
    */
   filter (multiaddrs) {
     multiaddrs = Array.isArray(multiaddrs) ? multiaddrs : [multiaddrs]
 
-    return multiaddrs.filter((ma) => {
+    if (this._filter) {
-      if (ma.protoCodes().includes(CODE_CIRCUIT)) {
+      return this._filter(multiaddrs)
-        return false
+    }
-      }
 
-      return mafmt.WebSockets.matches(ma.decapsulateCode(CODE_P2P)) ||
+    // Browser
-        mafmt.WebSocketsSecure.matches(ma.decapsulateCode(CODE_P2P))
+    if (env.isBrowser || env.isWebWorker) {
-    })
+      return filters.dnsWss(multiaddrs)
+    }
+
+    return filters.all(multiaddrs)
   }
 }
 

src/listener.js

@@ -78,7 +78,7 @@ module.exports = ({ handler, upgrader }, options = {}) => {
         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)))
+              multiaddrs.push(new multiaddr.Multiaddr(m.toString().replace('0.0.0.0', ni.address)))
             }
           })
         })

src/socket-to-conn.js

@@ -38,7 +38,8 @@ module.exports = (stream, options = {}) => {
     conn: stream,
 
     localAddr: options.localAddr || (stream.localAddress && stream.localPort
-      ? toMultiaddr(stream.localAddress, stream.localPort) : undefined),
+      ? toMultiaddr(stream.localAddress, stream.localPort)
+      : undefined),
 
     // If the remote address was passed, use it - it may have the peer ID encapsulated
     remoteAddr: options.remoteAddr || toMultiaddr(stream.remoteAddress, stream.remotePort),

test/browser.js

@@ -17,7 +17,7 @@ const mockUpgrader = {
 }
 
 describe('libp2p-websockets', () => {
-  const ma = multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
+  const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9095/ws')
   let ws
   let conn
 
@@ -34,6 +34,16 @@ describe('libp2p-websockets', () => {
     expect(results).to.eql([message])
   })
 
+  it('should filter out no DNS websocket addresses', function () {
+    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/80/ws')
+    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/443/wss')
+    const ma3 = multiaddr('/ip6/::1/tcp/80/ws')
+    const ma4 = multiaddr('/ip6/::1/tcp/443/wss')
+
+    const valid = ws.filter([ma1, ma2, ma3, ma4])
+    expect(valid.length).to.equal(0)
+  })
+
   describe('stress', () => {
     it('one big write', async () => {
       const rawMessage = new Uint8Array(1000000).fill('a')

test/compliance.node.js

@@ -5,16 +5,17 @@ const tests = require('libp2p-interfaces/src/transport/tests')
 const multiaddr = require('multiaddr')
 const http = require('http')
 const WS = require('../src')
+const filters = require('../src/filters')
 
 describe('interface-transport compliance', () => {
   tests({
     async setup ({ upgrader }) { // eslint-disable-line require-await
-      const ws = new WS({ upgrader })
+      const ws = new WS({ upgrader, filter: filters.all })
       const addrs = [
-        multiaddr('/ip4/127.0.0.1/tcp/9091/ws'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws'),
-        multiaddr('/ip4/127.0.0.1/tcp/9092/ws'),
+        new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9092/ws'),
-        multiaddr('/dns4/ipfs.io/tcp/9092/ws'),
+        new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/9092/ws'),
-        multiaddr('/dns4/ipfs.io/tcp/9092/wss')
+        new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/9092/wss')
       ]
 
       let delayMs = 0

test/node.js

@@ -5,15 +5,18 @@
 const https = require('https')
 const fs = require('fs')
 
+const AbortController = require('abort-controller').default
 const { expect } = require('aegir/utils/chai')
 const multiaddr = require('multiaddr')
 const goodbye = require('it-goodbye')
+const isLoopbackAddr = require('is-loopback-addr')
 const { collect } = require('streaming-iterables')
 const pipe = require('it-pipe')
 const BufferList = require('bl/BufferList')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
 const WS = require('../src')
+const filters = require('../src/filters')
 
 require('./compliance.node')
 
@@ -32,7 +35,7 @@ describe('instantiate the transport', () => {
 describe('listen', () => {
   describe('ip4', () => {
     let ws
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -67,7 +70,7 @@ describe('listen', () => {
     })
 
     it('listen on addr with /ipfs/QmHASH', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -75,7 +78,7 @@ describe('listen', () => {
     })
 
     it('listen on port 0', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -85,7 +88,7 @@ describe('listen', () => {
     })
 
     it('listen on any Interface', async () => {
-      const ma = multiaddr('/ip4/0.0.0.0/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -104,7 +107,7 @@ describe('listen', () => {
     })
 
     it('getAddrs on port 0 listen', async () => {
-      const addr = multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -114,7 +117,7 @@ describe('listen', () => {
     })
 
     it('getAddrs from listening on 0.0.0.0', async () => {
-      const addr = multiaddr('/ip4/0.0.0.0/tcp/9003/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/9003/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -123,7 +126,7 @@ describe('listen', () => {
     })
 
     it('getAddrs from listening on 0.0.0.0 and port 0', async () => {
-      const addr = multiaddr('/ip4/0.0.0.0/tcp/0/ws')
+      const addr = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws')
       const listener = ws.createListener((conn) => { })
       await listener.listen(addr)
       const addrs = await listener.getAddrs()
@@ -133,7 +136,7 @@ describe('listen', () => {
     })
 
     it('getAddrs preserves p2p Id', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
 
       await listener.listen(ma)
@@ -146,7 +149,7 @@ describe('listen', () => {
 
   describe('ip6', () => {
     let ws
-    const ma = multiaddr('/ip6/::1/tcp/9091/ws')
+    const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -181,7 +184,7 @@ describe('listen', () => {
     })
 
     it('listen on addr with /ipfs/QmHASH', async () => {
-      const ma = multiaddr('/ip6/::1/tcp/9091/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const listener = ws.createListener((conn) => { })
       await listener.listen(ma)
       await listener.close()
@@ -193,7 +196,7 @@ describe('dial', () => {
   describe('ip4', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/ws')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -213,7 +216,7 @@ describe('dial', () => {
     })
 
     it('dial with p2p Id', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const conn = await ws.dial(ma)
       const s = goodbye({ source: ['hey'], sink: collect })
 
@@ -222,8 +225,18 @@ describe('dial', () => {
       expect(result).to.be.eql([uint8ArrayFromString('hey')])
     })
 
+    it('dial should throw on immediate abort', async () => {
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const controller = new AbortController()
+
+      const conn = ws.dial(ma, { signal: controller.signal })
+      controller.abort()
+
+      await expect(conn).to.eventually.be.rejected()
+    })
+
     it('should resolve port 0', async () => {
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/0/ws')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/0/ws')
       const ws = new WS({ upgrader: mockUpgrader })
 
       // Create a Promise that resolves when a connection is handled
@@ -250,10 +263,40 @@ describe('dial', () => {
     })
   })
 
+  describe('ip4 no loopback', () => {
+    let ws
+    let listener
+    const ma = new multiaddr.Multiaddr('/ip4/0.0.0.0/tcp/0/ws')
+
+    beforeEach(() => {
+      ws = new WS({ upgrader: mockUpgrader })
+      listener = ws.createListener(conn => pipe(conn, conn))
+      return listener.listen(ma)
+    })
+
+    afterEach(() => listener.close())
+
+    it('dial', async () => {
+      const addrs = listener.getAddrs().filter((ma) => {
+        const { address } = ma.nodeAddress()
+
+        return !isLoopbackAddr(address)
+      })
+
+      // Dial first no loopback address
+      const conn = await ws.dial(addrs[0])
+      const s = goodbye({ source: ['hey'], sink: collect })
+
+      const result = await pipe(s, conn, s)
+
+      expect(result).to.be.eql([uint8ArrayFromString('hey')])
+    })
+  })
+
   describe('ip4 with wss', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9091/wss')
+    const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9091/wss')
 
     const server = https.createServer({
       cert: fs.readFileSync('./test/fixtures/certificate.pem'),
@@ -281,7 +324,7 @@ describe('dial', () => {
   describe('ip6', () => {
     let ws
     let listener
-    const ma = multiaddr('/ip6/::1/tcp/9091')
+    const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091')
 
     beforeEach(() => {
       ws = new WS({ upgrader: mockUpgrader })
@@ -310,7 +353,7 @@ describe('dial', () => {
     })
 
     it('dial with p2p Id', async () => {
-      const ma = multiaddr('/ip6/::1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip6/::1/tcp/9091/ws/p2p/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
       const conn = await ws.dial(ma)
 
       const s = goodbye({
@@ -327,65 +370,25 @@ describe('dial', () => {
 describe('filter addrs', () => {
   let ws
 
-  before(() => {
+  describe('default filter addrs with only dns', () => {
-    ws = new WS({ upgrader: mockUpgrader })
+    before(() => {
-  })
+      ws = new WS({ upgrader: mockUpgrader })
+    })
 
-  describe('filter valid addrs for this transport', function () {
+    it('should filter out invalid WS addresses', function () {
-    it('should fail invalid WS addresses', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
-      const ma2 = multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma3 = new multiaddr.Multiaddr('/ip6/::1/tcp/80')
-      const ma3 = multiaddr('/ip6/::1/tcp/80')
+      const ma4 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80')
-      const ma4 = multiaddr('/dnsaddr/ipfs.io/tcp/80')
 
       const valid = ws.filter([ma1, ma2, ma3, ma4])
       expect(valid.length).to.equal(0)
     })
 
-    it('should filter correct ipv4 addresses', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/80/ws')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/443/wss')
-
-      const valid = ws.filter([ma1, ma2])
-      expect(valid.length).to.equal(2)
-      expect(valid[0]).to.deep.equal(ma1)
-      expect(valid[1]).to.deep.equal(ma2)
-    })
-
-    it('should filter correct ipv4 addresses with ipfs id', function () {
-      const ma1 = multiaddr('/ip4/127.0.0.1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/80/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-
-      const valid = ws.filter([ma1, ma2])
-      expect(valid.length).to.equal(2)
-      expect(valid[0]).to.deep.equal(ma1)
-      expect(valid[1]).to.deep.equal(ma2)
-    })
-
-    it('should filter correct ipv6 address', function () {
-      const ma1 = multiaddr('/ip6/::1/tcp/80/ws')
-      const ma2 = multiaddr('/ip6/::1/tcp/443/wss')
-
-      const valid = ws.filter([ma1, ma2])
-      expect(valid.length).to.equal(2)
-      expect(valid[0]).to.deep.equal(ma1)
-      expect(valid[1]).to.deep.equal(ma2)
-    })
-
-    it('should filter correct ipv6 addresses with ipfs id', function () {
-      const ma1 = multiaddr('/ip6/::1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip6/::1/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-
-      const valid = ws.filter([ma1, ma2])
-      expect(valid.length).to.equal(2)
-      expect(valid[0]).to.deep.equal(ma1)
-      expect(valid[1]).to.deep.equal(ma2)
-    })
-
     it('should filter correct dns address', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/ws')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/ws')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
-      const ma3 = multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
+      const ma3 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
 
       const valid = ws.filter([ma1, ma2, ma3])
       expect(valid.length).to.equal(3)
@@ -395,8 +398,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns address with ipfs id', function () {
-      const ma1 = multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -405,8 +408,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns4 address', function () {
-      const ma1 = multiaddr('/dns4/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns4/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -415,8 +418,8 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -425,8 +428,116 @@ describe('filter addrs', () => {
     })
 
     it('should filter correct dns6 address with ipfs id', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+  })
+
+  describe('custom filter addrs', () => {
+    before(() => {
+      ws = new WS({ upgrader: mockUpgrader, filter: filters.all })
+    })
+
+    it('should fail invalid WS addresses', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma3 = new multiaddr.Multiaddr('/ip6/::1/tcp/80')
+      const ma4 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80')
+
+      const valid = ws.filter([ma1, ma2, ma3, ma4])
+      expect(valid.length).to.equal(0)
+    })
+
+    it('should filter correct ipv4 addresses', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/443/wss')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct ipv4 addresses with ipfs id', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/80/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct ipv6 address', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip6/::1/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/ip6/::1/tcp/443/wss')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct ipv6 addresses with ipfs id', function () {
+      const ma1 = new multiaddr.Multiaddr('/ip6/::1/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/ip6/::1/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct dns address', function () {
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/ws')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws')
+      const ma3 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/wss')
+
+      const valid = ws.filter([ma1, ma2, ma3])
+      expect(valid.length).to.equal(3)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+      expect(valid[2]).to.deep.equal(ma3)
+    })
+
+    it('should filter correct dns address with ipfs id', function () {
+      const ma1 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dnsaddr/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct dns4 address', function () {
+      const ma1 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/dns4/ipfs.io/tcp/443/wss')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct dns6 address', function () {
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss')
+
+      const valid = ws.filter([ma1, ma2])
+      expect(valid.length).to.equal(2)
+      expect(valid[0]).to.deep.equal(ma1)
+      expect(valid[1]).to.deep.equal(ma2)
+    })
+
+    it('should filter correct dns6 address with ipfs id', function () {
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma2 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/443/wss/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2])
       expect(valid.length).to.equal(2)
@@ -435,11 +546,11 @@ describe('filter addrs', () => {
     })
 
     it('should filter mixed addresses', function () {
-      const ma1 = multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma1 = new multiaddr.Multiaddr('/dns6/ipfs.io/tcp/80/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
-      const ma2 = multiaddr('/ip4/127.0.0.1/tcp/9090')
+      const ma2 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090')
-      const ma3 = multiaddr('/ip4/127.0.0.1/udp/9090')
+      const ma3 = new multiaddr.Multiaddr('/ip4/127.0.0.1/udp/9090')
-      const ma4 = multiaddr('/dns6/ipfs.io/ws')
+      const ma4 = new multiaddr.Multiaddr('/dns6/ipfs.io/ws')
-      const mh5 = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
+      const mh5 = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
         '/p2p-circuit/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
       const valid = ws.filter([ma1, ma2, ma3, ma4, mh5])
@@ -447,14 +558,13 @@ describe('filter addrs', () => {
       expect(valid[0]).to.deep.equal(ma1)
       expect(valid[1]).to.deep.equal(ma4)
     })
-  })
 
-  it('filter a single addr for this transport', (done) => {
+    it('filter a single addr for this transport', () => {
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+      const ma = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
-    const valid = ws.filter(ma)
+      const valid = ws.filter(ma)
-    expect(valid.length).to.equal(1)
+      expect(valid.length).to.equal(1)
-    expect(valid[0]).to.deep.equal(ma)
+      expect(valid[0]).to.deep.equal(ma)
-    done()
+    })
   })
 })