@whitesev/utils 2.3.7 → 2.4.0

package/dist/index.system.js

@@ -1720,55 +1720,57 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 根据传入的参数处理获取details配置
                      */
-                    handleBeforeRequestDetails(...args) {
-                        let result = {};
+                    handleBeforeRequestOption(...args) {
+                        let option = {};
                         if (typeof args[0] === "string") {
                             /* 传入的是url,details? */
                             let url = args[0];
-                            result.url = url;
+                            option.url = url;
                             if (typeof args[1] === "object") {
                                 /* 处理第二个参数details */
                                 let details = args[1];
-                                result = details;
-                                result.url = url;
+                                option = details;
+                                option.url = url;
                             }
                         }
                         else {
                             /* 传入的是details */
-                            result = args[0];
+                            option = args[0];
                         }
-                        return result;
+                        return option;
                     },
                     /**
                      * 获取请求配置
                      * @param method 当前请求方法，默认get
-                     * @param details 请求配置
+                     * @param userRequestOption 用户的请求配置
                      * @param resolve promise回调
                      * @param reject 抛出错误回调
                      */
-                    getDetails(method, details, resolve, reject) {
+                    getRequestOption(method, userRequestOption, resolve, reject) {
                         let that = this;
-                        let result = {
-                            url: details.url || this.context.#defaultDetails.url,
+                        let requestOption = {
+                            url: userRequestOption.url || this.context.#defaultDetails.url,
                             method: (method || "GET").toString().toUpperCase(),
-                            timeout: details.timeout || this.context.#defaultDetails.timeout,
-                            responseType: details.responseType || this.context.#defaultDetails.responseType,
+                            timeout: userRequestOption.timeout || this.context.#defaultDetails.timeout,
+                            responseType: userRequestOption.responseType ||
+                                this.context.#defaultDetails.responseType,
                             /* 对象使用深拷贝 */
                             headers: utils.deepClone(this.context.#defaultDetails.headers),
-                            data: details.data || this.context.#defaultDetails.data,
-                            redirect: details.redirect || this.context.#defaultDetails.redirect,
-                            cookie: details.cookie || this.context.#defaultDetails.cookie,
-                            cookiePartition: details.cookiePartition ||
+                            data: userRequestOption.data || this.context.#defaultDetails.data,
+                            redirect: userRequestOption.redirect || this.context.#defaultDetails.redirect,
+                            cookie: userRequestOption.cookie || this.context.#defaultDetails.cookie,
+                            cookiePartition: userRequestOption.cookiePartition ||
                                 this.context.#defaultDetails.cookiePartition,
-                            binary: details.binary || this.context.#defaultDetails.binary,
-                            nocache: details.nocache || this.context.#defaultDetails.nocache,
-                            revalidate: details.revalidate || this.context.#defaultDetails.revalidate,
+                            binary: userRequestOption.binary || this.context.#defaultDetails.binary,
+                            nocache: userRequestOption.nocache || this.context.#defaultDetails.nocache,
+                            revalidate: userRequestOption.revalidate ||
+                                this.context.#defaultDetails.revalidate,
                             /* 对象使用深拷贝 */
-                            context: utils.deepClone(details.context || this.context.#defaultDetails.context),
-                            overrideMimeType: details.overrideMimeType ||
+                            context: utils.deepClone(userRequestOption.context || this.context.#defaultDetails.context),
+                            overrideMimeType: userRequestOption.overrideMimeType ||
                                 this.context.#defaultDetails.overrideMimeType,
-                            anonymous: details.anonymous || this.context.#defaultDetails.anonymous,
-                            fetch: details.fetch || this.context.#defaultDetails.fetch,
+                            anonymous: userRequestOption.anonymous || this.context.#defaultDetails.anonymous,
+                            fetch: userRequestOption.fetch || this.context.#defaultDetails.fetch,
                             /* 对象使用深拷贝 */
                             fetchInit: utils.deepClone(this.context.#defaultDetails.fetchInit),
                             allowInterceptConfig: {
@@ -1779,153 +1781,243 @@ System.register('Utils', [], (function (exports) {
                                 afterResponseError: this.context.#defaultDetails
                                     .allowInterceptConfig.afterResponseError,
                             },
-                            user: details.user || this.context.#defaultDetails.user,
-                            password: details.password || this.context.#defaultDetails.password,
+                            user: userRequestOption.user || this.context.#defaultDetails.user,
+                            password: userRequestOption.password || this.context.#defaultDetails.password,
                             onabort(...args) {
-                                that.context.HttpxCallBack.onAbort(details, resolve, reject, args);
+                                that.context.HttpxCallBack.onAbort(userRequestOption, resolve, reject, args);
                             },
                             onerror(...args) {
-                                that.context.HttpxCallBack.onError(details, resolve, reject, args);
+                                that.context.HttpxCallBack.onError(userRequestOption, resolve, reject, args);
                             },
                             onloadstart(...args) {
-                                that.context.HttpxCallBack.onLoadStart(details, args);
+                                that.context.HttpxCallBack.onLoadStart(userRequestOption, args);
                             },
                             onprogress(...args) {
-                                that.context.HttpxCallBack.onProgress(details, args);
+                                that.context.HttpxCallBack.onProgress(userRequestOption, args);
                             },
                             onreadystatechange(...args) {
-                                that.context.HttpxCallBack.onReadyStateChange(details, args);
+                                that.context.HttpxCallBack.onReadyStateChange(userRequestOption, args);
                             },
                             ontimeout(...args) {
-                                that.context.HttpxCallBack.onTimeout(details, resolve, reject, args);
+                                that.context.HttpxCallBack.onTimeout(userRequestOption, resolve, reject, args);
                             },
                             onload(...args) {
-                                that.context.HttpxCallBack.onLoad(details, resolve, reject, args);
+                                that.context.HttpxCallBack.onLoad(userRequestOption, resolve, reject, args);
                             },
                         };
                         // 补全allowInterceptConfig参数
-                        if (typeof details.allowInterceptConfig === "boolean") {
-                            Object.keys(result.allowInterceptConfig).forEach((keyName) => {
-                                result.allowInterceptConfig[keyName] =
-                                    details.allowInterceptConfig;
+                        if (typeof userRequestOption.allowInterceptConfig === "boolean") {
+                            Object.keys(requestOption.allowInterceptConfig).forEach((keyName) => {
+                                Reflect.set(requestOption.allowInterceptConfig, keyName, userRequestOption.allowInterceptConfig);
                             });
                         }
                         else {
-                            if (typeof details.allowInterceptConfig === "object" &&
-                                details.allowInterceptConfig != null) {
-                                Object.keys(details.allowInterceptConfig).forEach((keyName) => {
-                                    let value = details.allowInterceptConfig[keyName];
-                                    if (keyName in
-                                        result.allowInterceptConfig &&
-                                        typeof value === "boolean") {
-                                        result.allowInterceptConfig[keyName] = value;
+                            if (typeof userRequestOption.allowInterceptConfig === "object" &&
+                                userRequestOption.allowInterceptConfig != null) {
+                                Object.keys(userRequestOption.allowInterceptConfig).forEach((keyName) => {
+                                    let value = Reflect.get(userRequestOption.allowInterceptConfig, keyName);
+                                    if (typeof value === "boolean" &&
+                                        Reflect.has(requestOption.allowInterceptConfig, keyName)) {
+                                        Reflect.set(requestOption.allowInterceptConfig, keyName, value);
                                     }
                                 });
                             }
                         }
                         if (typeof this.context.GM_Api.xmlHttpRequest !== "function") {
-                            result.fetch = true;
-                        }
-                        if (typeof result.headers === "object") {
-                            if (typeof details.headers === "object") {
-                                Object.keys(details.headers).forEach((keyName, index) => {
-                                    if (keyName in result.headers &&
-                                        details.headers?.[keyName] == null) {
+                            // GM函数不存在，强制使用fetch
+                            requestOption.fetch = true;
+                        }
+                        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) {
                                         /* 在默认的header中存在，且设置它新的值为空，那么就是默认的值 */
-                                        Reflect.deleteProperty(result.headers, keyName);
+                                        Reflect.deleteProperty(requestOption.headers, keyName);
                                     }
                                     else {
-                                        result.headers[keyName] = details?.headers?.[keyName];
+                                        requestOption.headers[keyName] =
+                                            userRequestOption?.headers?.[keyName];
                                     }
                                 });
                             }
                         }
                         else {
-                            result.headers = details.headers;
+                            /* 默认的headers不是对象，那么就直接使用新的 */
+                            Reflect.set(requestOption, "headers", userRequestOption.headers);
                         }
-                        if (typeof result.fetchInit === "object") {
+                        if (typeof requestOption.fetchInit === "object") {
                             /* 使用assign替换且添加 */
-                            if (typeof details.fetchInit === "object") {
-                                Object.keys(details.fetchInit).forEach((keyName, index) => {
-                                    if (keyName in result.fetchInit &&
-                                        details.fetchInit[keyName] == null) {
+                            if (typeof userRequestOption.fetchInit === "object") {
+                                Object.keys(userRequestOption.fetchInit).forEach((keyName, index) => {
+                                    if (keyName in requestOption.fetchInit &&
+                                        userRequestOption.fetchInit[keyName] == null) {
                                         /* 在默认的fetchInit中存在，且设置它新的值为空，那么就是默认的值 */
-                                        Reflect.deleteProperty(result.fetchInit, keyName);
+                                        Reflect.deleteProperty(requestOption.fetchInit, keyName);
                                     }
                                     else {
-                                        result.fetchInit[keyName] = details.fetchInit[keyName];
+                                        Reflect.set(requestOption.fetchInit, keyName, Reflect.get(userRequestOption.fetchInit, keyName));
                                     }
                                 });
                             }
                         }
                         else {
-                            result.fetchInit = details.fetchInit;
+                            Reflect.set(requestOption, "fetchInit", userRequestOption.fetchInit);
                         }
                         // 处理新的cookiePartition
-                        if (typeof result.cookiePartition === "object" &&
-                            result.cookiePartition != null) {
-                            if (Reflect.has(result.cookiePartition, "topLevelSite") &&
-                                typeof result.cookiePartition.topLevelSite !== "string") {
+                        if (typeof requestOption.cookiePartition === "object" &&
+                            requestOption.cookiePartition != null) {
+                            if (Reflect.has(requestOption.cookiePartition, "topLevelSite") &&
+                                typeof requestOption.cookiePartition.topLevelSite !== "string") {
                                 // topLevelSite必须是字符串
-                                Reflect.deleteProperty(result.cookiePartition, "topLevelSite");
+                                Reflect.deleteProperty(requestOption.cookiePartition, "topLevelSite");
                             }
                         }
-                        return result;
-                    },
-                    /**
-                     * 处理发送请求的details，去除值为undefined、空function的值
-                     * @param details
-                     */
-                    handle(details) {
-                        Object.keys(details).forEach((keyName) => {
-                            if (details[keyName] == null ||
-                                (details[keyName] instanceof Function &&
-                                    utils.isNull(details[keyName]))) {
-                                Reflect.deleteProperty(details, keyName);
-                                return;
-                            }
-                        });
-                        if (utils.isNull(details.url)) {
-                            throw new TypeError(`Utils.Httpx 参数 url不符合要求: ${details.url}`);
-                        }
-                        /* method值统一大写，兼容Via */
-                        details.method = details.method.toUpperCase();
-                        /* 判断是否是以http开头，否则主动加上origin */
+                        /* 完善请求的url */
                         try {
-                            new URL(details.url);
+                            new URL(requestOption.url);
                         }
                         catch (error) {
-                            if (details.url.startsWith("//")) {
-                                details.url = window.location.protocol + details.url;
+                            if (requestOption.url.startsWith("//")) {
+                                // 补充https:
+                                requestOption.url = globalThis.location.protocol + requestOption.url;
                             }
-                            else if (details.url.startsWith("/")) {
-                                details.url = window.location.origin + details.url;
+                            else if (requestOption.url.startsWith("/")) {
+                                // 补充origin
+                                requestOption.url = globalThis.location.origin + requestOption.url;
                             }
                             else {
-                                details.url = window.location.origin + "/" + details.url;
+                                // 补充origin+/
+                                requestOption.url =
+                                    globalThis.location.origin + "/" + requestOption.url;
                             }
                         }
-                        return details;
+                        if (requestOption.fetchInit && !requestOption.fetch) {
+                            // 清空fetchInit
+                            Reflect.deleteProperty(requestOption, "fetchInit");
+                        }
+                        // 转换data类型
+                        try {
+                            /** 是否对数据进行处理 */
+                            let processData = userRequestOption.processData ?? true;
+                            if (requestOption.data != null && processData) {
+                                let method = requestOption.method;
+                                if (method === "GET" || method === "HEAD") {
+                                    // GET类型，data如果有，那么需要转为searchParams
+                                    let urlObj = new URL(requestOption.url);
+                                    let urlSearch = "";
+                                    if (typeof requestOption.data === "string") {
+                                        urlSearch = requestOption.data;
+                                    }
+                                    else if (typeof requestOption.data === "object") {
+                                        // URLSearchParams参数可以转普通的string:string，包括FormData
+                                        // @ts-ignore
+                                        let searchParams = new URLSearchParams(requestOption.data);
+                                        urlSearch = searchParams.toString();
+                                    }
+                                    if (urlSearch != "") {
+                                        if (urlObj.search === "") {
+                                            // url没有search参数，直接覆盖
+                                            urlObj.search = urlSearch;
+                                        }
+                                        else {
+                                            // 有search参数
+                                            if (urlObj.search.endsWith("&")) {
+                                                // xxx=xxx&
+                                                urlObj.search = urlObj.search + urlSearch;
+                                            }
+                                            else {
+                                                // xxx=xxx&xxx=
+                                                urlObj.search = urlObj.search + "&" + urlSearch;
+                                            }
+                                        }
+                                    }
+                                    requestOption.url = urlObj.toString();
+                                }
+                                else if (method === "POST" && requestOption.headers != null) {
+                                    // POST类型，data如果是FormData，那么需要转为string
+                                    let headersKeyList = Object.keys(requestOption.headers);
+                                    let ContentTypeIndex = headersKeyList.findIndex((headerKey) => {
+                                        return (headerKey.trim().toLowerCase() === "content-type" &&
+                                            typeof requestOption.headers[headerKey] === "string");
+                                    });
+                                    if (ContentTypeIndex !== -1) {
+                                        let ContentTypeKey = headersKeyList[ContentTypeIndex];
+                                        // 设置了Content-Type
+                                        let ContentType = requestOption.headers[ContentTypeIndex].toLowerCase();
+                                        if (ContentType.includes("application/json")) {
+                                            // application/json
+                                            if (requestOption.data instanceof FormData) {
+                                                const entries = {};
+                                                requestOption.data.forEach((value, key) => {
+                                                    entries[key] = value;
+                                                });
+                                                requestOption.data = JSON.stringify(entries);
+                                            }
+                                            else if (typeof requestOption.data === "object") {
+                                                requestOption.data = JSON.stringify(requestOption.data);
+                                            }
+                                        }
+                                        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();
+                                            }
+                                        }
+                                        else if (ContentType.includes("multipart/form-data")) {
+                                            // multipart/form-data
+                                            if (requestOption.data instanceof FormData) {
+                                                Reflect.deleteProperty(requestOption.headers, ContentTypeKey);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        catch (error) {
+                            console.warn("Httpx ==> 转换data参数错误", error);
+                        }
+                        return requestOption;
+                    },
+                    /**
+                     * 处理发送请求的配置，去除值为undefined、空function的值
+                     * @param option
+                     */
+                    removeRequestNullOption(option) {
+                        Object.keys(option).forEach((keyName) => {
+                            if (option[keyName] == null ||
+                                (option[keyName] instanceof Function &&
+                                    utils.isNull(option[keyName]))) {
+                                Reflect.deleteProperty(option, keyName);
+                                return;
+                            }
+                        });
+                        if (utils.isNull(option.url)) {
+                            throw new TypeError(`Utils.Httpx 参数 url不符合要求: ${option.url}`);
+                        }
+                        return option;
                     },
                     /**
                      * 处理fetch的配置
-                     * @param details
+                     * @param option
                      */
-                    handleFetchDetail(details) {
+                    handleFetchOption(option) {
                         /**
                          * fetch的请求配置
                          **/
-                        let fetchRequestInit = {};
-                        if ((details.method === "GET" || details.method === "HEAD") &&
-                            details.data != null) {
+                        let fetchRequestOption = {};
+                        if ((option.method === "GET" || option.method === "HEAD") &&
+                            option.data != null) {
                             /* GET 或 HEAD 方法的请求不能包含 body 信息 */
-                            Reflect.deleteProperty(details, "data");
+                            Reflect.deleteProperty(option, "data");
                         }
                         /* 中止信号控制器 */
                         let abortController = new AbortController();
                         let signal = abortController.signal;
                         signal.onabort = () => {
-                            details.onabort({
+                            option.onabort({
                                 isFetch: true,
                                 responseText: "",
                                 response: null,
@@ -1936,19 +2028,28 @@ System.register('Utils', [], (function (exports) {
                                 error: "aborted",
                             });
                         };
-                        fetchRequestInit.method = details.method ?? "GET";
-                        fetchRequestInit.headers = details.headers;
-                        fetchRequestInit.body = details.data;
-                        fetchRequestInit.mode = "cors";
-                        fetchRequestInit.credentials = "include";
-                        fetchRequestInit.cache = "no-cache";
-                        fetchRequestInit.redirect = "follow";
-                        fetchRequestInit.referrerPolicy = "origin-when-cross-origin";
-                        fetchRequestInit.signal = signal;
-                        Object.assign(fetchRequestInit, details.fetchInit || {});
+                        // 设置请求
+                        fetchRequestOption.method = option.method ?? "GET";
+                        // 设置请求头
+                        fetchRequestOption.headers = option.headers;
+                        // 设置请求体
+                        fetchRequestOption.body = option.data;
+                        // 设置跨域
+                        fetchRequestOption.mode = "cors";
+                        // 设置包含
+                        fetchRequestOption.credentials = "include";
+                        // 设置不缓存
+                        fetchRequestOption.cache = "no-cache";
+                        // 设置始终重定向
+                        fetchRequestOption.redirect = "follow";
+                        // 设置referer跨域
+                        fetchRequestOption.referrerPolicy = "origin-when-cross-origin";
+                        // 设置信号中断
+                        fetchRequestOption.signal = signal;
+                        Object.assign(fetchRequestOption, option.fetchInit || {});
                         return {
-                            fetchDetails: details,
-                            fetchRequestInit: fetchRequestInit,
+                            fetchOption: option,
+                            fetchRequestOption: fetchRequestOption,
                             abortController: abortController,
                         };
                     },
@@ -1960,14 +2061,19 @@ System.register('Utils', [], (function (exports) {
                      * @param details 配置
                      * @param resolve 回调
                      * @param reject 抛出错误
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onAbort(details, resolve, reject, argumentsList) {
+                    onAbort(details, resolve, reject, argsResult) {
+                        // console.log(argsResult);
                         if ("onabort" in details) {
-                            details.onabort.apply(this, argumentsList);
+                            details.onabort.apply(this, argsResult);
                         }
                         else if ("onabort" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onabort.apply(this, argumentsList);
+                            this.context.#defaultDetails.onabort.apply(this, argsResult);
+                        }
+                        let response = argsResult;
+                        if (response.length) {
+                            response = response[0];
                         }
                         if (this.context.HttpxResponseHook.errorResponseCallBack({
                             type: "onabort",
@@ -1979,9 +2085,11 @@ System.register('Utils', [], (function (exports) {
                             return;
                         }
                         resolve({
-                            status: false,
-                            data: [...argumentsList],
+                            data: response,
+                            details: details,
                             msg: "请求被取消",
+                            status: false,
+                            statusCode: -1,
                             type: "onabort",
                         });
                     },
@@ -1990,16 +2098,17 @@ System.register('Utils', [], (function (exports) {
                      * @param details 配置
                      * @param resolve 回调
                      * @param reject 抛出错误
-                     * @param argumentsList 响应的参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onError(details, resolve, reject, argumentsList) {
+                    onError(details, resolve, reject, argsResult) {
+                        // console.log(argsResult);
                         if ("onerror" in details) {
-                            details.onerror.apply(this, argumentsList);
+                            details.onerror.apply(this, argsResult);
                         }
                         else if ("onerror" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onerror.apply(this, argumentsList);
+                            this.context.#defaultDetails.onerror.apply(this, argsResult);
                         }
-                        let response = argumentsList;
+                        let response = argsResult;
                         if (response.length) {
                             response = response[0];
                         }
@@ -2013,10 +2122,11 @@ System.register('Utils', [], (function (exports) {
                             return;
                         }
                         resolve({
-                            status: false,
                             data: response,
                             details: details,
                             msg: "请求异常",
+                            status: false,
+                            statusCode: response["status"],
                             type: "onerror",
                         });
                     },
@@ -2025,42 +2135,50 @@ System.register('Utils', [], (function (exports) {
                      * @param details 配置
                      * @param resolve 回调
                      * @param reject 抛出错误
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onTimeout(details, resolve, reject, argumentsList) {
+                    onTimeout(details, resolve, reject, argsResult) {
+                        // console.log(argsResult);
                         if ("ontimeout" in details) {
-                            details.ontimeout.apply(this, argumentsList);
+                            details.ontimeout.apply(this, argsResult);
                         }
                         else if ("ontimeout" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.ontimeout.apply(this, argumentsList);
+                            this.context.#defaultDetails.ontimeout.apply(this, argsResult);
+                        }
+                        let response = argsResult;
+                        if (response.length) {
+                            response = response[0];
                         }
                         if (this.context.HttpxResponseHook.errorResponseCallBack({
                             type: "ontimeout",
                             error: new TypeError("request timeout"),
-                            response: (argumentsList || [null])[0],
+                            response: (argsResult || [null])[0],
                             details: details,
                         }) == null) {
                             // reject(new TypeError("response is intercept with ontimeout"));
                             return;
                         }
                         resolve({
-                            status: false,
-                            data: [...argumentsList],
+                            data: response,
+                            details: details,
                             msg: "请求超时",
+                            status: false,
+                            statusCode: 0,
                             type: "ontimeout",
                         });
                     },
                     /**
                      * onloadstart请求开始-触发
                      * @param details 配置
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onLoadStart(details, argumentsList) {
+                    onLoadStart(details, argsResult) {
+                        // console.log(argsResult);
                         if ("onloadstart" in details) {
-                            details.onloadstart.apply(this, argumentsList);
+                            details.onloadstart.apply(this, argsResult);
                         }
                         else if ("onloadstart" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onloadstart.apply(this, argumentsList);
+                            this.context.#defaultDetails.onloadstart.apply(this, argsResult);
                         }
                     },
                     /**
@@ -2068,11 +2186,12 @@ System.register('Utils', [], (function (exports) {
                      * @param details 请求的配置
                      * @param resolve 回调
                      * @param reject 抛出错误
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onLoad(details, resolve, reject, argumentsList) {
+                    onLoad(details, resolve, reject, argsResult) {
+                        // console.log(argsResult);
                         /* X浏览器会因为设置了responseType导致不返回responseText */
-                        let originResponse = argumentsList[0];
+                        let originResponse = argsResult[0];
                         /* responseText为空，response不为空的情况 */
                         if (utils.isNull(originResponse["responseText"]) &&
                             utils.isNotNull(originResponse["response"])) {
@@ -2145,41 +2264,44 @@ System.register('Utils', [], (function (exports) {
                                 return;
                             }
                             resolve({
-                                status: true,
                                 data: originResponse,
                                 details: details,
-                                msg: "请求完毕",
+                                msg: "请求成功",
+                                status: true,
+                                statusCode: originResponse.status,
                                 type: "onload",
                             });
                         }
                         else {
-                            this.context.HttpxCallBack.onError(details, resolve, reject, argumentsList);
+                            this.context.HttpxCallBack.onError(details, resolve, reject, argsResult);
                         }
                     },
                     /**
                      * onprogress上传进度-触发
                      * @param details 配置
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onProgress(details, argumentsList) {
+                    onProgress(details, argsResult) {
+                        // console.log(argsResult);
                         if ("onprogress" in details) {
-                            details.onprogress.apply(this, argumentsList);
+                            details.onprogress.apply(this, argsResult);
                         }
                         else if ("onprogress" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onprogress.apply(this, argumentsList);
+                            this.context.#defaultDetails.onprogress.apply(this, argsResult);
                         }
                     },
                     /**
                      * onreadystatechange准备状态改变-触发
                      * @param details 配置
-                     * @param argumentsList 参数列表
+                     * @param argsResult 返回的参数列表
                      */
-                    onReadyStateChange(details, argumentsList) {
+                    onReadyStateChange(details, argsResult) {
+                        // console.log(argsResult);
                         if ("onreadystatechange" in details) {
-                            details.onreadystatechange.apply(this, argumentsList);
+                            details.onreadystatechange.apply(this, argsResult);
                         }
                         else if ("onreadystatechange" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onreadystatechange.apply(this, argumentsList);
+                            this.context.#defaultDetails.onreadystatechange.apply(this, argsResult);
                         }
                     },
                 };
@@ -2201,11 +2323,12 @@ System.register('Utils', [], (function (exports) {
                             }
                         }
                         if (details.fetch) {
-                            const { fetchDetails, fetchRequestInit, abortController } = this.context.HttpxRequestDetails.handleFetchDetail(details);
-                            return this.fetch(fetchDetails, fetchRequestInit, abortController);
+                            // 使用fetch请求
+                            const { fetchOption: fetchOption, fetchRequestOption: fetchRequestOption, abortController, } = this.context.HttpxRequestDetails.handleFetchOption(details);
+                            return this.fetch(fetchOption, fetchRequestOption, abortController);
                         }
                         else {
-                            Reflect.deleteProperty(details, "fetchInit");
+                            // 使用GM_xmlHttpRequest请求
                             return this.xmlHttpRequest(details);
                         }
                     },
@@ -2218,12 +2341,12 @@ System.register('Utils', [], (function (exports) {
                     },
                     /**
                      * 使用fetch发送请求
-                     * @param details
-                     * @param fetchRequestInit
+                     * @param option
+                     * @param fetchRequestOption
                      * @param abortController
                      */
-                    fetch(details, fetchRequestInit, abortController) {
-                        fetch(details.url, fetchRequestInit)
+                    fetch(option, fetchRequestOption, abortController) {
+                        fetch(option.url, fetchRequestOption)
                             .then(async (fetchResponse) => {
                             /** 自定义的response */
                             let httpxResponse = {
@@ -2233,15 +2356,16 @@ System.register('Utils', [], (function (exports) {
                                 // @ts-ignore
                                 status: fetchResponse.status,
                                 statusText: fetchResponse.statusText,
+                                // @ts-ignore
                                 response: void 0,
                                 responseFetchHeaders: fetchResponse.headers,
                                 responseHeaders: "",
                                 // @ts-ignore
                                 responseText: void 0,
-                                responseType: details.responseType,
+                                responseType: option.responseType,
                                 responseXML: void 0,
                             };
-                            Object.assign(httpxResponse, details.context || {});
+                            Object.assign(httpxResponse, option.context || {});
                             // 把headers转为字符串
                             for (const [key, value] of fetchResponse.headers.entries()) {
                                 httpxResponse.responseHeaders += `${key}: ${value}\n`;
@@ -2249,7 +2373,7 @@ System.register('Utils', [], (function (exports) {
                             /** 请求返回的类型 */
                             const fetchResponseType = fetchResponse.headers.get("Content-Type");
                             /* 如果需要stream，且获取到的是stream，那直接返回 */
-                            if (details.responseType === "stream" ||
+                            if (option.responseType === "stream" ||
                                 (fetchResponse.headers.has("Content-Type") &&
                                     fetchResponse.headers
                                         .get("Content-Type")
@@ -2258,7 +2382,7 @@ System.register('Utils', [], (function (exports) {
                                 Reflect.set(httpxResponse, "response", fetchResponse.body);
                                 Reflect.deleteProperty(httpxResponse, "responseText");
                                 Reflect.deleteProperty(httpxResponse, "responseXML");
-                                details.onload(httpxResponse);
+                                option.onload(httpxResponse);
                                 return;
                             }
                             /** 响应 */
@@ -2287,22 +2411,22 @@ System.register('Utils', [], (function (exports) {
                             let textDecoder = new TextDecoder(encoding);
                             responseText = textDecoder.decode(arrayBuffer);
                             response = responseText;
-                            if (details.responseType === "arraybuffer") {
+                            if (option.responseType === "arraybuffer") {
                                 // response返回格式是二进制流
                                 response = arrayBuffer;
                             }
-                            else if (details.responseType === "blob") {
+                            else if (option.responseType === "blob") {
                                 // response返回格式是blob
                                 response = new Blob([arrayBuffer]);
                             }
-                            else if (details.responseType === "json" ||
+                            else if (option.responseType === "json" ||
                                 (typeof fetchResponseType === "string" &&
                                     fetchResponseType.includes("application/json"))) {
                                 // response返回格式是JSON格式
                                 response = utils.toJSON(responseText);
                             }
-                            else if (details.responseType === "document" ||
-                                details.responseType == null) {
+                            else if (option.responseType === "document" ||
+                                option.responseType == null) {
                                 // response返回格式是文档格式
                                 let parser = new DOMParser();
                                 response = parser.parseFromString(responseText, "text/html");
@@ -2314,15 +2438,15 @@ System.register('Utils', [], (function (exports) {
                             Reflect.set(httpxResponse, "responseText", responseText);
                             Reflect.set(httpxResponse, "responseXML", responseXML);
                             // 执行回调
-                            details.onload(httpxResponse);
+                            option.onload(httpxResponse);
                         })
                             .catch((error) => {
                             if (error.name === "AbortError") {
                                 return;
                             }
-                            details.onerror({
+                            option.onerror({
                                 isFetch: true,
-                                finalUrl: details.url,
+                                finalUrl: option.url,
                                 readyState: 4,
                                 status: 0,
                                 statusText: "",
@@ -2331,9 +2455,9 @@ System.register('Utils', [], (function (exports) {
                                 error: error,
                             });
                         });
-                        details.onloadstart({
+                        option.onloadstart({
                             isFetch: true,
-                            finalUrl: details.url,
+                            finalUrl: option.url,
                             readyState: 1,
                             responseHeaders: "",
                             responseText: "",
@@ -2388,15 +2512,15 @@ System.register('Utils', [], (function (exports) {
                 #LOG_DETAILS = false;
                 /**
                  * 实例化，可传入GM_xmlhttpRequest，未传入则使用window.fetch
-                 * @param __xmlHttpRequest__
+                 * @param xmlHttpRequest
                  */
-                constructor(__xmlHttpRequest__) {
-                    if (typeof __xmlHttpRequest__ !== "function") {
+                constructor(xmlHttpRequest) {
+                    if (typeof xmlHttpRequest !== "function") {
                         console.warn("[Httpx-constructor] 未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，将默认使用window.fetch");
                     }
                     this.interceptors.request.context = this;
                     this.interceptors.response.context = this;
-                    this.GM_Api.xmlHttpRequest = __xmlHttpRequest__;
+                    this.GM_Api.xmlHttpRequest = xmlHttpRequest;
                 }
                 /**
                  * 覆盖当前配置
@@ -2490,28 +2614,24 @@ System.register('Utils', [], (function (exports) {
                  */
                 async get(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("GET", details, resolve, reject);
-                        Reflect.deleteProperty(requestDetails, "onprogress");
-                        // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                    let promise = new globalThis.Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("GET", userRequestOption, resolve, reject);
+                        Reflect.deleteProperty(requestOption, "onprogress");
+                        this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
                 /**
@@ -2519,27 +2639,25 @@ System.register('Utils', [], (function (exports) {
                  */
                 async post(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("POST", details, resolve, reject);
+                    let promise = new Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("POST", userRequestOption, resolve, reject);
                         // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                        requestOption =
+                            this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
                 /**
@@ -2547,28 +2665,26 @@ System.register('Utils', [], (function (exports) {
                  */
                 async head(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("HEAD", details, resolve, reject);
-                        Reflect.deleteProperty(requestDetails, "onprogress");
+                    let promise = new Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("HEAD", userRequestOption, resolve, reject);
+                        Reflect.deleteProperty(requestOption, "onprogress");
                         // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                        requestOption =
+                            this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
                 /**
@@ -2576,28 +2692,26 @@ System.register('Utils', [], (function (exports) {
                  */
                 async options(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("OPTIONS", details, resolve, reject);
-                        Reflect.deleteProperty(requestDetails, "onprogress");
+                    let promise = new Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("OPTIONS", userRequestOption, resolve, reject);
+                        Reflect.deleteProperty(requestOption, "onprogress");
                         // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                        requestOption =
+                            this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
                 /**
@@ -2605,28 +2719,26 @@ System.register('Utils', [], (function (exports) {
                  */
                 async delete(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("DELETE", details, resolve, reject);
-                        Reflect.deleteProperty(requestDetails, "onprogress");
+                    let promise = new Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("DELETE", userRequestOption, resolve, reject);
+                        Reflect.deleteProperty(requestOption, "onprogress");
                         // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                        requestOption =
+                            this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
                 /**
@@ -2634,27 +2746,25 @@ System.register('Utils', [], (function (exports) {
                  */
                 async put(...args // @ts-ignore
                 ) {
-                    let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
+                    let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
                     let abortFn = null;
-                    const promise = new Promise((resolve, reject) => {
-                        let requestDetails = this.HttpxRequestDetails.getDetails("PUT", details, resolve, reject);
+                    let promise = new Promise((resolve, reject) => {
+                        let requestOption = this.HttpxRequestDetails.getRequestOption("PUT", userRequestOption, resolve, reject);
                         // @ts-ignore
-                        requestDetails = this.HttpxRequestDetails.handle(requestDetails);
-                        const requestResult = this.HttpxRequest.request(requestDetails);
+                        requestOption =
+                            this.HttpxRequestDetails.removeRequestNullOption(requestOption);
+                        const requestResult = this.HttpxRequest.request(requestOption);
                         if (requestResult != null &&
                             typeof requestResult.abort === "function") {
                             abortFn = requestResult.abort;
                         }
                     });
-                    Object.defineProperty(promise, "abort", {
-                        value: () => {
-                            return () => {
-                                if (typeof abortFn === "function") {
-                                    abortFn();
-                                }
-                            };
-                        },
-                    });
+                    // @ts-ignore
+                    promise.abort = () => {
+                        if (typeof abortFn === "function") {
+                            abortFn();
+                        }
+                    };
                     return promise;
                 }
             }
@@ -2685,6 +2795,10 @@ System.register('Utils', [], (function (exports) {
                         code: 401,
                         msg: "操作失败",
                     },
+                    empty: {
+                        code: 201,
+                        msg: "操作成功，但是没有数据",
+                    },
                     openFailed: { code: 91001, msg: "打开数据库失败" },
                     saveFailed: { code: 91002, msg: "保存数据失败" },
                     getFailed: { code: 91003, msg: "获取数据失败" },
@@ -2873,11 +2987,11 @@ System.register('Utils', [], (function (exports) {
                                     /* result 返回的是 {key: string, value: any} */
                                     /* 键值对存储 */
                                     let data = result ? result.value : void 0;
-                                    if (data) {
+                                    if (data == null) {
                                         resolve({
                                             success: true,
-                                            code: that.#statusCode.operationSuccess.code,
-                                            msg: that.#statusCode.operationSuccess.msg,
+                                            code: that.#statusCode.empty.code,
+                                            msg: that.#statusCode.empty.msg,
                                             data: data,
                                             event: event,
                                             result: result,
@@ -2885,10 +2999,10 @@ System.register('Utils', [], (function (exports) {
                                     }
                                     else {
                                         resolve({
-                                            success: false,
-                                            code: that.#statusCode.operationFailed.code,
-                                            msg: that.#statusCode.operationFailed.msg,
-                                            data: void 0,
+                                            success: true,
+                                            code: that.#statusCode.operationSuccess.code,
+                                            msg: that.#statusCode.operationSuccess.msg,
+                                            data: data,
                                             event: event,
                                             result: result,
                                         });
@@ -3955,7 +4069,7 @@ System.register('Utils', [], (function (exports) {
                     this.windowApi = new WindowApi(option);
                 }
                 /** 版本号 */
-                version = "2024.10.19";
+                version = "2024.10.28";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -4102,22 +4216,33 @@ System.register('Utils', [], (function (exports) {
                     if (!UtilsContext.isDOM(element)) {
                         throw new Error("Utils.checkUserClickInNode 参数 targetNode 必须为 Element|Node 类型");
                     }
-                    let mouseClickPosX = Number(window.event.clientX.toString()); /* 鼠标相对屏幕横坐标 */
-                    let mouseClickPosY = Number(window.event.clientY.toString()); /* 鼠标相对屏幕纵坐标 */
-                    let elementPosXLeft = Number(element.getBoundingClientRect().left); /* 要检测的元素的相对屏幕的横坐标最左边 */
-                    let elementPosXRight = Number(element.getBoundingClientRect().right); /* 要检测的元素的相对屏幕的横坐标最右边 */
-                    let elementPosYTop = Number(element.getBoundingClientRect().top); /* 要检测的元素的相对屏幕的纵坐标最上边 */
-                    let elementPosYBottom = Number(element.getBoundingClientRect().bottom); /* 要检测的元素的相对屏幕的纵坐标最下边 */
-                    let clickNodeHTML = this.windowApi.window.event.target
-                        .innerHTML;
-                    if (mouseClickPosX >= elementPosXLeft &&
-                        mouseClickPosX <= elementPosXRight &&
-                        mouseClickPosY >= elementPosYTop &&
-                        mouseClickPosY <= elementPosYBottom) {
+                    let clickEvent = UtilsContext.windowApi.window.event;
+                    let touchEvent = UtilsContext.windowApi.window.event;
+                    let $click = clickEvent?.composedPath()?.[0];
+                    // 点击的x坐标
+                    let clickPosX = clickEvent?.clientX != null
+                        ? clickEvent.clientX
+                        : touchEvent.touches[0].clientX;
+                    // 点击的y坐标
+                    let clickPosY = clickEvent?.clientY != null
+                        ? clickEvent.clientY
+                        : touchEvent.touches[0].clientY;
+                    let { 
+                    /* 要检测的元素的相对屏幕的横坐标最左边 */
+                    left: elementPosXLeft, 
+                    /* 要检测的元素的相对屏幕的横坐标最右边 */
+                    right: elementPosXRight, 
+                    /* 要检测的元素的相对屏幕的纵坐标最上边 */
+                    top: elementPosYTop, 
+                    /* 要检测的元素的相对屏幕的纵坐标最下边 */
+                    bottom: elementPosYBottom, } = element.getBoundingClientRect();
+                    if (clickPosX >= elementPosXLeft &&
+                        clickPosX <= elementPosXRight &&
+                        clickPosY >= elementPosYTop &&
+                        clickPosY <= elementPosYBottom) {
                         return true;
                     }
-                    else if (clickNodeHTML &&
-                        element.innerHTML.includes(clickNodeHTML)) {
+                    else if (($click && element.contains($click)) || $click == element) {
                         /* 这种情况是应对在界面中隐藏的元素，getBoundingClientRect获取的都是0 */
                         return true;
                     }
@@ -6175,7 +6300,8 @@ System.register('Utils', [], (function (exports) {
                 dragSlider(selector, offsetX = this.windowApi.window.innerWidth) {
                     let UtilsContext = this;
                     function initMouseEvent(eventName, offSetX, offSetY) {
-                        let win = unsafeWindow || window;
+                        // @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;