@whitesev/utils 1.5.4 → 1.5.5

package/dist/src/Httpx.d.ts

@@ -1162,7 +1162,7 @@ declare class Httpx {
              * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
              * + 超出 2xx 范围的状态码都会触发该函数
              */
-            use(successFn?: (<T_1 extends HttpxAsyncResultData<HttpxDetails>>(response: HttpxAsyncResultData) => void | T_1) | undefined, errorFn?: (<T_2 extends HttpxHookErrorData>(data: T_2) => void | T_2) | undefined): string | undefined;
+            use(successFn?: <T extends HttpxAsyncResultData>(response: HttpxAsyncResultData) => void | T, errorFn?: <T extends HttpxHookErrorData>(data: T) => void | T): string | undefined;
             /**
              * 移除拦截器
              * @param id 通过use返回的id

package/dist/src/Utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../src/ajaxHooker/index.d.ts" />
 import { ColorConversion } from "./ColorConversion";
 import { GBKEncoder } from "./GBKEncoder";
 import { UtilsGMCookie } from "./UtilsGMCookie";
@@ -1413,8 +1412,8 @@ declare class Utils {
      */
     tryCatch: (...args: any) => {
         config(paramDetails: import("./TryCatch").UtilsTryCatchConfig): any;
-        error(handler: string | Function | ((...args: any[]) => any)): any;
-        run<A extends any[], R>(callback: string | Function | ((...args: A) => R), __context__?: any): import("./TryCatch").UtilsTryCatchType;
+        error(handler: ((...args: any[]) => any) | string | Function): any;
+        run<A extends any[], R>(callback: ((...args: A) => R) | string | Function, __context__?: any): import("./TryCatch").UtilsTryCatchType;
     };
     /**
      * 数组去重，去除重复的值

package/package.json

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

package/src/Httpx.ts

@@ -1305,13 +1305,17 @@ class Httpx {
 		},
 		/**
 		 * 成功的回调
-		 * @param response
+		 * @param response 响应
+		 * @param details 请求的配置
 		 */
-		successResponseCallBack(response: HttpxAsyncResultData) {
+		successResponseCallBack(
+			response: HttpxAsyncResultData,
+			details: HttpxDetails
+		) {
 			for (let index = 0; index < this.$config.configList.length; index++) {
 				let item = this.$config.configList[index];
 				if (typeof item.successFn === "function") {
-					if (item.successFn(response) == null) {
+					if (item.successFn(response, details) == null) {
 						return;
 					}
 				}
@@ -1320,12 +1324,13 @@ class Httpx {
 		},
 		/**
 		 * 失败的回调
-		 * @param response
+		 * @param data 配置
 		 */
 		errorResponseCallBack(data: {
 			type: "onerror" | "ontimeout" | "onabort";
 			error: Error;
 			response: any;
+			details: HttpxDetails;
 		}) {
 			for (let index = 0; index < this.$config.configList.length; index++) {
 				let item = this.$config.configList[index];
@@ -1632,6 +1637,7 @@ class Httpx {
 					type: "onabort",
 					error: new TypeError("request canceled"),
 					response: null,
+					details: details,
 				}) == null
 			) {
 				return;
@@ -1669,6 +1675,7 @@ class Httpx {
 					type: "onerror",
 					error: new TypeError("request error"),
 					response: response,
+					details: details,
 				}) == null
 			) {
 				return;
@@ -1703,6 +1710,7 @@ class Httpx {
 					type: "ontimeout",
 					error: new TypeError("request timeout"),
 					response: (argumentsList || [null])[0],
+					details: details,
 				}) == null
 			) {
 				return;
@@ -1797,8 +1805,10 @@ class Httpx {
 			/* 状态码2xx都是成功的 */
 			if (Math.floor(Response.status / 100) === 2) {
 				if (
-					this.context.HttpxResponseHook.successResponseCallBack(Response) ==
-					null
+					this.context.HttpxResponseHook.successResponseCallBack(
+						Response,
+						details
+					) == null
 				) {
 					return;
 				}
@@ -1933,7 +1943,7 @@ class Httpx {
 					/** 响应xml文档 */
 					let responseXML = "";
 
-					let arrayBuffer = await resp.arrayBuffer;
+					let arrayBuffer = await resp.arrayBuffer();
 
 					let encoding = "utf-8";
 					if (resp.headers.has("Content-Type")) {
@@ -1945,7 +1955,7 @@ class Httpx {
 						}
 					}
 					let textDecoder = new TextDecoder(encoding);
-					responseText = textDecoder.decode(await resp.arrayBuffer());
+					responseText = textDecoder.decode(arrayBuffer);
 					response = responseText;
 
 					if (details.responseType === "arraybuffer") {