@whitesev/utils 1.8.0 → 1.9.2

package/dist/index.esm.js

@@ -1563,14 +1563,23 @@ class Httpx {
          * @private
          */
         beforeRequestCallBack(details) {
-            if (details.allowInterceptConfig) {
-                // 首先配置得存在，不然默认允许拦截
-                if (typeof details.allowInterceptConfig.beforeRequest === "boolean" &&
-                    !details.allowInterceptConfig.beforeRequest) {
-                    // 设置了禁止拦截
+            if (typeof details.allowInterceptConfig === "boolean") {
+                if (!details.allowInterceptConfig) {
+                    // 不允许拦截
                     return details;
                 }
             }
+            else {
+                if (details.allowInterceptConfig != null) {
+                    // 配置存在
+                    // 细分处理是否拦截
+                    if (typeof details.allowInterceptConfig.beforeRequest === "boolean" &&
+                        !details.allowInterceptConfig.beforeRequest) {
+                        // 设置了禁止拦截
+                        return details;
+                    }
+                }
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.fn === "function") {
@@ -1632,15 +1641,24 @@ class Httpx {
          * @param details 请求的配置
          */
         successResponseCallBack(response, details) {
-            if (details.allowInterceptConfig) {
-                // 首先配置得存在，不然默认允许拦截
-                if (typeof details.allowInterceptConfig.afterResponseSuccess ===
-                    "boolean" &&
-                    !details.allowInterceptConfig.afterResponseSuccess) {
-                    // 设置了禁止拦截
+            if (typeof details.allowInterceptConfig === "boolean") {
+                if (!details.allowInterceptConfig) {
+                    // 不允许拦截
                     return details;
                 }
             }
+            else {
+                if (details.allowInterceptConfig != null) {
+                    // 配置存在
+                    // 细分处理是否拦截
+                    if (typeof details.allowInterceptConfig.afterResponseSuccess ===
+                        "boolean" &&
+                        !details.allowInterceptConfig.afterResponseSuccess) {
+                        // 设置了禁止拦截
+                        return details;
+                    }
+                }
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.successFn === "function") {
@@ -1654,17 +1672,28 @@ class Httpx {
         /**
          * 失败的回调
          * @param data 配置
+         * @returns
+         * 返回null|undefined就是拦截掉了
          */
         errorResponseCallBack(data) {
-            if (data.details.allowInterceptConfig) {
-                // 首先配置得存在，不然默认允许拦截
-                if (typeof data.details.allowInterceptConfig.afterResponseError ===
-                    "boolean" &&
-                    !data.details.allowInterceptConfig.afterResponseError) {
-                    // 设置了禁止拦截
+            if (typeof data.details.allowInterceptConfig === "boolean") {
+                if (!data.details.allowInterceptConfig) {
+                    // 不允许拦截
                     return data;
                 }
             }
+            else {
+                if (data.details.allowInterceptConfig != null) {
+                    // 配置存在
+                    // 细分处理是否拦截
+                    if (typeof data.details.allowInterceptConfig.afterResponseError ===
+                        "boolean" &&
+                        !data.details.allowInterceptConfig.afterResponseError) {
+                        // 设置了禁止拦截
+                        return data;
+                    }
+                }
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.errorFn === "function") {
@@ -1735,10 +1764,11 @@ class Httpx {
         /**
          * 获取请求配置
          * @param method 当前请求方法，默认get
-         * @param resolve promise回调
          * @param details 请求配置
+         * @param resolve promise回调
+         * @param reject 抛出错误回调
          */
-        getDetails(method, resolve, details) {
+        getDetails(method, details, resolve, reject) {
             let that = this;
             let result = {
                 url: details.url || this.context.#defaultDetails.url,
@@ -1761,13 +1791,21 @@ class Httpx {
                 fetch: details.fetch || this.context.#defaultDetails.fetch,
                 /* 对象使用深拷贝 */
                 fetchInit: utils.deepClone(this.context.#defaultDetails.fetchInit),
+                allowInterceptConfig: {
+                    beforeRequest: this.context.#defaultDetails
+                        .allowInterceptConfig.beforeRequest,
+                    afterResponseSuccess: this.context.#defaultDetails
+                        .allowInterceptConfig.afterResponseSuccess,
+                    afterResponseError: this.context.#defaultDetails
+                        .allowInterceptConfig.afterResponseError,
+                },
                 user: details.user || this.context.#defaultDetails.user,
                 password: details.password || this.context.#defaultDetails.password,
                 onabort(...args) {
-                    that.context.HttpxCallBack.onAbort(details, resolve, args);
+                    that.context.HttpxCallBack.onAbort(details, resolve, reject, args);
                 },
                 onerror(...args) {
-                    that.context.HttpxCallBack.onError(details, resolve, args);
+                    that.context.HttpxCallBack.onError(details, resolve, reject, args);
                 },
                 onloadstart(...args) {
                     that.context.HttpxCallBack.onLoadStart(details, args);
@@ -1779,12 +1817,32 @@ class Httpx {
                     that.context.HttpxCallBack.onReadyStateChange(details, args);
                 },
                 ontimeout(...args) {
-                    that.context.HttpxCallBack.onTimeout(details, resolve, args);
+                    that.context.HttpxCallBack.onTimeout(details, resolve, reject, args);
                 },
                 onload(...args) {
-                    that.context.HttpxCallBack.onLoad(details, resolve, args);
+                    that.context.HttpxCallBack.onLoad(details, resolve, reject, args);
                 },
             };
+            // 补全allowInterceptConfig参数
+            if (typeof details.allowInterceptConfig === "boolean") {
+                Object.keys(result.allowInterceptConfig).forEach((keyName) => {
+                    result.allowInterceptConfig[keyName] =
+                        details.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 this.context.GM_Api.xmlHttpRequest !== "function") {
                 result.fetch = true;
             }
@@ -1912,9 +1970,10 @@ class Httpx {
          * onabort请求被取消-触发
          * @param details 配置
          * @param resolve 回调
+         * @param reject 抛出错误
          * @param argumentsList 参数列表
          */
-        onAbort(details, resolve, argumentsList) {
+        onAbort(details, resolve, reject, argumentsList) {
             if ("onabort" in details) {
                 details.onabort.apply(this, argumentsList);
             }
@@ -1927,6 +1986,7 @@ class Httpx {
                 response: null,
                 details: details,
             }) == null) {
+                // reject(new TypeError("response is intercept with onabort"));
                 return;
             }
             resolve({
@@ -1940,9 +2000,10 @@ class Httpx {
          * onerror请求异常-触发
          * @param details 配置
          * @param resolve 回调
+         * @param reject 抛出错误
          * @param argumentsList 响应的参数列表
          */
-        onError(details, resolve, argumentsList) {
+        onError(details, resolve, reject, argumentsList) {
             if ("onerror" in details) {
                 details.onerror.apply(this, argumentsList);
             }
@@ -1959,6 +2020,7 @@ class Httpx {
                 response: response,
                 details: details,
             }) == null) {
+                // reject(new TypeError("response is intercept with onerror"));
                 return;
             }
             resolve({
@@ -1973,9 +2035,10 @@ class Httpx {
          * ontimeout请求超时-触发
          * @param details 配置
          * @param resolve 回调
+         * @param reject 抛出错误
          * @param argumentsList 参数列表
          */
-        onTimeout(details, resolve, argumentsList) {
+        onTimeout(details, resolve, reject, argumentsList) {
             if ("ontimeout" in details) {
                 details.ontimeout.apply(this, argumentsList);
             }
@@ -1988,6 +2051,7 @@ class Httpx {
                 response: (argumentsList || [null])[0],
                 details: details,
             }) == null) {
+                // reject(new TypeError("response is intercept with ontimeout"));
                 return;
             }
             resolve({
@@ -2014,9 +2078,10 @@ class Httpx {
          * onload加载完毕-触发
          * @param details 请求的配置
          * @param resolve 回调
+         * @param reject 抛出错误
          * @param argumentsList 参数列表
          */
-        onLoad(details, resolve, argumentsList) {
+        onLoad(details, resolve, reject, argumentsList) {
             /* X浏览器会因为设置了responseType导致不返回responseText */
             let Response = argumentsList[0];
             /* responseText为空，response不为空的情况 */
@@ -2071,6 +2136,7 @@ class Httpx {
             /* 状态码2xx都是成功的 */
             if (Math.floor(Response.status / 100) === 2) {
                 if (this.context.HttpxResponseHook.successResponseCallBack(Response, details) == null) {
+                    // reject(new TypeError("response is intercept with onloada"));
                     return;
                 }
                 resolve({
@@ -2082,7 +2148,7 @@ class Httpx {
                 });
             }
             else {
-                this.context.HttpxCallBack.onError(details, resolve, argumentsList);
+                this.context.HttpxCallBack.onError(details, resolve, reject, argumentsList);
             }
         },
         /**
@@ -2393,8 +2459,8 @@ class Httpx {
     async get(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("get", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("GET", details, resolve, reject);
             Reflect.deleteProperty(requestDetails, "onprogress");
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
@@ -2406,8 +2472,8 @@ class Httpx {
     async post(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("post", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("POST", details, resolve, reject);
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
         });
@@ -2418,8 +2484,8 @@ class Httpx {
     async head(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("head", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("HEAD", details, resolve, reject);
             Reflect.deleteProperty(requestDetails, "onprogress");
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
@@ -2431,8 +2497,8 @@ class Httpx {
     async options(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("options", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("OPTIONS", details, resolve, reject);
             Reflect.deleteProperty(requestDetails, "onprogress");
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
@@ -2444,8 +2510,8 @@ class Httpx {
     async delete(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("delete", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("DELETE", details, resolve, reject);
             Reflect.deleteProperty(requestDetails, "onprogress");
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
@@ -2457,8 +2523,8 @@ class Httpx {
     async put(...args) {
         let that = this;
         let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-        return new Promise((resolve) => {
-            let requestDetails = that.HttpxRequestDetails.getDetails("put", resolve, details);
+        return new Promise((resolve, reject) => {
+            let requestDetails = that.HttpxRequestDetails.getDetails("PUT", details, resolve, reject);
             requestDetails = that.HttpxRequestDetails.handle(requestDetails);
             that.HttpxRequest.request(requestDetails);
         });