X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/284fc661dc7f18aa32d0dbcd8e7f98cb16af4bb7..a878ac9416129138aba0be7ee3f202a6d8c972f1:/extension/content_script.js?ds=sidebyside

diff --git a/extension/content_script.js b/extension/content_script.js
index 8ca721a..0c7012b 100644
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,158 +1,100 @@
-import { io } from 'socket.io-client';
-import Peers from './peers';
-import Media from './media';
+import { io } from "socket.io-client";
+import { initializeTada } from "./tada";
+import {
+  addPeer,
+  addIceCandidate,
+  answerPeerOffer,
+  processPeerAnswer,
+  removePeer,
+  resetPeers,
+} from "./peers";
+import { startMedia, stopMedia } 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,
-  peers: {},
 
   onMessage(message) {
     internals[message.action](message.data);
   },
 
-  async joinAudioCall(data) {
+  onError(error) {
+    // TODO: How do we want to handle errors?
+    console.error(error.stack || error);
+  },
 
-    internals.tada = data.tada; // Keeping for fun
+  connect() {
+    internals.port = chrome.runtime.connect({ name: "content" });
+    internals.port.onMessage.addListener(internals.onMessage);
+  },
 
+  async joinAudioCall({ currentUrl, tada }) {
     try {
-      const mediaStream = await Media.start();
-
-      internals.socket = io(internals.kSocketUrl, {
-        transports: ['websocket']
-      });
-
-      internals.socket.on('error', function(error) {
-
-        console.error('GENERAL ERROR', error);
-      });
-
-      internals.socket.on('connect_error', function(error) {
+      const mediaStream = await startMedia();
+      const playTada = initializeTada(tada);
 
-        console.error('CONNNECT ERROR', error);
-      });
+      const socket = (internals.socket = io(internals.kSocketUrl, {
+        transports: ["websocket"],
+      }));
 
-      internals.socket.on('connect', function() {
+      socket.on("error", internals.handleError);
+      socket.on("connect_error", internals.handleError);
 
-        console.log('Connected to signaling server, group: ', data.currentUrl);
-        internals.socket.emit('join', {
-          room: data.currentUrl,
+      socket.on("connect", () => {
+        console.debug("Connected to signaling server, group: ", currentUrl);
+        playTada();
+        socket.emit("join", {
+          room: currentUrl,
         });
       });
 
-      internals.socket.on('disconnect', function() {
-
-        console.log("disconnected from signaling server");
-      });
-
-      internals.socket.on('addPeer', function(data) {
-
-          Peers.add(data.peerId, internals.tada);
-          const peerId = data.peerId;
-
-          const peerConnection = new RTCPeerConnection(
-              { iceServers: internals.kIceServers },
-              { optional: [{ DtlsSrtpKeyAgreement: true }] }
-          );
-
-          internals.peers[peerId] = peerConnection;
-          mediaStream.getTracks().forEach((track) => {
-            peerConnection.addTrack(track, localStream);
-          });
-
-          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
-          socket.emit('relayOffer', { offer, peerId });
-        };
-
-        console.log(`There are now ${Peers.count()} participants`);
-      });
-
-      socket.on('offerReceived', async (data) => {
-
-				const peerConnection = internals.peers[data.peerId];
-
-        const offer = new RTCSessionDescription(data.offer);
-        await peerConnection.setRemoteDescription(offer);
-
-        const answer = await peerConnection.createAnswer();
-        await peerConnection.setLocalDescription(answer);
-
-        // Send the answer to the peer
-        socket.emit('relayAnswer', { answer, peerId: data.peerId });
+      socket.on("disconnect", () => {
+        console.debug("disconnected from signaling server");
       });
 
-      socket.on('answerReceived', async (data) => {
-
-				const peerConnection = internals.peers[data.peerId];
-        const answer = new RTCSessionDescription(data.answer);
-				await peerConnection.setRemoteDescription(answer);
+      socket.on("addPeer", ({ peerId, shouldCreateOffer }) => {
+        addPeer({
+          peerId,
+          shouldCreateOffer,
+          mediaStream,
+          onOffer: (data) => socket.emit("relayOffer", data),
+          socket,
+        });
+        playTada();
       });
 
-      socket.on('ICECandidateReceived', async (data) => {
-
-				const peerConnection = internals.peers[data.peerId];
-        const candidate = new RTCIceCandidate(data.candidate);
-        await peerConnection.addIceCandidate(candidate);
-		  });
-
-
-      internals.socket.on('removePeer', function() {
-
-				delete internals.peers[data.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`);
+      socket.on("offerReceived", async ({ peerId, offer }) => {
+        socket.emit("relayAnswer", await answerPeerOffer({ peerId, offer }));
       });
-    }
-    catch (err) {
 
+      socket.on("answerReceived", (data) => processPeerAnswer(data));
+      socket.on("ICECandidateReceived", (data) => addIceCandidate(data));
+      socket.on("removePeer", (data) => removePeer(data));
+    } catch (err) {
       internals.port.postMessage({
-        action: 'error'
+        action: "error",
       });
       internals.port.disconnect();
     }
   },
 
   hangUp() {
-
-    Peers.reset();
-    Media.stop();
+    resetPeers();
+    stopMedia();
     internals.socket.close();
     internals.port.disconnect();
-  }
+  },
 };
 
-internals.port = chrome.runtime.connect({ name:"content" });
-internals.port.onMessage.addListener(internals.onMessage);
+internals.connect();
+chrome.runtime.onConnect.addListener(() => {
+  internals.connect();
+});
 
-console.log('Content Script Loaded');
+console.debug("Content Script Loaded");
 
 // Indicates to the background script that we executed correctly
 true;