From 7235ae229d56f9bda5079d864d9712fc6c3bf65e Mon Sep 17 00:00:00 2001
From: Khush Jammu <khushjammu@gmail.com>
Date: Sat, 30 May 2020 19:01:59 +0800
Subject: [PATCH 1/6] fix screen sharing

---
 public/js/chat.js | 80 ++++++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 8d627c5..58c3f79 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -28,12 +28,12 @@ const entireChat = $("#entire-chat");
 const chatZone = $("#chat-zone");
 
 var VideoChat = {
-  connected: [],
+  connected: new Map(),
   localICECandidates: {},
   socket: io(),
   remoteVideoWrapper: document.getElementById("wrapper"),
   localVideo: document.getElementById("local-video"),
-  peerConnections: {},
+  peerConnections: new Map(),
   recognition: undefined,
   answerCreatedUUIDs: [], // HACKY workaround: currently, onAnswer seems to be triggering twice and we don't know why
 
@@ -135,19 +135,20 @@ var VideoChat = {
       
 
       VideoChat.localICECandidates[uuid] = []; // initialise uuid with empty array
-      VideoChat.connected[uuid] = false;
+      VideoChat.connected.set(uuid, false);
+      // VideoChat.connected[uuid] = false;
 
       // Set up a new RTCPeerConnection using the token's iceServers.
-      VideoChat.peerConnections[uuid] = new RTCPeerConnection({
+      VideoChat.peerConnections.set(uuid, new RTCPeerConnection({
         iceServers: token.iceServers,
-      });
+      }))
       // Add the local video stream to the peerConnection.
       VideoChat.localStream.getTracks().forEach(function (track) {
-        VideoChat.peerConnections[uuid].addTrack(track, VideoChat.localStream);
+        VideoChat.peerConnections.get(uuid).addTrack(track, VideoChat.localStream);
       });
       // Add general purpose data channel to peer connection,
       // used for text chats, captions, and toggling sending captions
-      dataChanel = VideoChat.peerConnections[uuid].createDataChannel("chat", {
+      dataChanel = VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
         negotiated: true,
         // both peers must have same id
         id: 0,
@@ -173,13 +174,13 @@ var VideoChat = {
 
       // Set up callbacks for the connection generating iceCandidates or
       // receiving the remote media stream.
-      VideoChat.peerConnections[uuid].onicecandidate = function(u) {VideoChat.onIceCandidate(u, uuid)};
-      VideoChat.peerConnections[uuid].onaddstream = function(u) {VideoChat.onAddStream(u, uuid)};
+      VideoChat.peerConnections.get(uuid).onicecandidate = function(u) {VideoChat.onIceCandidate(u, uuid)};
+      VideoChat.peerConnections.get(uuid).onaddstream = function(u) {VideoChat.onAddStream(u, uuid)};
       
 
       // Called when there is a change in connection state
-      VideoChat.peerConnections[uuid].oniceconnectionstatechange = function (event) {
-        switch (VideoChat.peerConnections[uuid].iceConnectionState) {
+      VideoChat.peerConnections.get(uuid).oniceconnectionstatechange = function (event) {
+        switch (VideoChat.peerConnections.get(uuid).iceConnectionState) {
           case "connected":
             logIt("connected");
             // Once connected we no longer have a need for the signaling server, so disconnect
@@ -211,7 +212,7 @@ var VideoChat = {
       logIt(
         `<<< Received local ICE candidate from STUN/TURN server (${event.candidate.address}) associated with UUID (${uuid})`
       );
-      if (VideoChat.connected[uuid]) {
+      if (VideoChat.connected.get(uuid)) {
         logIt(`>>> Sending local ICE candidate (${event.candidate.address})`);
         VideoChat.socket.emit(
           "candidate",
@@ -239,18 +240,18 @@ var VideoChat = {
     logIt(
       `onCandidate <<< Received remote ICE candidate (${rtcCandidate.address} - ${rtcCandidate.relatedAddress})`
     );
-    VideoChat.peerConnections[uuid].addIceCandidate(rtcCandidate);
+    VideoChat.peerConnections.get(uuid).addIceCandidate(rtcCandidate);
   },
 
   // Create an offer that contains the media capabilities of the browser.
   createOffer: function (uuid) {
       console.log(">>> Creating offer to UUID: ", uuid, ". my UUID is", VideoChat.socket.id);
-    VideoChat.peerConnections[uuid].createOffer(
+    VideoChat.peerConnections.get(uuid).createOffer(
       function (offer) {
         // If the offer is created successfully, set it as the local description
         // and send it over the socket connection to initiate the peerConnection
         // on the other side.
-        VideoChat.peerConnections[uuid].setLocalDescription(offer);
+        VideoChat.peerConnections.get(uuid).setLocalDescription(offer);
         VideoChat.socket.emit("offer", JSON.stringify(offer), roomHash, uuid);
       },
       function (err) {
@@ -269,10 +270,10 @@ var VideoChat = {
     logIt("createAnswer");
     rtcOffer = new RTCSessionDescription(JSON.parse(offer));
     console.log("createAnswer: setting remote description of " + uuid + " on " + VideoChat.socket.id);
-    VideoChat.peerConnections[uuid].setRemoteDescription(rtcOffer);
-    VideoChat.peerConnections[uuid].createAnswer(
+    VideoChat.peerConnections.get(uuid).setRemoteDescription(rtcOffer);
+    VideoChat.peerConnections.get(uuid).createAnswer(
       function (answer) {
-        VideoChat.peerConnections[uuid].setLocalDescription(answer);
+        VideoChat.peerConnections.get(uuid).setLocalDescription(answer);
         console.log(">>> Creating answer to UUID: ", uuid, ". my UUID is", VideoChat.socket.id);
         VideoChat.socket.emit("answer", JSON.stringify(answer), roomHash, uuid);
       },
@@ -302,7 +303,7 @@ var VideoChat = {
       var rtcAnswer = new RTCSessionDescription(JSON.parse(answer));
       // Set remote description of RTCSession
       console.log("onAnswer: setting remote description of " + uuid + " on " + VideoChat.socket.id);
-      VideoChat.peerConnections[uuid].setRemoteDescription(rtcAnswer);
+      VideoChat.peerConnections.get(uuid).setRemoteDescription(rtcAnswer);
       // The caller now knows that the callee is ready to accept new ICE candidates, so sending the buffer over
       VideoChat.localICECandidates[uuid].forEach((candidate) => {
         logIt(`>>> Sending local ICE candidate (${candidate.address})`);
@@ -313,11 +314,6 @@ var VideoChat = {
 
   // Called when a stream is added to the peer connection
   onAddStream: function (event, uuid) {
-    // if(VideoChat.counter > 4) {
-    //     VideoChat.socket.disconnect();
-    // }else{
-    //   VideoChat.counter++;
-    // }
     logIt("onAddStream <<< Received new stream from remote. Adding it..." + event);
     // Create new remote video source in wrapper
     // Create a <video> node
@@ -333,7 +329,7 @@ var VideoChat = {
     // Remove the loading gif from video
     VideoChat.remoteVideoWrapper.lastChild.style.background = "none";
     // Update connection status
-    VideoChat.connected[uuid] = true;
+    VideoChat.connected.set(uuid, true);
     // Hide caption status text
     captionText.fadeOut();
     // Reposition local video after a second, as there is often a delay
@@ -523,11 +519,20 @@ function pauseVideo() {
 
 // Swap camera / screen share
 function swap() {
-  // Handle swap video before video call is connected
-  if (!VideoChat.connected) {
+  // Handle swap video before video call is connected by checking that there's at least one peer connected
+  var cannot_join = true;
+
+  VideoChat.connected.forEach(function(value, key, map) {
+    if (value) {
+      cannot_join = false;
+    }
+  });
+
+  if (cannot_join) {
     alert("You must join a call before you can share your screen.");
     return;
   }
+
   // Store swap button icon and text
   const swapIcon = document.getElementById("swap-icon");
   const swapText = document.getElementById("swap-text");
@@ -595,15 +600,18 @@ function switchStreamHelper(stream) {
   videoTrack.onended = function () {
     swap();
   };
-  if (VideoChat.connected) {
-    // Find sender
-    const sender = VideoChat.peerConnection.getSenders().find(function (s) {
-      // make sure tack types match
-      return s.track.kind === videoTrack.kind;
-    });
-    // Replace sender track
-    sender.replaceTrack(videoTrack);
-  }
+
+  // Swap video for every peer connection
+  VideoChat.connected.forEach(function(value, key, map) {
+    // Just to be safe, check if connected before swapping video channel
+    if (VideoChat.connected.get(key)) {
+      const sender = VideoChat.peerConnections.get(key).getSenders().find (function(s) {
+        return s.track.kind === videoTrack.kind;
+      })
+      sender.replaceTrack(videoTrack);
+    }
+  });
+
   // Update local video stream
   VideoChat.localStream = videoTrack;
   // Update local video object

From 9132d430afc4aec422893e7d5a635d633614ff1f Mon Sep 17 00:00:00 2001
From: Khush Jammu <khushjammu@gmail.com>
Date: Sat, 30 May 2020 19:37:48 +0800
Subject: [PATCH 2/6] fix chat functionality - added nicknames to do that

---
 public/js/chat.js | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 58c3f79..77abf6a 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -28,6 +28,7 @@ const entireChat = $("#entire-chat");
 const chatZone = $("#chat-zone");
 
 var VideoChat = {
+  nickname: undefined,
   connected: new Map(),
   localICECandidates: {},
   socket: io(),
@@ -92,6 +93,13 @@ var VideoChat = {
         Snackbar.close();
       },
     });
+
+    VideoChat.nickname = prompt("Please enter a nickname", "");
+
+    while (VideoChat.nickname == null || VideoChat.nickname.trim() === "") {
+      VideoChat.nickname = prompt("Nickname cannot be empty. Please enter a nickname", "");
+    }
+
     VideoChat.localVideo.srcObject = stream;
     // Now we're ready to join the chat room.
     VideoChat.socket.emit("join", roomHash);
@@ -136,7 +144,6 @@ var VideoChat = {
 
       VideoChat.localICECandidates[uuid] = []; // initialise uuid with empty array
       VideoChat.connected.set(uuid, false);
-      // VideoChat.connected[uuid] = false;
 
       // Set up a new RTCPeerConnection using the token's iceServers.
       VideoChat.peerConnections.set(uuid, new RTCPeerConnection({
@@ -412,6 +419,20 @@ function windowResized() {
   rePositionCaptions();
 }
 
+// Checks if connected to at least one peer
+function isConnected() {
+  var connected = false;
+
+  // No way to 'break' forEach -> we go through all anyway
+  VideoChat.connected.forEach(function(value, key, map) {
+    if (value) {
+      connected = true;
+    }
+  });
+
+  return connected;
+}
+
 // Fullscreen
 // function openFullscreen() {
 //   try {
@@ -520,15 +541,7 @@ function pauseVideo() {
 // Swap camera / screen share
 function swap() {
   // Handle swap video before video call is connected by checking that there's at least one peer connected
-  var cannot_join = true;
-
-  VideoChat.connected.forEach(function(value, key, map) {
-    if (value) {
-      cannot_join = false;
-    }
-  });
-
-  if (cannot_join) {
+  if (!isConnected()) {
     alert("You must join a call before you can share your screen.");
     return;
   }
@@ -770,6 +783,7 @@ function recieveCaptions(captions) {
 // Text Chat
 // Add text message to chat screen on page
 function addMessageToScreen(msg, isOwnMessage) {
+  // If nickname is undefined or null, user didn't input a nickname
   if (isOwnMessage) {
     $(".chat-messages").append(
       '<div class="message-item customer cssanimation fadeInBottom"><div class="message-bloc"><div class="message">' +
@@ -796,7 +810,7 @@ chatInput.addEventListener("keypress", function (event) {
     // Make links clickable
     msg = msg.autoLink();
     // Send message over data channel
-    dataChanel.send("mes:" + msg);
+    dataChanel.send("mes:" + VideoChat.nickname + ": " + msg);
     // Add message to screen
     addMessageToScreen(msg, true);
     // Auto scroll chat down

From cb419b0817fbf449f15d83753f0edc660c10c939 Mon Sep 17 00:00:00 2001
From: Khush Jammu <khushjammu@gmail.com>
Date: Sat, 30 May 2020 20:42:08 +0800
Subject: [PATCH 3/6] fix video toggling and muting

---
 public/js/chat.js | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 77abf6a..647e526 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -29,6 +29,8 @@ const chatZone = $("#chat-zone");
 
 var VideoChat = {
   nickname: undefined,
+  videoEnabled: true, 
+  audioEnabled: true, 
   connected: new Map(),
   localICECandidates: {},
   socket: io(),
@@ -480,21 +482,23 @@ function isConnected() {
 
 // Mute microphone
 function muteMicrophone() {
+  VideoChat.audioEnabled = !VideoChat.audioEnabled;
   var audioTrack = null;
-  // Get audio track to mute
-  VideoChat.peerConnections.first.getSenders().find(function (s) {
-    if (s.track.kind === "audio") {
-      audioTrack = s.track;
-    }
+
+  VideoChat.peerConnections.forEach(function(value, key, map) {
+    value.getSenders().find(function (s) {
+      if (s.track.kind === "audio") {
+        audioTrack = s.track;
+      }
+    })
+    audioTrack.enabled = VideoChat.audioEnabled;
   });
-  isMuted = !audioTrack.enabled;
-  audioTrack.enabled = isMuted;
-  isMuted = !isMuted;
+
   // select mic button and mic button text
   const micButtonIcon = document.getElementById("mic-icon");
   const micButtonText = document.getElementById("mic-text");
   // Update mute button text and icon
-  if (isMuted) {
+  if (!VideoChat.audioEnabled) {
     micButtonIcon.classList.remove("fa-microphone");
     micButtonIcon.classList.add("fa-microphone-slash");
     micButtonText.innerText = "Unmute";
@@ -508,21 +512,25 @@ function muteMicrophone() {
 
 // Pause Video
 function pauseVideo() {
-  var videoTrack = null;
-  // Get video track to pause
-  VideoChat.peerConnection.getSenders().find(function (s) {
-    if (s.track.kind === "video") {
-      videoTrack = s.track;
-    }
+  VideoChat.videoEnabled = !VideoChat.videoEnabled;
+
+  // Communicate pause to all the peers' video tracks
+  VideoChat.peerConnections.forEach(function(value, key, map) {
+    console.log("pausing video for ", key);
+    value.getSenders().find(function (s) {
+      if (s.track.kind === "video") {
+        console.log("found video track")
+        videoTrack = s.track;
+      }
+    })
+    videoTrack.enabled = VideoChat.videoEnabled;
   });
-  videoIsPaused = !videoTrack.enabled;
-  videoTrack.enabled = videoIsPaused;
-  videoIsPaused = !videoIsPaused;
+
   // select video button and video button text
   const videoButtonIcon = document.getElementById("video-icon");
   const videoButtonText = document.getElementById("video-text");
   // update pause button icon and text
-  if (videoIsPaused) {
+  if (!VideoChat.videoEnabled) {
     localVideoText.text("Video is paused");
     localVideoText.show();
     videoButtonIcon.classList.remove("fa-video");

From 658c8d514c4ef0c83b9cdacd8f789e5302ae0b7f Mon Sep 17 00:00:00 2001
From: Khush Jammu <khushjammu@gmail.com>
Date: Sat, 30 May 2020 21:08:11 +0800
Subject: [PATCH 4/6] restructure dataChannel - fixed it so that messaging
 works with 3 peers

---
 public/js/chat.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 647e526..528640c 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -1,7 +1,6 @@
 // Vars
 var isMuted;
 var videoIsPaused;
-var dataChanel = null;
 const browserName = getBrowserName();
 const url = window.location.href;
 const roomHash = url.substring(url.lastIndexOf("/") + 1).toLowerCase();
@@ -27,6 +26,9 @@ const captionButtontext = $("#caption-button-text");
 const entireChat = $("#entire-chat");
 const chatZone = $("#chat-zone");
 
+var dataChannel = new Map();
+
+
 var VideoChat = {
   nickname: undefined,
   videoEnabled: true, 
@@ -157,17 +159,17 @@ var VideoChat = {
       });
       // Add general purpose data channel to peer connection,
       // used for text chats, captions, and toggling sending captions
-      dataChanel = VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
+      dataChannel.set(uuid, VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
         negotiated: true,
         // both peers must have same id
         id: 0,
-      });
+      }));
       // Called when dataChannel is successfully opened
-      dataChanel.onopen = function (event) {
+      dataChannel.get(uuid).onopen = function (event) {
         logIt("dataChannel opened");
       };
       // Handle different dataChannel types
-      dataChanel.onmessage = function (event) {
+      dataChannel.get(uuid).onmessage = function (event) {
         const receivedData = event.data;
         // First 4 chars represent data type
         const dataType = receivedData.substring(0, 4);
@@ -435,6 +437,13 @@ function isConnected() {
   return connected;
 }
 
+function sendToAllDataChannels(message) {
+  // key is UUID, value is dataChannel object
+  dataChannel.forEach(function(value, key, map) {
+    value.send(message);
+  });
+}
+
 // Fullscreen
 // function openFullscreen() {
 //   try {
@@ -648,7 +657,7 @@ function switchStreamHelper(stream) {
 // Request captions from other user, toggles state
 function requestToggleCaptions() {
   // Handle requesting captions before connected
-  if (!VideoChat.connected) {
+  if (!isConnected()) {
     alert("You must be connected to a peer to use Live Caption");
     return;
   }
@@ -669,7 +678,7 @@ function requestToggleCaptions() {
     receivingCaptions = true;
   }
   // Send request to get captions over data channel
-  dataChanel.send("tog:");
+  sendToAllDataChannels("tog:");
 }
 
 // Start/stop sending captions to other user
@@ -695,7 +704,7 @@ function startSpeech() {
     logIt(e);
     logIt("error importing speech library");
     // Alert other user that they cannon use live caption
-    dataChanel.send("cap:notusingchrome");
+    sendToAllDataChannels("cap:notusingchrome");
     return;
   }
   // recognition.maxAlternatives = 3;
@@ -707,6 +716,7 @@ function startSpeech() {
     let interimTranscript = "";
     for (let i = event.resultIndex, len = event.results.length; i < len; i++) {
       var transcript = event.results[i][0].transcript;
+      console.log(transcript);
       if (event.results[i].isFinal) {
         finalTranscript += transcript;
       } else {
@@ -714,10 +724,10 @@ function startSpeech() {
         var charsToKeep = interimTranscript.length % 100;
         // Send captions over data chanel,
         // subtracting as many complete 100 char slices from start
-        dataChanel.send(
+        sendToAllDataChannels(
           "cap:" +
             interimTranscript.substring(interimTranscript.length - charsToKeep)
-        );
+          );
       }
     }
   };
@@ -818,7 +828,7 @@ chatInput.addEventListener("keypress", function (event) {
     // Make links clickable
     msg = msg.autoLink();
     // Send message over data channel
-    dataChanel.send("mes:" + VideoChat.nickname + ": " + msg);
+    sendToAllDataChannels("mes:" + VideoChat.nickname + ": " + msg);
     // Add message to screen
     addMessageToScreen(msg, true);
     // Auto scroll chat down

From 804ace168f14bd8885d3310a2e2b78417b167cc0 Mon Sep 17 00:00:00 2001
From: Khush Jammu <khushjammu@gmail.com>
Date: Sat, 30 May 2020 21:25:52 +0800
Subject: [PATCH 5/6] missed one usage of videoIsPaused. captions not working
 yet

---
 public/js/chat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 528640c..91d2f85 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -647,7 +647,7 @@ function switchStreamHelper(stream) {
   // Update local video object
   VideoChat.localVideo.srcObject = stream;
   // Unpause video on swap
-  if (videoIsPaused) {
+  if (!VideoChat.videoEnabled) {
     pauseVideo();
   }
 }

From c56b521c5e104feb2105675928f4b938d2154b84 Mon Sep 17 00:00:00 2001
From: Taichi Kato <me@taichikato.com>
Date: Sun, 31 May 2020 10:54:40 +0800
Subject: [PATCH 6/6] Ran prettier on code

---
 public/chat.html  |   3 +-
 public/js/chat.js | 169 +++++++++++++++++++++++++++++++---------------
 server.js         |  32 ++++++---
 3 files changed, 137 insertions(+), 67 deletions(-)

diff --git a/public/chat.html b/public/chat.html
index d15c4ce..db77f8a 100644
--- a/public/chat.html
+++ b/public/chat.html
@@ -46,8 +46,7 @@
     </div>
 
     <p id="remote-video-text"></p>
-    <div id="wrapper">
-    </div>
+    <div id="wrapper"></div>
     <div id="moveable">
       <p id="local-video-text">No webcam input</p>
       <video id="local-video" autoplay muted playsinline></video>
diff --git a/public/js/chat.js b/public/js/chat.js
index 91d2f85..092d173 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -28,11 +28,10 @@ const chatZone = $("#chat-zone");
 
 var dataChannel = new Map();
 
-
 var VideoChat = {
   nickname: undefined,
-  videoEnabled: true, 
-  audioEnabled: true, 
+  videoEnabled: true,
+  audioEnabled: true,
   connected: new Map(),
   localICECandidates: {},
   socket: io(),
@@ -101,7 +100,10 @@ var VideoChat = {
     VideoChat.nickname = prompt("Please enter a nickname", "");
 
     while (VideoChat.nickname == null || VideoChat.nickname.trim() === "") {
-      VideoChat.nickname = prompt("Nickname cannot be empty. Please enter a nickname", "");
+      VideoChat.nickname = prompt(
+        "Nickname cannot be empty. Please enter a nickname",
+        ""
+      );
     }
 
     VideoChat.localVideo.srcObject = stream;
@@ -128,42 +130,54 @@ var VideoChat = {
     logIt("readyToCall");
   },
   call: function (uuid, room) {
-      logIt("Initiating call");
-      VideoChat.startCall(uuid);
+    logIt("Initiating call");
+    VideoChat.startCall(uuid);
   },
 
   // Set up a callback to run when we have the ephemeral token to use Twilio's TURN server.
   startCall: function (uuid) {
-    VideoChat.socket.on("token", VideoChat.establishConnection(uuid, function(a) {VideoChat.createOffer(a);}));
+    VideoChat.socket.on(
+      "token",
+      VideoChat.establishConnection(uuid, function (a) {
+        VideoChat.createOffer(a);
+      })
+    );
     VideoChat.socket.emit("token", roomHash, uuid);
   },
 
   establishConnection: function (correctUuid, callback) {
-    return function(token, uuid) {
+    return function (token, uuid) {
       if (correctUuid != uuid) {
         return;
       }
       console.log("establishing connection to", uuid);
-      
 
       VideoChat.localICECandidates[uuid] = []; // initialise uuid with empty array
       VideoChat.connected.set(uuid, false);
 
       // Set up a new RTCPeerConnection using the token's iceServers.
-      VideoChat.peerConnections.set(uuid, new RTCPeerConnection({
-        iceServers: token.iceServers,
-      }))
+      VideoChat.peerConnections.set(
+        uuid,
+        new RTCPeerConnection({
+          iceServers: token.iceServers,
+        })
+      );
       // Add the local video stream to the peerConnection.
       VideoChat.localStream.getTracks().forEach(function (track) {
-        VideoChat.peerConnections.get(uuid).addTrack(track, VideoChat.localStream);
+        VideoChat.peerConnections
+          .get(uuid)
+          .addTrack(track, VideoChat.localStream);
       });
       // Add general purpose data channel to peer connection,
       // used for text chats, captions, and toggling sending captions
-      dataChannel.set(uuid, VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
-        negotiated: true,
-        // both peers must have same id
-        id: 0,
-      }));
+      dataChannel.set(
+        uuid,
+        VideoChat.peerConnections.get(uuid).createDataChannel("chat", {
+          negotiated: true,
+          // both peers must have same id
+          id: 0,
+        })
+      );
       // Called when dataChannel is successfully opened
       dataChannel.get(uuid).onopen = function (event) {
         logIt("dataChannel opened");
@@ -185,12 +199,17 @@ var VideoChat = {
 
       // Set up callbacks for the connection generating iceCandidates or
       // receiving the remote media stream.
-      VideoChat.peerConnections.get(uuid).onicecandidate = function(u) {VideoChat.onIceCandidate(u, uuid)};
-      VideoChat.peerConnections.get(uuid).onaddstream = function(u) {VideoChat.onAddStream(u, uuid)};
-      
+      VideoChat.peerConnections.get(uuid).onicecandidate = function (u) {
+        VideoChat.onIceCandidate(u, uuid);
+      };
+      VideoChat.peerConnections.get(uuid).onaddstream = function (u) {
+        VideoChat.onAddStream(u, uuid);
+      };
 
       // Called when there is a change in connection state
-      VideoChat.peerConnections.get(uuid).oniceconnectionstatechange = function (event) {
+      VideoChat.peerConnections.get(
+        uuid
+      ).oniceconnectionstatechange = function (event) {
         switch (VideoChat.peerConnections.get(uuid).iceConnectionState) {
           case "connected":
             logIt("connected");
@@ -213,7 +232,7 @@ var VideoChat = {
         }
       };
       callback(uuid);
-    } 
+    };
   },
 
   // When the peerConnection generates an ice candidate, send it over the socket to the peer.
@@ -237,7 +256,6 @@ var VideoChat = {
         // The peer may not have created the RTCPeerConnection yet, so we are waiting for the 'answer'
         // to arrive. This will signal that the peer is ready to receive signaling.
         VideoChat.localICECandidates[uuid].push(event.candidate);
-        
       }
     }
   },
@@ -256,7 +274,12 @@ var VideoChat = {
 
   // Create an offer that contains the media capabilities of the browser.
   createOffer: function (uuid) {
-      console.log(">>> Creating offer to UUID: ", uuid, ". my UUID is", VideoChat.socket.id);
+    console.log(
+      ">>> Creating offer to UUID: ",
+      uuid,
+      ". my UUID is",
+      VideoChat.socket.id
+    );
     VideoChat.peerConnections.get(uuid).createOffer(
       function (offer) {
         // If the offer is created successfully, set it as the local description
@@ -280,12 +303,22 @@ var VideoChat = {
   createAnswer: function (offer, uuid) {
     logIt("createAnswer");
     rtcOffer = new RTCSessionDescription(JSON.parse(offer));
-    console.log("createAnswer: setting remote description of " + uuid + " on " + VideoChat.socket.id);
+    console.log(
+      "createAnswer: setting remote description of " +
+        uuid +
+        " on " +
+        VideoChat.socket.id
+    );
     VideoChat.peerConnections.get(uuid).setRemoteDescription(rtcOffer);
     VideoChat.peerConnections.get(uuid).createAnswer(
       function (answer) {
         VideoChat.peerConnections.get(uuid).setLocalDescription(answer);
-        console.log(">>> Creating answer to UUID: ", uuid, ". my UUID is", VideoChat.socket.id);
+        console.log(
+          ">>> Creating answer to UUID: ",
+          uuid,
+          ". my UUID is",
+          VideoChat.socket.id
+        );
         VideoChat.socket.emit("answer", JSON.stringify(answer), roomHash, uuid);
       },
       function (err) {
@@ -300,32 +333,54 @@ var VideoChat = {
   onOffer: function (offer, uuid) {
     logIt("onOffer <<< Received offer");
     // VideoChat.socket.on("token", VideoChat.establishConnection(uuid, function(a) {VideoChat.createOffer(a);}));
-    VideoChat.socket.on("token", VideoChat.establishConnection(uuid, function(a) {VideoChat.createAnswer(offer, a);}));
+    VideoChat.socket.on(
+      "token",
+      VideoChat.establishConnection(uuid, function (a) {
+        VideoChat.createAnswer(offer, a);
+      })
+    );
     VideoChat.socket.emit("token", roomHash, uuid);
   },
 
   // When an answer is received, add it to the peerConnection as the remote description.
   onAnswer: function (answer, uuid) {
-    console.log("onAnswer <<< Received answer", uuid, ". my UUID is", VideoChat.socket.id);
+    console.log(
+      "onAnswer <<< Received answer",
+      uuid,
+      ". my UUID is",
+      VideoChat.socket.id
+    );
 
     // if (!VideoChat.answerCreatedUUIDs.includes(uuid)) {
-      VideoChat.answerCreatedUUIDs.push(uuid);
-      // logIt("onAnswer <<< Received answer" + "");
-      var rtcAnswer = new RTCSessionDescription(JSON.parse(answer));
-      // Set remote description of RTCSession
-      console.log("onAnswer: setting remote description of " + uuid + " on " + VideoChat.socket.id);
-      VideoChat.peerConnections.get(uuid).setRemoteDescription(rtcAnswer);
-      // The caller now knows that the callee is ready to accept new ICE candidates, so sending the buffer over
-      VideoChat.localICECandidates[uuid].forEach((candidate) => {
-        logIt(`>>> Sending local ICE candidate (${candidate.address})`);
-        // Send ice candidate over websocket
-        VideoChat.socket.emit("candidate", JSON.stringify(candidate), roomHash, uuid);
-      });
+    VideoChat.answerCreatedUUIDs.push(uuid);
+    // logIt("onAnswer <<< Received answer" + "");
+    var rtcAnswer = new RTCSessionDescription(JSON.parse(answer));
+    // Set remote description of RTCSession
+    console.log(
+      "onAnswer: setting remote description of " +
+        uuid +
+        " on " +
+        VideoChat.socket.id
+    );
+    VideoChat.peerConnections.get(uuid).setRemoteDescription(rtcAnswer);
+    // The caller now knows that the callee is ready to accept new ICE candidates, so sending the buffer over
+    VideoChat.localICECandidates[uuid].forEach((candidate) => {
+      logIt(`>>> Sending local ICE candidate (${candidate.address})`);
+      // Send ice candidate over websocket
+      VideoChat.socket.emit(
+        "candidate",
+        JSON.stringify(candidate),
+        roomHash,
+        uuid
+      );
+    });
   },
 
   // Called when a stream is added to the peer connection
   onAddStream: function (event, uuid) {
-    logIt("onAddStream <<< Received new stream from remote. Adding it..." + event);
+    logIt(
+      "onAddStream <<< Received new stream from remote. Adding it..." + event
+    );
     // Create new remote video source in wrapper
     // Create a <video> node
     var node = document.createElement("video");
@@ -412,7 +467,8 @@ function rePositionCaptions() {
   // Get remote video position
   var bounds = remoteVideosWrapper.position();
   bounds.top -= 10;
-  bounds.top = bounds.top + remoteVideosWrapper.height() - 1 * captionText.height();
+  bounds.top =
+    bounds.top + remoteVideosWrapper.height() - 1 * captionText.height();
   // Reposition captions
   captionText.css(bounds);
 }
@@ -428,7 +484,7 @@ function isConnected() {
   var connected = false;
 
   // No way to 'break' forEach -> we go through all anyway
-  VideoChat.connected.forEach(function(value, key, map) {
+  VideoChat.connected.forEach(function (value, key, map) {
     if (value) {
       connected = true;
     }
@@ -439,7 +495,7 @@ function isConnected() {
 
 function sendToAllDataChannels(message) {
   // key is UUID, value is dataChannel object
-  dataChannel.forEach(function(value, key, map) {
+  dataChannel.forEach(function (value, key, map) {
     value.send(message);
   });
 }
@@ -494,12 +550,12 @@ function muteMicrophone() {
   VideoChat.audioEnabled = !VideoChat.audioEnabled;
   var audioTrack = null;
 
-  VideoChat.peerConnections.forEach(function(value, key, map) {
+  VideoChat.peerConnections.forEach(function (value, key, map) {
     value.getSenders().find(function (s) {
       if (s.track.kind === "audio") {
         audioTrack = s.track;
       }
-    })
+    });
     audioTrack.enabled = VideoChat.audioEnabled;
   });
 
@@ -524,14 +580,14 @@ function pauseVideo() {
   VideoChat.videoEnabled = !VideoChat.videoEnabled;
 
   // Communicate pause to all the peers' video tracks
-  VideoChat.peerConnections.forEach(function(value, key, map) {
+  VideoChat.peerConnections.forEach(function (value, key, map) {
     console.log("pausing video for ", key);
     value.getSenders().find(function (s) {
       if (s.track.kind === "video") {
-        console.log("found video track")
+        console.log("found video track");
         videoTrack = s.track;
       }
-    })
+    });
     videoTrack.enabled = VideoChat.videoEnabled;
   });
 
@@ -632,12 +688,15 @@ function switchStreamHelper(stream) {
   };
 
   // Swap video for every peer connection
-  VideoChat.connected.forEach(function(value, key, map) {
+  VideoChat.connected.forEach(function (value, key, map) {
     // Just to be safe, check if connected before swapping video channel
     if (VideoChat.connected.get(key)) {
-      const sender = VideoChat.peerConnections.get(key).getSenders().find (function(s) {
-        return s.track.kind === videoTrack.kind;
-      })
+      const sender = VideoChat.peerConnections
+        .get(key)
+        .getSenders()
+        .find(function (s) {
+          return s.track.kind === videoTrack.kind;
+        });
       sender.replaceTrack(videoTrack);
     }
   });
@@ -727,7 +786,7 @@ function startSpeech() {
         sendToAllDataChannels(
           "cap:" +
             interimTranscript.substring(interimTranscript.length - charsToKeep)
-          );
+        );
       }
     }
   };
diff --git a/server.js b/server.js
index 7e8407c..256aad3 100644
--- a/server.js
+++ b/server.js
@@ -8,11 +8,14 @@ var twillioAccountSID =
 var twilio = require("twilio")(twillioAccountSID, twillioAuthToken);
 var express = require("express");
 var app = express();
-const fs = require('fs');
-var http = require("https").createServer({
-  key: fs.readFileSync('/Users/khushjammu/certs/privkey.pem'),
-  cert: fs.readFileSync('/Users/khushjammu/certs/cert.pem')
-}, app);
+const fs = require("fs");
+var http = require("https").createServer(
+  {
+    key: fs.readFileSync("/Users/khushjammu/certs/privkey.pem"),
+    cert: fs.readFileSync("/Users/khushjammu/certs/cert.pem"),
+  },
+  app
+);
 // var http = require("http").createServer(app);
 var io = require("socket.io")(http);
 var path = require("path");
@@ -94,9 +97,9 @@ io.on("connection", function (socket) {
       });
     } else if (numClients < 4) {
       socket.join(room);
-      logIt("Connected clients", room)
+      logIt("Connected clients", room);
       for (var clientId in clients.sockets) {
-        logIt('ID: ' + clientId, room);
+        logIt("ID: " + clientId, room);
       }
 
       // When the client is not the first to join the room, all clients are ready.
@@ -106,7 +109,10 @@ io.on("connection", function (socket) {
       socket.emit("ready", room).to(room);
       socket.broadcast.to(room).emit("ready", room);
     } else {
-      logIt("room already full with " + numClients + " people in the room.", room);
+      logIt(
+        "room already full with " + numClients + " people in the room.",
+        room
+      );
       socket.emit("full", room);
     }
   });
@@ -133,13 +139,19 @@ io.on("connection", function (socket) {
 
   // Relay offers
   socket.on("offer", function (offer, room, uuid) {
-    logIt("Received offer from " + socket.id + " and emitting to " + uuid, room);
+    logIt(
+      "Received offer from " + socket.id + " and emitting to " + uuid,
+      room
+    );
     io.to(uuid).emit("offer", offer, socket.id);
   });
 
   // Relay answers
   socket.on("answer", function (answer, room, uuid) {
-    logIt("Received answer from " + socket.id + " and emitting to " + uuid, room);
+    logIt(
+      "Received answer from " + socket.id + " and emitting to " + uuid,
+      room
+    );
     io.to(uuid).emit("answer", answer, socket.id);
   });
 });