Merge branch 'main' of gitlab.com:rbdr/junction into main

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index f3e1fb49c6b493baa66b5a9fe25a1993b1082662..2c32053918aec6d2060164356f84e277f37c5dfb 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -2,6 +2,7 @@ const internals = {
 
   promisesSupported: !!(window.browser),
   port: null,
 
   promisesSupported: !!(window.browser),
   port: null,

+  currentUrl: null,

 
   icons: {
     call: {
 
   icons: {
     call: {


@@ -31,6 +32,7 @@ const internals = {
     port.postMessage({
       action: 'joinAudioCall',
       data: {
     port.postMessage({
       action: 'joinAudioCall',
       data: {

+        currentUrl: internals.currentUrl,

         tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
       }
     });
         tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
       }
     });


@@ -48,6 +50,7 @@ const internals = {
   onDisconnect() {
     internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
     internals.setIcon('call');
   onDisconnect() {
     internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
     internals.setIcon('call');

+    internals.currentUrl = null;

     internals.port = null;
     internals.getRoot().browserAction.enable();
   },
     internals.port = null;
     internals.getRoot().browserAction.enable();
   },


@@ -57,13 +60,19 @@ const internals = {
     internals.getRoot().browserAction.disable();
     const activeTabs = await internals.getActiveTabs();
 
     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();
       }
         internals.onDisconnect();
       }

+    });
+
+    if (execution && !execution[0]) {
+      internals.onDisconnect();
+    }

   }
   ,
 
   }
   ,