chore: post-review cleanup + subtitle fail-safe and import reliability

.gitignore

@@ -4,6 +4,7 @@ node_modules/
 .next/
 test-results/
 dist/
+packages/web/out/
 *.log
 
 # OS

packages/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkah/extension",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Chinese & Korean pop-up dictionary browser extension",
   "private": true,
   "type": "module",
@@ -18,8 +18,6 @@
   "dependencies": {
     "classnames": "^2.5.1",
     "dexie": "^4.0.0",
-    "effector": "^23.4.4",
-    "effector-react": "^23.3.0",
     "file-saver": "^2.0.5",
     "lucide-react": "^1.7.0",
     "react": "^19.2.0",
@@ -33,6 +31,7 @@
     "@wxt-dev/module-react": "^1.1.0",
     "autoprefixer": "^10.4.17",
     "fake-indexeddb": "^6.0.0",
+    "happy-dom": "^20.11.1",
     "postcss": "^8.5.0",
     "sass": "^1.88.0",
     "tailwindcss": "^3.4.1",

packages/extension/src/data/dict-cache.ts

@@ -11,6 +11,19 @@ const kedictCache = new Map<string, DictEntry | null>();
 const viconCache = new Map<string, DictEntry | null>();
 const lemmaCache = new Map<string, LemmaEntry | null>();
 
+/**
+ * Drop all read-through caches. Must be called after a dictionary import
+ * completes: lookups served DURING an in-progress import cache misses as
+ * `null`, and those negative entries would otherwise shadow the freshly
+ * imported data until the service worker restarts.
+ */
+export function clearDictionaryCaches(): void {
+  cedictCache.clear();
+  kedictCache.clear();
+  viconCache.clear();
+  lemmaCache.clear();
+}
+
 export async function getCedict(key: string): Promise<DictEntry | undefined> {
   if (cedictCache.has(key)) return cedictCache.get(key) ?? undefined;
   const entry = await db.cedict.get(key);

packages/extension/src/data/import-dictionaries.ts

@@ -1,4 +1,5 @@
 import { db } from './schema';
+import { clearDictionaryCaches } from './dict-cache';
 import { csvToJson, csvToTags } from '../lib/csv-utils';
 import AvailableLanguages from '../lib/available-languages';
 
@@ -160,14 +161,28 @@ async function importKoreanDicts(progress: ImportProgress): Promise<void> {
   }
 }
 
-export async function importDictionariesIfNeeded(): Promise<void> {
+// Guard against concurrent runs (onInstalled + service worker startup
+// can both trigger an import attempt)
+let importInFlight: Promise<void> | null = null;
+
+export function importDictionariesIfNeeded(): Promise<void> {
+  if (!importInFlight) {
+    importInFlight = doImport().finally(() => {
+      importInFlight = null;
+    });
+  }
+  return importInFlight;
+}
+
+async function doImport(): Promise<void> {
   const progress = await getImportProgress();
   if (progress.version >= IMPORT_VERSION) {
-    console.log('[inkah] Dictionaries already imported');
     return;
   }
 
-  // Import preferred language first, then the other
+  // Import preferred language first, then the other.
+  // MV3 service workers can be killed mid-import — per-table progress
+  // flags let the next startup resume where this run left off.
   const langResult = await chrome.storage.local.get(['targetLanguage']);
   const preferred: SupportedLanguages = langResult.targetLanguage ?? 'zh';
 
@@ -182,5 +197,11 @@ export async function importDictionariesIfNeeded(): Promise<void> {
   }
 
   await updateImportProgress({ version: IMPORT_VERSION });
+
+  // Lookups served while the import was running cached their misses as
+  // negative entries — drop them so the imported data is visible now
+  // rather than after the next service worker restart.
+  clearDictionaryCaches();
+
   console.log('[inkah] Dictionary import complete!');
 }

packages/extension/src/entrypoints/background.ts

@@ -27,11 +27,18 @@ export default defineBackground(() => {
     }
   });
 
-  // Warm the IndexedDB cache on every service worker startup
-  // (service workers are ephemeral in MV3 — this runs each time one spins up)
-  warmDictionaryCache().catch((err) => {
-    console.warn('[inkah] Cache warm failed (dicts may not be imported yet):', err);
-  });
+  // On every service worker startup: resume any incomplete dictionary
+  // import (MV3 workers can be killed mid-import — onInstalled alone
+  // never retries), then warm the in-memory cache.
+  importDictionariesIfNeeded()
+    .catch((err) => {
+      console.error('[inkah] Dictionary import failed:', err);
+    })
+    .finally(() => {
+      warmDictionaryCache().catch((err) => {
+        console.warn('[inkah] Cache warm failed (dicts may not be imported yet):', err);
+      });
+    });
 
   // Message handler for content scripts and popup
   chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {

packages/extension/src/entrypoints/content.ts

@@ -573,6 +573,11 @@ export default defineContentScript({
         topPos = anchorBottom + gap;
       }
 
+      // Final clamp — never let the popup extend past the viewport edges
+      const actualWidth = popup.offsetWidth;
+      leftPos = Math.max(8, Math.min(leftPos, viewWidth - actualWidth - 8));
+      topPos = Math.max(8, Math.min(topPos, viewHeight - popupHeight - 8));
+
       popup.style.left = `${leftPos}px`;
       popup.style.top = `${topPos}px`;
     }
@@ -763,7 +768,9 @@ export default defineContentScript({
             lockedRangeNode = result.rangeNode;
             lockedRangeOffset = result.rangeOffset;
             lastPopup = createPopupElement(definitions, result.rect);
-            document.body.appendChild(lastPopup);
+            // Append inside the fullscreen element when active — nodes outside
+          // it don't render while fullscreen
+          ((document.fullscreenElement as HTMLElement | null) ?? document.body).appendChild(lastPopup);
             positionPopup(lastPopup);
 
             // Highlight the matched word in the text (old code's setHoverSelection)
@@ -822,7 +829,9 @@ export default defineContentScript({
         showPopup: (definitions: WordDefinitions[], rect: DOMRect) => {
           removePopup();
           lastPopup = createPopupElement(definitions, rect);
-          document.body.appendChild(lastPopup);
+          // Append inside the fullscreen element when active — nodes outside
+          // it don't render while fullscreen
+          ((document.fullscreenElement as HTMLElement | null) ?? document.body).appendChild(lastPopup);
           positionPopup(lastPopup);
         },
         removePopup,
@@ -875,7 +884,9 @@ export default defineContentScript({
           const rect = range.getBoundingClientRect();
           removePopup();
           lastPopup = createPopupElement(definitions, rect);
-          document.body.appendChild(lastPopup);
+          // Append inside the fullscreen element when active — nodes outside
+          // it don't render while fullscreen
+          ((document.fullscreenElement as HTMLElement | null) ?? document.body).appendChild(lastPopup);
           positionPopup(lastPopup);
         }
       } catch {}