feat: discovery fixes and tests

package.json

@@ -2,7 +2,7 @@
   "name": "libp2p-stardust",
   "version": "0.0.1",
   "description": "Basically ws-star but without the bugs",
-  "main": "index.js",
+  "main": "src/transport/index.js",
   "scripts": {
     "lint": "aegir lint",
     "build": "aegir build",
@@ -29,6 +29,7 @@
     "libp2p-websockets": "^0.12.0",
     "multistream-select": "^0.14.3",
     "peer-id": "^0.12.1",
+    "peer-info": "^0.15.0",
     "protons": "^1.0.1"
   },
   "devDependencies": {

src/client/connection.js

@@ -3,14 +3,15 @@
 const LP = require('../rpc/lp')
 const pull = require('pull-stream/pull')
 const handshake = require('pull-handshake')
-const {JoinInit, JoinChallenge, JoinChallengeSolution, JoinVerify, Discovery, DialRequest, DialResponse, Error: E, ErrorTranslations} = require('../rpc/proto')
+const {JoinInit, JoinChallenge, JoinChallengeSolution, JoinVerify, Discovery, DialRequest, DialResponse, ErrorTranslations} = require('../rpc/proto')
 
 const prom = (f) => new Promise((resolve, reject) => f((err, res) => err ? reject(err) : resolve(res)))
 
 const sha5 = (data) => crypto.createHash('sha512').update(data).digest()
 
 const crypto = require('crypto')
 const ID = require('peer-id')
+const PeerInfo = require('peer-info')
 
 const debug = require('debug')
 const log = debug('libp2p:stardust:client')
@@ -28,10 +29,19 @@ class Connection {
   async readDiscovery () {
     const addrBase = this.address.decapsulate('p2p-websocket-star')
     const {ids} = await this.rpc.readProto(Discovery)
+    log('reading discovery')
     ids
-      .map(id => new ID(id).toB58String())
-      .filter(id => id !== this.client.id.toB58String())
-      .map(id => addrBase.encapsulate('/p2p-websocket-star/ipfs/' + id))
+      .map(id => {
+        const pi = new PeerInfo(new ID(id))
+        if (pi.id.toB58String() === this.client.id.toB58String()) return
+        pi.multiaddrs.add(addrBase.encapsulate('/p2p-websocket-star/ipfs/' + pi.id.toB58String()))
+
+        return pi
+      })
+      .filter(Boolean)
+      .forEach(pi => this.client.discovery.emit('peer', pi))
+
+    this.readDiscovery()
   }
 
   async connect (address) {
@@ -70,7 +80,6 @@ class Connection {
     this.rpc = rpc
     muxed.on('stream', this.handler)
     this.readDiscovery()
-    setInterval(this.readDiscovery.bind(this), 10 * 1000)
   }
 
   async dial (addr) {

src/transport/index.js

@@ -10,6 +10,7 @@ const Connection = require('interface-connection').Connection
 const once = require('once')
 const debug = require('debug')
 const log = debug('libp2p:stardust')
+const EE = require('events').EventEmitter
 
 function noop () {}
 
@@ -30,6 +31,15 @@ class Stardust {
     this.switch = new MicroSwitch({ transports, addresses: [], muxers })
     this.id = id
 
+    this.discovery = new EE()
+    this.discovery.tag = 'stardust'
+    this.discovery.start = (callback) => {
+      setImmediate(callback)
+    }
+    this.discovery.stop = (callback) => {
+      setImmediate(callback)
+    }
+
     this.connections = {}
   }
 

test/connect.spec.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Client = require('../src/client')
+const Client = require('..')
 const ID = require('peer-id')
 const IDJSON = require('./id.json')
 const multiaddr = require('multiaddr')
@@ -22,7 +22,7 @@ describe('connect', () => {
 
   it('should be creatable', () => {
     client = new Client({id})
-    conn = client.createConnection(() => {})
+    conn = client.createListener(() => {})
   })
 
   it('should connect to server', async () => conn.connect(SERVER_URL))

test/dial.spec.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Client = require('../src/client')
+const Client = require('..')
 const ID = require('peer-id')
 const IDJSON = [require('./id.json'), require('./id2.json')]
 const multiaddr = require('multiaddr')
@@ -21,7 +21,7 @@ describe('dial', () => {
 
   it('connect all clients', async () => {
     clients = ids.map(id => new Client({id}))
-    conns = clients.map(client => client.createConnection(conn => pull(conn, conn)))
+    conns = clients.map(client => client.createListener(conn => pull(conn, conn)))
     await Promise.all(conns.map(conn => conn.connect(SERVER_URL)))
     clients.forEach(c => (c.addr = multiaddr('/ipfs/' + c.id.toB58String())))
   })
@@ -39,6 +39,10 @@ describe('dial', () => {
   })
 
   it('client1 should discover client2', function (done) { // TODO: fix this
-    this.timeout(10000)
+    this.timeout(15000)
+    clients[0].discovery.once('peer', (pi) => {
+      require('assert')(String(pi.multiaddrs.toArray()[0]) === String(SERVER_URL) + String(clients[1].addr))
+      done()
+    })
   })
 })