X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/344f7c1320d512a423c9f2133959417823f5cc83..ec4adc33ec00dfe4a5720a13551428aaddaf72d9:/extension/junction.js?ds=inline diff --git a/extension/junction.js b/extension/junction.js index bb2d3e5..3e8b4d9 100644 --- a/extension/junction.js +++ b/extension/junction.js @@ -1,26 +1,20 @@ -const io = require('socket.io-client'); - const internals = { - - promisesSupported: !!(window.browser), - isInCallState: false, + promisesSupported: !!window.browser, + port: null, + currentUrl: null, icons: { call: { - 16: 'icons/action-16.png', - 32: 'icons/action-32.png' + 16: "icons/action-16.png", + 32: "icons/action-32.png", }, 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(); @@ -29,91 +23,91 @@ const internals = { return internals.joinAudioCall(); }, - async joinAudioCall() { - - internals.isInCallState = true; - internals.setIcon('hangUp'); - const activeTabs = await internals.getActiveTabs(); - - const socketUrl = 'http://polypropylene.website:8000'; - const currentUrl = activeTabs[0].url; - - this.socket = io(socketUrl); - - this.socket.on('connect', function() { - console.log("Connected to signaling server"); - }); - - this.socket.on('disconnect', function() { - console.log("disconnected from signaling server"); - }); - - this.socket.on('addPeer', function() { - this.peers++; - console.log(`There are now ${this.peers} participants`); - }); - - this.socket.on('removePeer', function() { - this.peers--; - console.log(`There are now ${this.peers} participants`); + 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"), + }, }); - - console.log(activeTabs[0].url); // placeholder while we connect backend. - internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav')); + internals.getRoot().browserAction.enable(); + internals.setIcon("hangUp"); }, - hangUp() { - this.socket.close(); - - + onMessage(message) { + if (message.action === "error") { + internals.getRoot().browserAction.setBadgeText({ text: "x" }, () => {}); + } + }, - document.querySelectorAll('audio').forEach((audioElement) => audioElement.remove()); - internals.setIcon('call'); - internals.isInCallState = false; + onDisconnect() { + internals.getRoot().browserAction.setBadgeText({ text: "" }, () => {}); + internals.setIcon("call"); + internals.currentUrl = null; + internals.port = null; + internals.getRoot().browserAction.enable(); }, - createAudioElement(source, type = 'audio/wav') { + async joinAudioCall() { + internals.getRoot().browserAction.disable(); + const activeTabs = await internals.getActiveTabs(); - const audioElement = document.createElement('audio'); - audioElement.src = source; - audioElement.autoplay = 'autoplay'; - audioElement.type = type; - document.querySelector('body').appendChild(audioElement); + 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() { - return internals.isInCallState; // this should be replaced with actually checking the built stuff + return !!internals.port; }, setIcon(iconSet) { - internals.getRoot().browserAction.setIcon({ - path: internals.icons[iconSet] + path: internals.icons[iconSet], }); }, getRoot() { - return window.browser || window.chrome; }, // Chrome doesn't yet implement the promise based tabs.query :'( getActiveTabs() { - const query = { currentWindow: true, - active: true + active: true, }; if (internals.promisesSupported) { return internals.getRoot().tabs.query(query); } - return new Promise((resolve, reject) => { - + return new Promise((resolve) => { internals.getRoot().tabs.query(query, (tabs) => { - return resolve(tabs); }); }); @@ -121,3 +115,4 @@ const internals = { }; internals.getRoot().browserAction.onClicked.addListener(internals.onClick); +internals.getRoot().runtime.onConnect.addListener(internals.onConnect);