@whitesev/utils 2.3.0 → 2.3.2

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

@@ -1,110 +1,110 @@
-export declare interface Vue2Object {
-    $attrs: any;
-    $children: Vue2Object[];
-    $createElement: (...args: any[]) => any;
-    $el: HTMLElement;
-    $listeners: any;
-    $options: any;
-    $parent: Vue2Object;
-    $refs: any;
-    $root: Vue2Object;
-    $scopedSlots: any;
-    $slots: any;
-    $store: any;
-    $vnode: any;
-    _data: any;
-    _directInactive: boolean;
-    _events: any;
-    _hasHookEvent: boolean;
-    _isBeingDestroyed: boolean;
-    _isDestroyed: boolean;
-    _isMounted: boolean;
-    _isVue: boolean;
-    $data: any;
-    $isServer: boolean;
-    $props: any;
-    $route: any & {
-        fullPath: string;
-        hash: string;
-        matched: any[];
-        meta: any;
-        name: string;
-        params: any;
-        path: string;
-        query: any;
-    };
-    $router: any & {
-        afterHooks: Function[];
-        app: Vue2Object;
-        apps: Vue2Object[];
-        beforeHooks: Function[];
-        fallback: boolean;
-        history: any & {
-            base: string;
-            current: any;
-            listeners: any[];
-            router: Vue2Object["$router"];
-            /**
-             *
-             * @param delta 访问的距离。如果 delta < 0 则后退相应数量的记录，如果 > 0 则前进。
-             * @param triggerListeners 是否应该触发连接到该历史的监听器
-             * @returns
-             */
-            go: (delta: number, triggerListeners?: boolean) => void;
-            /**
-             *
-             * @param to 要设置的地址
-             * @param data 可选的 HistoryState 以关联该导航记录
-             * @returns
-             */
-            push: (to: string, data?: any) => void;
-            /**
-             *
-             * @param to 要设置的地址
-             * @param data 可选的 HistoryState 以关联该导航记录
-             * @returns
-             */
-            replace: (to: string, data?: any) => void;
-        };
-        matcher: any & {
-            addRoute: (...args: any[]) => any;
-            addRoutes: (...args: any[]) => any;
-            getRoutes: () => any;
-            match: (...args: any[]) => any;
-        };
-        mode: string;
-        resolveHooks: ((...args: any[]) => any)[];
-        currentRoute: any;
-        beforeEach: (callback: ((
-        /** 即将要进入的目标 路由对象 */
-        to: Vue2Object["$route"], 
-        /** 当前导航正要离开的路由 */
-        from: Vue2Object["$route"], 
-        /**
-         *
-         * + next(): 进行管道中的下一个钩子。如果全部钩子执行完了，则导航的状态就是 confirmed (确认的)。
-         * + next(false): 中断当前的导航。如果浏览器的 URL 改变了 (可能是用户手动或者浏览器后退按钮)，那么 URL 地址会重置到 from 路由对应的地址。
-         * + next('/') 或者 next({ path: '/' }): 跳转到一个不同的地址。当前的导航被中断，然后进行一个新的导航。你可以向 next 传递任意位置对象，且允许设置诸如 replace: true、name: 'home' 之类的选项以及任何用在 router-link 的 to prop 或 router.push 中的选项。
-         * + next(error): (2.4.0+) 如果传入 next 的参数是一个 Error 实例，则导航会被终止且该错误会被传递给 router.onError() 注册过的回调。
-         */
-        next: Function) => void)
-        /** 移除上一个添加的监听 */
-         | (() => void)) => void;
-        afterEach: (callback: ((
-        /** 即将要进入的目标 路由对象 */
-        to: Vue2Object["$route"], 
-        /** 当前导航正要离开的路由 */
-        from: Vue2Object["$route"]) => void)
-        /** 移除上一个添加的监听 */
-         | (() => void)) => void;
-    };
-    $ssrContext: any;
-    $watch: (key: string | string[] | (() => any), handler: (this: any, newVal: any, oldVal: any) => void, options?: {
-        immediate?: boolean;
-        deep?: boolean;
-    }) => void;
-    [key: string]: any;
-}
-export declare interface HTMLVue2DivElement extends HTMLDivElement {
-    __vue__: Vue2Object;
-}
+export declare interface Vue2Object {
+    $attrs: any;
+    $children: Vue2Object[];
+    $createElement: (...args: any[]) => any;
+    $el: HTMLElement;
+    $listeners: any;
+    $options: any;
+    $parent: Vue2Object;
+    $refs: any;
+    $root: Vue2Object;
+    $scopedSlots: any;
+    $slots: any;
+    $store: any;
+    $vnode: any;
+    _data: any;
+    _directInactive: boolean;
+    _events: any;
+    _hasHookEvent: boolean;
+    _isBeingDestroyed: boolean;
+    _isDestroyed: boolean;
+    _isMounted: boolean;
+    _isVue: boolean;
+    $data: any;
+    $isServer: boolean;
+    $props: any;
+    $route: any & {
+        fullPath: string;
+        hash: string;
+        matched: any[];
+        meta: any;
+        name: string;
+        params: any;
+        path: string;
+        query: any;
+    };
+    $router: any & {
+        afterHooks: Function[];
+        app: Vue2Object;
+        apps: Vue2Object[];
+        beforeHooks: Function[];
+        fallback: boolean;
+        history: any & {
+            base: string;
+            current: any;
+            listeners: any[];
+            router: Vue2Object["$router"];
+            /**
+             *
+             * @param delta 访问的距离。如果 delta < 0 则后退相应数量的记录，如果 > 0 则前进。
+             * @param triggerListeners 是否应该触发连接到该历史的监听器
+             * @returns
+             */
+            go: (delta: number, triggerListeners?: boolean) => void;
+            /**
+             *
+             * @param to 要设置的地址
+             * @param data 可选的 HistoryState 以关联该导航记录
+             * @returns
+             */
+            push: (to: string, data?: any) => void;
+            /**
+             *
+             * @param to 要设置的地址
+             * @param data 可选的 HistoryState 以关联该导航记录
+             * @returns
+             */
+            replace: (to: string, data?: any) => void;
+        };
+        matcher: any & {
+            addRoute: (...args: any[]) => any;
+            addRoutes: (...args: any[]) => any;
+            getRoutes: () => any;
+            match: (...args: any[]) => any;
+        };
+        mode: string;
+        resolveHooks: ((...args: any[]) => any)[];
+        currentRoute: any;
+        beforeEach: (callback: ((
+        /** 即将要进入的目标 路由对象 */
+        to: Vue2Object["$route"], 
+        /** 当前导航正要离开的路由 */
+        from: Vue2Object["$route"], 
+        /**
+         *
+         * + next(): 进行管道中的下一个钩子。如果全部钩子执行完了，则导航的状态就是 confirmed (确认的)。
+         * + next(false): 中断当前的导航。如果浏览器的 URL 改变了 (可能是用户手动或者浏览器后退按钮)，那么 URL 地址会重置到 from 路由对应的地址。
+         * + next('/') 或者 next({ path: '/' }): 跳转到一个不同的地址。当前的导航被中断，然后进行一个新的导航。你可以向 next 传递任意位置对象，且允许设置诸如 replace: true、name: 'home' 之类的选项以及任何用在 router-link 的 to prop 或 router.push 中的选项。
+         * + next(error): (2.4.0+) 如果传入 next 的参数是一个 Error 实例，则导航会被终止且该错误会被传递给 router.onError() 注册过的回调。
+         */
+        next: Function) => void)
+        /** 移除上一个添加的监听 */
+         | (() => void)) => void;
+        afterEach: (callback: ((
+        /** 即将要进入的目标 路由对象 */
+        to: Vue2Object["$route"], 
+        /** 当前导航正要离开的路由 */
+        from: Vue2Object["$route"]) => void)
+        /** 移除上一个添加的监听 */
+         | (() => void)) => void;
+    };
+    $ssrContext: any;
+    $watch: (key: string | string[] | (() => any), handler: (this: any, newVal: any, oldVal: any) => void, options?: {
+        immediate?: boolean;
+        deep?: boolean;
+    }) => void;
+    [key: string]: any;
+}
+export declare interface HTMLVue2DivElement extends HTMLDivElement {
+    __vue__: Vue2Object;
+}

package/package.json

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

package/src/Httpx.ts

@@ -1299,7 +1299,7 @@ class Httpx {
 				return uuid;
 			} else {
 				console.warn(
-					"HttpxRequestHook.addBeforeRequestCallBack: fn is not a function"
+					"[Httpx-HttpxRequestHook.addBeforeRequestCallBack] fn is not a function"
 				);
 			}
 		},
@@ -1889,66 +1889,93 @@ class Httpx {
 			argumentsList: any
 		) {
 			/* X浏览器会因为设置了responseType导致不返回responseText */
-			let Response: HttpxAsyncResultData<HttpxDetails> = argumentsList[0];
+			let originResponse: HttpxAsyncResultData<HttpxDetails> = argumentsList[0];
 			/* responseText为空，response不为空的情况 */
 			if (
-				Utils.isNull(Response["responseText"]) &&
-				Utils.isNotNull(Response["response"])
+				Utils.isNull(originResponse["responseText"]) &&
+				Utils.isNotNull(originResponse["response"])
 			) {
-				if (typeof Response["response"] === "object") {
+				if (typeof originResponse["response"] === "object") {
 					Utils.tryCatch().run(() => {
-						Response["responseText"] = JSON.stringify(Response["response"]);
+						originResponse["responseText"] = JSON.stringify(
+							originResponse["response"]
+						);
 					});
 				} else {
-					Response["responseText"] = Response["response"];
+					originResponse["responseText"] = originResponse["response"];
 				}
 			}
 
 			/* response为空，responseText不为空的情况 */
 			if (
-				Response["response"] == null &&
-				typeof Response["responseText"] === "string" &&
-				Response["responseText"].trim() !== ""
+				originResponse["response"] == null &&
+				typeof originResponse["responseText"] === "string" &&
+				originResponse["responseText"].trim() !== ""
 			) {
-				let newResponse = Response["responseText"];
+				/** 原始的请求text */
+				let httpxResponseText = originResponse.responseText;
+				// 自定义个新的response
+				let httpxResponse: any = httpxResponseText;
 				if (details.responseType === "json") {
-					(newResponse as any) = Utils.toJSON(Response["responseText"]);
+					httpxResponse = Utils.toJSON(httpxResponseText);
 				} else if (details.responseType === "document") {
 					let parser = new DOMParser();
-					(newResponse as any) = parser.parseFromString(
-						Response["responseText"],
+					httpxResponse = parser.parseFromString(
+						httpxResponseText,
 						"text/html"
 					);
 				} else if (details.responseType === "arraybuffer") {
 					let encoder = new TextEncoder();
-					let arrayBuffer = encoder.encode(Response["responseText"]);
-					(newResponse as any) = arrayBuffer;
+					let arrayBuffer = encoder.encode(httpxResponseText);
+					httpxResponse = arrayBuffer;
 				} else if (details.responseType === "blob") {
 					let encoder = new TextEncoder();
-					let arrayBuffer = encoder.encode(Response["responseText"]);
-					(newResponse as any) = new Blob([arrayBuffer]);
-				} else {
-					newResponse = Response["responseText"];
+					let arrayBuffer = encoder.encode(httpxResponseText);
+					httpxResponse = new Blob([arrayBuffer]);
 				}
+				// 尝试覆盖原response
 				try {
-					Response["response"] = newResponse;
+					let setStatus = Reflect.set(
+						originResponse,
+						"response",
+						httpxResponse
+					);
+					if (!setStatus) {
+						console.warn(
+							"[Httpx-HttpxCallBack.oonLoad] 覆盖原始 response 失败，尝试添加新的httpxResponse"
+						);
+						try {
+							Reflect.set(originResponse, "httpxResponse", httpxResponse);
+						} catch (error) {
+							console.warn(
+								"[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖"
+							);
+						}
+					}
 				} catch (error) {
-					console.warn("response 无法被覆盖");
+					console.warn(
+						"[Httpx-HttpxCallBack.oonLoad] 原始 response 无法被覆盖，尝试添加新的httpxResponse"
+					);
+					try {
+						Reflect.set(originResponse, "httpxResponse", httpxResponse);
+					} catch (error) {
+						console.warn(
+							"[Httpx-HttpxCallBack.oonLoad] httpxResponse 无法被覆盖"
+						);
+					}
 				}
 			}
 			/* Stay扩展中没有finalUrl，对应的是responseURL */
-			if (
-				Response["finalUrl"] == null &&
-				(Response as any)["responseURL"] != null
-			) {
-				Response["finalUrl"] = (Response as any)["responseURL"];
+			let originResponseURL = Reflect.get(originResponse, "responseURL");
+			if (originResponse["finalUrl"] == null && originResponseURL != null) {
+				Reflect.set(originResponse, "finalUrl", originResponseURL);
 			}
 
 			/* 状态码2xx都是成功的 */
-			if (Math.floor(Response.status / 100) === 2) {
+			if (Math.floor(originResponse.status / 100) === 2) {
 				if (
 					this.context.HttpxResponseHook.successResponseCallBack(
-						Response,
+						originResponse,
 						details
 					) == null
 				) {
@@ -1957,7 +1984,7 @@ class Httpx {
 				}
 				resolve({
 					status: true,
-					data: Response,
+					data: originResponse,
 					details: details,
 					msg: "请求完毕",
 					type: "onload",
@@ -2007,7 +2034,7 @@ class Httpx {
 		 */
 		request(details: Required<HttpxDetails>) {
 			if (this.context.#LOG_DETAILS) {
-				console.log("Httpx请求配置👇", details);
+				console.log("[Httpx-HttpxRequest.request] 请求前的配置👇", details);
 			}
 			if (
 				typeof this.context.HttpxRequestHook.beforeRequestCallBack ===
@@ -2047,37 +2074,43 @@ class Httpx {
 			abortController: AbortController
 		) {
 			fetch(details.url, fetchRequestInit)
-				.then(async (resp) => {
-					/**
-					 * @type {HttpxAsyncResultData}
-					 */
-					let httpxResponse = {
+				.then(async (fetchResponse) => {
+					/** 自定义的response */
+					let httpxResponse: HttpxAsyncResultData = {
 						isFetch: true,
-						finalUrl: resp.url,
+						finalUrl: fetchResponse.url,
 						readyState: 4,
-						status: resp.status,
-						statusText: resp.statusText,
+						// @ts-ignore
+						status: fetchResponse.status,
+						statusText: fetchResponse.statusText,
 						response: void 0,
-						responseFetchHeaders: resp.headers,
+						responseFetchHeaders: fetchResponse.headers,
 						responseHeaders: "",
+						// @ts-ignore
 						responseText: void 0,
 						responseType: details.responseType,
 						responseXML: void 0,
 					};
 					Object.assign(httpxResponse, details.context || {});
 
-					for (const [key, value] of (resp.headers as any).entries()) {
+					// 把headers转为字符串
+					for (const [key, value] of (fetchResponse.headers as any).entries()) {
 						httpxResponse.responseHeaders += `${key}: ${value}\n`;
 					}
 
-					/* 如果是流式传输，直接返回 */
+					/** 请求返回的类型 */
+					const fetchResponseType = fetchResponse.headers.get("Content-Type");
+
+					/* 如果需要stream，且获取到的是stream，那直接返回 */
 					if (
 						details.responseType === "stream" ||
-						(resp.headers.has("Content-Type") &&
-							resp.headers.get("Content-Type")!.includes("text/event-stream"))
+						(fetchResponse.headers.has("Content-Type") &&
+							fetchResponse.headers
+								.get("Content-Type")!
+								.includes("text/event-stream"))
 					) {
-						(httpxResponse as any)["isStream"] = true;
-						(httpxResponse as any).response = resp.body;
+						Reflect.set(httpxResponse, "isStream", true);
+						Reflect.set(httpxResponse, "response", fetchResponse.body);
 						Reflect.deleteProperty(httpxResponse, "responseText");
 						Reflect.deleteProperty(httpxResponse, "responseXML");
 						details.onload(httpxResponse);
@@ -2085,57 +2118,67 @@ class Httpx {
 					}
 
 					/** 响应 */
-					let response = "";
+					let response: any = "";
 					/** 响应字符串 */
 					let responseText = "";
 					/** 响应xml文档 */
-					let responseXML = "";
-
-					let arrayBuffer = await resp.arrayBuffer();
+					let responseXML: XMLDocument | string = "";
+					/** 先获取二进制数据 */
+					let arrayBuffer = await fetchResponse.arrayBuffer();
 
+					/** 数据编码 */
 					let encoding = "utf-8";
-					if (resp.headers.has("Content-Type")) {
-						let charsetMatched = resp.headers
+					if (fetchResponse.headers.has("Content-Type")) {
+						let charsetMatched = fetchResponse.headers
 							.get("Content-Type")
 							?.match(/charset=(.+)/);
 						if (charsetMatched) {
 							encoding = charsetMatched[1];
+							encoding = encoding.toLowerCase();
 						}
 					}
+					// Failed to construct 'TextDecoder': The encoding label provided ('"UTF-8"') is invalid.
+					// 去除引号
+					encoding = encoding.replace(/('|")/gi, "");
+					// 编码
 					let textDecoder = new TextDecoder(encoding);
 					responseText = textDecoder.decode(arrayBuffer);
 					response = responseText;
 
 					if (details.responseType === "arraybuffer") {
-						(response as any) = arrayBuffer;
+						// response返回格式是二进制流
+						response = arrayBuffer;
 					} else if (details.responseType === "blob") {
-						(response as any) = new Blob([arrayBuffer as any]);
+						// response返回格式是blob
+						response = new Blob([arrayBuffer]);
+					} else if (
+						details.responseType === "json" ||
+						(typeof fetchResponseType === "string" &&
+							fetchResponseType.includes("application/json"))
+					) {
+						// response返回格式是JSON格式
+						response = Utils.toJSON(responseText);
 					} else if (
 						details.responseType === "document" ||
 						details.responseType == null
 					) {
+						// response返回格式是文档格式
 						let parser = new DOMParser();
-						(response as any) = parser.parseFromString(
-							responseText,
-							"text/html"
-						);
-					} else if (details.responseType === "json") {
-						(response as any) = Utils.toJSON(responseText);
+						response = parser.parseFromString(responseText, "text/html");
 					}
+					// 转为XML结构
 					let parser = new DOMParser();
-					(responseXML as any) = parser.parseFromString(
-						responseText,
-						"text/xml"
-					);
+					responseXML = parser.parseFromString(responseText, "text/xml");
 
-					(httpxResponse as any).response = response;
-					(httpxResponse as any).responseText = responseText;
-					(httpxResponse as any).responseXML = responseXML;
+					Reflect.set(httpxResponse, "response", response);
+					Reflect.set(httpxResponse, "responseText", responseText);
+					Reflect.set(httpxResponse, "responseXML", responseXML);
 
+					// 执行回调
 					details.onload(httpxResponse);
 				})
-				.catch((err) => {
-					if (err.name === "AbortError") {
+				.catch((error: any) => {
+					if (error.name === "AbortError") {
 						return;
 					}
 					details.onerror({
@@ -2146,7 +2189,7 @@ class Httpx {
 						statusText: "",
 						responseHeaders: "",
 						responseText: "",
-						error: err,
+						error: error,
 					});
 				});
 			details.onloadstart({
@@ -2210,7 +2253,7 @@ class Httpx {
 	constructor(__xmlHttpRequest__?: any) {
 		if (typeof __xmlHttpRequest__ !== "function") {
 			console.warn(
-				"Httpx未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，强制使用window.fetch"
+				"[Httpx-constructor] 未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，将默认使用window.fetch"
 			);
 		}
 		this.interceptors.request.context = this as any;

package/src/Utils.ts

@@ -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);
+					})
+			);
+		}
 	}
 	/**
 	 * 等待函数数组全部执行完毕，注意，每个函数的顺序不是同步