@whitesev/utils 2.2.9 → 2.3.1

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

@@ -1,4 +1,3 @@
-import { AnyObject } from "./Utils";
 /**
  * 状态码
  * + https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status
@@ -15,7 +14,7 @@ export type HttpxResponseCallBackType = "onload" | "onerror" | "ontimeout" | "on
 export type HttpxResponseMap = {
     arraybuffer: ArrayBuffer;
     blob: Blob;
-    json: AnyObject;
+    json: any;
     stream: ReadableStream<string>;
     document: Document;
     undefined: string;
@@ -965,7 +964,7 @@ export declare interface HttpxDetails {
     /**
      * 将该对象添加到响应的属性中，可为空
      */
-    context?: AnyObject;
+    context?: any;
     /**
      * 重写mimeType，可为空
      */

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

@@ -1,4 +1,3 @@
-import type { AnyObject } from "./Utils";
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
     /** 是否输出Tag，false的话其它的颜色也不输出，默认为true */
@@ -83,7 +82,7 @@ declare class Log {
      * @example
      * log.table([{"名字":"example","值":"123"},{"名字":"example2","值":"345"}])
      */
-    table(msg: AnyObject[], color?: string, otherStyle?: string): void;
+    table(msg: any[], color?: string, otherStyle?: string): void;
     /**
      * 配置Log对象的颜色
      * @param paramDetails 配置信息

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

@@ -13,6 +13,7 @@ import type { DOMUtils_EventType } from "./Event";
 import type { Vue2Object } from "./VueObject";
 import type { UtilsAjaxHookResult } from "./AjaxHookerType";
 import { type UtilsWindowApiOption } from "./WindowApi";
+import { Vue } from "./Vue";
 export declare var unsafeWindow: Window & typeof globalThis;
 export type JSTypeMap = {
     string: string;
@@ -546,12 +547,12 @@ declare class Utils {
      * Utils.getReactObj(document.querySelector("input"))?.reactProps?.onChange({target:{value:"123"}});
      */
     getReactObj(element: HTMLElement | Element): {
-        reactFiber?: AnyObject;
-        reactProps?: AnyObject;
-        reactEvents?: AnyObject;
-        reactEventHandlers?: AnyObject;
-        reactInternalInstance?: AnyObject;
-        reactContainer?: AnyObject;
+        reactFiber?: any;
+        reactProps?: any;
+        reactEvents?: any;
+        reactEventHandlers?: any;
+        reactInternalInstance?: any;
+        reactContainer?: any;
     };
     /**
      * 获取对象上的Symbol属性，如果没设置keyName，那么返回一个对象，对象是所有遍历到的Symbol对象
@@ -958,7 +959,7 @@ declare class Utils {
      * Utils.parseObjectToArray({"工具类":"jsonToArray","return","Array"});
      * > ['jsonToArray', 'Array']
      **/
-    parseObjectToArray(target: AnyObject): any;
+    parseObjectToArray(target: any): any;
     /**
      * 自动锁对象，用于循环判断运行的函数，在循环外new后使用，注意，如果函数内部存在异步操作，需要使用await
      * @example
@@ -1660,7 +1661,7 @@ declare class Utils {
      * > "test success set"
      *
      */
-    waitProperty<T extends any>(checkObj: AnyObject | (() => AnyObject), checkPropertyName: string): Promise<T>;
+    waitProperty<T extends any>(checkObj: any | (() => any), checkPropertyName: string): Promise<T>;
     /**
      * 在规定时间内等待对象上的属性出现
      * @param checkObj 检查的对象
@@ -1671,7 +1672,7 @@ declare class Utils {
      * await Utils.waitPropertyByInterval(window,"test");
      * console.log("test success set");
      */
-    waitPropertyByInterval<T extends any>(checkObj: AnyObject | (() => AnyObject), checkPropertyName: string | ((obj: any) => boolean), intervalTimer?: number, maxTime?: number): Promise<T>;
+    waitPropertyByInterval<T extends any>(checkObj: any | (() => any), checkPropertyName: string | ((obj: any) => boolean), intervalTimer?: number, maxTime?: number): Promise<T>;
     /**
      * 在规定时间内等待元素上的__vue__属性或者__vue__属性上的某个值出现出现
      * @param element 目标元素
@@ -1707,7 +1708,7 @@ declare class Utils {
      * console.log(window.test);
      * > 111;
      */
-    watchObject(target: AnyObject, propertyName: string, getCallBack: (value: any) => void, setCallBack: (value: any) => void): void;
+    watchObject(target: any, propertyName: string, getCallBack: (value: any) => void, setCallBack: (value: any) => void): void;
     /**
      * 创建一个新的Utils实例
      * @param option
@@ -1742,6 +1743,10 @@ declare class Utils {
      * Utils.generateUUID()
      */
     generateUUID: () => string;
+    /**
+     * 自定义的动态响应对象
+     */
+    Vue: typeof Vue;
 }
 declare let utils: Utils;
 export { utils as Utils };

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

@@ -0,0 +1,43 @@
+declare class RefImpl {
+    _value: any;
+    _isRef: boolean;
+    _rawValue: any;
+    _vue: Vue;
+    constructor(vueIns: Vue, rawValue: any);
+    get value(): any;
+    set value(newValue: any);
+}
+declare class ObjectRefImpl {
+    object: any;
+    key: any;
+    constructor(object: any, key: any);
+    get value(): any;
+    set value(newValue: any);
+}
+export declare class Vue {
+    private reactMap;
+    private targetMap;
+    private activeEffect;
+    constructor();
+    /**
+     * 生成一个被代理的对象
+     * @param target 需要代理的对象
+     */
+    reactive<T extends object>(target: T): T;
+    /**
+     * 观察被reactive的对象值改变
+     * @param source 被观察的对象，这里采用函数返回对象
+     * @param changeCallBack 值改变的回调
+     */
+    watch<T>(source: () => T, changeCallBack: (newValue: T | undefined, oldValue: T | undefined) => void): void;
+    toReactive(value: any): any;
+    ref(value: any): RefImpl;
+    toRef(object: any, key: any): ObjectRefImpl;
+    toRefs(object: any): {};
+    private trigger;
+    private triggerEffect;
+    private track;
+    private trackEffect;
+    private traversal;
+}
+export {};

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

@@ -1,49 +1,48 @@
-import type { AnyObject } from "./Utils";
-export declare interface Vue2Object extends AnyObject {
-    $attrs: AnyObject;
+export declare interface Vue2Object {
+    $attrs: any;
     $children: Vue2Object[];
     $createElement: (...args: any[]) => any;
     $el: HTMLElement;
-    $listeners: AnyObject;
-    $options: AnyObject;
+    $listeners: any;
+    $options: any;
     $parent: Vue2Object;
-    $refs: AnyObject;
+    $refs: any;
     $root: Vue2Object;
-    $scopedSlots: AnyObject;
-    $slots: AnyObject;
-    $store: AnyObject;
-    $vnode: AnyObject;
-    _data: AnyObject;
+    $scopedSlots: any;
+    $slots: any;
+    $store: any;
+    $vnode: any;
+    _data: any;
     _directInactive: boolean;
-    _events: AnyObject;
+    _events: any;
     _hasHookEvent: boolean;
     _isBeingDestroyed: boolean;
     _isDestroyed: boolean;
     _isMounted: boolean;
     _isVue: boolean;
-    $data: AnyObject;
+    $data: any;
     $isServer: boolean;
-    $props: AnyObject;
-    $route: AnyObject & {
+    $props: any;
+    $route: any & {
         fullPath: string;
         hash: string;
-        matched: AnyObject[];
-        meta: AnyObject;
+        matched: any[];
+        meta: any;
         name: string;
-        params: AnyObject;
+        params: any;
         path: string;
-        query: AnyObject;
+        query: any;
     };
-    $router: AnyObject & {
+    $router: any & {
         afterHooks: Function[];
         app: Vue2Object;
         apps: Vue2Object[];
         beforeHooks: Function[];
         fallback: boolean;
-        history: AnyObject & {
+        history: any & {
             base: string;
-            current: AnyObject;
-            listeners: AnyObject[];
+            current: any;
+            listeners: any[];
             router: Vue2Object["$router"];
             /**
              *
@@ -58,16 +57,16 @@ export declare interface Vue2Object extends AnyObject {
              * @param data 可选的 HistoryState 以关联该导航记录
              * @returns
              */
-            push: (to: string, data?: AnyObject) => void;
+            push: (to: string, data?: any) => void;
             /**
              *
              * @param to 要设置的地址
              * @param data 可选的 HistoryState 以关联该导航记录
              * @returns
              */
-            replace: (to: string, data?: AnyObject) => void;
+            replace: (to: string, data?: any) => void;
         };
-        matcher: AnyObject & {
+        matcher: any & {
             addRoute: (...args: any[]) => any;
             addRoutes: (...args: any[]) => any;
             getRoutes: () => any;
@@ -75,7 +74,7 @@ export declare interface Vue2Object extends AnyObject {
         };
         mode: string;
         resolveHooks: ((...args: any[]) => any)[];
-        currentRoute: AnyObject;
+        currentRoute: any;
         beforeEach: (callback: ((
         /** 即将要进入的目标 路由对象 */
         to: Vue2Object["$route"], 
@@ -99,11 +98,12 @@ export declare interface Vue2Object extends AnyObject {
         /** 移除上一个添加的监听 */
          | (() => void)) => void;
     };
-    $ssrContext: AnyObject;
+    $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.2.9",
+  "version": "2.3.1",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -44,6 +44,7 @@
     "typescript": "^5.5.4"
   },
   "scripts": {
+    "dev": "rollup --config --watch",
     "build": "rollup --config",
     "build:all": "rollup --config"
   }

package/src/Httpx.ts

@@ -1,4 +1,4 @@
-import { AnyObject, Utils } from "./Utils";
+import { Utils } from "./Utils";
 import { GenerateUUID } from "./UtilsCommon";
 
 /**
@@ -98,7 +98,7 @@ export type HttpxResponseCallBackType =
 export type HttpxResponseMap = {
 	arraybuffer: ArrayBuffer;
 	blob: Blob;
-	json: AnyObject;
+	json: any;
 	stream: ReadableStream<string>;
 	document: Document;
 	undefined: string;
@@ -1062,7 +1062,7 @@ export declare interface HttpxDetails {
 	/**
 	 * 将该对象添加到响应的属性中，可为空
 	 */
-	context?: AnyObject;
+	context?: any;
 	/**
 	 * 重写mimeType，可为空
 	 */
@@ -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/Log.ts

@@ -1,4 +1,3 @@
-import type { AnyObject } from "./Utils";
 
 /** Utils.Log的初始化配置 */
 declare interface UtilsLogOptions {
@@ -245,7 +244,7 @@ class Log {
 	 * @example
 	 * log.table([{"名字":"example","值":"123"},{"名字":"example2","值":"345"}])
 	 */
-	table(msg: AnyObject[], color = this.#details.infoColor, otherStyle = "") {
+	table(msg: any[], color = this.#details.infoColor, otherStyle = "") {
 		if (this.#disable) return;
 		this.checkClearConsole();
 		let stack = new Error()!.stack!.split("\n");