@whitesev/utils 2.7.1 → 2.7.3

package/src/Httpx.ts

@@ -12,7 +12,7 @@ import type {
 } from "./types/Httpx";
 import { GenerateUUID } from "./UtilsCommon";
 
-class Httpx {
+export class Httpx {
 	private GM_Api = {
 		xmlHttpRequest: null as any,
 	};
@@ -79,9 +79,7 @@ class Httpx {
 				});
 				return uuid;
 			} else {
-				console.warn(
-					"[Httpx-HttpxRequestHook.addBeforeRequestCallBack] fn is not a function"
-				);
+				console.warn("[Httpx-HttpxRequestHook.addBeforeRequestCallBack] fn is not a function");
 			}
 		},
 		/**
@@ -90,9 +88,7 @@ class Httpx {
 		 */
 		delete(id: string) {
 			if (typeof id === "string") {
-				let findIndex = this.$config.configList.findIndex(
-					(item) => item.id === id
-				);
+				let findIndex = this.$config.configList.findIndex((item) => item.id === id);
 				if (findIndex !== -1) {
 					this.$config.configList.splice(findIndex, 1);
 					return true;
@@ -139,8 +135,7 @@ class Httpx {
 					// 配置存在
 					// 细分处理是否拦截
 					if (
-						typeof details.allowInterceptConfig.afterResponseSuccess ===
-							"boolean" &&
+						typeof details.allowInterceptConfig.afterResponseSuccess === "boolean" &&
 						!details.allowInterceptConfig.afterResponseSuccess
 					) {
 						// 设置了禁止拦截
@@ -179,8 +174,7 @@ class Httpx {
 					// 配置存在
 					// 细分处理是否拦截
 					if (
-						typeof data.details.allowInterceptConfig.afterResponseError ===
-							"boolean" &&
+						typeof data.details.allowInterceptConfig.afterResponseError === "boolean" &&
 						!data.details.allowInterceptConfig.afterResponseError
 					) {
 						// 设置了禁止拦截
@@ -220,9 +214,7 @@ class Httpx {
 		 */
 		delete(id: string) {
 			if (typeof id === "string") {
-				let findIndex = this.$config.configList.findIndex(
-					(item) => item.id === id
-				);
+				let findIndex = this.$config.configList.findIndex((item) => item.id === id);
 				if (findIndex !== -1) {
 					this.$config.configList.splice(findIndex, 1);
 					return true;
@@ -243,7 +235,9 @@ class Httpx {
 		 * 对请求的参数进行合并处理
 		 */
 		handleBeforeRequestOptionArgs(...args: (HttpxRequestOption | string)[]) {
-			let option: HttpxRequestOption = {};
+			let option: HttpxRequestOption = {
+				url: void 0 as any as string,
+			};
 			if (typeof args[0] === "string") {
 				/* 传入的是url，转为配置 */
 				let url = args[0];
@@ -266,7 +260,7 @@ class Httpx {
 		 * @param method 当前请求方法，默认get
 		 * @param userRequestOption 用户的请求配置
 		 * @param resolve promise回调
-		 * @param reject 抛出错误回调
+		 * @param reject promise抛出错误回调
 		 */
 		getRequestOption(
 			method: HttpxMethod,
@@ -291,70 +285,43 @@ class Httpx {
 			let requestOption = <Required<HttpxRequestOption>>{
 				url: url,
 				method: (method || "GET").toString().toUpperCase().trim(),
-				timeout:
-					userRequestOption.timeout ||
-					this.context.#defaultRequestOption.timeout,
-				responseType:
-					userRequestOption.responseType ||
-					this.context.#defaultRequestOption.responseType,
+				timeout: userRequestOption.timeout || this.context.#defaultRequestOption.timeout,
+				responseType: userRequestOption.responseType || this.context.#defaultRequestOption.responseType,
 				/* 对象使用深拷贝 */
-				headers: CommonUtil.deepClone(
-					this.context.#defaultRequestOption.headers
-				),
+				headers: CommonUtil.deepClone(this.context.#defaultRequestOption.headers),
 				data: userRequestOption.data || this.context.#defaultRequestOption.data,
-				redirect:
-					userRequestOption.redirect ||
-					this.context.#defaultRequestOption.redirect,
-				cookie:
-					userRequestOption.cookie || this.context.#defaultRequestOption.cookie,
+				redirect: userRequestOption.redirect || this.context.#defaultRequestOption.redirect,
+				cookie: userRequestOption.cookie || this.context.#defaultRequestOption.cookie,
 				cookiePartition:
-					userRequestOption.cookiePartition ||
-					this.context.#defaultRequestOption.cookiePartition,
-				binary:
-					userRequestOption.binary || this.context.#defaultRequestOption.binary,
-				nocache:
-					userRequestOption.nocache ||
-					this.context.#defaultRequestOption.nocache,
-				revalidate:
-					userRequestOption.revalidate ||
-					this.context.#defaultRequestOption.revalidate,
+					userRequestOption.cookiePartition || this.context.#defaultRequestOption.cookiePartition,
+				binary: userRequestOption.binary || this.context.#defaultRequestOption.binary,
+				nocache: userRequestOption.nocache || this.context.#defaultRequestOption.nocache,
+				revalidate: userRequestOption.revalidate || this.context.#defaultRequestOption.revalidate,
 				/* 对象使用深拷贝 */
 				context: CommonUtil.deepClone(
-					userRequestOption.context ||
-						this.context.#defaultRequestOption.context
+					userRequestOption.context || this.context.#defaultRequestOption.context
 				),
 				overrideMimeType:
-					userRequestOption.overrideMimeType ||
-					this.context.#defaultRequestOption.overrideMimeType,
-				anonymous:
-					userRequestOption.anonymous ||
-					this.context.#defaultRequestOption.anonymous,
-				fetch:
-					userRequestOption.fetch || this.context.#defaultRequestOption.fetch,
+					userRequestOption.overrideMimeType || this.context.#defaultRequestOption.overrideMimeType,
+				anonymous: userRequestOption.anonymous || this.context.#defaultRequestOption.anonymous,
+				fetch: userRequestOption.fetch || this.context.#defaultRequestOption.fetch,
 				/* 对象使用深拷贝 */
-				fetchInit: CommonUtil.deepClone(
-					this.context.#defaultRequestOption.fetchInit
-				),
+				fetchInit: CommonUtil.deepClone(this.context.#defaultRequestOption.fetchInit),
 				allowInterceptConfig: {
 					beforeRequest: (
-						this.context.#defaultRequestOption
-							.allowInterceptConfig as HttpxAllowInterceptConfig
+						this.context.#defaultRequestOption.allowInterceptConfig as HttpxAllowInterceptConfig
 					).beforeRequest,
 					afterResponseSuccess: (
-						this.context.#defaultRequestOption
-							.allowInterceptConfig as HttpxAllowInterceptConfig
+						this.context.#defaultRequestOption.allowInterceptConfig as HttpxAllowInterceptConfig
 					).afterResponseSuccess,
 					afterResponseError: (
-						this.context.#defaultRequestOption
-							.allowInterceptConfig as HttpxAllowInterceptConfig
+						this.context.#defaultRequestOption.allowInterceptConfig as HttpxAllowInterceptConfig
 					).afterResponseError,
 				},
 				user: userRequestOption.user || this.context.#defaultRequestOption.user,
-				password:
-					userRequestOption.password ||
-					this.context.#defaultRequestOption.password,
+				password: userRequestOption.password || this.context.#defaultRequestOption.password,
 				onabort(...args) {
-					that.context.HttpxCallBack.onAbort(
+					that.context.HttpxResponseCallBack.onAbort(
 						userRequestOption as Required<HttpxRequestOption>,
 						resolve,
 						reject,
@@ -362,7 +329,7 @@ class Httpx {
 					);
 				},
 				onerror(...args) {
-					that.context.HttpxCallBack.onError(
+					that.context.HttpxResponseCallBack.onError(
 						userRequestOption as Required<HttpxRequestOption>,
 						resolve,
 						reject,
@@ -370,25 +337,25 @@ class Httpx {
 					);
 				},
 				onloadstart(...args) {
-					that.context.HttpxCallBack.onLoadStart(
+					that.context.HttpxResponseCallBack.onLoadStart(
 						userRequestOption as Required<HttpxRequestOption>,
 						args
 					);
 				},
 				onprogress(...args) {
-					that.context.HttpxCallBack.onProgress(
+					that.context.HttpxResponseCallBack.onProgress(
 						userRequestOption as Required<HttpxRequestOption>,
 						args
 					);
 				},
 				onreadystatechange(...args) {
-					that.context.HttpxCallBack.onReadyStateChange(
+					that.context.HttpxResponseCallBack.onReadyStateChange(
 						userRequestOption as Required<HttpxRequestOption>,
 						args
 					);
 				},
 				ontimeout(...args) {
-					that.context.HttpxCallBack.onTimeout(
+					that.context.HttpxResponseCallBack.onTimeout(
 						userRequestOption as Required<HttpxRequestOption>,
 						resolve,
 						reject,
@@ -396,7 +363,7 @@ class Httpx {
 					);
 				},
 				onload(...args) {
-					that.context.HttpxCallBack.onLoad(
+					that.context.HttpxResponseCallBack.onLoad(
 						userRequestOption as Required<HttpxRequestOption>,
 						resolve,
 						reject,
@@ -406,9 +373,7 @@ class Httpx {
 			};
 			// 补全allowInterceptConfig参数
 			if (typeof userRequestOption.allowInterceptConfig === "boolean") {
-				Object.keys(
-					requestOption.allowInterceptConfig as HttpxAllowInterceptConfig
-				).forEach((keyName) => {
+				Object.keys(requestOption.allowInterceptConfig as HttpxAllowInterceptConfig).forEach((keyName) => {
 					Reflect.set(
 						requestOption.allowInterceptConfig as HttpxAllowInterceptConfig,
 						keyName,
@@ -420,27 +385,18 @@ class Httpx {
 					typeof userRequestOption.allowInterceptConfig === "object" &&
 					userRequestOption.allowInterceptConfig != null
 				) {
-					Object.keys(userRequestOption.allowInterceptConfig).forEach(
-						(keyName) => {
-							let value = Reflect.get(
-								userRequestOption.allowInterceptConfig as HttpxAllowInterceptConfig,
-								keyName
-							) as Boolean;
-							if (
-								typeof value === "boolean" &&
-								Reflect.has(
-									requestOption.allowInterceptConfig as HttpxAllowInterceptConfig,
-									keyName
-								)
-							) {
-								Reflect.set(
-									requestOption.allowInterceptConfig as HttpxAllowInterceptConfig,
-									keyName,
-									value
-								);
-							}
+					Object.keys(userRequestOption.allowInterceptConfig).forEach((keyName) => {
+						let value = Reflect.get(
+							userRequestOption.allowInterceptConfig as HttpxAllowInterceptConfig,
+							keyName
+						) as Boolean;
+						if (
+							typeof value === "boolean" &&
+							Reflect.has(requestOption.allowInterceptConfig as HttpxAllowInterceptConfig, keyName)
+						) {
+							Reflect.set(requestOption.allowInterceptConfig as HttpxAllowInterceptConfig, keyName, value);
 						}
-					);
+					});
 				}
 			}
 			if (typeof this.context.GM_Api.xmlHttpRequest !== "function") {
@@ -450,15 +406,11 @@ class Httpx {
 			if (typeof requestOption.headers === "object") {
 				if (typeof userRequestOption.headers === "object") {
 					Object.keys(userRequestOption.headers).forEach((keyName, index) => {
-						if (
-							keyName in requestOption.headers &&
-							userRequestOption!.headers?.[keyName] == null
-						) {
+						if (keyName in requestOption.headers && userRequestOption!.headers?.[keyName] == null) {
 							/* 在默认的header中存在，且设置它新的值为空，那么就是默认的值 */
 							Reflect.deleteProperty(requestOption.headers, keyName);
 						} else {
-							requestOption.headers[keyName] =
-								userRequestOption?.headers?.[keyName];
+							requestOption.headers[keyName] = userRequestOption?.headers?.[keyName];
 						}
 					});
 				} else {
@@ -473,10 +425,7 @@ class Httpx {
 				/* 使用assign替换且添加 */
 				if (typeof userRequestOption.fetchInit === "object") {
 					Object.keys(userRequestOption.fetchInit).forEach((keyName, index) => {
-						if (
-							keyName in requestOption.fetchInit &&
-							(userRequestOption as any).fetchInit[keyName] == null
-						) {
+						if (keyName in requestOption.fetchInit && (userRequestOption as any).fetchInit[keyName] == null) {
 							/* 在默认的fetchInit中存在，且设置它新的值为空，那么就是默认的值 */
 							Reflect.deleteProperty(requestOption.fetchInit, keyName);
 						} else {
@@ -493,10 +442,7 @@ class Httpx {
 			}
 
 			// 处理新的cookiePartition
-			if (
-				typeof requestOption.cookiePartition === "object" &&
-				requestOption.cookiePartition != null
-			) {
+			if (typeof requestOption.cookiePartition === "object" && requestOption.cookiePartition != null) {
 				if (
 					Reflect.has(requestOption.cookiePartition, "topLevelSite") &&
 					typeof requestOption.cookiePartition.topLevelSite !== "string"
@@ -518,8 +464,7 @@ class Httpx {
 					requestOption.url = globalThis.location.origin + requestOption.url;
 				} else {
 					// 补充origin+/
-					requestOption.url =
-						globalThis.location.origin + "/" + requestOption.url;
+					requestOption.url = globalThis.location.origin + "/" + requestOption.url;
 				}
 			}
 
@@ -545,8 +490,7 @@ class Httpx {
 						} else if (typeof requestOption.data === "object") {
 							isHandler = true;
 							// URLSearchParams参数可以转普通的string:string，包括FormData
-							// @ts-ignore
-							let searchParams = new URLSearchParams(requestOption.data);
+							let searchParams = new URLSearchParams(requestOption.data as Record<string, string>);
 							urlSearch = searchParams.toString();
 						}
 						if (isHandler) {
@@ -594,14 +538,11 @@ class Httpx {
 								} else if (typeof requestOption.data === "object") {
 									requestOption.data = JSON.stringify(requestOption.data);
 								}
-							} else if (
-								ContentType.includes("application/x-www-form-urlencoded")
-							) {
+							} else if (ContentType.includes("application/x-www-form-urlencoded")) {
 								// application/x-www-form-urlencoded
 								if (typeof requestOption.data === "object") {
 									requestOption.data = new URLSearchParams(
-										// @ts-ignore
-										requestOption.data
+										requestOption.data as Record<string, string>
 									).toString();
 								}
 							} else if (ContentType.includes("multipart/form-data")) {
@@ -621,11 +562,9 @@ class Httpx {
 		},
 		/**
 		 * 处理发送请求的配置，去除值为undefined、空function的值
-		 * @param option
+		 * @param option 请求配置
 		 */
-		removeRequestNullOption(
-			option: Required<HttpxRequestOption>
-		): HttpxRequestOption {
+		removeRequestNullOption(option: Required<HttpxRequestOption>): HttpxRequestOption {
 			Object.keys(option).forEach((keyName) => {
 				if (
 					option[keyName as keyof HttpxRequestOption] == null ||
@@ -637,23 +576,20 @@ class Httpx {
 				}
 			});
 			if (CommonUtil.isNull(option.url)) {
-				throw new TypeError(`Utils.Httpx 参数 url不符合要求: ${option.url}`);
+				throw new TypeError(`Utils.Httpx 参数url不能为空：${option.url}`);
 			}
 			return option;
 		},
 		/**
 		 * 处理fetch的配置
-		 * @param option
+		 * @param option 请求配置
 		 */
 		handleFetchOption(option: Required<HttpxRequestOption>) {
 			/**
 			 * fetch的请求配置
 			 **/
 			let fetchRequestOption = <RequestInit>{};
-			if (
-				(option.method === "GET" || option.method === "HEAD") &&
-				option.data != null
-			) {
+			if ((option.method === "GET" || option.method === "HEAD") && option.data != null) {
 				/* GET 或 HEAD 方法的请求不能包含 body 信息 */
 				Reflect.deleteProperty(option, "data");
 			}
@@ -698,13 +634,13 @@ class Httpx {
 			};
 		},
 	};
-	private HttpxCallBack = {
+	private HttpxResponseCallBack = {
 		context: this,
 		/**
 		 * onabort请求被取消-触发
 		 * @param details 配置
-		 * @param resolve 回调
-		 * @param reject 抛出错误
+		 * @param resolve promise回调
+		 * @param reject promise抛出错误回调
 		 * @param argsResult 返回的参数列表
 		 */
 		async onAbort(
@@ -714,10 +650,10 @@ class Httpx {
 			argsResult: any
 		) {
 			// console.log(argsResult);
-			if ("onabort" in details) {
+			if (typeof details?.onabort === "function") {
 				details.onabort.apply(this, argsResult);
-			} else if ("onabort" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.onabort!.apply(this, argsResult);
+			} else if (typeof this.context.#defaultRequestOption?.onabort === "function") {
+				this.context.#defaultRequestOption.onabort.apply(this, argsResult);
 			}
 			let response = argsResult;
 			if (response.length) {
@@ -726,12 +662,12 @@ class Httpx {
 			if (
 				(await this.context.HttpxResponseHook.errorResponseCallBack({
 					type: "onabort",
-					error: new TypeError("request canceled"),
+					error: new Error("request canceled"),
 					response: null,
 					details: details,
 				})) == null
 			) {
-				// reject(new TypeError("response is intercept with onabort"));
+				// reject(new Error("response is intercept with onabort"));
 				return;
 			}
 			resolve({
@@ -744,66 +680,70 @@ class Httpx {
 			});
 		},
 		/**
-		 * onerror请求异常-触发
+		 * ontimeout请求超时-触发
 		 * @param details 配置
 		 * @param resolve 回调
 		 * @param reject 抛出错误
 		 * @param argsResult 返回的参数列表
 		 */
-		async onError(
+		async onTimeout(
 			details: Required<HttpxRequestOption>,
 			resolve: (resultOption: HttpxResponse<HttpxRequestOption>) => void,
 			reject: (...args: any[]) => void,
 			argsResult: any
 		) {
 			// console.log(argsResult);
-			if ("onerror" in details) {
-				details.onerror.apply(this, argsResult);
-			} else if ("onerror" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.onerror!.apply(this, argsResult);
+			if (typeof details?.ontimeout === "function") {
+				// 执行配置中的ontime回调
+				details.ontimeout.apply(this, argsResult);
+			} else if (typeof this.context.#defaultRequestOption?.ontimeout === "function") {
+				// 执行默认配置的ontime回调
+				this.context.#defaultRequestOption.ontimeout.apply(this, argsResult);
 			}
+			// 获取响应结果
 			let response = argsResult;
 			if (response.length) {
 				response = response[0];
 			}
+			// 执行错误回调的钩子
 			if (
 				(await this.context.HttpxResponseHook.errorResponseCallBack({
-					type: "onerror",
-					error: new TypeError("request error"),
+					type: "ontimeout",
+					error: new Error("request timeout"),
 					response: response,
 					details: details,
 				})) == null
 			) {
-				// reject(new TypeError("response is intercept with onerror"));
+				// reject(new Error("response is intercept with ontimeout"));
 				return;
 			}
 			resolve({
 				data: response,
 				details: details,
-				msg: "请求异常",
+				msg: "请求超时",
 				status: false,
-				statusCode: response["status"],
-				type: "onerror",
+				statusCode: 0,
+				type: "ontimeout",
 			});
 		},
 		/**
-		 * ontimeout请求超时-触发
+		 * onerror请求异常-触发
 		 * @param details 配置
 		 * @param resolve 回调
 		 * @param reject 抛出错误
 		 * @param argsResult 返回的参数列表
 		 */
-		async onTimeout(
+		async onError(
 			details: Required<HttpxRequestOption>,
 			resolve: (resultOption: HttpxResponse<HttpxRequestOption>) => void,
 			reject: (...args: any[]) => void,
 			argsResult: any
 		) {
 			// console.log(argsResult);
-			if ("ontimeout" in details) {
-				details.ontimeout.apply(this, argsResult);
-			} else if ("ontimeout" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.ontimeout!.apply(this, argsResult);
+			if (typeof details?.onerror === "function") {
+				details.onerror.apply(this, argsResult);
+			} else if (typeof this.context.#defaultRequestOption?.onerror === "function") {
+				this.context.#defaultRequestOption.onerror.apply(this, argsResult);
 			}
 			let response = argsResult;
 			if (response.length) {
@@ -811,41 +751,24 @@ class Httpx {
 			}
 			if (
 				(await this.context.HttpxResponseHook.errorResponseCallBack({
-					type: "ontimeout",
-					error: new TypeError("request timeout"),
-					response: (argsResult || [null])[0],
+					type: "onerror",
+					error: new Error("request error"),
+					response: response,
 					details: details,
 				})) == null
 			) {
-				// reject(new TypeError("response is intercept with ontimeout"));
+				// reject(new Error("response is intercept with onerror"));
 				return;
 			}
 			resolve({
 				data: response,
 				details: details,
-				msg: "请求超时",
+				msg: "请求异常",
 				status: false,
-				statusCode: 0,
-				type: "ontimeout",
+				statusCode: response["status"],
+				type: "onerror",
 			});
 		},
-
-		/**
-		 * onloadstart请求开始-触发
-		 * @param details 配置
-		 * @param argsResult 返回的参数列表
-		 */
-		onLoadStart(details: Required<HttpxRequestOption>, argsResult: any[]) {
-			// console.log(argsResult);
-			if ("onloadstart" in details) {
-				details.onloadstart.apply(this, argsResult);
-			} else if ("onloadstart" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.onloadstart!.apply(
-					this,
-					argsResult
-				);
-			}
-		},
 		/**
 		 * onload加载完毕-触发
 		 * @param details 请求的配置
@@ -869,9 +792,7 @@ class Httpx {
 			) {
 				if (typeof originResponse["response"] === "object") {
 					TryCatch().run(() => {
-						originResponse["responseText"] = JSON.stringify(
-							originResponse["response"]
-						);
+						originResponse["responseText"] = JSON.stringify(originResponse["response"]);
 					});
 				} else {
 					originResponse["responseText"] = originResponse["response"] as string;
@@ -892,10 +813,7 @@ class Httpx {
 					httpxResponse = CommonUtil.toJSON(httpxResponseText);
 				} else if (details.responseType === "document") {
 					let parser = new DOMParser();
-					httpxResponse = parser.parseFromString(
-						httpxResponseText,
-						"text/html"
-					);
+					httpxResponse = parser.parseFromString(httpxResponseText, "text/html");
 				} else if (details.responseType === "arraybuffer") {
 					let encoder = new TextEncoder();
 					let arrayBuffer = encoder.encode(httpxResponseText);
@@ -907,33 +825,21 @@ class Httpx {
 				}
 				// 尝试覆盖原response
 				try {
-					let setStatus = Reflect.set(
-						originResponse,
-						"response",
-						httpxResponse
-					);
+					let setStatus = Reflect.set(originResponse, "response", httpxResponse);
 					if (!setStatus) {
-						console.warn(
-							"[Httpx-HttpxCallBack.oonLoad] 覆盖原始 response 失败，尝试添加新的httpxResponse"
-						);
+						console.warn("[Httpx-HttpxCallBack.oonLoad] 覆盖原始 response 失败，尝试添加新的httpxResponse");
 						try {
 							Reflect.set(originResponse, "httpxResponse", httpxResponse);
 						} catch (error) {
-							console.warn(
-								"[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖"
-							);
+							console.warn("[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖");
 						}
 					}
 				} catch (error) {
-					console.warn(
-						"[Httpx-HttpxCallBack.oonLoad] 原始 response 无法被覆盖，尝试添加新的httpxResponse"
-					);
+					console.warn("[Httpx-HttpxCallBack.oonLoad] 原始 response 无法被覆盖，尝试添加新的httpxResponse");
 					try {
 						Reflect.set(originResponse, "httpxResponse", httpxResponse);
 					} catch (error) {
-						console.warn(
-							"[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖"
-						);
+						console.warn("[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖");
 					}
 				}
 			}
@@ -945,13 +851,8 @@ class Httpx {
 
 			/* 状态码2xx都是成功的 */
 			if (Math.floor(originResponse.status / 100) === 2) {
-				if (
-					(await this.context.HttpxResponseHook.successResponseCallBack(
-						originResponse,
-						details
-					)) == null
-				) {
-					// reject(new TypeError("response is intercept with onloada"));
+				if ((await this.context.HttpxResponseHook.successResponseCallBack(originResponse, details)) == null) {
+					// reject(new Error("response is intercept with onloada"));
 					return;
 				}
 				resolve({
@@ -963,25 +864,20 @@ class Httpx {
 					type: "onload",
 				});
 			} else {
-				this.context.HttpxCallBack.onError(
-					details,
-					resolve,
-					reject,
-					argsResult
-				);
+				this.context.HttpxResponseCallBack.onError(details, resolve, reject, argsResult);
 			}
 		},
 		/**
-		 * onprogress上传进度-触发
+		 * onloadstart请求开始-触发
 		 * @param details 配置
 		 * @param argsResult 返回的参数列表
 		 */
-		onProgress(details: Required<HttpxRequestOption>, argsResult: any[]) {
+		onLoadStart(details: Required<HttpxRequestOption>, argsResult: any[]) {
 			// console.log(argsResult);
-			if ("onprogress" in details) {
-				details.onprogress.apply(this, argsResult);
-			} else if ("onprogress" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.onprogress!.apply(this, argsResult);
+			if (typeof details?.onloadstart === "function") {
+				details.onloadstart.apply(this, argsResult);
+			} else if (typeof this.context.#defaultRequestOption?.onloadstart === "function") {
+				this.context.#defaultRequestOption.onloadstart.apply(this, argsResult);
 			}
 		},
 		/**
@@ -989,18 +885,25 @@ class Httpx {
 		 * @param details 配置
 		 * @param argsResult 返回的参数列表
 		 */
-		onReadyStateChange(
-			details: Required<HttpxRequestOption>,
-			argsResult: any[]
-		) {
+		onReadyStateChange(details: Required<HttpxRequestOption>, argsResult: any[]) {
 			// console.log(argsResult);
-			if ("onreadystatechange" in details) {
+			if (typeof details?.onreadystatechange === "function") {
 				details.onreadystatechange.apply(this, argsResult);
-			} else if ("onreadystatechange" in this.context.#defaultRequestOption) {
-				this.context.#defaultRequestOption!.onreadystatechange!.apply(
-					this,
-					argsResult
-				);
+			} else if (typeof this.context.#defaultRequestOption?.onreadystatechange === "function") {
+				this.context.#defaultRequestOption.onreadystatechange.apply(this, argsResult);
+			}
+		},
+		/**
+		 * onprogress上传进度-触发
+		 * @param details 配置
+		 * @param argsResult 返回的参数列表
+		 */
+		onProgress(details: Required<HttpxRequestOption>, argsResult: any[]) {
+			// console.log(argsResult);
+			if (typeof details?.onprogress === "function") {
+				details.onprogress.apply(this, argsResult);
+			} else if (typeof this.context.#defaultRequestOption?.onprogress === "function") {
+				this.context.#defaultRequestOption.onprogress.apply(this, argsResult);
 			}
 		},
 	};
@@ -1014,12 +917,8 @@ class Httpx {
 			if (this.context.#defaultInitOption.logDetails) {
 				console.log("[Httpx-HttpxRequest.request] 请求前的配置👇", details);
 			}
-			if (
-				typeof this.context.HttpxRequestHook.beforeRequestCallBack ===
-				"function"
-			) {
-				let hookResult =
-					await this.context.HttpxRequestHook.beforeRequestCallBack(details);
+			if (typeof this.context.HttpxRequestHook.beforeRequestCallBack === "function") {
+				let hookResult = await this.context.HttpxRequestHook.beforeRequestCallBack(details);
 				if (hookResult == null) {
 					return;
 				}
@@ -1064,15 +963,12 @@ class Httpx {
 						isFetch: true,
 						finalUrl: fetchResponse.url,
 						readyState: 4,
-						// @ts-ignore
 						status: fetchResponse.status,
 						statusText: fetchResponse.statusText,
-						// @ts-ignore
-						response: void 0,
+						response: "",
 						responseFetchHeaders: fetchResponse.headers,
 						responseHeaders: "",
-						// @ts-ignore
-						responseText: void 0,
+						responseText: "",
 						responseType: option.responseType,
 						responseXML: void 0,
 					};
@@ -1090,9 +986,7 @@ class Httpx {
 					if (
 						option.responseType === "stream" ||
 						(fetchResponse.headers.has("Content-Type") &&
-							fetchResponse.headers
-								.get("Content-Type")!
-								.includes("text/event-stream"))
+							fetchResponse.headers.get("Content-Type")!.includes("text/event-stream"))
 					) {
 						Reflect.set(httpxResponse, "isStream", true);
 						Reflect.set(httpxResponse, "response", fetchResponse.body);
@@ -1105,7 +999,7 @@ class Httpx {
 					/** 响应 */
 					let response: any = "";
 					/** 响应字符串 */
-					let responseText = "";
+					let responseText: string = "";
 					/** 响应xml文档 */
 					let responseXML: XMLDocument | string = "";
 					/** 先获取二进制数据 */
@@ -1114,9 +1008,7 @@ class Httpx {
 					/** 数据编码 */
 					let encoding = "utf-8";
 					if (fetchResponse.headers.has("Content-Type")) {
-						let charsetMatched = fetchResponse.headers
-							.get("Content-Type")
-							?.match(/charset=(.+)/);
+						let charsetMatched = fetchResponse.headers.get("Content-Type")?.match(/charset=(.+)/);
 						if (charsetMatched) {
 							encoding = charsetMatched[1];
 							encoding = encoding.toLowerCase();
@@ -1138,15 +1030,11 @@ class Httpx {
 						response = new Blob([arrayBuffer]);
 					} else if (
 						option.responseType === "json" ||
-						(typeof fetchResponseType === "string" &&
-							fetchResponseType.includes("application/json"))
+						(typeof fetchResponseType === "string" && fetchResponseType.includes("application/json"))
 					) {
 						// response返回格式是JSON格式
 						response = CommonUtil.toJSON(responseText);
-					} else if (
-						option.responseType === "document" ||
-						option.responseType == null
-					) {
+					} else if (option.responseType === "document" || option.responseType == null) {
 						// response返回格式是文档格式
 						let parser = new DOMParser();
 						response = parser.parseFromString(responseText, "text/html");
@@ -1155,9 +1043,9 @@ class Httpx {
 					let parser = new DOMParser();
 					responseXML = parser.parseFromString(responseText, "text/xml");
 
-					Reflect.set(httpxResponse, "response", response);
-					Reflect.set(httpxResponse, "responseText", responseText);
-					Reflect.set(httpxResponse, "responseXML", responseXML);
+					httpxResponse.response = response;
+					httpxResponse.responseText = responseText;
+					httpxResponse.responseXML = responseXML;
 
 					// 执行回调
 					option.onload(httpxResponse);
@@ -1197,7 +1085,7 @@ class Httpx {
 	 * 默认配置
 	 */
 	#defaultRequestOption = <HttpxRequestOption>{
-		url: void 0,
+		url: void 0 as undefined | string,
 		timeout: 5000,
 		async: false,
 		responseType: void 0,
@@ -1261,14 +1149,8 @@ class Httpx {
 		if (typeof option.xmlHttpRequest === "function") {
 			this.GM_Api.xmlHttpRequest = option.xmlHttpRequest;
 		}
-		this.#defaultRequestOption = CommonUtil.assign(
-			this.#defaultRequestOption,
-			option
-		);
-		this.#defaultInitOption = CommonUtil.assign(
-			this.#defaultInitOption,
-			option
-		);
+		this.#defaultRequestOption = CommonUtil.assign(this.#defaultRequestOption, option);
+		this.#defaultInitOption = CommonUtil.assign(this.#defaultInitOption, option);
 	}
 	/**
 	 * 拦截器
@@ -1283,11 +1165,7 @@ class Httpx {
 			 * 添加拦截器
 			 * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
 			 */
-			use(
-				fn: <T extends Required<HttpxRequestOption>>(
-					details: T
-				) => void | T | Promise<void | T>
-			) {
+			use(fn: <T extends Required<HttpxRequestOption>>(details: T) => void | T | Promise<void | T>) {
 				if (typeof fn !== "function") {
 					console.warn("[Httpx-interceptors-request] 请传入拦截器函数");
 					return;
@@ -1325,9 +1203,7 @@ class Httpx {
 					response: T,
 					details: HttpxRequestOption
 				) => void | T,
-				errorFn?: <T extends HttpxHookErrorData>(
-					data: T
-				) => void | T | Promise<void | T>
+				errorFn?: <T extends HttpxHookErrorData>(data: T) => void | T | Promise<void | T>
 			) {
 				if (typeof successFn !== "function" && typeof errorFn !== "function") {
 					console.warn("[Httpx-interceptors-response] 必须传入一个拦截器函数");
@@ -1357,13 +1233,6 @@ class Httpx {
 	setXMLHttpRequest(httpRequest: Function) {
 		this.GM_Api.xmlHttpRequest = httpRequest;
 	}
-	/**
-	 * GET 请求
-	 * @param url 网址
-	 */
-	get<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * GET 请求
 	 * @param details 配置
@@ -1371,23 +1240,29 @@ class Httpx {
 	get<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * GET 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	get<T extends HttpxRequestOption>(
+	get<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * GET 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	get(
-		...args: (string | HttpxRequestOption)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	get(...args: (string | HttpxRequestOption)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		useRequestOption.method = "GET";
 		return this.request(useRequestOption, (option) => {
 			Reflect.deleteProperty(option, "onprogress");
@@ -1397,33 +1272,30 @@ class Httpx {
 	 * POST 请求
 	 * @param details 配置
 	 */
-	post<T extends HttpxRequestOption>(
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
-	/**
-	 * POST 请求
-	 * @param url 网址
-	 */
-	post<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
+	post<T extends HttpxRequestOption>(details?: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * POST 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	post<T extends HttpxRequestOption>(
+	post<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * POST 请求
 	 */
-	post(
-		...args: (HttpxRequestOption | string)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	post(...args: (HttpxRequestOption | string)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		useRequestOption.method = "POST";
 		return this.request(useRequestOption);
 	}
@@ -1431,33 +1303,30 @@ class Httpx {
 	 * HEAD 请求
 	 * @param details 配置
 	 */
-	head<T extends HttpxRequestOption>(
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
-	/**
-	 * HEAD 请求
-	 * @param url 网址
-	 */
-	head<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
+	head<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * HEAD 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	head<T extends HttpxRequestOption>(
+	head<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * HEAD 请求
 	 */
-	head(
-		...args: (HttpxRequestOption | string)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	head(...args: (HttpxRequestOption | string)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		useRequestOption.method = "HEAD";
 		return this.request(useRequestOption, (option) => {
 			Reflect.deleteProperty(option, "onprogress");
@@ -1467,76 +1336,68 @@ class Httpx {
 	 * OPTIONS 请求
 	 * @param details 配置
 	 */
-	options<T extends HttpxRequestOption>(
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
-	/**
-	 * OPTIONS 请求
-	 * @param url 网址
-	 */
-	options<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
+	options<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * OPTIONS 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	options<T extends HttpxRequestOption>(
+	options<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * OPTIONS 请求
 	 */
-	options(
-		...args: (HttpxRequestOption | string)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	options(...args: (HttpxRequestOption | string)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		useRequestOption.method = "OPTIONS";
 		return this.request(useRequestOption, (option) => {
 			Reflect.deleteProperty(option, "onprogress");
 		});
 	}
-
 	/**
 	 * DELETE 请求
 	 * @param details 配置
 	 */
-	delete<T extends HttpxRequestOption>(
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+	delete<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * DELETE 请求
-	 * @param url 网址
-	 */
-	delete<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
-	/**
-	 * DELETE 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	delete<T extends HttpxRequestOption>(
+	delete<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * DELETE 请求
 	 */
-	delete(
-		...args: (HttpxRequestOption | string)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	delete(...args: (HttpxRequestOption | string)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		useRequestOption.method = "DELETE";
 		return this.request(useRequestOption, (option) => {
 			Reflect.deleteProperty(option, "onprogress");
 		});
 	}
-
 	/**
 	 * PUT 请求
 	 * @param details 配置
@@ -1544,32 +1405,30 @@ class Httpx {
 	put<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
 	/**
 	 * PUT 请求
-	 * @param url 网址
-	 */
-	put<T extends HttpxRequestOption>(
-		url: string
-	): HttpxPromise<HttpxResponse<T>>;
-	/**
-	 * PUT 请求
-	 * @param url 网址
+	 * @param url 请求的url
 	 * @param details 配置
 	 */
-	put<T extends HttpxRequestOption>(
+	put<T extends Omit<HttpxRequestOption, "url">>(
 		url: string,
-		details: T
-	): HttpxPromise<HttpxResponse<T>>;
+		details?: T
+	): HttpxPromise<
+		HttpxResponse<
+			T & {
+				/**
+				 * 请求的url
+				 */
+				url: string;
+			}
+		>
+	>;
 	/**
 	 * PUT 请求
 	 */
-	put(
-		...args: (HttpxRequestOption | string)[]
-	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
+	put(...args: (HttpxRequestOption | string)[]): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
+		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(...args);
 		userRequestOption.method = "PUT";
 		return this.request(userRequestOption);
 	}
-
 	/**
 	 * 发送请求
 	 * @param details 配置
@@ -1579,43 +1438,29 @@ class Httpx {
 		details: T,
 		beforeRequestOption?: (option: Required<T>) => void
 	): HttpxPromise<HttpxResponse<T>> {
-		let useRequestOption =
-			this.HttpxRequestOption.handleBeforeRequestOptionArgs(details);
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOptionArgs(details);
 		/** 取消请求 */
 		let abortFn: Function | null = null;
-		let promise = new globalThis.Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					useRequestOption.method!,
-					useRequestOption,
-					resolve,
-					reject
-				);
-				if (typeof beforeRequestOption === "function") {
-					// @ts-ignore
-					beforeRequestOption(requestOption);
-				}
-				// @ts-ignore
-				requestOption =
-					this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
+		let promise = new globalThis.Promise<HttpxResponse<HttpxRequestOption>>(async (resolve, reject) => {
+			let requestOption = <Required<T>>(
+				this.HttpxRequestOption.getRequestOption(useRequestOption.method!, useRequestOption, resolve, reject)
+			);
+			if (typeof beforeRequestOption === "function") {
+				beforeRequestOption(requestOption);
+			}
+			requestOption = this.HttpxRequestOption.removeRequestNullOption(
+				<Required<HttpxRequestOption>>requestOption
+			) as Required<T>;
+			const requestResult = await this.HttpxRequest.request(<Required<HttpxRequestOption>>requestOption);
+			if (requestResult != null && typeof requestResult.abort === "function") {
+				abortFn = requestResult.abort;
 			}
-		);
-		// @ts-ignore
+		}) as HttpxPromise<HttpxResponse<T>>;
 		promise.abort = () => {
 			if (typeof abortFn === "function") {
 				abortFn();
 			}
 		};
-		// @ts-ignore
 		return promise;
 	}
 }
-
-export { Httpx };