Fix typo in CONTRIBUTING

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index f3e1fb49c6b493baa66b5a9fe25a1993b1082662..1d5f8a50b26c5ef8546f43245ba771862fac0aa2 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,18 +1,19 @@
 const internals = {
 const internals = {

-
-  promisesSupported: !!(window.browser),
+  promisesSupported: !!window.browser,
+  injectedScript: {},

   port: null,
   port: null,

+  currentUrl: null,

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

-      16: 'icons/action-16.png',
-      32: 'icons/action-32.png'
+      16: "icons/action-16.png",
+      32: "icons/action-32.png",

     },
 
     hangUp: {
     },
 
     hangUp: {

-      16: 'icons/hang_up-16.png',
-      32: 'icons/hang_up-32.png'
-    }
+      16: "icons/hang_up-16.png",
+      32: "icons/hang_up-32.png",
+    },

   },
 
   onClick() {
   },
 
   onClick() {


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

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

   },
 
   },
 

-  onConnect(port) {
+  joinAudioCall() {
+    internals.port.postMessage({
+      action: "joinAudioCall",
+      data: {
+        currentUrl: internals.currentUrl,
+        tada: internals.getRoot().runtime.getURL("sounds/tada.wav"),
+      },
+    });
+    internals.getRoot().browserAction.enable();
+    internals.setIcon("hangUp");
+  },

 
 

+  onConnect(port) {

     internals.port = port;
     port.onDisconnect.addListener(internals.onDisconnect);
     port.onMessage.addListener(internals.onMessage);
     internals.port = port;
     port.onDisconnect.addListener(internals.onDisconnect);
     port.onMessage.addListener(internals.onMessage);

-    port.postMessage({
-      action: 'joinAudioCall',
-      data: {
-        tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
-      }
-    });
-    internals.getRoot().browserAction.enable();
-    internals.setIcon('hangUp');
+    internals.joinAudioCall();

   },
 
   onMessage(message) {
   },
 
   onMessage(message) {

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

     }
   },
 
   onDisconnect() {
     }
   },
 
   onDisconnect() {

-    internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
-    internals.setIcon('call');
+    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();
   },
 

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

     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'
-      });
-
-      if (!execution || !execution[0]) {
+    internals.currentUrl = activeTabs[0].url;
+    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();
       }
         internals.onDisconnect();
       }

-  }
-  ,
+    } else {
+      internals.getRoot().tabs.connect(activeTabs[0].id);
+    }
+  },

 
   hangUp() {
 
   hangUp() {

-

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

-      action: 'hangUp'
+      action: "hangUp",

     });
   },
 
   isInCall() {
     });
   },
 
   isInCall() {

-
-    return !!(internals.port);
+    return !!internals.port;

   },
 
   setIcon(iconSet) {
   },
 
   setIcon(iconSet) {

-

     internals.getRoot().browserAction.setIcon({
     internals.getRoot().browserAction.setIcon({

-      path: internals.icons[iconSet]
+      path: internals.icons[iconSet],

     });
   },
 
   getRoot() {
     });
   },
 
   getRoot() {

-

     return window.browser || window.chrome;
   },
 
   // Chrome doesn't yet implement the promise based tabs.query :'(
 
   getActiveTabs() {
     return window.browser || window.chrome;
   },
 
   // Chrome doesn't yet implement the promise based tabs.query :'(
 
   getActiveTabs() {

-

     const query = {
       currentWindow: true,
     const query = {
       currentWindow: true,

-      active: true
+      active: true,

     };
 
     if (internals.promisesSupported) {
       return internals.getRoot().tabs.query(query);
     }
 
     };
 
     if (internals.promisesSupported) {
       return internals.getRoot().tabs.query(query);
     }
 

-    return new Promise((resolve, reject) => {
-
+    return new Promise((resolve) => {

       internals.getRoot().tabs.query(query, (tabs) => {
       internals.getRoot().tabs.query(query, (tabs) => {

-

         return resolve(tabs);
       });
     });
         return resolve(tabs);
       });
     });