Fix rooms and force ws protocol

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index 73befa209a8d34d2bae7657d1b61b8478fc20a1f..2c32053918aec6d2060164356f84e277f37c5dfb 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,9 +1,8 @@
-const io = require('socket.io-client');
-
 const internals = {
 
   promisesSupported: !!(window.browser),
-  isInCallState: false,
+  port: null,
+  currentUrl: null,
 
   icons: {
     call: {
@@ -17,10 +16,6 @@ const internals = {
     }
   },
 
-  socket: null,
-
-  peers: 0,
-
   onClick() {
     if (internals.isInCall()) {
       return internals.hangUp();
@@ -29,67 +24,69 @@ const internals = {
     return internals.joinAudioCall();
   },
 
-  async joinAudioCall() {
-
-    internals.isInCallState = true;
+  onConnect(port) {
+
+    internals.port = port;
+    port.onDisconnect.addListener(internals.onDisconnect);
+    port.onMessage.addListener(internals.onMessage);
+    port.postMessage({
+      action: 'joinAudioCall',
+      data: {
+        currentUrl: internals.currentUrl,
+        tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
+      }
+    });
+    internals.getRoot().browserAction.enable();
     internals.setIcon('hangUp');
-    const activeTabs = await internals.getActiveTabs();
-
-    const socketUrl = 'http://localhost:8000/';
-    const currentUrl = activeTabs[0].url;
+  },
 
-    this.socket = io(socketUrl);
+  onMessage(message) {
 
-    var that = this;
+    if (message.action === 'error') {
+      internals.getRoot().browserAction.setBadgeText({ text: 'x' }, () => {});
+    }
+  },
 
-    this.socket.on('connect', function() {
-      console.log("Connected to signaling server");
+  onDisconnect() {
+    internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
+    internals.setIcon('call');
+    internals.currentUrl = null;
+    internals.port = null;
+    internals.getRoot().browserAction.enable();
+  },
 
-      that.socket.emit('join', {
-        'url': currentUrl,
-      });
-    });
+  async joinAudioCall() {
 
-    this.socket.on('disconnect', function() {
-      console.log("disconnected from signaling server");
-    });
+    internals.getRoot().browserAction.disable();
+    const activeTabs = await internals.getActiveTabs();
 
-    this.socket.on('addPeer', function(data) {
-      console.log(data);
-      that.peers++;
-      console.log(`There are now ${that.peers} participants`);
-    });
+    internals.currentUrl = activeTabs[0].url;
+    const execution = await internals.getRoot().tabs.executeScript(activeTabs[0].id, {
+      file: '/build/content_script.js'
+    }, () => {
 
-    this.socket.on('removePeer', function() {
-      that.peers--;
-      console.log(`There are now ${that.peers} participants`);
+      if (internals.getRoot().runtime.lastError) {
+        internals.onDisconnect();
+      }
     });
 
-    console.log(activeTabs[0].url); // placeholder while we connect backend.
-    internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav'));
-  },
+    if (execution && !execution[0]) {
+      internals.onDisconnect();
+    }
+  }
+  ,
 
   hangUp() {
-    this.socket.close();
-
 
-
-    document.querySelectorAll('audio').forEach((audioElement) => audioElement.remove());
-    internals.setIcon('call');
-    internals.isInCallState = false;
-  },
-
-  createAudioElement(source, type = 'audio/wav') {
-
-    const audioElement = document.createElement('audio');
-    audioElement.src = source;
-    audioElement.autoplay = 'autoplay';
-    audioElement.type = type;
-    document.querySelector('body').appendChild(audioElement);
+    internals.getRoot().browserAction.disable();
+    internals.port.postMessage({
+      action: 'hangUp'
+    });
   },
 
   isInCall() {
-    return internals.isInCallState; // this should be replaced with actually checking the built stuff
+
+    return !!(internals.port);
   },
 
   setIcon(iconSet) {
@@ -128,3 +125,4 @@ const internals = {
 };
 
 internals.getRoot().browserAction.onClicked.addListener(internals.onClick);
+internals.getRoot().runtime.onConnect.addListener(internals.onConnect);