Merge branch 'master' of github.com:Jlavatai/strapp

[henge/kiak.git] / client.js

diff --git a/client.js b/client.js
index c1956a7..6cdf150 100644 (file)
--- a/client.js
+++ b/client.js
@@ -2,8 +2,6 @@ const body = document.createElement('body')
 const root = document.createElement('div')\r
 document.title = "Strapp.io Client"\r
 const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }\r
 const root = document.createElement('div')\r
 document.title = "Strapp.io Client"\r
 const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }\r

-let dataChannel\r
-let hostScreen\r

 \r
 /* TODO: This is duplicated in both client.js and host.js */\r
 function getPublicKey() {\r
 \r
 /* TODO: This is duplicated in both client.js and host.js */\r
 function getPublicKey() {\r


@@ -55,8 +53,8 @@ function requestHostAnswer(url, data) {
     /* But there is no JSON? */\r
     request.setRequestHeader('Content-Type', 'application/json' )\r
     request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')\r
     /* But there is no JSON? */\r
     request.setRequestHeader('Content-Type', 'application/json' )\r
     request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')\r

-    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)    \r
-    request.onreadystatechange = () => {\r
+    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)
+    request.onreadystatechange = () => {

       if (request.status === 200) {\r
         if(request.readyState === 4) {\r
           console.log('Client: Recieved Answer from Host')\r
       if (request.status === 200) {\r
         if(request.readyState === 4) {\r
           console.log('Client: Recieved Answer from Host')\r


@@ -125,6 +123,7 @@ function requestHostICE(cpc, url, pubKey) {
 \r
 /* Create and send offer -> Send ICE Candidates -> Poll for ICE Candidates */\r
 getPublicKey().then((cpk) => {\r
 \r
 /* Create and send offer -> Send ICE Candidates -> Poll for ICE Candidates */\r
 getPublicKey().then((cpk) => {\r

+  let dataChannel\r

   console.log('Client: Create and send offer')\r
   const cpc = new RTCPeerConnection(conf)\r
 \r
   console.log('Client: Create and send offer')\r
   const cpc = new RTCPeerConnection(conf)\r
 \r


@@ -175,13 +174,11 @@ getPublicKey().then((cpk) => {
 \r
   /* Triggered when Host adds track to peer connection */\r
   cpc.ontrack = (event) => {\r
 \r
   /* Triggered when Host adds track to peer connection */\r
   cpc.ontrack = (event) => {\r

-    console.log(`track event is ${event}`)\r
-    let remoteRTPSenders = cpc.getSenders()\r

     let remoteRTPReceivers = cpc.getReceivers()\r
     let remoteRTPReceivers = cpc.getReceivers()\r

-    console.log(remoteRTPReceivers)\r
-    /* Add each remoteRTPSenders.track to own stream */\r
+    let hostScreen\r

     let video = document.querySelector('video')\r
     let video = document.querySelector('video')\r

-    video.autoplay = true\r
+    /* TODO: Audio, video, or other track? */\r
+    console.log(remoteRTPReceivers)\r

     console.log(video)\r
     hostScreen = new MediaStream([remoteRTPReceivers[0].track])\r
     if(!video.srcObject) {\r
     console.log(video)\r
     hostScreen = new MediaStream([remoteRTPReceivers[0].track])\r
     if(!video.srcObject) {\r


@@ -189,7 +186,6 @@ getPublicKey().then((cpk) => {
     }\r
     console.log(hostScreen.getVideoTracks())\r
     console.log(video.srcObject)\r
     }\r
     console.log(hostScreen.getVideoTracks())\r
     console.log(video.srcObject)\r

-    video.play()\r

     video.onloadedmetadata = () => {\r
       video.play()\r
     }\r
     video.onloadedmetadata = () => {\r
       video.play()\r
     }\r