@whitesev/utils 1.4.9 → 1.5.1

package/dist/src/Httpx.d.ts

@@ -1105,6 +1105,11 @@ export declare interface HttpxAsyncResult<T = HttpxDetails> {
      */
     type: HttpxResponseCallBackType;
 }
+export declare interface HttpxHookErrorData {
+    type: "onerror" | "ontimeout" | "onabort";
+    error: Error;
+    response: any;
+}
 declare class Httpx {
     #private;
     private GM_Api;
@@ -1134,7 +1139,7 @@ declare class Httpx {
              * 添加拦截器
              * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
              */
-            use(fn: (details: Required<HttpxDetails>) => void): string | undefined;
+            use(fn: <T = Required<HttpxDetails>>(details: T) => void | T): string | undefined;
             /**
              * 移除拦截器
              * @param id 通过use返回的id
@@ -1157,11 +1162,7 @@ declare class Httpx {
              * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
              * + 超出 2xx 范围的状态码都会触发该函数
              */
-            use(successFn: (response: HttpxAsyncResultData) => void, errorFn: (data: {
-                type: "onerror" | "ontimeout";
-                error: Error;
-                response: any;
-            }) => void): string | undefined;
+            use(successFn?: (<T_1 = HttpxAsyncResultData<HttpxDetails>>(response: HttpxAsyncResultData) => void | T_1) | undefined, errorFn?: (<T_2 = HttpxHookErrorData>(data: T_2) => void | T_2) | undefined): string | undefined;
             /**
              * 移除拦截器
              * @param id 通过use返回的id

package/package.json

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

package/src/Httpx.ts

@@ -1202,6 +1202,12 @@ export declare interface HttpxAsyncResult<T = HttpxDetails> {
 	type: HttpxResponseCallBackType;
 }
 
+export declare interface HttpxHookErrorData {
+	type: "onerror" | "ontimeout" | "onabort";
+	error: Error;
+	response: any;
+}
+
 const GenerateUUID = () => {
 	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
 		var r = (Math.random() * 16) | 0,
@@ -1292,8 +1298,8 @@ class Httpx {
 			configList: <
 				{
 					id: string;
-					successFn: Function;
-					errorFn: Function;
+					successFn?: Function;
+					errorFn?: Function;
 				}[]
 			>[],
 		},
@@ -1317,7 +1323,7 @@ class Httpx {
 		 * @param response
 		 */
 		errorResponseCallBack(data: {
-			type: "onerror" | "ontimeout";
+			type: "onerror" | "ontimeout" | "onabort";
 			error: Error;
 			response: any;
 		}) {
@@ -1334,7 +1340,7 @@ class Httpx {
 		/**
 		 * 添加请求前的回调处理配置
 		 */
-		add(successFn: Function, errorFn: Function) {
+		add(successFn?: Function, errorFn?: Function) {
 			let id = GenerateUUID();
 			this.$config.configList.push({
 				id: id,
@@ -1621,6 +1627,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],
@@ -2067,7 +2082,7 @@ class Httpx {
 			 * 添加拦截器
 			 * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
 			 */
-			use(fn: (details: Required<HttpxDetails>) => void) {
+			use(fn: <T = Required<HttpxDetails>>(details: T) => void | T) {
 				if (typeof fn !== "function") {
 					console.warn("[Httpx-interceptors-request] 请传入拦截器函数");
 					return;
@@ -2101,18 +2116,16 @@ class Httpx {
 			 * + 超出 2xx 范围的状态码都会触发该函数
 			 */
 			use(
-				successFn: (response: HttpxAsyncResultData) => void,
-				errorFn: (data: {
-					type: "onerror" | "ontimeout";
-					error: Error;
-					response: any;
-				}) => void
+				successFn?: <T = HttpxAsyncResultData>(
+					response: HttpxAsyncResultData
+				) => void | T,
+				errorFn?: <T = HttpxHookErrorData>(data: T) => void | T
 			) {
 				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!);
 			},
 			/**
 			 * 移除拦截器