@whitesev/utils 2.4.1 → 2.4.3

package/dist/index.umd.js

@@ -1541,7 +1541,7 @@
              * @param details 当前的请求配置
              * @private
              */
-            beforeRequestCallBack(details) {
+            async beforeRequestCallBack(details) {
                 if (typeof details.allowInterceptConfig === "boolean") {
                     if (!details.allowInterceptConfig) {
                         // 不允许拦截
@@ -1562,7 +1562,7 @@
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.fn === "function") {
-                        let result = item.fn(details);
+                        let result = await item.fn(details);
                         if (result == null) {
                             return;
                         }
@@ -1619,7 +1619,7 @@
              * @param response 响应
              * @param details 请求的配置
              */
-            successResponseCallBack(response, details) {
+            async successResponseCallBack(response, details) {
                 if (typeof details.allowInterceptConfig === "boolean") {
                     if (!details.allowInterceptConfig) {
                         // 不允许拦截
@@ -1641,7 +1641,8 @@
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.successFn === "function") {
-                        if (item.successFn(response, details) == null) {
+                        let result = await item.successFn(response, details);
+                        if (result == null) {
                             return;
                         }
                     }
@@ -1654,7 +1655,7 @@
              * @returns
              * 返回null|undefined就是拦截掉了
              */
-            errorResponseCallBack(data) {
+            async errorResponseCallBack(data) {
                 if (typeof data.details.allowInterceptConfig === "boolean") {
                     if (!data.details.allowInterceptConfig) {
                         // 不允许拦截
@@ -1676,7 +1677,8 @@
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.errorFn === "function") {
-                        if (item.errorFn(data) == null) {
+                        let result = await item.errorFn(data);
+                        if (result == null) {
                             return;
                         }
                     }
@@ -1716,7 +1718,7 @@
                 this.$config.configList = [];
             },
         };
-        HttpxRequestDetails = {
+        HttpxRequestOption = {
             context: this,
             /**
              * 根据传入的参数处理获取details配置
@@ -2064,7 +2066,7 @@
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            onAbort(details, resolve, reject, argsResult) {
+            async onAbort(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
                 if ("onabort" in details) {
                     details.onabort.apply(this, argsResult);
@@ -2076,12 +2078,12 @@
                 if (response.length) {
                     response = response[0];
                 }
-                if (this.context.HttpxResponseHook.errorResponseCallBack({
+                if ((await this.context.HttpxResponseHook.errorResponseCallBack({
                     type: "onabort",
                     error: new TypeError("request canceled"),
                     response: null,
                     details: details,
-                }) == null) {
+                })) == null) {
                     // reject(new TypeError("response is intercept with onabort"));
                     return;
                 }
@@ -2101,7 +2103,7 @@
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            onError(details, resolve, reject, argsResult) {
+            async onError(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
                 if ("onerror" in details) {
                     details.onerror.apply(this, argsResult);
@@ -2113,12 +2115,12 @@
                 if (response.length) {
                     response = response[0];
                 }
-                if (this.context.HttpxResponseHook.errorResponseCallBack({
+                if ((await this.context.HttpxResponseHook.errorResponseCallBack({
                     type: "onerror",
                     error: new TypeError("request error"),
                     response: response,
                     details: details,
-                }) == null) {
+                })) == null) {
                     // reject(new TypeError("response is intercept with onerror"));
                     return;
                 }
@@ -2138,7 +2140,7 @@
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            onTimeout(details, resolve, reject, argsResult) {
+            async onTimeout(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
                 if ("ontimeout" in details) {
                     details.ontimeout.apply(this, argsResult);
@@ -2150,12 +2152,12 @@
                 if (response.length) {
                     response = response[0];
                 }
-                if (this.context.HttpxResponseHook.errorResponseCallBack({
+                if ((await this.context.HttpxResponseHook.errorResponseCallBack({
                     type: "ontimeout",
                     error: new TypeError("request timeout"),
                     response: (argsResult || [null])[0],
                     details: details,
-                }) == null) {
+                })) == null) {
                     // reject(new TypeError("response is intercept with ontimeout"));
                     return;
                 }
@@ -2189,7 +2191,7 @@
              * @param reject 抛出错误
              * @param argsResult 返回的参数列表
              */
-            onLoad(details, resolve, reject, argsResult) {
+            async onLoad(details, resolve, reject, argsResult) {
                 // console.log(argsResult);
                 /* X浏览器会因为设置了responseType导致不返回responseText */
                 let originResponse = argsResult[0];
@@ -2260,7 +2262,7 @@
                 }
                 /* 状态码2xx都是成功的 */
                 if (Math.floor(originResponse.status / 100) === 2) {
-                    if (this.context.HttpxResponseHook.successResponseCallBack(originResponse, details) == null) {
+                    if ((await this.context.HttpxResponseHook.successResponseCallBack(originResponse, details)) == null) {
                         // reject(new TypeError("response is intercept with onloada"));
                         return;
                     }
@@ -2312,20 +2314,20 @@
              * 发送请求
              * @param details
              */
-            request(details) {
+            async request(details) {
                 if (this.context.#LOG_DETAILS) {
                     console.log("[Httpx-HttpxRequest.request] 请求前的配置👇", details);
                 }
                 if (typeof this.context.HttpxRequestHook.beforeRequestCallBack ===
                     "function") {
-                    let hookResult = this.context.HttpxRequestHook.beforeRequestCallBack(details);
+                    let hookResult = await this.context.HttpxRequestHook.beforeRequestCallBack(details);
                     if (hookResult == null) {
                         return;
                     }
                 }
                 if (details.fetch) {
                     // 使用fetch请求
-                    const { fetchOption: fetchOption, fetchRequestOption: fetchRequestOption, abortController, } = this.context.HttpxRequestDetails.handleFetchOption(details);
+                    const { fetchOption: fetchOption, fetchRequestOption: fetchRequestOption, abortController, } = this.context.HttpxRequestOption.handleFetchOption(details);
                     return this.fetch(fetchOption, fetchRequestOption, abortController);
                 }
                 else {
@@ -2613,15 +2615,15 @@
          * @param url 网址
          * @param details 配置
          */
-        async get(...args // @ts-ignore
+        get(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new globalThis.Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("GET", userRequestOption, resolve, reject);
+            let promise = new globalThis.Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("GET", userRequestOption, resolve, reject);
                 Reflect.deleteProperty(requestOption, "onprogress");
-                this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2633,21 +2635,22 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
         /**
          * POST 请求
          */
-        async post(...args // @ts-ignore
+        post(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("POST", userRequestOption, resolve, reject);
+            let promise = new Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("POST", userRequestOption, resolve, reject);
                 // @ts-ignore
                 requestOption =
-                    this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2659,22 +2662,23 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
         /**
          * HEAD 请求
          */
-        async head(...args // @ts-ignore
+        head(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("HEAD", userRequestOption, resolve, reject);
+            let promise = new Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("HEAD", userRequestOption, resolve, reject);
                 Reflect.deleteProperty(requestOption, "onprogress");
                 // @ts-ignore
                 requestOption =
-                    this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2686,22 +2690,23 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
         /**
          * OPTIONS 请求
          */
-        async options(...args // @ts-ignore
+        options(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("OPTIONS", userRequestOption, resolve, reject);
+            let promise = new Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("OPTIONS", userRequestOption, resolve, reject);
                 Reflect.deleteProperty(requestOption, "onprogress");
                 // @ts-ignore
                 requestOption =
-                    this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2713,22 +2718,23 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
         /**
          * DELETE 请求
          */
-        async delete(...args // @ts-ignore
+        delete(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("DELETE", userRequestOption, resolve, reject);
+            let promise = new Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("DELETE", userRequestOption, resolve, reject);
                 Reflect.deleteProperty(requestOption, "onprogress");
                 // @ts-ignore
                 requestOption =
-                    this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2740,21 +2746,22 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
         /**
          * PUT 请求
          */
-        async put(...args // @ts-ignore
+        put(...args // @ts-ignore
         ) {
-            let userRequestOption = this.HttpxRequestDetails.handleBeforeRequestOption(...args);
+            let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(...args);
             let abortFn = null;
-            let promise = new Promise((resolve, reject) => {
-                let requestOption = this.HttpxRequestDetails.getRequestOption("PUT", userRequestOption, resolve, reject);
+            let promise = new Promise(async (resolve, reject) => {
+                let requestOption = this.HttpxRequestOption.getRequestOption("PUT", userRequestOption, resolve, reject);
                 // @ts-ignore
                 requestOption =
-                    this.HttpxRequestDetails.removeRequestNullOption(requestOption);
-                const requestResult = this.HttpxRequest.request(requestOption);
+                    this.HttpxRequestOption.removeRequestNullOption(requestOption);
+                const requestResult = await this.HttpxRequest.request(requestOption);
                 if (requestResult != null &&
                     typeof requestResult.abort === "function") {
                     abortFn = requestResult.abort;
@@ -2766,6 +2773,7 @@
                     abortFn();
                 }
             };
+            // @ts-ignore
             return promise;
         }
     }
@@ -4070,7 +4078,7 @@
             this.windowApi = new WindowApi(option);
         }
         /** 版本号 */
-        version = "2024.10.28";
+        version = "2024.10.31";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");