Inject script only once

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index f1a4361491d69c837b38f10f92b379eb3f54a1c7..776096927473e635738e8577f8988675b7e9645e 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,126 +1,120 @@
-const io = require('socket.io-client');
-

 const internals = {
 const internals = {

-
-  promisesSupported: !!(window.browser),
-  isInCallState: false,
+  promisesSupported: !!window.browser,
+  injectedScript: false,
+  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",
+    },

   },
 
   },
 

-  socket: null,
-
-  peers: 0,
-

   onClick() {
     if (internals.isInCall()) {
       return internals.hangUp();
     }
 
   onClick() {
     if (internals.isInCall()) {
       return internals.hangUp();
     }
 

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

   },
 
   },
 

-  async joinAudioCall() {
-
-    internals.isInCallState = true;
-    internals.setIcon('hangUp');
-    const activeTabs = await internals.getActiveTabs();
-
-    const socketUrl = 'http://unlimited.pizza:8000/';
-    const currentUrl = activeTabs[0].url;
-
-    this.socket = io(socketUrl);
-
-    var that = this;
-
-    this.socket.on('connect', function() {
-      console.log("Connected to signaling server");
-
-      that.socket.emit('join', {
-        'url': currentUrl,
-      });
-    });
-
-    this.socket.on('disconnect', function() {
-      console.log("disconnected from signaling server");
-    });
-
-    this.socket.on('addPeer', function(data) {
-      console.log(data);
-      that.peers++;
-      console.log(`There are now ${that.peers} participants`);
+  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");
+  },

 
 

-    this.socket.on('removePeer', function() {
-      that.peers--;
-      console.log(`There are now ${that.peers} participants`);
-    });
+  onConnect(port) {
+    internals.port = port;
+    port.onDisconnect.addListener(internals.onDisconnect);
+    port.onMessage.addListener(internals.onMessage);
+    internals.joinAudioCall();
+  },

 
 

-    console.log(activeTabs[0].url); // placeholder while we connect backend.
-    internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav'));
+  onMessage(message) {
+    if (message.action === "error") {
+      internals.getRoot().browserAction.setBadgeText({ text: "x" }, () => {});
+    }

   },
 
   },
 

-  hangUp() {
-    this.socket.close();
+  onDisconnect() {
+    internals.getRoot().browserAction.setBadgeText({ text: "" }, () => {});
+    internals.setIcon("call");
+    internals.currentUrl = null;
+    internals.port = null;
+    internals.getRoot().browserAction.enable();
+  },

 
 

+  async initializeContentScript() {
+    internals.getRoot().browserAction.disable();
+    const activeTabs = await internals.getActiveTabs();

 
 

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

 
 

-    document.querySelectorAll('audio').forEach((audioElement) => audioElement.remove());
-    internals.setIcon('call');
-    internals.isInCallState = false;
+    if (execution && !execution[0]) {
+      internals.onDisconnect();
+    }

   },
   },

-
-  createAudioElement(source, type = 'audio/wav') {
-
-    const audioElement = document.createElement('audio');
-    audioElement.src = source;
-    audioElement.autoplay = 'autoplay';
-    audioElement.type = type;
-    document.querySelector('body').appendChild(audioElement);
+  hangUp() {
+    internals.getRoot().browserAction.disable();
+    internals.port.postMessage({
+      action: "hangUp",
+    });

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

-    return internals.isInCallState; // this should be replaced with actually checking the built stuff
+    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);
       });
     });


@@ -128,3 +122,4 @@ const internals = {
 };
 
 internals.getRoot().browserAction.onClicked.addListener(internals.onClick);
 };
 
 internals.getRoot().browserAction.onClicked.addListener(internals.onClick);

+internals.getRoot().runtime.onConnect.addListener(internals.onConnect);