@whitesev/utils 2.6.4 → 2.6.6

package/dist/index.system.js

@@ -2286,24 +2286,25 @@ System.register('Utils', [], (function (exports) {
                 HttpxRequestOption = {
                     context: this,
                     /**
-                     * 根据传入的参数处理获取details配置
+                     * 对请求的参数进行合并处理
                      */
-                    handleBeforeRequestOption(...args) {
+                    handleBeforeRequestOptionArgs(...args) {
                         let option = {};
                         if (typeof args[0] === "string") {
-                            /* 传入的是url,details? */
+                            /* 传入的是url，转为配置 */
                             let url = args[0];
                             option.url = url;
                             if (typeof args[1] === "object") {
                                 /* 处理第二个参数details */
-                                let details = args[1];
-                                option = details;
+                                let optionArg = args[1];
+                                utils.assign(option, optionArg, true);
                                 option.url = url;
                             }
                         }
                         else {
-                            /* 传入的是details */
-                            option = args[0];
+                            /* 传入的是配置 */
+                            let optionArg = args[0];
+                            utils.assign(option, optionArg, true);
                         }
                         return option;
                     },
@@ -2316,41 +2317,59 @@ System.register('Utils', [], (function (exports) {
                      */
                     getRequestOption(method, userRequestOption, resolve, reject) {
                         let that = this;
+                        let url = userRequestOption.url || this.context.#defaultRequestOption.url;
+                        if (typeof url === "string") {
+                            // 去除左右空格
+                            url = url.trim();
+                            if (url.startsWith("http://") || url.startsWith("https://")) ;
+                            else {
+                                if (typeof this.context.#defaultInitOption.baseURL === "string") {
+                                    // 设置了基础域
+                                    url = this.context.#defaultInitOption.baseURL + url;
+                                }
+                            }
+                        }
                         let requestOption = {
-                            url: userRequestOption.url || this.context.#defaultDetails.url,
+                            url: url,
                             method: (method || "GET").toString().toUpperCase().trim(),
-                            timeout: userRequestOption.timeout || this.context.#defaultDetails.timeout,
+                            timeout: userRequestOption.timeout ||
+                                this.context.#defaultRequestOption.timeout,
                             responseType: userRequestOption.responseType ||
-                                this.context.#defaultDetails.responseType,
+                                this.context.#defaultRequestOption.responseType,
                             /* 对象使用深拷贝 */
-                            headers: utils.deepClone(this.context.#defaultDetails.headers),
-                            data: userRequestOption.data || this.context.#defaultDetails.data,
-                            redirect: userRequestOption.redirect || this.context.#defaultDetails.redirect,
-                            cookie: userRequestOption.cookie || this.context.#defaultDetails.cookie,
+                            headers: utils.deepClone(this.context.#defaultRequestOption.headers),
+                            data: userRequestOption.data || this.context.#defaultRequestOption.data,
+                            redirect: userRequestOption.redirect ||
+                                this.context.#defaultRequestOption.redirect,
+                            cookie: userRequestOption.cookie || this.context.#defaultRequestOption.cookie,
                             cookiePartition: userRequestOption.cookiePartition ||
-                                this.context.#defaultDetails.cookiePartition,
-                            binary: userRequestOption.binary || this.context.#defaultDetails.binary,
-                            nocache: userRequestOption.nocache || this.context.#defaultDetails.nocache,
+                                this.context.#defaultRequestOption.cookiePartition,
+                            binary: userRequestOption.binary || this.context.#defaultRequestOption.binary,
+                            nocache: userRequestOption.nocache ||
+                                this.context.#defaultRequestOption.nocache,
                             revalidate: userRequestOption.revalidate ||
-                                this.context.#defaultDetails.revalidate,
+                                this.context.#defaultRequestOption.revalidate,
                             /* 对象使用深拷贝 */
-                            context: utils.deepClone(userRequestOption.context || this.context.#defaultDetails.context),
+                            context: utils.deepClone(userRequestOption.context ||
+                                this.context.#defaultRequestOption.context),
                             overrideMimeType: userRequestOption.overrideMimeType ||
-                                this.context.#defaultDetails.overrideMimeType,
-                            anonymous: userRequestOption.anonymous || this.context.#defaultDetails.anonymous,
-                            fetch: userRequestOption.fetch || this.context.#defaultDetails.fetch,
+                                this.context.#defaultRequestOption.overrideMimeType,
+                            anonymous: userRequestOption.anonymous ||
+                                this.context.#defaultRequestOption.anonymous,
+                            fetch: userRequestOption.fetch || this.context.#defaultRequestOption.fetch,
                             /* 对象使用深拷贝 */
-                            fetchInit: utils.deepClone(this.context.#defaultDetails.fetchInit),
+                            fetchInit: utils.deepClone(this.context.#defaultRequestOption.fetchInit),
                             allowInterceptConfig: {
-                                beforeRequest: this.context.#defaultDetails
+                                beforeRequest: this.context.#defaultRequestOption
                                     .allowInterceptConfig.beforeRequest,
-                                afterResponseSuccess: this.context.#defaultDetails
+                                afterResponseSuccess: this.context.#defaultRequestOption
                                     .allowInterceptConfig.afterResponseSuccess,
-                                afterResponseError: this.context.#defaultDetails
+                                afterResponseError: this.context.#defaultRequestOption
                                     .allowInterceptConfig.afterResponseError,
                             },
-                            user: userRequestOption.user || this.context.#defaultDetails.user,
-                            password: userRequestOption.password || this.context.#defaultDetails.password,
+                            user: userRequestOption.user || this.context.#defaultRequestOption.user,
+                            password: userRequestOption.password ||
+                                this.context.#defaultRequestOption.password,
                             onabort(...args) {
                                 that.context.HttpxCallBack.onAbort(userRequestOption, resolve, reject, args);
                             },
@@ -2644,8 +2663,8 @@ System.register('Utils', [], (function (exports) {
                         if ("onabort" in details) {
                             details.onabort.apply(this, argsResult);
                         }
-                        else if ("onabort" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onabort.apply(this, argsResult);
+                        else if ("onabort" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.onabort.apply(this, argsResult);
                         }
                         let response = argsResult;
                         if (response.length) {
@@ -2681,8 +2700,8 @@ System.register('Utils', [], (function (exports) {
                         if ("onerror" in details) {
                             details.onerror.apply(this, argsResult);
                         }
-                        else if ("onerror" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onerror.apply(this, argsResult);
+                        else if ("onerror" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.onerror.apply(this, argsResult);
                         }
                         let response = argsResult;
                         if (response.length) {
@@ -2718,8 +2737,8 @@ System.register('Utils', [], (function (exports) {
                         if ("ontimeout" in details) {
                             details.ontimeout.apply(this, argsResult);
                         }
-                        else if ("ontimeout" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.ontimeout.apply(this, argsResult);
+                        else if ("ontimeout" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.ontimeout.apply(this, argsResult);
                         }
                         let response = argsResult;
                         if (response.length) {
@@ -2753,8 +2772,8 @@ System.register('Utils', [], (function (exports) {
                         if ("onloadstart" in details) {
                             details.onloadstart.apply(this, argsResult);
                         }
-                        else if ("onloadstart" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onloadstart.apply(this, argsResult);
+                        else if ("onloadstart" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.onloadstart.apply(this, argsResult);
                         }
                     },
                     /**
@@ -2862,8 +2881,8 @@ System.register('Utils', [], (function (exports) {
                         if ("onprogress" in details) {
                             details.onprogress.apply(this, argsResult);
                         }
-                        else if ("onprogress" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onprogress.apply(this, argsResult);
+                        else if ("onprogress" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.onprogress.apply(this, argsResult);
                         }
                     },
                     /**
@@ -2876,8 +2895,8 @@ System.register('Utils', [], (function (exports) {
                         if ("onreadystatechange" in details) {
                             details.onreadystatechange.apply(this, argsResult);
                         }
-                        else if ("onreadystatechange" in this.context.#defaultDetails) {
-                            this.context.#defaultDetails.onreadystatechange.apply(this, argsResult);
+                        else if ("onreadystatechange" in this.context.#defaultRequestOption) {
+                            this.context.#defaultRequestOption.onreadystatechange.apply(this, argsResult);
                         }
                     },
                 };
@@ -2888,7 +2907,7 @@ System.register('Utils', [], (function (exports) {
                      * @param details
                      */
                     async request(details) {
-                        if (this.context.#LOG_DETAILS) {
+                        if (this.context.#defaultInitOption.logDetails) {
                             console.log("[Httpx-HttpxRequest.request] 请求前的配置👇", details);
                         }
                         if (typeof this.context.HttpxRequestHook.beforeRequestCallBack ===
@@ -3050,7 +3069,7 @@ System.register('Utils', [], (function (exports) {
                 /**
                  * 默认配置
                  */
-                #defaultDetails = {
+                #defaultRequestOption = {
                     url: undefined,
                     timeout: 5000,
                     async: false,
@@ -3082,31 +3101,39 @@ System.register('Utils', [], (function (exports) {
                     onreadystatechange() { },
                     onprogress() { },
                 };
+                #defaultInitOption = {
+                    /**
+                     * `baseURL` 将自动加在 `url` 前面，除非 `url` 是一个绝对 URL。
+                     */
+                    baseURL: undefined,
+                    /**
+                     * 当前使用请求时，输出请求的配置，一般用于DEBUG|DEV
+                     */
+                    logDetails: false,
+                };
                 /**
-                 * 当前使用请求时，输出请求的配置
-                 */
-                #LOG_DETAILS = false;
-                /**
-                 * 实例化，可传入GM_xmlhttpRequest，未传入则使用window.fetch
-                 * @param xmlHttpRequest
+                 * 实例化
+                 * @param option 初始化配置
                  */
-                constructor(xmlHttpRequest) {
-                    if (typeof xmlHttpRequest !== "function") {
+                constructor(option = {}) {
+                    if (typeof option.xmlHttpRequest !== "function") {
                         console.warn("[Httpx-constructor] 未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，将默认使用window.fetch");
                     }
+                    utils.coverObjectFunctionThis(this);
                     this.interceptors.request.context = this;
                     this.interceptors.response.context = this;
-                    this.GM_Api.xmlHttpRequest = xmlHttpRequest;
+                    this.config(option);
                 }
                 /**
                  * 覆盖当前配置
-                 * @param details
+                 * @param option
                  */
-                config(details = {}) {
-                    if ("logDetails" in details && typeof details["logDetails"] === "boolean") {
-                        this.#LOG_DETAILS = details["logDetails"];
+                config(option = {}) {
+                    if (typeof option.xmlHttpRequest === "function") {
+                        this.GM_Api.xmlHttpRequest = option.xmlHttpRequest;
                     }
-                    this.#defaultDetails = utils.assign(this.#defaultDetails, details);
+                    this.#defaultRequestOption = utils.assign(this.#defaultRequestOption, option);
+                    this.#defaultInitOption = utils.assign(this.#defaultInitOption, option);
                 }
                 /**
                  * 拦截器
@@ -3188,149 +3215,74 @@ System.register('Utils', [], (function (exports) {
                  * @param url 网址
                  * @param details 配置
                  */
-                get(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
-                    let abortFn = null;
-                    let promise = new globalThis.Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("GET", userRequestOption, resolve, reject);
-                        Reflect.deleteProperty(requestOption, "onprogress");
-                        this.HttpxRequestOption.removeRequestNullOption(requestOption);
-                        const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
-                            abortFn = requestResult.abort;
-                        }
+                get(...args) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    useRequestOption.method = "GET";
+                    return this.request(useRequestOption, (option) => {
+                        Reflect.deleteProperty(option, "onprogress");
                     });
-                    // @ts-ignore
-                    promise.abort = () => {
-                        if (typeof abortFn === "function") {
-                            abortFn();
-                        }
-                    };
-                    // @ts-ignore
-                    return promise;
                 }
                 /**
                  * POST 请求
                  */
-                post(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
-                    let abortFn = null;
-                    let promise = new Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("POST", userRequestOption, resolve, reject);
-                        // @ts-ignore
-                        requestOption =
-                            this.HttpxRequestOption.removeRequestNullOption(requestOption);
-                        const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
-                            abortFn = requestResult.abort;
-                        }
-                    });
-                    // @ts-ignore
-                    promise.abort = () => {
-                        if (typeof abortFn === "function") {
-                            abortFn();
-                        }
-                    };
-                    // @ts-ignore
-                    return promise;
+                post(...args) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    useRequestOption.method = "POST";
+                    return this.request(useRequestOption);
                 }
                 /**
                  * HEAD 请求
                  */
-                head(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
-                    let abortFn = null;
-                    let promise = new Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("HEAD", userRequestOption, resolve, reject);
-                        Reflect.deleteProperty(requestOption, "onprogress");
-                        // @ts-ignore
-                        requestOption =
-                            this.HttpxRequestOption.removeRequestNullOption(requestOption);
-                        const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
-                            abortFn = requestResult.abort;
-                        }
+                head(...args) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    useRequestOption.method = "HEAD";
+                    return this.request(useRequestOption, (option) => {
+                        Reflect.deleteProperty(option, "onprogress");
                     });
-                    // @ts-ignore
-                    promise.abort = () => {
-                        if (typeof abortFn === "function") {
-                            abortFn();
-                        }
-                    };
-                    // @ts-ignore
-                    return promise;
                 }
                 /**
                  * OPTIONS 请求
                  */
-                options(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
-                    let abortFn = null;
-                    let promise = new Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("OPTIONS", userRequestOption, resolve, reject);
-                        Reflect.deleteProperty(requestOption, "onprogress");
-                        // @ts-ignore
-                        requestOption =
-                            this.HttpxRequestOption.removeRequestNullOption(requestOption);
-                        const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
-                            abortFn = requestResult.abort;
-                        }
+                options(...args) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    useRequestOption.method = "OPTIONS";
+                    return this.request(useRequestOption, (option) => {
+                        Reflect.deleteProperty(option, "onprogress");
                     });
-                    // @ts-ignore
-                    promise.abort = () => {
-                        if (typeof abortFn === "function") {
-                            abortFn();
-                        }
-                    };
-                    // @ts-ignore
-                    return promise;
                 }
                 /**
                  * DELETE 请求
                  */
-                delete(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
-                    let abortFn = null;
-                    let promise = new Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("DELETE", userRequestOption, resolve, reject);
-                        Reflect.deleteProperty(requestOption, "onprogress");
-                        // @ts-ignore
-                        requestOption =
-                            this.HttpxRequestOption.removeRequestNullOption(requestOption);
-                        const requestResult = await this.HttpxRequest.request(requestOption);
-                        if (requestResult != null &&
-                            typeof requestResult.abort === "function") {
-                            abortFn = requestResult.abort;
-                        }
+                delete(...args) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    useRequestOption.method = "DELETE";
+                    return this.request(useRequestOption, (option) => {
+                        Reflect.deleteProperty(option, "onprogress");
                     });
-                    // @ts-ignore
-                    promise.abort = () => {
-                        if (typeof abortFn === "function") {
-                            abortFn();
-                        }
-                    };
-                    // @ts-ignore
-                    return promise;
                 }
                 /**
                  * PUT 请求
                  */
-                put(...args // @ts-ignore
-                ) {
-                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
+                put(...args) {
+                    let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+                    userRequestOption.method = "PUT";
+                    return this.request(userRequestOption);
+                }
+                /**
+                 * 发送请求
+                 * @param details 配置
+                 * @param beforeRequestOption 处理请求前的配置
+                 */
+                request(details, beforeRequestOption) {
+                    let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(details);
+                    /** 取消请求 */
                     let abortFn = null;
-                    let promise = new Promise(async (resolve, reject) => {
-                        let requestOption = this.HttpxRequestOption.getRequestOption("PUT", userRequestOption, resolve, reject);
+                    let promise = new globalThis.Promise(async (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);
@@ -5058,7 +5010,7 @@ System.register('Utils', [], (function (exports) {
                     this.windowApi = new WindowApi(option);
                 }
                 /** 版本号 */
-                version = "2025.3.25";
+                version = "2025.4.11";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -8227,6 +8179,22 @@ System.register('Utils', [], (function (exports) {
                     }
                     return new URL(text);
                 }
+                /**
+                 * 覆盖对象中的函数this指向
+                 * @param target 需要覆盖的对象
+                 * @param [objectThis] 覆盖的this指向，如果为传入，则默认为对象本身
+                 */
+                coverObjectFunctionThis(target, objectThis) {
+                    if (typeof target !== "object" || target === null) {
+                        throw new Error("target must be object");
+                    }
+                    objectThis = objectThis || target;
+                    Object.keys(target).forEach((key) => {
+                        if (typeof target[key] === "function") {
+                            target[key] = target[key].bind(objectThis);
+                        }
+                    });
+                }
                 /**
                  * 生成uuid
                  * @example