cleanup preparestream

This commit is contained in:
Jorrin
2024-01-12 20:15:34 +01:00
parent ad32ab8909
commit 854e4361ee

View File

@@ -26,8 +26,6 @@ const mapHeadersToDeclarativeNetRequestHeaders = (
const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (req, res) => { const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (req, res) => {
try { try {
await assertDomainWhitelist(req.sender.tab.url); await assertDomainWhitelist(req.sender.tab.url);
console.log(req.body);
let rules: any;
if (isChrome()) { if (isChrome()) {
await chrome.declarativeNetRequest.updateDynamicRules({ await chrome.declarativeNetRequest.updateDynamicRules({
removeRuleIds: [req.body.ruleId], removeRuleIds: [req.body.ruleId],
@@ -35,8 +33,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
{ {
id: req.body.ruleId, id: req.body.ruleId,
condition: { condition: {
// TODO: Fix this idk why it doesn't work from fetcher requests requestDomains: req.body.targetDomains,
// requestDomains: req.body.targetDomains,
}, },
action: { action: {
type: chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS, type: chrome.declarativeNetRequest.RuleActionType.MODIFY_HEADERS,
@@ -73,7 +70,6 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
}, },
], ],
}); });
rules = await chrome.declarativeNetRequest.getDynamicRules();
if (chrome.runtime.lastError?.message) throw new Error(chrome.runtime.lastError.message); if (chrome.runtime.lastError?.message) throw new Error(chrome.runtime.lastError.message);
} else { } else {
await browser.declarativeNetRequest.updateDynamicRules({ await browser.declarativeNetRequest.updateDynamicRules({
@@ -82,7 +78,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
{ {
id: req.body.ruleId, id: req.body.ruleId,
condition: { condition: {
// requestDomains: req.body.targetDomains, requestDomains: req.body.targetDomains,
}, },
action: { action: {
type: 'modifyHeaders', type: 'modifyHeaders',
@@ -113,15 +109,11 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
}, },
], ],
}); });
rules = await browser.declarativeNetRequest.getDynamicRules();
if (browser.runtime.lastError?.message) throw new Error(browser.runtime.lastError.message); if (browser.runtime.lastError?.message) throw new Error(browser.runtime.lastError.message);
} }
res.send({ res.send({
success: true, success: true,
// @ts-expect-error TODO: remove this when debugging is done :D
body: req.body,
rules,
}); });
} catch (err) { } catch (err) {
res.send({ res.send({