refactor: async await #266

.aegir.js

@@ -1,130 +1,47 @@
 'use strict'
 
-const pull = require('pull-stream')
-const WebSocketStarRendezvous = require('libp2p-websocket-star-rendezvous')
-const sigServer = require('libp2p-webrtc-star/src/sig-server')
-const promisify = require('promisify-es6')
-const mplex = require('pull-mplex')
-const spdy = require('libp2p-spdy')
-const PeerBook = require('peer-book')
+const Libp2p = require('./src')
+const { MULTIADDRS_WEBSOCKETS } = require('./test/fixtures/browser')
+const Peers = require('./test/fixtures/peers')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
-const path = require('path')
-const Switch = require('./src/switch')
 const WebSockets = require('libp2p-websockets')
-
-const Node = require('./test/utils/bundle-nodejs.js')
-const {
-  getPeerRelay,
-  WRTC_RENDEZVOUS_MULTIADDR,
-  WS_RENDEZVOUS_MULTIADDR
-} = require('./test/utils/constants')
-
-let wrtcRendezvous
-let wsRendezvous
-let node
-let peerInfo
-let switchA
-let switchB
-
-function echo (protocol, conn) { pull(conn, conn) }
-function idJSON (id) {
-  const p = path.join(__dirname, `./test/switch/test-data/id-${id}.json`)
-  return require(p)
-}
-
-function createSwitchA () {
-  return new Promise((resolve, reject) => {
-    PeerId.createFromJSON(idJSON(1), (err, id) => {
-      if (err) { return reject(err) }
-
-      const peerA = new PeerInfo(id)
-      const maA = '/ip4/127.0.0.1/tcp/15337/ws'
-
-      peerA.multiaddrs.add(maA)
-      const sw = new Switch(peerA, new PeerBook())
-
-      sw.transport.add('ws', new WebSockets())
-      sw.start((err) => {
-        if (err) { return reject(err) }
-        resolve(sw)
-      })
-    })
-  })
-}
-
-function createSwitchB () {
-  return new Promise((resolve, reject) => {
-    PeerId.createFromJSON(idJSON(2), (err, id) => {
-      if (err) { return reject(err) }
-
-      const peerB = new PeerInfo(id)
-      const maB = '/ip4/127.0.0.1/tcp/15347/ws'
-
-      peerB.multiaddrs.add(maB)
-      const sw = new Switch(peerB, new PeerBook())
-
-      sw.transport.add('ws', new WebSockets())
-      sw.connection.addStreamMuxer(mplex)
-      sw.connection.addStreamMuxer(spdy)
-      sw.connection.reuse()
-      sw.handle('/echo/1.0.0', echo)
-      sw.start((err) => {
-        if (err) { return reject(err) }
-        resolve(sw)
-      })
-    })
-  })
-}
+const Muxer = require('libp2p-mplex')
+const Crypto = require('libp2p-secio')
+const pipe = require('it-pipe')
+let libp2p
 
 const before = async () => {
-  [
-    wrtcRendezvous,
-    wsRendezvous,
-    peerInfo,
-    switchA,
-    switchB
-  ] = await Promise.all([
-    sigServer.start({
-      port: WRTC_RENDEZVOUS_MULTIADDR.nodeAddress().port
-      // cryptoChallenge: true TODO: needs https://github.com/libp2p/js-libp2p-webrtc-star/issues/128
-    }),
-    WebSocketStarRendezvous.start({
-      port: WS_RENDEZVOUS_MULTIADDR.nodeAddress().port,
-      refreshPeerListIntervalMS: 1000,
-      strictMultiaddr: false,
-      cryptoChallenge: true
-    }),
-    getPeerRelay(),
-    createSwitchA(),
-    createSwitchB()
-  ])
+  // Use the last peer
+  const peerId = await PeerId.createFromJSON(Peers[Peers.length - 1])
+  const peerInfo = new PeerInfo(peerId)
+  peerInfo.multiaddrs.add(MULTIADDRS_WEBSOCKETS[0])
 
-  node = new Node({
+  libp2p = new Libp2p({
     peerInfo,
+    modules: {
+      transport: [WebSockets],
+      streamMuxer: [Muxer],
+      connEncryption: [Crypto]
+    },
     config: {
       relay: {
         enabled: true,
         hop: {
           enabled: true,
-          active: true
+          active: false
         }
       }
     }
   })
+  // Add the echo protocol
+  libp2p.handle('/echo/1.0.0', ({ stream }) => pipe(stream, stream))
 
-  node.handle('/echo/1.0.0', (protocol, conn) => pull(conn, conn))
-  await node.start()
+  await libp2p.start()
 }
 
-const after = () => {
-  return Promise.all([
-    wrtcRendezvous.stop(),
-    wsRendezvous.stop(),
-    node.stop(),
-    promisify(switchA.stop, { context: switchA })(),
-    promisify(switchB.stop, { context: switchB })()
-  ])
+const after = async () => {
+  await libp2p.stop()
 }
 
 module.exports = {

.gitignore

@@ -3,6 +3,7 @@ docs
 **/*.log
 test/repo-tests*
 **/bundle.js
+.cache
 
 # Logs
 logs

.travis.yml

@@ -21,24 +21,23 @@ jobs:
     - stage: check
       script:
         - npx aegir build --bundlesize
-        - npx aegir dep-check -- -i wrtc -i electron-webrtc
+        # Remove pull libs once ping is async
+        - npx aegir dep-check -- -i pull-handshake -i pull-stream
         - npm run lint
 
     - stage: test
       name: chrome
       addons:
         chrome: stable
       script:
-        - npx aegir test -t browser
-        - npx aegir test -t webworker
+        - npx aegir test -t browser -t webworker
 
     - stage: test
       name: firefox
       addons:
         firefox: latest
       script:
-        - npx aegir test -t browser -- --browsers FirefoxHeadless
-        - npx aegir test -t webworker -- --browsers FirefoxHeadless
+        - npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless
 
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,72 @@
+<a name="0.27.0-rc.0"></a>
+# [0.27.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.2...v0.27.0-rc.0) (2020-01-24)
+
+
+### Bug Fixes
+
+* registrar should filter the disconnected conn ([#532](https://github.com/libp2p/js-libp2p/issues/532)) ([83409de](https://github.com/libp2p/js-libp2p/commit/83409de))
+* stop discoveries ([#530](https://github.com/libp2p/js-libp2p/issues/530)) ([c44e6e3](https://github.com/libp2p/js-libp2p/commit/c44e6e3))
+* use toB58String everywhere to be consistent ([#537](https://github.com/libp2p/js-libp2p/issues/537)) ([31d1b23](https://github.com/libp2p/js-libp2p/commit/31d1b23))
+
+
+
+<a name="0.27.0-pre.2"></a>
+# [0.27.0-pre.2](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.1...v0.27.0-pre.2) (2020-01-07)
+
+
+### Bug Fixes
+
+* conn mngr min/max connection values ([#528](https://github.com/libp2p/js-libp2p/issues/528)) ([a1717da](https://github.com/libp2p/js-libp2p/commit/a1717da))
+* make dialer configurable ([#521](https://github.com/libp2p/js-libp2p/issues/521)) ([24c3ce6](https://github.com/libp2p/js-libp2p/commit/24c3ce6))
+* upgrader should not need muxers ([#517](https://github.com/libp2p/js-libp2p/issues/517)) ([56a1825](https://github.com/libp2p/js-libp2p/commit/56a1825))
+
+
+### Features
+
+* add libp2p.connections getter ([#522](https://github.com/libp2p/js-libp2p/issues/522)) ([6ca19c5](https://github.com/libp2p/js-libp2p/commit/6ca19c5))
+* allow transport options to be passed on creation ([#524](https://github.com/libp2p/js-libp2p/issues/524)) ([0d4b2bd](https://github.com/libp2p/js-libp2p/commit/0d4b2bd))
+
+
+
+<a name="0.27.0-pre.1"></a>
+# [0.27.0-pre.1](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.0...v0.27.0-pre.1) (2019-12-15)
+
+
+### Features
+
+* coalescing dial support ([#518](https://github.com/libp2p/js-libp2p/issues/518)) ([4a871bb](https://github.com/libp2p/js-libp2p/commit/4a871bb))
+
+
+
+<a name="0.27.0-pre.0"></a>
+# [0.27.0-pre.0](https://github.com/libp2p/js-libp2p/compare/v0.26.2...v0.27.0-pre.0) (2019-12-12)
+
+
+### Bug Fixes
+
+* clean up peer discovery flow ([#494](https://github.com/libp2p/js-libp2p/issues/494)) ([f3eb1f1](https://github.com/libp2p/js-libp2p/commit/f3eb1f1))
+* clean up pending dials abort per feedback ([7c3371b](https://github.com/libp2p/js-libp2p/commit/7c3371b))
+* correct release readme ([c4bc00b](https://github.com/libp2p/js-libp2p/commit/c4bc00b))
+* examples readme typos ([#481](https://github.com/libp2p/js-libp2p/issues/481)) ([35ac02d](https://github.com/libp2p/js-libp2p/commit/35ac02d))
+* performance bottleneck in stat.js ([#463](https://github.com/libp2p/js-libp2p/issues/463)) ([93a1e42](https://github.com/libp2p/js-libp2p/commit/93a1e42))
+* release tokens as soon as they are available ([43440aa](https://github.com/libp2p/js-libp2p/commit/43440aa))
+* replace peerInfo addresses with listen addresses ([#485](https://github.com/libp2p/js-libp2p/issues/485)) ([acbbc0f](https://github.com/libp2p/js-libp2p/commit/acbbc0f))
+* token release logic ([1838a64](https://github.com/libp2p/js-libp2p/commit/1838a64))
+
+
+### Features
+
+* abort all pending dials on stop ([754fbc2](https://github.com/libp2p/js-libp2p/commit/754fbc2))
+* add early token recycling in ([24c6037](https://github.com/libp2p/js-libp2p/commit/24c6037))
+* add token based dialer ([f8540fa](https://github.com/libp2p/js-libp2p/commit/f8540fa))
+* discovery modules ([#486](https://github.com/libp2p/js-libp2p/issues/486)) ([997ee16](https://github.com/libp2p/js-libp2p/commit/997ee16))
+* discovery modules from transports should be added ([#510](https://github.com/libp2p/js-libp2p/issues/510)) ([af96dcc](https://github.com/libp2p/js-libp2p/commit/af96dcc))
+* peer store ([#470](https://github.com/libp2p/js-libp2p/issues/470)) ([f3e276e](https://github.com/libp2p/js-libp2p/commit/f3e276e))
+* registrar ([#471](https://github.com/libp2p/js-libp2p/issues/471)) ([797d8f0](https://github.com/libp2p/js-libp2p/commit/797d8f0))
+* support peer-id instances in peer store operations ([#491](https://github.com/libp2p/js-libp2p/issues/491)) ([11ed6bd](https://github.com/libp2p/js-libp2p/commit/11ed6bd))
+
+
+
 <a name="0.26.2"></a>
 ## [0.26.2](https://github.com/libp2p/js-libp2p/compare/v0.26.1...v0.26.2) (2019-09-24)