Merge branch 'main' into rbdr-content-script

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index 2dbff7895b0cf1d6722b63098f294cfe09901b83..a662f6c8f612150cca9843e57262e613e9ea7075 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,9 +1,7 @@
-const io = require('socket.io-client');
-

 const internals = {
 
   promisesSupported: !!(window.browser),
 const internals = {
 
   promisesSupported: !!(window.browser),

-  isInCallState: false,
+  port: null,

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


@@ -17,10 +15,6 @@ const internals = {
     }
   },
 
     }
   },
 

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

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


@@ -29,60 +23,61 @@ const internals = {
     return internals.joinAudioCall();
   },
 
     return internals.joinAudioCall();
   },
 

-  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);
-
-    this.socket.on('connect', function() {
-      console.log("Connected to signaling server");
-    });
+  onConnect(port) {

 
 

-    this.socket.on('disconnect', function() {
-      console.log("disconnected from signaling server");
+    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');
+  },

 
 

-    this.socket.on('addPeer', function() {
-      this.peers++;
-      console.log(`There are now ${this.peers} participants`);
-    });
+  onMessage(message) {

 
 

-    this.socket.on('removePeer', function() {
-      this.peers--;
-      console.log(`There are now ${this.peers} participants`);
-    });
+    if (message.action === 'error') {
+      internals.getRoot().browserAction.setBadgeText({ text: 'x' }, () => {});
+    }
+  },

 
 

-    console.log(activeTabs[0].url); // placeholder while we connect backend.
-    internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav'));
+  onDisconnect() {
+    internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});
+    internals.setIcon('call');
+    internals.port = null;
+    internals.getRoot().browserAction.enable();

   },
 
   },
 

-  hangUp() {
-    this.socket.close();
+  async joinAudioCall() {

 
 

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

 
 

+      const execution = await internals.getRoot().tabs.executeScript(activeTabs[0].id, {
+        file: '/content_script.js'
+      });

 
 

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

 
 

-  createAudioElement(source, type = 'audio/wav') {
+  hangUp() {

 
 

-    const audioElement = document.createElement('audio');
-    audioElement.src = source;
-    audioElement.autoplay = 'autoplay';
-    audioElement.type = type;
-    document.querySelector('body').appendChild(audioElement);
+    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) {


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

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