@whitesev/utils 2.7.2 → 2.7.4

package/dist/index.system.js

@@ -70,11 +70,7 @@ System.register('Utils', [], (function (exports) {
                         !validPattern.test(greenValue.toString()) ||
                         !validPattern.test(blueValue.toString()))
                         throw new TypeError("输入错误的rgb颜色值");
-                    let hexs = [
-                        redValue.toString(16),
-                        greenValue.toString(16),
-                        blueValue.toString(16),
-                    ];
+                    let hexs = [redValue.toString(16), greenValue.toString(16), blueValue.toString(16)];
                     for (let index = 0; index < 3; index++)
                         if (hexs[index].length == 1)
                             hexs[index] = "0" + hexs[index];
@@ -122,10 +118,7 @@ System.register('Utils', [], (function (exports) {
                     this.#data = dataText.match(/..../g);
                     for (let i = 0x81; i <= 0xfe; i++) {
                         for (let j = 0x40; j <= 0xfe; j++) {
-                            this.#U2Ghash[this.#data[index++]] = ("%" +
-                                i.toString(16) +
-                                "%" +
-                                j.toString(16)).toUpperCase();
+                            this.#U2Ghash[this.#data[index++]] = ("%" + i.toString(16) + "%" + j.toString(16)).toUpperCase();
                         }
                     }
                     for (let key in this.#U2Ghash) {
@@ -253,9 +246,7 @@ System.register('Utils', [], (function (exports) {
                         callbackFunction = callback;
                         context = __context__ || this;
                         let result = executeTryCatch(callbackFunction, handleError, context);
-                        return result !== void 0
-                            ? result
-                            : TryCatchCore;
+                        return result !== void 0 ? result : TryCatchCore;
                     },
                 };
                 /**
@@ -284,10 +275,7 @@ System.register('Utils', [], (function (exports) {
                         }
                         if (handleErrorFunc) {
                             if (typeof handleErrorFunc === "string") {
-                                result = new Function(handleErrorFunc).apply(funcThis, [
-                                    ...args,
-                                    error,
-                                ]);
+                                result = new Function(handleErrorFunc).apply(funcThis, [...args, error]);
                             }
                             else {
                                 result = handleErrorFunc.apply(funcThis, [...args, error]);
@@ -375,10 +363,7 @@ System.register('Utils', [], (function (exports) {
                                     itemResult = objItem === 0;
                                     break;
                                 case "string":
-                                    itemResult =
-                                        objItem.trim() === "" ||
-                                            objItem === "null" ||
-                                            objItem === "undefined";
+                                    itemResult = objItem.trim() === "" || objItem === "null" || objItem === "undefined";
                                     break;
                                 case "boolean":
                                     itemResult = !objItem;
@@ -419,8 +404,7 @@ System.register('Utils', [], (function (exports) {
                         return null;
                     let clone = obj instanceof Array ? [] : {};
                     for (const [key, value] of Object.entries(obj)) {
-                        clone[key] =
-                            typeof value === "object" ? UtilsContext.deepClone(value) : value;
+                        clone[key] = typeof value === "object" ? UtilsContext.deepClone(value) : value;
                     }
                     return clone;
                 }
@@ -738,13 +722,13 @@ System.register('Utils', [], (function (exports) {
             // ==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==
 
             const ajaxHooker = function () {
-            	const version = "1.4.7";
+            	const version = "1.4.8";
             	const hookInst = {
             		hookFns: [],
             		filters: [],
@@ -773,11 +757,7 @@ System.register('Utils', [], (function (exports) {
             	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 {
@@ -815,8 +795,7 @@ System.register('Utils', [], (function (exports) {
             					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]":
@@ -854,11 +833,9 @@ System.register('Utils', [], (function (exports) {
             				!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;
             					}
@@ -871,8 +848,7 @@ System.register('Utils', [], (function (exports) {
             				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);
@@ -885,93 +861,72 @@ System.register('Utils', [], (function (exports) {
             			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];
@@ -993,11 +948,7 @@ System.register('Utils', [], (function (exports) {
             				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,
@@ -1020,18 +971,16 @@ System.register('Utils', [], (function (exports) {
             							}
             						);
             					}
-            					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);
             			});
@@ -1044,13 +993,7 @@ System.register('Utils', [], (function (exports) {
             					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] };
             			}
             		}
@@ -1059,8 +1002,7 @@ System.register('Utils', [], (function (exports) {
             			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);
@@ -1070,8 +1012,7 @@ System.register('Utils', [], (function (exports) {
             			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);
             			}
             		}
@@ -1082,9 +1023,7 @@ System.register('Utils', [], (function (exports) {
             			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];
@@ -1094,8 +1033,7 @@ System.register('Utils', [], (function (exports) {
             			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])) {
@@ -1124,13 +1062,7 @@ System.register('Utils', [], (function (exports) {
             			};
             			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);
@@ -1167,15 +1099,12 @@ System.register('Utils', [], (function (exports) {
             	}
             	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) => {
@@ -1241,18 +1170,22 @@ System.register('Utils', [], (function (exports) {
             						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);
@@ -1274,8 +1207,7 @@ System.register('Utils', [], (function (exports) {
             		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;
@@ -1283,37 +1215,25 @@ System.register('Utils', [], (function (exports) {
             	// 针对头条、抖音 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;
@@ -1959,14 +1879,10 @@ System.register('Utils', [], (function (exports) {
                         // };
                         /* 点击菜单后触发callback后的网页是否刷新 */
                         menuOption.autoReload =
-                            typeof menuOption.autoReload !== "boolean"
-                                ? this.$default.autoReload
-                                : menuOption.autoReload;
+                            typeof menuOption.autoReload !== "boolean" ? this.$default.autoReload : menuOption.autoReload;
                         /* 点击菜单后触发callback后的网页是否存储值 */
                         menuOption.isStoreValue =
-                            typeof menuOption.isStoreValue !== "boolean"
-                                ? this.$default.isStoreValue
-                                : menuOption.isStoreValue;
+                            typeof menuOption.isStoreValue !== "boolean" ? this.$default.isStoreValue : menuOption.isStoreValue;
                         /**
                          * 用户点击菜单后的回调函数
                          * @param event
@@ -2019,8 +1935,7 @@ System.register('Utils', [], (function (exports) {
                      * @param menuKey 菜单-键key
                      */
                     getMenuHandledOption(menuKey) {
-                        return this.$data.data.find((item) => item.handleData.key === menuKey)
-                            ?.handleData;
+                        return this.$data.data.find((item) => item.handleData.key === menuKey)?.handleData;
                     },
                 };
                 constructor(details) {
@@ -2028,8 +1943,7 @@ System.register('Utils', [], (function (exports) {
                     this.GM_Api.setValue = details.GM_setValue;
                     this.GM_Api.registerMenuCommand = details.GM_registerMenuCommand;
                     this.GM_Api.unregisterMenuCommand = details.GM_unregisterMenuCommand;
-                    this.MenuHandle.$default.autoReload =
-                        typeof details.autoReload === "boolean" ? details.autoReload : true;
+                    this.MenuHandle.$default.autoReload = typeof details.autoReload === "boolean" ? details.autoReload : true;
                     for (const keyName of Object.keys(this.GM_Api)) {
                         if (typeof this.GM_Api[keyName] !== "function") {
                             throw new Error(`Utils.GM_Menu 请在脚本开头加上 @grant  ${keyName}，且传入该对象`);
@@ -2261,8 +2175,7 @@ System.register('Utils', [], (function (exports) {
                         _context = context || window;
                         _funcName = getFuncName(this);
                         _context["realFunc_" + _funcName] = this;
-                        if (_context[_funcName].prototype &&
-                            _context[_funcName].prototype.isHooked) {
+                        if (_context[_funcName].prototype && _context[_funcName].prototype.isHooked) {
                             console.log("Already has been hooked,unhook first");
                             return false;
                         }
@@ -2440,8 +2353,7 @@ System.register('Utils', [], (function (exports) {
                             if (details.allowInterceptConfig != null) {
                                 // 配置存在
                                 // 细分处理是否拦截
-                                if (typeof details.allowInterceptConfig.afterResponseSuccess ===
-                                    "boolean" &&
+                                if (typeof details.allowInterceptConfig.afterResponseSuccess === "boolean" &&
                                     !details.allowInterceptConfig.afterResponseSuccess) {
                                     // 设置了禁止拦截
                                     return details;
@@ -2476,8 +2388,7 @@ System.register('Utils', [], (function (exports) {
                             if (data.details.allowInterceptConfig != null) {
                                 // 配置存在
                                 // 细分处理是否拦截
-                                if (typeof data.details.allowInterceptConfig.afterResponseError ===
-                                    "boolean" &&
+                                if (typeof data.details.allowInterceptConfig.afterResponseError === "boolean" &&
                                     !data.details.allowInterceptConfig.afterResponseError) {
                                     // 设置了禁止拦截
                                     return data;
@@ -2579,44 +2490,31 @@ System.register('Utils', [], (function (exports) {
                         let requestOption = {
                             url: url,
                             method: (method || "GET").toString().toUpperCase().trim(),
-                            timeout: userRequestOption.timeout ||
-                                this.context.#defaultRequestOption.timeout,
-                            responseType: userRequestOption.responseType ||
-                                this.context.#defaultRequestOption.responseType,
+                            timeout: userRequestOption.timeout || this.context.#defaultRequestOption.timeout,
+                            responseType: userRequestOption.responseType || this.context.#defaultRequestOption.responseType,
                             /* 对象使用深拷贝 */
                             headers: commonUtil.deepClone(this.context.#defaultRequestOption.headers),
                             data: userRequestOption.data || this.context.#defaultRequestOption.data,
-                            redirect: userRequestOption.redirect ||
-                                this.context.#defaultRequestOption.redirect,
+                            redirect: userRequestOption.redirect || this.context.#defaultRequestOption.redirect,
                             cookie: userRequestOption.cookie || this.context.#defaultRequestOption.cookie,
-                            cookiePartition: userRequestOption.cookiePartition ||
-                                this.context.#defaultRequestOption.cookiePartition,
+                            cookiePartition: userRequestOption.cookiePartition || this.context.#defaultRequestOption.cookiePartition,
                             binary: userRequestOption.binary || this.context.#defaultRequestOption.binary,
-                            nocache: userRequestOption.nocache ||
-                                this.context.#defaultRequestOption.nocache,
-                            revalidate: userRequestOption.revalidate ||
-                                this.context.#defaultRequestOption.revalidate,
+                            nocache: userRequestOption.nocache || this.context.#defaultRequestOption.nocache,
+                            revalidate: userRequestOption.revalidate || this.context.#defaultRequestOption.revalidate,
                             /* 对象使用深拷贝 */
-                            context: commonUtil.deepClone(userRequestOption.context ||
-                                this.context.#defaultRequestOption.context),
-                            overrideMimeType: userRequestOption.overrideMimeType ||
-                                this.context.#defaultRequestOption.overrideMimeType,
-                            anonymous: userRequestOption.anonymous ||
-                                this.context.#defaultRequestOption.anonymous,
+                            context: commonUtil.deepClone(userRequestOption.context || this.context.#defaultRequestOption.context),
+                            overrideMimeType: userRequestOption.overrideMimeType || this.context.#defaultRequestOption.overrideMimeType,
+                            anonymous: userRequestOption.anonymous || this.context.#defaultRequestOption.anonymous,
                             fetch: userRequestOption.fetch || this.context.#defaultRequestOption.fetch,
                             /* 对象使用深拷贝 */
                             fetchInit: commonUtil.deepClone(this.context.#defaultRequestOption.fetchInit),
                             allowInterceptConfig: {
-                                beforeRequest: this.context.#defaultRequestOption
-                                    .allowInterceptConfig.beforeRequest,
-                                afterResponseSuccess: this.context.#defaultRequestOption
-                                    .allowInterceptConfig.afterResponseSuccess,
-                                afterResponseError: this.context.#defaultRequestOption
-                                    .allowInterceptConfig.afterResponseError,
+                                beforeRequest: this.context.#defaultRequestOption.allowInterceptConfig.beforeRequest,
+                                afterResponseSuccess: this.context.#defaultRequestOption.allowInterceptConfig.afterResponseSuccess,
+                                afterResponseError: this.context.#defaultRequestOption.allowInterceptConfig.afterResponseError,
                             },
                             user: userRequestOption.user || this.context.#defaultRequestOption.user,
-                            password: userRequestOption.password ||
-                                this.context.#defaultRequestOption.password,
+                            password: userRequestOption.password || this.context.#defaultRequestOption.password,
                             onabort(...args) {
                                 that.context.HttpxResponseCallBack.onAbort(userRequestOption, resolve, reject, args);
                             },
@@ -2664,14 +2562,12 @@ System.register('Utils', [], (function (exports) {
                         if (typeof requestOption.headers === "object") {
                             if (typeof userRequestOption.headers === "object") {
                                 Object.keys(userRequestOption.headers).forEach((keyName, index) => {
-                                    if (keyName in requestOption.headers &&
-                                        userRequestOption.headers?.[keyName] == null) {
+                                    if (keyName in requestOption.headers && userRequestOption.headers?.[keyName] == null) {
                                         /* 在默认的header中存在，且设置它新的值为空，那么就是默认的值 */
                                         Reflect.deleteProperty(requestOption.headers, keyName);
                                     }
                                     else {
-                                        requestOption.headers[keyName] =
-                                            userRequestOption?.headers?.[keyName];
+                                        requestOption.headers[keyName] = userRequestOption?.headers?.[keyName];
                                     }
                                 });
                             }
@@ -2684,8 +2580,7 @@ System.register('Utils', [], (function (exports) {
                             /* 使用assign替换且添加 */
                             if (typeof userRequestOption.fetchInit === "object") {
                                 Object.keys(userRequestOption.fetchInit).forEach((keyName, index) => {
-                                    if (keyName in requestOption.fetchInit &&
-                                        userRequestOption.fetchInit[keyName] == null) {
+                                    if (keyName in requestOption.fetchInit && userRequestOption.fetchInit[keyName] == null) {
                                         /* 在默认的fetchInit中存在，且设置它新的值为空，那么就是默认的值 */
                                         Reflect.deleteProperty(requestOption.fetchInit, keyName);
                                     }
@@ -2699,8 +2594,7 @@ System.register('Utils', [], (function (exports) {
                             Reflect.set(requestOption, "fetchInit", userRequestOption.fetchInit);
                         }
                         // 处理新的cookiePartition
-                        if (typeof requestOption.cookiePartition === "object" &&
-                            requestOption.cookiePartition != null) {
+                        if (typeof requestOption.cookiePartition === "object" && requestOption.cookiePartition != null) {
                             if (Reflect.has(requestOption.cookiePartition, "topLevelSite") &&
                                 typeof requestOption.cookiePartition.topLevelSite !== "string") {
                                 // topLevelSite必须是字符串
@@ -2722,8 +2616,7 @@ System.register('Utils', [], (function (exports) {
                             }
                             else {
                                 // 补充origin+/
-                                requestOption.url =
-                                    globalThis.location.origin + "/" + requestOption.url;
+                                requestOption.url = globalThis.location.origin + "/" + requestOption.url;
                             }
                         }
                         if (requestOption.fetchInit && !requestOption.fetch) {
@@ -2847,8 +2740,7 @@ System.register('Utils', [], (function (exports) {
                          * fetch的请求配置
                          **/
                         let fetchRequestOption = {};
-                        if ((option.method === "GET" || option.method === "HEAD") &&
-                            option.data != null) {
+                        if ((option.method === "GET" || option.method === "HEAD") && option.data != null) {
                             /* GET 或 HEAD 方法的请求不能包含 body 信息 */
                             Reflect.deleteProperty(option, "data");
                         }
@@ -3129,8 +3021,7 @@ System.register('Utils', [], (function (exports) {
                         if (typeof details?.onreadystatechange === "function") {
                             details.onreadystatechange.apply(this, argsResult);
                         }
-                        else if (typeof this.context.#defaultRequestOption?.onreadystatechange ===
-                            "function") {
+                        else if (typeof this.context.#defaultRequestOption?.onreadystatechange === "function") {
                             this.context.#defaultRequestOption.onreadystatechange.apply(this, argsResult);
                         }
                     },
@@ -3159,8 +3050,7 @@ System.register('Utils', [], (function (exports) {
                         if (this.context.#defaultInitOption.logDetails) {
                             console.log("[Httpx-HttpxRequest.request] 请求前的配置👇", details);
                         }
-                        if (typeof this.context.HttpxRequestHook.beforeRequestCallBack ===
-                            "function") {
+                        if (typeof this.context.HttpxRequestHook.beforeRequestCallBack === "function") {
                             let hookResult = await this.context.HttpxRequestHook.beforeRequestCallBack(details);
                             if (hookResult == null) {
                                 return;
@@ -3216,9 +3106,7 @@ System.register('Utils', [], (function (exports) {
                             /* 如果需要stream，且获取到的是stream，那直接返回 */
                             if (option.responseType === "stream" ||
                                 (fetchResponse.headers.has("Content-Type") &&
-                                    fetchResponse.headers
-                                        .get("Content-Type")
-                                        .includes("text/event-stream"))) {
+                                    fetchResponse.headers.get("Content-Type").includes("text/event-stream"))) {
                                 Reflect.set(httpxResponse, "isStream", true);
                                 Reflect.set(httpxResponse, "response", fetchResponse.body);
                                 Reflect.deleteProperty(httpxResponse, "responseText");
@@ -3237,9 +3125,7 @@ System.register('Utils', [], (function (exports) {
                             /** 数据编码 */
                             let encoding = "utf-8";
                             if (fetchResponse.headers.has("Content-Type")) {
-                                let charsetMatched = fetchResponse.headers
-                                    .get("Content-Type")
-                                    ?.match(/charset=(.+)/);
+                                let charsetMatched = fetchResponse.headers.get("Content-Type")?.match(/charset=(.+)/);
                                 if (charsetMatched) {
                                     encoding = charsetMatched[1];
                                     encoding = encoding.toLowerCase();
@@ -3261,13 +3147,11 @@ System.register('Utils', [], (function (exports) {
                                 response = new Blob([arrayBuffer]);
                             }
                             else if (option.responseType === "json" ||
-                                (typeof fetchResponseType === "string" &&
-                                    fetchResponseType.includes("application/json"))) {
+                                (typeof fetchResponseType === "string" && fetchResponseType.includes("application/json"))) {
                                 // response返回格式是JSON格式
                                 response = commonUtil.toJSON(responseText);
                             }
-                            else if (option.responseType === "document" ||
-                                option.responseType == null) {
+                            else if (option.responseType === "document" || option.responseType == null) {
                                 // response返回格式是文档格式
                                 let parser = new DOMParser();
                                 response = parser.parseFromString(responseText, "text/html");
@@ -3530,8 +3414,7 @@ System.register('Utils', [], (function (exports) {
                         }
                         requestOption = this.HttpxRequestOption.removeRequestNullOption(requestOption);
                         const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
+                        if (requestResult != null && typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
@@ -4022,8 +3905,7 @@ System.register('Utils', [], (function (exports) {
                     if (typeof __GM_info === "string") {
                         this.tag = __GM_info;
                     }
-                    else if (typeof __GM_info === "object" &&
-                        typeof __GM_info?.script?.name === "string") {
+                    else if (typeof __GM_info === "object" && typeof __GM_info?.script?.name === "string") {
                         this.tag = __GM_info.script.name;
                     }
                     this.#console = console;
@@ -4079,8 +3961,7 @@ System.register('Utils', [], (function (exports) {
                  */
                 checkClearConsole() {
                     this.#logCount++;
-                    if (this.#details.autoClearConsole &&
-                        this.#logCount > this.#details.logMaxCount) {
+                    if (this.#details.autoClearConsole && this.#logCount > this.#details.logMaxCount) {
                         this.#console.clear();
                         this.#logCount = 0;
                     }
@@ -4489,6 +4370,10 @@ System.register('Utils', [], (function (exports) {
                     globalThis: globalThis,
                     self: self,
                     top: top,
+                    setTimeout: globalThis.setTimeout,
+                    setInterval: globalThis.setInterval,
+                    clearTimeout: globalThis.clearTimeout,
+                    clearInterval: globalThis.clearInterval,
                 };
                 /** 使用的配置 */
                 api;
@@ -4521,6 +4406,18 @@ System.register('Utils', [], (function (exports) {
                 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;
+                }
             }
 
             const VueUtils = {
@@ -4996,7 +4893,7 @@ System.register('Utils', [], (function (exports) {
             };
 
             // This is the minified and stringified code of the worker-timers-worker package.
-            const worker = `(()=>{var e={455:function(e,t){!function(e){"use strict";var t=function(e){return function(t){var r=e(t);return t.add(r),r}},r=function(e){return function(t,r){return e.set(t,r),r}},n=void 0===Number.MAX_SAFE_INTEGER?9007199254740991:Number.MAX_SAFE_INTEGER,o=536870912,s=2*o,a=function(e,t){return function(r){var a=t.get(r),i=void 0===a?r.size:a<s?a+1:0;if(!r.has(i))return e(r,i);if(r.size<o){for(;r.has(i);)i=Math.floor(Math.random()*s);return e(r,i)}if(r.size>n)throw new Error("Congratulations, you created a collection of unique numbers which uses all available integers!");for(;r.has(i);)i=Math.floor(Math.random()*n);return e(r,i)}},i=new WeakMap,u=r(i),c=a(u,i),l=t(c);e.addUniqueNumber=l,e.generateUniqueNumber=c}(t)}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n].call(s.exports,s,s.exports,r),s.exports}(()=>{"use strict";const e=-32603,t=-32602,n=-32601,o=(e,t)=>Object.assign(new Error(e),{status:t}),s=t=>o('The handler of the method called "'.concat(t,'" returned an unexpected result.'),e),a=(t,r)=>async({data:{id:a,method:i,params:u}})=>{const c=r[i];try{if(void 0===c)throw(e=>o('The requested method called "'.concat(e,'" is not supported.'),n))(i);const r=void 0===u?c():c(u);if(void 0===r)throw(t=>o('The handler of the method called "'.concat(t,'" returned no required result.'),e))(i);const l=r instanceof Promise?await r:r;if(null===a){if(void 0!==l.result)throw s(i)}else{if(void 0===l.result)throw s(i);const{result:e,transferables:r=[]}=l;t.postMessage({id:a,result:e},r)}}catch(e){const{message:r,status:n=-32603}=e;t.postMessage({error:{code:n,message:r},id:a})}};var i=r(455);const u=new Map,c=(e,r,n)=>({...r,connect:({port:t})=>{t.start();const n=e(t,r),o=(0,i.generateUniqueNumber)(u);return u.set(o,(()=>{n(),t.close(),u.delete(o)})),{result:o}},disconnect:({portId:e})=>{const r=u.get(e);if(void 0===r)throw(e=>o('The specified parameter called "portId" with the given value "'.concat(e,'" does not identify a port connected to this worker.'),t))(e);return r(),{result:null}},isSupported:async()=>{if(await new Promise((e=>{const t=new ArrayBuffer(0),{port1:r,port2:n}=new MessageChannel;r.onmessage=({data:t})=>e(null!==t),n.postMessage(t,[t])}))){const e=n();return{result:e instanceof Promise?await e:e}}return{result:!1}}}),l=(e,t,r=()=>!0)=>{const n=c(l,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},d=(e,t)=>r=>{const n=t.get(r);if(void 0===n)return Promise.resolve(!1);const[o,s]=n;return e(o),t.delete(r),s(!1),Promise.resolve(!0)},f=(e,t,r,n)=>(o,s,a)=>{const i=o+s-t.timeOrigin,u=i-t.now();return new Promise((t=>{e.set(a,[r(n,u,i,e,t,a),t])}))},m=new Map,h=d(globalThis.clearTimeout,m),p=new Map,v=d(globalThis.clearTimeout,p),w=((e,t)=>{const r=(n,o,s,a)=>{const i=n-e.now();i>0?o.set(a,[t(r,i,n,o,s,a),s]):(o.delete(a),s(!0))};return r})(performance,globalThis.setTimeout),g=f(m,performance,globalThis.setTimeout,w),T=f(p,performance,globalThis.setTimeout,w);l(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?h(e):v(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?g:T)(e,t,r)})})})()})();`; // tslint:disable-line:max-line-length
+            const worker = `(()=>{var e={455:function(e,t){!function(e){"use strict";var t=function(e){return function(t){var r=e(t);return t.add(r),r}},r=function(e){return function(t,r){return e.set(t,r),r}},n=void 0===Number.MAX_SAFE_INTEGER?9007199254740991:Number.MAX_SAFE_INTEGER,o=536870912,s=2*o,a=function(e,t){return function(r){var a=t.get(r),i=void 0===a?r.size:a<s?a+1:0;if(!r.has(i))return e(r,i);if(r.size<o){for(;r.has(i);)i=Math.floor(Math.random()*s);return e(r,i)}if(r.size>n)throw new Error("Congratulations, you created a collection of unique numbers which uses all available integers!");for(;r.has(i);)i=Math.floor(Math.random()*n);return e(r,i)}},i=new WeakMap,u=r(i),c=a(u,i),l=t(c);e.addUniqueNumber=l,e.generateUniqueNumber=c}(t)}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n].call(s.exports,s,s.exports,r),s.exports}(()=>{"use strict";const e=-32603,t=-32602,n=-32601,o=(e,t)=>Object.assign(new Error(e),{status:t}),s=t=>o('The handler of the method called "'.concat(t,'" returned an unexpected result.'),e),a=(t,r)=>async({data:{id:a,method:i,params:u}})=>{const c=r[i];try{if(void 0===c)throw(e=>o('The requested method called "'.concat(e,'" is not supported.'),n))(i);const r=void 0===u?c():c(u);if(void 0===r)throw(t=>o('The handler of the method called "'.concat(t,'" returned no required result.'),e))(i);const l=r instanceof Promise?await r:r;if(null===a){if(void 0!==l.result)throw s(i)}else{if(void 0===l.result)throw s(i);const{result:e,transferables:r=[]}=l;t.postMessage({id:a,result:e},r)}}catch(e){const{message:r,status:n=-32603}=e;t.postMessage({error:{code:n,message:r},id:a})}};var i=r(455);const u=new Map,c=(e,r,n)=>({...r,connect:({port:t})=>{t.start();const n=e(t,r),o=(0,i.generateUniqueNumber)(u);return u.set(o,()=>{n(),t.close(),u.delete(o)}),{result:o}},disconnect:({portId:e})=>{const r=u.get(e);if(void 0===r)throw(e=>o('The specified parameter called "portId" with the given value "'.concat(e,'" does not identify a port connected to this worker.'),t))(e);return r(),{result:null}},isSupported:async()=>{if(await new Promise(e=>{const t=new ArrayBuffer(0),{port1:r,port2:n}=new MessageChannel;r.onmessage=({data:t})=>e(null!==t),n.postMessage(t,[t])})){const e=n();return{result:e instanceof Promise?await e:e}}return{result:!1}}}),l=(e,t,r=()=>!0)=>{const n=c(l,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},d=(e,t)=>r=>{const n=t.get(r);if(void 0===n)return Promise.resolve(!1);const[o,s]=n;return e(o),t.delete(r),s(!1),Promise.resolve(!0)},f=(e,t,r,n)=>(o,s,a)=>{const i=o+s-t.timeOrigin,u=i-t.now();return new Promise(t=>{e.set(a,[r(n,u,i,e,t,a),t])})},m=new Map,h=d(globalThis.clearTimeout,m),p=new Map,v=d(globalThis.clearTimeout,p),w=((e,t)=>{const r=(n,o,s,a)=>{const i=n-e.now();i>0?o.set(a,[t(r,i,n,o,s,a),s]):(o.delete(a),s(!0))};return r})(performance,globalThis.setTimeout),g=f(m,performance,globalThis.setTimeout,w),T=f(p,performance,globalThis.setTimeout,w);l(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?h(e):v(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?g:T)(e,t,r)})})})()})();`; // tslint:disable-line:max-line-length
 
             const loadOrReturnBroker = createLoadOrReturnBroker(load, worker);
             const clearInterval = (timerId) => loadOrReturnBroker().clearInterval(timerId);
@@ -5583,7 +5480,7 @@ System.register('Utils', [], (function (exports) {
                     this.windowApi = new WindowApi(option);
                 }
                 /** 版本号 */
-                version = "2025.7.29";
+                version = "2025.8.21";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -5706,13 +5603,9 @@ System.register('Utils', [], (function (exports) {
                     let touchEvent = UtilsContext.windowApi.window.event;
                     let $click = clickEvent?.composedPath()?.[0];
                     // 点击的x坐标
-                    let clickPosX = clickEvent?.clientX != null
-                        ? clickEvent.clientX
-                        : touchEvent.touches[0].clientX;
+                    let clickPosX = clickEvent?.clientX != null ? clickEvent.clientX : touchEvent.touches[0].clientX;
                     // 点击的y坐标
-                    let clickPosY = clickEvent?.clientY != null
-                        ? clickEvent.clientY
-                        : touchEvent.touches[0].clientY;
+                    let clickPosY = clickEvent?.clientY != null ? clickEvent.clientY : touchEvent.touches[0].clientY;
                     let { 
                     /* 要检测的元素的相对屏幕的横坐标最左边 */
                     left: elementPosXLeft, 
@@ -5875,9 +5768,7 @@ System.register('Utils', [], (function (exports) {
                         /* CODE FOR BROWSERS THAT SUPPORT window.find */
                         let windowFind = this.windowApi.self.find;
                         strFound = windowFind(str, caseSensitive, true, true, false);
-                        if (strFound &&
-                            this.windowApi.self.getSelection &&
-                            !this.windowApi.self.getSelection().anchorNode) {
+                        if (strFound && this.windowApi.self.getSelection && !this.windowApi.self.getSelection().anchorNode) {
                             strFound = windowFind(str, caseSensitive, true, true, false);
                         }
                         if (!strFound) {
@@ -5980,9 +5871,7 @@ System.register('Utils', [], (function (exports) {
                         }
                     }
                     result = result.toFixed(2);
-                    result = addType
-                        ? result + resultType.toString()
-                        : parseFloat(result.toString());
+                    result = addType ? result + resultType.toString() : parseFloat(result.toString());
                     return result;
                 }
                 getNodeListValue(...args) {
@@ -6061,14 +5950,7 @@ System.register('Utils', [], (function (exports) {
                     if (text.length === 8) {
                         /* 该字符串只有时分秒 */
                         let today = new Date();
-                        text =
-                            today.getFullYear() +
-                                "-" +
-                                (today.getMonth() + 1) +
-                                "-" +
-                                today.getDate() +
-                                " " +
-                                text;
+                        text = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate() + " " + text;
                     }
                     text = text.substring(0, 19);
                     text = text.replace(/-/g, "/");
@@ -6089,25 +5971,13 @@ System.register('Utils', [], (function (exports) {
                  * 获取 transitionend 的在各个浏览器的兼容名
                  */
                 getTransitionEndNameList() {
-                    return [
-                        "webkitTransitionEnd",
-                        "mozTransitionEnd",
-                        "MSTransitionEnd",
-                        "otransitionend",
-                        "transitionend",
-                    ];
+                    return ["webkitTransitionEnd", "mozTransitionEnd", "MSTransitionEnd", "otransitionend", "transitionend"];
                 }
                 /**
                  * 获取 animationend 的在各个浏览器的兼容名
                  */
                 getAnimationEndNameList() {
-                    return [
-                        "webkitAnimationEnd",
-                        "mozAnimationEnd",
-                        "MSAnimationEnd",
-                        "oanimationend",
-                        "animationend",
-                    ];
+                    return ["webkitAnimationEnd", "mozAnimationEnd", "MSAnimationEnd", "oanimationend", "animationend"];
                 }
                 getArrayLastValue(targetObj) {
                     return targetObj[targetObj.length - 1];
@@ -6211,10 +6081,8 @@ System.register('Utils', [], (function (exports) {
                     }
                     /* 如果有多个相同类型的兄弟元素，则需要添加索引 */
                     if (element.parentElement.querySelectorAll(element.tagName).length > 1) {
-                        let index = Array.prototype.indexOf.call(element.parentElement.children, element) +
-                            1;
-                        selector +=
-                            " > " + element.tagName.toLowerCase() + ":nth-child(" + index + ")";
+                        let index = Array.prototype.indexOf.call(element.parentElement.children, element) + 1;
+                        selector += " > " + element.tagName.toLowerCase() + ":nth-child(" + index + ")";
                     }
                     else {
                         selector += " > " + element.tagName.toLowerCase();
@@ -6234,9 +6102,7 @@ System.register('Utils', [], (function (exports) {
                         return void 0;
                     }
                     if (result.length > 1) {
-                        if (result.length === 2 &&
-                            typeof result[0] === "object" &&
-                            typeof result[1] === "function") {
+                        if (result.length === 2 && typeof result[0] === "object" && typeof result[1] === "function") {
                             let data = result[0];
                             let handleDataFunc = result[1];
                             Object.keys(data).forEach((keyName) => {
@@ -6334,9 +6200,7 @@ System.register('Utils', [], (function (exports) {
                         return void 0;
                     }
                     if (result.length > 1) {
-                        if (result.length === 2 &&
-                            typeof result[0] === "object" &&
-                            typeof result[1] === "function") {
+                        if (result.length === 2 && typeof result[0] === "object" && typeof result[1] === "function") {
                             let data = result[0];
                             let handleDataFunc = result[1];
                             Object.keys(data).forEach((keyName) => {
@@ -6426,12 +6290,10 @@ System.register('Utils', [], (function (exports) {
                 getRandomValue(...args) {
                     let result = [...args];
                     if (result.length > 1) {
-                        if (result.length === 2 &&
-                            typeof result[0] === "number" &&
-                            typeof result[1] === "number") {
+                        if (result.length === 2 && typeof result[0] === "number" && typeof result[1] === "number") {
                             let leftNumber = result[0] > result[1] ? result[1] : result[0];
                             let rightNumber = result[0] > result[1] ? result[0] : result[1];
-                            return (Math.round(Math.random() * (rightNumber - leftNumber)) + leftNumber);
+                            return Math.round(Math.random() * (rightNumber - leftNumber)) + leftNumber;
                         }
                         else {
                             return result[Math.floor(Math.random() * result.length)];
@@ -6442,8 +6304,7 @@ System.register('Utils', [], (function (exports) {
                         if (Array.isArray(paramData)) {
                             return paramData[Math.floor(Math.random() * paramData.length)];
                         }
-                        else if (typeof paramData === "object" &&
-                            Object.keys(paramData).length > 0) {
+                        else if (typeof paramData === "object" && Object.keys(paramData).length > 0) {
                             let paramObjDataKey = Object.keys(paramData)[Math.floor(Math.random() * Object.keys(paramData).length)];
                             return paramData[paramObjDataKey];
                         }
@@ -6750,11 +6611,9 @@ System.register('Utils', [], (function (exports) {
                     let nearBottomHeight = 50;
                     let checkWindow = () => {
                         // 已滚动的距离
-                        let scrollTop = this.windowApi.window.pageYOffset ||
-                            this.windowApi.document.documentElement.scrollTop;
+                        let scrollTop = this.windowApi.window.pageYOffset || this.windowApi.document.documentElement.scrollTop;
                         // 视窗高度
-                        let viewportHeight = this.windowApi.window.innerHeight ||
-                            this.windowApi.document.documentElement.clientHeight;
+                        let viewportHeight = this.windowApi.window.innerHeight || this.windowApi.document.documentElement.clientHeight;
                         // 最大滚动距离
                         let maxScrollHeight = this.windowApi.document.documentElement.scrollHeight - nearBottomHeight;
                         return scrollTop + viewportHeight >= maxScrollHeight;
@@ -7043,8 +6902,7 @@ System.register('Utils', [], (function (exports) {
                  **/
                 isNull = commonUtil.isNull.bind(commonUtil);
                 isThemeDark() {
-                    return this.windowApi.globalThis.matchMedia("(prefers-color-scheme: dark)")
-                        .matches;
+                    return this.windowApi.globalThis.matchMedia("(prefers-color-scheme: dark)").matches;
                 }
                 /**
                  * 判断元素是否在页面中可见
@@ -7077,10 +6935,8 @@ System.register('Utils', [], (function (exports) {
                         else {
                             let domClientRect = domItem.getBoundingClientRect();
                             if (inView) {
-                                let viewportWidth = this.windowApi.window.innerWidth ||
-                                    this.windowApi.document.documentElement.clientWidth;
-                                let viewportHeight = this.windowApi.window.innerHeight ||
-                                    this.windowApi.document.documentElement.clientHeight;
+                                let viewportWidth = this.windowApi.window.innerWidth || this.windowApi.document.documentElement.clientWidth;
+                                let viewportHeight = this.windowApi.window.innerHeight || this.windowApi.document.documentElement.clientHeight;
                                 result = !(domClientRect.right < 0 ||
                                     domClientRect.left > viewportWidth ||
                                     domClientRect.bottom < 0 ||
@@ -7104,8 +6960,7 @@ System.register('Utils', [], (function (exports) {
                         for (const key in Object.values(this.windowApi.top.window.via)) {
                             if (Reflect.has(this.windowApi.top.window.via, key)) {
                                 let objValueFunc = this.windowApi.top.window.via[key];
-                                if (typeof objValueFunc === "function" &&
-                                    UtilsContext.isNativeFunc(objValueFunc)) {
+                                if (typeof objValueFunc === "function" && UtilsContext.isNativeFunc(objValueFunc)) {
                                     result = true;
                                 }
                                 else {
@@ -7127,8 +6982,7 @@ System.register('Utils', [], (function (exports) {
                         for (const key in Object.values(this.windowApi.top.window.mbrowser)) {
                             if (Reflect.has(this.windowApi.top.window.mbrowser, key)) {
                                 let objValueFunc = this.windowApi.top.window.mbrowser[key];
-                                if (typeof objValueFunc === "function" &&
-                                    UtilsContext.isNativeFunc(objValueFunc)) {
+                                if (typeof objValueFunc === "function" && UtilsContext.isNativeFunc(objValueFunc)) {
                                     result = true;
                                 }
                                 else {
@@ -7365,13 +7219,11 @@ System.register('Utils', [], (function (exports) {
                      * 释放所有
                      */
                     function releaseAll() {
-                        if (typeof UtilsContext.windowApi.window[needReleaseKey] !==
-                            "undefined") {
+                        if (typeof UtilsContext.windowApi.window[needReleaseKey] !== "undefined") {
                             /* 已存在 */
                             return;
                         }
-                        UtilsContext.windowApi.window[needReleaseKey] =
-                            UtilsContext.deepClone(needReleaseObject);
+                        UtilsContext.windowApi.window[needReleaseKey] = UtilsContext.deepClone(needReleaseObject);
                         Object.values(needReleaseObject).forEach((value) => {
                             if (typeof value === "function") {
                                 needReleaseObject[value.name] = () => { };
@@ -7385,8 +7237,7 @@ System.register('Utils', [], (function (exports) {
                         Array.from(functionNameList).forEach((item) => {
                             Object.values(needReleaseObject).forEach((value) => {
                                 if (typeof value === "function") {
-                                    if (typeof UtilsContext.windowApi.window[needReleaseKey] ===
-                                        "undefined") {
+                                    if (typeof UtilsContext.windowApi.window[needReleaseKey] === "undefined") {
                                         UtilsContext.windowApi.window[needReleaseKey] = {};
                                     }
                                     if (item === value.name) {
@@ -7401,8 +7252,7 @@ System.register('Utils', [], (function (exports) {
                      * 恢复所有
                      */
                     function recoveryAll() {
-                        if (typeof UtilsContext.windowApi.window[needReleaseKey] ===
-                            "undefined") {
+                        if (typeof UtilsContext.windowApi.window[needReleaseKey] === "undefined") {
                             /* 未存在 */
                             return;
                         }
@@ -7413,8 +7263,7 @@ System.register('Utils', [], (function (exports) {
                      * 恢复单个
                      */
                     function recoveryOne() {
-                        if (typeof UtilsContext.windowApi.window[needReleaseKey] ===
-                            "undefined") {
+                        if (typeof UtilsContext.windowApi.window[needReleaseKey] === "undefined") {
                             /* 未存在 */
                             return;
                         }
@@ -7422,8 +7271,7 @@ System.register('Utils', [], (function (exports) {
                             if (UtilsContext.windowApi.window[needReleaseKey][item]) {
                                 needReleaseObject[item] = UtilsContext.windowApi.window[needReleaseKey][item];
                                 Reflect.deleteProperty(UtilsContext.windowApi.window[needReleaseKey], item);
-                                if (Object.keys(UtilsContext.windowApi.window[needReleaseKey])
-                                    .length === 0) {
+                                if (Object.keys(UtilsContext.windowApi.window[needReleaseKey]).length === 0) {
                                     Reflect.deleteProperty(window, needReleaseKey);
                                 }
                             }
@@ -7680,8 +7528,7 @@ System.register('Utils', [], (function (exports) {
                             let copyStatus = false;
                             let requestPermissionStatus = await this.requestClipboardPermission();
                             console.log(requestPermissionStatus);
-                            if (this.hasClipboard() &&
-                                (this.hasClipboardWrite() || this.hasClipboardWriteText())) {
+                            if (this.hasClipboard() && (this.hasClipboardWrite() || this.hasClipboardWriteText())) {
                                 try {
                                     copyStatus = await this.copyDataByClipboard();
                                 }
@@ -7842,11 +7689,8 @@ System.register('Utils', [], (function (exports) {
                         mouseEvent.initMouseEvent(eventName, true, true, win, 0, offSetX, offSetY, offSetX, offSetY, false, false, false, false, 0, null);
                         return mouseEvent;
                     }
-                    let sliderElement = typeof selector === "string"
-                        ? domUtils.selector(selector)
-                        : selector;
-                    if (!(sliderElement instanceof Node) ||
-                        !(sliderElement instanceof Element)) {
+                    let sliderElement = typeof selector === "string" ? domUtils.selector(selector) : selector;
+                    if (!(sliderElement instanceof Node) || !(sliderElement instanceof Element)) {
                         throw new Error("Utils.dragSlider 参数selector 必须为Node/Element类型");
                     }
                     let rect = sliderElement.getBoundingClientRect(), x0 = rect.x || rect.left, y0 = rect.y || rect.top, x1 = x0 + offsetX, y1 = y0;
@@ -7898,17 +7742,14 @@ System.register('Utils', [], (function (exports) {
                 }
                 sortListByProperty(data, getPropertyValueFunc, sortByDesc = true) {
                     let UtilsContext = this;
-                    if (typeof getPropertyValueFunc !== "function" &&
-                        typeof getPropertyValueFunc !== "string") {
+                    if (typeof getPropertyValueFunc !== "function" && typeof getPropertyValueFunc !== "string") {
                         throw new Error("Utils.sortListByProperty 参数 getPropertyValueFunc 必须为 function|string 类型");
                     }
                     if (typeof sortByDesc !== "boolean") {
                         throw new Error("Utils.sortListByProperty 参数 sortByDesc 必须为 boolean 类型");
                     }
                     let getObjValue = function (obj) {
-                        return typeof getPropertyValueFunc === "string"
-                            ? obj[getPropertyValueFunc]
-                            : getPropertyValueFunc(obj);
+                        return typeof getPropertyValueFunc === "string" ? obj[getPropertyValueFunc] : getPropertyValueFunc(obj);
                     };
                     /**
                      * 排序方法
@@ -7983,8 +7824,7 @@ System.register('Utils', [], (function (exports) {
                     if (Array.isArray(data)) {
                         data.sort(sortFunc);
                     }
-                    else if (data instanceof NodeList ||
-                        UtilsContext.isJQuery(data)) {
+                    else if (data instanceof NodeList || UtilsContext.isJQuery(data)) {
                         sortNodeFunc(data, getDataFunc);
                         result = getDataFunc();
                     }
@@ -8177,9 +8017,7 @@ System.register('Utils', [], (function (exports) {
                     let parent = UtilsContext.windowApi.document;
                     // 超时时间
                     let timeout = 0;
-                    if (typeof args[0] !== "string" &&
-                        !Array.isArray(args[0]) &&
-                        typeof args[0] !== "function") {
+                    if (typeof args[0] !== "string" && !Array.isArray(args[0]) && typeof args[0] !== "function") {
                         throw new TypeError("Utils.waitNode 第一个参数必须是string|string[]|Function");
                     }
                     if (args.length === 1) ;
@@ -8189,8 +8027,7 @@ System.register('Utils', [], (function (exports) {
                             // "div",10000
                             timeout = secondParam;
                         }
-                        else if (typeof secondParam === "object" &&
-                            secondParam instanceof Node) {
+                        else if (typeof secondParam === "object" && secondParam instanceof Node) {
                             // "div",document
                             parent = secondParam;
                         }
@@ -8276,8 +8113,7 @@ System.register('Utils', [], (function (exports) {
                             // "div",10000
                             timeout = secondParam;
                         }
-                        else if (typeof secondParam === "object" &&
-                            secondParam instanceof Node) {
+                        else if (typeof secondParam === "object" && secondParam instanceof Node) {
                             // "div",document
                             parent = secondParam;
                         }
@@ -8332,8 +8168,7 @@ System.register('Utils', [], (function (exports) {
                             // "div",10000
                             timeout = secondParam;
                         }
-                        else if (typeof secondParam === "object" &&
-                            secondParam instanceof Node) {
+                        else if (typeof secondParam === "object" && secondParam instanceof Node) {
                             // "div",document
                             parent = secondParam;
                         }
@@ -8419,8 +8254,7 @@ System.register('Utils', [], (function (exports) {
                             // "div",10000
                             timeout = secondParam;
                         }
-                        else if (typeof secondParam === "object" &&
-                            secondParam instanceof Node) {
+                        else if (typeof secondParam === "object" && secondParam instanceof Node) {
                             // "div",document
                             parent = secondParam;
                         }
@@ -8553,8 +8387,7 @@ System.register('Utils', [], (function (exports) {
                     return flag;
                 }
                 watchObject(target, propertyName, getCallBack, setCallBack) {
-                    if (typeof getCallBack !== "function" &&
-                        typeof setCallBack !== "function") {
+                    if (typeof getCallBack !== "function" && typeof setCallBack !== "function") {
                         return;
                     }
                     if (typeof getCallBack === "function") {
@@ -8606,13 +8439,27 @@ System.register('Utils', [], (function (exports) {
                         return;
                     }
                     let handleResult = handler(target);
-                    if (handleResult &&
-                        typeof handleResult.isFind === "boolean" &&
-                        handleResult.isFind) {
+                    if (handleResult && typeof handleResult.isFind === "boolean" && handleResult.isFind) {
                         return handleResult.data;
                     }
                     return this.queryProperty(handleResult.data, handler);
                 }
+                /**
+                 * 异步-深度获取对象属性
+                 * @param target 待获取的对象
+                 * @param handler 获取属性的回调
+                 */
+                async asyncQueryProperty(target, handler) {
+                    if (target == null) {
+                        // @ts-ignore
+                        return;
+                    }
+                    let handleResult = await handler(target);
+                    if (handleResult && typeof handleResult.isFind === "boolean" && handleResult.isFind) {
+                        return handleResult.data;
+                    }
+                    return await this.asyncQueryProperty(handleResult.data, handler);
+                }
                 /**
                  * 创建一个新的Utils实例
                  * @param option
@@ -8717,7 +8564,7 @@ System.register('Utils', [], (function (exports) {
                         return setTimeout$1(callback, timeout);
                     }
                     catch (error) {
-                        return globalThis.setTimeout(callback, timeout);
+                        return this.windowApi.setTimeout(callback, timeout);
                     }
                 }
                 /**
@@ -8733,7 +8580,7 @@ System.register('Utils', [], (function (exports) {
                     catch (error) {
                     }
                     finally {
-                        globalThis.clearTimeout(timeId);
+                        this.windowApi.clearTimeout(timeId);
                     }
                 }
                 /**
@@ -8746,7 +8593,7 @@ System.register('Utils', [], (function (exports) {
                         return setInterval(callback, timeout);
                     }
                     catch (error) {
-                        return globalThis.setInterval(callback, timeout);
+                        return this.windowApi.setInterval(callback, timeout);
                     }
                 }
                 /**
@@ -8762,7 +8609,7 @@ System.register('Utils', [], (function (exports) {
                     catch (error) {
                     }
                     finally {
-                        globalThis.clearInterval(timeId);
+                        this.windowApi.clearInterval(timeId);
                     }
                 }
                 /**