extension: Allow this to work on Firefox when its eventually supported

ruffle-rs · Jun 14, 2024 · ce55ea5 · ce55ea5
1 parent 2190695
commit ce55ea5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/web/packages/extension/manifest_firefox.json5 b/web/packages/extension/manifest_firefox.json5
@@ -48,7 +48,8 @@
         "open_in_tab": true,
     },
     "permissions": [
-        "<all_urls>", // // To allow script injecting + the internal player to bypass CORS
+        "<all_urls>", // // To allow script injecting + the internal player to bypass CORS + SWF takeover
+        "declarativeNetRequest",
         "scripting",
         "storage"
     ],

diff --git a/web/packages/extension/src/background.ts b/web/packages/extension/src/background.ts
@@ -15,7 +15,9 @@ async function enable() {
             {
                 id: 1,
                 action: {
-                    type: chrome.declarativeNetRequest.RuleActionType.REDIRECT,
+                    type:
+                        chrome.declarativeNetRequest.RuleActionType?.REDIRECT ??
+                        "redirect",
                     redirect: { regexSubstitution: playerPage + "#\\0" },
                 },
                 condition: {
@@ -32,14 +34,17 @@ async function enable() {
                         },
                     ],
                     resourceTypes: [
-                        chrome.declarativeNetRequest.ResourceType.MAIN_FRAME,
+                        chrome.declarativeNetRequest.ResourceType?.MAIN_FRAME ??
+                            "main_frame",
                     ],
                 },
             },
             {
                 id: 2,
                 action: {
-                    type: chrome.declarativeNetRequest.RuleActionType.REDIRECT,
+                    type:
+                        chrome.declarativeNetRequest.RuleActionType?.REDIRECT ??
+                        "redirect",
                     redirect: { regexSubstitution: playerPage + "#\\0" },
                 },
                 condition: {
@@ -54,29 +59,39 @@ async function enable() {
                         },
                     ],
                     resourceTypes: [
-                        chrome.declarativeNetRequest.ResourceType.MAIN_FRAME,
+                        chrome.declarativeNetRequest.ResourceType?.MAIN_FRAME ??
+                            "main_frame",
                     ],
                 },
             },
             {
                 id: 3,
                 action: {
-                    type: chrome.declarativeNetRequest.RuleActionType.REDIRECT,
+                    type:
+                        chrome.declarativeNetRequest.RuleActionType?.REDIRECT ??
+                        "redirect",
                     redirect: { regexSubstitution: playerPage + "#\\0" },
                 },
                 condition: {
                     regexFilter: "^.*\\.s(?:wf|pl)(\\?.*|#.*|)$",
                     excludedResponseHeaders: [{ header: "content-type" }],
                     resourceTypes: [
-                        chrome.declarativeNetRequest.ResourceType.MAIN_FRAME,
+                        chrome.declarativeNetRequest.ResourceType?.MAIN_FRAME ??
+                            "main_frame",
                     ],
                 },
             },
         ];
-        await utils.declarativeNetRequest.updateDynamicRules({
-            removeRuleIds: [1, 2, 3],
-            addRules: rules,
-        });
+        try {
+            await utils.declarativeNetRequest.updateDynamicRules({
+                removeRuleIds: [1, 2, 3],
+                addRules: rules,
+            });
+        } catch (e) {
+            console.info(
+                "Failed to register rules: responseHeaders condition unsupported",
+            );
+        }
     }
     if (
         !utils.scripting ||