testing

Author: nullagent

src/comms/peer-comms.js

@@ -1,3 +1,4 @@
+
 const {Routines, Identity} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.comms.peercomms')
 const uuidv4 = require('uuid/v4')
@@ -10,7 +11,7 @@ const Joi = require('joi')
 const HostOp = require('./host/host-op')
 const HostProtocolScheme = require('./host/host-protocol-scheme')
 
-const AUTH_TIMEOUT_MS = 3000
+const AUTH_TIMEOUT_MS = 25000
 
 const HOST_SESSION_STATES = {
   AUTH_REQUIRED: 'AUTH_REQUIRED',
@@ -491,4 +492,4 @@ class PeerComms extends ISocketComms {
 }
 
 
-module.exports = PeerComms
+module.exports = PeerComms

src/comms/rtc-socket-comms.js

@@ -14,6 +14,8 @@ class RTCSocketComms extends PeerComms {
   constructor({remoteIdentity, host, party, rtcOptions, trickle = false, ...options}){
     super({remoteIdentity, host, party, ...options})
 
+    debug('starting host=',host, ' uuid=', this.uuid)
+
     this.rtcSettings = {
       trickle,
       initiator: host,

src/comms/websocket-comms.js

@@ -20,6 +20,8 @@ class WebsocketComms extends PeerComms {
     this.uri = uri
     this.connection = connection
 
+    debug('starting host=',host, ' uuid=', this.uuid, ' uri=', this.uri)
+
     if(this.host && !this.connection){
       throw new Error('existing connection expected')
     }

src/party/loki-cache.js

@@ -133,10 +133,15 @@ module.exports = class LokiCache extends EventEmitter {
 
           // check if msg is already in cache
           if (cachedMsg) {
-            collection.remove(cachedMsg)
-            //collection.findAndRemove({
-            //  '$meta.id': id,
-            //})
+            try{
+              collection.remove(cachedMsg)
+              //collection.findAndRemove({
+              //  '$meta.id': id,
+              //})
+            }
+            catch(err){
+              debug('WARN', err)
+            }
           }
 
           // clone msg on insert - cache should follow backend

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

@@ -1,5 +1,8 @@
 const EventEmitter = require('eventemitter3')
 
+const debug = require('debug')('dataparty.match-maker-client')
+
+
 const dataparty_crypto = require('@dataparty/crypto')
 const LokiParty = require('../local/loki-party')
 const PeerParty = require('./peer-party')
@@ -136,7 +139,9 @@ class MatchMakerClient extends EventEmitter {
     } else if(this.pendingInvites.rx[inviteId]) {
 
       let invite = this.pendingInvites.rx[inviteId]
-      invite.onInviteMsg(msg.invite)
+
+      debug('calling onInviteMsg')
+      await invite.onInviteMsg(msg.invite)
     }
   }
 
@@ -146,12 +151,12 @@ class MatchMakerClient extends EventEmitter {
     const inviteId = msg.invite.$meta.id
     let pending = this.pendingInvites.tx[inviteId]
 
-    if( pending &&
-        //msg.invite.state == 'accepted' &&
-        pending.inviteDoc.id == msg.invite.$meta.id
+    if( pending 
     ){
 
-      pending.onInviteMsg(msg.invite)
+      debug('calling onInviteMsg')
+
+      await pending.onInviteMsg(msg.invite)
 
     }
   }

src/party/peer/peer-invite.js

@@ -75,7 +75,7 @@ class PeerInvite extends EventEmitter {
     this.emit('done', this)
   }
 
-  async accept(mediaSrc){
+  async accept(mediaSrc, config){
     debug('accepting invite')
 
     /*if(this.inviteDoc.toHash == matchMaker.wsParty.identity.key.hash){
@@ -97,7 +97,7 @@ class PeerInvite extends EventEmitter {
 
     this.payload = payload.msg
 
-    return await this.establish(mediaSrc)
+    return await this.establish({mediaSrc, config})
   }
 
   async reject(){
@@ -158,43 +158,51 @@ class PeerInvite extends EventEmitter {
     this.topicSub = new party.ROSLIB.Topic({
       ros : party.comms.ros,
       name : '/invite/' + this.id + '/session/'+(actorField=='to'?'from':'to'),
-      messageType: 'SecureObject'
+      messageType: 'Object'
     })
 
     this.topicPub = new party.ROSLIB.Topic({
       ros : party.comms.ros,
       name : '/invite/' + this.id + '/session/'+actorField,
-      messageType: 'SecureObject'
+      messageType: 'Object'
     })
 
     this.topicSub.subscribe(async (msg)=>{
       debug(this.topicSub.name, ' got message', msg)
 
-      let msgWorkAround = new dataparty_crypto.Message({})
-      msgWorkAround.fromJSON(msg.offer)
+      for(let i=0; i<msg.offers.length; i++){
 
-      let offer = await party.privateIdentity.decrypt(msgWorkAround)
-      
-      if(offer.from.hash != otherIdentity.key.hash){
-        debug('BAD IDENTITY')
-        return
-      }
-      
-      //console.log(offer.msg)
-      if(!connected && this.peerParty){
-        this.peerParty.comms.socket.signal(offer.msg)
+        let msgWorkAround = new dataparty_crypto.Message({})
+        msgWorkAround.fromJSON(msg.offers[i])
+
+        let offer = await party.privateIdentity.decrypt(msgWorkAround)
+
+        if(offer.from.hash != otherIdentity.key.hash){
+          debug('BAD IDENTITY')
+          continue
+        }
+
+        debug('got webrtc offer', offer.msg)
+        if(!this.connected && this.peerParty){
+          this.peerParty.comms.socket.signal(offer.msg)
+        }
       }
     })
 
     debug('subscribed to - ', this.topicSub.name)
 
+    if(this.isSender()){
+      //await delay(500)
+    }
+
     this.peerParty = new PeerParty({
       comms: new RTCSocketComms({
         host: this.isSender(),
         session: this.payload.session,
         rtcOptions: {
           initiator: this.isSender(),
-          stream: mediaSrc, //false,
+          stream: mediaSrc,
+          //stream: this.isSender() ? mediaSrc : undefined, //false,
           trickle: true,
           allowHalfTrickle: true,
           config: {
@@ -233,6 +241,8 @@ class PeerInvite extends EventEmitter {
     })
 
 
+   let sendFreely = false
+
     this.peerParty.comms.socket.on('signal', async (data)=>{
 
       if(this.peerParty.comms.authed){ return }
@@ -242,31 +252,32 @@ class PeerInvite extends EventEmitter {
 
       const secureOffer = await party.privateIdentity.encrypt(data, otherIdentity)
 
-      if(host){
+      if(host && !sendFreely){
         //console.log('am host')
-        this.offers.push({offer: secureOffer.toJSON()})
+        this.offers.push( secureOffer.toJSON() )
       } else {
         //console.log('am client')
-        this.topicPub.publish({offer: secureOffer.toJSON()})
+        this.topicPub.publish( {offers: [secureOffer.toJSON()] } )
       }
     })
 
 
     if(host){
       console.log('delay')
-      await delay(2500)
+      await delay(250)
+      sendFreely = true
 
-      console.log('have offers', offers)
+      console.log('sending offers', this.offers)
 
-      for(let i=0; i < offers.length; i++){
+      //for(let i=0; i < this.offers.length; i++){
 
-        if(this.peerParty.comms.authed || this.connected){ break }
+        //if(this.peerParty.comms.authed || this.connected){ break }
 
-        this.topicPub.publish( offers[i] )
+        this.topicPub.publish( {offers: this.offers} )
 
-        await delay(1000)
+        //await delay(1000)
 
-      }
+      //}
     } else {
 
     }
@@ -288,4 +299,4 @@ class PeerInvite extends EventEmitter {
 
 }
 
-module.exports = PeerInvite
+module.exports = PeerInvite

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 = 60*1000
+const WATCHDOG_INTERVAL = 30*1000
 
 const Comms = require('../comms')
 const PeerParty = require('../party/peer/peer-party')

src/venue/public/p2p-test.html

@@ -113,7 +113,7 @@ <h2>Remote</h2>
 
     video.play()
 
-    await establish({
+    await pendingInvite.establish({
       mediaSrc: localMediaSrc,
       hostParty: hostLocal
     })
@@ -127,7 +127,18 @@ <h2>Remote</h2>
     audio: true
   })
 
-  await pendingInvite.accept(localMediaSrc)
+  console.log('showing local video')
+  var video = document.getElementById('local-video')
+
+  if ('srcObject' in video) {
+    video.srcObject = localMediaSrc
+  } else {
+    video.src = window.URL.createObjectURL(localMediaSrc) // for older browsers
+  }
+
+  video.play()
+
+  await pendingInvite.accept(localMediaSrc, config)
 
   pendingInvite.on('stream', invite => {
     // got remote video stream, now let's show it in a video tag
@@ -144,20 +155,6 @@ <h2>Remote</h2>
   })
 }
 
-async function finalizeCall(){
-
-  localMediaSrc = await navigator.mediaDevices.getUserMedia({
-    video: true,
-    audio: true
-  })
-
-
-  await pendingInvite.establish({
-    mediaSrc: localMediaSrc,
-    config
-    //hostParty: hostLocal
-  })
-}
 
 async function cancelCall() {
   if(!pendingInvite){ return }