@nsnanocat/util 1.8.7 → 1.8.8

package/package.json

@@ -32,5 +32,5 @@
   "devDependencies": {
     "typescript": "^5.6.3"
   },
-  "version": "1.8.7"
+  "version": "1.8.8"
 }

package/polyfill/fetch.mjs

@@ -159,37 +159,44 @@ export async function fetch(resource, options = {}) {
 				}),
 			]);
 		case "Node.js": {
-			const iconv = require("iconv-lite");
-			const got = globalThis.got ? globalThis.got : require("got");
-			const cktough = globalThis.cktough ? globalThis.cktough : require("tough-cookie");
-			const ckjar = globalThis.ckjar ? globalThis.ckjar : new cktough.CookieJar();
-			if (resource) {
-				resource.headers = resource.headers ? resource.headers : {};
-				if (undefined === resource.headers.Cookie && undefined === resource.cookieJar) resource.cookieJar = ckjar;
-			}
+			const nodeFetch = globalThis.fetch ? globalThis.fetch : require("node-fetch");
+			const fetchCookie = globalThis.fetchCookie ? globalThis.fetchCookie : require("fetch-cookie").default;
+			const fetch = fetchCookie(nodeFetch);
+			// 转换请求参数
+			resource.timeout = resource.timeout * 1000;
+			resource.redirect = resource.redirection ? "follow" : "manual";
 			const { url, ...options } = resource;
-			return await got[method](url, options)
-				.on("redirect", (response, nextOpts) => {
-					try {
-						if (response.headers["set-cookie"]) {
-							const ck = response.headers["set-cookie"].map(cktough.Cookie.parse).toString();
-							if (ck) ckjar.setCookieSync(ck, null);
-							nextOpts.cookieJar = ckjar;
+			// 发送请求
+			return Promise.race([
+				await fetch(url, options)
+					.then(async response => {
+						const bodyBytes = await response.arrayBuffer();
+						let headers;
+						try {
+							headers = response.headers.raw();
+						} catch {
+							headers = Array.from(response.headers.entries()).reduce((acc, [key, value]) => {
+								acc[key] = acc[key] ? [...acc[key], value] : [value];
+								return acc;
+							}, {});
 						}
-					} catch (e) {
-						Console.error(e);
-					}
-					// ckjar.setCookieSync(response.headers["set-cookie"].map(Cookie.parse).toString())
-				})
-				.then(
-					response => {
-						response.statusCode = response.status;
-						response.body = iconv.decode(response.rawBody, "utf-8");
-						response.bodyBytes = response.rawBody;
-						return response;
-					},
-					error => Promise.reject(error.message),
-				);
+						return {
+							ok: response.ok ?? /^2\d\d$/.test(response.status),
+							status: response.status,
+							statusCode: response.status,
+							statusText: response.statusText,
+							body: bodyBytes.toString("utf-8"),
+							bodyBytes: bodyBytes,
+							headers: Object.fromEntries(Object.entries(headers).map(([key, value]) => [key, key.toLowerCase() !== "set-cookie" ? value.toString() : value])),
+						};
+					})
+					.catch(error => Promise.reject(error.message)),
+				new Promise((resolve, reject) => {
+					setTimeout(() => {
+						reject(new Error(`${Function.name}: 请求超时, 请检查网络后重试`));
+					}, resource.timeout);
+				}),
+			]);
 		}
 	}
 }