adding test files

diff --git a/client-test.js b/client-test.js
new file mode 100644 (file)
index 0000000..fd84989
--- /dev/null
+++ b/client-test.js
@@ -0,0 +1,222 @@
+const body = document.createElement('body')\r
+const root = document.createElement('div')\r
+document.title = "Strapp.io Client"\r
+const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }\r
+\r
+/* TODO: This is duplicated in both client.js and host.js */\r
+function getPublicKey() {\r
+  return new Promise( (resolve, reject) => {\r
+    /* Check local storage for public key */\r
+    if (!window.localStorage.getItem('public-key')) {\r
+      /* If doesn't exist, generate public and private key pair, store in\r
+      local storage */\r
+      crypto.subtle.generateKey(\r
+        { name:'RSA-OAEP',\r
+        modulusLength: 2048,\r
+        publicExponent: new Uint8Array([0x01, 0x00, 0x01]),\r
+        hash: {name: "SHA-256"}\r
+      },\r
+      true,\r
+      ['encrypt', 'decrypt']\r
+    ).then((keyPair) => {\r
+      /* TODO: Do we need to store the private key as well? */\r
+      crypto.subtle.exportKey('jwk', keyPair.publicKey)\r
+      .then((exportedKey) => {\r
+        window.localStorage.setItem('publicKey', exportedKey)\r
+        console.log('public key is' + window.localStorage.getItem('publicKey'))\r
+        resolve(exportedKey)\r
+      })\r
+\r
+    })\r
+  }\r
+  else {\r
+    resolve(window.localStorage.getItem('publicKey'))\r
+  }\r
+})\r
+\r
+}\r
+\r
+function sendHost(url, data) {\r
+  const request = new XMLHttpRequest()\r
+  request.open('POST', url, true)\r
+  request.setRequestHeader('Content-Type', 'application/json' )\r
+  request.setRequestHeader('X-Strapp-Type', 'ice-candidate-submission')\r
+  request.send(data)\r
+}\r
+\r
+/* Poll the server. Send get request, wait for timeout, send another request.\r
+Do this until...? Can be used for either reconnecting or waiting for answer*/\r
+function requestHostAnswer(url, data) {\r
+  return new Promise((resolve, reject) => {\r
+    const request = new XMLHttpRequest()\r
+    request.open('GET', url, true)\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.setRequestHeader('X-Strapp-Offer', JSON.stringify(data.sdp))\r
+    request.onreadystatechange = () => {\r
+      if (request.status === 200) {\r
+        if(request.readyState === 4) {\r
+          console.log('Client: Recieved Answer from Host')\r
+          console.log(request)\r
+          resolve(request.response)\r
+        }\r
+      }\r
+      else if (request.status === 504) {\r
+        console.log('timed out, resending')\r
+        resolve(requestHostAnswer(url, data))\r
+      }\r
+      else {\r
+        reject('server unhandled response of status ' + request.status)\r
+      }\r
+    }\r
+    request.send()\r
+  })\r
+}\r
+\r
+/* Poll server for ice candidates until ice is complete */\r
+function requestHostICE(cpc, url, pubKey) {\r
+  let intervalID = window.setInterval(() => {\r
+    if (cpc.iceConnectionState.localeCompare('connected') !== 0\r
+    && cpc.iceConnectionState.localeCompare('completed') !== 0) {\r
+      console.log('Client: Polling server begin for intervalID = ' + intervalID)\r
+      console.log('Client: Requesting ICE Candidates from server')\r
+      const request = new XMLHttpRequest()\r
+      request.open('GET', url, true)\r
+      request.setRequestHeader('Content-Type', 'application/json' )\r
+      request.setRequestHeader('X-Strapp-Type', 'ice-candidate-request')\r
+      request.setRequestHeader('X-client-pubkey', pubKey)\r
+      request.onreadystatechange = () => {\r
+        if (request.status === 200) {\r
+          if(request.readyState === 4) {\r
+            console.log('Client: Recieved ICE response from Host')\r
+            let response = JSON.parse(request.response)\r
+            switch(response['iceState']) {\r
+              case "a":\r
+              cpc.addIceCandidate(new RTCIceCandidate(response.ice))\r
+              break\r
+              case "g": /* Gathering so let interval keep polling */\r
+              break\r
+              case "c": /* host iceState == Complete, stop bugging it */\r
+              clearInterval(intervalID)\r
+              clearTimeout()\r
+              break\r
+              default:\r
+              console.log('Unhandled iceState in requestHostICE()' + response['iceState'])\r
+              break\r
+            }\r
+          }\r
+        }\r
+        else {\r
+          console.log('server unhandled response of status ' + request.status)\r
+          clearInterval(intervalID)\r
+        }\r
+      }\r
+      request.send()\r
+    }\r
+    else {\r
+      clearTimeout()\r
+      clearInterval(intervalID)\r
+    }\r
+  }, 5000)\r
+}\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
+  cpc.oniceconnectionstatechange = () => {\r
+    console.log('iceConnectionState = ' + cpc.iceConnectionState)\r
+  }\r
+\r
+  cpc.onnegotiationneeded = () => {\r
+    console.log('negotiation needed!')\r
+    cpc.createOffer().then((offer) => {\r
+      return cpc.setLocalDescription(offer)\r
+    })\r
+    .then(() => {\r
+      console.log('Client: Sending offer to host')\r
+      let offer = {\r
+        cmd: '> sdp pubKey',\r
+        sdp: cpc.localDescription,\r
+        pubKey: cpk.n\r
+      }\r
+      console.log(offer)\r
+      return requestHostAnswer(window.location, offer)\r
+    })\r
+    .then((serverResponse) => {\r
+      const answer = JSON.parse(serverResponse)\r
+      console.log('Client: Polling for ICE candidates')\r
+      requestHostICE(cpc, window.location, cpk.n)\r
+      cpc.setRemoteDescription(answer.sdp)\r
+      cpc.onicecandidate = (event) => {\r
+        if (event.candidate) {\r
+          console.log('Client: Sending ice candidate to host')\r
+          sendHost(window.location, JSON.stringify({\r
+            cmd: '> ice pubkey',\r
+            ice: event.candidate,\r
+            pubKey: cpk.n\r
+          }))\r
+        }\r
+        else {\r
+          console.log('Client: No more Ice Candidates to send')\r
+        }\r
+      }\r
+\r
+\r
+    }).catch( (err) => {\r
+      console.log('error in sdp handshake: ' + err)\r
+    })\r
+  }\r
+  /* Start data channel, triggers on negotiation needed */\r
+  dataChannel = cpc.createDataChannel("sendChannel");\r
+\r
+  /* Triggered when Host adds track to peer connection */\r
+  cpc.ontrack = (event) => {\r
+    let remoteRTPReceivers = cpc.getReceivers()\r
+    let hostScreen\r
+    let video = document.querySelector('video')\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
+      video.srcObject = hostScreen\r
+    }\r
+    console.log(hostScreen.getVideoTracks())\r
+    console.log(video.srcObject)\r
+    video.onloadedmetadata = () => {\r
+      video.play()\r
+    }\r
+  }\r
+\r
+  dataChannel.onmessage = (msg) => {\r
+    /* Get mediaStream from host and add it to the video */\r
+    let hostMessage = JSON.parse(msg.data)\r
+    console.log('Client: Renego')\r
+    cpc.setRemoteDescription(hostMessage.sdp).then(() => {\r
+      cpc.createAnswer().then((answer) => {\r
+        return cpc.setLocalDescription(answer)\r
+      }).then(() => {\r
+        dataChannel.send(JSON.stringify({\r
+          "cmd": "> screen dataChannel",\r
+          "sdp": cpc.localDescription\r
+        }))\r
+      })\r
+    })\r
+\r
+\r
+  }\r
+  dataChannel.onopen = () => {\r
+    document.body.innerHTML = (`<div><button> Connection with host established! </button></div> <video controls></video>`)\r
+  }\r
+\r
+})\r
+document.addEventListener('DOMContentLoaded', () => {\r
+\r
+  document.body.innerHTML = `<button> Setting up connection with host  </button>`\r
+\r
+});\r

diff --git a/host-test.js b/host-test.js
new file mode 100644 (file)
index 0000000..25a7b62
--- /dev/null
+++ b/host-test.js
@@ -0,0 +1,233 @@
+document.title = "Strapp.io Host"\r
+\r
+\r
+const conf = {"iceServers": [{ "urls": "stun:stun.1.google.com:19302" }] }\r
+const clients = new Map([])\r
+const iceCandidates = []\r
+let dataChannel\r
+let screenStream /* TODO: Remove if can access localStreams */\r
+let tracks = []\r
+let hpk\r
+\r
+/* TODO: duplicate in both client.js and host.jhs */\r
+function getPublicKey() {\r
+  return new Promise( (resolve, reject) => {\r
+    /* Check local storage for public key */\r
+    if (!window.localStorage.getItem('public-key')) {\r
+      console.log('public key is undefined')\r
+      /* If doesn't exist, generate public and private key pair, store in\r
+      local storage */\r
+      crypto.subtle.generateKey(\r
+        { name:'RSA-OAEP',\r
+        modulusLength: 2048,\r
+        publicExponent: new Uint8Array([0x01, 0x00, 0x01]),\r
+        hash: {name: "SHA-256"}\r
+      },\r
+      true,\r
+      ['encrypt', 'decrypt']\r
+    ).then((keyPair) => {\r
+      /* TODO: Do we need to store the private key as well? */\r
+      crypto.subtle.exportKey('jwk', keyPair.publicKey)\r
+      .then((exportedKey) => {\r
+        window.localStorage.setItem('publicKey', exportedKey)\r
+        console.log('public key is' + window.localStorage.getItem('publicKey'))\r
+        resolve(exportedKey)\r
+      })\r
+\r
+    })\r
+  }\r
+  else {\r
+    resolve(window.localStorage.getItem('publicKey'))\r
+    }\r
+  })\r
+}\r
+\r
+function sendClientICE(clientPubKey, hostPubKey, iceCandidate) {\r
+  console.log('Host: Allocating ice candidate for client')\r
+  console.log(iceCandidate)\r
+  iceCandidates.push(JSON.stringify({\r
+    cmd: "< ice pubKey",\r
+    ice: iceCandidate,\r
+    hostPubKey: hostPubKey, /* TODO: do we need to send this? */\r
+    clientPubKey: clientPubKey,\r
+    iceState: "a"\r
+  }))\r
+}\r
+\r
+function handleNewClientConnection(pubKey, sdpOffer) {\r
+  /* New Client Connection*/\r
+  hpc = new RTCPeerConnection(conf)\r
+  console.log('handleNewClientConnections()')\r
+  console.log(sdpOffer)\r
+  clients.set(pubKey, hpc)\r
+  console.log(pubKey)\r
+  hpc.setRemoteDescription(sdpOffer)\r
+  .then(() => {\r
+    hpc.createAnswer().then((answer) => {\r
+      return hpc.setLocalDescription(answer)\r
+    })\r
+    .then(() => {\r
+\r
+      hpc.onicecandidate = (event) => {\r
+        if (event.candidate) {\r
+          sendClientICE(pubKey, hpk.n, event.candidate)\r
+        }\r
+        else {\r
+          console.log('Host: Finished allocating ICE candidates')\r
+        }\r
+      }\r
+      console.log('Host: Sending answer to Client ')\r
+      wsock.send(JSON.stringify({\r
+        cmd: '< sdp pubKey',\r
+        sdp: hpc.localDescription,\r
+        hostPubKey: hpk.n,\r
+        clientPubKey: pubKey\r
+      }))\r
+\r
+    }).catch((err) => {\r
+      console.log(`error in host answer ${err}`)\r
+    })\r
+  }).catch((error) => {\r
+    console.log(`error in setRemoteDescription ${error}`)\r
+  })\r
+  hpc.oniceconnectionstatechange = () => {\r
+    console.log('iceConnectionState = ' + hpc.iceConnectionState)\r
+  }\r
+  hpc.ondatachannel = (evt) => {\r
+    dataChannel = evt.channel\r
+    dataChannel.onmessage = (msg) => {\r
+      let clientMessage = JSON.parse(msg.data)\r
+      console.log(`client message is ${clientMessage}`)\r
+      hpc.setRemoteDescription(clientMessage.sdp).then(() => {\r
+        console.log('should be streaming now')\r
+      })\r
+    }\r
+    dataChannel.onopen = () => {\r
+      /* If !screenStream, gUM */\r
+      screenStream.getTracks().forEach( (track) => {\r
+        hpc.addTrack(track, screenStream)\r
+      })\r
+      console.log(hpc.getSenders())\r
+      /* Create offer */\r
+      hpc.createOffer().then((offer) => {\r
+        return hpc.setLocalDescription(offer)\r
+      }).then( () => {\r
+        dataChannel.send(JSON.stringify({\r
+          "cmd": "< screen dataChannel",\r
+          "sdp": hpc.localDescription,\r
+          "pubKey": hpc['hpk'].n\r
+        }))\r
+      })\r
+    }\r
+  }\r
+  hpc.onnegotiationneeded = () => {\r
+    console.log('negotiation needed')\r
+  }\r
+\r
+}\r
+\r
+function handleNewIceCandidate(msg) {\r
+  console.log('Host: Adding new ice candidate')\r
+  const hpc = clients.get(msg.pubKey)\r
+  let candidate = new RTCIceCandidate(msg.ice)\r
+  hpc.addIceCandidate(candidate)\r
+}\r
+\r
+function handleIceRequest(msg) {\r
+  console.log('Host: Handling ice candidate request')\r
+  console.log(iceCandidates)\r
+  const hpc = clients.get(msg.pubKey)\r
+  const iceCandidate = iceCandidates.pop()\r
+  if (iceCandidate !== undefined) {\r
+    wsock.send(iceCandidate)\r
+  } else {\r
+    if (hpc.iceGatheringState.localeCompare('gathering') === 0) {\r
+      wsock.send(`{"cmd" : "< ice pubKey", "clientPubKey":"${msg.pubKey}", "iceState": "g"}`)\r
+    }\r
+    else if (hpc.iceGatheringState.localeCompare('complete') === 0) {\r
+      wsock.send(`{"cmd" : "< ice pubKey", "clientPubKey":"${msg.pubKey}", "iceState": "c"}`)\r
+    }\r
+\r
+  }\r
+\r
+}\r
+if ("WebSocket" in window) {\r
+  document.addEventListener('DOMContentLoaded', (event) => {\r
+    document.body.innerHTML = '<div>Choose options for client</div> <video autoplay></video>'\r
+    navigator.mediaDevices.getUserMedia({\r
+        video : { mediaSource: "screen",\r
+        width: {max: '1920'},\r
+        height: {max: '1080'},\r
+        frameRate: {max: '10'}} })\r
+    .then(function(mediaStream) {\r
+      let video = document.querySelector('video')\r
+      screenStream = mediaStream\r
+      console.log(mediaStream)\r
+      video.srcObject = mediaStream\r
+      console.log('Grabbed media')\r
+      video.onloadedmetadata = function(e) {\r
+        console.log(e)\r
+        video.play()\r
+      }\r
+    })\r
+    .catch(function(err) {\r
+      document.body.innerHTML = 'Help me help you. Reload the page and allow screen sharing!'\r
+      console.log(err);\r
+    }); // always check for errors at the end.\r
+\r
+    getPublicKey()\r
+    .then((hpkVal) => {\r
+      hpk = hpkVal\r
+    })\r
+    wsock = new WebSocket(`${_strapp_protocol}://${window.location.hostname}:${_strapp_port}`)\r
+    wsock.onopen = () => {\r
+      console.log(`Strapped to ${_strapp_protocol}://${window.location.hostname}:${_strapp_port}`)\r
+    }\r
+\r
+    wsock.onmessage = (serverMsg) => {\r
+      /* msg is either offer or ice candidate or ice candidate request*/\r
+\r
+      /* What if data null? */\r
+      console.log(`serverMsg = ${serverMsg.data}`)\r
+\r
+      let msg = serverMsg.data.split(' ')\r
+      let clientID = msg[0]\r
+      let type =  msg[1]\r
+      let data = JSON.parse(msg.splice(2).join())\r
+\r
+      if (clients.has(clientID)) {\r
+        switch (type) {\r
+          case 'ice-candidate-submission':\r
+            handleNewIceCandidate(msg)\r
+            break\r
+          case 'ice-candidate-request':\r
+            handleIceRequest(msg)\r
+            break\r
+          case 'client-sdp-offer':\r
+            //repeatedoffer shouldnt happen here\r
+      }\r
+      }\r
+      else {\r
+        switch (type) {\r
+          case 'client-sdp-offer':\r
+            handleNewClientConnection(clientID, data)\r
+            break\r
+          case 'ice-candidate-request':\r
+            handleIceRequest()\r
+            break\r
+          case 'ice-candidate-submission':\r
+            handleNewIceCandidate\r
+            break\r
+        }\r
+      }\r
+    }\r
+\r
+\r
+\r
+  })\r
+}\r
+else {\r
+  document.addEventListener('DOMContentLoaded', () => {\r
+    document.body.innerHTML = 'Websockets not supported in your browser'\r
+  })\r
+}\r