@whitesev/utils 1.4.7 → 1.4.9

package/dist/index.system.js

@@ -1466,7 +1466,7 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 添加请求前的回调处理配置
                      */
-                    addBeforeRequestCallBack(fn) {
+                    add(fn) {
                         if (typeof fn === "function") {
                             let uuid = GenerateUUID();
                             this.$config.configList.push({
@@ -1483,7 +1483,7 @@ System.register('Utils', [], (function (exports) {
                      * 删除请求前的回调处理配置
                      * @param id
                      */
-                    deleteBeforeRequestCallBack(id) {
+                    delete(id) {
                         if (typeof id === "string") {
                             let findIndex = this.$config.configList.findIndex((item) => item.id === id);
                             if (findIndex !== -1) {
@@ -1496,7 +1496,7 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 清空设置的请求前的回调处理配置
                      */
-                    clearBeforeRequestCallBack() {
+                    clearAll() {
                         this.$config.configList = [];
                     },
                 };
@@ -1526,21 +1526,21 @@ System.register('Utils', [], (function (exports) {
                      * 失败的回调
                      * @param response
                      */
-                    errorResponseCallBack(response) {
+                    errorResponseCallBack(data) {
                         for (let index = 0; index < this.$config.configList.length; index++) {
                             let item = this.$config.configList[index];
                             if (typeof item.errorFn === "function") {
-                                if (item.errorFn(response) == null) {
+                                if (item.errorFn(data) == null) {
                                     return;
                                 }
                             }
                         }
-                        return response;
+                        return data;
                     },
                     /**
                      * 添加请求前的回调处理配置
                      */
-                    addAfterResponseCallBack(successFn, errorFn) {
+                    add(successFn, errorFn) {
                         let id = GenerateUUID();
                         this.$config.configList.push({
                             id: id,
@@ -1553,7 +1553,7 @@ System.register('Utils', [], (function (exports) {
                      * 删除请求前的回调处理配置
                      * @param id
                      */
-                    deleteAfterResponseCallBack(id) {
+                    delete(id) {
                         if (typeof id === "string") {
                             let findIndex = this.$config.configList.findIndex((item) => item.id === id);
                             if (findIndex !== -1) {
@@ -1566,7 +1566,7 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 清空设置的请求前的回调处理配置
                      */
-                    clearAfterResponseCallBack() {
+                    clearAll() {
                         this.$config.configList = [];
                     },
                 };
@@ -1807,6 +1807,13 @@ System.register('Utils', [], (function (exports) {
                         if (response.length) {
                             response = response[0];
                         }
+                        if (this.context.HttpxResponseHook.errorResponseCallBack({
+                            type: "onerror",
+                            error: new TypeError("request error"),
+                            response: response,
+                        }) == null) {
+                            return;
+                        }
                         resolve({
                             status: false,
                             data: response,
@@ -1828,6 +1835,13 @@ System.register('Utils', [], (function (exports) {
                         else if ("ontimeout" in this.context.#defaultDetails) {
                             this.context.#defaultDetails.ontimeout.apply(this, argumentsList);
                         }
+                        if (this.context.HttpxResponseHook.errorResponseCallBack({
+                            type: "ontimeout",
+                            error: new TypeError("request timeout"),
+                            response: (argumentsList || [null])[0],
+                        }) == null) {
+                            return;
+                        }
                         resolve({
                             status: false,
                             data: [...argumentsList],
@@ -1908,6 +1922,10 @@ System.register('Utils', [], (function (exports) {
                         }
                         /* 状态码2xx都是成功的 */
                         if (Math.floor(Response.status / 100) === 2) {
+                            if (this.context.HttpxResponseHook.successResponseCallBack(Response) ==
+                                null) {
+                                return;
+                            }
                             resolve({
                                 status: true,
                                 data: Response,
@@ -2128,8 +2146,8 @@ System.register('Utils', [], (function (exports) {
                     if (typeof __xmlHttpRequest__ !== "function") {
                         console.warn("Httpx未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，强制使用window.fetch");
                     }
-                    this.interceptors.request = this;
-                    this.interceptors.response = this;
+                    this.interceptors.request.context = this;
+                    this.interceptors.response.context = this;
                     this.GM_Api.xmlHttpRequest = __xmlHttpRequest__;
                 }
                 /**
@@ -2156,14 +2174,24 @@ System.register('Utils', [], (function (exports) {
                          * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
                          */
                         use(fn) {
-                            return this.context.HttpxRequestHook.addBeforeRequestCallBack(fn);
+                            if (typeof fn !== "function") {
+                                console.warn("[Httpx-interceptors-request] 请传入拦截器函数");
+                                return;
+                            }
+                            return this.context.HttpxRequestHook.add(fn);
                         },
                         /**
                          * 移除拦截器
                          * @param id 通过use返回的id
                          */
                         eject(id) {
-                            return this.context.HttpxRequestHook.deleteBeforeRequestCallBack(id);
+                            return this.context.HttpxRequestHook.delete(id);
+                        },
+                        /**
+                         * 移除所有拦截器
+                         */
+                        ejectAll() {
+                            this.context.HttpxRequestHook.clearAll();
                         },
                     },
                     /**
@@ -2180,17 +2208,23 @@ System.register('Utils', [], (function (exports) {
                          */
                         use(successFn, errorFn) {
                             if (typeof successFn !== "function" && typeof errorFn !== "function") {
-                                console.warn("[Httpx] 请传入拦截器函数");
+                                console.warn("[Httpx-interceptors-response] 请传入拦截器函数");
                                 return;
                             }
-                            return this.context.HttpxResponseHook.addAfterResponseCallBack(successFn, errorFn);
+                            return this.context.HttpxResponseHook.add(successFn, errorFn);
                         },
                         /**
                          * 移除拦截器
                          * @param id 通过use返回的id
                          */
                         eject(id) {
-                            return this.context.HttpxResponseHook.deleteAfterResponseCallBack(id);
+                            return this.context.HttpxResponseHook.delete(id);
+                        },
+                        /**
+                         * 移除所有拦截器
+                         */
+                        ejectAll() {
+                            this.context.HttpxResponseHook.clearAll();
                         },
                     },
                 };