wip: get websockets to work in the browser

gulpfile.js

@@ -3,24 +3,32 @@
 const gulp = require('gulp')
 const multiaddr = require('multiaddr')
 const Node = require('libp2p-ipfs').Node
-const Peer = require('peer-info')
-const Id = require('peer-id')
+const PeerInfo = require('peer-info')
+const PeerId = require('peer-id')
 const pull = require('pull-stream')
 
 const sigServer = require('libp2p-webrtc-star/src/signalling-server')
 let sigS
 
 let node
 const rawPeer = require('./test/peer.json')
+
 gulp.task('libnode:start', (done) => {
-  const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws')
-  Id.createFromPrivKey(rawPeer.privKey, (err, id) => {
+  let count = 0
+  const ready = () => ++count === 2 ? done() : null
+
+  sigS = sigServer.start(15555, ready)
+
+  PeerId.createFromJSON(rawPeer, gotId)
+
+  function gotId (err, pid) {
     if (err) {
       return done(err)
     }
+    const peer = new PeerInfo(pid)
 
-    const peer = new Peer(id)
-    peer.multiaddr.add(mh)
+    const ma = multiaddr('/ip4/127.0.0.1/tcp/9200/ws')
+    peer.multiaddr.add(ma)
 
     node = new Node(peer)
     node.start(() => {
@@ -29,12 +37,7 @@ gulp.task('libnode:start', (done) => {
       })
       ready()
     })
-
-    let count = 0
-    const ready = () => ++count === 2 ? done() : null
-
-    sigS = sigServer.start(15555, ready)
-  })
+  }
 })
 
 gulp.task('libnode:stop', (done) => {

src/index.js

@@ -53,6 +53,7 @@ exports.Node = function Node (pInfo, pBook) {
     // if we have `webrtc-star` addrs, then add
     // the WebRTCStar transport
     const wstar = new WebRTCStar()
+
     if (wstar.filter(this.peerInfo.multiaddrs).length > 0) {
       this.swarm.transport.add('wstar', wstar)
       wstar.discovery.on('peer', (peerInfo) => {

test/browser.js

@@ -2,9 +2,8 @@
 
 const w = require('webrtcsupport')
 
-require('./websockets-only')
+// require('./websockets-only')
 
 if (w.support) {
   require('./webrtc-star-only')
-  require('./webrtc-star-and-websockets')
 }

test/websockets-only.js

@@ -19,6 +19,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => {
 
   before((done) => {
     const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + rawPeer.id)
+
     PeerId.createFromPrivKey(rawPeer.privKey, (err, id) => {
       if (err) {
         return done(err)