🔥 FirefoxMV2: 跟随MV3 移除 axios (#1339)

* FirefoxMV2: 跟随MV3 移除 axios

* 🔧 修复资源管理器测试：将 axios mock 替换为 fetch mock

---------

Co-authored-by: 王一之 <yz@ggnb.top>

Author: cyfung1031

.gitignore

@@ -32,6 +32,7 @@ tailwind.config.js
 
 superpowers
 .claude
+.omc
 CLAUDE.md
 
 test-results

package-lock.json

@@ -29,7 +29,6 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
-    "axios": "^1.13.2",
     "core-js": "^3.47.0",
     "cron": "^2.4.4",
     "crx": "^5.0.1",

package.json

@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
 /* eslint-disable import/prefer-default-export */
-import { ExtServer } from "@App/app/const";
-import { api } from "@App/pkg/axios";
+import { ExtServer, ExtServerApi } from "@App/app/const";
 import { WarpTokenError } from "./error";
 
 type NetDiskType = "baidu" | "onedrive";
@@ -11,11 +10,7 @@ export function GetNetDiskToken(netDiskType: NetDiskType): Promise<{
   msg: string;
   data: { token: { access_token: string; refresh_token: string } };
 }> {
-  return api
-    .get(`/auth/net-disk/token?netDiskType=${netDiskType}`)
-    .then((resp) => {
-      return resp.data;
-    });
+  return fetch(ExtServerApi + `auth/net-disk/token?netDiskType=${netDiskType}`).then((resp) => resp.json());
 }
 
 export function RefreshToken(
@@ -26,14 +21,16 @@ export function RefreshToken(
   msg: string;
   data: { token: { access_token: string; refresh_token: string } };
 }> {
-  return api
-    .post(`/auth/net-disk/token/refresh?netDiskType=${netDiskType}`, {
+  return fetch(ExtServerApi + `auth/net-disk/token/refresh?netDiskType=${netDiskType}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
       netDiskType,
       refreshToken,
-    })
-    .then((resp) => {
-      return resp.data;
-    });
+    }),
+  }).then((resp) => resp.json());
 }
 
 export function NetDisk(netDiskType: NetDiskType) {

pkg/filesystem/auth.ts

@@ -3,6 +3,7 @@ import { version } from "../../package.json";
 export const ExtVersion = version;
 
 export const ExtServer = "https://ext.scriptcat.org/";
+export const ExtServerApi = ExtServer + "api/v1/";
 
 export const ExternalWhitelist = [
   "greasyfork.org",

src/app/const.ts

@@ -10,23 +10,23 @@ import {
 } from "@App/app/repo/resource";
 import { ResourceLinkDAO } from "@App/app/repo/resource_link";
 import { Script } from "@App/app/repo/scripts";
-import axios from "axios";
 import Cache from "@App/app/cache";
 import { blobToBase64 } from "@App/pkg/utils/utils";
 import CacheKey from "@App/pkg/utils/cache_key";
 import { isText } from "@App/pkg/utils/istextorbinary";
 import Manager from "../manager";
 import { calculateHashFromArrayBuffer } from "@App/pkg/utils/crypto";
 import { base64ToHex, isBase64 } from "./utils";
+import { blobToUint8Array } from "@App/pkg/utils/datatype";
 
 // 资源管理器,负责资源的更新获取等操作
 
 function calculateHash(blob: Blob): Promise<ResourceHash> {
   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: "",
@@ -35,7 +35,7 @@ function calculateHash(blob: Blob): Promise<ResourceHash> {
           sha512: "",
         });
       } else {
-        resolve(calculateHashFromArrayBuffer(<ArrayBuffer>reader.result));
+        resolve(calculateHashFromArrayBuffer(<ArrayBuffer>this.result));
       }
     };
   });
@@ -366,41 +366,34 @@ export class ResourceManager extends Manager {
     return Promise.resolve(undefined);
   }
 
-  loadByUrl(url: string, type: ResourceType): Promise<Resource> {
-    return new Promise((resolve, reject) => {
-      const u = this.parseUrl(url);
-      axios
-        .get(u.url, {
-          responseType: "blob",
-        })
-        .then(async (response) => {
-          if (response.status !== 200) {
-            return reject(
-              new Error(`resource response status not 200:${response.status}`)
-            );
-          }
-          const resource: Resource = {
-            id: 0,
-            url: u.url,
-            content: "",
-            contentType: (
-              response.headers["content-type"] || "application/octet-stream"
-            ).split(";")[0],
-            hash: await calculateHash(<Blob>response.data),
-            base64: "",
-            type,
-            createtime: new Date().getTime(),
-          };
-          const arrayBuffer = await (<Blob>response.data).arrayBuffer();
-          const uint8Array = new Uint8Array(arrayBuffer);
-          if (isText(uint8Array)) {
-            resource.content = await (<Blob>response.data).text();
-          }
-          resource.base64 = (await blobToBase64(<Blob>response.data)) || "";
-          return resolve(resource);
-        })
-        .catch((e) => reject(e));
-    });
+  async loadByUrl(url: string, type: ResourceType): Promise<Resource> {
+    const u = this.parseUrl(url);
+    const resp = await fetch(u.url);
+    if (resp.status !== 200) {
+      throw new Error(`resource response status not 200: ${resp.status}`);
+    }
+    const data = await resp.blob();
+    const [hash, uint8Array, base64] = await Promise.all([
+      calculateHash(data),
+      blobToUint8Array(data),
+      blobToBase64(data),
+    ]);
+    const contentType = resp.headers.get("content-type");
+    const resource: Resource = {
+      id: 0,
+      url: u.url,
+      content: "",
+      contentType: (contentType || "application/octet-stream").split(";")[0],
+      hash: hash,
+      base64: "",
+      type,
+      createtime: Date.now(),
+    };
+    if (isText(uint8Array)) {
+      resource.content = await data.text();
+    }
+    resource.base64 = base64 || "";
+    return resource;
   }
 
   parseUrl(url: string): {