🐛 修复GM.xmlHttpRequest的onload事件 #570

Author: CodFrm

src/app/service/content/gm_api.ts

@@ -806,10 +806,14 @@ export default class GMApi extends GM_Base {
   public ["GM.xmlHttpRequest"](details: GMTypes.XHRDetails): Promise<GMTypes.XHRResponse> {
     let abort: { abort: () => void };
     const ret = new Promise<GMTypes.XHRResponse>((resolve, reject) => {
+      const oldOnload = details.onload;
       details.onloadend = (xhr: GMTypes.XHRResponse) => {
+        oldOnload && oldOnload(xhr);
         resolve(xhr);
       };
+      const oldOnerror = details.onerror;
       details.onerror = (error: any) => {
+        oldOnerror && oldOnerror(error);
         reject(error);
       };
       abort = _GM_xmlhttpRequest(this, details);

src/pkg/utils/match.test.ts

@@ -10,6 +10,7 @@ describe("UrlMatch-google", () => {
   url.add("https://example.org/foo/bar.html", "ok4");
   url.add("http://127.0.0.1/*", "ok5");
   url.add("*://mail.google.com/*", "ok6");
+  url.exclude("https://example-2.org/foo/bar.html", "ok1");
   it("match1", () => {
     expect(url.match("https://www.google.com/")).toEqual(["ok1"]);
     expect(url.match("https://example.org/foo/bar.html")).toEqual(["ok1", "ok2", "ok4"]);
@@ -34,6 +35,9 @@ describe("UrlMatch-google", () => {
     expect(url.match("http://mail.google.com/foo/baz/bar")).toEqual(["ok6"]);
     expect(url.match("https://mail.google.com/foobar")).toEqual(["ok1", "ok2", "ok3", "ok6"]);
   });
+  it("exclude", () => {
+    expect(url.match("https://example-2.org/foo/bar.html")).toEqual(["ok2"]);
+  });
 });
 
 describe("UrlMatch-google-error", () => {