X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=client.js;fp=client.js;h=c1956a7775420b0f207f1055594746166e51eff2;hp=160d5ddb4be53af90713898460f05e54f51297b8;hb=3f5fce84645ec2c59aec0908807d1e9cb3e05e2d;hpb=68d808b03537c8cbe71d895f2ebc0bd9ab232bea diff --git a/client.js b/client.js index 160d5dd..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 */ @@ -55,7 +55,7 @@ function requestHostAnswer(url, data) { /* 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.setRequestHeader('X-Strapp-Pubkey', data.pubKey) request.onreadystatechange = () => { if (request.status === 200) { if(request.readyState === 4) { @@ -72,7 +72,7 @@ function requestHostAnswer(url, data) { reject('server unhandled response of status ' + request.status) } } - request.send() + request.send(data) }) } @@ -170,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() @@ -192,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)