Make error handling better

codecov · Oct 28, 2024 · 3030313 · 3030313
1 parent 8a4c236
commit 3030313
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/background/dynamic_content_scripts.ts b/src/background/dynamic_content_scripts.ts
@@ -41,8 +41,18 @@ export async function unregisterContentScriptIfExists(
     registrations = await browser.scripting.getRegisteredContentScripts({
       ids: [dynamicContentScriptRegistrationId],
     });
-  } catch (error) {
-    return true;
+  } catch (error: any) {
+    // Safari throws if the script id doesn't exist, so handle that gracefully
+    if (
+      error instanceof Error &&
+      error.message.match(
+        /Invalid call to scripting.getRegisteredContentScripts\(\)\. No script with ID '.*'/
+      )
+    ) {
+      return true;
+    } else {
+      throw error;
+    }
   }
 
   if (registrations.length === 0) {