From 02071d8e6e45dd253298d2e450ecfffacccaec19 Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <ruben@unlimited.pizza>
Date: Sun, 27 Sep 2020 22:36:52 +0200
Subject: Fix rooms and force ws protocol

---
 extension/junction.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'extension/junction.js')

diff --git a/extension/junction.js b/extension/junction.js
index f3e1fb4..2c32053 100644
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -2,6 +2,7 @@ const internals = {
 
   promisesSupported: !!(window.browser),
   port: null,
+  currentUrl: null,
 
   icons: {
     call: {
@@ -31,6 +32,7 @@ const internals = {
     port.postMessage({
       action: 'joinAudioCall',
       data: {
+        currentUrl: internals.currentUrl,
         tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
       }
     });
@@ -48,6 +50,7 @@ const internals = {
   onDisconnect() {
     internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
     internals.setIcon('call');
+    internals.currentUrl = null;
     internals.port = null;
     internals.getRoot().browserAction.enable();
   },
@@ -57,13 +60,19 @@ const internals = {
     internals.getRoot().browserAction.disable();
     const activeTabs = await internals.getActiveTabs();
 
-      const execution = await internals.getRoot().tabs.executeScript(activeTabs[0].id, {
-        file: '/build/content_script.js'
-      });
+    internals.currentUrl = activeTabs[0].url;
+    const execution = await internals.getRoot().tabs.executeScript(activeTabs[0].id, {
+      file: '/build/content_script.js'
+    }, () => {
 
-      if (!execution || !execution[0]) {
+      if (internals.getRoot().runtime.lastError) {
         internals.onDisconnect();
       }
+    });
+
+    if (execution && !execution[0]) {
+      internals.onDisconnect();
+    }
   }
   ,
 
-- 
cgit