Merge branch 'main' of gitlab.com:rbdr/junction into main

[rbdr/junction] / extension / content_script.js

diff --git a/extension/content_script.js b/extension/content_script.js
index 84a2fd3bce3ed6bd3cd1a306e860fa9f5eed43df..70c085fa3d98531d18bed7d3e334462ec5f3b90c 100644 (file)
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,6 +1,10 @@
+'use strict';
+

 (() => {
 
   const io = require('socket.io-client');
 (() => {
 
   const io = require('socket.io-client');

+  const Peers = require('./peers');
+  const Media = require('./media');

 
   const internals = {
 
 
   const internals = {
 


@@ -16,8 +20,10 @@
 
     async joinAudioCall(data) {
 
 
     async joinAudioCall(data) {
 

+      internals.tada = data.tada; // Keeping for fun
+

       try {
       try {

-        const mediaStream = await navigator.mediaDevices.getUserMedia({ audio: true });
+        const mediaStream = await Media.start();

 
         internals.socket = io(internals.kSocketUrl, {
           transports: ['websocket']
 
         internals.socket = io(internals.kSocketUrl, {
           transports: ['websocket']


@@ -49,17 +55,15 @@
         internals.socket.on('addPeer', function(data) {
 
           console.log(data);
         internals.socket.on('addPeer', function(data) {
 
           console.log(data);

-          internals.peers++;
-          console.log(`There are now ${internals.peers} participants`);
+          Peers.add('id-'+Peers.count(), internals.tada);
+          console.log(`There are now ${Peers.count()} participants`);

         });
 
         internals.socket.on('removePeer', function() {
 
         });
 
         internals.socket.on('removePeer', function() {
 

-          internals.peers--;
-          console.log(`There are now ${internals.peers} participants`);
+          Peers.remove('id-'+(Peers.count() - 1)); // This is only for testing, don't use count to remove ids.
+          console.log(`There are now ${Peers.count()} participants`);

         });
         });

-
-        internals.createAudioElement(data.tada);

       }
       catch (err) {
 
       }
       catch (err) {
 


@@ -67,24 +71,15 @@
           action: 'error'
         });
         internals.port.disconnect();
           action: 'error'
         });
         internals.port.disconnect();

-        internals.createAudioElement(data.tada);

       }
     },
 
     hangUp() {
       }
     },
 
     hangUp() {

-      document.querySelectorAll('.junction-call-audio').forEach((audioElement) => audioElement.remove());
+
+      Peers.reset();
+      Media.stop();

       internals.socket.close();
       internals.port.disconnect();
       internals.socket.close();
       internals.port.disconnect();

-    },
-
-    createAudioElement(source, type = 'audio/wav') {
-
-      const audioElement = document.createElement('audio');
-      audioElement.setAttribute('class', 'junction-call-audio');
-      audioElement.src = source;
-      audioElement.autoplay = 'autoplay';
-      audioElement.type = type;
-      document.querySelector('body').appendChild(audioElement);

     }
   };
 
     }
   };