X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/93fe1aee43a79a23d4c418c230fde0e451259279..80172072ed99b14e3d5b435b097888a4621f78bc:/extension/content_script.js

diff --git a/extension/content_script.js b/extension/content_script.js
index 741e1c4..279c52d 100644
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,86 +1,88 @@
-(() => {
+import { io } from 'socket.io-client';
+import Peers from './peers';
+import Media from './media';
 
-  const io = require('socket.io-client');
+const internals = {
 
-  const internals = {
+  kSocketUrl: 'ws://localhost:8000',
 
-    kSocketUrl: 'http://unlimited.pizza:8000/',
+  port: null,
+  socket: null,
+  peers: 0,
 
-    port: null,
-    socket: null,
-    peers: 0,
+  onMessage(message) {
+    internals[message.action](message.data);
+  },
 
-    onMessage(message) {
-      internals[message.action](message.data);
-    },
+  async joinAudioCall(data) {
 
-    async joinAudioCall(data) {
+    internals.tada = data.tada; // Keeping for fun
 
-      try {
-        const mediaStream = await navigator.mediaDevices.getUserMedia({ audio: true });
+    try {
+      await Media.start();
 
-        internals.socket = io(internals.kSocketUrl);
+      internals.socket = io(internals.kSocketUrl, {
+        transports: ['websocket']
+      });
 
-        console.log('Connecting to server');
-        internals.socket.on('connect', function() {
+      internals.socket.on('error', function(error) {
 
-          console.log("Connected to signaling server");
-          internals.socket.emit('join', {
-            'url': currentUrl,
-          });
-        });
+        console.error('GENERAL ERROR', error);
+      });
 
-        internals.socket.on('disconnect', function() {
+      internals.socket.on('connect_error', function(error) {
 
-          console.log("disconnected from signaling server");
-        });
+        console.error('CONNNECT ERROR', error);
+      });
 
-        internals.socket.on('addPeer', function(data) {
+      internals.socket.on('connect', function() {
 
-          console.log(data);
-          internals.peers++;
-          console.log(`There are now ${internals.peers} participants`);
+        console.log("Connected to signaling server, group: ", data.currentUrl);
+        internals.socket.emit('join', {
+          'url': data.currentUrl,
         });
+      });
 
-        internals.socket.on('removePeer', function() {
+      internals.socket.on('disconnect', function() {
 
-          internals.peers--;
-          console.log(`There are now ${internals.peers} participants`);
-        });
+        console.log("disconnected from signaling server");
+      });
 
-        console.log('Done!');
-        internals.createAudioElement(data.tada);
-      }
-      catch (err) {
+      internals.socket.on('addPeer', function(data) {
 
-        internals.port.postMessage({
-          action: 'error'
-        });
-        internals.port.disconnect();
-        internals.createAudioElement(data.tada);
-      }
-    },
-
-    hangUp() {
-      document.querySelectorAll('.junction-call-audio').forEach((audioElement) => audioElement.remove());
-      internals.socket.close();
-      internals.port.disconnect();
-    },
+        console.log(data);
+        Peers.add('id-'+Peers.count(), internals.tada);
+        console.log(`There are now ${Peers.count()} participants`);
+      });
 
-    createAudioElement(source, type = 'audio/wav') {
+      internals.socket.on('removePeer', function() {
 
-      const audioElement = document.createElement('audio');
-      audioElement.setAttribute('class', 'junction-call-audio');
-      audioElement.src = source;
-      audioElement.autoplay = 'autoplay';
-      audioElement.type = type;
-      document.querySelector('body').appendChild(audioElement);
+        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();
+    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.log('Content Script Loaded');
 
 // Indicates to the background script that we executed correctly
 true;