@whitesev/utils 1.4.9 → 1.5.0

package/dist/src/Httpx.d.ts

@@ -1157,8 +1157,8 @@ declare class Httpx {
              * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
              * + 超出 2xx 范围的状态码都会触发该函数
              */
-            use(successFn: (response: HttpxAsyncResultData) => void, errorFn: (data: {
-                type: "onerror" | "ontimeout";
+            use(successFn?: (response: HttpxAsyncResultData) => void, errorFn?: (data: {
+                type: "onerror" | "ontimeout" | "onabort";
                 error: Error;
                 response: any;
             }) => void): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@whitesev/utils",
-	"version": "1.4.9",
+	"version": "1.5.0",
 	"description": "一个常用的工具库",
 	"main": "dist/index.cjs.js",
 	"module": "dist/node/index.esm.js",

package/src/Httpx.ts

@@ -1292,8 +1292,8 @@ class Httpx {
 			configList: <
 				{
 					id: string;
-					successFn: Function;
-					errorFn: Function;
+					successFn?: Function;
+					errorFn?: Function;
 				}[]
 			>[],
 		},
@@ -1317,7 +1317,7 @@ class Httpx {
 		 * @param response
 		 */
 		errorResponseCallBack(data: {
-			type: "onerror" | "ontimeout";
+			type: "onerror" | "ontimeout" | "onabort";
 			error: Error;
 			response: any;
 		}) {
@@ -1334,7 +1334,7 @@ class Httpx {
 		/**
 		 * 添加请求前的回调处理配置
 		 */
-		add(successFn: Function, errorFn: Function) {
+		add(successFn?: Function, errorFn?: Function) {
 			let id = GenerateUUID();
 			this.$config.configList.push({
 				id: id,
@@ -1621,6 +1621,15 @@ class Httpx {
 			} else if ("onabort" in this.context.#defaultDetails) {
 				this.context.#defaultDetails!.onabort!.apply(this, argumentsList);
 			}
+			if (
+				this.context.HttpxResponseHook.errorResponseCallBack({
+					type: "onabort",
+					error: new TypeError("request canceled"),
+					response: null,
+				}) == null
+			) {
+				return;
+			}
 			resolve({
 				status: false,
 				data: [...argumentsList],
@@ -2101,18 +2110,18 @@ class Httpx {
 			 * + 超出 2xx 范围的状态码都会触发该函数
 			 */
 			use(
-				successFn: (response: HttpxAsyncResultData) => void,
-				errorFn: (data: {
-					type: "onerror" | "ontimeout";
+				successFn?: (response: HttpxAsyncResultData) => void,
+				errorFn?: (data: {
+					type: "onerror" | "ontimeout" | "onabort";
 					error: Error;
 					response: any;
 				}) => void
 			) {
 				if (typeof successFn !== "function" && typeof errorFn !== "function") {
-					console.warn("[Httpx-interceptors-response] 请传入拦截器函数");
+					console.warn("[Httpx-interceptors-response] 必须传入一个拦截器函数");
 					return;
 				}
-				return this.context.HttpxResponseHook.add(successFn, errorFn);
+				return this.context.HttpxResponseHook.add(successFn!, errorFn!);
 			},
 			/**
 			 * 移除拦截器