Parallel sync/async for best effort policy fetching under any circums…

…tance.
hackademix · Feb 10, 2022 · 0942a8a · 0942a8a
1 parent b0a870c
commit 0942a8a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/src/bg/main.js b/src/bg/main.js
@@ -212,7 +212,7 @@
 
   function onSyncMessage(msg, sender) {
     switch(msg.id) {
-      case "fetchPolicy":
+      case "fetchChildPolicy":
         return messageHandler.fetchChildPolicy(msg, sender);
       break;
     }

diff --git a/src/content/staticNS.js b/src/content/staticNS.js
@@ -90,21 +90,44 @@
         // extra hops to ensure that scripts don't run when CSP has not been set through HTTP headers
         this.syncFetchPolicy();
       } else {
-        let msg = {id: "fetchPolicy", url, contextUrl: url};
-        debug(`Synchronously fetching policy for ${url}.`);
-        let policy = browser.runtime.sendSyncMessage(msg);
-        if (!policy) {
-          debug(`Couldn't retrieve policy synchronously, trying async.`);
-          (async () => this.setup(await browser.runtime.sendMessage(msg)))();
-        } else {
+        let msg = {id: "fetchChildPolicy", url, contextUrl: url};
+
+        let asyncFetch = (async () => {
+          let policy = null;
+          for (let attempts = 10; !(policy || this.policy) && attempts-- > 0;) {
+            try {
+              debug(`Retrieving policy asynchronously (${attempts} attempts left).`);
+              policy = await Messages.send(msg.id, msg) || this.domPolicy;
+              debug("Asynchronous policy", policy);
+            } catch (e) {
+              error(e, "(Asynchronous policy fetch)");
+            }
+          }
           this.setup(policy);
-        }
+        });
+        debug(`Synchronously fetching policy for ${url}.`);
+        let policy = null;
+        let attempts = 100;
+        let refetch = () => {
+          policy = browser.runtime.sendSyncMessage(msg) || this.domPolicy;
+          if (policy) {
+            this.setup(policy);
+          } else if (attempts-- > 0) {
+            debug(`Couldn't retrieve policy synchronously (${attempts} attempts left).`);
+            if (asyncFetch) {
+              asyncFetch();
+              asyncFetch = null;
+            }
+            queueMicrotask(refetch);
+          }
+        };
+        refetch();
       }
     },
 
     setup(policy) {
       if (this.policy) return false;
-      debug("%s, %s, fetched %o", document.URL, document.readyState, policy);
+      debug("%s, %s, fetched %o", document.URL, document.readyState, policy, new Error().stack); // DEV_ONLY
       if (!policy) {
         policy = {permissions: {capabilities: []}, localFallback: true};
       }