@whitesev/utils 1.8.0 → 1.9.2

package/dist/index.umd.js

@@ -1569,14 +1569,23 @@
              * @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") {
@@ -1638,15 +1647,24 @@
              * @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") {
@@ -1660,17 +1678,28 @@
             /**
              * 失败的回调
              * @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") {
@@ -1741,10 +1770,11 @@
             /**
              * 获取请求配置
              * @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,
@@ -1767,13 +1797,21 @@
                     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);
@@ -1785,12 +1823,32 @@
                         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;
                 }
@@ -1918,9 +1976,10 @@
              * 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);
                 }
@@ -1933,6 +1992,7 @@
                     response: null,
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with onabort"));
                     return;
                 }
                 resolve({
@@ -1946,9 +2006,10 @@
              * 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);
                 }
@@ -1965,6 +2026,7 @@
                     response: response,
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with onerror"));
                     return;
                 }
                 resolve({
@@ -1979,9 +2041,10 @@
              * 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);
                 }
@@ -1994,6 +2057,7 @@
                     response: (argumentsList || [null])[0],
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with ontimeout"));
                     return;
                 }
                 resolve({
@@ -2020,9 +2084,10 @@
              * 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不为空的情况 */
@@ -2077,6 +2142,7 @@
                 /* 状态码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({
@@ -2088,7 +2154,7 @@
                     });
                 }
                 else {
-                    this.context.HttpxCallBack.onError(details, resolve, argumentsList);
+                    this.context.HttpxCallBack.onError(details, resolve, reject, argumentsList);
                 }
             },
             /**
@@ -2399,8 +2465,8 @@
         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);
@@ -2412,8 +2478,8 @@
         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);
             });
@@ -2424,8 +2490,8 @@
         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);
@@ -2437,8 +2503,8 @@
         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);
@@ -2450,8 +2516,8 @@
         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);
@@ -2463,8 +2529,8 @@
         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);
             });