From 79e8fc2fac69858321f6ad3f2b922e650eaeaefb Mon Sep 17 00:00:00 2001 From: TC Date: Tue, 12 Jan 2021 22:52:21 +0100 Subject: [PATCH 1/3] Fix downloader plugin with context isolation --- plugins/downloader/front.js | 44 ++++++++++++---------- plugins/downloader/templates/download.html | 2 +- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/plugins/downloader/front.js b/plugins/downloader/front.js index 0045928173..d235da65ef 100644 --- a/plugins/downloader/front.js +++ b/plugins/downloader/front.js @@ -1,3 +1,5 @@ +const { contextBridge } = require("electron"); + const { ElementFromFile, templatePath, triggerAction } = require("../utils"); const { ACTIONS, CHANNEL } = require("./actions.js"); const { downloadVideoToMP3 } = require("./youtube-dl"); @@ -28,26 +30,28 @@ const reinit = () => { } }; -global.download = () => { - const videoUrl = window.location.href; - - downloadVideoToMP3( - videoUrl, - (feedback) => { - if (!progress) { - console.warn("Cannot update progress"); - } else { - progress.innerHTML = feedback; - } - }, - (error) => { - triggerAction(CHANNEL, ACTIONS.ERROR, error); - reinit(); - }, - reinit, - pluginOptions - ); -}; +contextBridge.exposeInMainWorld("downloader", { + download: () => { + const videoUrl = window.location.href; + + downloadVideoToMP3( + videoUrl, + (feedback) => { + if (!progress) { + console.warn("Cannot update progress"); + } else { + progress.innerHTML = feedback; + } + }, + (error) => { + triggerAction(CHANNEL, ACTIONS.ERROR, error); + reinit(); + }, + reinit, + pluginOptions + ); + }, +}); function observeMenu(options) { pluginOptions = { ...pluginOptions, ...options }; diff --git a/plugins/downloader/templates/download.html b/plugins/downloader/templates/download.html index 138464fbc3..7f9ab3ceaf 100644 --- a/plugins/downloader/templates/download.html +++ b/plugins/downloader/templates/download.html @@ -4,7 +4,7 @@ tabindex="-1" aria-disabled="false" aria-selected="false" - onclick="download()" + onclick="downloader.download()" >
Date: Tue, 12 Jan 2021 22:54:04 +0100 Subject: [PATCH 2/3] Use contextBridge in preload script + update navigation plugin --- plugins/navigation/actions.js | 24 +++++++++++------------ plugins/navigation/back.js | 8 ++++---- plugins/navigation/templates/back.html | 2 +- plugins/navigation/templates/forward.html | 2 +- preload.js | 8 +++----- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/plugins/navigation/actions.js b/plugins/navigation/actions.js index 83947a632e..69c8536b79 100644 --- a/plugins/navigation/actions.js +++ b/plugins/navigation/actions.js @@ -1,24 +1,24 @@ -const { triggerAction } = require('../utils'); +const { triggerAction } = require("../utils"); const CHANNEL = "navigation"; const ACTIONS = { - NEXT: "next", - BACK: 'back', -} + NEXT: "next", + BACK: "back", +}; function goToNextPage() { - triggerAction(CHANNEL, ACTIONS.NEXT); + triggerAction(CHANNEL, ACTIONS.NEXT); } function goToPreviousPage() { - triggerAction(CHANNEL, ACTIONS.BACK); + triggerAction(CHANNEL, ACTIONS.BACK); } module.exports = { - CHANNEL: CHANNEL, - ACTIONS: ACTIONS, - global: { - goToNextPage: goToNextPage, - goToPreviousPage: goToPreviousPage, - } + CHANNEL: CHANNEL, + ACTIONS: ACTIONS, + actions: { + goToNextPage: goToNextPage, + goToPreviousPage: goToPreviousPage, + }, }; diff --git a/plugins/navigation/back.js b/plugins/navigation/back.js index 54ee18a77d..6d0d0a2a4d 100644 --- a/plugins/navigation/back.js +++ b/plugins/navigation/back.js @@ -1,23 +1,23 @@ const path = require("path"); const { injectCSS, listenAction } = require("../utils"); -const { ACTIONS, CHANNEL } = require("./actions.js"); +const { ACTIONS, CHANNEL } = require("./actions.js"); function handle(win) { injectCSS(win.webContents, path.join(__dirname, "style.css")); listenAction(CHANNEL, (event, action) => { switch (action) { - case ACTIONS.NEXT: + case ACTIONS.NEXT: if (win.webContents.canGoForward()) { win.webContents.goForward(); } break; - case ACTIONS.BACK: + case ACTIONS.BACK: if (win.webContents.canGoBack()) { win.webContents.goBack(); } break; - default: + default: console.log("Unknown action: " + action); } }); diff --git a/plugins/navigation/templates/back.html b/plugins/navigation/templates/back.html index 2a67516361..e37d2284c7 100644 --- a/plugins/navigation/templates/back.html +++ b/plugins/navigation/templates/back.html @@ -2,7 +2,7 @@ class="style-scope ytmusic-pivot-bar-renderer navigation-item" tab-id="FEmusic_back" role="tab" - onclick="goToPreviousPage()" + onclick="navigationActions.goToPreviousPage()" >