X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=client.js;h=c1956a7775420b0f207f1055594746166e51eff2;hp=9b58c5d772cb0bee035181695d5d93924ba53022;hb=bfecfec52e8ce28c6eefc336ee42df3263b6cef3;hpb=49487d947260500f71a7e125c705cef45e998db2

diff --git a/client.js b/client.js
index 9b58c5d..c1956a7 100644
--- a/client.js
+++ b/client.js
@@ -5,7 +5,7 @@ const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }
 let dataChannel
 let hostScreen
 
-/* TODO: duplicate in both client.js and host.js */
+/* TODO: This is duplicated in both client.js and host.js */
 function getPublicKey() {
   return new Promise( (resolve, reject) => {
     /* Check local storage for public key */
@@ -38,7 +38,7 @@ function getPublicKey() {
 
 }
 
-function postServer(url, data) {
+function sendHost(url, data) {
   const request = new XMLHttpRequest()
   request.open('POST', url, true)
   request.setRequestHeader('Content-Type', 'application/json' )
@@ -46,44 +46,38 @@ function postServer(url, data) {
   request.send(data)
 }
 
-/* TODO: All this does is wrap a function in a promise. Allows pollServerForAnswer
-to call itself recursively with the same promise */
-function pollServer(url, clientPubKey, func) {
-  return new Promise((resolve, reject) => {
-    func(url, clientPubKey, resolve, reject )
-  })
-}
-
 /* Poll the server. Send get request, wait for timeout, send another request.
 Do this until...? Can be used for either reconnecting or waiting for answer*/
-function pollServerForAnswer(url, data, resolve, reject) {
-  const request = new XMLHttpRequest()
-  request.open('GET', url, true)
-  /* But there is no JSON? */
-  request.setRequestHeader('Content-Type', 'application/json' )
-  request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')
-  request.setRequestHeader('X-Client-Offer', JSON.stringify(data))
-  request.onreadystatechange = () => {
-    if (request.status === 200) {
-      if(request.readyState === 4) {
-        console.log('Client: Recieved Answer from Host')
-        console.log(request)
-        resolve(request.response)
+function requestHostAnswer(url, data) {
+  return new Promise((resolve, reject) => {
+    const request = new XMLHttpRequest()
+    request.open('GET', url, true)
+    /* But there is no JSON? */
+    request.setRequestHeader('Content-Type', 'application/json' )
+    request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')
+    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)    
+    request.onreadystatechange = () => {
+      if (request.status === 200) {
+        if(request.readyState === 4) {
+          console.log('Client: Recieved Answer from Host')
+          console.log(request)
+          resolve(request.response)
+        }
+      }
+      else if (request.status === 504) {
+        console.log('timed out, resending')
+        resolve(requestHostAnswer(url, data))
+      }
+      else {
+        reject('server unhandled response of status ' + request.status)
       }
     }
-    else if (request.status === 504) {
-      console.log('timed out, resending')
-      pollServerForAnswer(url, data, resolve, reject)
-    }
-    else {
-      reject('server unhandled response of status ' + request.status)
-    }
-  }
-  request.send()
+    request.send(data)
+  })
 }
 
 /* Poll server for ice candidates until ice is complete */
-function pollServerForICECandidate(cpc, url, pubKey) {
+function requestHostICE(cpc, url, pubKey) {
   let intervalID = window.setInterval(() => {
     if (cpc.iceConnectionState.localeCompare('connected') !== 0
     && cpc.iceConnectionState.localeCompare('completed') !== 0) {
@@ -101,17 +95,17 @@ function pollServerForICECandidate(cpc, url, pubKey) {
             let response = JSON.parse(request.response)
             switch(response['iceState']) {
               case "a":
-                cpc.addIceCandidate(new RTCIceCandidate(response.ice))
-                break
+              cpc.addIceCandidate(new RTCIceCandidate(response.ice))
+              break
               case "g": /* Gathering so let interval keep polling */
-                break
+              break
               case "c": /* host iceState == Complete, stop bugging it */
-                clearInterval(intervalID)
-                clearTimeout()
-                break
+              clearInterval(intervalID)
+              clearTimeout()
+              break
               default:
-                console.log('Unhandled iceState in pollServerForICECandidate()' + response['iceState'])
-                break
+              console.log('Unhandled iceState in requestHostICE()' + response['iceState'])
+              break
             }
           }
         }
@@ -150,16 +144,17 @@ getPublicKey().then((cpk) => {
         sdp: cpc.localDescription,
         pubKey: cpk.n
       }
-      return pollServer(window.location, offer, pollServerForAnswer)
-    }).then((serverResponse) => {
+      return requestHostAnswer(window.location, offer)
+    })
+    .then((serverResponse) => {
       const answer = JSON.parse(serverResponse)
       console.log('Client: Polling for ICE candidates')
-      pollServerForICECandidate(cpc, window.location, cpk.n)
+      requestHostICE(cpc, window.location, cpk.n)
       cpc.setRemoteDescription(answer.sdp)
       cpc.onicecandidate = (event) => {
         if (event.candidate) {
           console.log('Client: Sending ice candidate to host')
-          postServer(window.location, JSON.stringify({
+          sendHost(window.location, JSON.stringify({
             cmd: '> ice pubkey',
             ice: event.candidate,
             pubKey: cpk.n
@@ -175,8 +170,10 @@ getPublicKey().then((cpk) => {
       console.log('error in sdp handshake: ' + err)
     })
   }
-  /* Start data channel */
+  /* Start data channel, triggers on negotiation needed */
   dataChannel = cpc.createDataChannel("sendChannel");
+
+  /* Triggered when Host adds track to peer connection */
   cpc.ontrack = (event) => {
     console.log(`track event is ${event}`)
     let remoteRTPSenders = cpc.getSenders()
@@ -197,9 +194,11 @@ getPublicKey().then((cpk) => {
       video.play()
     }
   }
+
   dataChannel.onmessage = (msg) => {
     /* Get mediaStream from host and add it to the video */
     let hostMessage = JSON.parse(msg.data)
+    console.log('Client: Renego')
     cpc.setRemoteDescription(hostMessage.sdp).then(() => {
       cpc.createAnswer().then((answer) => {
         return cpc.setLocalDescription(answer)
@@ -220,6 +219,6 @@ getPublicKey().then((cpk) => {
 })
 document.addEventListener('DOMContentLoaded', () => {
 
-    document.body.innerHTML = `<button> Setting up connection with host </button>`
+  document.body.innerHTML = `<button> Setting up connection with host  </button>`
 
 });