@whitesev/utils 2.3.1 → 2.3.3

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

@@ -949,6 +949,26 @@ export declare interface HttpxDetails {
      * 自定义Cookie，可为空
      */
     cookie?: string;
+    /**
+     * TamperMonkey5.2+
+     *
+     * @link https://developer.mozilla.org/zh-CN/docs/Mozilla/Add-ons/WebExtensions/API/cookies#storage_partitioning
+     */
+    cookiePartition?: {
+        /**
+         * 设置顶级站点
+         *
+         * @example
+         * http://*.example.com/
+         *
+         * @example
+         * http://www.example.com/
+         *
+         * @example
+         * *://*.example.com/
+         */
+        topLevelSite?: string;
+    };
     /**
      * 以二进制模式发送数据字符串，可为空
      */
@@ -1206,68 +1226,98 @@ declare class Httpx {
     /**
      * GET 请求
      * @param url 网址
+     */
+    get(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * GET 请求
      * @param details 配置
      */
-    get<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    get(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * GET 请求
+     * @param url 网址
      * @param details 配置
      */
-    get<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    get(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * POST 请求
      * @param details 配置
      */
-    post<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    post(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * POST 请求
+     * @param url 网址
+     */
+    post(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * POST 请求
      * @param url 网址
      * @param details 配置
      */
-    post<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    post(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * HEAD 请求
      * @param details 配置
      */
-    head<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    head(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * HEAD 请求
+     * @param url 网址
+     */
+    head(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * HEAD 请求
      * @param url 网址
      * @param details 配置
      */
-    head<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    head(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * OPTIONS 请求
      * @param details 配置
      */
-    options<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    options(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * OPTIONS 请求
+     * @param url 网址
+     */
+    options(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * OPTIONS 请求
      * @param url 网址
      * @param details 配置
      */
-    options<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    options(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * DELETE 请求
      * @param details 配置
      */
-    delete<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    delete(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * DELETE 请求
+     * @param url 网址
+     */
+    delete(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * DELETE 请求
      * @param url 网址
      * @param details 配置
      */
-    delete<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    delete(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * PUT 请求
      * @param details 配置
      */
-    put<T extends HttpxDetails>(details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    put(details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+    /**
+     * PUT 请求
+     * @param url 网址
+     */
+    put(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
     /**
      * PUT 请求
      * @param url 网址
      * @param details 配置
      */
-    put<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
+    put(url: string, details: HttpxDetails): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 }
 export { Httpx };

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

@@ -1419,6 +1419,15 @@ declare class Utils {
      * > [{"key": 2}]
      **/
     uniqueArray<T extends any, TT extends any>(uniqueArrayData?: T[], compareArrayData?: TT[], compareFun?: (item1: T, item2: TT) => boolean): any[];
+    /**
+     * 数组去重，去除不需要的值
+     * @param uniqueArrayData 需要过滤的数组
+     * @param getIdentfierValue 获取用于确定唯一性的值
+     * @example
+     * Utils.uniqueArray([{name:"1",host:"baidu.com"},{name:"2",host:"baidu.com"},{name:"3",host:"baidu.com"}]);
+     * > [{name:"1",host:"baidu.com"}]
+     */
+    uniqueArray<T>(uniqueArrayData: T[], getIdentfierValue: (itemValue: T) => any): T[];
     /**
      * 等待函数数组全部执行完毕，注意，每个函数的顺序不是同步
      * @param data 需要遍历的数组

package/package.json

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

package/src/Httpx.ts

@@ -1047,6 +1047,26 @@ export declare interface HttpxDetails {
 	 * 自定义Cookie，可为空
 	 */
 	cookie?: string;
+	/**
+	 * TamperMonkey5.2+
+	 *
+	 * @link https://developer.mozilla.org/zh-CN/docs/Mozilla/Add-ons/WebExtensions/API/cookies#storage_partitioning
+	 */
+	cookiePartition?: {
+		/**
+		 * 设置顶级站点
+		 *
+		 * @example
+		 * http://*.example.com/
+		 *
+		 * @example
+		 * http://www.example.com/
+		 *
+		 * @example
+		 * *://*.example.com/
+		 */
+		topLevelSite?: string;
+	};
 	/**
 	 * 以二进制模式发送数据字符串，可为空
 	 */
@@ -1509,6 +1529,9 @@ class Httpx {
 				data: details.data || this.context.#defaultDetails.data,
 				redirect: details.redirect || this.context.#defaultDetails.redirect,
 				cookie: details.cookie || this.context.#defaultDetails.cookie,
+				cookiePartition:
+					details.cookiePartition ||
+					this.context.#defaultDetails.cookiePartition,
 				binary: details.binary || this.context.#defaultDetails.binary,
 				nocache: details.nocache || this.context.#defaultDetails.nocache,
 				revalidate:
@@ -1661,6 +1684,20 @@ class Httpx {
 			} else {
 				(result as any).fetchInit = details.fetchInit;
 			}
+
+			// 处理新的cookiePartition
+			if (
+				typeof result.cookiePartition === "object" &&
+				result.cookiePartition != null
+			) {
+				if (
+					Reflect.has(result.cookiePartition, "topLevelSite") &&
+					typeof result.cookiePartition.topLevelSite !== "string"
+				) {
+					// topLevelSite必须是字符串
+					Reflect.deleteProperty(result.cookiePartition, "topLevelSite");
+				}
+			}
 			return result;
 		},
 		/**
@@ -2220,6 +2257,7 @@ class Httpx {
 		data: void 0,
 		redirect: void 0,
 		cookie: void 0,
+		cookiePartition: void 0,
 		binary: void 0,
 		nocache: void 0,
 		revalidate: void 0,
@@ -2362,26 +2400,33 @@ class Httpx {
 	/**
 	 * GET 请求
 	 * @param url 网址
+	 */
+	async get(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * GET 请求
 	 * @param details 配置
 	 */
-	async get<T extends HttpxDetails>(
-		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async get(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * GET 请求
+	 * @param url 网址
 	 * @param details 配置
 	 */
-	async get<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async get(
+		url: string,
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * GET 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
 	async get(
-		...args: (HttpxDetails | string)[] // @ts-ignore
+		...args: (string | HttpxDetails)[] // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<HttpxDetails>> {
 		let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
 		let abortFn: Function | null = null;
@@ -2420,18 +2465,24 @@ class Httpx {
 	 * POST 请求
 	 * @param details 配置
 	 */
-	async post<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async post(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * POST 请求
+	 * @param url 网址
+	 */
+	// @ts-ignore
+	async post(url: string): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * POST 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async post<T extends HttpxDetails>(
+	async post(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * POST 请求
 	 */
@@ -2474,18 +2525,25 @@ class Httpx {
 	 * HEAD 请求
 	 * @param details 配置
 	 */
-	async head<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async head(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * HEAD 请求
+	 * @param url 网址
+	 */
+	async head(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * HEAD 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async head<T extends HttpxDetails>(
+	async head(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * HEAD 请求
 	 */
@@ -2533,18 +2591,25 @@ class Httpx {
 	 * OPTIONS 请求
 	 * @param details 配置
 	 */
-	options<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	options(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * OPTIONS 请求
+	 * @param url 网址
+	 */
+	options(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * OPTIONS 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	options<T extends HttpxDetails>(
+	options(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * OPTIONS 请求
 	 */
@@ -2589,18 +2654,25 @@ class Httpx {
 	 * DELETE 请求
 	 * @param details 配置
 	 */
-	async delete<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async delete(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * DELETE 请求
+	 * @param url 网址
+	 */
+	async delete(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * DELETE 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async delete<T extends HttpxDetails>(
+	async delete(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * DELETE 请求
 	 */
@@ -2646,18 +2718,25 @@ class Httpx {
 	 * PUT 请求
 	 * @param details 配置
 	 */
-	async put<T extends HttpxDetails>(
-		details: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+	async put(
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
+	/**
+	 * PUT 请求
+	 * @param url 网址
+	 */
+	async put(
+		url: string // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * PUT 请求
 	 * @param url 网址
 	 * @param details 配置
 	 */
-	async put<T extends HttpxDetails>(
+	async put(
 		url: string,
-		details?: T // @ts-ignore
-	): HttpxPromise<HttpxAsyncResult<T>>;
+		details: HttpxDetails // @ts-ignore
+	): HttpxPromise<HttpxAsyncResult<HttpxDetails>>;
 	/**
 	 * PUT 请求
 	 */

package/src/Utils.ts

@@ -53,7 +53,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.9.10";
+	version = "2024.9.28";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -3951,20 +3951,48 @@ class Utils {
 		compareArrayData?: TT[],
 		compareFun?: (item1: T, item2: TT) => boolean
 	): any[];
-	uniqueArray<T extends any, TT extends any>(
+	/**
+	 * 数组去重，去除不需要的值
+	 * @param uniqueArrayData 需要过滤的数组
+	 * @param getIdentfierValue 获取用于确定唯一性的值
+	 * @example
+	 * Utils.uniqueArray([{name:"1",host:"baidu.com"},{name:"2",host:"baidu.com"},{name:"3",host:"baidu.com"}]);
+	 * > [{name:"1",host:"baidu.com"}]
+	 */
+	uniqueArray<T>(
+		uniqueArrayData: T[],
+		getIdentfierValue: (itemValue: T) => any
+	): T[];
+	uniqueArray<T, T2>(
 		uniqueArrayData: T[] = [],
-		compareArrayData: TT[] = [],
-		compareFun: (item1: T, item2: TT) => boolean = (item, item2) => {
-			// @ts-ignore
+		compareArrayData: any,
+		compareFun: any = (item: any, item2: any) => {
 			return item === item2;
 		}
 	): any[] {
-		return Array.from(uniqueArrayData).filter(
-			(item) =>
-				!Array.from(compareArrayData).some(function (item2) {
-					return compareFun(item, item2);
-				})
-		);
+		if (typeof compareArrayData === "function") {
+			const compareFn = compareArrayData;
+			const seen = new Set();
+
+			const result: T[] = [];
+			for (const item of uniqueArrayData) {
+				// 使用compareFn函数来获取当前对象的唯一标识
+				const identfier = compareFn(item);
+				// 如果Set中还没有这个标识，则添加到结果数组中，并将其标识存入Set
+				if (!seen.has(identfier)) {
+					seen.add(identfier);
+					result.push(item);
+				}
+			}
+			return result;
+		} else {
+			return Array.from(uniqueArrayData).filter(
+				(item) =>
+					!Array.from(compareArrayData).some(function (item2) {
+						return compareFun(item, item2);
+					})
+			);
+		}
 	}
 	/**
 	 * 等待函数数组全部执行完毕，注意，每个函数的顺序不是同步