@whitesev/utils 2.6.3 → 2.6.5

package/dist/types/src/Httpx.d.ts

@@ -1,170 +1,176 @@
-import type { HttpxHookErrorData, HttpxRequestOption, HttpxRequestOptionConfig, HttpxResponse, HttpxResponseData, HttpxPromise } from "./types/Httpx";
-declare class Httpx {
-    #private;
-    private GM_Api;
-    private HttpxRequestHook;
-    private HttpxResponseHook;
-    private HttpxRequestOption;
-    private HttpxCallBack;
-    private HttpxRequest;
-    /**
-     * 实例化，可传入GM_xmlhttpRequest，未传入则使用window.fetch
-     * @param xmlHttpRequest
-     */
-    constructor(xmlHttpRequest?: Function);
-    /**
-     * 覆盖全局配置
-     * @param details 配置
-     */
-    config(details?: Partial<HttpxRequestOptionConfig>): void;
-    /**
-     * 拦截器
-     */
-    interceptors: {
-        /**
-         * 请求拦截器
-         */
-        request: {
-            context: Httpx;
-            /**
-             * 添加拦截器
-             * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
-             */
-            use(fn: <T extends Required<HttpxRequestOption>>(details: T) => void | T | Promise<void | T>): string | undefined;
-            /**
-             * 移除拦截器
-             * @param id 通过use返回的id
-             */
-            eject(id: string): boolean;
-            /**
-             * 移除所有拦截器
-             */
-            ejectAll(): void;
-        };
-        /**
-         * 响应拦截器
-         */
-        response: {
-            context: Httpx;
-            /**
-             * 添加拦截器
-             * @param successFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
-             * + 2xx 范围内的状态码都会触发该函数
-             * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
-             * + 超出 2xx 范围的状态码都会触发该函数
-             */
-            use(successFn?: <T extends HttpxResponseData<HttpxRequestOption>>(response: T, details: HttpxRequestOption) => void | T, errorFn?: <T extends HttpxHookErrorData>(data: T) => void | T | Promise<void | T>): string | undefined;
-            /**
-             * 移除拦截器
-             * @param id 通过use返回的id
-             */
-            eject(id: string): boolean;
-            /**
-             * 移除所有拦截器
-             */
-            ejectAll(): void;
-        };
-    };
-    /**
-     * 修改xmlHttpRequest
-     * @param httpRequest 网络请求函数
-     */
-    setXMLHttpRequest(httpRequest: Function): void;
-    /**
-     * GET 请求
-     * @param url 网址
-     */
-    get<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * GET 请求
-     * @param details 配置
-     */
-    get<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * GET 请求
-     * @param url 网址
-     * @param details 配置
-     */
-    get<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * 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 请求
-     * @param url 网址
-     * @param details 配置
-     */
-    post<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * 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 请求
-     * @param url 网址
-     * @param details 配置
-     */
-    head<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * 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 请求
-     * @param url 网址
-     * @param details 配置
-     */
-    options<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * DELETE 请求
-     * @param details 配置
-     */
-    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 details 配置
-     */
-    delete<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-    /**
-     * PUT 请求
-     * @param details 配置
-     */
-    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 details 配置
-     */
-    put<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
-}
-export { Httpx };
+import type { HttpxHookErrorData, HttpxRequestOption, HttpxRequestOptionConfig, HttpxResponse, HttpxResponseData, HttpxPromise } from "./types/Httpx";
+declare class Httpx {
+    #private;
+    private GM_Api;
+    private HttpxRequestHook;
+    private HttpxResponseHook;
+    private HttpxRequestOption;
+    private HttpxCallBack;
+    private HttpxRequest;
+    /**
+     * 实例化，可传入GM_xmlhttpRequest，未传入则使用window.fetch
+     * @param xmlHttpRequest
+     */
+    constructor(xmlHttpRequest?: Function);
+    /**
+     * 覆盖全局配置
+     * @param details 配置
+     */
+    config(details?: Partial<HttpxRequestOptionConfig>): void;
+    /**
+     * 拦截器
+     */
+    interceptors: {
+        /**
+         * 请求拦截器
+         */
+        request: {
+            context: Httpx;
+            /**
+             * 添加拦截器
+             * @param fn 设置的请求前回调函数，如果返回配置，则使用返回的配置，如果返回null|undefined，则阻止请求
+             */
+            use(fn: <T extends Required<HttpxRequestOption>>(details: T) => void | T | Promise<void | T>): string | undefined;
+            /**
+             * 移除拦截器
+             * @param id 通过use返回的id
+             */
+            eject(id: string): boolean;
+            /**
+             * 移除所有拦截器
+             */
+            ejectAll(): void;
+        };
+        /**
+         * 响应拦截器
+         */
+        response: {
+            context: Httpx;
+            /**
+             * 添加拦截器
+             * @param successFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
+             * + 2xx 范围内的状态码都会触发该函数
+             * @param errorFn 设置的响应后回调函数，如果返回响应，则使用返回的响应，如果返回null|undefined，则阻止响应
+             * + 超出 2xx 范围的状态码都会触发该函数
+             */
+            use(successFn?: <T extends HttpxResponseData<HttpxRequestOption>>(response: T, details: HttpxRequestOption) => void | T, errorFn?: <T extends HttpxHookErrorData>(data: T) => void | T | Promise<void | T>): string | undefined;
+            /**
+             * 移除拦截器
+             * @param id 通过use返回的id
+             */
+            eject(id: string): boolean;
+            /**
+             * 移除所有拦截器
+             */
+            ejectAll(): void;
+        };
+    };
+    /**
+     * 修改xmlHttpRequest
+     * @param httpRequest 网络请求函数
+     */
+    setXMLHttpRequest(httpRequest: Function): void;
+    /**
+     * GET 请求
+     * @param url 网址
+     */
+    get<T extends HttpxRequestOption>(url: string): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * GET 请求
+     * @param details 配置
+     */
+    get<T extends HttpxRequestOption>(details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * GET 请求
+     * @param url 网址
+     * @param details 配置
+     */
+    get<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * 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 请求
+     * @param url 网址
+     * @param details 配置
+     */
+    post<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * 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 请求
+     * @param url 网址
+     * @param details 配置
+     */
+    head<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * 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 请求
+     * @param url 网址
+     * @param details 配置
+     */
+    options<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * DELETE 请求
+     * @param details 配置
+     */
+    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 details 配置
+     */
+    delete<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * PUT 请求
+     * @param details 配置
+     */
+    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 details 配置
+     */
+    put<T extends HttpxRequestOption>(url: string, details: T): HttpxPromise<HttpxResponse<T>>;
+    /**
+     * 发送请求
+     * @param details 配置
+     * @param beforeRequestOption 处理请求前的配置
+     */
+    request<T extends HttpxRequestOption>(details: T, beforeRequestOption?: (option: Required<T>) => void): HttpxPromise<HttpxResponse<T>>;
+}
+export { Httpx };

package/dist/types/src/UtilsGMCookie.d.ts

@@ -2,6 +2,10 @@ import type { UtilsGMCookieDeleteOptions, UtilsGMCookieListOptions, UtilsGMCooki
 export declare class UtilsGMCookie {
     private windowApi;
     constructor(windowApiOption?: WindowApiOption);
+    /**
+     * 获取Cookie分组
+     */
+    private getCookiesList;
     /**
      * 获取单个cookie
      * @param cookieName cookie名

package/dist/types/src/types/Httpx.d.ts

@@ -62,6 +62,19 @@ export type HttpxStatus =
 	| 510
 	| 511;
 
+/**
+ * HTTP WebDav的请求方法
+ * + https://blog.csdn.net/weixin_48421613/article/details/128611546
+ */
+export type HttpxWebDavMethod =
+	| "PROPFIND"
+	| "PROPPATCH"
+	| "MKCOL"
+	| "MOVE"
+	| "COPY"
+	| "LOCK"
+	| "UNLOCK";
+
 /**
  * HTTP 请求方法
  * + https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Methods
@@ -75,7 +88,8 @@ export type HttpxMethod =
 	| "CONNECT"
 	| "OPTIONS"
 	| "TRACE"
-	| "PATCH";
+	| "PATCH"
+	| HttpxWebDavMethod;
 
 /**
  * 重定向参数

package/package.json

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

package/src/Httpx.ts

@@ -244,7 +244,7 @@ class Httpx {
 		handleBeforeRequestOption(...args: (HttpxRequestOption | string)[]) {
 			let option: HttpxRequestOption = {};
 			if (typeof args[0] === "string") {
-				/* 传入的是url,details? */
+				/* 传入的是url，转为配置 */
 				let url = args[0];
 				option.url = url;
 				if (typeof args[1] === "object") {
@@ -254,7 +254,7 @@ class Httpx {
 					option.url = url;
 				}
 			} else {
-				/* 传入的是details */
+				/* 传入的是配置 */
 				option = args[0];
 			}
 			return option;
@@ -1349,37 +1349,13 @@ class Httpx {
 	get(
 		...args: (string | HttpxRequestOption)[] // @ts-ignore
 	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
-		let abortFn: Function | null = null;
-		let promise = new globalThis.Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"GET",
-					userRequestOption,
-					resolve,
-					reject
-				);
-				Reflect.deleteProperty(requestOption, "onprogress");
-				this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
-			}
-		);
-		// @ts-ignore
-		promise.abort = () => {
-			if (typeof abortFn === "function") {
-				abortFn();
-			}
-		};
-		// @ts-ignore
-		return promise;
+		useRequestOption.method = "GET";
+		return this.request(useRequestOption, (option) => {
+			Reflect.deleteProperty(option, "onprogress");
+		});
 	}
 	/**
 	 * POST 请求
@@ -1411,38 +1387,11 @@ class Httpx {
 	post(
 		...args: (HttpxRequestOption | string)[] // @ts-ignore
 	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
-		let abortFn: Function | null = null;
-		let promise = new Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"POST",
-					userRequestOption,
-					resolve,
-					reject
-				);
-				// @ts-ignore
-				requestOption =
-					this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
-			}
-		);
-		// @ts-ignore
-		promise.abort = () => {
-			if (typeof abortFn === "function") {
-				abortFn();
-			}
-		};
-		// @ts-ignore
-		return promise;
+		useRequestOption.method = "POST";
+		return this.request(useRequestOption);
 	}
 	/**
 	 * HEAD 请求
@@ -1473,40 +1422,13 @@ class Httpx {
 	head(
 		...args: (HttpxRequestOption | string)[] // @ts-ignore
 	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
-		let abortFn: Function | null = null;
-		let promise = new Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"HEAD",
-					userRequestOption,
-					resolve,
-					reject
-				);
-				Reflect.deleteProperty(requestOption, "onprogress");
-				// @ts-ignore
-				requestOption =
-					this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
-			}
-		);
-
-		// @ts-ignore
-		promise.abort = () => {
-			if (typeof abortFn === "function") {
-				abortFn();
-			}
-		};
-		// @ts-ignore
-		return promise;
+		useRequestOption.method = "HEAD";
+		return this.request(useRequestOption, (option) => {
+			Reflect.deleteProperty(option, "onprogress");
+		});
 	}
 	/**
 	 * OPTIONS 请求
@@ -1537,39 +1459,13 @@ class Httpx {
 	options(
 		...args: (HttpxRequestOption | string)[] // @ts-ignore
 	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
-		let abortFn: Function | null = null;
-		let promise = new Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"OPTIONS",
-					userRequestOption,
-					resolve,
-					reject
-				);
-				Reflect.deleteProperty(requestOption, "onprogress");
-				// @ts-ignore
-				requestOption =
-					this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
-			}
-		);
-		// @ts-ignore
-		promise.abort = () => {
-			if (typeof abortFn === "function") {
-				abortFn();
-			}
-		};
-		// @ts-ignore
-		return promise;
+		useRequestOption.method = "OPTIONS";
+		return this.request(useRequestOption, (option) => {
+			Reflect.deleteProperty(option, "onprogress");
+		});
 	}
 
 	/**
@@ -1601,40 +1497,13 @@ class Httpx {
 	delete(
 		...args: (HttpxRequestOption | string)[] // @ts-ignore
 	): HttpxPromise<HttpxResponse<HttpxRequestOption>> {
-		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
+		let useRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
-		let abortFn: Function | null = null;
-		let promise = new Promise<HttpxResponse<HttpxRequestOption>>(
-			async (resolve, reject) => {
-				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"DELETE",
-					userRequestOption,
-					resolve,
-					reject
-				);
-				Reflect.deleteProperty(requestOption, "onprogress");
-				// @ts-ignore
-				requestOption =
-					this.HttpxRequestOption.removeRequestNullOption(requestOption);
-				const requestResult = await this.HttpxRequest.request(requestOption);
-				if (
-					requestResult != null &&
-					typeof requestResult.abort === "function"
-				) {
-					abortFn = requestResult.abort;
-				}
-			}
-		);
-
-		// @ts-ignore
-		promise.abort = () => {
-			if (typeof abortFn === "function") {
-				abortFn();
-			}
-		};
-		// @ts-ignore
-		return promise;
+		useRequestOption.method = "DELETE";
+		return this.request(useRequestOption, (option) => {
+			Reflect.deleteProperty(option, "onprogress");
+		});
 	}
 
 	/**
@@ -1669,15 +1538,35 @@ class Httpx {
 		let userRequestOption = this.HttpxRequestOption.handleBeforeRequestOption(
 			...args
 		);
+		userRequestOption.method = "PUT";
+		return this.request(userRequestOption);
+	}
+
+	/**
+	 * 发送请求
+	 * @param details 配置
+	 * @param beforeRequestOption 处理请求前的配置
+	 */
+	request<T extends HttpxRequestOption>(
+		details: T,
+		beforeRequestOption?: (option: Required<T>) => void
+	): HttpxPromise<HttpxResponse<T>> {
+		let useRequestOption =
+			this.HttpxRequestOption.handleBeforeRequestOption(details);
+		/** 取消请求 */
 		let abortFn: Function | null = null;
-		let promise = new Promise<HttpxResponse<HttpxRequestOption>>(
+		let promise = new globalThis.Promise<HttpxResponse<HttpxRequestOption>>(
 			async (resolve, reject) => {
 				let requestOption = this.HttpxRequestOption.getRequestOption(
-					"PUT",
-					userRequestOption,
+					useRequestOption.method!,
+					useRequestOption,
 					resolve,
 					reject
 				);
+				if (typeof beforeRequestOption === "function") {
+					// @ts-ignore
+					beforeRequestOption(requestOption);
+				}
 				// @ts-ignore
 				requestOption =
 					this.HttpxRequestOption.removeRequestNullOption(requestOption);

package/src/Utils.ts

@@ -31,7 +31,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2025.3.25";
+	version = "2025.4.11";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个