Only send offer on one side

[rbdr/junction] / extension / content_script.js

diff --git a/extension/content_script.js b/extension/content_script.js
index 70c085fa3d98531d18bed7d3e334462ec5f3b90c..c344bd945ca94e23ef5f954460f201cc98b6a61f 100644 (file)
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,91 +1,93 @@
-'use strict';
-
-(() => {
-
-  const io = require('socket.io-client');
-  const Peers = require('./peers');
-  const Media = require('./media');
-
-  const internals = {
-
-    kSocketUrl: 'https://junction.unlimited.pizza/',
-
-    port: null,
-    socket: null,
-    peers: 0,
-
-    onMessage(message) {
-      internals[message.action](message.data);
-    },
-
-    async joinAudioCall(data) {
-
-      internals.tada = data.tada; // Keeping for fun
-
-      try {
-        const mediaStream = await Media.start();
-
-        internals.socket = io(internals.kSocketUrl, {
-          transports: ['websocket']
-        });
-
-        internals.socket.on('error', function(error) {
-
-          console.error('GENERAL ERROR', error);
+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: [{ urls: "stun:stun.l.google.com:19302" }],
+
+  port: null,
+  socket: null,
+
+  onMessage(message) {
+    internals[message.action](message.data);
+  },
+
+  onError(error) {
+    // TODO: How do we want to handle errors?
+    console.error(error.stack || error);
+  },
+
+  async joinAudioCall({ currentUrl, tada }) {
+    try {
+      const mediaStream = await startMedia();
+      const playTada = initializeTada(tada);
+
+      const socket = (internals.socket = io(internals.kSocketUrl, {
+        transports: ["websocket"],
+      }));
+
+      socket.on("error", internals.handleError);
+      socket.on("connect_error", internals.handleError);
+
+      socket.on("connect", () => {
+        console.debug("Connected to signaling server, group: ", currentUrl);
+        playTada();
+        socket.emit("join", {
+          room: currentUrl,

         });
         });

-
-        internals.socket.on('connect_error', function(error) {
-
-          console.error('CONNNECT ERROR', error);
+      });
+
+      socket.on("disconnect", () => {
+        console.debug("disconnected from signaling server");
+      });
+
+      socket.on("addPeer", ({ peerId, shouldCreateOffer }) => {
+        addPeer({
+          peerId,
+          shouldCreateOffer,
+          mediaStream,
+          onOffer: (data) => socket.emit("relayOffer", data),
+          socket

         });
         });

-
-        internals.socket.on('connect', function() {
-
-          console.log("Connected to signaling server, group: ", data.currentUrl);
-          internals.socket.emit('join', {
-            'url': data.currentUrl,
-          });
-        });
-
-        internals.socket.on('disconnect', function() {
-
-          console.log("disconnected from signaling server");
-        });
-
-        internals.socket.on('addPeer', function(data) {
-
-          console.log(data);
-          Peers.add('id-'+Peers.count(), internals.tada);
-          console.log(`There are now ${Peers.count()} participants`);
-        });
-
-        internals.socket.on('removePeer', function() {
-
-          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`);
-        });
-      }
-      catch (err) {
-
-        internals.port.postMessage({
-          action: 'error'
-        });
-        internals.port.disconnect();
-      }
-    },
-
-    hangUp() {
-
-      Peers.reset();
-      Media.stop();
-      internals.socket.close();
+        playTada();
+      });
+
+      socket.on("offerReceived", async ({ peerId, offer }) => {
+        socket.emit("relayAnswer", await answerPeerOffer({ peerId, offer }));
+      });
+
+      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",
+      });

       internals.port.disconnect();
     }
       internals.port.disconnect();
     }

-  };
+  },
+
+  hangUp() {
+    resetPeers();
+    stopMedia();
+    internals.socket.close();
+    internals.port.disconnect();
+  },
+};
+
+internals.port = chrome.runtime.connect({ name: "content" });
+internals.port.onMessage.addListener(internals.onMessage);

 
 

-  internals.port = chrome.runtime.connect({ name:"content" });
-  internals.port.onMessage.addListener(internals.onMessage);
-})();
+console.debug("Content Script Loaded");

 
 // Indicates to the background script that we executed correctly
 true;
 
 // Indicates to the background script that we executed correctly
 true;