调整纪录清除代码

Author: cyfung1031

src/app/cache.ts

@@ -81,6 +81,19 @@ class ExtCache implements CacheStorage {
     });
   }
 
+  dels(keys: string[]): Promise<void> {
+    return new Promise((resolve) => {
+      chrome.storage.session.remove(keys, () => {
+        const lastError = chrome.runtime.lastError;
+        if (lastError) {
+          console.error("chrome.runtime.lastError in chrome.storage.session.remove:", lastError);
+          // 无视storage API错误，继续执行
+        }
+        resolve();
+      });
+    });
+  }
+
   clear(): Promise<void> {
     return new Promise((resolve) => {
       chrome.storage.session.clear(() => {

src/app/service/service_worker/script.ts

@@ -219,14 +219,6 @@ export class ScriptService {
     const uuid = uuidv4();
     try {
       await this.openUpdateOrInstallPage(uuid, url, source, false);
-      timeoutExecution(
-        `${cIdKey}_cleanup_${uuid}`,
-        () => {
-          // 清理缓存
-          cacheInstance.del(`${CACHE_KEY_SCRIPT_INFO}${uuid}`);
-        },
-        30 * 1000
-      );
       return `/src/install.html?uuid=${uuid}`;
     } catch (err: any) {
       console.error(err);

src/pages/install/App.tsx

@@ -146,6 +146,50 @@ const fetchScriptBody = async (url: string, { onProgress }: { [key: string]: any
   return { code, metadata };
 };
 
+const cleanupStaleInstallInfo = (uuid: string) => {
+  // 頁面打開時不清除當前uuid，每30秒更新一次記錄
+  const f = () => {
+    cacheInstance.tx(`scriptInfoKeeps`, (val: Record<string, number> | undefined, tx) => {
+      val = val || {};
+      val[uuid] = Date.now();
+      tx.set(val);
+    });
+  };
+  f();
+  setInterval(f, 30_000);
+
+  // 頁面打開後清除舊記錄
+  const delay = Math.floor(5000 * Math.random()) + 10000; // 使用乱数时间避免瀏览器重啟时大量Tabs同时执行清除
+  timeoutExecution(
+    `${cIdKey}cleanupStaleInstallInfo`,
+    () => {
+      cacheInstance
+        .tx(`scriptInfoKeeps`, (val: Record<string, number> | undefined, tx) => {
+          const now = Date.now();
+          const keeps = new Set<string>();
+          const out: Record<string, number> = {};
+          for (const [k, ts] of Object.entries(val ?? {})) {
+            if (ts > 0 && now - ts < 60_000) {
+              keeps.add(`${CACHE_KEY_SCRIPT_INFO}${k}`);
+              out[k] = ts;
+            }
+          }
+          tx.set(out);
+          return keeps;
+        })
+        .then(async (keeps) => {
+          const list = await cacheInstance.list();
+          const filtered = list.filter((key) => key.startsWith(CACHE_KEY_SCRIPT_INFO) && !keeps.has(key));
+          if (filtered.length) {
+            // 清理缓存
+            cacheInstance.dels(filtered);
+          }
+        });
+    },
+    delay
+  );
+};
+
 const cIdKey = `(cid_${Math.random()})`;
 
 function App() {
@@ -198,8 +242,14 @@ function App() {
         return;
       }
 
+      if (window.history.length > 1) {
+        setDoBackwards(true);
+      }
+      setLoaded(true);
+
       if (uuid) {
         const cachedInfo = await scriptClient.getInstallInfo(uuid);
+        cleanupStaleInstallInfo(uuid);
         if (cachedInfo?.[0]) isKnownUpdate = true;
         info = cachedInfo?.[1] || undefined;
         if (!info) {
@@ -261,10 +311,6 @@ function App() {
         }
         diffCode = prepare.oldScriptCode;
       }
-      if (window.history.length > 1) {
-        setDoBackwards(true);
-      }
-      setLoaded(true);
       setScriptCode(code);
       setDiffCode(diffCode);
       setOldScriptVersion(typeof oldVersion === "string" ? oldVersion : null);