From e1fa0340747f8e398c2529994a27fcabe39f608b Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 31 Jan 2024 18:55:22 +0100 Subject: [PATCH 1/3] Add background script to reload on load. Painful fix --- src/background.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/background.ts diff --git a/src/background.ts b/src/background.ts new file mode 100644 index 0000000..1b79798 --- /dev/null +++ b/src/background.ts @@ -0,0 +1,13 @@ +import { isChrome } from '~utils/extension'; + +// Both brave and firefox for some reason need this extension reload, +// If this isn't done, they will never load properly and will fail updateDynamicRules() +if (isChrome()) { + chrome.runtime.onStartup.addListener(() => { + chrome.runtime.reload(); + }); +} else { + browser.runtime.onStartup.addListener(() => { + browser.runtime.reload(); + }); +} From 9f34642a963789a389f2ca60205672761dd8b6d8 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 31 Jan 2024 18:55:34 +0100 Subject: [PATCH 2/3] Add some logging and use full urls --- src/background/messages/makeRequest.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts index cd778a8..bdc16fa 100644 --- a/src/background/messages/makeRequest.ts +++ b/src/background/messages/makeRequest.ts @@ -49,19 +49,20 @@ const mapBodyToFetchBody = (body: Request['body'], bodyType: Request['bodyType'] const handler: PlasmoMessaging.MessageHandler> = async (req, res) => { try { + const url = makeFullUrl(req.body.url, req.body); await assertDomainWhitelist(req.sender.tab.url); if (req.body.headers['User-Agent']) { await setDynamicRules({ ruleId: MAKE_REQUEST_DYNAMIC_RULE, - targetDomains: [new URL(req.body.url).hostname], + targetDomains: [new URL(url).hostname], requestHeaders: { 'User-Agent': req.body.headers['User-Agent'], }, }); } - const response = await fetch(makeFullUrl(req.body.url, req.body), { + const response = await fetch(url, { method: req.body.method, headers: req.body.headers, body: mapBodyToFetchBody(req.body.body, req.body.bodyType), @@ -80,6 +81,7 @@ const handler: PlasmoMessaging.MessageHandler> = async (r }, }); } catch (err) { + console.error('failed request', err); res.send({ success: false, error: err.message, From 08f8fbbcfd4081a56f250812b48052f119bfe47f Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 31 Jan 2024 20:05:46 +0100 Subject: [PATCH 3/3] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14f0747..1134e5a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@movie-web/extension", "displayName": "movie-web extension", - "version": "1.0.2", + "version": "1.0.3", "description": "Enhance your movie-web experience with just one click", "author": "movie-web", "scripts": {