From 62a1e565bb5723750d6958fc6952b3db7073d977 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Sun, 3 May 2020 17:09:31 +0100
Subject: [PATCH] Fix frameAncestors undefined error

---
 ext/src/background/background.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/src/background/background.ts b/ext/src/background/background.ts
index ae4f533..96002aa 100755
--- a/ext/src/background/background.ts
+++ b/ext/src/background/background.ts
@@ -471,7 +471,10 @@ async function initWhitelist () {
     logger.info("init (whitelist)");
 
     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 chromeUserAgent = getChromeUserAgent(
@@ -510,12 +513,10 @@ async function initWhitelist () {
     }
 
     function handleResourceRequests (details: OnBeforeSendHeadersDetails) {
-        if (!details.requestHeaders) {
+        if (!details.requestHeaders || !details.frameAncestors) {
             return;
         }
 
-        // @ts-ignore
-        // Another issue with @types/firefox-webext-browser
         for (const ancestor of details.frameAncestors) {
             if (originUrlCache.includes(ancestor.url)) {
                 for (const header of details.requestHeaders) {