From 471ac230eb4c8dd59d24daf3467cc7d919332a33 Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Sun, 7 Feb 2021 14:42:28 +0100 Subject: [PATCH] [mirotalk] - refactor comment --- README.md | 2 +- server.js | 25 +++++----- www/client.js | 131 ++++++++++++++++++++++++++------------------------ 3 files changed, 82 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index eddf1a27..c42380a7 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Open the app in one of following **supported browser** - WebCam (front - rear) - Audio - Screen Sharing -- Send Message +- Quick Message - Chat Room - Full Screen Mode - Change Theme diff --git a/server.js b/server.js index daeb8bae..83c401e3 100755 --- a/server.js +++ b/server.js @@ -26,11 +26,11 @@ var turnUrls = process.env.TURN_URLS; var turnUsername = process.env.TURN_USERNAME; var turnCredential = process.env.TURN_PASSWORD; -// use all static files from the www folder +// Use all static files from the www folder app.use(express.static(path.join(__dirname, "www"))); // ===================================================== -// expose server to external with https tunnel using ngrok +// Expose server to external with https tunnel using ngrok // ===================================================== async function ngrokStart() { try { @@ -52,7 +52,7 @@ async function ngrokStart() { /* * You should probably use a different stun-turn server doing commercial stuff - * Also see: https://gist.github.com/zziuni/3741933 or https://www.twilio.com/docs/stun-turn + * Also see: https://gist.github.com/zziuni/3741933 or https://www.twilio.com/docs/stun-turn or https://github.com/coturn/coturn * Check the functionality of STUN/TURN servers: https://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/ */ var iceServers = [ @@ -65,7 +65,7 @@ var iceServers = [ ]; // ===================================================== -// Start Local Server with ngrok https tunnel +// Start Local Server with ngrok https tunnel (optional) // ===================================================== var PORT = process.env.PORT || 80; server.listen(PORT, null, function () { @@ -115,8 +115,9 @@ var sockets = {}; // collect sockets * information. After all of that happens, they'll finally be able to complete * the peer connection and will be in streaming audio/video between eachother. */ + // ===================================================== -// on peer connected +// On peer connected // ===================================================== io.sockets.on("connect", (socket) => { console.log("[" + socket.id + "] --> connection accepted"); @@ -125,7 +126,7 @@ io.sockets.on("connect", (socket) => { sockets[socket.id] = socket; // ===================================================== - // on peer diconnected + // On peer diconnected // ===================================================== socket.on("disconnect", () => { for (var channel in socket.channels) { @@ -136,7 +137,7 @@ io.sockets.on("connect", (socket) => { }); // ===================================================== - // on peer join + // On peer join // ===================================================== socket.on("join", (config) => { console.log("[" + socket.id + "] --> join ", config); @@ -150,7 +151,7 @@ io.sockets.on("connect", (socket) => { if (!(channel in channels)) { channels[channel] = {}; } - // + for (var id in channels[channel]) { // offer false channels[channel][id].emit("addPeer", { @@ -172,7 +173,7 @@ io.sockets.on("connect", (socket) => { }); // ===================================================== - // remove peers + // Remove peers // ===================================================== async function removePeerFrom(channel) { if (!(channel in socket.channels)) { @@ -191,7 +192,7 @@ io.sockets.on("connect", (socket) => { } // ===================================================== - // relay ICE to peers + // Relay ICE to peers // ===================================================== socket.on("relayICE", (config) => { let peer_id = config.peer_id; @@ -211,7 +212,7 @@ io.sockets.on("connect", (socket) => { }); // ===================================================== - // relay SDP to peers + // Relay SDP to peers // ===================================================== socket.on("relaySDP", (config) => { let peer_id = config.peer_id; @@ -231,7 +232,7 @@ io.sockets.on("connect", (socket) => { }); // ===================================================== - // handle peer message + // Handle peers messages // ===================================================== socket.on("msg", (config) => { let peers = config.peers; diff --git a/www/client.js b/www/client.js index 6b5a59aa..035a5cf5 100644 --- a/www/client.js +++ b/www/client.js @@ -9,7 +9,7 @@ "use strict"; // https://www.w3schools.com/js/js_strict.asp // ===================================================== -// config var +// Const and var // ===================================================== const loaderGif = "/images/loader.gif"; const myChatAvatar = "/images/programmer.svg"; @@ -38,11 +38,11 @@ var peers = {}; // keep track of our peer connections, indexed by peer_id == soc var peerMediaElements = {}; // keep track of our