Address issues with App Store Review

[rbdr/junction] / extension / content_script.js

diff --git a/extension/content_script.js b/extension/content_script.js
index 279c52de5adad64e34da41a00eb78d05d235c7d8..0c7012b7939c8f34fa6e2c0414f12fc3fee597f6 100644 (file)
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,88 +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 = {
 
 const internals = {

-
-  kSocketUrl: 'ws://localhost:8000',
+  kSocketUrl: "https://junction.tranquil.services",
+  kIceServers: [{ urls: "stun:stun.l.google.com:19302" }],

 
   port: null,
   socket: null,
 
   port: null,
   socket: null,

-  peers: 0,

 
   onMessage(message) {
     internals[message.action](message.data);
   },
 
 
   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 {
     try {

-      await Media.start();
-
-      internals.socket = io(internals.kSocketUrl, {
-        transports: ['websocket']
-      });
+      const mediaStream = await startMedia();
+      const playTada = initializeTada(tada);

 
 

-      internals.socket.on('error', function(error) {
+      const socket = (internals.socket = io(internals.kSocketUrl, {
+        transports: ["websocket"],
+      }));

 
 

-        console.error('GENERAL ERROR', error);
-      });
-
-      internals.socket.on('connect_error', function(error) {
-
-        console.error('CONNNECT ERROR', error);
-      });
+      socket.on("error", internals.handleError);
+      socket.on("connect_error", internals.handleError);

 
 

-      internals.socket.on('connect', function() {
-
-        console.log("Connected to signaling server, group: ", data.currentUrl);
-        internals.socket.emit('join', {
-          'url': 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");
+      socket.on("disconnect", () => {
+        console.debug("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`);
+      socket.on("addPeer", ({ peerId, shouldCreateOffer }) => {
+        addPeer({
+          peerId,
+          shouldCreateOffer,
+          mediaStream,
+          onOffer: (data) => socket.emit("relayOffer", data),
+          socket,
+        });
+        playTada();

       });
 
       });
 

-      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`);
+      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({
       internals.port.postMessage({

-        action: 'error'
+        action: "error",

       });
       internals.port.disconnect();
     }
   },
 
   hangUp() {
       });
       internals.port.disconnect();
     }
   },
 
   hangUp() {

-
-    Peers.reset();
-    Media.stop();
+    resetPeers();
+    stopMedia();

     internals.socket.close();
     internals.port.disconnect();
     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;
 
 // Indicates to the background script that we executed correctly
 true;