@whitesev/utils 2.7.3 → 2.7.5

package/dist/types/src/WindowApi.d.ts

@@ -10,4 +10,8 @@ export declare class WindowApi {
     get globalThis(): typeof globalThis | Window;
     get self(): Window & typeof globalThis;
     get top(): Window;
+    get setTimeout(): (handler: TimerHandler, timeout?: number, ...arguments: any[]) => number;
+    get setInterval(): (handler: TimerHandler, timeout?: number, ...arguments: any[]) => number;
+    get clearTimeout(): (id: number | undefined) => void;
+    get clearInterval(): (id: number | undefined) => void;
 }

package/dist/types/src/types/WindowApi.d.ts

@@ -7,4 +7,8 @@ export type WindowApiOption = {
 	globalThis?: typeof globalThis | Window;
 	self?: Window & typeof globalThis;
 	top: Window;
+	setTimeout: Window["setTimeout"];
+	setInterval: Window["setInterval"];
+	clearTimeout: Window["clearTimeout"];
+	clearInterval: Window["clearInterval"];
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",

package/src/Utils.ts

@@ -35,7 +35,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2025.8.11";
+	version = "2025.8.21";
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
 	 * @param cssText css字符串
@@ -4698,7 +4698,7 @@ class Utils {
 		try {
 			return WorkerSetTimeout(callback, timeout);
 		} catch (error) {
-			return globalThis.setTimeout(callback, timeout);
+			return this.windowApi.setTimeout(callback, timeout);
 		}
 	}
 	/**
@@ -4712,7 +4712,7 @@ class Utils {
 			}
 		} catch (error) {
 		} finally {
-			globalThis.clearTimeout(timeId);
+			this.windowApi.clearTimeout(timeId);
 		}
 	}
 	/**
@@ -4724,7 +4724,7 @@ class Utils {
 		try {
 			return WorkerSetInterval(callback, timeout);
 		} catch (error) {
-			return globalThis.setInterval(callback, timeout);
+			return this.windowApi.setInterval(callback, timeout);
 		}
 	}
 	/**
@@ -4738,7 +4738,7 @@ class Utils {
 			}
 		} catch (error) {
 		} finally {
-			globalThis.clearInterval(timeId);
+			this.windowApi.clearInterval(timeId);
 		}
 	}
 	/**

package/src/WindowApi.ts

@@ -8,6 +8,10 @@ export class WindowApi {
 		globalThis: globalThis,
 		self: self,
 		top: top!,
+		setTimeout: globalThis.setTimeout.bind(globalThis),
+		setInterval: globalThis.setInterval.bind(globalThis),
+		clearTimeout: globalThis.clearTimeout.bind(globalThis),
+		clearInterval: globalThis.clearInterval.bind(globalThis),
 	};
 	/** 使用的配置 */
 	private api: Required<WindowApiOption>;
@@ -40,4 +44,16 @@ export class WindowApi {
 	get top() {
 		return this.api.top;
 	}
+	get setTimeout() {
+		return this.api.setTimeout;
+	}
+	get setInterval() {
+		return this.api.setInterval;
+	}
+	get clearTimeout() {
+		return this.api.clearTimeout;
+	}
+	get clearInterval() {
+		return this.api.clearInterval;
+	}
 }

package/src/ajaxHooker/ajaxHooker.js

@@ -1,14 +1,14 @@
 // ==UserScript==
 // @name         ajaxHooker
 // @author       cxxjackie
-// @version      1.4.7
+// @version      1.4.8
 // @supportURL   https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
 // @license      GNU LGPL-3.0
 // ==/UserScript==
 
 export const ajaxHooker = function () {
 	"use strict";
-	const version = "1.4.7";
+	const version = "1.4.8";
 	const hookInst = {
 		hookFns: [],
 		filters: [],
@@ -37,11 +37,7 @@ export const ajaxHooker = function () {
 	const emptyFn = () => {};
 	const errorFn = (e) => console.error(e);
 	function isThenable(obj) {
-		return (
-			obj &&
-			["object", "function"].includes(typeof obj) &&
-			typeof obj.then === "function"
-		);
+		return obj && ["object", "function"].includes(typeof obj) && typeof obj.then === "function";
 	}
 	function catchError(fn, ...args) {
 		try {
@@ -79,8 +75,7 @@ export const ajaxHooker = function () {
 					const [header, value] = line.split(/(?<=^[^:]+)\s*:\s*/);
 					if (!value) continue;
 					const lheader = header.toLowerCase();
-					headers[lheader] =
-						lheader in headers ? `${headers[lheader]}, ${value}` : value;
+					headers[lheader] = lheader in headers ? `${headers[lheader]}, ${value}` : value;
 				}
 				break;
 			case "[object Headers]":
@@ -118,11 +113,9 @@ export const ajaxHooker = function () {
 				!filters.find((obj) => {
 					switch (true) {
 						case obj.type && obj.type !== type:
-						case getType(obj.url) === "[object String]" &&
-							!url.includes(obj.url):
+						case getType(obj.url) === "[object String]" && !url.includes(obj.url):
 						case getType(obj.url) === "[object RegExp]" && !obj.url.test(url):
-						case obj.method &&
-							obj.method.toUpperCase() !== method.toUpperCase():
+						case obj.method && obj.method.toUpperCase() !== method.toUpperCase():
 						case "async" in obj && obj.async !== async:
 							return false;
 					}
@@ -135,8 +128,7 @@ export const ajaxHooker = function () {
 				win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
 					if (this.shouldFilter(filters)) return;
 					hookFns.forEach((fn) => {
-						if (getType(fn) === "[object Function]")
-							catchError(fn, this.request);
+						if (getType(fn) === "[object Function]") catchError(fn, this.request);
 					});
 					for (const key in this.request) {
 						if (isThenable(this.request[key])) this._recoverRequestKey(key);
@@ -149,93 +141,72 @@ export const ajaxHooker = function () {
 			win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
 				if (this.shouldFilter(filters)) return;
 				promises.push(
-					Promise.all(hookFns.map((fn) => catchError(fn, this.request))).then(
-						() => {
-							const requestKeys = [];
-							for (const key in this.request)
-								!ignoreKeys.has(key) && requestKeys.push(key);
-							return Promise.all(
-								requestKeys.map((key) =>
-									Promise.resolve(this.request[key]).then(
-										(val) => (this.request[key] = val),
-										() => this._recoverRequestKey(key)
-									)
+					Promise.all(hookFns.map((fn) => catchError(fn, this.request))).then(() => {
+						const requestKeys = [];
+						for (const key in this.request) !ignoreKeys.has(key) && requestKeys.push(key);
+						return Promise.all(
+							requestKeys.map((key) =>
+								Promise.resolve(this.request[key]).then(
+									(val) => (this.request[key] = val),
+									() => this._recoverRequestKey(key)
 								)
-							);
-						}
-					)
+							)
+						);
+					})
 				);
 			});
 			return Promise.all(promises);
 		}
 		waitForResponseKeys(response) {
-			const responseKeys =
-				this.request.type === "xhr" ? xhrResponses : fetchResponses;
+			const responseKeys = this.request.type === "xhr" ? xhrResponses : fetchResponses;
 			if (!this.request.async) {
 				if (getType(this.request.response) === "[object Function]") {
 					catchError(this.request.response, response);
 					responseKeys.forEach((key) => {
-						if (
-							"get" in getDescriptor(response, key) ||
-							isThenable(response[key])
-						) {
+						if ("get" in getDescriptor(response, key) || isThenable(response[key])) {
 							delete response[key];
 						}
 					});
 				}
 				return new SyncThenable();
 			}
-			return Promise.resolve(catchError(this.request.response, response)).then(
-				() =>
-					Promise.all(
-						responseKeys.map((key) => {
-							const descriptor = getDescriptor(response, key);
-							if (descriptor && "value" in descriptor) {
-								return Promise.resolve(descriptor.value).then(
-									(val) => (response[key] = val),
-									() => delete response[key]
-								);
-							} else {
-								delete response[key];
-							}
-						})
-					)
+			return Promise.resolve(catchError(this.request.response, response)).then(() =>
+				Promise.all(
+					responseKeys.map((key) => {
+						const descriptor = getDescriptor(response, key);
+						if (descriptor && "value" in descriptor) {
+							return Promise.resolve(descriptor.value).then(
+								(val) => (response[key] = val),
+								() => delete response[key]
+							);
+						} else {
+							delete response[key];
+						}
+					})
+				)
 			);
 		}
 	}
 	const proxyHandler = {
 		get(target, prop) {
 			const descriptor = getDescriptor(target, prop);
-			if (
-				descriptor &&
-				!descriptor.configurable &&
-				!descriptor.writable &&
-				!descriptor.get
-			)
+			if (descriptor && !descriptor.configurable && !descriptor.writable && !descriptor.get)
 				return target[prop];
 			const ah = target.__ajaxHooker;
 			if (ah && ah.proxyProps) {
 				if (prop in ah.proxyProps) {
 					const pDescriptor = ah.proxyProps[prop];
 					if ("get" in pDescriptor) return pDescriptor.get();
-					if (typeof pDescriptor.value === "function")
-						return pDescriptor.value.bind(ah);
+					if (typeof pDescriptor.value === "function") return pDescriptor.value.bind(ah);
 					return pDescriptor.value;
 				}
-				if (typeof target[prop] === "function")
-					return target[prop].bind(target);
+				if (typeof target[prop] === "function") return target[prop].bind(target);
 			}
 			return target[prop];
 		},
 		set(target, prop, value) {
 			const descriptor = getDescriptor(target, prop);
-			if (
-				descriptor &&
-				!descriptor.configurable &&
-				!descriptor.writable &&
-				!descriptor.set
-			)
-				return true;
+			if (descriptor && !descriptor.configurable && !descriptor.writable && !descriptor.set) return true;
 			const ah = target.__ajaxHooker;
 			if (ah && ah.proxyProps && prop in ah.proxyProps) {
 				const pDescriptor = ah.proxyProps[prop];
@@ -257,11 +228,7 @@ export const ajaxHooker = function () {
 				proxyEvents: {},
 			});
 			xhr.addEventListener("readystatechange", (e) => {
-				if (
-					ah.proxyXhr.readyState === 4 &&
-					ah.request &&
-					typeof ah.request.response === "function"
-				) {
+				if (ah.proxyXhr.readyState === 4 && ah.request && typeof ah.request.response === "function") {
 					const response = {
 						finalUrl: ah.proxyXhr.responseURL,
 						status: ah.proxyXhr.status,
@@ -284,18 +251,16 @@ export const ajaxHooker = function () {
 							}
 						);
 					}
-					ah.resThenable = new AHRequest(ah.request)
-						.waitForResponseKeys(response)
-						.then(() => {
-							for (const key of xhrResponses) {
-								ah.proxyProps[key] = {
-									get: () => {
-										if (!(key in response)) response[key] = tempValues[key];
-										return response[key];
-									},
-								};
-							}
-						});
+					ah.resThenable = new AHRequest(ah.request).waitForResponseKeys(response).then(() => {
+						for (const key of xhrResponses) {
+							ah.proxyProps[key] = {
+								get: () => {
+									if (!(key in response)) response[key] = tempValues[key];
+									return response[key];
+								},
+							};
+						}
+					});
 				}
 				ah.dispatchEvent(e);
 			});
@@ -308,13 +273,7 @@ export const ajaxHooker = function () {
 					set: (val) => ah.addEvent(onEvt, val),
 				};
 			}
-			for (const method of [
-				"setRequestHeader",
-				"addEventListener",
-				"removeEventListener",
-				"open",
-				"send",
-			]) {
+			for (const method of ["setRequestHeader", "addEventListener", "removeEventListener", "open", "send"]) {
 				ah.proxyProps[method] = { value: ah[method] };
 			}
 		}
@@ -323,8 +282,7 @@ export const ajaxHooker = function () {
 			if (type.startsWith("on")) {
 				this.proxyEvents[type] = typeof event === "function" ? event : null;
 			} else {
-				if (typeof event === "object" && event !== null)
-					event = event.handleEvent;
+				if (typeof event === "object" && event !== null) event = event.handleEvent;
 				if (typeof event !== "function") return;
 				this.proxyEvents[type] = this.proxyEvents[type] || new Set();
 				this.proxyEvents[type].add(event);
@@ -334,8 +292,7 @@ export const ajaxHooker = function () {
 			if (type.startsWith("on")) {
 				this.proxyEvents[type] = null;
 			} else {
-				if (typeof event === "object" && event !== null)
-					event = event.handleEvent;
+				if (typeof event === "object" && event !== null) event = event.handleEvent;
 				this.proxyEvents[type] && this.proxyEvents[type].delete(event);
 			}
 		}
@@ -346,9 +303,7 @@ export const ajaxHooker = function () {
 			defineProp(e, "srcElement", () => this.proxyXhr);
 			this.proxyEvents[e.type] &&
 				this.proxyEvents[e.type].forEach((fn) => {
-					this.resThenable.then(
-						() => !e.ajaxHooker_isStopped && fn.call(this.proxyXhr, e)
-					);
+					this.resThenable.then(() => !e.ajaxHooker_isStopped && fn.call(this.proxyXhr, e));
 				});
 			if (e.ajaxHooker_isStopped) return;
 			const onEvent = this.proxyEvents["on" + e.type];
@@ -358,8 +313,7 @@ export const ajaxHooker = function () {
 			this.originalXhr.setRequestHeader(header, value);
 			if (!this.request) return;
 			const headers = this.request.headers;
-			headers[header] =
-				header in headers ? `${headers[header]}, ${value}` : value;
+			headers[header] = header in headers ? `${headers[header]}, ${value}` : value;
 		}
 		addEventListener(...args) {
 			if (xhrAsyncEvents.includes(args[0])) {
@@ -388,13 +342,7 @@ export const ajaxHooker = function () {
 			};
 			this.openArgs = args;
 			this.resThenable = new SyncThenable();
-			[
-				"responseURL",
-				"readyState",
-				"status",
-				"statusText",
-				...xhrResponses,
-			].forEach((key) => {
+			["responseURL", "readyState", "status", "statusText", ...xhrResponses].forEach((key) => {
 				delete this.proxyProps[key];
 			});
 			return this.originalXhr.open(method, url, async, ...args);
@@ -431,15 +379,12 @@ export const ajaxHooker = function () {
 	}
 	function fakeXHR() {
 		const xhr = new winAh.realXHR();
-		if ("__ajaxHooker" in xhr)
-			console.warn("检测到不同版本的ajaxHooker，可能发生冲突！");
+		if ("__ajaxHooker" in xhr) console.warn("检测到不同版本的ajaxHooker，可能发生冲突！");
 		xhr.__ajaxHooker = new XhrHooker(xhr);
 		return xhr.__ajaxHooker.proxyXhr;
 	}
 	fakeXHR.prototype = win.XMLHttpRequest.prototype;
-	Object.keys(win.XMLHttpRequest).forEach(
-		(key) => (fakeXHR[key] = win.XMLHttpRequest[key])
-	);
+	Object.keys(win.XMLHttpRequest).forEach((key) => (fakeXHR[key] = win.XMLHttpRequest[key]));
 	function fakeFetch(url, options = {}) {
 		if (!url) return winAh.realFetch.call(win, url, options);
 		return new Promise(async (resolve, reject) => {
@@ -505,18 +450,22 @@ export const ajaxHooker = function () {
 						status: res.status,
 						responseHeaders: parseHeaders(res.headers),
 					};
-					fetchResponses.forEach(
-						(key) =>
-							(res[key] = function () {
-								if (key in response) return Promise.resolve(response[key]);
-								return resProto[key].call(this).then((val) => {
-									response[key] = val;
-									return req
-										.waitForResponseKeys(response)
-										.then(() => (key in response ? response[key] : val));
-								});
-							})
-					);
+					if (res.ok) {
+						fetchResponses.forEach(
+							(key) =>
+								(res[key] = function () {
+									if (key in response) return Promise.resolve(response[key]);
+									return resProto[key].call(this).then((val) => {
+										response[key] = val;
+										return req
+											.waitForResponseKeys(response)
+											.then(() => (key in response ? response[key] : val));
+									});
+								})
+						);
+					} else {
+						catchError(request.response, response);
+					}
 				}
 				resolve(res);
 			}, reject);
@@ -538,8 +487,7 @@ export const ajaxHooker = function () {
 		realFetchClone: resProto.clone,
 		hookInsts: new Set(),
 	};
-	if (winAh.version !== version)
-		console.warn("检测到不同版本的ajaxHooker，可能发生冲突！");
+	if (winAh.version !== version) console.warn("检测到不同版本的ajaxHooker，可能发生冲突！");
 	win.XMLHttpRequest = winAh.fakeXHR;
 	win.fetch = winAh.fakeFetch;
 	resProto.clone = winAh.fakeFetchClone;
@@ -547,37 +495,25 @@ export const ajaxHooker = function () {
 	// 针对头条、抖音 secsdk.umd.js 的兼容性处理
 	class AHFunction extends Function {
 		call(thisArg, ...args) {
-			if (
-				thisArg &&
-				thisArg.__ajaxHooker &&
-				thisArg.__ajaxHooker.proxyXhr === thisArg
-			) {
+			if (thisArg && thisArg.__ajaxHooker && thisArg.__ajaxHooker.proxyXhr === thisArg) {
 				thisArg = thisArg.__ajaxHooker.originalXhr;
 			}
 			return Reflect.apply(this, thisArg, args);
 		}
 		apply(thisArg, args) {
-			if (
-				thisArg &&
-				thisArg.__ajaxHooker &&
-				thisArg.__ajaxHooker.proxyXhr === thisArg
-			) {
+			if (thisArg && thisArg.__ajaxHooker && thisArg.__ajaxHooker.proxyXhr === thisArg) {
 				thisArg = thisArg.__ajaxHooker.originalXhr;
 			}
 			return Reflect.apply(this, thisArg, args || []);
 		}
 	}
 	function hookSecsdk(csrf) {
-		Object.setPrototypeOf(
-			csrf.nativeXMLHttpRequestSetRequestHeader,
-			AHFunction.prototype
-		);
+		Object.setPrototypeOf(csrf.nativeXMLHttpRequestSetRequestHeader, AHFunction.prototype);
 		Object.setPrototypeOf(csrf.nativeXMLHttpRequestOpen, AHFunction.prototype);
 		Object.setPrototypeOf(csrf.nativeXMLHttpRequestSend, AHFunction.prototype);
 	}
 	if (win.secsdk) {
-		if (win.secsdk.csrf && win.secsdk.csrf.nativeXMLHttpRequestOpen)
-			hookSecsdk(win.secsdk.csrf);
+		if (win.secsdk.csrf && win.secsdk.csrf.nativeXMLHttpRequestOpen) hookSecsdk(win.secsdk.csrf);
 	} else {
 		defineProp(win, "secsdk", emptyFn, (secsdk) => {
 			delete win.secsdk;

package/src/types/WindowApi.d.ts

@@ -7,4 +7,8 @@ export type WindowApiOption = {
 	globalThis?: typeof globalThis | Window;
 	self?: Window & typeof globalThis;
 	top: Window;
+	setTimeout: Window["setTimeout"];
+	setInterval: Window["setInterval"];
+	clearTimeout: Window["clearTimeout"];
+	clearInterval: Window["clearInterval"];
 };