Support reader more in Firefox

This was a feature request at https://kagifeedback.org/d/2558-summarizer-doesnt-work-when-firefox-reader-mode-is-active This also updates [`rome` to `biome`](https://biomejs.dev/blog/annoucing-biome/) and adds an inline message/solution for [this error when saving a token](https://kagifeedback.org/d/2206-extension-not-logging-in-to-search-in-ubuntu-firefox-private-window/21).
kagisearch · Dec 6, 2023 · be39ce0 · be39ce0
1 parent a64f4db
commit be39ce0
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 76 deletions.
diff --git a/rome.json → biome.json b/rome.json → biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://docs.rome.tools/schemas/12.1.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.4.1/schema.json",
   "organizeImports": {
     "enabled": false
   },
@@ -11,14 +11,15 @@
     "rules": {
       "recommended": true,
       "complexity": {
-        "noExtraBooleanCast": "off"
+        "noExtraBooleanCast": "off",
+        "noForEach": "off"
       }
     }
   },
   "formatter": {
     "enabled": true,
     "indentStyle": "space",
-    "indentSize": 2
+    "indentWidth": 2
   },
   "javascript": {
     "formatter": {

diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Kagi Search for Chrome",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A simple extension for setting Kagi as a default search engine, and automatically logging in to Kagi in incognito browsing windows",
   "background": {
     "service_worker": "src/background.js",

diff --git a/firefox/manifest.json b/firefox/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Kagi Search for Firefox",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A simple helper extension for setting Kagi as a default search engine, and automatically logging in to Kagi in incognito browsing windows.",
   "background": {
     "page": "src/background_page.html"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     "build": "npm run build-firefox && npm run build-chrome",
     "build-firefox": "node build.js firefox",
     "build-chrome": "node build.js chrome",
-    "format": "rome format --write . && rome check --apply .",
-    "lint": "rome check .",
+    "format": "biome format --write . && biome check --apply .",
+    "lint": "biome check .",
     "test": "npm run lint"
   },
   "repository": {
@@ -25,9 +25,9 @@
   },
   "homepage": "https://github.com/kagisearch/browser_extensions#readme",
   "devDependencies": {
+    "@biomejs/biome": "1.4.1",
     "adm-zip": "0.5.10",
-    "nodemon": "3.0.1",
-    "rome": "12.1.3"
+    "nodemon": "3.0.1"
   },
   "engines": {
     "node": "20.x",

diff --git a/shared/src/background.js b/shared/src/background.js
@@ -41,14 +41,24 @@ async function saveToken(
 
   syncSessionFromExisting = shouldSync;
 
-  await browser.storage.local.set({
-    session_token: token,
-    sync_existing: shouldSync,
-    api_token: sessionApiToken,
-    api_engine: sessionApiEngine,
-    summary_type: sessionSummaryType,
-    target_language: sessionTargetLanguage,
-  });
+  try {
+    await browser.storage.local.set({
+      session_token: token,
+      sync_existing: shouldSync,
+      api_token: sessionApiToken,
+      api_engine: sessionApiEngine,
+      summary_type: sessionSummaryType,
+      target_language: sessionTargetLanguage,
+    });
+  } catch (error) {
+    console.error(error);
+
+    await browser.runtime.sendMessage({
+      type: 'save-error',
+    });
+
+    return;
+  }
 
   await updateRules();
 
@@ -142,7 +152,7 @@ browser.webRequest.onBeforeRequest.addListener(
 browser.runtime.onMessage.addListener(async (data) => {
   switch (data.type) {
     case 'save_token': {
-      saveToken(data, true);
+      await saveToken(data, true);
       break;
     }
     case 'open_extension': {
@@ -158,7 +168,7 @@ browser.runtime.onMessage.addListener(async (data) => {
       break;
     }
     case 'summarize_page': {
-      summarizePage(data);
+      await summarizePage(data);
       break;
     }
     default:

diff --git a/shared/src/lib/utils.js b/shared/src/lib/utils.js
@@ -103,9 +103,8 @@ export async function fetchSettings() {
   const apiObject = await browser.storage.local.get('api_token');
   const apiEngineObject = await browser.storage.local.get('api_engine');
   const summaryTypeObject = await browser.storage.local.get('summary_type');
-  const targetLanguageObject = await browser.storage.local.get(
-    'target_language',
-  );
+  const targetLanguageObject =
+    await browser.storage.local.get('target_language');
 
   return {
     token: sessionObject?.session_token,
@@ -140,6 +139,11 @@ export async function getActiveTab(fetchingFromShortcut = false) {
         tab?.url?.startsWith('http://') || tab?.url?.startsWith('https://'),
     ) || tabs[0];
 
+  if (tab?.url?.startsWith('about:reader?url=')) {
+    const newUrl = new URL(tab.url);
+    tab.url = newUrl.searchParams.get('url');
+  }
+
   if (!tab || !tab.url) {
     console.error('No tab/url found.');
     console.error(JSON.stringify(tabs));

diff --git a/shared/src/popup.css b/shared/src/popup.css
@@ -116,7 +116,8 @@ input[type="password"]:focus {
 }
 
 #status_permission_message,
-#status_error_message {
+#status_error_message,
+#save_error {
   color: #fd6820;
 }
 

diff --git a/shared/src/popup.html b/shared/src/popup.html
@@ -161,6 +161,17 @@
           </div>
         </div>
 
+        <div class="setting_row" style="display: none" id="save_error">
+          <div>
+            <div class="title">
+              Error saving token!
+            </div>
+            <div class="desc">
+              It seems the extension isn't able to save the token. Please try disabling the "<span>Allow in Incognito</span>" toggle, saving the token, then enabling it again.
+            </div>
+          </div>
+        </div>
+
         <div class="setting_row">
           <button id="token_save">Save settings</button>
         </div>