@whitesev/utils 2.7.0 → 2.7.1

package/README.md

@@ -1,6 +1,6 @@
 # 安装
 
-+ 最新版本：[![npm version](https://img.shields.io/npm/v/@whitesev/utils)](https://www.npmjs.com/package/@whitesev/utils)
+- 最新版本：[![npm version](https://img.shields.io/npm/v/@whitesev/utils)](https://www.npmjs.com/package/@whitesev/utils)
 
 ```node
 npm install @whitesev/utils
@@ -37,8 +37,8 @@ Utils.assign({1:1},{1:2,2:3})
 
 ```javascript
 /* 等待a元素出现，返回Promise对象，在then中或使用await获取结果，统一返回数组格式的元素，如[...a] */
-Utils.waitNode("a").then((element => {
-  console.log(element );
+Utils.waitNode("a").then((element) => {
+	console.log(element);
 });
 
 /* 同时满足多个选择器的结果，都满足了才会触发回调 */
@@ -61,24 +61,24 @@ Utils.toJSON("{123:123}");
 let httpx = new Utils.Httpx();
 /* 修改配置 */
 httpx.config({
-  timeout: 5000,
-  onabort: function () {
-    console.log("请求取消");
-  },
-  ontimeout: function () {
-    console.log("请求超时");
-  },
-  onerror: function (response) {
-    console.log("httpx-onerror 请求异常");
-    console.log(response);
-  },
+	timeout: 5000,
+	onabort: function () {
+		console.log("请求取消");
+	},
+	ontimeout: function () {
+		console.log("请求超时");
+	},
+	onerror: function (response) {
+		console.log("httpx-onerror 请求异常");
+		console.log(response);
+	},
 });
 /* 发送post请求 */
 let postResp = await httpx.post({
-  url: url,
-  data: JSON.stringify({
-    test: 1,
-  }),
+	url: url,
+	data: JSON.stringify({
+		test: 1,
+	}),
 });
 ```
 
@@ -173,4 +173,4 @@ menu_key:{
 GM_Menu.delete("menu_key");
 ```
 
-等...API请看代码
+等...API 请看文档

package/dist/index.amd.js

@@ -748,13 +748,13 @@ define((function () { 'use strict';
     // ==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: [],
@@ -764,20 +764,18 @@ define((function () { 'use strict';
     	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);
@@ -855,6 +853,10 @@ define((function () { 'use strict';
     			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 (
@@ -875,7 +877,6 @@ define((function () { 'use strict';
     			);
     		}
     		waitForRequestKeys() {
-    			const requestKeys = ["url", "method", "abort", "headers", "data"];
     			if (!this.request.async) {
     				win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
     					if (this.shouldFilter(filters)) return;
@@ -883,27 +884,31 @@ define((function () { 'use strict';
     						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)
     									)
     								)
-    							)
+    							);
+    						}
     					)
     				);
     			});
@@ -1084,6 +1089,7 @@ define((function () { 'use strict';
     			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(
@@ -1161,6 +1167,9 @@ define((function () { 'use strict';
     					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);
     				}
     			});
@@ -1182,8 +1191,10 @@ define((function () { 'use strict';
     		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();
@@ -1230,6 +1241,9 @@ define((function () { 'use strict';
     			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 = {
@@ -5592,7 +5606,7 @@ define((function () { 'use strict';
             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类型");
@@ -5676,7 +5690,7 @@ define((function () { 'use strict';
          * 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