@whitesev/utils 2.7.1 → 2.7.3

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值是否合法 */
@@ -76,11 +71,7 @@
                 !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];
@@ -90,38 +81,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]);
         }
     }
@@ -136,10 +119,7 @@
             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) {
@@ -209,20 +189,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 +233,6 @@
              * @param handler
              */
             error(handler) {
-                // @ts-ignore
                 handleError = handler;
                 return TryCatchCore;
             },
@@ -268,7 +247,6 @@
                 callbackFunction = callback;
                 context = __context__ || this;
                 let result = executeTryCatch(callbackFunction, handleError, context);
-                // @ts-ignore
                 return result !== void 0 ? result : TryCatchCore;
             },
         };
@@ -298,10 +276,7 @@
                 }
                 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]);
@@ -389,10 +364,7 @@
                             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;
@@ -433,8 +405,7 @@
                 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;
         }
@@ -1953,35 +1924,30 @@
                 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"
-                        ? 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
@@ -2034,8 +2000,7 @@
              * @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) {
@@ -2043,8 +2008,7 @@
             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}，且传入该对象`);
@@ -2276,8 +2240,7 @@
                 _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;
                 }
@@ -2455,8 +2418,7 @@
                     if (details.allowInterceptConfig != null) {
                         // 配置存在
                         // 细分处理是否拦截
-                        if (typeof details.allowInterceptConfig.afterResponseSuccess ===
-                            "boolean" &&
+                        if (typeof details.allowInterceptConfig.afterResponseSuccess === "boolean" &&
                             !details.allowInterceptConfig.afterResponseSuccess) {
                             // 设置了禁止拦截
                             return details;
@@ -2491,8 +2453,7 @@
                     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;
@@ -2549,7 +2510,9 @@
              * 对请求的参数进行合并处理
              */
             handleBeforeRequestOptionArgs(...args) {
-                let option = {};
+                let option = {
+                    url: void 0,
+                };
                 if (typeof args[0] === "string") {
                     /* 传入的是url，转为配置 */
                     let url = args[0];
@@ -2573,7 +2536,7 @@
              * @param method 当前请求方法，默认get
              * @param userRequestOption 用户的请求配置
              * @param resolve promise回调
-             * @param reject 抛出错误回调
+             * @param reject promise抛出错误回调
              */
             getRequestOption(method, userRequestOption, resolve, reject) {
                 let that = this;
@@ -2592,64 +2555,51 @@
                 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.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参数
@@ -2677,14 +2627,12 @@
                 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];
                             }
                         });
                     }
@@ -2697,8 +2645,7 @@
                     /* 使用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);
                             }
@@ -2712,8 +2659,7 @@
                     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必须是字符串
@@ -2735,8 +2681,7 @@
                     }
                     else {
                         // 补充origin+/
-                        requestOption.url =
-                            globalThis.location.origin + "/" + requestOption.url;
+                        requestOption.url = globalThis.location.origin + "/" + requestOption.url;
                     }
                 }
                 if (requestOption.fetchInit && !requestOption.fetch) {
@@ -2761,7 +2706,6 @@
                             else if (typeof requestOption.data === "object") {
                                 isHandler = true;
                                 // URLSearchParams参数可以转普通的string:string，包括FormData
-                                // @ts-ignore
                                 let searchParams = new URLSearchParams(requestOption.data);
                                 urlSearch = searchParams.toString();
                             }
@@ -2816,9 +2760,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")) {
@@ -2838,7 +2780,7 @@
             },
             /**
              * 处理发送请求的配置，去除值为undefined、空function的值
-             * @param option
+             * @param option 请求配置
              */
             removeRequestNullOption(option) {
                 Object.keys(option).forEach((keyName) => {
@@ -2850,21 +2792,20 @@
                     }
                 });
                 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) {
                 /**
                  * 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");
                 }
@@ -2909,21 +2850,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;
@@ -2932,11 +2873,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({
@@ -2949,93 +2890,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 请求的配置
@@ -3115,7 +3046,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({
@@ -3128,21 +3059,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);
                 }
             },
             /**
@@ -3152,13 +3083,27 @@
              */
             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,
@@ -3170,8 +3115,7 @@
                 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;
@@ -3208,15 +3152,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,
                     };
@@ -3230,9 +3171,7 @@
                     /* 如果需要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");
@@ -3251,9 +3190,7 @@
                     /** 数据编码 */
                     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();
@@ -3275,13 +3212,11 @@
                         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");
@@ -3289,9 +3224,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);
                 })
@@ -3472,7 +3407,7 @@
         }
         /**
          * GET 请求
-         * @param url 网址
+         * @param url 请求的url
          * @param details 配置
          */
         get(...args) {
@@ -3538,27 +3473,21 @@
             /** 取消请求 */
             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") {
+                if (requestResult != null && typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
                 }
             });
-            // @ts-ignore
             promise.abort = () => {
                 if (typeof abortFn === "function") {
                     abortFn();
                 }
             };
-            // @ts-ignore
             return promise;
         }
     }
@@ -3568,8 +3497,7 @@
         #storeName;
         #dbVersion;
         /* websql的版本号，由于ios的问题，版本号的写法不一样 */
-        // @ts-ignore
-        #slqVersion = "1";
+        // #slqVersion = "1";
         /* 监听IndexDB */
         #indexedDB = window.indexedDB ||
             window.mozIndexedDB ||
@@ -3577,8 +3505,7 @@
             window.msIndexedDB;
         /* 缓存数据库，避免同一个页面重复创建和销毁 */
         #db = {};
-        // @ts-ignore
-        #store = null;
+        // #store: IDBObjectStore = null as any;
         /** 状态码 */
         #statusCode = {
             operationSuccess: {
@@ -3623,7 +3550,7 @@
             txn = this.#db[dbName].transaction(this.#storeName, "readwrite");
             /* IndexDB的读写权限 */
             store = txn.objectStore(this.#storeName);
-            this.#store = store;
+            // this.#store = store;
             return store;
         }
         /**
@@ -4043,8 +3970,7 @@
             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;
@@ -4100,8 +4026,7 @@
          */
         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;
             }
@@ -4348,12 +4273,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 键
@@ -4454,7 +4407,6 @@
          * 返回字典本身
          */
         getItems() {
-            // @ts-ignore
             return this.items;
         }
         /**
@@ -4464,38 +4416,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 {
@@ -4521,7 +4450,6 @@
             if (!option) {
                 option = Object.assign({}, this.defaultApi);
             }
-            // @ts-ignore
             this.api = Object.assign({}, option);
         }
         get document() {
@@ -4579,11 +4507,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) {
@@ -4650,8 +4577,7 @@
         reactive(target) {
             const that = this;
             if (!(typeof target === "object" && target !== null)) {
-                // @ts-ignore
-                return;
+                return void 0;
             }
             if (VueUtils.isReactive(target)) {
                 return target;
@@ -4721,7 +4647,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;
@@ -5017,7 +4942,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);
@@ -5449,7 +5374,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);
                 });
             }
@@ -5467,7 +5391,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));
                 });
             }
@@ -5513,7 +5436,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 = "";
@@ -5533,7 +5455,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 = "";
@@ -5564,7 +5485,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;
@@ -5587,7 +5507,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;
@@ -5610,7 +5529,7 @@
             this.windowApi = new WindowApi(option);
         }
         /** 版本号 */
-        version = "2025.7.29";
+        version = "2025.8.11";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -5707,7 +5626,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元素");
             }
@@ -5718,7 +5637,6 @@
                 cancelable: true,
                 clientX: clientX,
                 clientY: clientY,
-                // @ts-ignore
                 view: view,
                 detail: 1,
             };
@@ -5734,13 +5652,9 @@
             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, 
@@ -5903,9 +5817,7 @@
                 /* 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) {
@@ -6008,9 +5920,7 @@
                 }
             }
             result = result.toFixed(2);
-            result = addType
-                ? result + resultType.toString()
-                : parseFloat(result.toString());
+            result = addType ? result + resultType.toString() : parseFloat(result.toString());
             return result;
         }
         getNodeListValue(...args) {
@@ -6089,14 +5999,7 @@
             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, "/");
@@ -6117,25 +6020,13 @@
          * 获取 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];
@@ -6225,12 +6116,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;
@@ -6241,10 +6130,8 @@
             }
             /* 如果有多个相同类型的兄弟元素，则需要添加索引 */
             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();
@@ -6261,13 +6148,10 @@
             let result = [...args];
             let newResult = [];
             if (result.length === 0) {
-                // @ts-ignore
-                return;
+                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) => {
@@ -6302,7 +6186,6 @@
             // 当前页面最大的z-index
             let zIndex = 0;
             // 当前的最大z-index的元素，调试使用
-            // @ts-ignore
             let maxZIndexNode = null;
             /**
              * 元素是否可见
@@ -6363,13 +6246,10 @@
             let result = [...args];
             let newResult = [];
             if (result.length === 0) {
-                // @ts-ignore
-                return;
+                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) => {
@@ -6459,12 +6339,10 @@
         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)];
@@ -6475,8 +6353,7 @@
                 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];
                 }
@@ -6783,11 +6660,9 @@
             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;
@@ -6838,7 +6713,6 @@
         }
         isJQuery(target) {
             let result = false;
-            // @ts-ignore
             if (typeof jQuery === "object" && target instanceof jQuery) {
                 result = true;
             }
@@ -7077,8 +6951,7 @@
          **/
         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;
         }
         /**
          * 判断元素是否在页面中可见
@@ -7111,10 +6984,8 @@
                 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 ||
@@ -7138,8 +7009,7 @@
                 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 {
@@ -7161,8 +7031,7 @@
                 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 {
@@ -7399,13 +7268,11 @@
              * 释放所有
              */
             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] = () => { };
@@ -7419,8 +7286,7 @@
                 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) {
@@ -7435,8 +7301,7 @@
              * 恢复所有
              */
             function recoveryAll() {
-                if (typeof UtilsContext.windowApi.window[needReleaseKey] ===
-                    "undefined") {
+                if (typeof UtilsContext.windowApi.window[needReleaseKey] === "undefined") {
                     /* 未存在 */
                     return;
                 }
@@ -7447,8 +7312,7 @@
              * 恢复单个
              */
             function recoveryOne() {
-                if (typeof UtilsContext.windowApi.window[needReleaseKey] ===
-                    "undefined") {
+                if (typeof UtilsContext.windowApi.window[needReleaseKey] === "undefined") {
                     /* 未存在 */
                     return;
                 }
@@ -7456,8 +7320,7 @@
                     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);
                         }
                     }
@@ -7619,29 +7482,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);
                             }
                         };
                     }
@@ -7714,10 +7575,9 @@
                 }
                 async init() {
                     let copyStatus = false;
-                    // @ts-ignore
-                    await this.requestClipboardPermission();
-                    if (this.hasClipboard() &&
-                        (this.hasClipboardWrite() || this.hasClipboardWriteText())) {
+                    let requestPermissionStatus = await this.requestClipboardPermission();
+                    console.log(requestPermissionStatus);
+                    if (this.hasClipboard() && (this.hasClipboardWrite() || this.hasClipboardWriteText())) {
                         try {
                             copyStatus = await this.copyDataByClipboard();
                         }
@@ -7733,11 +7593,8 @@
                     this.destroy();
                 }
                 destroy() {
-                    // @ts-ignore
                     this.#resolve = null;
-                    // @ts-ignore
                     this.#copyData = null;
-                    // @ts-ignore
                     this.#copyDataType = null;
                 }
                 isText() {
@@ -7781,7 +7638,6 @@
                         if (navigator.permissions && navigator.permissions.query) {
                             navigator.permissions
                                 .query({
-                                // @ts-ignore
                                 name: "clipboard-write",
                             })
                                 .then((permissionStatus) => {
@@ -7877,17 +7733,13 @@
         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);
                 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;
@@ -7939,17 +7791,14 @@
         }
         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);
             };
             /**
              * 排序方法
@@ -8024,8 +7873,7 @@
             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();
             }
@@ -8036,7 +7884,6 @@
         }
         stringToRegular(targetString, flags = "ig") {
             let reg;
-            // @ts-ignore
             flags = flags.toLowerCase();
             if (typeof targetString === "string") {
                 reg = new RegExp(targetString.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"), flags);
@@ -8129,10 +7976,8 @@
          */
         searchParamStrToObj(searhParamsStr) {
             if (typeof searhParamsStr !== "string") {
-                // @ts-ignore
                 return {};
             }
-            // @ts-ignore
             return Object.fromEntries(new URLSearchParams(searhParamsStr));
         }
         /**
@@ -8221,9 +8066,7 @@
             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) ;
@@ -8233,8 +8076,7 @@
                     // "div",10000
                     timeout = secondParam;
                 }
-                else if (typeof secondParam === "object" &&
-                    secondParam instanceof Node) {
+                else if (typeof secondParam === "object" && secondParam instanceof Node) {
                     // "div",document
                     parent = secondParam;
                 }
@@ -8320,8 +8162,7 @@
                     // "div",10000
                     timeout = secondParam;
                 }
-                else if (typeof secondParam === "object" &&
-                    secondParam instanceof Node) {
+                else if (typeof secondParam === "object" && secondParam instanceof Node) {
                     // "div",document
                     parent = secondParam;
                 }
@@ -8376,8 +8217,7 @@
                     // "div",10000
                     timeout = secondParam;
                 }
-                else if (typeof secondParam === "object" &&
-                    secondParam instanceof Node) {
+                else if (typeof secondParam === "object" && secondParam instanceof Node) {
                     // "div",document
                     parent = secondParam;
                 }
@@ -8463,8 +8303,7 @@
                     // "div",10000
                     timeout = secondParam;
                 }
-                else if (typeof secondParam === "object" &&
-                    secondParam instanceof Node) {
+                else if (typeof secondParam === "object" && secondParam instanceof Node) {
                     // "div",document
                     parent = secondParam;
                 }
@@ -8597,8 +8436,7 @@
             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") {
@@ -8650,13 +8488,27 @@
                 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
@@ -8835,7 +8687,6 @@
                 function requestPermissionsWithClipboard() {
                     navigator.permissions
                         .query({
-                        // @ts-ignore
                         name: "clipboard-read",
                     })
                         .then((permissionStatus) => {