Merge branch 'main' into release/v1.3

Author: CodFrm

packages/filesystem/auth.ts

@@ -2,8 +2,9 @@ import { ExtServer, ExtServerApi } from "@App/app/const";
 import { WarpTokenError } from "./error";
 import { LocalStorageDAO } from "@App/app/repo/localStorage";
 import { sleep } from "@App/pkg/utils/utils";
+import type { FileSystemType } from "./factory";
 
-type NetDiskType = "baidu" | "onedrive" | "googledrive" | "dropbox";
+export type NetDiskType = "baidu" | "onedrive" | "googledrive" | "dropbox";
 
 export function GetNetDiskToken(netDiskType: NetDiskType): Promise<{
   code: number;
@@ -127,3 +128,21 @@ export async function AuthVerify(netDiskType: NetDiskType, invalid?: boolean) {
   }
   return token.accessToken;
 }
+
+export const netDiskTypeMap: Partial<Record<FileSystemType, NetDiskType>> = {
+  "baidu-netdsik": "baidu",
+  onedrive: "onedrive",
+  googledrive: "googledrive",
+  dropbox: "dropbox",
+};
+
+export async function ClearNetDiskToken(netDiskType: NetDiskType) {
+  const localStorageDAO = new LocalStorageDAO();
+  const key = `netdisk:token:${netDiskType}`;
+  try {
+    await localStorageDAO.delete(key);
+  } catch (error) {
+    // ignore
+    console.error("ClearNetDiskToken error:", error);
+  }
+}

src/app/service/content/gm_api/gm_api.test.ts

@@ -461,6 +461,158 @@ describe.concurrent("GM_value", () => {
     expect(ret).toEqual({ ret1: 123, ret2: 456 });
   });
 
+  it.concurrent("value引用问题 #1141", async () => {
+    const script = Object.assign({}, scriptRes) as ScriptLoadInfo;
+    script.metadata.grant = ["GM_getValue", "GM_setValue", "GM_getValues"];
+    script.code = `
+const value1 = {
+    arr: [1],
+    obj: {
+        a: "1"
+    },
+    str: "123",
+}
+GM_setValue("abc", value1);
+
+const allValues1 = GM_getValues();
+
+allValues1.abc.arr.push(8);
+allValues1.n1 = 5;
+allValues1.n2 = {c: 8};
+delete allValues1.abc.obj.a;
+allValues1.abc.str = "0";
+
+const value2 = GM_getValue("abc");
+
+value2.arr.push(2);
+value2.obj.b = 2;
+value2.str = "456";
+
+value1.arr.push(3);
+value1.obj.b = 3;
+value1.str = "789";
+
+const value3 = GM_getValue("abc");
+
+const values1 = GM_getValues(["abc", "n3"]);
+
+const values2 = GM_getValues({"abc":{}, "n4":{}, "n5":"hi"});
+
+values2.abc.arr.push(2);
+values2.abc.obj.b = 2;
+values2.abc.str = "456";
+
+const allValues2 = GM_getValues();
+
+
+const value4 = GM_getValue("abc");
+const value5 = GM_getValue("abc");
+value5.arr[0] = 9;
+GM_setValue("abc", value5);
+
+const value6 = GM_getValue("abc");
+    
+return { value1, value2, value3, values1,values2, allValues1, allValues2, value4, value5, value6 };
+    `;
+    const mockSendMessage = vi.fn().mockResolvedValue({ code: 0 });
+    const mockMessage = {
+      sendMessage: mockSendMessage,
+    } as unknown as Message;
+    // @ts-ignore
+    const exec = new ExecScript(script, "content", mockMessage, nilFn, envInfo);
+    exec.scriptFunc = compileScript(compileScriptCode(script));
+    const ret = await exec.exec();
+
+    expect(mockSendMessage).toHaveBeenCalled();
+    expect(mockSendMessage).toHaveBeenCalledTimes(2);
+
+    expect(ret).toEqual({
+      value1: {
+        arr: [1, 3],
+        obj: {
+          a: "1",
+          b: 3,
+        },
+        str: "789",
+      },
+      value2: {
+        arr: [1, 2],
+        obj: {
+          a: "1",
+          b: 2,
+        },
+        str: "456",
+      },
+      value3: {
+        arr: [1],
+        obj: {
+          a: "1",
+        },
+        str: "123",
+      },
+      values1: {
+        abc: {
+          arr: [1],
+          obj: {
+            a: "1",
+          },
+          str: "123",
+        },
+      },
+      values2: {
+        abc: {
+          arr: [1, 2],
+          obj: {
+            a: "1",
+            b: 2,
+          },
+          str: "456",
+        },
+        n4: {},
+        n5: "hi",
+      },
+      allValues1: {
+        abc: {
+          arr: [1, 8],
+          obj: {},
+          str: "0",
+        },
+        n1: 5,
+        n2: { c: 8 },
+      },
+      allValues2: {
+        abc: {
+          arr: [1],
+          obj: {
+            a: "1",
+          },
+          str: "123",
+        },
+      },
+      value4: {
+        arr: [1],
+        obj: {
+          a: "1",
+        },
+        str: "123",
+      },
+      value5: {
+        arr: [9],
+        obj: {
+          a: "1",
+        },
+        str: "123",
+      },
+      value6: {
+        arr: [9],
+        obj: {
+          a: "1",
+        },
+        str: "123",
+      },
+    });
+  });
+
   it.concurrent("GM_setValues", async () => {
     const script = Object.assign({}, scriptRes) as ScriptLoadInfo;
     script.metadata.grant = ["GM_getValues", "GM_setValues"];
@@ -499,7 +651,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValues",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the object payload
             keyValuePairs1,
           ],
@@ -523,7 +675,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValues",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the object payload
             keyValuePairs2,
           ],
@@ -573,7 +725,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValues",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the object payload
             keyValuePairs1,
           ],
@@ -592,7 +744,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValue",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the string payload
             "b",
           ],
@@ -643,7 +795,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValues",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the object payload
             keyValuePairs1,
           ],
@@ -667,7 +819,7 @@ describe.concurrent("GM_value", () => {
           api: "GM_setValues",
           params: [
             // event id
-            expect.stringMatching(/^.+::\d$/),
+            expect.stringMatching(/^.+::\d+$/),
             // the string payload
             keyValuePairs2,
           ],

src/app/service/content/gm_api/gm_api.ts

@@ -237,6 +237,9 @@ export default class GMApi extends GM_Base {
     if (!a.scriptRes) return undefined;
     const ret = a.scriptRes.value[key];
     if (ret !== undefined) {
+      if (ret && typeof ret === "object") {
+        return structuredClone(ret);
+      }
       return ret;
     }
     return defaultValue;
@@ -268,14 +271,14 @@ export default class GMApi extends GM_Base {
     if (promise) {
       valueChangePromiseMap.set(id, promise);
     }
-    // 对object的value进行一次转化
-    if (value && typeof value === "object") {
-      value = JSON.parse(JSON.stringify(value));
-    }
     if (value === undefined) {
       delete a.scriptRes.value[key];
       a.sendMessage("GM_setValue", [id, key]);
     } else {
+      // 对object的value进行一次转化
+      if (value && typeof value === "object") {
+        value = structuredClone(value);
+      }
       a.scriptRes.value[key] = value;
       a.sendMessage("GM_setValue", [id, key, value]);
     }
@@ -297,13 +300,13 @@ export default class GMApi extends GM_Base {
     const keyValuePairs = [] as [string, REncoded<unknown>][];
     for (const [key, value] of Object.entries(values)) {
       let value_ = value;
-      // 对object的value进行一次转化
-      if (value_ && typeof value_ === "object") {
-        value_ = JSON.parse(JSON.stringify(value_));
-      }
       if (value_ === undefined) {
         if (valueStore[key]) delete valueStore[key];
       } else {
+        // 对object的value进行一次转化
+        if (value_ && typeof value_ === "object") {
+          value_ = structuredClone(value_);
+        }
         valueStore[key] = value_;
       }
       // 避免undefined 等空值流失，先进行映射处理
@@ -369,7 +372,7 @@ export default class GMApi extends GM_Base {
     if (!this.scriptRes) return {};
     if (!keysOrDefaults) {
       // Returns all values
-      return this.scriptRes.value;
+      return structuredClone(this.scriptRes.value);
     }
     const result: TGMKeyValue = {};
     if (Array.isArray(keysOrDefaults)) {
@@ -378,7 +381,12 @@ export default class GMApi extends GM_Base {
       for (let index = 0; index < keysOrDefaults.length; index++) {
         const key = keysOrDefaults[index];
         if (key in this.scriptRes.value) {
-          result[key] = this.scriptRes.value[key];
+          // 对object的value进行一次转化
+          let value = this.scriptRes.value[key];
+          if (value && typeof value === "object") {
+            value = structuredClone(value);
+          }
+          result[key] = value;
         }
       }
     } else {

src/locales/ach-UG/translation.json

@@ -421,6 +421,10 @@
   "confirm_leave_page": "crwdns8634:0crwdne8634:0",
   "page_in_blacklist": "crwdns8636:0crwdne8636:0",
   "baidu_netdisk": "crwdns8638:0crwdne8638:0",
+  "netdisk_unbind": "Unbind {{provider}}",
+  "netdisk_unbind_confirm": "Unbind the {{provider}} account?",
+  "netdisk_unbind_success": "{{provider}} account unbound",
+  "netdisk_unbind_error": "Failed to unbind {{provider}} account",
   "save_only_current_group": "crwdns8640:0crwdne8640:0",
   "script_import_result": "crwdns8642:0crwdne8642:0",
   "failure_info": "crwdns8644:0crwdne8644:0",
@@ -546,4 +550,4 @@
     "subscribe_update_desc": "crwdns12856:0{{newScripts}}crwdnd12856:0{{deletedScripts}}crwdne12856:0"
   },
   "loading": "crwdns12870:0crwdne12870:0"
-}
+}

src/locales/de-DE/translation.json

@@ -423,6 +423,10 @@
   "confirm_leave_page": "Derzeit im Bearbeitungsstatus. Das Navigieren zu anderen Seiten führt zum Verlust des aktuellen Inhalts. Navigieren?",
   "page_in_blacklist": "Die aktuelle Seite ist auf der Blacklist und kann keine Skripte verwenden",
   "baidu_netdisk": "Baidu Netdisk",
+  "netdisk_unbind": "{{provider}} trennen",
+  "netdisk_unbind_confirm": "Das {{provider}}-Konto trennen?",
+  "netdisk_unbind_success": "{{provider}}-Konto getrennt",
+  "netdisk_unbind_error": "{{provider}}-Konto konnte nicht getrennt werden",
   "save_only_current_group": "Speichern ist nur für die aktuelle Gruppe wirksam",
   "script_import_result": "Skript-Import-Ergebnis",
   "failure_info": "Fehlerinformationen",
@@ -561,4 +565,4 @@
     "maybe_later": "Vielleicht später",
     "settings_hint": "Sie können diese Option jederzeit in den Einstellungen ändern."
   }
-}
+}

src/locales/en-US/translation.json

@@ -423,6 +423,10 @@
   "confirm_leave_page": "Currently editing status. Leaving this page will lose the current content. Do you want to leave?",
   "page_in_blacklist": "The current page is blacklisted, cannot use script",
   "baidu_netdisk": "BaiduNetdisk",
+  "netdisk_unbind": "Unbind {{provider}}",
+  "netdisk_unbind_confirm": "Unbind the {{provider}} account?",
+  "netdisk_unbind_success": "{{provider}} account unbound",
+  "netdisk_unbind_error": "Failed to unbind {{provider}} account",
   "save_only_current_group": "Save only for current group",
   "script_import_result": "Script Import Results",
   "failure_info": "Failure Information",
@@ -561,4 +565,4 @@
     "maybe_later": "Maybe Later",
     "settings_hint": "You can change this option in settings at any time."
   }
-}
+}

src/locales/ja-JP/translation.json

@@ -423,6 +423,10 @@
   "confirm_leave_page": "現在編集中です。他のページに移動すると現在の内容が失われます。移動しますか？",
   "page_in_blacklist": "現在のページはブラックリストにあり、スクリプトを使用できません",
   "baidu_netdisk": "百度ネットディスク",
+  "netdisk_unbind": "{{provider}} の連携を解除",
+  "netdisk_unbind_confirm": "{{provider}} のアカウント連携を解除しますか？",
+  "netdisk_unbind_success": "{{provider}} のアカウント連携を解除しました",
+  "netdisk_unbind_error": "{{provider}} のアカウント解除に失敗しました",
   "save_only_current_group": "保存は現在のグループにのみ有効です",
   "script_import_result": "スクリプトインポート結果",
   "failure_info": "失敗情報",
@@ -561,4 +565,4 @@
     "maybe_later": "後で",
     "settings_hint": "設定ページでいつでも変更できます。"
   }
-}
+}