From 0833ed83461c9c0e35d549e931418b817d657784 Mon Sep 17 00:00:00 2001
From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com>
Date: Sat, 28 Mar 2026 19:10:06 +0900
Subject: [PATCH 1/8] =?UTF-8?q?Breaking:=20=E4=BB=A5=20OPFS=20=E5=82=A8?=
 =?UTF-8?q?=E5=AD=98=20Code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/migrate.ts                            | 15 ++-
 src/app/repo/scripts.ts                       | 91 +++++++++++++++----
 src/app/service/service_worker/runtime.ts     |  7 +-
 src/app/service/service_worker/script.ts      |  6 +-
 src/app/service/service_worker/subscribe.ts   |  2 +-
 src/app/service/service_worker/synchronize.ts |  5 +-
 .../components/CloudScriptPlan/index.tsx      |  4 +-
 .../options/routes/script/ScriptEditor.tsx    |  6 +-
 src/pkg/utils/script.ts                       |  4 +-
 9 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/src/app/migrate.ts b/src/app/migrate.ts
index 63244e79e..ff9d25b2f 100644
--- a/src/app/migrate.ts
+++ b/src/app/migrate.ts
@@ -1,7 +1,7 @@
 import { getStorageName } from "@App/pkg/utils/utils";
 import { db } from "./repo/dao";
 import type { Script, ScriptAndCode } from "./repo/scripts";
-import { ScriptCodeDAO, ScriptDAO } from "./repo/scripts";
+import { ScriptCodeDAO, ScriptCodeDAONew, ScriptDAO } from "./repo/scripts";
 import type { Subscribe } from "./repo/subscribe";
 import { SubscribeDAO } from "./repo/subscribe";
 import type { Value } from "./repo/value";
@@ -19,7 +19,7 @@ export function migrateToChromeStorage() {
       // 迁移脚本
       const scripts = await db.table("scripts").toArray();
       const scriptDAO = new ScriptDAO();
-      const scriptCodeDAO = new ScriptCodeDAO();
+      const scriptCodeDAO = new ScriptCodeDAONew();
       console.log("开始迁移脚本数据", scripts.length);
       await Promise.all(
         // 不处理 Promise.reject ?
@@ -267,6 +267,17 @@ export function migrateChromeStorage() {
         );
       },
     },
+    {
+      version: 2,
+      upgrade: async () => {
+        // 修复之前originDomain字段错误的数据
+        const scriptCodeDAO = new ScriptCodeDAO();
+        const scriptCodeDAONew = new ScriptCodeDAONew();
+        const scriptCodes = await scriptCodeDAO.all();
+        await Promise.all(scriptCodes.map(async (scriptCode) => scriptCodeDAONew.save(scriptCode)));
+        await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
+      },
+    },
   ];
   const localstorageDAO = new LocalStorageDAO();
   localstorageDAO.get("migrations").then(async (item) => {
diff --git a/src/app/repo/scripts.ts b/src/app/repo/scripts.ts
index 6fcc2b86f..11489ea38 100644
--- a/src/app/repo/scripts.ts
+++ b/src/app/repo/scripts.ts
@@ -147,33 +147,18 @@ export type TClientPageLoadInfo =
   | { ok: false };
 
 export class ScriptDAO extends Repo<Script> {
-  scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
-
   constructor() {
     super("script");
   }
 
   enableCache(): void {
     super.enableCache();
-    this.scriptCodeDAO.enableCache();
   }
 
   public save(val: Script) {
     return super._save(val.uuid, val);
   }
 
-  findByUUID(uuid: string) {
-    return this.get(uuid);
-  }
-
-  async getAndCode(uuid: string): Promise<ScriptAndCode | undefined> {
-    const [script, code] = await Promise.all([this.get(uuid), this.scriptCodeDAO.get(uuid)]);
-    if (!script || !code) {
-      return undefined;
-    }
-    return Object.assign(script, code);
-  }
-
   public findByName(name: string) {
     return this.findOne((key, value) => {
       return value.name === name;
@@ -298,11 +283,79 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
     super("scriptCode");
   }
 
-  findByUUID(uuid: string) {
-    return this.get(uuid);
-  }
-
   public save(val: ScriptCode) {
     return super._save(val.uuid, val);
   }
 }
+
+// 不能 extends Repo<ScriptCode>. 沒有 dao.gets()
+export class ScriptCodeDAONew {
+  _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
+  static getDirHandle(): Promise<FileSystemDirectoryHandle> {
+    return navigator.storage
+      .getDirectory()
+      .then((opfsRoot) => opfsRoot.getDirectoryHandle("storage_script_codes", { create: true }));
+  }
+  public async save(val: ScriptCode) {
+    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
+    const folder = await this._dirHandlePromise;
+    const handle = await folder.getFileHandle(`${val.uuid}.user.js`, { create: true });
+    const writable = await handle.createWritable({ keepExistingData: false });
+    await writable.write(val.code);
+    await writable.close();
+  }
+  public async delete(uuid: string) {
+    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
+    const folder = await this._dirHandlePromise;
+    try {
+      await folder.removeEntry(`${uuid}.user.js`);
+    } catch {
+      // ignore delete failure. e.g. no file
+    }
+  }
+  public async get(uuid: string): Promise<ScriptCode> {
+    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
+    const folder = await this._dirHandlePromise;
+    let code: string = "";
+    let handle: FileSystemFileHandle;
+    try {
+      handle = await folder.getFileHandle(`${uuid}.user.js`, { create: false });
+    } catch {
+      // no file -> empty code
+      return {
+        uuid,
+        code,
+      };
+    }
+    code = await handle.getFile().then((f) => f.text());
+    return { uuid, code };
+  }
+  public async deletes(uuids: string[]) {
+    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
+    const folder = await this._dirHandlePromise;
+    await Promise.all(
+      uuids.map(async (uuid) => {
+        try {
+          await folder.removeEntry(`${uuid}.user.js`);
+        } catch {
+          // ignore delete failure. e.g. no file
+        }
+      })
+    );
+  }
+  public async gets(uuids: string[]): Promise<(ScriptCode | undefined)[]> {
+    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
+    const folder = await this._dirHandlePromise;
+    return Promise.all(
+      uuids.map(async (uuid) => {
+        try {
+          const handle = await folder.getFileHandle(`${uuid}.user.js`, { create: false });
+          const code = await handle.getFile().then((f) => f.text());
+          return { uuid, code };
+        } catch {
+          return undefined;
+        }
+      })
+    );
+  }
+}
diff --git a/src/app/service/service_worker/runtime.ts b/src/app/service/service_worker/runtime.ts
index 8ddc0dc00..e0a751014 100644
--- a/src/app/service/service_worker/runtime.ts
+++ b/src/app/service/service_worker/runtime.ts
@@ -2,7 +2,7 @@ import type { EmitEventRequest, ScriptLoadInfo, ScriptMatchInfo, ScriptMenu } fr
 import type { IMessageQueue } from "@Packages/message/message_queue";
 import type { Group, IGetSender } from "@Packages/message/server";
 import type { ExtMessageSender, MessageSend } from "@Packages/message/types";
-import type { TClientPageLoadInfo } from "@App/app/repo/scripts";
+import { ScriptCodeDAONew, type TClientPageLoadInfo } from "@App/app/repo/scripts";
 import type { Script, ScriptDAO, ScriptRunResource, ScriptSite, TScriptInfo } from "@App/app/repo/scripts";
 import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, SCRIPT_TYPE_NORMAL } from "@App/app/repo/scripts";
 import { type ValueService } from "./value";
@@ -128,6 +128,7 @@ export class RuntimeService {
   initialCompiledResourcePromise: Promise<any> | undefined;
 
   compiledResourceDAO: CompiledResourceDAO = new CompiledResourceDAO();
+  private readonly scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
 
   constructor(
     private systemConfig: SystemConfig,
@@ -1245,7 +1246,7 @@ export class RuntimeService {
       }
     }
 
-    const { value, resource, scriptDAO } = this;
+    const { value, resource, scriptCodeDAO } = this;
     await Promise.all(
       enableScriptList.flatMap((script) => [
         // 加载value
@@ -1265,7 +1266,7 @@ export class RuntimeService {
           }
         }),
         // 加载code相关的信息
-        scriptDAO.scriptCodeDAO.get(script.uuid).then((code) => {
+        scriptCodeDAO.get(script.uuid).then((code) => {
           if (code) {
             const metadataStr = getMetadataStr(code.code) || "";
             const userConfigStr = getUserConfigStr(code.code) || "";
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index baf968383..a3eaaba3c 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -21,7 +21,7 @@ import type {
   ScriptRunResource,
   ScriptSite,
 } from "@App/app/repo/scripts";
-import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAO } from "@App/app/repo/scripts";
+import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAONew } from "@App/app/repo/scripts";
 import { type IMessageQueue } from "@Packages/message/message_queue";
 import { createScriptInfo, type ScriptInfo, type InstallSource } from "@App/pkg/utils/scriptInstall";
 import { type ResourceService } from "./resource";
@@ -69,7 +69,7 @@ export type TScriptInstallReturn = {
 
 export class ScriptService {
   logger: Logger;
-  scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
+  scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
   localStorageDAO: LocalStorageDAO = new LocalStorageDAO();
   compiledResourceDAO: CompiledResourceDAO = new CompiledResourceDAO();
   private readonly scriptUpdateCheck;
@@ -83,7 +83,7 @@ export class ScriptService {
     private readonly scriptDAO: ScriptDAO
   ) {
     this.logger = LoggerCore.logger().with({ service: "script" });
-    this.scriptCodeDAO.enableCache();
+    // this.scriptCodeDAO.enableCache();
     this.scriptUpdateCheck = new ScriptUpdateCheck(systemConfig, group, mq, valueService, resourceService, scriptDAO);
   }
 
diff --git a/src/app/service/service_worker/subscribe.ts b/src/app/service/service_worker/subscribe.ts
index 5ec19875a..2215a1eb0 100644
--- a/src/app/service/service_worker/subscribe.ts
+++ b/src/app/service/service_worker/subscribe.ts
@@ -135,7 +135,7 @@ export class SubscribeService {
       // 通过uuid查询脚本id
       result.push(
         (async () => {
-          const script = await this.scriptDAO.findByUUID(item.uuid);
+          const script = await this.scriptDAO.get(item.uuid);
           if (script) {
             notification[1].push(i18nName(script));
             // 删除脚本
diff --git a/src/app/service/service_worker/synchronize.ts b/src/app/service/service_worker/synchronize.ts
index 9d2c00a7f..655d2420a 100644
--- a/src/app/service/service_worker/synchronize.ts
+++ b/src/app/service/service_worker/synchronize.ts
@@ -5,8 +5,8 @@ import {
   type Script,
   SCRIPT_STATUS_DISABLE,
   SCRIPT_STATUS_ENABLE,
+  ScriptCodeDAONew,
   type ScriptDAO,
-  type ScriptCodeDAO,
 } from "@App/app/repo/scripts";
 import BackupExport from "@App/pkg/backup/export";
 import type { BackupData, ResourceBackup, ScriptBackupData, ScriptOptions, ValueStorage } from "@App/pkg/backup/struct";
@@ -69,7 +69,7 @@ type PushScriptParam = TInstallScriptParams;
 export class SynchronizeService {
   logger: Logger;
 
-  scriptCodeDAO: ScriptCodeDAO;
+  readonly scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
 
   storage: ChromeStorage = new ChromeStorage("sync", false);
 
@@ -84,7 +84,6 @@ export class SynchronizeService {
     private scriptDAO: ScriptDAO
   ) {
     this.logger = LoggerCore.logger().with({ service: "synchronize" });
-    this.scriptCodeDAO = this.scriptDAO.scriptCodeDAO;
   }
 
   // 生成备份文件到文件系统
diff --git a/src/pages/components/CloudScriptPlan/index.tsx b/src/pages/components/CloudScriptPlan/index.tsx
index c74710b88..6d941e779 100644
--- a/src/pages/components/CloudScriptPlan/index.tsx
+++ b/src/pages/components/CloudScriptPlan/index.tsx
@@ -2,7 +2,7 @@ import { DocumentationSite } from "@App/app/const";
 import type { Export, ExportTarget } from "@App/app/repo/export";
 import { ExportDAO } from "@App/app/repo/export";
 import type { Script } from "@App/app/repo/scripts";
-import { ScriptCodeDAO } from "@App/app/repo/scripts";
+import { ScriptCodeDAONew } from "@App/app/repo/scripts";
 import { localePath } from "@App/locales/locales";
 import { makeBlobURL } from "@App/pkg/utils/utils";
 import { Button, Checkbox, Form, Input, Message, Modal, Select } from "@arco-design/web-react";
@@ -123,7 +123,7 @@ const CloudScriptPlan: React.FC<{
             zip: zipFile,
             ...params,
           });
-          const code = await new ScriptCodeDAO().findByUUID(script.uuid);
+          const code = await new ScriptCodeDAONew().get(script.uuid);
           if (!code) {
             Message.error(t("invalid_script_code"));
             return;
diff --git a/src/pages/options/routes/script/ScriptEditor.tsx b/src/pages/options/routes/script/ScriptEditor.tsx
index 2cb856004..a500e08b3 100644
--- a/src/pages/options/routes/script/ScriptEditor.tsx
+++ b/src/pages/options/routes/script/ScriptEditor.tsx
@@ -1,5 +1,5 @@
 import type { Script } from "@App/app/repo/scripts";
-import { SCRIPT_TYPE_NORMAL, ScriptCodeDAO, ScriptDAO } from "@App/app/repo/scripts";
+import { SCRIPT_TYPE_NORMAL, ScriptCodeDAONew, ScriptDAO } from "@App/app/repo/scripts";
 import CodeEditor from "@App/pages/components/CodeEditor";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
@@ -201,7 +201,7 @@ type EditorState = {
 };
 
 const scriptDAO = new ScriptDAO();
-const scriptCodeDAO = new ScriptCodeDAO();
+const scriptCodeDAO = new ScriptCodeDAONew();
 
 function ScriptEditor() {
   const [visible, setVisible] = useState<{ [key: string]: boolean }>({});
@@ -273,7 +273,7 @@ function ScriptEditor() {
         // 如果不在，从数据库读取
         const script = scriptList.find((s) => s.uuid === uuid);
         if (script) {
-          const code = await scriptCodeDAO.findByUUID(uuid);
+          const code = await scriptCodeDAO.get(uuid);
           const newEditor: EditorState = {
             script,
             code: code?.code || "",
diff --git a/src/pkg/utils/script.ts b/src/pkg/utils/script.ts
index 4f1ba4c57..a8028b825 100644
--- a/src/pkg/utils/script.ts
+++ b/src/pkg/utils/script.ts
@@ -7,7 +7,7 @@ import {
   SCRIPT_TYPE_BACKGROUND,
   SCRIPT_TYPE_CRONTAB,
   SCRIPT_TYPE_NORMAL,
-  ScriptCodeDAO,
+  ScriptCodeDAONew,
   ScriptDAO,
 } from "@App/app/repo/scripts";
 import type { Subscribe } from "@App/app/repo/subscribe";
@@ -190,7 +190,7 @@ export async function prepareScriptByCode(
     ) {
       throw new Error(i18n_t("error_script_type_mismatch"));
     }
-    const scriptCode = await new ScriptCodeDAO().get(old.uuid);
+    const scriptCode = await new ScriptCodeDAONew().get(old.uuid);
     if (!scriptCode) {
       throw new Error(i18n_t("error_old_script_code_missing"));
     }

From 4fff7176df12f8165d51d7a5b6958b643ad5cb6a Mon Sep 17 00:00:00 2001
From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com>
Date: Sat, 28 Mar 2026 19:17:40 +0900
Subject: [PATCH 2/8] =?UTF-8?q?=E8=BF=87=E6=B8=A1=E6=9C=9F=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/migrate.ts      | 12 ++++++++++--
 src/app/repo/scripts.ts | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/migrate.ts b/src/app/migrate.ts
index ff9d25b2f..d85f613e8 100644
--- a/src/app/migrate.ts
+++ b/src/app/migrate.ts
@@ -270,12 +270,20 @@ export function migrateChromeStorage() {
     {
       version: 2,
       upgrade: async () => {
-        // 修复之前originDomain字段错误的数据
         const scriptCodeDAO = new ScriptCodeDAO();
         const scriptCodeDAONew = new ScriptCodeDAONew();
         const scriptCodes = await scriptCodeDAO.all();
         await Promise.all(scriptCodes.map(async (scriptCode) => scriptCodeDAONew.save(scriptCode)));
-        await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
+        // 过渡期间不删除旧代码
+        // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
+      },
+    },
+    {
+      version: 3,
+      upgrade: async () => {
+        // const scriptCodeDAO = new ScriptCodeDAO();
+        // 过渡期间后删除旧代码
+        // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
       },
     },
   ];
diff --git a/src/app/repo/scripts.ts b/src/app/repo/scripts.ts
index 11489ea38..fda5119ba 100644
--- a/src/app/repo/scripts.ts
+++ b/src/app/repo/scripts.ts
@@ -78,7 +78,7 @@ export interface Script {
   checktime: number; // 脚本检查更新时间戳
   lastruntime?: number; // 脚本最后一次运行时间戳
   nextruntime?: number; // 脚本下一次运行时间戳
-  ignoreVersion?: string; // 忽略單一版本的更新檢查
+  ignoreVersion?: string; // 忽略单一版本的更新检查
 }
 
 // 分开存储脚本代码
@@ -220,7 +220,7 @@ export class ScriptDAO extends Repo<Script> {
         if (val1.length < 2) {
           return val1[0] === val2[0];
         }
-        // 無視次序
+        // 无视次序
         const s = new Set([...val1, ...val2]);
         if (s.size !== val1.length) return false;
         return true;
@@ -228,14 +228,14 @@ export class ScriptDAO extends Repo<Script> {
       return val1 === val2;
     };
     const isScriptInfoEqual = (script1: Script, script2: Script) => {
-      // @author, @copyright, @license 應該不會改
+      // @author, @copyright, @license 应该不会改
       if (!valEqual(script1.metadata.author, script2.metadata.author)) return false;
       if (!valEqual(script1.metadata.copyright, script2.metadata.copyright)) return false;
       if (!valEqual(script1.metadata.license, script2.metadata.license)) return false;
-      // @grant, @connect 應該不會改
+      // @grant, @connect 应该不会改
       if (!valEqual(script1.metadata.grant, script2.metadata.grant)) return false;
       if (!valEqual(script1.metadata.connect, script2.metadata.connect)) return false;
-      // @match @include 應該不會改
+      // @match @include 应该不会改
       if (!valEqual(script1.metadata.match, script2.metadata.match)) return false;
       if (!valEqual(script1.metadata.include, script2.metadata.include)) return false;
       return true;
@@ -288,9 +288,10 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
   }
 }
 
-// 不能 extends Repo<ScriptCode>. 沒有 dao.gets()
+// 不能 extends Repo<ScriptCode>. 没有 dao.gets()
 export class ScriptCodeDAONew {
-  _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
+  private readonly _scriptCodeDAO = new ScriptCodeDAO();
+  private _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
   static getDirHandle(): Promise<FileSystemDirectoryHandle> {
     return navigator.storage
       .getDirectory()
@@ -303,6 +304,8 @@ export class ScriptCodeDAONew {
     const writable = await handle.createWritable({ keepExistingData: false });
     await writable.write(val.code);
     await writable.close();
+    // 过渡期间同步保存至 ScriptCodeDAO
+    await this._scriptCodeDAO.save(val); // [Version: 2] ONLY
   }
   public async delete(uuid: string) {
     if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();

From a61d5b5c50cfbf5b6d27dfa2b9e8338f1204cad0 Mon Sep 17 00:00:00 2001
From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com>
Date: Sat, 28 Mar 2026 19:26:46 +0900
Subject: [PATCH 3/8] =?UTF-8?q?migrations=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/migrate.ts | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/app/migrate.ts b/src/app/migrate.ts
index d85f613e8..125f37b8a 100644
--- a/src/app/migrate.ts
+++ b/src/app/migrate.ts
@@ -278,33 +278,37 @@ export function migrateChromeStorage() {
         // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
       },
     },
-    {
-      version: 3,
-      upgrade: async () => {
-        // const scriptCodeDAO = new ScriptCodeDAO();
-        // 过渡期间后删除旧代码
-        // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
-      },
-    },
+    // {
+    //   version: 3,
+    //   upgrade: async () => {
+    //     // const scriptCodeDAO = new ScriptCodeDAO();
+    //     // 过渡期间后删除旧代码
+    //     // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
+    //   },
+    // },
   ];
   const localstorageDAO = new LocalStorageDAO();
   localstorageDAO.get("migrations").then(async (item) => {
+    // 旧代码 logic 错误。只好维持 array 形式但只储单一版本号
     const migrations = item?.value || [];
+    let migrationVersion = migrations[0] || 0;
     for (let i = 0; i < migrationList.length; i++) {
       const m = migrationList[i];
-      if (!migrations.includes(m.version)) {
+      if (migrationVersion < m.version) {
+        // 需要升级
         try {
           await m.upgrade();
-          migrations.push(m.version);
+          migrationVersion = m.version;
+          localstorageDAO.save({
+            key: "migrations",
+            value: [migrationVersion],
+          });
         } catch (e) {
+          // throw 后停止升级
           throw new Error(`Chrome storage migration v${m.version} failed: ${e}`);
         }
       }
     }
-    localstorageDAO.save({
-      key: "migrations",
-      value: migrations,
-    });
   });
 }
 

From bc9a6e1dfc97672127fc219670bc395fcf2bd2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Sun, 29 Mar 2026 20:46:58 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E2=9C=85=20=E4=B8=BA=20ScriptCodeDAO=20OPF?=
 =?UTF-8?q?S=20=E8=BF=81=E7=A7=BB=E7=BC=96=E5=86=99=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=92=8C=20OPFS=20mock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/repo/scripts.test.ts | 69 +++++++++++++++++++++++++++++++++
 tests/vitest.setup.ts        | 74 ++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/src/app/repo/scripts.test.ts b/src/app/repo/scripts.test.ts
index 54f040456..657e67812 100644
--- a/src/app/repo/scripts.test.ts
+++ b/src/app/repo/scripts.test.ts
@@ -1,6 +1,7 @@
 import { describe, it, expect, beforeEach } from "vitest";
 import {
   ScriptDAO,
+  ScriptCodeDAO,
   type Script,
   SCRIPT_TYPE_NORMAL,
   SCRIPT_STATUS_ENABLE,
@@ -152,3 +153,71 @@ describe("ScriptDAO.searchExistingScript", () => {
     expect(found[0]).toBeUndefined();
   });
 });
+
+describe("ScriptCodeDAO", () => {
+  let dao: ScriptCodeDAO;
+
+  beforeEach(async () => {
+    await chrome.storage.local.clear();
+    (globalThis as any).__clearOPFSMock?.();
+    dao = new ScriptCodeDAO();
+  });
+
+  it("save 后 get 应该从 OPFS 读取", async () => {
+    await dao.save({ uuid: "test-1", code: "alert('hello');" });
+    const result = await dao.get("test-1");
+    expect(result).toBeDefined();
+    expect(result!.code).toBe("alert('hello');");
+  });
+
+  it("get 不存在的脚本应返回 undefined", async () => {
+    const result = await dao.get("nonexistent");
+    expect(result).toBeUndefined();
+  });
+
+  it("OPFS 不存在时应 fallback 到 chrome.storage.local", async () => {
+    await chrome.storage.local.set({ "scriptCode:old-script": { uuid: "old-script", code: "old code" } });
+    const result = await dao.get("old-script");
+    expect(result).toBeDefined();
+    expect(result!.code).toBe("old code");
+  });
+
+  it("fallback 读取后应懒迁移到 OPFS", async () => {
+    await chrome.storage.local.set({ "scriptCode:lazy": { uuid: "lazy", code: "lazy code" } });
+    await dao.get("lazy");
+    // 等待懒迁移的异步写入完成
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    await chrome.storage.local.clear();
+    const dao2 = new ScriptCodeDAO();
+    const result = await dao2.get("lazy");
+    expect(result).toBeDefined();
+    expect(result!.code).toBe("lazy code");
+  });
+
+  it("delete 应同时删除 OPFS 和 chrome.storage.local", async () => {
+    await dao.save({ uuid: "del-test", code: "to delete" });
+    await dao.delete("del-test");
+    const result = await dao.get("del-test");
+    expect(result).toBeUndefined();
+  });
+
+  it("gets 应批量获取", async () => {
+    await dao.save({ uuid: "a", code: "code-a" });
+    await dao.save({ uuid: "b", code: "code-b" });
+    const results = await dao.gets(["a", "b", "c"]);
+    expect(results[0]?.code).toBe("code-a");
+    expect(results[1]?.code).toBe("code-b");
+    expect(results[2]).toBeUndefined();
+  });
+
+  it("saveToOPFS 仅写 OPFS 不写 chrome.storage.local", async () => {
+    await dao.saveToOPFS({ uuid: "opfs-only", code: "opfs code" });
+    const storageResult = await new Promise<any>((resolve) => {
+      chrome.storage.local.get("scriptCode:opfs-only", resolve);
+    });
+    expect(storageResult["scriptCode:opfs-only"]).toBeUndefined();
+    const result = await dao.get("opfs-only");
+    expect(result).toBeDefined();
+    expect(result!.code).toBe("opfs code");
+  });
+});
diff --git a/tests/vitest.setup.ts b/tests/vitest.setup.ts
index 8dcc95fc4..a5e621f47 100644
--- a/tests/vitest.setup.ts
+++ b/tests/vitest.setup.ts
@@ -262,3 +262,77 @@ vi.stubGlobal("define", "特殊关键字不能穿透沙盒");
 if (!URL.createObjectURL) URL.createObjectURL = undefined;
 //@ts-expect-error
 if (!URL.revokeObjectURL) URL.revokeObjectURL = undefined;
+
+// OPFS mock - 内存中模拟 FileSystem API
+const opfsMockStorage: Record<string, Record<string, string>> = {};
+
+class MockFileSystemWritableFileStream {
+  private _dirName: string;
+  private _fileName: string;
+  constructor(dirName: string, fileName: string) {
+    this._dirName = dirName;
+    this._fileName = fileName;
+  }
+  async write(data: string) {
+    if (!opfsMockStorage[this._dirName]) opfsMockStorage[this._dirName] = {};
+    opfsMockStorage[this._dirName][this._fileName] = data;
+  }
+  async close() {}
+}
+
+class MockFileSystemFileHandle {
+  private _dirName: string;
+  private _fileName: string;
+  constructor(dirName: string, fileName: string) {
+    this._dirName = dirName;
+    this._fileName = fileName;
+  }
+  async createWritable(_opts?: { keepExistingData: boolean }) {
+    return new MockFileSystemWritableFileStream(this._dirName, this._fileName);
+  }
+  async getFile() {
+    const content = opfsMockStorage[this._dirName]?.[this._fileName] ?? "";
+    return { text: async () => content };
+  }
+}
+
+class MockFileSystemDirectoryHandle {
+  private _name: string;
+  constructor(name: string) {
+    this._name = name;
+  }
+  async getDirectoryHandle(name: string, opts?: { create: boolean }) {
+    if (!opts?.create && !opfsMockStorage[name]) {
+      throw new DOMException("NotFoundError");
+    }
+    if (opts?.create && !opfsMockStorage[name]) {
+      opfsMockStorage[name] = {};
+    }
+    return new MockFileSystemDirectoryHandle(name);
+  }
+  async getFileHandle(name: string, opts?: { create: boolean }) {
+    if (!opts?.create && !opfsMockStorage[this._name]?.[name]) {
+      throw new DOMException("NotFoundError");
+    }
+    return new MockFileSystemFileHandle(this._name, name);
+  }
+  async removeEntry(name: string) {
+    if (opfsMockStorage[this._name]) {
+      delete opfsMockStorage[this._name][name];
+    }
+  }
+}
+
+Object.defineProperty(navigator, "storage", {
+  value: {
+    getDirectory: async () => new MockFileSystemDirectoryHandle("opfs-root"),
+  },
+  writable: true,
+});
+
+// 导出清理函数供测试使用
+(globalThis as any).__clearOPFSMock = () => {
+  for (const key of Object.keys(opfsMockStorage)) {
+    delete opfsMockStorage[key];
+  }
+};

From 69f64e8cd2e67e7d2a3e0573d32f1c825c73bec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Sun, 29 Mar 2026 20:47:34 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20ScriptCodeDAO=20?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E6=94=B9=E4=B8=BA=20OPFS=20=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=20+=20chrome.storage.local=20fallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/repo/scripts.ts | 130 +++++++++++++++++++++-------------------
 1 file changed, 68 insertions(+), 62 deletions(-)

diff --git a/src/app/repo/scripts.ts b/src/app/repo/scripts.ts
index fda5119ba..881384828 100644
--- a/src/app/repo/scripts.ts
+++ b/src/app/repo/scripts.ts
@@ -278,87 +278,93 @@ export class ScriptDAO extends Repo<Script> {
 }
 
 // 为了防止脚本代码数据量过大,单独存储脚本代码
+// 内部使用 OPFS 优先存储，fallback 到 chrome.storage.local（过渡期间）
 export class ScriptCodeDAO extends Repo<ScriptCode> {
+  private _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
+
   constructor() {
     super("scriptCode");
   }
 
-  public save(val: ScriptCode) {
-    return super._save(val.uuid, val);
+  private getDirHandle(): Promise<FileSystemDirectoryHandle> {
+    if (!this._dirHandlePromise) {
+      this._dirHandlePromise = navigator.storage
+        .getDirectory()
+        .then((opfsRoot) => opfsRoot.getDirectoryHandle("storage_script_codes", { create: true }));
+    }
+    return this._dirHandlePromise;
   }
-}
 
-// 不能 extends Repo<ScriptCode>. 没有 dao.gets()
-export class ScriptCodeDAONew {
-  private readonly _scriptCodeDAO = new ScriptCodeDAO();
-  private _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
-  static getDirHandle(): Promise<FileSystemDirectoryHandle> {
-    return navigator.storage
-      .getDirectory()
-      .then((opfsRoot) => opfsRoot.getDirectoryHandle("storage_script_codes", { create: true }));
-  }
-  public async save(val: ScriptCode) {
-    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
-    const folder = await this._dirHandlePromise;
+  // 仅写入 OPFS，供迁移使用，避免写放大
+  public async saveToOPFS(val: ScriptCode): Promise<void> {
+    const folder = await this.getDirHandle();
     const handle = await folder.getFileHandle(`${val.uuid}.user.js`, { create: true });
     const writable = await handle.createWritable({ keepExistingData: false });
     await writable.write(val.code);
     await writable.close();
-    // 过渡期间同步保存至 ScriptCodeDAO
-    await this._scriptCodeDAO.save(val); // [Version: 2] ONLY
   }
-  public async delete(uuid: string) {
-    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
-    const folder = await this._dirHandlePromise;
+
+  public async save(val: ScriptCode): Promise<ScriptCode> {
+    // 写入 OPFS
+    await this.saveToOPFS(val);
+    // 过渡期间同步写入 chrome.storage.local
+    return super._save(val.uuid, val);
+  }
+
+  public async get(key: string): Promise<ScriptCode | undefined> {
+    // 优先从 OPFS 读取
     try {
-      await folder.removeEntry(`${uuid}.user.js`);
+      const folder = await this.getDirHandle();
+      const handle = await folder.getFileHandle(`${key}.user.js`, { create: false });
+      const code = await handle.getFile().then((f) => f.text());
+      return { uuid: key, code };
     } catch {
-      // ignore delete failure. e.g. no file
+      // OPFS 没有，fallback 到 chrome.storage.local
+    }
+    const result = await super.get(key);
+    if (result) {
+      // 懒迁移：写入 OPFS（不 await，异步后台执行即可）
+      this.saveToOPFS(result).catch(() => {});
     }
+    return result;
   }
-  public async get(uuid: string): Promise<ScriptCode> {
-    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
-    const folder = await this._dirHandlePromise;
-    let code: string = "";
-    let handle: FileSystemFileHandle;
+
+  public async gets(keys: string[]): Promise<(ScriptCode | undefined)[]> {
+    return Promise.all(keys.map((key) => this.get(key)));
+  }
+
+  public async delete(key: string): Promise<void> {
+    // 删除 OPFS
     try {
-      handle = await folder.getFileHandle(`${uuid}.user.js`, { create: false });
+      const folder = await this.getDirHandle();
+      await folder.removeEntry(`${key}.user.js`);
     } catch {
-      // no file -> empty code
-      return {
-        uuid,
-        code,
-      };
+      // 忽略删除失败
     }
-    code = await handle.getFile().then((f) => f.text());
-    return { uuid, code };
+    // 过渡期间同步删除 chrome.storage.local
+    return super.delete(key);
   }
-  public async deletes(uuids: string[]) {
-    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
-    const folder = await this._dirHandlePromise;
-    await Promise.all(
-      uuids.map(async (uuid) => {
-        try {
-          await folder.removeEntry(`${uuid}.user.js`);
-        } catch {
-          // ignore delete failure. e.g. no file
-        }
-      })
-    );
-  }
-  public async gets(uuids: string[]): Promise<(ScriptCode | undefined)[]> {
-    if (!this._dirHandlePromise) this._dirHandlePromise = ScriptCodeDAONew.getDirHandle();
-    const folder = await this._dirHandlePromise;
-    return Promise.all(
-      uuids.map(async (uuid) => {
-        try {
-          const handle = await folder.getFileHandle(`${uuid}.user.js`, { create: false });
-          const code = await handle.getFile().then((f) => f.text());
-          return { uuid, code };
-        } catch {
-          return undefined;
-        }
-      })
-    );
+
+  public async deletes(keys: string[]): Promise<void> {
+    // 删除 OPFS
+    try {
+      const folder = await this.getDirHandle();
+      await Promise.all(
+        keys.map(async (key) => {
+          try {
+            await folder.removeEntry(`${key}.user.js`);
+          } catch {
+            // 忽略
+          }
+        })
+      );
+    } catch {
+      // 忽略
+    }
+    // 过渡期间同步删除 chrome.storage.local
+    return super.deletes(keys);
   }
 }
+
+// 过渡期间保留别名，供其他文件引用（Task 4 将统一替换为 ScriptCodeDAO）
+export { ScriptCodeDAO as ScriptCodeDAONew };

From 4768e7ae23b551bea927a3c926aadab0e13ab730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Sun, 29 Mar 2026 20:53:28 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E6=AD=A3=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E9=80=BB=E8=BE=91=EF=BC=9AsaveToOPFS=20=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=86=99=E6=94=BE=E5=A4=A7=20+=20=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E6=A0=BC=E5=BC=8F=20+=20await=20+=20?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BF=9D=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/migrate.ts | 55 +++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/app/migrate.ts b/src/app/migrate.ts
index 125f37b8a..1f02a2500 100644
--- a/src/app/migrate.ts
+++ b/src/app/migrate.ts
@@ -1,7 +1,7 @@
 import { getStorageName } from "@App/pkg/utils/utils";
 import { db } from "./repo/dao";
 import type { Script, ScriptAndCode } from "./repo/scripts";
-import { ScriptCodeDAO, ScriptCodeDAONew, ScriptDAO } from "./repo/scripts";
+import { ScriptCodeDAO, ScriptDAO } from "./repo/scripts";
 import type { Subscribe } from "./repo/subscribe";
 import { SubscribeDAO } from "./repo/subscribe";
 import type { Value } from "./repo/value";
@@ -19,7 +19,7 @@ export function migrateToChromeStorage() {
       // 迁移脚本
       const scripts = await db.table("scripts").toArray();
       const scriptDAO = new ScriptDAO();
-      const scriptCodeDAO = new ScriptCodeDAONew();
+      const scriptCodeDAO = new ScriptCodeDAO();
       console.log("开始迁移脚本数据", scripts.length);
       await Promise.all(
         // 不处理 Promise.reject ?
@@ -271,42 +271,37 @@ export function migrateChromeStorage() {
       version: 2,
       upgrade: async () => {
         const scriptCodeDAO = new ScriptCodeDAO();
-        const scriptCodeDAONew = new ScriptCodeDAONew();
+        // 从 chrome.storage.local 读取所有旧代码
         const scriptCodes = await scriptCodeDAO.all();
-        await Promise.all(scriptCodes.map(async (scriptCode) => scriptCodeDAONew.save(scriptCode)));
-        // 过渡期间不删除旧代码
-        // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
+        // 仅写入 OPFS，避免写放大（不通过 save() 回写 chrome.storage.local）
+        await Promise.all(scriptCodes.map(async (scriptCode) => scriptCodeDAO.saveToOPFS(scriptCode)));
       },
     },
-    // {
-    //   version: 3,
-    //   upgrade: async () => {
-    //     // const scriptCodeDAO = new ScriptCodeDAO();
-    //     // 过渡期间后删除旧代码
-    //     // await scriptCodeDAO.deletes(scriptCodes.map((e) => e.uuid));
-    //   },
-    // },
   ];
   const localstorageDAO = new LocalStorageDAO();
   localstorageDAO.get("migrations").then(async (item) => {
-    // 旧代码 logic 错误。只好维持 array 形式但只储单一版本号
-    const migrations = item?.value || [];
-    let migrationVersion = migrations[0] || 0;
+    const migrations: number[] = item?.value || [];
     for (let i = 0; i < migrationList.length; i++) {
       const m = migrationList[i];
-      if (migrationVersion < m.version) {
-        // 需要升级
-        try {
-          await m.upgrade();
-          migrationVersion = m.version;
-          localstorageDAO.save({
-            key: "migrations",
-            value: [migrationVersion],
-          });
-        } catch (e) {
-          // throw 后停止升级
-          throw new Error(`Chrome storage migration v${m.version} failed: ${e}`);
-        }
+      if (migrations.includes(m.version)) {
+        continue;
+      }
+      // 保证顺序：前一个版本必须已完成
+      if (i > 0 && !migrations.includes(migrationList[i - 1].version)) {
+        throw new Error(
+          `Chrome storage migration v${m.version} skipped: v${migrationList[i - 1].version} not completed`
+        );
+      }
+      try {
+        await m.upgrade();
+        migrations.push(m.version);
+        // 每步成功后立即持久化，避免 SW 挂起导致进度丢失
+        await localstorageDAO.save({
+          key: "migrations",
+          value: migrations,
+        });
+      } catch (e) {
+        throw new Error(`Chrome storage migration v${m.version} failed: ${e}`);
       }
     }
   });

From bed286b48cb6cb7981f95e97dab0a4d07b1a7773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Sun, 29 Mar 2026 20:54:03 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=81=A2=E5=A4=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=20ScriptCodeDAO=EF=BC=88=E5=86=85=E9=83=A8=E5=B7=B2=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20OPFS=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/repo/scripts.ts                          | 3 ---
 src/app/service/service_worker/runtime.ts        | 4 ++--
 src/app/service/service_worker/script.ts         | 4 ++--
 src/app/service/service_worker/synchronize.ts    | 4 ++--
 src/pages/components/CloudScriptPlan/index.tsx   | 4 ++--
 src/pages/options/routes/script/ScriptEditor.tsx | 4 ++--
 src/pkg/utils/script.ts                          | 4 ++--
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/app/repo/scripts.ts b/src/app/repo/scripts.ts
index 881384828..f031d647e 100644
--- a/src/app/repo/scripts.ts
+++ b/src/app/repo/scripts.ts
@@ -365,6 +365,3 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
     return super.deletes(keys);
   }
 }
-
-// 过渡期间保留别名，供其他文件引用（Task 4 将统一替换为 ScriptCodeDAO）
-export { ScriptCodeDAO as ScriptCodeDAONew };
diff --git a/src/app/service/service_worker/runtime.ts b/src/app/service/service_worker/runtime.ts
index e0a751014..3e1cdd72c 100644
--- a/src/app/service/service_worker/runtime.ts
+++ b/src/app/service/service_worker/runtime.ts
@@ -2,7 +2,7 @@ import type { EmitEventRequest, ScriptLoadInfo, ScriptMatchInfo, ScriptMenu } fr
 import type { IMessageQueue } from "@Packages/message/message_queue";
 import type { Group, IGetSender } from "@Packages/message/server";
 import type { ExtMessageSender, MessageSend } from "@Packages/message/types";
-import { ScriptCodeDAONew, type TClientPageLoadInfo } from "@App/app/repo/scripts";
+import { ScriptCodeDAO, type TClientPageLoadInfo } from "@App/app/repo/scripts";
 import type { Script, ScriptDAO, ScriptRunResource, ScriptSite, TScriptInfo } from "@App/app/repo/scripts";
 import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, SCRIPT_TYPE_NORMAL } from "@App/app/repo/scripts";
 import { type ValueService } from "./value";
@@ -128,7 +128,7 @@ export class RuntimeService {
   initialCompiledResourcePromise: Promise<any> | undefined;
 
   compiledResourceDAO: CompiledResourceDAO = new CompiledResourceDAO();
-  private readonly scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
+  private readonly scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
 
   constructor(
     private systemConfig: SystemConfig,
diff --git a/src/app/service/service_worker/script.ts b/src/app/service/service_worker/script.ts
index 8b60b6c45..1b9d286f8 100644
--- a/src/app/service/service_worker/script.ts
+++ b/src/app/service/service_worker/script.ts
@@ -21,7 +21,7 @@ import type {
   ScriptRunResource,
   ScriptSite,
 } from "@App/app/repo/scripts";
-import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAONew } from "@App/app/repo/scripts";
+import { SCRIPT_STATUS_DISABLE, SCRIPT_STATUS_ENABLE, ScriptCodeDAO } from "@App/app/repo/scripts";
 import { type IMessageQueue } from "@Packages/message/message_queue";
 import { createScriptInfo, type ScriptInfo, type InstallSource } from "@App/pkg/utils/scriptInstall";
 import { type ResourceService } from "./resource";
@@ -69,7 +69,7 @@ export type TScriptInstallReturn = {
 
 export class ScriptService {
   logger: Logger;
-  scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
+  scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
   localStorageDAO: LocalStorageDAO = new LocalStorageDAO();
   compiledResourceDAO: CompiledResourceDAO = new CompiledResourceDAO();
   private readonly scriptUpdateCheck;
diff --git a/src/app/service/service_worker/synchronize.ts b/src/app/service/service_worker/synchronize.ts
index 655d2420a..c8794ca9a 100644
--- a/src/app/service/service_worker/synchronize.ts
+++ b/src/app/service/service_worker/synchronize.ts
@@ -5,7 +5,7 @@ import {
   type Script,
   SCRIPT_STATUS_DISABLE,
   SCRIPT_STATUS_ENABLE,
-  ScriptCodeDAONew,
+  ScriptCodeDAO,
   type ScriptDAO,
 } from "@App/app/repo/scripts";
 import BackupExport from "@App/pkg/backup/export";
@@ -69,7 +69,7 @@ type PushScriptParam = TInstallScriptParams;
 export class SynchronizeService {
   logger: Logger;
 
-  readonly scriptCodeDAO: ScriptCodeDAONew = new ScriptCodeDAONew();
+  readonly scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
 
   storage: ChromeStorage = new ChromeStorage("sync", false);
 
diff --git a/src/pages/components/CloudScriptPlan/index.tsx b/src/pages/components/CloudScriptPlan/index.tsx
index 6d941e779..760476e59 100644
--- a/src/pages/components/CloudScriptPlan/index.tsx
+++ b/src/pages/components/CloudScriptPlan/index.tsx
@@ -2,7 +2,7 @@ import { DocumentationSite } from "@App/app/const";
 import type { Export, ExportTarget } from "@App/app/repo/export";
 import { ExportDAO } from "@App/app/repo/export";
 import type { Script } from "@App/app/repo/scripts";
-import { ScriptCodeDAONew } from "@App/app/repo/scripts";
+import { ScriptCodeDAO } from "@App/app/repo/scripts";
 import { localePath } from "@App/locales/locales";
 import { makeBlobURL } from "@App/pkg/utils/utils";
 import { Button, Checkbox, Form, Input, Message, Modal, Select } from "@arco-design/web-react";
@@ -123,7 +123,7 @@ const CloudScriptPlan: React.FC<{
             zip: zipFile,
             ...params,
           });
-          const code = await new ScriptCodeDAONew().get(script.uuid);
+          const code = await new ScriptCodeDAO().get(script.uuid);
           if (!code) {
             Message.error(t("invalid_script_code"));
             return;
diff --git a/src/pages/options/routes/script/ScriptEditor.tsx b/src/pages/options/routes/script/ScriptEditor.tsx
index a500e08b3..551086965 100644
--- a/src/pages/options/routes/script/ScriptEditor.tsx
+++ b/src/pages/options/routes/script/ScriptEditor.tsx
@@ -1,5 +1,5 @@
 import type { Script } from "@App/app/repo/scripts";
-import { SCRIPT_TYPE_NORMAL, ScriptCodeDAONew, ScriptDAO } from "@App/app/repo/scripts";
+import { SCRIPT_TYPE_NORMAL, ScriptCodeDAO, ScriptDAO } from "@App/app/repo/scripts";
 import CodeEditor from "@App/pages/components/CodeEditor";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
@@ -201,7 +201,7 @@ type EditorState = {
 };
 
 const scriptDAO = new ScriptDAO();
-const scriptCodeDAO = new ScriptCodeDAONew();
+const scriptCodeDAO = new ScriptCodeDAO();
 
 function ScriptEditor() {
   const [visible, setVisible] = useState<{ [key: string]: boolean }>({});
diff --git a/src/pkg/utils/script.ts b/src/pkg/utils/script.ts
index 5c3f3b57b..2a32ab946 100644
--- a/src/pkg/utils/script.ts
+++ b/src/pkg/utils/script.ts
@@ -7,7 +7,7 @@ import {
   SCRIPT_TYPE_BACKGROUND,
   SCRIPT_TYPE_CRONTAB,
   SCRIPT_TYPE_NORMAL,
-  ScriptCodeDAONew,
+  ScriptCodeDAO,
   ScriptDAO,
 } from "@App/app/repo/scripts";
 import type { Subscribe } from "@App/app/repo/subscribe";
@@ -190,7 +190,7 @@ export async function prepareScriptByCode(
     ) {
       throw new Error(i18n_t("error_script_type_mismatch"));
     }
-    const scriptCode = await new ScriptCodeDAONew().get(old.uuid);
+    const scriptCode = await new ScriptCodeDAO().get(old.uuid);
     if (!scriptCode) {
       throw new Error(i18n_t("error_old_script_code_missing"));
     }

From 2fa931b9d63a453803616841048054d294c87536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Sun, 29 Mar 2026 21:36:48 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20ScriptCodeDAO=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20extends=20Repo=20+=20save=20=E5=AE=B9?=
 =?UTF-8?q?=E9=94=99=20+=20OPFS=20mock=20=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ScriptCodeDAO 不再继承 Repo，过渡期间的 chrome.storage.local 操作
  改为 legacySave/legacyGet/legacyDelete 内部方法，过渡结束后直接删除
- save() 增加 try-catch，OPFS 写入失败不影响 chrome.storage.local
- OPFS mock 从 vitest.setup.ts 抽离到 tests/opfs_mock.ts
---
 src/app/repo/scripts.ts | 84 ++++++++++++++++++++++++++++++++++-------
 tests/opfs_mock.ts      | 74 ++++++++++++++++++++++++++++++++++++
 tests/vitest.setup.ts   | 73 ++---------------------------------
 3 files changed, 148 insertions(+), 83 deletions(-)
 create mode 100644 tests/opfs_mock.ts

diff --git a/src/app/repo/scripts.ts b/src/app/repo/scripts.ts
index f031d647e..0ea510495 100644
--- a/src/app/repo/scripts.ts
+++ b/src/app/repo/scripts.ts
@@ -279,18 +279,15 @@ export class ScriptDAO extends Repo<Script> {
 
 // 为了防止脚本代码数据量过大,单独存储脚本代码
 // 内部使用 OPFS 优先存储，fallback 到 chrome.storage.local（过渡期间）
-export class ScriptCodeDAO extends Repo<ScriptCode> {
+export class ScriptCodeDAO {
+  private static readonly LEGACY_PREFIX = "scriptCode:";
   private _dirHandlePromise: Promise<FileSystemDirectoryHandle> | null = null;
 
-  constructor() {
-    super("scriptCode");
-  }
-
   private getDirHandle(): Promise<FileSystemDirectoryHandle> {
     if (!this._dirHandlePromise) {
       this._dirHandlePromise = navigator.storage
         .getDirectory()
-        .then((opfsRoot) => opfsRoot.getDirectoryHandle("storage_script_codes", { create: true }));
+        .then((opfsRoot) => opfsRoot.getDirectoryHandle("script_codes", { create: true }));
     }
     return this._dirHandlePromise;
   }
@@ -305,10 +302,15 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
   }
 
   public async save(val: ScriptCode): Promise<ScriptCode> {
-    // 写入 OPFS
-    await this.saveToOPFS(val);
+    // 写入 OPFS（失败不影响 chrome.storage.local）
+    try {
+      await this.saveToOPFS(val);
+    } catch {
+      // OPFS 写入失败，忽略
+    }
     // 过渡期间同步写入 chrome.storage.local
-    return super._save(val.uuid, val);
+    await this.legacySave(val);
+    return val;
   }
 
   public async get(key: string): Promise<ScriptCode | undefined> {
@@ -321,9 +323,9 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
     } catch {
       // OPFS 没有，fallback 到 chrome.storage.local
     }
-    const result = await super.get(key);
+    const result = await this.legacyGet(key);
     if (result) {
-      // 懒迁移：写入 OPFS（不 await，异步后台执行即可）
+      // 懒迁移：写入 OPFS
       this.saveToOPFS(result).catch(() => {});
     }
     return result;
@@ -342,7 +344,7 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
       // 忽略删除失败
     }
     // 过渡期间同步删除 chrome.storage.local
-    return super.delete(key);
+    await this.legacyDelete([key]);
   }
 
   public async deletes(keys: string[]): Promise<void> {
@@ -362,6 +364,62 @@ export class ScriptCodeDAO extends Repo<ScriptCode> {
       // 忽略
     }
     // 过渡期间同步删除 chrome.storage.local
-    return super.deletes(keys);
+    await this.legacyDelete(keys);
+  }
+
+  // --- 过渡期间 chrome.storage.local 操作，过渡结束后删除 ---
+
+  // 从 chrome.storage.local 读取所有脚本代码（仅迁移使用）
+  public all(): Promise<ScriptCode[]> {
+    return new Promise((resolve) => {
+      chrome.storage.local.get(null, (items) => {
+        if (chrome.runtime.lastError) {
+          console.error("chrome.storage.local.get error:", chrome.runtime.lastError);
+        }
+        const result: ScriptCode[] = [];
+        for (const key in items) {
+          if (key.startsWith(ScriptCodeDAO.LEGACY_PREFIX)) {
+            result.push(items[key]);
+          }
+        }
+        resolve(result);
+      });
+    });
+  }
+
+  private legacySave(val: ScriptCode): Promise<void> {
+    const key = ScriptCodeDAO.LEGACY_PREFIX + val.uuid;
+    return new Promise((resolve) => {
+      chrome.storage.local.set({ [key]: val }, () => {
+        if (chrome.runtime.lastError) {
+          console.error("chrome.storage.local.set error:", chrome.runtime.lastError);
+        }
+        resolve();
+      });
+    });
+  }
+
+  private legacyGet(key: string): Promise<ScriptCode | undefined> {
+    const storageKey = ScriptCodeDAO.LEGACY_PREFIX + key;
+    return new Promise((resolve) => {
+      chrome.storage.local.get(storageKey, (items) => {
+        if (chrome.runtime.lastError) {
+          console.error("chrome.storage.local.get error:", chrome.runtime.lastError);
+        }
+        resolve(items[storageKey]);
+      });
+    });
+  }
+
+  private legacyDelete(keys: string[]): Promise<void> {
+    const storageKeys = keys.map((key) => ScriptCodeDAO.LEGACY_PREFIX + key);
+    return new Promise((resolve) => {
+      chrome.storage.local.remove(storageKeys, () => {
+        if (chrome.runtime.lastError) {
+          console.error("chrome.storage.local.remove error:", chrome.runtime.lastError);
+        }
+        resolve();
+      });
+    });
   }
 }
diff --git a/tests/opfs_mock.ts b/tests/opfs_mock.ts
new file mode 100644
index 000000000..6e421474e
--- /dev/null
+++ b/tests/opfs_mock.ts
@@ -0,0 +1,74 @@
+// OPFS mock - 内存中模拟 FileSystem API
+const opfsMockStorage: Record<string, Record<string, string>> = {};
+
+class MockFileSystemWritableFileStream {
+  private _dirName: string;
+  private _fileName: string;
+  constructor(dirName: string, fileName: string) {
+    this._dirName = dirName;
+    this._fileName = fileName;
+  }
+  async write(data: string) {
+    if (!opfsMockStorage[this._dirName]) opfsMockStorage[this._dirName] = {};
+    opfsMockStorage[this._dirName][this._fileName] = data;
+  }
+  async close() {}
+}
+
+class MockFileSystemFileHandle {
+  private _dirName: string;
+  private _fileName: string;
+  constructor(dirName: string, fileName: string) {
+    this._dirName = dirName;
+    this._fileName = fileName;
+  }
+  async createWritable(_opts?: { keepExistingData: boolean }) {
+    return new MockFileSystemWritableFileStream(this._dirName, this._fileName);
+  }
+  async getFile() {
+    const content = opfsMockStorage[this._dirName]?.[this._fileName] ?? "";
+    return { text: async () => content };
+  }
+}
+
+class MockFileSystemDirectoryHandle {
+  private _name: string;
+  constructor(name: string) {
+    this._name = name;
+  }
+  async getDirectoryHandle(name: string, opts?: { create: boolean }) {
+    if (!opts?.create && !opfsMockStorage[name]) {
+      throw new DOMException("NotFoundError");
+    }
+    if (opts?.create && !opfsMockStorage[name]) {
+      opfsMockStorage[name] = {};
+    }
+    return new MockFileSystemDirectoryHandle(name);
+  }
+  async getFileHandle(name: string, opts?: { create: boolean }) {
+    if (!opts?.create && !opfsMockStorage[this._name]?.[name]) {
+      throw new DOMException("NotFoundError");
+    }
+    return new MockFileSystemFileHandle(this._name, name);
+  }
+  async removeEntry(name: string) {
+    if (opfsMockStorage[this._name]) {
+      delete opfsMockStorage[this._name][name];
+    }
+  }
+}
+
+export function installOPFSMock() {
+  Object.defineProperty(navigator, "storage", {
+    value: {
+      getDirectory: async () => new MockFileSystemDirectoryHandle("opfs-root"),
+    },
+    writable: true,
+  });
+}
+
+export function clearOPFSMock() {
+  for (const key of Object.keys(opfsMockStorage)) {
+    delete opfsMockStorage[key];
+  }
+}
diff --git a/tests/vitest.setup.ts b/tests/vitest.setup.ts
index a5e621f47..e47e55dec 100644
--- a/tests/vitest.setup.ts
+++ b/tests/vitest.setup.ts
@@ -263,76 +263,9 @@ if (!URL.createObjectURL) URL.createObjectURL = undefined;
 //@ts-expect-error
 if (!URL.revokeObjectURL) URL.revokeObjectURL = undefined;
 
-// OPFS mock - 内存中模拟 FileSystem API
-const opfsMockStorage: Record<string, Record<string, string>> = {};
+import { installOPFSMock, clearOPFSMock } from "./opfs_mock";
 
-class MockFileSystemWritableFileStream {
-  private _dirName: string;
-  private _fileName: string;
-  constructor(dirName: string, fileName: string) {
-    this._dirName = dirName;
-    this._fileName = fileName;
-  }
-  async write(data: string) {
-    if (!opfsMockStorage[this._dirName]) opfsMockStorage[this._dirName] = {};
-    opfsMockStorage[this._dirName][this._fileName] = data;
-  }
-  async close() {}
-}
-
-class MockFileSystemFileHandle {
-  private _dirName: string;
-  private _fileName: string;
-  constructor(dirName: string, fileName: string) {
-    this._dirName = dirName;
-    this._fileName = fileName;
-  }
-  async createWritable(_opts?: { keepExistingData: boolean }) {
-    return new MockFileSystemWritableFileStream(this._dirName, this._fileName);
-  }
-  async getFile() {
-    const content = opfsMockStorage[this._dirName]?.[this._fileName] ?? "";
-    return { text: async () => content };
-  }
-}
-
-class MockFileSystemDirectoryHandle {
-  private _name: string;
-  constructor(name: string) {
-    this._name = name;
-  }
-  async getDirectoryHandle(name: string, opts?: { create: boolean }) {
-    if (!opts?.create && !opfsMockStorage[name]) {
-      throw new DOMException("NotFoundError");
-    }
-    if (opts?.create && !opfsMockStorage[name]) {
-      opfsMockStorage[name] = {};
-    }
-    return new MockFileSystemDirectoryHandle(name);
-  }
-  async getFileHandle(name: string, opts?: { create: boolean }) {
-    if (!opts?.create && !opfsMockStorage[this._name]?.[name]) {
-      throw new DOMException("NotFoundError");
-    }
-    return new MockFileSystemFileHandle(this._name, name);
-  }
-  async removeEntry(name: string) {
-    if (opfsMockStorage[this._name]) {
-      delete opfsMockStorage[this._name][name];
-    }
-  }
-}
-
-Object.defineProperty(navigator, "storage", {
-  value: {
-    getDirectory: async () => new MockFileSystemDirectoryHandle("opfs-root"),
-  },
-  writable: true,
-});
+installOPFSMock();
 
 // 导出清理函数供测试使用
-(globalThis as any).__clearOPFSMock = () => {
-  for (const key of Object.keys(opfsMockStorage)) {
-    delete opfsMockStorage[key];
-  }
-};
+(globalThis as any).__clearOPFSMock = clearOPFSMock;