[v1.3] 改良代码 - .load / .loadend

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

@@ -71,7 +71,9 @@ export const toBlobURL = (a: GMApi, blob: Blob): Promise<string> | string => {
 export const blobToDataURL = (blob: Blob): Promise<string> => {
   return new Promise<string>((resolve, reject) => {
     const reader = new FileReader();
-    reader.onload = () => resolve(reader.result as string);
+    reader.onloadend = function () {
+      resolve(<string>this.result);
+    };
     reader.onerror = reject;
     reader.onabort = reject;
     reader.readAsDataURL(blob);

src/app/service/content/scripting.ts

@@ -81,15 +81,16 @@ export default class ScriptingRuntime {
           }
           case "CAT_fetchDocument": {
             const [url, isContent] = data.params;
+            // 根据来源选择不同的消息桥（content / inject）
+            let msg: CustomEventMessage | null = isContent ? this.senderToContent : this.senderToInject;
             return new Promise((resolve) => {
               const xhr = new XMLHttpRequest();
               xhr.responseType = "document";
               xhr.open("GET", url);
-              xhr.onload = () => {
-                // 根据来源选择不同的消息桥（content / inject）
-                const msg = isContent ? this.senderToContent : this.senderToInject;
-                const nodeId = msg.sendRelatedTarget(xhr.response);
+              xhr.onloadend = function () {
+                const nodeId = msg!.sendRelatedTarget(this.response);
                 resolve(nodeId);
+                msg = null;
               };
               xhr.send();
             });

src/app/service/service_worker/resource.ts

@@ -241,8 +241,8 @@ export class ResourceService {
     return new Promise((resolve) => {
       const reader = new FileReader();
       reader.readAsArrayBuffer(blob);
-      reader.onloadend = () => {
-        if (!reader.result) {
+      reader.onloadend = function () {
+        if (!this.result) {
           resolve({
             md5: "",
             sha1: "",
@@ -251,7 +251,7 @@ export class ResourceService {
             sha512: "",
           });
         } else {
-          resolve(calculateHashFromArrayBuffer(<ArrayBuffer>reader.result));
+          resolve(calculateHashFromArrayBuffer(<ArrayBuffer>this.result));
         }
       };
     });

src/pkg/utils/crypto.ts

@@ -5,11 +5,11 @@ export function calculateMd5(blob: Blob) {
   return new Promise<string>((resolve, reject) => {
     const reader = new FileReader();
     reader.readAsArrayBuffer(blob);
-    reader.onloadend = () => {
-      if (!reader.result) {
+    reader.onloadend = function () {
+      if (!this.result) {
         reject(new Error("result is null"));
       } else {
-        const result = calculateMD5FromArrayBuffer(<ArrayBuffer>reader.result);
+        const result = calculateMD5FromArrayBuffer(<ArrayBuffer>this.result);
         resolve(result);
       }
     };

src/pkg/utils/datatype.ts

@@ -5,8 +5,8 @@ export const blobToUint8Array = async (blob: Blob): Promise<Uint8Array<ArrayBuff
   if (typeof blob?.arrayBuffer === "function") return new Uint8Array(await blob.arrayBuffer());
   return new Promise((resolve, reject) => {
     const reader = new FileReader();
-    reader.onload = () => {
-      resolve(new Uint8Array(reader.result as ArrayBuffer));
+    reader.onloadend = function () {
+      resolve(new Uint8Array(this.result as ArrayBuffer));
     };
     reader.onerror = reject;
     reader.readAsArrayBuffer(blob);

src/pkg/utils/utils.ts

@@ -327,7 +327,9 @@ export const makeBlobURL = <T extends { blob: Blob; persistence: boolean }>(
 export function blobToBase64(blob: Blob): Promise<string> {
   return new Promise((resolve) => {
     const reader = new FileReader();
-    reader.onloadend = () => resolve(<string>reader.result);
+    reader.onloadend = function () {
+      resolve(<string>this.result);
+    };
     reader.readAsDataURL(blob);
   });
 }
@@ -336,7 +338,9 @@ export function blobToBase64(blob: Blob): Promise<string> {
 export function blobToText(blob: Blob): Promise<string | null> {
   return new Promise((resolve) => {
     const reader = new FileReader();
-    reader.onloadend = () => resolve(<string | null>reader.result);
+    reader.onloadend = function () {
+      resolve(<string>this.result);
+    };
     reader.readAsText(blob);
   });
 }