From a2647a58d639967d7ed1dd9e012c68851351421a Mon Sep 17 00:00:00 2001 From: Jorrin <43169049+JorrinKievit@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:38:04 +0100 Subject: [PATCH] cleanup and fix targetDomain --- src/background/messages/makeRequest.ts | 12 +++--------- src/background/messages/prepareStream.ts | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts index 4f221da..7cc44fd 100644 --- a/src/background/messages/makeRequest.ts +++ b/src/background/messages/makeRequest.ts @@ -12,7 +12,7 @@ type Body = value: string; } | { - bodyType: 'FormData' | 'URLSearchParams' | 'Object'; + bodyType: 'FormData' | 'URLSearchParams' | 'object'; value: Record; }; @@ -50,7 +50,7 @@ const mapBodyToFetchBody = (body: Request['body']): BodyInit => { }); return searchParams; } - if (body?.bodyType === 'Object') { + if (body?.bodyType === 'object') { return JSON.stringify(body.value); } if (body?.bodyType === 'string') { @@ -63,18 +63,14 @@ const handler: PlasmoMessaging.MessageHandler> = async (r try { await assertDomainWhitelist(req.sender.tab.url); - console.log(req.body.headers['User-Agent']); if (req.body.headers['User-Agent']) { - console.log('preparing stream'); await setDynamicRules({ ruleId: 23498, - targetDomains: [req.body.url], + targetDomains: [new URL(req.body.url).hostname], requestHeaders: { 'User-Agent': req.body.headers['User-Agent'], }, }); - const rules = await chrome.declarativeNetRequest.getDynamicRules(); - console.log(rules); } const response = await fetch(makeFullUrl(req.body.url, req.body), { @@ -95,8 +91,6 @@ const handler: PlasmoMessaging.MessageHandler> = async (r }, }); } catch (err) { - console.log('error'); - console.log(err); res.send({ success: false, error: err.message, diff --git a/src/background/messages/prepareStream.ts b/src/background/messages/prepareStream.ts index 688285d..2833433 100644 --- a/src/background/messages/prepareStream.ts +++ b/src/background/messages/prepareStream.ts @@ -21,7 +21,6 @@ const handler: PlasmoMessaging.MessageHandler = async (re success: true, }); } catch (err) { - console.log(err); res.send({ success: false, error: err.message,