From: ken Date: Fri, 30 Jun 2017 23:23:58 +0000 (+0000) Subject: fixed null body for get headers X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fkiak.git;a=commitdiff_plain;h=d33866cf8b1a188ad9ab23a934986bfd1b4726cb fixed null body for get headers --- diff --git a/client.js b/client.js index 8989989..8813f55 100644 --- a/client.js +++ b/client.js @@ -7,11 +7,12 @@ document.body = body /* 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 pollServerTimeout(url, data, resolve, reject) { - console.log('Polling server with offer ' + data) + console.log(`Polling server ${url} with`) + console.log(data) const request = new XMLHttpRequest() - request.open('GET', url) + request.open('GET', url, true) request.setRequestHeader('Content-Type', 'application/json' ) - request.setRequestHeader('X-Strapp-Type', 'o' ) + request.setRequestHeader('X-Strapp-Type', JSON.stringify(data)) request.onreadystatechange = () => { if (request.status === 200) { console.log(request.response) @@ -26,7 +27,7 @@ function pollServerTimeout(url, data, resolve, reject) { } } console.log(data) - request.send('data in stufff and stuff in data') + request.send() } /* TODO: All this does is wrap a function in a promise */ @@ -76,7 +77,8 @@ const cpc = new RTCPeerConnection() console.log('creating offer') cpc.createOffer().then((offer) => { return cpc.setLocalDescription(offer) -}).then(() => { +}) + .then(() => { console.log('sessionDescriptionInit = ' + cpc.localDescription) getPublicKey().then((cpk) => { console.log('cpk is' + cpk) @@ -95,3 +97,6 @@ cpc.createOffer().then((offer) => { console.log('error in sdp handshake: ' + err) }) }) + .catch((err) => { + console.log(err) + }) diff --git a/main.js b/main.js index 845e54b..f123a41 100644 --- a/main.js +++ b/main.js @@ -73,7 +73,7 @@ const router = { const route = router.routes[routeName] /* Client is INIT GET */ - if (request.headers['x-strapp-type'] !== 'o') { + if (request.headers['x-strapp-type'] == undefined) { console.log('client init GET') response.writeHead(200, { 'Content-Type': 'text/html' }) response.write(`${router.skelPage[0]}${router.clientJS}${router.skelPage[1]}`) @@ -82,8 +82,7 @@ const router = { // (this happens when a client connects to an active route with no currently-online host) } else { /* Client sent offer, waiting for answer */ - console.log('client offer/answer GET') - //route.socket.send(JSON.parse(body.join(''))) + console.log(JSON.parse(request.headers['x-strapp-type'])) route.socket.on('message', (hostResponse) => { console.log(hostResponse) })