Fix frameAncestors undefined error

This commit is contained in:
hensm
2020-05-03 17:09:31 +01:00
parent 11268d3748
commit 62a1e565bb

View File

@@ -471,7 +471,10 @@ async function initWhitelist () {
logger.info("init (whitelist)"); logger.info("init (whitelist)");
type OnBeforeSendHeadersDetails = Parameters<Parameters< type OnBeforeSendHeadersDetails = Parameters<Parameters<
typeof browser.webRequest.onBeforeSendHeaders.addListener>[0]>[0]; typeof browser.webRequest.onBeforeSendHeaders.addListener>[0]>[0] & {
// Missing on @types/firefox-webext-browser
frameAncestors?: Array<{ url: string, frameId: number }>
};
const originUrlCache: string[] = []; const originUrlCache: string[] = [];
const chromeUserAgent = getChromeUserAgent( const chromeUserAgent = getChromeUserAgent(
@@ -510,12 +513,10 @@ async function initWhitelist () {
} }
function handleResourceRequests (details: OnBeforeSendHeadersDetails) { function handleResourceRequests (details: OnBeforeSendHeadersDetails) {
if (!details.requestHeaders) { if (!details.requestHeaders || !details.frameAncestors) {
return; return;
} }
// @ts-ignore
// Another issue with @types/firefox-webext-browser
for (const ancestor of details.frameAncestors) { for (const ancestor of details.frameAncestors) {
if (originUrlCache.includes(ancestor.url)) { if (originUrlCache.includes(ancestor.url)) {
for (const header of details.requestHeaders) { for (const header of details.requestHeaders) {