From 38fbb4f106ba8464ba410ec8caab5be5bbc82578 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Wed, 8 Apr 2026 05:06:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?FirefoxMV2:=20=E8=B7=9F=E9=9A=8FMV3=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=20axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 31 ++++++++-- package.json | 1 - pkg/filesystem/auth.ts | 23 ++++---- src/app/const.ts | 1 + src/app/service/resource/manager.ts | 71 +++++++++++------------ src/pkg/axios.ts | 11 ---- src/pkg/utils/datatype.ts | 88 +++++++++++++++++++++++++++++ 7 files changed, 158 insertions(+), 68 deletions(-) delete mode 100644 src/pkg/axios.ts create mode 100644 src/pkg/utils/datatype.ts diff --git a/package-lock.json b/package-lock.json index 3df6f1089..79f3c413a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "scriptcat", - "version": "0.16.12", + "version": "0.16.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scriptcat", - "version": "0.16.12", + "version": "0.16.13", "license": "GPLv3", "dependencies": { "@arco-design/web-react": "^2.66.1", @@ -17,7 +17,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", @@ -6006,6 +6005,7 @@ }, "node_modules/asynckit": { "version": "0.4.0", + "dev": true, "license": "MIT" }, "node_modules/available-typed-arrays": { @@ -6035,7 +6035,9 @@ "version": "1.13.2", "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", @@ -6731,6 +6733,7 @@ }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -7094,6 +7097,7 @@ }, "node_modules/combined-stream": { "version": "1.0.8", + "dev": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -8249,6 +8253,7 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -8466,6 +8471,7 @@ }, "node_modules/dunder-proto": { "version": "1.0.1", + "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -8679,6 +8685,7 @@ }, "node_modules/es-define-property": { "version": "1.0.1", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -8686,6 +8693,7 @@ }, "node_modules/es-errors": { "version": "1.3.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -8726,6 +8734,7 @@ }, "node_modules/es-object-atoms": { "version": "1.1.1", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -8738,6 +8747,7 @@ "version": "2.1.0", "resolved": "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -10123,6 +10133,7 @@ }, "node_modules/follow-redirects": { "version": "1.15.9", + "dev": true, "funding": [ { "type": "individual", @@ -10130,6 +10141,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=4.0" }, @@ -10157,6 +10169,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -10262,6 +10275,7 @@ }, "node_modules/get-intrinsic": { "version": "1.3.0", + "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -10292,6 +10306,7 @@ }, "node_modules/get-proto": { "version": "1.0.1", + "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -10444,6 +10459,7 @@ }, "node_modules/gopd": { "version": "1.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -10544,6 +10560,7 @@ }, "node_modules/has-symbols": { "version": "1.1.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -10554,6 +10571,7 @@ }, "node_modules/has-tostringtag": { "version": "1.0.2", + "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" @@ -15384,6 +15402,7 @@ }, "node_modules/math-intrinsics": { "version": "1.1.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -15467,6 +15486,7 @@ }, "node_modules/mime-db": { "version": "1.52.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -15474,6 +15494,7 @@ }, "node_modules/mime-types": { "version": "2.1.35", + "dev": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -16817,7 +16838,9 @@ }, "node_modules/proxy-from-env": { "version": "1.1.0", - "license": "MIT" + "dev": true, + "license": "MIT", + "peer": true }, "node_modules/psl": { "version": "1.9.0", diff --git a/package.json b/package.json index a97fb0d88..1792f632b 100644 --- a/package.json +++ b/package.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", diff --git a/pkg/filesystem/auth.ts b/pkg/filesystem/auth.ts index 945b96e8a..5aff6d064 100644 --- a/pkg/filesystem/auth.ts +++ b/pkg/filesystem/auth.ts @@ -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) { diff --git a/src/app/const.ts b/src/app/const.ts index b40531eb6..e1e2a7b9d 100644 --- a/src/app/const.ts +++ b/src/app/const.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", diff --git a/src/app/service/resource/manager.ts b/src/app/service/resource/manager.ts index 07492e428..fc36aabd2 100644 --- a/src/app/service/resource/manager.ts +++ b/src/app/service/resource/manager.ts @@ -10,7 +10,6 @@ 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"; @@ -18,6 +17,7 @@ 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"; // 资源管理器,负责资源的更新获取等操作 @@ -25,8 +25,8 @@ function calculateHash(blob: Blob): Promise { 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 { sha512: "", }); } else { - resolve(calculateHashFromArrayBuffer(reader.result)); + resolve(calculateHashFromArrayBuffer(this.result)); } }; }); @@ -366,41 +366,34 @@ export class ResourceManager extends Manager { return Promise.resolve(undefined); } - loadByUrl(url: string, type: ResourceType): Promise { - 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(response.data), - base64: "", - type, - createtime: new Date().getTime(), - }; - const arrayBuffer = await (response.data).arrayBuffer(); - const uint8Array = new Uint8Array(arrayBuffer); - if (isText(uint8Array)) { - resource.content = await (response.data).text(); - } - resource.base64 = (await blobToBase64(response.data)) || ""; - return resolve(resource); - }) - .catch((e) => reject(e)); - }); + async loadByUrl(url: string, type: ResourceType): Promise { + 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): { diff --git a/src/pkg/axios.ts b/src/pkg/axios.ts deleted file mode 100644 index 68709623b..000000000 --- a/src/pkg/axios.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable import/prefer-default-export */ - -import { ExtServer } from "@App/app/const"; -import axios from "axios"; - -export const api = axios.create({ - baseURL: `${ExtServer}api/v1`, - validateStatus(status) { - return status < 500; - }, -}); diff --git a/src/pkg/utils/datatype.ts b/src/pkg/utils/datatype.ts new file mode 100644 index 000000000..c214ced9d --- /dev/null +++ b/src/pkg/utils/datatype.ts @@ -0,0 +1,88 @@ +/* ---------- Helper functions ---------- */ + +/** Convert a Blob/File to Uint8Array */ +export const blobToUint8Array = async (blob: Blob): Promise> => { + if (typeof blob?.arrayBuffer === "function") return new Uint8Array(await blob.arrayBuffer()); + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.onloadend = function () { + resolve(new Uint8Array(this.result as ArrayBuffer)); + }; + reader.onerror = reject; + reader.readAsArrayBuffer(blob); + }); +}; + +/** Base64 -> Uint8Array (browser-safe) */ +export function base64ToUint8(b64: string): Uint8Array { + if (typeof (Uint8Array as any).fromBase64 === "function") { + // JS 2025 + return (Uint8Array as any).fromBase64(b64) as Uint8Array; + } else if (typeof Buffer !== "undefined" && typeof Buffer.from === "function") { + // Node.js + return Uint8Array.from(Buffer.from(b64, "base64")); + } else { + // Fallback + const bin = atob(b64); + const ab = new ArrayBuffer(bin.length); + const out = new Uint8Array(ab); // <- Uint8Array + for (let i = 0, l = bin.length; i < l; i++) out[i] = bin.charCodeAt(i); + return out; + } +} + +export function uint8ToBase64(uint8arr: Uint8Array): string { + if (typeof (uint8arr as any).toBase64 === "function") { + // JS 2025 + return (uint8arr as any).toBase64() as string; + } else if (typeof Buffer !== "undefined" && typeof Buffer.from === "function") { + // Node.js + return Buffer.from(uint8arr).toString("base64") as string; + } else { + // Fallback + let binary = ""; + let i = 0; + while (uint8arr.length - i > 65535) { + binary += String.fromCharCode(...uint8arr.slice(i, i + 65535)); + i += 65535; + } + binary += String.fromCharCode(...(i ? uint8arr.slice(i) : uint8arr)); + return btoa(binary) as string; + } +} + +// Split Uint8Array (or ArrayBuffer) into 2MB chunks as Uint8Array views +export function chunkUint8(src: Uint8Array | ArrayBuffer, chunkSize = 2 * 1024 * 1024): Uint8Array[] { + if (chunkSize <= 0) throw new RangeError("chunkSize must be > 0"); + // Fast path: normalize to a Uint8Array view without copying + const u8 = src instanceof Uint8Array ? src : new Uint8Array(src); + const len = u8.length; + if (len < chunkSize) return len ? [u8.subarray(0)] : []; + const full = Math.floor(len / chunkSize); + const rem = len - full * chunkSize; + const outLen = rem ? full + 1 : full; + const chunks = new Array(outLen); + let offset = 0; + for (let k = 0; k < full; k++) chunks[k] = u8.subarray(offset, (offset += chunkSize)); + if (rem) chunks[full] = u8.subarray(offset); + return chunks; // array of Uint8Array views +} + +// Helper to join Uint8Array chunks +export function concatUint8(chunks: readonly Uint8Array[]): Uint8Array { + const n = chunks.length; + if (n === 0) return new Uint8Array(0); + if (n === 1) { + return new Uint8Array(chunks[0]); + } + let total = 0; + for (let i = 0; i < n; i++) total += chunks[i].byteLength; + const out = new Uint8Array(total); + let offset = 0; + for (let i = 0; i < n; i++) { + const chunk = chunks[i]; + out.set(chunk, offset); + offset += chunk.byteLength; + } + return out; +} From fb08119dbaae511a9734a395b48f8e9205bdaefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Wed, 8 Apr 2026 09:56:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A7=20=E4=BF=AE=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=AE=A1=E7=90=86=E5=99=A8=E6=B5=8B=E8=AF=95=EF=BC=9A?= =?UTF-8?q?=E5=B0=86=20axios=20mock=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20fetch?= =?UTF-8?q?=20mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/app/service/resource/resource.test.ts | 62 +++++++++++++++++------ 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index f277dbc96..4da3edf5f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ tailwind.config.js superpowers .claude +.omc CLAUDE.md test-results diff --git a/src/app/service/resource/resource.test.ts b/src/app/service/resource/resource.test.ts index 0bf38b347..a296d9a38 100644 --- a/src/app/service/resource/resource.test.ts +++ b/src/app/service/resource/resource.test.ts @@ -3,10 +3,35 @@ import MessageCenter from "@App/app/message/center"; import { MessageHander } from "@App/app/message/message"; import initTestEnv from "@App/pkg/utils/test_utils"; import ResourceManager from "./manager"; -import axios from "axios"; -import MockAdapter from "axios-mock-adapter"; import { Script } from "@App/app/repo/scripts"; -const mock = new MockAdapter(axios); + +// mock fetch 路由表 +const fetchMocks: Record< + string, + { status: number; blob: Blob; contentType: string } +> = {}; + +function mockFetchRoute( + url: string, + status: number, + blob: Blob, + contentType: string +) { + fetchMocks[url] = { status, blob, contentType }; +} + +// @ts-ignore +global.fetch = jest.fn((url: string) => { + const mock = fetchMocks[url]; + if (!mock) { + return Promise.reject(new Error(`not implemented`)); + } + return Promise.resolve({ + status: mock.status, + blob: () => Promise.resolve(mock.blob), + headers: new Headers({ "content-type": mock.contentType }), + }); +}); // @ts-ignore global.sandbox = global; @@ -18,9 +43,12 @@ IoC.registerInstance(MessageCenter, center).alias([MessageHander]); describe("resource manager", () => { const manager = IoC.instance(ResourceManager) as ResourceManager; it("get resource", async () => { - mock.onGet("http://localhost/resource").reply(200, new Blob(["test"]), { - "content-type": "application/octet-stream", - }); + mockFetchRoute( + "http://localhost/resource", + 200, + new Blob(["test"]), + "application/octet-stream" + ); const resource = await manager.getResource( 1, "http://localhost/resource", @@ -36,11 +64,12 @@ describe("resource manager", () => { expect(resource).toEqual(resource2); }); it("not text", async () => { - mock - .onGet("http://localhost/require") - .reply(200, new Blob([String.fromCharCode(1) + String.fromCharCode(2)]), { - "content-type": "application/octet-stream", - }); + mockFetchRoute( + "http://localhost/require", + 200, + new Blob([String.fromCharCode(1) + String.fromCharCode(2)]), + "application/octet-stream" + ); const require = await manager.getResource( 1, "http://localhost/require", @@ -49,11 +78,12 @@ describe("resource manager", () => { expect(require!.content).toEqual(""); }); it("bad resource", async () => { - mock - .onGet("http://localhost/require2") - .reply(200, new Blob(["test"], { type: "text/javascript" }), { - "content-type": "text/javascript", - }); + mockFetchRoute( + "http://localhost/require2", + 200, + new Blob(["test"], { type: "text/javascript" }), + "text/javascript" + ); const script: Script = { metadata: { require: ["http://localhost/require2", "http://bad/resource"],