From 64ef2b4196dcff3381216c30153c31b54e5ffc01 Mon Sep 17 00:00:00 2001
From: Taichi Kato <me@taichikato.com>
Date: Sat, 30 May 2020 19:21:27 +0800
Subject: [PATCH] removed debug code

---
 public/js/chat.js | 64 ++++++-----------------------------------------
 server.js         |  5 +---
 2 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/public/js/chat.js b/public/js/chat.js
index 32f5567..3c3e49c 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -94,12 +94,9 @@ var VideoChat = {
     VideoChat.localVideo.srcObject = stream;
     // Now we're ready to join the chat room.
     VideoChat.socket.emit("join", roomHash);
-    // Receive its own uuid
-    VideoChat.socket.on("uuid", (uuid) => (VideoChat.uuid = uuid));
     // Add listeners to the websocket
     VideoChat.socket.on("full", chatRoomFull);
     VideoChat.socket.on("offer", VideoChat.onOffer);
-    VideoChat.socket.on("ready", VideoChat.readyToCall);
     VideoChat.socket.on("willInitiateCall", VideoChat.call);
     // Set up listeners on the socket
     VideoChat.socket.on("candidate", VideoChat.onCandidate);
@@ -110,17 +107,9 @@ var VideoChat = {
     );
   },
 
-  // When we are ready to call, enable the Call button.
-  readyToCall: function (event) {
-    logIt("readyToCall");
-  },
-  call: function (uuid, room) {
-    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) {
+  call: function (uuid, room) {
+    logIt("Initiating call with " + uuid);
     VideoChat.socket.on(
       "token",
       VideoChat.establishConnection(uuid, function (a) {
@@ -136,8 +125,8 @@ var VideoChat = {
         return;
       }
       console.log("establishing connection to", uuid);
-
-      VideoChat.localICECandidates[uuid] = []; // initialise uuid with empty array
+      // Initialise localICEcandidates for node uuid with empty array
+      VideoChat.localICECandidates[uuid] = [];
       VideoChat.connected[uuid] = false;
 
       // Set up a new RTCPeerConnection using the token's iceServers.
@@ -191,8 +180,6 @@ var VideoChat = {
           case "connected":
             logIt("connected");
             // Once connected we no longer have a need for the signaling server, so disconnect
-            // VideoChat.socket.off("token");
-            // VideoChat.socket.off("offer");
             break;
           case "disconnected":
             logIt("disconnected");
@@ -251,12 +238,7 @@ 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
-    );
+    logIt(`createOffer to ${uuid} >>> Creating offer...`);
     VideoChat.peerConnections[uuid].createOffer(
       function (offer) {
         // If the offer is created successfully, set it as the local description
@@ -280,22 +262,11 @@ 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
-    );
+    logIt(`>>> Creating answer to ${uuid}`);
     VideoChat.peerConnections[uuid].setRemoteDescription(rtcOffer);
     VideoChat.peerConnections[uuid].createAnswer(
       function (answer) {
         VideoChat.peerConnections[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);
       },
       function (err) {
@@ -321,22 +292,9 @@ var VideoChat = {
 
   // 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
-    );
-
-    // logIt("onAnswer <<< Received answer" + "");
+    logIt(`onAnswer <<< Received answer from ${uuid}`);
     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);
     // The caller now knows that the callee is ready to accept new ICE candidates, so sending the buffer over
     VideoChat.localICECandidates[uuid].forEach((candidate) => {
@@ -353,14 +311,8 @@ 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
-    );
+      "onAddStream <<< Received new stream from remote. Adding it...");
     // Create new remote video source in wrapper
     // Create a <video> node
     var node = document.createElement("video");
diff --git a/server.js b/server.js
index b4f8e6d..05555d5 100644
--- a/server.js
+++ b/server.js
@@ -92,7 +92,7 @@ io.on("connection", function (socket) {
           // Existing callers initiates call with user
         }
       });
-    } else if (numClients < 4) {
+    } else if (numClients < 5) {
       socket.join(room);
       logIt("Connected clients", room);
       for (var clientId in clients.sockets) {
@@ -102,9 +102,6 @@ io.on("connection", function (socket) {
       // When the client is not the first to join the room, all clients are ready.
       logIt("Broadcasting ready message", room);
       socket.broadcast.to(room).emit("willInitiateCall", socket.id, room);
-      // socket.emit("uuid", socket.id);
-      socket.emit("ready", room).to(room);
-      socket.broadcast.to(room).emit("ready", room);
     } else {
       logIt(
         "room already full with " + numClients + " people in the room.",