Use source and support srcObject

[rbdr/junction] / extension / content_script.js

diff --git a/extension/content_script.js b/extension/content_script.js
index 4a6c7e65315e19b2aa761aec95deb0dd6bf82585..70c085fa3d98531d18bed7d3e334462ec5f3b90c 100644 (file)
--- a/extension/content_script.js
+++ b/extension/content_script.js
@@ -1,7 +1,18 @@
+'use strict';
+

 (() => {
 
 (() => {
 

+  const io = require('socket.io-client');
+  const Peers = require('./peers');
+  const Media = require('./media');
+

   const internals = {
   const internals = {

+
+    kSocketUrl: 'https://junction.unlimited.pizza/',
+

     port: null,
     port: null,

+    socket: null,
+    peers: 0,

 
     onMessage(message) {
       internals[message.action](message.data);
 
     onMessage(message) {
       internals[message.action](message.data);


@@ -9,9 +20,50 @@
 
     async joinAudioCall(data) {
 
 
     async joinAudioCall(data) {
 

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

       try {
       try {

-        const mediaStream = await navigator.mediaDevices.getUserMedia({ audio: true });
-        internals.createAudioElement(data.tada);
+        const mediaStream = await Media.start();
+
+        internals.socket = io(internals.kSocketUrl, {
+          transports: ['websocket']
+        });
+
+        internals.socket.on('error', function(error) {
+
+          console.error('GENERAL ERROR', error);
+        });
+
+        internals.socket.on('connect_error', function(error) {
+
+          console.error('CONNNECT ERROR', error);
+        });
+
+        internals.socket.on('connect', function() {
+
+          console.log("Connected to signaling server, group: ", data.currentUrl);
+          internals.socket.emit('join', {
+            'url': data.currentUrl,
+          });
+        });
+
+        internals.socket.on('disconnect', function() {
+
+          console.log("disconnected from signaling server");
+        });
+
+        internals.socket.on('addPeer', function(data) {
+
+          console.log(data);
+          Peers.add('id-'+Peers.count(), internals.tada);
+          console.log(`There are now ${Peers.count()} participants`);
+        });
+
+        internals.socket.on('removePeer', function() {
+
+          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`);
+        });

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


@@ -19,23 +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());
-      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);
+      Peers.reset();
+      Media.stop();
+      internals.socket.close();
+      internals.port.disconnect();

     }
   };
 
     }
   };