X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=client.js;h=a4b6953f659a3c2f7f732cb4f2ff7a52fcdba438;hp=eab31877a4d57e701d2e962a75fc8cc67282c87b;hb=a7e6c36b91dd1a36021f7459200436b3cb31d756;hpb=0ff5eabbfe914a66b7f6b2a7f22f6469895ab826
diff --git a/client.js b/client.js
index eab3187..a4b6953 100644
--- a/client.js
+++ b/client.js
@@ -1,148 +1,138 @@
const body = document.createElement('body')
const root = document.createElement('div')
document.title = "Strapp.io Client"
-body.appendChild(root)
-document.body = body
const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }
-/* 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 */
if (!window.localStorage.getItem('public-key')) {
- console.log('public key is undefined')
/* If doesn't exist, generate public and private key pair, store in
local storage */
crypto.subtle.generateKey(
{ name:'RSA-OAEP',
- modulusLength: 2048,
- publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
- hash: {name: "SHA-256"}
- },
- true,
- ['encrypt', 'decrypt']
- ).then((keyPair) => {
- /* TODO: Do we need to store the private key as well? */
- crypto.subtle.exportKey('jwk', keyPair.publicKey)
- .then((exportedKey) => {
- window.localStorage.setItem('publicKey', exportedKey)
- console.log('public key is' + window.localStorage.getItem('publicKey'))
- resolve(exportedKey)
- })
-
- })
- }
- else {
- resolve(window.localStorage.getItem('publicKey'))
- }
- })
+ modulusLength: 2048,
+ publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
+ hash: {name: "SHA-256"}
+ },
+ true,
+ ['encrypt', 'decrypt']
+ ).then((keyPair) => {
+ /* TODO: Do we need to store the private key as well? */
+ crypto.subtle.exportKey('jwk', keyPair.publicKey)
+ .then((exportedKey) => {
+ window.localStorage.setItem('publicKey', exportedKey)
+ console.log('public key is' + window.localStorage.getItem('publicKey'))
+ resolve(exportedKey)
+ })
+
+ })
+ }
+ else {
+ resolve(window.localStorage.getItem('publicKey'))
+ }
+})
}
-function postServer(url, data) {
+function sendHost(url, data) {
const request = new XMLHttpRequest()
- request.open('POST', url, true)
+ request.open('GET', url, true)
request.setRequestHeader('Content-Type', 'application/json' )
- request.setRequestHeader('X-Strapp-Type', 'ice-candidate-submission')
+ request.setRequestHeader('x-strapp-type', 'ice-candidate-submission')
request.send(data)
}
-/* TODO: All this does is wrap a function in a 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 response from Host')
- console.log(request)
- resolve(request.response)
+Do this until...? Can be used for either reconnecting or waiting for answer*/
+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')
- pollServerTimeout(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) {
- window.setInterval(() => {
- if (cpc.iceGatheringState !== 'complete') {
- return new Promise((resolve, reject) => {
- console.log('Client: Requesting ICE Candidates from server')
- const request = new XMLHttpRequest()
- request.open('GET', window.location, true)
- request.setRequestHeader('Content-Type', 'application/json' )
- request.setRequestHeader('X-Strapp-Type', 'ice-candidate-request')
- request.onreadystatechange = () => {
- if (request.status === 200) {
- if(request.readyState === 4) {
- console.log('Client: Recieved ICE Candidate from Host')
- resolve(request.response)
- }
- }
- else if (request.status === 204) {
- console.log('Ice Candidate unavailable, trying again in one second')
- }
- else {
- reject('server unhandled response of status ' + request.status)
- }
- }
- request.send(cpc.pubKey)
- }).then((response) => {
- cpc.addIceCandidate(response.candidate)
- }).catch((err) => {
- console.log('pollServerForICECandidate: ' + err)
- })
+function requestHostICE(cpc, url, pubKey) {
+ let intervalID = window.setInterval(() => {
+ if (cpc.iceConnectionState.localeCompare('connected') !== 0
+ && cpc.iceConnectionState.localeCompare('completed') !== 0) {
+ console.log('Client: Polling server begin for intervalID = ' + intervalID)
+ console.log('Client: Requesting ICE Candidates from server')
+ const request = new XMLHttpRequest()
+ request.open('GET', url, true)
+ request.setRequestHeader('Content-Type', 'application/json' )
+ request.setRequestHeader('x-strapp-Type', 'ice-candidate-request')
+ request.setRequestHeader('x-client-pubkey', pubKey)
+ request.onreadystatechange = () => {
+ if (request.status === 200) {
+ if(request.readyState === 4) {
+ console.log('Client: Recieved ICE response from Host')
+ let response = JSON.parse(request.response)
+ switch(response['iceState']) {
+ case "a":
+ cpc.addIceCandidate(new RTCIceCandidate(response.ice))
+ break
+ case "g": /* Gathering so let interval keep polling */
+ break
+ case "c": /* host iceState == Complete, stop bugging it */
+ clearInterval(intervalID)
+ clearTimeout()
+ break
+ default:
+ console.log('Unhandled iceState in requestHostICE()' + response['iceState'])
+ break
+ }
+ }
+ }
+ else {
+ console.log('server unhandled response of status ' + request.status)
+ clearInterval(intervalID)
+ }
+ }
+ request.send()
}
else {
clearTimeout()
+ clearInterval(intervalID)
}
- }, 2000)
+ }, 5000)
}
-/* Create, set, and get client Offer. Poll server for host answer.
- Set host answer as client remoteDescription */
+/* Create and send offer -> Send ICE Candidates -> Poll for ICE Candidates */
getPublicKey().then((cpk) => {
+ let dataChannel
+ console.log('Client: Create and send offer')
const cpc = new RTCPeerConnection(conf)
- /* Start data channel */
- sendChannel = cpc.createDataChannel("sendChannel");
- sendChannel.onopen = () => {
- console.log('client data channel on line')
- sendChannel.onmessage = (message) => {
- console.log(message.data)
- }
- sendChannel.send('Hi from the Client')
- };
- /* Start polling for ice candidate */
-
- console.log(cpc.iceConnectionState)
cpc.oniceconnectionstatechange = () => {
console.log('iceConnectionState = ' + cpc.iceConnectionState)
}
-
-
cpc.onnegotiationneeded = () => {
+ console.log('negotiation needed!')
cpc.createOffer().then((offer) => {
return cpc.setLocalDescription(offer)
})
@@ -153,18 +143,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: received host answer')
- cpc.setRemoteDescription(answer.sdp).then(() => {
- console.log('Client: Polling for ICE candidates')
- pollServerForICECandidate(cpc)
- })
+ console.log('Client: Polling for ICE candidates')
+ 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
@@ -174,8 +163,58 @@ getPublicKey().then((cpk) => {
console.log('Client: No more Ice Candidates to send')
}
}
+
+
}).catch( (err) => {
console.log('error in sdp handshake: ' + err)
})
}
+ /* Start data channel, triggers on negotiation needed */
+ dataChannel = cpc.createDataChannel("sendChannel");
+
+ /* Triggered when Host adds track to peer connection */
+ cpc.ontrack = (event) => {
+ let remoteRTPReceivers = cpc.getReceivers()
+ let hostScreen
+ let video = document.querySelector('video')
+ /* TODO: Audio, video, or other track? */
+ console.log(remoteRTPReceivers)
+ console.log(video)
+ hostScreen = new MediaStream([remoteRTPReceivers[0].track])
+ if(!video.srcObject) {
+ video.srcObject = hostScreen
+ }
+ console.log(hostScreen.getVideoTracks())
+ console.log(video.srcObject)
+ video.onloadedmetadata = () => {
+ 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)
+ }).then(() => {
+ dataChannel.send(JSON.stringify({
+ "cmd": "> screen dataChannel",
+ "sdp": cpc.localDescription
+ }))
+ })
+ })
+
+
+ }
+ dataChannel.onopen = () => {
+ document.body.innerHTML = (` `)
+ }
+
})
+document.addEventListener('DOMContentLoaded', () => {
+
+ document.body.innerHTML = ``
+
+});