Properly allow multiple

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index 3e8b4d9e4996b50c738d476df389573ad0e4d09d..1d5f8a50b26c5ef8546f43245ba771862fac0aa2 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,5 +1,6 @@
 const internals = {
   promisesSupported: !!window.browser,
 const internals = {
   promisesSupported: !!window.browser,

+  injectedScript: {},

   port: null,
   currentUrl: null,
 
   port: null,
   currentUrl: null,
 


@@ -20,14 +21,11 @@ const internals = {
       return internals.hangUp();
     }
 
       return internals.hangUp();
     }
 

-    return internals.joinAudioCall();
+    return internals.initializeContentScript();

   },
 
   },
 

-  onConnect(port) {
-    internals.port = port;
-    port.onDisconnect.addListener(internals.onDisconnect);
-    port.onMessage.addListener(internals.onMessage);
-    port.postMessage({
+  joinAudioCall() {
+    internals.port.postMessage({

       action: "joinAudioCall",
       data: {
         currentUrl: internals.currentUrl,
       action: "joinAudioCall",
       data: {
         currentUrl: internals.currentUrl,


@@ -38,6 +36,13 @@ const internals = {
     internals.setIcon("hangUp");
   },
 
     internals.setIcon("hangUp");
   },
 

+  onConnect(port) {
+    internals.port = port;
+    port.onDisconnect.addListener(internals.onDisconnect);
+    port.onMessage.addListener(internals.onMessage);
+    internals.joinAudioCall();
+  },
+

   onMessage(message) {
     if (message.action === "error") {
       internals.getRoot().browserAction.setBadgeText({ text: "x" }, () => {});
   onMessage(message) {
     if (message.action === "error") {
       internals.getRoot().browserAction.setBadgeText({ text: "x" }, () => {});


@@ -52,27 +57,31 @@ const internals = {
     internals.getRoot().browserAction.enable();
   },
 
     internals.getRoot().browserAction.enable();
   },
 

-  async joinAudioCall() {
+  async initializeContentScript() {

     internals.getRoot().browserAction.disable();
     const activeTabs = await internals.getActiveTabs();
 
     internals.currentUrl = activeTabs[0].url;
     internals.getRoot().browserAction.disable();
     const activeTabs = await internals.getActiveTabs();
 
     internals.currentUrl = activeTabs[0].url;

-    const execution = await internals.getRoot().tabs.executeScript(
-      activeTabs[0].id,
-      {
-        file: "/build/content_script.js",
-      },
-      () => {
-        if (internals.getRoot().runtime.lastError) {
-          internals.onDisconnect();
-        }
-      },
-    );
-
-    if (execution && !execution[0]) {
-      internals.onDisconnect();
+    const id = activeTabs[0].id;
+    if (!internals.injectedScript[id]) {
+      const execution = await internals.getRoot().tabs.executeScript(
+        activeTabs[0].id,
+        {
+          file: "/build/content_script.js",
+        },
+        () => {
+          internals.injectedScript[id] = true;
+        },
+      );
+
+      if (execution && !execution[0]) {
+        internals.onDisconnect();
+      }
+    } else {
+      internals.getRoot().tabs.connect(activeTabs[0].id);

     }
   },
     }
   },

+

   hangUp() {
     internals.getRoot().browserAction.disable();
     internals.port.postMessage({
   hangUp() {
     internals.getRoot().browserAction.disable();
     internals.port.postMessage({