seems to work happily now

Author: nullagent

src/comms/peer-comms.js

@@ -71,6 +71,7 @@ class PeerComms extends ISocketComms {
 
   setState(state) {
     this.state = state
+    debug('state -', state)
     this.emit('state', this.state)
   }
 

src/party/iparty.js

@@ -178,7 +178,7 @@ class IParty {
 
     const identityBson = this._identity.toBSON(true)
     const identityBase64 = dataparty_crypto.Routines.Utils.base64.encode(identityBson)
-    await this.config.write(path, identityBase64)
+    await this.config.write('identity', identityBase64)
   }
 
   /**

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

@@ -148,7 +148,7 @@ class MatchMakerClient extends EventEmitter {
 
     if( pending &&
         //msg.invite.state == 'accepted' &&
-        pending.$meta.id == msg.invite.$meta.id
+        pending.inviteDoc.id == msg.invite.$meta.id
     ){
 
       pending.onInviteMsg(msg.invite)

src/party/peer/peer-invite.js

@@ -3,6 +3,8 @@
 const debug = require('debug')('dataparty.peer-invite')
 const EventEmitter = require('eventemitter3')
 
+const dataparty_crypto = require('@dataparty/crypto')
+
 const PeerParty = require('./peer-party')
 const RTCSocketComms = require('../../comms/rtc-socket-comms')
 
@@ -39,6 +41,8 @@ class PeerInvite extends EventEmitter {
     // host only
     this.offers = []
 
+    this.incomingStream = null
+
     /*if(!this.isSender()){
       this.inviteDoc.
     }*/
@@ -74,13 +78,13 @@ class PeerInvite extends EventEmitter {
   async accept(mediaSrc){
     debug('accepting invite')
 
-    if(this.inviteDoc.toHash == party.identity.key.hash){
-        otherIdentity = await this.matchMaker.lookupPublicKey(pendingCallInvite.fromHash)
+    /*if(this.inviteDoc.toHash == matchMaker.wsParty.identity.key.hash){
+        otherIdentity = await this.matchMaker.lookupPublicKey(this.inviteDoc.fromHash)
     } else {
-        otherIdentity = await this.matchMaker.lookupPublicKey(pendingCallInvite.toHash)
-    }
+        otherIdentity = await this.matchMaker.lookupPublicKey(this.inviteDoc.toHash)
+    }*/
 
-    let changedInvite = await setInviteState(this, 'accepted')
+    let changedInvite = await this.matchMaker.setInviteState(this, 'accepted')
 
     //console.log('pendingCall', changedInvite)
 
@@ -222,9 +226,16 @@ class PeerInvite extends EventEmitter {
       this.emit('connected')
     })
 
+
+    this.peerParty.comms.socket.on('stream', stream => {
+      this.incomingStream = stream
+      this.emit('stream', this)
+    })
+    
+
     this.peerParty.comms.socket.on('signal', async (data)=>{
 
-      if(pthis.eerParty.comms.authed){ return }
+      if(this.peerParty.comms.authed){ return }
 
       debug(' >> offer signal trickle', data)
 

src/venue/public/p2p-test.html

@@ -23,7 +23,7 @@
 
   <div>
     <input type="text" id="invite-id" placeholder="invite id" readonly>
-    <button onclick="answerCall()">Answer Call</button>
+    <button onclick="acceptCall()">Answer Call</button>
     <button onclick="rejectCall()">Reject Call</button>
   </div>
 
@@ -48,6 +48,21 @@ <h2>Remote</h2>
 
 let pendingInvite = null
 
+let localMediaSrc = null
+
+let config = new Dataparty.Config.LocalStorageConfig({
+  basePath:'',
+  cloud: {
+    uri: 'https://' + window.location.hostname + ':3000'
+  }
+})
+
+let hostLocal = new Dataparty.LokiParty({
+  path: 'call-test',
+  dbAdapter: new Dataparty.LokiParty.Loki.LokiMemoryAdapter(),
+  config: config
+})
+
 async function callUser(){
   if(pendingInvite){ return }
 
@@ -60,9 +75,88 @@ <h2>Remote</h2>
     action: 'call'
   })
 
+  pendingInvite.on('stream', invite => {
+    // got remote video stream, now let's show it in a video tag
+    console.log('showing remote video')
+    var video = document.getElementById('remote-video')
+
+    if ('srcObject' in video) {
+      video.srcObject = invite.incomingStream
+    } else {
+      video.src = window.URL.createObjectURL(invite.incomingStream) // for older browsers
+    }
+
+    video.play()
+  })
+
   pendingInvite.on('state-change', (invite)=>{
     console.log('state-change', invite.state, invite)
   })
+
+  pendingInvite.once('accepted', async (invite)=>{
+
+    console.log('accepted')
+
+    localMediaSrc = await navigator.mediaDevices.getUserMedia({
+      video: true,
+      audio: true
+    })
+
+    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 establish({
+      mediaSrc: localMediaSrc,
+      hostParty: hostLocal
+    })
+  })
+}
+
+async function acceptCall() {
+
+  localMediaSrc = await navigator.mediaDevices.getUserMedia({
+    video: true,
+    audio: true
+  })
+
+  await pendingInvite.accept(localMediaSrc)
+
+  pendingInvite.on('stream', invite => {
+    // got remote video stream, now let's show it in a video tag
+    console.log('showing remote video')
+    var video = document.getElementById('remote-video')
+
+    if ('srcObject' in video) {
+      video.srcObject = invite.incomingStream
+    } else {
+      video.src = window.URL.createObjectURL(invite.incomingStream) // for older browsers
+    }
+
+    video.play()
+  })
+}
+
+async function finalizeCall(){
+
+  localMediaSrc = await navigator.mediaDevices.getUserMedia({
+    video: true,
+    audio: true
+  })
+
+
+  await pendingInvite.establish({
+    mediaSrc: localMediaSrc,
+    config
+    //hostParty: hostLocal
+  })
 }
 
 async function cancelCall() {
@@ -78,7 +172,10 @@ <h2>Remote</h2>
 }
 
 async function init(){
-  matchMaker = new Dataparty.MatchMakerClient(null, null)
+
+  await hostLocal.start()
+
+  matchMaker = new Dataparty.MatchMakerClient(hostLocal.privateIdentity, null)
 
   await matchMaker.start()