Merge branch 'main' into release/v1.3

Author: CodFrm

example/gm_download.js

@@ -19,5 +19,4 @@ GM_download({
     }, onload(data) {
         console.log("load", data);
     },
-    downloadMethod: "xhr"
 });

example/tests/gm_xhr_test.js

@@ -874,7 +874,8 @@ const enableTool = true;
         });
         assertEq(res.status, 200);
         assert(progressEvents >= 4, "received at least 4 progress events");
-        assert(lastLoaded >= 0, "progress loaded captured");
+        // `progress` is guaranteed to fire only in the Fetch API.
+        assert(fetch ? lastLoaded > 0 : lastLoaded >= 0, "progress loaded captured");
         assert(!response, "no response");
       },
     },
@@ -916,7 +917,8 @@ const enableTool = true;
         });
         assertEq(res.status, 200);
         assert(progressEvents >= 4, "received at least 4 progress events");
-        assert(lastLoaded >= 0, "progress loaded captured");
+        // `progress` is guaranteed to fire only in the Fetch API.
+        assert(fetch ? lastLoaded > 0 : lastLoaded >= 0, "progress loaded captured");
         assert(response instanceof ReadableStream && typeof response.getReader === "function", "response");
       },
     },

packages/chrome-extension-mock/downloads.ts

@@ -1,5 +1,20 @@
 export default class Downloads {
-  download(_: any, callback: () => void) {
-    callback && callback();
+  onChangedCallback: ((downloadDelta: chrome.downloads.DownloadDelta) => void) | null = null;
+
+  onChanged = {
+    addListener: (callback: (downloadDelta: chrome.downloads.DownloadDelta) => void) => {
+      this.onChangedCallback = callback;
+    },
+    removeListener: (_callback: (downloadDelta: chrome.downloads.DownloadDelta) => void) => {
+      this.onChangedCallback = null;
+    },
+  };
+
+  download(_: any, callback: (downloadId: number) => void) {
+    callback && callback(1);
+    this.onChangedCallback?.({
+      id: 1,
+      state: { current: "complete" },
+    });
   }
 }

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

@@ -0,0 +1,48 @@
+import { describe, it, expect } from "vitest";
+import { shouldFnBind } from "./create_context";
+
+describe.concurrent("shouldFnBind", () => {
+  it.concurrent("不处理非原生函数", () => {
+    const o: Record<string, any> = {};
+    o.targetArrowFn = () => {};
+    expect(shouldFnBind(o.targetArrowFn)).toBe(false);
+    o.targetArrowFn = new Proxy(o.targetArrowFn, {});
+    expect(shouldFnBind(o.targetArrowFn)).toBe(false);
+    o.targetFn1 = function () {};
+    expect(shouldFnBind(o.targetFn1)).toBe(false);
+    o.targetFn1 = new Proxy(o.targetFn1, {});
+    expect(shouldFnBind(o.targetFn1)).toBe(false);
+    o.targetFn2 = function targetFn2() {};
+    expect(shouldFnBind(o.targetFn2)).toBe(false);
+    o.targetFn2 = new Proxy(o.targetFn2, {});
+    expect(shouldFnBind(o.targetFn2)).toBe(false);
+  });
+  it.concurrent("处理Proxy Function #985", () => {
+    const o: Record<string, any> = {};
+    // 例1: valueOf
+    o.valueOf = global.valueOf;
+    expect(shouldFnBind(o.valueOf)).toBe(true);
+    o.valueOf = new Proxy(o.valueOf, {});
+    expect(shouldFnBind(o.valueOf)).toBe(true);
+    // 例2: setTimeoutForTest1: 验证一次拦截
+    // @ts-ignore
+    o.setTimeoutForTest1 = global.setTimeoutForTest1;
+    expect(shouldFnBind(o.setTimeoutForTest1)).toBe(true);
+    o.setTimeoutForTest1 = new Proxy(o.setTimeoutForTest1, {
+      apply: (target, thisArg, argArray) => {
+        console.log("proxy call", { target, thisArg, argArray });
+      },
+    });
+    expect(shouldFnBind(o.setTimeoutForTest1)).toBe(true);
+    // 例2: setTimeoutForTest2: 验证二次拦截
+    // @ts-ignore
+    o.setTimeoutForTest2 = global.setTimeoutForTest2;
+    expect(shouldFnBind(o.setTimeoutForTest2)).toBe(true);
+    o.setTimeoutForTest2 = new Proxy(o.setTimeoutForTest2, {
+      apply: (target, thisArg, argArray) => {
+        console.log("proxy call", { target, thisArg, argArray });
+      },
+    });
+    expect(shouldFnBind(o.setTimeoutForTest2)).toBe(true);
+  });
+});

src/app/service/content/create_context.ts

@@ -100,22 +100,22 @@ export const createContext = (
 const noEval = false;
 
 // 取得原生函数代码表示
-const getNativeCodeSeg = () => {
+const getNativeCodeSegs = () => {
   const k = "propertyIsEnumerable"; // 选用 Object.propertyIsEnumerable 取得原生函数代码表示
   const codeSeg = `${Object[k]}`;
   const idx1 = codeSeg.indexOf(k);
   const idx2 = codeSeg.indexOf("()");
   const idx3 = codeSeg.lastIndexOf("(");
   if (idx1 > 0 && idx2 > 0 && idx3 === idx2) {
-    return codeSeg.substring(idx1 + k.length);
+    return [codeSeg.substring(0, idx1), codeSeg.substring(idx1 + k.length)];
   }
-  return "";
+  return null;
 };
 
-const nativeCodeSeg = getNativeCodeSeg();
+const ncs = getNativeCodeSegs();
 
 // 判断是否应该将函数绑定到global （原生函数）
-const shouldFnBind = (f: any) => {
+export const shouldFnBind = (f: any) => {
   if (typeof f !== "function") return false;
   // 函数有 prototype 即为 Class
   if ("prototype" in f) return false; // 避免getter, 使用 in operator (注意, nodeJS的测试环境有异)
@@ -125,8 +125,15 @@ const shouldFnBind = (f: any) => {
   if (!name) return false;
   const e = name.charCodeAt(0);
   if (e >= 97 && e <= 122 && !name.includes(" ")) {
-    // 为避免浏览器插件封装了 原生函数，需要进行 toString 测试
-    if (nativeCodeSeg.length && `${f}`.endsWith(`${name}${nativeCodeSeg}`)) {
+    // 为避免浏览器插件封装了 原生函数，需要进行 toString 测试 （Proxy封装例外）
+    if (ncs?.[1]) {
+      const s = `${f}`;
+      // 广告拦截扩展进行Proxy封装后丢失名字 （Chrome：所有经Proxy封装都会变成无名原生函数）
+      if (s === `${ncs[0]}${name}${ncs[1]}` || s === `${ncs[0]}${ncs[1]}`) {
+        return true;
+      }
+    } else {
+      // 代码错误，全部 bind
       return true;
     }
   }
@@ -240,6 +247,10 @@ const sharedInitCopy = USE_PSEUDO_WINDOW
       ...overridedDescs,
     });
 
+// 把沙盒的 console 和网页的 console 隔离
+const initConsoleDescs = Object.getOwnPropertyDescriptors(console);
+const ConsolePrototype = Object.getPrototypeOf(console);
+
 type GMWorldContext = typeof globalThis & Record<PropertyKey, any>;
 
 const isPrimitive = (x: any) => x !== Object(x);
@@ -388,5 +399,8 @@ export const createProxyContext = <const Context extends GMWorldContext>(context
     mySandbox.onurlchange = null;
   }
 
+  // 从网页 console 隔离出来的沙盒 console
+  mySandbox.console = Object.create(ConsolePrototype, initConsoleDescs);
+
   return mySandbox;
 };

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

@@ -303,8 +303,8 @@ describe("沙盒环境测试", async () => {
       // });
 
       // 在模拟环境无法测试：在实际操作中和TM一致
-      // 在非拦截式沙盒裡删除 沙盒onload 后，会取得页面的真onload
-      // 在非拦截式沙盒裡删除 真onload 后，会变undefined
+      // 在非拦截式沙盒里删除 沙盒onload 后，会取得页面的真onload
+      // 在非拦截式沙盒里删除 真onload 后，会变undefined
       // it.concurrent("删除 onload 后应该为 null", () => {
       //   const mockFn = vi.fn();
       //   _this["onload"] = function thisOnLoad() {
@@ -376,33 +376,58 @@ describe("沙盒环境测试", async () => {
 
   it.concurrent("[兼容问题] Ensure Illegal invocation can be tested", () => {
     expect(global.setTimeout.name).toEqual("setTimeout");
+    // -----
     //@ts-ignore
-    expect(global.setTimeoutForTest.name).toEqual("setTimeoutForTest");
-    expect(_this.setTimeoutForTest.name).toEqual("bound setTimeoutForTest");
+    expect(global.setTimeoutForTest1.name).toEqual("setTimeoutForTest1");
+    expect(_this.setTimeoutForTest1.name).toEqual("bound setTimeoutForTest1");
     //@ts-ignore
     expect(() => global.setTimeout.call(global, () => {}, 1)).not.toThrow();
     //@ts-ignore
-    expect(() => global.setTimeoutForTest.call(global, () => {}, 1)).not.toThrow();
+    expect(() => global.setTimeoutForTest1.call(global, () => {}, 1)).not.toThrow();
     //@ts-ignore
-    expect(() => global.setTimeoutForTest.call({}, () => {}, 1)).toThrow();
+    expect(() => global.setTimeoutForTest1.call({}, () => {}, 1)).toThrow();
+    // -----
+    //@ts-ignore
+    expect(global.setTimeoutForTest2.name).toEqual("setTimeoutForTest2");
+    expect(_this.setTimeoutForTest2.name).toEqual("bound setTimeoutForTest2");
+    //@ts-ignore
+    expect(() => global.setTimeout.call(global, () => {}, 1)).not.toThrow();
+    //@ts-ignore
+    expect(() => global.setTimeoutForTest2.call(global, () => {}, 1)).not.toThrow();
+    //@ts-ignore
+    expect(() => global.setTimeoutForTest2.call({}, () => {}, 1)).toThrow();
   });
   // https://github.com/xcanwin/KeepChatGPT 环境隔离得不够干净导致的
   it.concurrent("[兼容问题] Uncaught TypeError: Illegal invocation #189", () => {
-    // setTimeout 和 setTimeoutForTest 都測試吧
+    // setTimeout 和 setTimeoutForTest1 都测试吧
     const promise1 = new Promise((resolve) => {
       console.log(_this.setTimeout.prototype);
-      _this.setTimeoutForTest(resolve, 1);
+      _this.setTimeoutForTest1(resolve, 1);
     });
     const promise2 = new Promise((resolve) => {
       console.log(_this.setTimeout.prototype);
       _this.setTimeout(resolve, 1);
     });
-    expect(Promise.all([promise1, promise2]).then(() => "ok")).resolves.toBe("ok");
+    const res = Promise.all([promise1, promise2]);
+    expect(res.then((res) => (!res[0] && !res[1] ? "ok" : "ng"))).resolves.toBe("ok");
   });
   // AC-baidu-重定向优化百度搜狗谷歌必应搜索_favicon_双列
   it.concurrent("[兼容问题] TypeError: Object.freeze is not a function #116", () => {
     expect(() => _this.Object.freeze({})).not.toThrow();
   });
+  it.concurrent("Proxy Function #985", () => {
+    // setTimeout 和 setTimeoutForTest2 都测试吧
+    const promise1 = new Promise((resolve) => {
+      console.log(_this.setTimeout.prototype);
+      _this.setTimeoutForTest2(resolve, 1);
+    });
+    const promise2 = new Promise((resolve) => {
+      console.log(_this.setTimeout.prototype);
+      _this.setTimeout(resolve, 1);
+    });
+    const res = Promise.all([promise1, promise2]);
+    expect(res.then((res) => (res[0] === "proxy" && !res[1] ? "ok" : "ng"))).resolves.toBe("ok");
+  });
 
   const tag = (<any>global)[Symbol.toStringTag]; // 实际环境：'[object Window]' 测试环境：'[object global]'
 

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

@@ -887,7 +887,7 @@ export default class GMApi extends GM_Base {
               retPromiseResolve?.(data.data);
               break;
             case "onprogress":
-              details.onprogress?.(makeCallbackParam({ ...data.data }));
+              details.onprogress?.(makeCallbackParam({ ...data.data, mode: "browser" }));
               retPromiseReject?.(new Error("Timeout ERROR"));
               break;
             case "ontimeout":
@@ -963,7 +963,7 @@ export default class GMApi extends GM_Base {
             // details.onload?.(makeCallbackParam({}))
           },
           onprogress: (e) => {
-            details.onprogress?.(makeCallbackParam({ ...e }));
+            details.onprogress?.(makeCallbackParam({ ...e, mode: "native" }));
           },
           ontimeout: () => {
             details.ontimeout?.(makeCallbackParam({}));

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

@@ -112,6 +112,9 @@ export function GM_xmlhttpRequest(
     }
   }
   const contentContext = details.context;
+  if (details.method) {
+    details.method = `${details.method}`.toUpperCase() as typeof details.method;
+  }
 
   const param: GMSend.XHRDetails = {
     method: details.method,
@@ -173,7 +176,18 @@ export function GM_xmlhttpRequest(
     const responseType = responseTypeOriginal; // 回传用
 
     // 发送信息
-    a.connect(isDownload ? "GM_download" : "GM_xmlhttpRequest", [param]).then((con) => {
+    let connectMessage: Promise<MessageConnect>;
+    if (isDownload) {
+      // 如果是下载，带上 downloadMode 参数，呼叫 SW 的 GM_download
+      // 在 SW 中处理，实际使用 GM_xmlhttpRequest 进行下载
+      const method = param.method === "POST" ? "POST" : "GET";
+      const downloadParam: GMTypes.DownloadDetails<string> = { ...param, method, downloadMode: "native", name: "" };
+      connectMessage = a.connect("GM_download", [downloadParam]);
+    } else {
+      // 一般 GM_xmlhttpRequest，呼叫 SW 的 GM_xmlhttpRequest
+      connectMessage = a.connect("GM_xmlhttpRequest", [param]);
+    }
+    connectMessage.then((con) => {
       // 注意。在此 callback 里，不应直接存取 param, 否则会影响 GC
       connect = con;
       const resultTexts = [] as string[]; // 函数参考清掉后，变数会被GC
@@ -336,9 +350,6 @@ export function GM_xmlhttpRequest(
               return responseXML as Document | null;
             },
             get responseText() {
-              if (responseTypeOriginal === "document") {
-                // console.log(resultType, resultBuffers.length, resultTexts.length);
-              }
               if (responseText === false) {
                 if (resultType === 2) {
                   finalResultBuffers ||= concatUint8(resultBuffers);
@@ -347,7 +358,6 @@ export function GM_xmlhttpRequest(
                   const text = decoder.decode(buf);
                   responseText = text;
                 } else {
-                  // resultType === 3
                   if (finalResultText === null) finalResultText = `${resultTexts.join("")}`;
                   responseText = finalResultText;
                 }

src/app/service/content/script_executor.ts

@@ -3,7 +3,7 @@ import { getStorageName } from "@App/pkg/utils/utils";
 import type { EmitEventRequest } from "../service_worker/types";
 import ExecScript from "./exec_script";
 import type { GMInfoEnv, ScriptFunc, ValueUpdateDataEncoded } from "./types";
-import { addStyle, definePropertyListener } from "./utils";
+import { addStyleSheet, definePropertyListener } from "./utils";
 import type { TScriptInfo } from "@App/app/repo/scripts";
 import { DefinedFlags } from "../service_worker/runtime.consts";
 
@@ -116,7 +116,7 @@ export class ScriptExecutor {
       for (const val of metadata["require-css"]) {
         const res = resource[val];
         if (res) {
-          addStyle(res.content);
+          addStyleSheet(res.content);
         }
       }
     }