match maker gui test

Author: nullagent

src/party/peer/match-maker-client.js

@@ -186,7 +186,7 @@ class MatchMakerClient extends EventEmitter {
 
     const lookupData = { hash }
 
-    const lookupResult = await restParty.comms.call('key/lookup', lookupData, {
+    const lookupResult = await this.restParty.comms.call('key/lookup', lookupData, {
       expectClearTextReply: false,
       sendClearTextRequest: false,
       useSessions: false
@@ -211,8 +211,8 @@ class MatchMakerClient extends EventEmitter {
 
     let toIdentity = null
     if(typeof toHashOrIdentity == 'string'){
-      const toIdentity = await lookupPublicKey(userCallHashInput.value)
-      thisotherIdentity = toIdentity
+      toIdentity = await this.lookupPublicKey(toHashOrIdentity)
+      //this.otherIdentity = toIdentity
     } else {
       toIdentity = toHashOrIdentity
     }
@@ -239,7 +239,7 @@ class MatchMakerClient extends EventEmitter {
 
     const invitePostData = {
       to: toIdentity.key.hash,
-      from: party.identity.key.hash,
+      from: this.wsParty.identity.key.hash,
       payload: JSON.stringify(secureInvite.toJSON())
     }
 

src/party/peer/peer-invite.js

@@ -28,7 +28,7 @@ class PeerInvite extends EventEmitter {
     this.fromIdentity = fromIdentity
     this.matchMaker = matchMakerClient
     this.inviteDoc = inviteDoc
-    this.latestDoc = null
+    this.inviteMsg = null //this.latestDoc = null
     this.payload = null
 
     this.topicSub = null
@@ -101,6 +101,10 @@ class PeerInvite extends EventEmitter {
     this.emit('done', this)
   }
 
+  get state(){
+    return (this.inviteMsg || this.inviteDoc).state
+  }
+
   async onInviteMsg(inviteMsg){
 
     debug('onInviteMsg', inviteMsg)
@@ -111,6 +115,8 @@ class PeerInvite extends EventEmitter {
     debug('\t', 'invite.state = ', inviteMsg.state)
     this.emit(inviteMsg.state, this)
 
+    this.emit('state-change', this)
+
     if(this.inviteMsg && END_STATES.indexOf(this.inviteMsg.state) ){
       this.emit('done', this)
     }

src/service/service-host-websocket.js

@@ -4,7 +4,7 @@ const debug = require('debug')('dataparty.service.host-websocket')
 const ws = require('ws')
 const WebSocketServer = ws.WebSocketServer
 
-const WATCHDOG_INTERVAL = 5*60*1000
+const WATCHDOG_INTERVAL = 60*1000
 
 const Comms = require('../comms')
 const PeerParty = require('../party/peer/peer-party')
@@ -29,7 +29,6 @@ class ServiceHostWebsocket{
 
     if(!server){
       settings = { port: this.port, ...this.wsSettings }
-      
     } else {
       settings = { noServer: true, ...this.wsSettings }
     }

src/service/service-runner-node.js

@@ -284,7 +284,7 @@ class ServiceRunnerNode {
 
     this.topics[name] = topic
 
-    const routablePath = Path.join(this.prefix, Path.normalize(name))
+    const routablePath = Path.normalize(name)
 
     let route = this.topicsRouter.add(name, routablePath/*, this.topicHandler(topic)*/)
 
@@ -447,30 +447,53 @@ class ServiceRunnerNode {
   }
 
   async getTopic(path){
-    debug('looking up route', path)
+    debug('looking up topic', path)
 
     let p = new Promise(async (resolve,reject)=>{
 
-      let route = await this.topicsRouter.route(path, (event)=>{
+      //debug('\tcalling route', path)
+      //debug('\t', Object.keys(this.topics))
 
-        //debug(event)
-        //debug('topic route callback')
+      try{
 
+        //debug('tryin', this.topicsRouter.route)
+        let routed = false
+        
+        let route = await this.topicsRouter.route(path, (event)=>{
+          
+          //debug(event)
+          //debug('topic route callback - ', path)
+          
+          
+          if(!event.route){
+            debug('no such topic', path)
+            //reject('no such topic')
+            routed = true
+            resolve(null)
+          } else {
+            debug('found route', event.route.name)
+          }
 
-        if(!event.route){
-          debug('no such topic', path)
-          //reject('no such topic')
-          resolve(null)
-        } else {
-          debug('found route', event.route.name)
-        }
+          routed = true
+          
+          return resolve({ route: event.route, topic: event.route.data, arguments: event.arguments })
+          
+        })
 
-        return resolve({ route: event.route, topic: event.route.data, arguments: event.arguments })
+        debug('\trouting done', routed)
 
-      })
+        if(!routed){
+          return reject(null)
+        }
+        
+      } catch(err){
 
-    })
+        debug(err)
 
+        return reject(err)
+      }
+    })
+      
     return await p
   }
 

src/venue/public/p2p-test.html

@@ -42,8 +42,58 @@ <h2>Remote</h2>
 
 let matchMaker = null
 
+let userHashInput = document.getElementById('user-hash')
+let userCallHashInput = document.getElementById('user-call-hash')
+let inviteIdInput = document.getElementById('invite-id')
+
+let pendingInvite = null
+
+async function callUser(){
+  if(pendingInvite){ return }
+
+  pendingInvite = await matchMaker.createInvite( userCallHashInput.value, {
+    type: 'webrtc',
+    service: '@dataparty/video-chat',
+    role: 'client'
+  }, {
+    roomId: '',
+    action: 'call'
+  })
+
+  pendingInvite.on('state-change', (invite)=>{
+    console.log('state-change', invite.state, invite)
+  })
+}
+
+async function cancelCall() {
+  if(!pendingInvite){ return }
+
+  await pendingInvite.cancel()
+}
+
+async function rejectCall(){
+  if(!pendingInvite){ return }
+
+  await pendingInvite.reject()
+}
+
 async function init(){
   matchMaker = new Dataparty.MatchMakerClient(null, null)
+
+  await matchMaker.start()
+
+  let myHash = matchMaker.restParty.identity.key.hash
+
+  userHashInput.value = myHash
+
+  matchMaker.on('invited', invite=>{
+    console.log('invited', invite)
+
+    pendingInvite = invite
+
+
+    inviteIdInput.value = invite.id
+  })
 }
 
 init().catch((err)=>{