test: Fix browser tests

.aegir.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const Utils = require('./test/utils')
+
+let Server
+
+function pre (done) {
+  Utils.createServer(require('./test/server.id.json'), ['/ip4/127.0.0.1/tcp/3236/ws'], {}, (err, server) => {
+    if (err) return done(err)
+    Server = server
+    done()
+  })
+}
+
+function post (done) {
+  Server.stop(done)
+}
+
+module.exports = {
+  hooks: {
+    pre,
+    post
+  }
+}

package.json

@@ -9,6 +9,9 @@
     "test:browser": "aegir test -t browser",
     "test:webworker": "aegir test -t webworker"
   },
+  "browser": {
+    "test/utils.js": "./test/utils.browser.js"
+  },
   "keywords": [
     "libp2p",
     "rendezvous",
@@ -30,7 +33,8 @@
     "libp2p-mplex": "^0.7.0",
     "libp2p-secio": "^0.10.0",
     "libp2p-spdy": "^0.12.1",
-    "libp2p-tcp": "^0.12.0"
+    "libp2p-tcp": "^0.12.0",
+    "libp2p-websockets": "^0.12.0"
   },
   "repository": {
     "type": "git",

src/server/index.js

@@ -22,7 +22,7 @@ class Server {
     this._stubNS = this.store.create(Buffer.alloc(256, '0').toString())
   }
 
-  start () {
+  start (cb) {
     this.gcIntv = setInterval(this.gc.bind(this), 60 * 1000)
     this.node.handle('/rendezvous/1.0.0', (proto, conn) => {
       const rpc = new RPC(this)
@@ -31,14 +31,14 @@ class Server {
         this.storeRPC(rpc)
       })
     })
+    if (cb) cb()
   }
 
-  stop () {
-    if (this && this.gcIntv) {
-      clearInterval(this.gcIntv)
-      // TODO: clear vars, shutdown conns, etc.
-      this.node.unhandle('/rendezvous/1.0.0')
-    }
+  stop (cb) {
+    clearInterval(this.gcIntv)
+    // TODO: clear vars, shutdown conns, etc.
+    this.node.unhandle('/rendezvous/1.0.0')
+    this.node.stop(cb)
   }
 
   storeRPC (rpc) {

test/discovery.spec.js

@@ -137,8 +137,10 @@ describe.skip('discovery', () => {
     parallel([client, client2].map(c => cb => c.stop(cb)), done)
   })
 
-  it('gc', () => {
-    server.gc()
-    expect(Object.keys(server.table.NS)).to.have.lengthOf(0)
-  })
+  if (Utils.createServer) {
+    it('gc', () => {
+      server.gc()
+      expect(Object.keys(server.table.NS)).to.have.lengthOf(0)
+    })
+  }
 })

test/utils.browser.js

@@ -0,0 +1,86 @@
+'use strict'
+
+const Libp2p = require('libp2p')
+const WS = require('libp2p-websockets')
+const MPLEX = require('libp2p-mplex')
+const SPDY = require('libp2p-spdy')
+const SECIO = require('libp2p-secio')
+
+const Id = require('peer-id')
+const Peer = require('peer-info')
+
+const Client = require('../src')
+
+const Utils = module.exports = (id, addrs, cb) => {
+  Id.createFromJSON(id, (err, id) => {
+    if (err) return cb(err)
+    const peer = new Peer(id)
+    addrs.forEach(a => peer.multiaddrs.add(a))
+
+    const swarm = new Libp2p({
+      transport: [
+        new WS()
+      ],
+      connection: {
+        muxer: [
+          MPLEX,
+          SPDY
+        ],
+        crypto: [SECIO]
+      }
+    }, peer, null, {
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: true,
+          active: false
+        }
+      }
+    })
+
+    swarm.start(err => {
+      if (err) return cb(err)
+      cb(null, swarm)
+    })
+  })
+}
+
+Utils.id = (id, addrs, cb) => {
+  Id.createFromJSON(id, (err, id) => {
+    if (err) return cb(err)
+    const peer = new Peer(id)
+    addrs.forEach(a => peer.multiaddrs.add(a))
+    cb(null, peer)
+  })
+}
+
+Utils.createServerMock = (id, addrs, cb) => {
+  Utils.id(id, addrs, (err, peerInfo) => {
+    if (err) return cb(err)
+    let swarm = {peerInfo}
+    let server = {node: swarm}
+    return cb(null, server, swarm)
+  })
+}
+
+Utils.createClient = (id, addrs, cb) => {
+  Utils(id, addrs, (err, swarm) => {
+    if (err) return cb(err)
+    const client = new Client(swarm)
+    client.start(err => {
+      if (err) return cb(err)
+      return cb(null, client, swarm)
+    })
+  })
+}
+
+Utils.default = cb => Utils.createServerMock(require('./server.id.json'), ['/ip4/127.0.0.1/tcp/3236/ws'], (err, server) => {
+  if (err) return cb(err)
+  Utils.createClient(require('./client.id.json'), [], (err, client) => {
+    if (err) return cb(err)
+    Utils.createClient(require('./client2.id.json'), [], (err, client2) => {
+      if (err) return cb(err)
+      return cb(null, client, server, client2)
+    })
+  })
+})

test/utils.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
 const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
@@ -128,14 +129,15 @@ const Server = require('../src/server')
 const Client = require('../src')
 
 const Utils = module.exports = (id, addrs, cb) => {
-  Id.createFromJSON(require(id), (err, id) => {
+  Id.createFromJSON(id, (err, id) => {
     if (err) return cb(err)
     const peer = new Peer(id)
     addrs.forEach(a => peer.multiaddrs.add(a))
 
     const swarm = new Libp2p({
       transport: [
-        new TCP()
+        new TCP(),
+        new WS()
       ],
       connection: {
         muxer: [
@@ -162,7 +164,7 @@ const Utils = module.exports = (id, addrs, cb) => {
 }
 
 Utils.id = (id, addrs, cb) => {
-  Id.createFromJSON(require(id), (err, id) => {
+  Id.createFromJSON(id, (err, id) => {
     if (err) return cb(err)
     const peer = new Peer(id)
     addrs.forEach(a => peer.multiaddrs.add(a))
@@ -190,11 +192,11 @@ Utils.createClient = (id, addrs, cb) => {
   })
 }
 
-Utils.default = cb => Utils.createServer('./server.id.json', ['/ip4/0.0.0.0/tcp/0'], {}, (err, server) => {
+Utils.default = cb => Utils.createServer(require('./server.id.json'), ['/ip4/0.0.0.0/tcp/0'], {}, (err, server) => {
   if (err) return cb(err)
-  Utils.createClient('./client.id.json', ['/ip4/0.0.0.0/tcp/0'], (err, client) => {
+  Utils.createClient(require('./client.id.json'), ['/ip4/0.0.0.0/tcp/0'], (err, client) => {
     if (err) return cb(err)
-    Utils.createClient('./client2.id.json', ['/ip4/0.0.0.0/tcp/0'], (err, client2) => {
+    Utils.createClient(require('./client2.id.json'), ['/ip4/0.0.0.0/tcp/0'], (err, client2) => {
       if (err) return cb(err)
       return cb(null, client, server, client2)
     })