@whitesev/utils 2.7.0 → 2.7.1

package/dist/index.iife.js

@@ -749,13 +749,13 @@ var Utils = (function () {
     // ==UserScript==
     // @name         ajaxHooker
     // @author       cxxjackie
-    // @version      1.4.6
+    // @version      1.4.7
     // @supportURL   https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
     // @license      GNU LGPL-3.0
     // ==/UserScript==
 
     const ajaxHooker = function () {
-    	const version = "1.4.6";
+    	const version = "1.4.7";
     	const hookInst = {
     		hookFns: [],
     		filters: [],
@@ -765,20 +765,18 @@ var Utils = (function () {
     	const resProto = win.Response.prototype;
     	const xhrResponses = ["response", "responseText", "responseXML"];
     	const fetchResponses = ["arrayBuffer", "blob", "formData", "json", "text"];
-    	const fetchInitProps = [
-    		"method",
-    		"headers",
-    		"body",
-    		"mode",
-    		"credentials",
+    	const xhrExtraProps = ["responseType", "timeout", "withCredentials"];
+    	const fetchExtraProps = [
     		"cache",
+    		"credentials",
+    		"integrity",
+    		"keepalive",
+    		"mode",
+    		"priority",
     		"redirect",
     		"referrer",
     		"referrerPolicy",
-    		"integrity",
-    		"keepalive",
     		"signal",
-    		"priority",
     	];
     	const xhrAsyncEvents = ["readystatechange", "load", "loadend"];
     	const getType = {}.toString.call.bind({}.toString);
@@ -856,6 +854,10 @@ var Utils = (function () {
     			this.request = request;
     			this.requestClone = { ...this.request };
     		}
+    		_recoverRequestKey(key) {
+    			if (key in this.requestClone) this.request[key] = this.requestClone[key];
+    			else delete this.request[key];
+    		}
     		shouldFilter(filters) {
     			const { type, url, method, async } = this.request;
     			return (
@@ -876,7 +878,6 @@ var Utils = (function () {
     			);
     		}
     		waitForRequestKeys() {
-    			const requestKeys = ["url", "method", "abort", "headers", "data"];
     			if (!this.request.async) {
     				win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
     					if (this.shouldFilter(filters)) return;
@@ -884,27 +885,31 @@ var Utils = (function () {
     						if (getType(fn) === "[object Function]")
     							catchError(fn, this.request);
     					});
-    					requestKeys.forEach((key) => {
-    						if (isThenable(this.request[key]))
-    							this.request[key] = this.requestClone[key];
-    					});
+    					for (const key in this.request) {
+    						if (isThenable(this.request[key])) this._recoverRequestKey(key);
+    					}
     				});
     				return new SyncThenable();
     			}
     			const promises = [];
+    			const ignoreKeys = new Set(["type", "async", "response"]);
     			win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
     				if (this.shouldFilter(filters)) return;
     				promises.push(
     					Promise.all(hookFns.map((fn) => catchError(fn, this.request))).then(
-    						() =>
-    							Promise.all(
+    						() => {
+    							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.request[key] = this.requestClone[key])
+    										() => this._recoverRequestKey(key)
     									)
     								)
-    							)
+    							);
+    						}
     					)
     				);
     			});
@@ -1085,6 +1090,7 @@ var Utils = (function () {
     			e.stopImmediatePropagation = stopImmediatePropagation;
     			defineProp(e, "target", () => this.proxyXhr);
     			defineProp(e, "currentTarget", () => this.proxyXhr);
+    			defineProp(e, "srcElement", () => this.proxyXhr);
     			this.proxyEvents[e.type] &&
     				this.proxyEvents[e.type].forEach((fn) => {
     					this.resThenable.then(
@@ -1162,6 +1168,9 @@ var Utils = (function () {
     					for (const header in request.headers) {
     						xhr.setRequestHeader(header, request.headers[header]);
     					}
+    					for (const prop of xhrExtraProps) {
+    						if (prop in request) xhr[prop] = request[prop];
+    					}
     					xhr.send(request.data);
     				}
     			});
@@ -1183,8 +1192,10 @@ var Utils = (function () {
     		return new Promise(async (resolve, reject) => {
     			const init = {};
     			if (getType(url) === "[object Request]") {
-    				for (const prop of fetchInitProps) init[prop] = url[prop];
+    				init.method = url.method;
+    				init.headers = url.headers;
     				if (url.body) init.body = await url.arrayBuffer();
+    				for (const prop of fetchExtraProps) init[prop] = url[prop];
     				url = url.url;
     			}
     			url = url.toString();
@@ -1231,6 +1242,9 @@ var Utils = (function () {
     			init.method = request.method;
     			init.headers = request.headers;
     			init.body = request.data;
+    			for (const prop of fetchExtraProps) {
+    				if (prop in request) init[prop] = request[prop];
+    			}
     			winAh.realFetch.call(win, request.url, init).then((res) => {
     				if (typeof request.response === "function") {
     					const response = {
@@ -5593,7 +5607,7 @@ var Utils = (function () {
             this.windowApi = new WindowApi(option);
         }
         /** 版本号 */
-        version = "2025.6.26";
+        version = "2025.7.29";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -5677,7 +5691,7 @@ var Utils = (function () {
          * ajax劫持库，支持xhr和fetch劫持。
          * + 来源：https://bbs.tampermonkey.net.cn/thread-3284-1-1.html
          * + 作者：cxxjackie
-         * + 版本：1.4.6
+         * + 版本：1.4.7
          * + 旧版本：1.2.4
          * + 文档：https://scriptcat.org/zh-CN/script-show-page/637/
          * @param useOldVersion 是否使用旧版本，默认false