@whitesev/utils 2.7.0 → 2.7.2

package/dist/index.umd.js

@@ -21,14 +21,13 @@
         /**
          * 16进制颜色转rgba
          *
-         * #ff0000 转 rgba(123,123,123, 0.4)
+         * 例如：`#ff0000` 转为 `rgba(123,123,123, 0.4)`
          * @param hex
          * @param opacity
          */
         hexToRgba(hex, opacity) {
             if (!this.isHex(hex)) {
-                // @ts-ignore
-                throw new TypeError("输入错误的hex", hex);
+                throw new TypeError("输入错误的hex：" + hex);
             }
             return hex && hex.replace(/\s+/g, "").length === 7
                 ? "rgba(" +
@@ -45,19 +44,16 @@
         /**
          * hex转rgb
          * @param str
-         * @returns
          */
         hexToRgb(str) {
             if (!this.isHex(str)) {
-                // @ts-ignore
-                throw new TypeError("输入错误的hex", str);
+                throw new TypeError("输入错误的hex：" + str);
             }
             /* replace替换查找的到的字符串 */
             str = str.replace("#", "");
             /* match得到查询数组 */
             let hxs = str.match(/../g);
             for (let index = 0; index < 3; index++) {
-                // @ts-ignore
                 hxs[index] = parseInt(hxs[index], 16);
             }
             return hxs;
@@ -67,7 +63,6 @@
          * @param redValue
          * @param greenValue
          * @param blueValue
-         * @returns
          */
         rgbToHex(redValue, greenValue, blueValue) {
             /* 验证输入的rgb值是否合法 */
@@ -90,38 +85,30 @@
          * 获取颜色变暗或亮
          * @param color 颜色
          * @param level 0~1.0
-         * @returns
          */
         getDarkColor(color, level) {
             if (!this.isHex(color)) {
-                // @ts-ignore
-                throw new TypeError("输入错误的hex", color);
+                throw new TypeError("输入错误的hex：" + color);
             }
             let rgbc = this.hexToRgb(color);
             for (let index = 0; index < 3; index++) {
-                // @ts-ignore
                 rgbc[index] = Math.floor(rgbc[index] * (1 - level));
             }
-            // @ts-ignore
             return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
         }
         /**
          * 获取颜色变亮
          * @param color 颜色
          * @param level 0~1.0
-         * @returns
          */
         getLightColor(color, level) {
             if (!this.isHex(color)) {
-                // @ts-ignore
-                throw new TypeError("输入错误的hex", color);
+                throw new TypeError("输入错误的hex：" + color);
             }
             let rgbc = this.hexToRgb(color);
             for (let index = 0; index < 3; index++) {
-                // @ts-ignore
                 rgbc[index] = Math.floor((255 - rgbc[index]) * level + rgbc[index]);
             }
-            // @ts-ignore
             return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);
         }
     }
@@ -209,20 +196,20 @@
          * @param str
          */
         decode(str) {
-            var GBKMatcher = /%[0-9A-F]{2}%[0-9A-F]{2}/;
-            var UTFMatcher = /%[0-9A-F]{2}/;
-            // @ts-ignore
-            var utf = true;
-            let that = this;
+            let GBKMatcher = /%[0-9A-F]{2}%[0-9A-F]{2}/;
+            let UTFMatcher = /%[0-9A-F]{2}/;
+            // let gbk = true;
+            let utf = true;
+            const that = this;
             while (utf) {
                 let gbkMatch = str.match(GBKMatcher);
                 let utfMatch = str.match(UTFMatcher);
+                // gbk = Boolean(gbkMatch);
                 utf = Boolean(utfMatch);
                 if (gbkMatch && gbkMatch in that.#G2Uhash) {
                     str = str.replace(gbkMatch, String.fromCharCode(("0x" + that.#G2Uhash[gbkMatch])));
                 }
                 else {
-                    // @ts-ignore
                     str = str.replace(utfMatch, decodeURIComponent(utfMatch));
                 }
             }
@@ -253,7 +240,6 @@
              * @param handler
              */
             error(handler) {
-                // @ts-ignore
                 handleError = handler;
                 return TryCatchCore;
             },
@@ -268,8 +254,9 @@
                 callbackFunction = callback;
                 context = __context__ || this;
                 let result = executeTryCatch(callbackFunction, handleError, context);
-                // @ts-ignore
-                return result !== void 0 ? result : TryCatchCore;
+                return result !== void 0
+                    ? result
+                    : TryCatchCore;
             },
         };
         /**
@@ -752,13 +739,13 @@
     // ==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: [],
@@ -768,20 +755,18 @@
     	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);
@@ -859,6 +844,10 @@
     			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 (
@@ -879,7 +868,6 @@
     			);
     		}
     		waitForRequestKeys() {
-    			const requestKeys = ["url", "method", "abort", "headers", "data"];
     			if (!this.request.async) {
     				win.__ajaxHooker.hookInsts.forEach(({ hookFns, filters }) => {
     					if (this.shouldFilter(filters)) return;
@@ -887,27 +875,31 @@
     						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)
     									)
     								)
-    							)
+    							);
+    						}
     					)
     				);
     			});
@@ -1088,6 +1080,7 @@
     			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(
@@ -1165,6 +1158,9 @@
     					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);
     				}
     			});
@@ -1186,8 +1182,10 @@
     		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();
@@ -1234,6 +1232,9 @@
     			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 = {
@@ -1939,25 +1940,24 @@
                 let defaultEnable = Boolean(this.getLocalMenuData(menuLocalDataItemKey, menuOption.enable));
                 /** 油猴菜单上显示的文本 */
                 let showText = menuOption.showText(menuOption.text, defaultEnable);
-                // @ts-ignore
-                ({
-                    /**
-                     * 菜单的id
-                     */
-                    id: menuOption.id,
-                    /**
-                     * 点击菜单项后是否应关闭弹出菜单
-                     */
-                    autoClose: menuOption.autoClose,
-                    /**
-                     * 菜单项的可选访问键
-                     */
-                    accessKey: menuOption.accessKey,
-                    /**
-                     * 菜单项的鼠标悬浮上的工具提示
-                     */
-                    title: menuOption.title,
-                });
+                // const GMMenuOptions = {
+                // 	/**
+                // 	 * 菜单的id
+                // 	 */
+                // 	id: menuOption.id,
+                // 	/**
+                // 	 * 点击菜单项后是否应关闭弹出菜单
+                // 	 */
+                // 	autoClose: menuOption.autoClose,
+                // 	/**
+                // 	 * 菜单项的可选访问键
+                // 	 */
+                // 	accessKey: menuOption.accessKey,
+                // 	/**
+                // 	 * 菜单项的鼠标悬浮上的工具提示
+                // 	 */
+                // 	title: menuOption.title,
+                // };
                 /* 点击菜单后触发callback后的网页是否刷新 */
                 menuOption.autoReload =
                     typeof menuOption.autoReload !== "boolean"
@@ -2535,7 +2535,9 @@
              * 对请求的参数进行合并处理
              */
             handleBeforeRequestOptionArgs(...args) {
-                let option = {};
+                let option = {
+                    url: void 0,
+                };
                 if (typeof args[0] === "string") {
                     /* 传入的是url，转为配置 */
                     let url = args[0];
@@ -2559,7 +2561,7 @@
              * @param method 当前请求方法，默认get
              * @param userRequestOption 用户的请求配置
              * @param resolve promise回调
-             * @param reject 抛出错误回调
+             * @param reject promise抛出错误回调
              */
             getRequestOption(method, userRequestOption, resolve, reject) {
                 let that = this;
@@ -2617,25 +2619,25 @@
                     password: userRequestOption.password ||
                         this.context.#defaultRequestOption.password,
                     onabort(...args) {
-                        that.context.HttpxCallBack.onAbort(userRequestOption, resolve, reject, args);
+                        that.context.HttpxResponseCallBack.onAbort(userRequestOption, resolve, reject, args);
                     },
                     onerror(...args) {
-                        that.context.HttpxCallBack.onError(userRequestOption, resolve, reject, args);
+                        that.context.HttpxResponseCallBack.onError(userRequestOption, resolve, reject, args);
                     },
                     onloadstart(...args) {
-                        that.context.HttpxCallBack.onLoadStart(userRequestOption, args);
+                        that.context.HttpxResponseCallBack.onLoadStart(userRequestOption, args);
                     },
                     onprogress(...args) {
-                        that.context.HttpxCallBack.onProgress(userRequestOption, args);
+                        that.context.HttpxResponseCallBack.onProgress(userRequestOption, args);
                     },
                     onreadystatechange(...args) {
-                        that.context.HttpxCallBack.onReadyStateChange(userRequestOption, args);
+                        that.context.HttpxResponseCallBack.onReadyStateChange(userRequestOption, args);
                     },
                     ontimeout(...args) {
-                        that.context.HttpxCallBack.onTimeout(userRequestOption, resolve, reject, args);
+                        that.context.HttpxResponseCallBack.onTimeout(userRequestOption, resolve, reject, args);
                     },
                     onload(...args) {
-                        that.context.HttpxCallBack.onLoad(userRequestOption, resolve, reject, args);
+                        that.context.HttpxResponseCallBack.onLoad(userRequestOption, resolve, reject, args);
                     },
                 };
                 // 补全allowInterceptConfig参数
@@ -2747,7 +2749,6 @@
                             else if (typeof requestOption.data === "object") {
                                 isHandler = true;
                                 // URLSearchParams参数可以转普通的string:string，包括FormData
-                                // @ts-ignore
                                 let searchParams = new URLSearchParams(requestOption.data);
                                 urlSearch = searchParams.toString();
                             }
@@ -2802,9 +2803,7 @@
                                 else if (ContentType.includes("application/x-www-form-urlencoded")) {
                                     // application/x-www-form-urlencoded
                                     if (typeof requestOption.data === "object") {
-                                        requestOption.data = new URLSearchParams(
-                                        // @ts-ignore
-                                        requestOption.data).toString();
+                                        requestOption.data = new URLSearchParams(requestOption.data).toString();
                                     }
                                 }
                                 else if (ContentType.includes("multipart/form-data")) {
@@ -2824,7 +2823,7 @@
             },
             /**
              * 处理发送请求的配置，去除值为undefined、空function的值
-             * @param option
+             * @param option 请求配置
              */
             removeRequestNullOption(option) {
                 Object.keys(option).forEach((keyName) => {
@@ -2836,13 +2835,13 @@
                     }
                 });
                 if (commonUtil.isNull(option.url)) {
-                    throw new TypeError(`Utils.Httpx 参数 url不符合要求: ${option.url}`);
+                    throw new TypeError(`Utils.Httpx 参数url不能为空：${option.url}`);
                 }
                 return option;
             },
             /**
              * 处理fetch的配置
-             * @param option
+             * @param option 请求配置
              */
             handleFetchOption(option) {
                 /**
@@ -2895,21 +2894,21 @@
                 };
             },
         };
-        HttpxCallBack = {
+        HttpxResponseCallBack = {
             context: this,
             /**
              * onabort请求被取消-触发
              * @param details 配置
-             * @param resolve 回调
-             * @param reject 抛出错误
+             * @param resolve promise回调
+             * @param reject promise抛出错误回调
              * @param argsResult 返回的参数列表
              */
             async onAbort(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
-                if ("onabort" in details) {
+                if (typeof details?.onabort === "function") {
                     details.onabort.apply(this, argsResult);
                 }
-                else if ("onabort" in this.context.#defaultRequestOption) {
+                else if (typeof this.context.#defaultRequestOption?.onabort === "function") {
                     this.context.#defaultRequestOption.onabort.apply(this, argsResult);
                 }
                 let response = argsResult;
@@ -2918,11 +2917,11 @@
                 }
                 if ((await this.context.HttpxResponseHook.errorResponseCallBack({
                     type: "onabort",
-                    error: new TypeError("request canceled"),
+                    error: new Error("request canceled"),
                     response: null,
                     details: details,
                 })) == null) {
-                    // reject(new TypeError("response is intercept with onabort"));
+                    // reject(new Error("response is intercept with onabort"));
                     return;
                 }
                 resolve({
@@ -2935,93 +2934,83 @@
                 });
             },
             /**
-             * onerror请求异常-触发
+             * ontimeout请求超时-触发
              * @param details 配置
              * @param resolve 回调
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            async onError(details, resolve, reject, argsResult) {
+            async onTimeout(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
-                if ("onerror" in details) {
-                    details.onerror.apply(this, argsResult);
+                if (typeof details?.ontimeout === "function") {
+                    // 执行配置中的ontime回调
+                    details.ontimeout.apply(this, argsResult);
                 }
-                else if ("onerror" in this.context.#defaultRequestOption) {
-                    this.context.#defaultRequestOption.onerror.apply(this, argsResult);
+                else if (typeof this.context.#defaultRequestOption?.ontimeout === "function") {
+                    // 执行默认配置的ontime回调
+                    this.context.#defaultRequestOption.ontimeout.apply(this, argsResult);
                 }
+                // 获取响应结果
                 let response = argsResult;
                 if (response.length) {
                     response = response[0];
                 }
+                // 执行错误回调的钩子
                 if ((await this.context.HttpxResponseHook.errorResponseCallBack({
-                    type: "onerror",
-                    error: new TypeError("request error"),
+                    type: "ontimeout",
+                    error: new Error("request timeout"),
                     response: response,
                     details: details,
                 })) == null) {
-                    // reject(new TypeError("response is intercept with onerror"));
+                    // reject(new Error("response is intercept with ontimeout"));
                     return;
                 }
                 resolve({
                     data: response,
                     details: details,
-                    msg: "请求异常",
+                    msg: "请求超时",
                     status: false,
-                    statusCode: response["status"],
-                    type: "onerror",
+                    statusCode: 0,
+                    type: "ontimeout",
                 });
             },
             /**
-             * ontimeout请求超时-触发
+             * onerror请求异常-触发
              * @param details 配置
              * @param resolve 回调
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            async onTimeout(details, resolve, reject, argsResult) {
+            async onError(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
-                if ("ontimeout" in details) {
-                    details.ontimeout.apply(this, argsResult);
+                if (typeof details?.onerror === "function") {
+                    details.onerror.apply(this, argsResult);
                 }
-                else if ("ontimeout" in this.context.#defaultRequestOption) {
-                    this.context.#defaultRequestOption.ontimeout.apply(this, argsResult);
+                else if (typeof this.context.#defaultRequestOption?.onerror === "function") {
+                    this.context.#defaultRequestOption.onerror.apply(this, argsResult);
                 }
                 let response = argsResult;
                 if (response.length) {
                     response = response[0];
                 }
                 if ((await this.context.HttpxResponseHook.errorResponseCallBack({
-                    type: "ontimeout",
-                    error: new TypeError("request timeout"),
-                    response: (argsResult || [null])[0],
+                    type: "onerror",
+                    error: new Error("request error"),
+                    response: response,
                     details: details,
                 })) == null) {
-                    // reject(new TypeError("response is intercept with ontimeout"));
+                    // reject(new Error("response is intercept with onerror"));
                     return;
                 }
                 resolve({
                     data: response,
                     details: details,
-                    msg: "请求超时",
+                    msg: "请求异常",
                     status: false,
-                    statusCode: 0,
-                    type: "ontimeout",
+                    statusCode: response["status"],
+                    type: "onerror",
                 });
             },
-            /**
-             * onloadstart请求开始-触发
-             * @param details 配置
-             * @param argsResult 返回的参数列表
-             */
-            onLoadStart(details, argsResult) {
-                // console.log(argsResult);
-                if ("onloadstart" in details) {
-                    details.onloadstart.apply(this, argsResult);
-                }
-                else if ("onloadstart" in this.context.#defaultRequestOption) {
-                    this.context.#defaultRequestOption.onloadstart.apply(this, argsResult);
-                }
-            },
             /**
              * onload加载完毕-触发
              * @param details 请求的配置
@@ -3101,7 +3090,7 @@
                 /* 状态码2xx都是成功的 */
                 if (Math.floor(originResponse.status / 100) === 2) {
                     if ((await this.context.HttpxResponseHook.successResponseCallBack(originResponse, details)) == null) {
-                        // reject(new TypeError("response is intercept with onloada"));
+                        // reject(new Error("response is intercept with onloada"));
                         return;
                     }
                     resolve({
@@ -3114,21 +3103,21 @@
                     });
                 }
                 else {
-                    this.context.HttpxCallBack.onError(details, resolve, reject, argsResult);
+                    this.context.HttpxResponseCallBack.onError(details, resolve, reject, argsResult);
                 }
             },
             /**
-             * onprogress上传进度-触发
+             * onloadstart请求开始-触发
              * @param details 配置
              * @param argsResult 返回的参数列表
              */
-            onProgress(details, argsResult) {
+            onLoadStart(details, argsResult) {
                 // console.log(argsResult);
-                if ("onprogress" in details) {
-                    details.onprogress.apply(this, argsResult);
+                if (typeof details?.onloadstart === "function") {
+                    details.onloadstart.apply(this, argsResult);
                 }
-                else if ("onprogress" in this.context.#defaultRequestOption) {
-                    this.context.#defaultRequestOption.onprogress.apply(this, argsResult);
+                else if (typeof this.context.#defaultRequestOption?.onloadstart === "function") {
+                    this.context.#defaultRequestOption.onloadstart.apply(this, argsResult);
                 }
             },
             /**
@@ -3138,13 +3127,28 @@
              */
             onReadyStateChange(details, argsResult) {
                 // console.log(argsResult);
-                if ("onreadystatechange" in details) {
+                if (typeof details?.onreadystatechange === "function") {
                     details.onreadystatechange.apply(this, argsResult);
                 }
-                else if ("onreadystatechange" in this.context.#defaultRequestOption) {
+                else if (typeof this.context.#defaultRequestOption?.onreadystatechange ===
+                    "function") {
                     this.context.#defaultRequestOption.onreadystatechange.apply(this, argsResult);
                 }
             },
+            /**
+             * onprogress上传进度-触发
+             * @param details 配置
+             * @param argsResult 返回的参数列表
+             */
+            onProgress(details, argsResult) {
+                // console.log(argsResult);
+                if (typeof details?.onprogress === "function") {
+                    details.onprogress.apply(this, argsResult);
+                }
+                else if (typeof this.context.#defaultRequestOption?.onprogress === "function") {
+                    this.context.#defaultRequestOption.onprogress.apply(this, argsResult);
+                }
+            },
         };
         HttpxRequest = {
             context: this,
@@ -3194,15 +3198,12 @@
                         isFetch: true,
                         finalUrl: fetchResponse.url,
                         readyState: 4,
-                        // @ts-ignore
                         status: fetchResponse.status,
                         statusText: fetchResponse.statusText,
-                        // @ts-ignore
-                        response: void 0,
+                        response: "",
                         responseFetchHeaders: fetchResponse.headers,
                         responseHeaders: "",
-                        // @ts-ignore
-                        responseText: void 0,
+                        responseText: "",
                         responseType: option.responseType,
                         responseXML: void 0,
                     };
@@ -3275,9 +3276,9 @@
                     // 转为XML结构
                     let parser = new DOMParser();
                     responseXML = parser.parseFromString(responseText, "text/xml");
-                    Reflect.set(httpxResponse, "response", response);
-                    Reflect.set(httpxResponse, "responseText", responseText);
-                    Reflect.set(httpxResponse, "responseXML", responseXML);
+                    httpxResponse.response = response;
+                    httpxResponse.responseText = responseText;
+                    httpxResponse.responseXML = responseXML;
                     // 执行回调
                     option.onload(httpxResponse);
                 })
@@ -3458,7 +3459,7 @@
         }
         /**
          * GET 请求
-         * @param url 网址
+         * @param url 请求的url
          * @param details 配置
          */
         get(...args) {
@@ -3524,27 +3525,22 @@
             /** 取消请求 */
             let abortFn = null;
             let promise = new globalThis.Promise(async (resolve, reject) => {
-                let requestOption = this.HttpxRequestOption.getRequestOption(useRequestOption.method, useRequestOption, resolve, reject);
+                let requestOption = (this.HttpxRequestOption.getRequestOption(useRequestOption.method, useRequestOption, resolve, reject));
                 if (typeof beforeRequestOption === "function") {
-                    // @ts-ignore
                     beforeRequestOption(requestOption);
                 }
-                // @ts-ignore
-                requestOption =
-                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                requestOption = this.HttpxRequestOption.removeRequestNullOption(requestOption);
                 const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
                 }
             });
-            // @ts-ignore
             promise.abort = () => {
                 if (typeof abortFn === "function") {
                     abortFn();
                 }
             };
-            // @ts-ignore
             return promise;
         }
     }
@@ -3554,8 +3550,7 @@
         #storeName;
         #dbVersion;
         /* websql的版本号，由于ios的问题，版本号的写法不一样 */
-        // @ts-ignore
-        #slqVersion = "1";
+        // #slqVersion = "1";
         /* 监听IndexDB */
         #indexedDB = window.indexedDB ||
             window.mozIndexedDB ||
@@ -3563,8 +3558,7 @@
             window.msIndexedDB;
         /* 缓存数据库，避免同一个页面重复创建和销毁 */
         #db = {};
-        // @ts-ignore
-        #store = null;
+        // #store: IDBObjectStore = null as any;
         /** 状态码 */
         #statusCode = {
             operationSuccess: {
@@ -3609,7 +3603,7 @@
             txn = this.#db[dbName].transaction(this.#storeName, "readwrite");
             /* IndexDB的读写权限 */
             store = txn.objectStore(this.#storeName);
-            this.#store = store;
+            // this.#store = store;
             return store;
         }
         /**
@@ -4334,12 +4328,40 @@
     }
 
     class UtilsDictionary {
-        items = {};
+        items;
         constructor(key, value) {
+            this.items = {};
             if (key != null) {
                 this.set(key, value);
             }
         }
+        /**
+         * 获取字典的长度，同this.size
+         */
+        get length() {
+            return this.size();
+        }
+        /**
+         * 迭代器
+         */
+        get entries() {
+            let that = this;
+            return function* () {
+                let itemKeys = Object.keys(that.getItems());
+                for (const keyName of itemKeys) {
+                    yield [keyName, that.get(keyName)];
+                }
+            };
+        }
+        /**
+         * 是否可遍历
+         */
+        get [Symbol.iterator]() {
+            let that = this;
+            return function () {
+                return that.entries();
+            };
+        }
         /**
          * 检查是否有某一个键
          * @param key 键
@@ -4440,7 +4462,6 @@
          * 返回字典本身
          */
         getItems() {
-            // @ts-ignore
             return this.items;
         }
         /**
@@ -4450,38 +4471,15 @@
         concat(data) {
             this.items = commonUtil.assign(this.items, data.getItems());
         }
+        /**
+         * 迭代字典
+         * @param callbackfn 回调函数
+         */
         forEach(callbackfn) {
             for (const key in this.getItems()) {
                 callbackfn(this.get(key), key, this.getItems());
             }
         }
-        /**
-         * 获取字典的长度，同this.size
-         */
-        get length() {
-            return this.size();
-        }
-        /**
-         * 迭代器
-         */
-        get entries() {
-            let that = this;
-            return function* () {
-                let itemKeys = Object.keys(that.getItems());
-                for (const keyName of itemKeys) {
-                    yield [keyName, that.get(keyName)];
-                }
-            };
-        }
-        /**
-         * 是否可遍历
-         */
-        get [Symbol.iterator]() {
-            let that = this;
-            return function () {
-                return that.entries();
-            };
-        }
     }
 
     class WindowApi {
@@ -4507,7 +4505,6 @@
             if (!option) {
                 option = Object.assign({}, this.defaultApi);
             }
-            // @ts-ignore
             this.api = Object.assign({}, option);
         }
         get document() {
@@ -4565,11 +4562,10 @@
         deps = [];
         active = true;
         fn;
-        // @ts-ignore
-        scheduler;
+        // private scheduler;
         constructor(fn, scheduler) {
             this.fn = fn;
-            this.scheduler = scheduler;
+            // this.scheduler = scheduler;
         }
         run(cb) {
             if (!this.active) {
@@ -4636,8 +4632,7 @@
         reactive(target) {
             const that = this;
             if (!(typeof target === "object" && target !== null)) {
-                // @ts-ignore
-                return;
+                return void 0;
             }
             if (VueUtils.isReactive(target)) {
                 return target;
@@ -4707,7 +4702,6 @@
         toRefs(object) {
             const result = VueUtils.isArray(object) ? new Array(object.length) : {};
             for (let key in object) {
-                // @ts-ignore
                 result[key] = this.toRef(object, key);
             }
             return result;
@@ -5003,7 +4997,7 @@
     };
 
     // 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),d=t(c);e.addUniqueNumber=d,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 d=r instanceof Promise?await r:r;if(null===a){if(void 0!==d.result)throw s(i)}else{if(void 0===d.result)throw s(i);const{result:e,transferables:r=[]}=d;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}}}),d=(e,t,r=()=>!0)=>{const n=c(d,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},l=e=>t=>{const r=e.get(t);if(void 0===r)return Promise.resolve(!1);const[n,o]=r;return clearTimeout(n),e.delete(t),o(!1),Promise.resolve(!0)},f=(e,t,r)=>(n,o,s)=>{const{expected:a,remainingDelay:i}=e(n,o);return new Promise((e=>{t.set(s,[setTimeout(r,i,a,t,e,s),e])}))},m=(e,t)=>{const r=performance.now(),n=e+t-r-performance.timeOrigin;return{expected:r+n,remainingDelay:n}},p=(e,t,r,n)=>{const o=e-performance.now();o>0?t.set(n,[setTimeout(p,o,e,t,r,n),r]):(t.delete(n),r(!0))},h=new Map,v=l(h),w=new Map,g=l(w),M=f(m,h,p),y=f(m,w,p);d(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?v(e):g(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?M:y)(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);
@@ -5435,7 +5429,6 @@
                 let text = textMatch[2];
                 selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
                 return Array.from(parent.querySelectorAll(selector)).filter(($ele) => {
-                    // @ts-ignore
                     return ($ele?.textContent || $ele?.innerText)?.includes(text);
                 });
             }
@@ -5453,7 +5446,6 @@
                 let regexp = new RegExp(pattern, flags);
                 selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
                 return Array.from(parent.querySelectorAll(selector)).filter(($ele) => {
-                    // @ts-ignore
                     return Boolean(($ele?.textContent || $ele?.innerText)?.match(regexp));
                 });
             }
@@ -5499,7 +5491,6 @@
                 let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
                 let text = textMatch[2];
                 selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
-                // @ts-ignore
                 let content = $el?.textContent || $el?.innerText;
                 if (typeof content !== "string") {
                     content = "";
@@ -5519,7 +5510,6 @@
                 }
                 let regexp = new RegExp(pattern, flags);
                 selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
-                // @ts-ignore
                 let content = $el?.textContent || $el?.innerText;
                 if (typeof content !== "string") {
                     content = "";
@@ -5550,7 +5540,6 @@
                 selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
                 let $closest = $el?.closest(selector);
                 if ($closest) {
-                    // @ts-ignore
                     let content = $el?.textContent || $el?.innerText;
                     if (typeof content === "string" && content.includes(text)) {
                         return $closest;
@@ -5573,7 +5562,6 @@
                 selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
                 let $closest = $el?.closest(selector);
                 if ($closest) {
-                    // @ts-ignore
                     let content = $el?.textContent || $el?.innerText;
                     if (typeof content === "string" && content.match(regexp)) {
                         return $closest;
@@ -5596,7 +5584,7 @@
             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类型");
@@ -5680,7 +5668,7 @@
          * 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
@@ -5693,7 +5681,7 @@
                 return ajaxHooker();
             }
         };
-        canvasClickByPosition(canvasElement, clientX = 0, clientY = 0, view = globalThis) {
+        canvasClickByPosition(canvasElement, clientX = 0, clientY = 0, view = this.windowApi.window) {
             if (!(canvasElement instanceof HTMLCanvasElement)) {
                 throw new Error("Utils.canvasClickByPosition 参数canvasElement必须是canvas元素");
             }
@@ -5704,7 +5692,6 @@
                 cancelable: true,
                 clientX: clientX,
                 clientY: clientY,
-                // @ts-ignore
                 view: view,
                 detail: 1,
             };
@@ -6211,12 +6198,10 @@
         }
         getElementSelector(element) {
             let UtilsContext = this;
-            // @ts-ignore
             if (!element)
-                return;
-            // @ts-ignore
+                return void 0;
             if (!element.parentElement)
-                return;
+                return void 0;
             /* 如果元素有id属性，则直接返回id选择器 */
             if (element.id)
                 return "#" + element.id;
@@ -6247,8 +6232,7 @@
             let result = [...args];
             let newResult = [];
             if (result.length === 0) {
-                // @ts-ignore
-                return;
+                return void 0;
             }
             if (result.length > 1) {
                 if (result.length === 2 &&
@@ -6288,7 +6272,6 @@
             // 当前页面最大的z-index
             let zIndex = 0;
             // 当前的最大z-index的元素，调试使用
-            // @ts-ignore
             let maxZIndexNode = null;
             /**
              * 元素是否可见
@@ -6349,8 +6332,7 @@
             let result = [...args];
             let newResult = [];
             if (result.length === 0) {
-                // @ts-ignore
-                return;
+                return void 0;
             }
             if (result.length > 1) {
                 if (result.length === 2 &&
@@ -6824,7 +6806,6 @@
         }
         isJQuery(target) {
             let result = false;
-            // @ts-ignore
             if (typeof jQuery === "object" && target instanceof jQuery) {
                 result = true;
             }
@@ -7605,29 +7586,27 @@
             EventTarget.prototype.addEventListener = function (...args) {
                 let type = args[0];
                 let callback = args[1];
-                // @ts-ignore
-                args[2];
+                // let options = args[2];
                 if (filter(type)) {
                     if (typeof callback === "function") {
                         args[1] = function (event) {
                             callback.call(this, trustEvent(event));
                         };
                     }
-                    else if (typeof callback === "object" &&
-                        "handleEvent" in callback) {
+                    else if (typeof callback === "object" && "handleEvent" in callback) {
                         let oldHandleEvent = callback["handleEvent"];
                         args[1]["handleEvent"] = function (event) {
                             if (event == null) {
                                 return;
                             }
                             try {
-                                /* Proxy对象使用instanceof会报错 */
+                                // Proxy对象使用instanceof会报错
+                                // 这里故意尝试一下，如果报错，则说明是Proxy对象
                                 event instanceof Proxy;
                                 oldHandleEvent.call(this, trustEvent(event));
                             }
                             catch (error) {
-                                // @ts-ignore
-                                event["isTrusted"] = isTrustValue;
+                                Reflect.set(event, "isTrusted", isTrustValue);
                             }
                         };
                     }
@@ -7700,8 +7679,8 @@
                 }
                 async init() {
                     let copyStatus = false;
-                    // @ts-ignore
-                    await this.requestClipboardPermission();
+                    let requestPermissionStatus = await this.requestClipboardPermission();
+                    console.log(requestPermissionStatus);
                     if (this.hasClipboard() &&
                         (this.hasClipboardWrite() || this.hasClipboardWriteText())) {
                         try {
@@ -7719,11 +7698,8 @@
                     this.destroy();
                 }
                 destroy() {
-                    // @ts-ignore
                     this.#resolve = null;
-                    // @ts-ignore
                     this.#copyData = null;
-                    // @ts-ignore
                     this.#copyDataType = null;
                 }
                 isText() {
@@ -7767,7 +7743,6 @@
                         if (navigator.permissions && navigator.permissions.query) {
                             navigator.permissions
                                 .query({
-                                // @ts-ignore
                                 name: "clipboard-write",
                             })
                                 .then((permissionStatus) => {
@@ -7863,7 +7838,6 @@
         dragSlider(selector, offsetX = this.windowApi.window.innerWidth) {
             let UtilsContext = this;
             function initMouseEvent(eventName, offSetX, offSetY) {
-                // @ts-ignore
                 let win = typeof unsafeWindow === "undefined" ? globalThis : unsafeWindow;
                 let mouseEvent = UtilsContext.windowApi.document.createEvent("MouseEvents");
                 mouseEvent.initMouseEvent(eventName, true, true, win, 0, offSetX, offSetY, offSetX, offSetY, false, false, false, false, 0, null);
@@ -8022,7 +7996,6 @@
         }
         stringToRegular(targetString, flags = "ig") {
             let reg;
-            // @ts-ignore
             flags = flags.toLowerCase();
             if (typeof targetString === "string") {
                 reg = new RegExp(targetString.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"), flags);
@@ -8115,10 +8088,8 @@
          */
         searchParamStrToObj(searhParamsStr) {
             if (typeof searhParamsStr !== "string") {
-                // @ts-ignore
                 return {};
             }
-            // @ts-ignore
             return Object.fromEntries(new URLSearchParams(searhParamsStr));
         }
         /**
@@ -8821,7 +8792,6 @@
                 function requestPermissionsWithClipboard() {
                     navigator.permissions
                         .query({
-                        // @ts-ignore
                         name: "clipboard-read",
                     })
                         .then((permissionStatus) => {