Fix server

[rbdr/junction] / extension / junction.js

diff --git a/extension/junction.js b/extension/junction.js
index e78a02bc0755301ca59def111a7a84050b265467..889e23f975dfdd3dccb9ce7dd081367fe33023e8 100644 (file)
--- a/extension/junction.js
+++ b/extension/junction.js
@@ -1,7 +1,8 @@
 const internals = {
 
   promisesSupported: !!(window.browser),
 const internals = {
 
   promisesSupported: !!(window.browser),

-  isInCallState: false,
+  port: null,
+  currentUrl: null,

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


@@ -23,34 +24,69 @@ const internals = {
     return internals.joinAudioCall();
   },
 
     return internals.joinAudioCall();
   },
 

-  async joinAudioCall() {
-
-    internals.isInCallState = true;
+  onConnect(port) {
+
+    internals.port = port;
+    port.onDisconnect.addListener(internals.onDisconnect);
+    port.onMessage.addListener(internals.onMessage);
+    port.postMessage({
+      action: 'joinAudioCall',
+      data: {
+        currentUrl: internals.currentUrl,
+        tada: internals.getRoot().runtime.getURL('sounds/tada.wav')
+      }
+    });
+    internals.getRoot().browserAction.enable();

     internals.setIcon('hangUp');
     internals.setIcon('hangUp');

-    const activeTabs = await internals.getActiveTabs();
-
-    console.log(activeTabs[0].url); // placeholder while we connect backend.
-    internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav'));

   },
 
   },
 

-  hangUp() {
+  onMessage(message) {

 
 

-    document.querySelectorAll('audio').forEach((audioElement) => audioElement.remove());
+    if (message.action === 'error') {
+      internals.getRoot().browserAction.setBadgeText({ text: 'x' }, () => {});
+    }
+  },
+
+  onDisconnect() {
+    internals.getRoot().browserAction.setBadgeText({ text: '' }, () => {});

     internals.setIcon('call');
     internals.setIcon('call');

-    internals.isInCallState = false;
+    internals.currentUrl = null;
+    internals.port = null;
+    internals.getRoot().browserAction.enable();

   },
 
   },
 

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

 
 

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


@@ -78,7 +114,7 @@ const internals = {
       return internals.getRoot().tabs.query(query);
     }
 
       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) => {
 


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

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