X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/139f43c6caf963d66704fe1675bcc70735e21926..b9a2baf2a7c957089e63844b857e05c07b87c2fb:/extension/content_script.js?ds=sidebyside

diff --git a/extension/content_script.js b/extension/content_script.js
index 6785a65..26da2b0 100644
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,13 +1,10 @@
-import { io } from 'socket.io-client';
-import Peers from './peers';
-import Media from './media';
+import { io } from "socket.io-client";
+import Peers from "./peers";
+import Media from "./media";
 
 const internals = {
-
-  kSocketUrl: 'https://junction.tranquil.services',
-	kIceServers: [
-		{url:"stun:stun.l.google.com:19302"}
-	],
+  kSocketUrl: "https://junction.tranquil.services",
+  kIceServers: [{ urls: "stun:stun.l.google.com:19302" }],
 
   port: null,
   socket: null,
@@ -17,120 +14,132 @@ const internals = {
     internals[message.action](message.data);
   },
 
-  async joinAudioCall(data) {
-
-    internals.tada = data.tada; // Keeping for fun
-
+  async joinAudioCall({ currentUrl, tada }) {
     try {
       const mediaStream = await Media.start();
 
       internals.socket = io(internals.kSocketUrl, {
-        transports: ['websocket']
+        transports: ["websocket"],
       });
 
-      internals.socket.on('error', function(error) {
-
-        console.error('GENERAL ERROR', error);
+      internals.socket.on("error", function (error) {
+        console.error("GENERAL ERROR", error);
       });
 
-      internals.socket.on('connect_error', function(error) {
-
-        console.error('CONNNECT ERROR', error);
+      internals.socket.on("connect_error", function (error) {
+        console.error("CONNNECT ERROR", error);
       });
 
-      internals.socket.on('connect', function() {
-
-        console.log("Connected to signaling server, group: ", data.currentUrl);
-        internals.socket.emit('join', {
-          'url': data.currentUrl,
+      internals.socket.on("connect", function () {
+        console.log("Connected to signaling server, group: ", currentUrl);
+        internals.socket.emit("join", {
+          room: currentUrl,
         });
       });
 
-      internals.socket.on('disconnect', function() {
-
+      internals.socket.on("disconnect", function () {
         console.log("disconnected from signaling server");
       });
 
-      internals.socket.on('addPeer', function(data) {
-
-        console.log(data);
-        Peers.add(data.peer_id, internals.tada);
-          const peerId = data.peer_id;
-
-          const peerConn = new RTCPeerConnection(
-              {"iceServers": internals.kIceServers},
-              {"optional": [{"DtlsSrtpKeyAgreement": true}]}
-          );
-
-          internals.peers[peerId] = peerConn;
-
-          peerConn.onicecandidate = (event) => {
-            if (event.candidate) {
-              internals.socket.emit('relayICECandidate', {
-                'peer_id': peerId,
-                'ice_candidate': {
-                  'sdpMLineIndex': event.candidate.sdpMLineIndex,
-                  'candidate': event.candidate.candidate
-                }
-              });
-            }
-          }
+      internals.socket.on("addPeer", function ({ peerId }) {
+        /**
+         * Eventually the whole rtc connection logic should be moved to Peers.
+         * Now it only plays tadas.
+         */
+        Peers.add(peerId, tada);
+
+        const peerConnection = new RTCPeerConnection(
+          { iceServers: internals.kIceServers },
+          { optional: [{ DtlsSrtpKeyAgreement: true }] },
+        );
+
+        internals.peers[peerId] = peerConnection;
+        mediaStream.getTracks().forEach((track) => {
+          peerConnection.addTrack(track, mediaStream);
+        });
 
-          peerConn.onaddstream = (stream) => {
-            console.log(`Received stream for peer ${peerId}`);
-            console.log(stream);
+        peerConnection.onicecandidate = (event) => {
+          if (event.candidate) {
+            internals.socket.emit("relayICECandidate", {
+              peerId: peerId,
+              candidate: event.candidate,
+            });
           }
+        };
+
+        const remoteStream = new MediaStream();
+        peerConnection.ontrack = (event) => {
+          remoteStream.addTrack(event.track);
+          const remoteAudioElement = new Audio();
+          remoteAudioElement.srcObject = remoteStream;
+          remoteAudioElement.play();
+        };
+
+        peerConnection.onnegotiationneeded = async () => {
+          console.log("Creating RTC offer to ", peerId);
+          const offer = await peerConnection.createOffer();
+          await peerConnection.setLocalDescription(offer);
+
+          // Emit the offer to the peer
+          internals.socket.emit("relayOffer", { offer, peerId });
+        };
 
-          peerConn.addStream(mediaStream);
-
-          if (data.should_create_offer) {
-            console.log("Creating RTC offer to ", peerId);
-            peerConn.createOffer((local_description) => {
-                  console.log("Local offer description is: ", local_description);
-                  peerConn.setLocalDescription(local_description, () => {
-                        internals.socket.emit('relaySessionDescription', {
-                          'peer_id': peerId,
-                          'session_description': local_description
-                        });
-
-                        console.log("Offer setLocalDescription succeeded");
-                      }, () => { console.log("Offer setLocalDescription failed!"); }
-                  );
-                },
-                (error) => { console.log("Error sending offer: ", error) }
-            );
-          }
         console.log(`There are now ${Peers.count()} participants`);
       });
 
-      internals.socket.on('removePeer', function() {
+      internals.socket.on("offerReceived", async ({ offer, peerId }) => {
+        const peerConnection = internals.peers[peerId];
 
-        Peers.remove('id-'+(Peers.count() - 1)); // This is only for testing, don't use count to remove ids.
-        console.log(`There are now ${Peers.count()} participants`);
+        const remoteDescription = new RTCSessionDescription(offer);
+        await peerConnection.setRemoteDescription(remoteDescription);
+
+        const answer = await peerConnection.createAnswer();
+        await peerConnection.setLocalDescription(answer);
+
+        // Send the answer to the peer
+        internals.socket.emit("relayAnswer", { answer, peerId });
       });
-    }
-    catch (err) {
 
+      internals.socket.on("answerReceived", async ({ answer, peerId }) => {
+        const peerConnection = internals.peers[peerId];
+        const remoteDescription = new RTCSessionDescription(answer);
+        await peerConnection.setRemoteDescription(remoteDescription);
+      });
+
+      internals.socket.on(
+        "ICECandidateReceived",
+        async ({ candidate, peerId }) => {
+          const peerConnection = internals.peers[peerId];
+          const iceCandidate = new RTCIceCandidate(candidate);
+          await peerConnection.addIceCandidate(iceCandidate);
+        },
+      );
+
+      internals.socket.on("removePeer", function ({ peerId }) {
+        delete internals.peers[peerId];
+        Peers.remove(peerId);
+        console.log(`There are now ${Peers.count()} participants`);
+      });
+    } catch (err) {
       internals.port.postMessage({
-        action: 'error'
+        action: "error",
       });
       internals.port.disconnect();
     }
   },
 
   hangUp() {
-
     Peers.reset();
     Media.stop();
     internals.socket.close();
     internals.port.disconnect();
-  }
+  },
 };
 
-internals.port = chrome.runtime.connect({ name:"content" });
+internals.port = chrome.runtime.connect({ name: "content" });
 internals.port.onMessage.addListener(internals.onMessage);
 
-console.log('Content Script Loaded');
+console.log("Content Script Loaded");
 
 // Indicates to the background script that we executed correctly
 true;