From e51faaf9348e7bb97cbf5fff102da8335066608b Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Fri, 26 Jan 2018 00:09:08 +0100 Subject: [PATCH] =?UTF-8?q?New=20comms=20between=20[uw.js=20<=3D=3D>=20uw-?= =?UTF-8?q?bg.js=20<=3D=3D>=20popup.js]=20established.=20Working=20in=20Fi?= =?UTF-8?q?refox,=20not=20in=20Chrome=20=E2=80=94=20potentially=20due=20to?= =?UTF-8?q?=20Promise.all()=20(try=20replacing=20with=20`for(promise=20of?= =?UTF-8?q?=20promises)=20await=20promise`)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/conf/uwvars.js | 1 - js/lib/Comms.js | 25 +++++-- js/uw-bg.js | 163 ++++++++++++++++++++++++++---------------- js/uw.js | 4 +- res/popup/js/popup.js | 20 +++--- 5 files changed, 133 insertions(+), 80 deletions(-) delete mode 100644 js/conf/uwvars.js diff --git a/js/conf/uwvars.js b/js/conf/uwvars.js deleted file mode 100644 index 8d1c8b6..0000000 --- a/js/conf/uwvars.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/js/lib/Comms.js b/js/lib/Comms.js index d6eec1e..9d3879c 100644 --- a/js/lib/Comms.js +++ b/js/lib/Comms.js @@ -19,6 +19,13 @@ var _com_queryTabs = async function(tabInfo){ } } +var _com_getActiveTab = async function(tabInfo){ + if(BrowserDetect.firefox){ + return await browser.tabs.query({currentWindow: true, active: true}); + } + return _com_chrome_tabquery_wrapper({currentWindow: true, active: true}); +} + var _com_chrome_tabs_sendmsg_wrapper = async function(tab, message, options){ return new Promise(function (resolve, reject){ @@ -97,27 +104,31 @@ var _com_sendToAllFrames = async function(message) { // pošlje sporočilce vsem okvirjem v trenutno odprtem zavihku in vrne _vse_ odgovore // sends a message to all frames in currently opened tab and returns all responses -var _com_sendToEachFrame = async function(message) { +var _com_sendToEachFrame = async function(message, tabId) { if(Debug.debug) console.log("[Comms::_com_sendToEveryFrame] sending message to every frames of currenntly active tab"); try{ - var tabs = await browser.tabs.query({currentWindow: true, active: true}); - var frames = await browser.webNavigation.getAllFrames({tabId: tabs[0].id}); - + if(tabId === undefined){ + var tabs = await browser.tabs.query({currentWindow: true, active: true}); + tabId = tabs[0].id; + } + var frames = await browser.webNavigation.getAllFrames({tabId: tabId}); + if(Debug.debug) - console.log("[Comms::_com_sendToEveryFrame] we have this many frames:", frames.length, "||| tabs:",tabs,"frames:",frames); + console.log("[Comms::_com_sendToEveryFrame] we have this many frames:", frames.length, "||| tabId:", tabId ,"frames:",frames); // pošlji sporočilce vsakemu okvirju, potisni obljubo v tabelo // send message to every frame, push promise to array var promises = []; for(var frame in frames){ - promises.push(browser.tabs.sendMessage(tabs[0].id, message, {frameId: frame.frameId})); + promises.push(browser.tabs.sendMessage(tabId, message, {frameId: frame.frameId})); } // počakajmo, da so obljube izpolnjene. // wait for all promises to be kept + var responses = await Promise.all(promises); if(Debug.debug) @@ -132,6 +143,8 @@ var _com_sendToEachFrame = async function(message) { } var Comms = { + getActiveTab: _com_getActiveTab, + sendToBackgroundScript: _com_sendMessageRuntime, queryTabs: _com_queryTabs, sendMessage: _com_sendMessage, sendMessageRuntime: _com_sendMessageRuntime, diff --git a/js/uw-bg.js b/js/uw-bg.js index 2925918..4dfc141 100644 --- a/js/uw-bg.js +++ b/js/uw-bg.js @@ -1,14 +1,20 @@ -console.log("blabla"); +var BgVars = { + arIsActive: true, + hasVideos: false + +} async function main(){ if(Debug.debug) console.log("[uw-bg::main] setting up background script"); await Settings.init(); + await Keybinds.init(); + // Poslušalci za dogodke | event listeners here + // {===]///[-------------------------------------]\\\[===} - - + browser.runtime.onMessage.addListener(_uwbg_rcvmsg); browser.tabs.onActivated.addListener(_uwbg_onTabSwitched); if(Debug.debug) @@ -21,26 +27,61 @@ async function _uwbg_onTabSwitched(activeInfo){ var tabId = activeInfo.tabId; // just for readability - Comms.sendToEach({"cmd":"has-videos"}); + var videoFrameList = await Comms.sendToEach({"cmd":"has-videos"}, tabId); + + // Pogledamo, če kateri od okvirjev vsebuje video. Da omogočimo pojavno okno je zadosti že + // en okvir z videom. + // <===[///]----------------------------[\\\]===> + // Check if any frame has a video in it. To enable the popup there only needs to be at least one, + // but the popup controls all frames. + var hasVideos = false; + for(frame of videoFrameList){ + hasVideos |= frame.response.hasVideos; + } + + BgVars.hasVideos = hasVideos; + + Settings.reload(); + // todo: change extension icon depending on whether there's a video on the page or not } -async function _uwbg_rcvmsg(message){ - return; + +async function _uwbg_registerVideo(tabId){ + var tabs = await Comms.getActiveTab(); + + // če ukaz pride iz zavihka, na katerem se trenunto ne nahajamo, potem se za zahtevo ne brigamo + // if command originated from a tab that's _not_ currently active, we ignore the request + if(tabId != tabs[0].id){ + if(Debug.debug){ + console.log("[uw-bg::_uwbg_registerVideo] request didn't come from currently active tab, ignoring"); + } + return; + } + + BgVars.hasVideos = true; + + // todo: change extension icon depending on whether there's a video on the page or not +} + +function _uwbg_rcvmsg(message, sender, sendResponse){ if(Debug.debug){ - console.log("[uw-bg::_uwbg_rcvmsg] received message", message); + console.log("[uw-bg::_uwbg_rcvmsg] received message", message, "from sender", sender); } message.sender = "uwbg"; message.receiver = "uw"; if(message.cmd == "has-videos"){ - var response = await sendMessage(message); - if(Debug.debug){ - console.log("[uw-bg::_uwbg_rcvmsg] received response for message", message, "response is this -->", response); + console.log("[uw-bg::_uwbg_rcvmsg] does this tab or any of its subframes have videos?", BgVars.hasVideos ); } - - return Promise.resolve(response); + + var res = {response: {hasVideos: BgVars.hasVideos}}; + if(BrowserDetect.firefox){ + return Promise.resolve(res); + } + sendResponse(res); + return true; } if(message.cmd == "get-config"){ @@ -49,64 +90,66 @@ async function _uwbg_rcvmsg(message){ config.arConf = {}; config.arConf.enabled_global = Settings.arDetect.enabled == "global"; - var keybinds = await Keybinds.fetch(); if(Debug.debug) console.log("[uw-bg::_uwbg_rcvmsg] Keybinds.fetch returned this:", keybinds); - config.keyboardShortcuts = keybinds; + config.keyboardShortcuts = BgVars.keyboardShortcuts; // predvidevajmo, da je enako. Če je drugače, bomo popravili ko dobimo odgovor // assume current is same as global & change that when you get response from content script config.arConf.enabled_current = Settings.arDetect.enabled == "global"; + + var res = {response: config} + if(BrowserDetect.firefox){ + return Promise.resolve(res); + } + sendMessage(res); + return true; + } + + if(message.cmd == "register-video"){ + // dobili smo sporočilce, ki pravi: "hej jaz imam video, naredi cahen" — ampak preden naredimo cahen, + // se je potrebno prepričati, da je sporočilce prišlo iz pravilnega zavihka. Trenutno odprt zavihek + // lahko dobimo to. ID zavihka, iz katerega je prišlo sporočilo, se skriva v sender.tab.id + // ~<><\\\][=================][///><>~ + // we got a message that says: "hey I have a video, make a mark or something" — but before we do the + // mark, we should check if the message has truly arrived from currently active tab. We can get the + // id of currently active tab here. ID of the sender tab is ‘hidden’ in sender.tab.id. - try{ - message.cmd = "get-ardetect-active"; - var response = await sendMessage(message); - if(Debug.debug){ - console.log("[uw-bg::_uwbg_rcvmsg] received response to get-ardetect-active!", {message: message, response: response}); - } - config.arConf.enabled_current = response.response.arDetect_active; - - } - catch(ex){ - if(Debug.debug) - console.log("%c[uw-bg::_uwbg_rcvmsg] there was something wrong with request for get-ardetect-active.", "color: #f00", ex); - } - - return Promise.resolve({response: config}); - } - else if(message.cmd == "force-ar"){ - sendMessage(message); // args: {cmd: string, newAr: number/"auto"} - } - else if(message.cmd == "stop-autoar"){ - sendMessage(message); - } - else if(message.cmd == "force-video-float"){ - if(message.global){ - Settings.miscFullscreenSettings.videoFloat = message.newFloat; - sendMessage(message); - } - else{ - sendMessage(message); - } - } - - else if(message.cmd == "disable-autoar"){ - Settings.arDetect.enabled = "no"; - Settings.save(); - sendMessage("reload-settings"); - } - else if(message.cmd == "disable-autoar-whitelist-only"){ - Settings.arDetect.enabled = "whitelist"; - Settings.save(); - sendMessage("reload-settings"); - } - else if(message.cmd == "enable-autoar"){ - Settings.arDetect.enabled = "global"; - Settings.save(); - sendMessage("reload-settings"); + _uwbg_registerVideo(sender.tab.id); } +// else if(message.cmd == "force-ar"){ +// sendMessage(message); // args: {cmd: string, newAr: number/"auto"} +// } +// else if(message.cmd == "stop-autoar"){ +// sendMessage(message); +// } +// else if(message.cmd == "force-video-float"){ +// if(message.global){ +// Settings.miscFullscreenSettings.videoFloat = message.newFloat; +// sendMessage(message); +// } +// else{ +// sendMessage(message); +// } +// } +// +// else if(message.cmd == "disable-autoar"){ +// Settings.arDetect.enabled = "no"; +// Settings.save(); +// sendMessage("reload-settings"); +// } +// else if(message.cmd == "disable-autoar-whitelist-only"){ +// Settings.arDetect.enabled = "whitelist"; +// Settings.save(); +// sendMessage("reload-settings"); +// } +// else if(message.cmd == "enable-autoar"){ +// Settings.arDetect.enabled = "global"; +// Settings.save(); +// sendMessage("reload-settings"); +// } } diff --git a/js/uw.js b/js/uw.js index 9bc7f0c..d04bb9a 100644 --- a/js/uw.js +++ b/js/uw.js @@ -99,8 +99,10 @@ function ghettoOnChange(){ if(GlobalVars.video === null){ var video = document.getElementsByTagName("video")[0]; - if(video !== undefined) + if(video !== undefined){ GlobalVars.video = video; + Comms.sendToBackgroundScript({"cmd":"register-video"}); + } } } diff --git a/res/popup/js/popup.js b/res/popup/js/popup.js index 6b2b0ee..98ec181 100644 --- a/res/popup/js/popup.js +++ b/res/popup/js/popup.js @@ -66,19 +66,15 @@ async function sendMessage(message){ function check4videos(){ - Comms.sendToEach({cmd: "has-videos"}) - .then(responses => { + Comms.sendToBackgroundScript({cmd: "has-videos"}) + .then(response => { if(Debug.debug){ - console.log("[popup.js::check4videos] received responses:",responses); - for(response of responses){ - console.log(response.response); - } + console.log("[popup.js::check4videos] received response:",response, "has video?", response.response); + } + if(response.response.hasVideos){ + hasVideos = true; + openMenu(selectedMenu); } - -// if(response.response.hasVideos){ -// hasVideos = true; -// openMenu(selectedMenu); -// } }) .catch(error => { if(Debug.debug) @@ -90,7 +86,7 @@ function check4videos(){ function check4conf(){ - sendMessage({cmd: "get-config"}) + sendToBackgroundScript({cmd: "get-config"}) .then(response => { if(Debug.debug) console.log("[popup.js::check4conf] received response:",response, response.response);