X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=blobdiff_plain;f=client.js;h=160d5ddb4be53af90713898460f05e54f51297b8;hp=19ad38f4a802e004788e3b1c136070a744b85d18;hb=f7059ee7fc9e2fdfa48e80a13b2843ac08cec1dc;hpb=76f2586877c1ed21edf469bfe21cee9fcffe8310
diff --git a/client.js b/client.js
index 19ad38f..160d5dd 100644
--- a/client.js
+++ b/client.js
@@ -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-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)
+ }
+ }
+ 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()
+ })
}
/* 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
@@ -220,6 +215,6 @@ getPublicKey().then((cpk) => {
})
document.addEventListener('DOMContentLoaded', () => {
- document.body.innerHTML = ``
+ document.body.innerHTML = ``
});