@whitesev/utils 2.9.8 → 2.9.10

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

@@ -1,4 +1,4 @@
-import type { HttpxHookErrorData, HttpxRequestOption, HttpxResponse, HttpxResponseData, HttpxPromise, HttpxInitOption } from "./types/Httpx";
+import type { HttpxHookErrorData, HttpxInitOption, HttpxPromise, HttpxRequestOption, HttpxResponse, HttpxResponseData } from "./types/Httpx";
 export declare class Httpx {
     #private;
     private GM_Api;

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

@@ -24,8 +24,7 @@ export declare class Log {
     /**
      * 输出内容
      * @param msg 需要输出的内容
-     * @param color 颜色
-     * @param otherStyle 其它CSS
+     * @param tagColor tag颜色
      */
     private printContent;
     /**

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

@@ -1,20 +1,20 @@
 import { ColorConversion } from "./ColorConversion";
+import { UtilsDictionary } from "./Dictionary";
 import { GBKEncoder } from "./GBKEncoder";
-import { UtilsGMCookie } from "./UtilsGMCookie";
-import { GMMenu } from "./UtilsGMMenu";
 import { Hooks } from "./Hooks";
 import { Httpx } from "./Httpx";
 import { indexedDB } from "./indexedDB";
 import { LockFunction } from "./LockFunction";
 import { Log } from "./Log";
+import { ModuleRaid } from "./ModuleRaid";
 import { Progress } from "./Progress";
-import { UtilsDictionary } from "./Dictionary";
 import type { UtilsAjaxHookResult } from "./types/ajaxHooker";
-import { Vue } from "./Vue";
 import { type ArgsType, type JSTypeNames, type UtilsOwnObject } from "./types/global";
-import type { WindowApiOption } from "./types/WindowApi";
-import { ModuleRaid } from "./ModuleRaid";
 import type { ReactInstance } from "./types/React";
+import type { WindowApiOption } from "./types/WindowApi";
+import { UtilsGMCookie } from "./UtilsGMCookie";
+import { GMMenu } from "./UtilsGMMenu";
+import { Vue } from "./Vue";
 declare class Utils {
     private windowApi;
     constructor(option?: WindowApiOption);
@@ -616,43 +616,43 @@ declare class Utils {
        **/
     Hooks: typeof Hooks;
     /**
-       * 为减少代码量和回调，把GM_xmlhttpRequest封装
-       * 文档地址: https://www.tampermonkey.net/documentation.php?ext=iikm
-       * 其中onloadstart、onprogress、onreadystatechange是回调形式，onabort、ontimeout、onerror可以设置全局回调函数
-       * @param _GM_xmlHttpRequest_ 油猴中的GM_xmlhttpRequest
-       * @example
-        let httpx = new Utils.Httpx(GM_xmlhttpRequest);
-        let postResp = await httpx.post({
-          url:url,
-          data:JSON.stringify({
-            test:1
-          }),
-          timeout: 5000
-        });
-        console.log(postResp);
-        > {
-          status: true,
-          data: {responseText: "...", response: xxx,...},
-          msg: "请求完毕",
-          type: "onload",
-        }
-    
-        if(postResp === "onload" && postResp.status){
-        // onload
-        }else if(postResp === "ontimeout"){
-        // ontimeout
-        }
-       * @example
-        // 也可以先配置全局参数
-        let httpx = new Utils.Httpx(GM_xmlhttpRequest);
-        httpx.config({
-          timeout: 5000,
-          async: false,
-          responseType: "html",
-          redirect: "follow",
-        })
-        // 优先级为 默认details < 全局details < 单独的details
-       */
+     * 为减少代码量和回调，把GM_xmlhttpRequest封装
+     * 文档地址: https://www.tampermonkey.net/documentation.php?ext=iikm
+     * 其中onloadstart、onprogress、onreadystatechange是回调形式，onabort、ontimeout、onerror可以设置全局回调函数
+     * @param _GM_xmlHttpRequest_ 油猴中的GM_xmlhttpRequest
+     * @example
+      let httpx = new Utils.Httpx(GM_xmlhttpRequest);
+      let postResp = await httpx.post({
+        url:url,
+        data:JSON.stringify({
+          test:1
+        }),
+        timeout: 5000
+      });
+      console.log(postResp);
+      > {
+        status: true,
+        data: {responseText: "...", response: xxx,...},
+        msg: "请求完毕",
+        type: "onload",
+      }
+  
+      if(postResp === "onload" && postResp.status){
+      // onload
+      }else if(postResp === "ontimeout"){
+      // ontimeout
+      }
+      * @example
+      // 也可以先配置全局参数
+      let httpx = new Utils.Httpx(GM_xmlhttpRequest);
+      httpx.config({
+        timeout: 5000,
+        async: false,
+        responseType: "html",
+        redirect: "follow",
+      })
+      // 优先级为 默认details < 全局details < 单独的details
+      */
     Httpx: typeof Httpx;
     /**
        * 浏览器端的indexedDB操作封装
@@ -1295,7 +1295,7 @@ declare class Utils {
         run<A extends any[], R>(callback: ((...args: A) => R) | string | ((...args: any[]) => any), __context__?: any): import("./types/TryCatch").UtilsTryCatchType;
     };
     /**
-     * 数组去重，去除重复的值
+     * 数组去重，去除重复的值，返回新的数组（不修改原数组）
      * @param uniqueArrayData 需要去重的数组
      * @param compareArrayData 用来比较的数组
      * @param compareFun 数组比较方法，如果值相同，去除该数据

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

@@ -89,7 +89,9 @@ export declare interface UtilsAjaxHookFilterOptions {
 /** Utils.ajaxHooker */
 export declare interface UtilsAjaxHookResult {
   /**
-     * 劫持
+     * 劫持xhr和fetch
+     * 
+     * 提示：如果多次调用.hook方法，将会多次处理同一个请求
      * @example
         ajaxHooker.hook(request => {
             if (request.url === 'https://www.example.com/') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.9.8",
+  "version": "2.9.10",
   "type": "module",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
@@ -36,27 +36,29 @@
   "author": "WhiteSev",
   "license": "MIT",
   "dependencies": {
-    "worker-timers": "^8.0.25"
+    "worker-timers": "^8.0.26"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.39.2",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
-    "browserslist": "^4.28.0",
-    "caniuse-lite": "^1.0.30001756",
-    "eslint": "^9.39.1",
+    "@types/node": "^25.0.3",
+    "browserslist": "^4.28.1",
+    "caniuse-lite": "^1.0.30001760",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-prettier": "^5.5.4",
     "globals": "^16.5.0",
-    "rollup": "^4.53.3",
+    "rolldown": "1.0.0-beta.55",
+    "rollup": "^4.53.5",
     "rollup-plugin-clear": "^2.0.7",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.47.0"
+    "typescript-eslint": "^8.50.0"
   },
   "scripts": {
     "lint": "eslint .",

package/src/Dictionary.ts

@@ -114,13 +114,23 @@ export class UtilsDictionary<K, V> {
    * 获取字典所有的键
    */
   keys(): K[] {
-    return Array.from(this.items.keys());
+    const keys = this.items.keys();
+    if (typeof keys.toArray === "function") {
+      return keys.toArray();
+    } else {
+      return [...keys];
+    }
   }
   /**
    * 返回字典中的所有值
    */
   values(): V[] {
-    return Array.from(this.items.values());
+    const values = this.items.values();
+    if (typeof values.toArray === "function") {
+      return values.toArray();
+    } else {
+      return [...values];
+    }
   }
   /**
    * 清空字典

package/src/Httpx.ts

@@ -3,12 +3,12 @@ import { TryCatch } from "./TryCatch";
 import type {
   HttpxAllowInterceptConfig,
   HttpxHookErrorData,
+  HttpxInitOption,
   HttpxMethod,
+  HttpxPromise,
   HttpxRequestOption,
   HttpxResponse,
   HttpxResponseData,
-  HttpxPromise,
-  HttpxInitOption,
 } from "./types/Httpx";
 import { GenerateUUID } from "./UtilsCommon";
 

package/src/Log.ts

@@ -12,23 +12,22 @@ export class Log {
   /* 配置 */
   #details: UtilsLogOptions = {
     tag: true,
-    successColor: "#0000FF",
-    errorColor: "#FF0000",
-    infoColor: "0",
-    warnColor: "0",
+    successColor: "background: #0eac0eff;",
+    errorColor: "background: #FF0000;",
+    infoColor: "background: #6495ed;",
+    warnColor: "background: #ff8c00;",
     debug: false,
     autoClearConsole: false,
     logMaxCount: 999,
   };
   /**
-   * 颜色配置
+   * 通用样式配置
    */
-  #msgColorDetails = [
-    "font-weight: bold; color: cornflowerblue",
-    "font-weight: bold; color: cornflowerblue",
-    "font-weight: bold; color: darkorange",
-    "font-weight: bold; color: cornflowerblue",
-  ];
+  #commonStyleConfig = {
+    commonStyle: "color: #ffffff; padding: 3px; border-radius: 3px;line-height: 1;margin-right: 6px;",
+    tagStyle: "background: #6495ed;",
+    callerNameStyle: "background: #78909C;",
+  };
   /**
    * @param __GM_info 油猴管理器的API GM_info，或者是一个对象，如{"script":{name:"Utils.Log"}}，或者直接是一个字符串，用作tag名
    * @param console 可指定console对象为unsafeWindow下的console或者是油猴window下的console
@@ -112,61 +111,36 @@ export class Log {
   /**
    * 输出内容
    * @param msg 需要输出的内容
-   * @param color 颜色
-   * @param otherStyle 其它CSS
+   * @param tagColor tag颜色
    */
-  private printContent(msg: any[], color: string, otherStyle?: string) {
+  private printContent(msg: any[], tagColor?: string) {
     this.checkClearConsole();
-    otherStyle = otherStyle || "";
     const stackSplit = new Error()!.stack!.split("\n");
     stackSplit.splice(0, 2);
     const { name: callerName, position: callerPosition } = this.parseErrorStack(stackSplit);
     const tagName = this.tag;
     const that = this;
 
+    const msgColorDetails: string[] = [];
+    // 控制台输出的tag的html格式
+    let consoleHTML = `%c${tagName}`;
     /** tag的html输出格式 */
-    const tagNameHTML = `%c[${tagName}%c`;
-    /** 调用的函数名的html输出格式 */
-    let callerNameHTML = `%c${callerName}%c]%c`;
-    if (callerName.trim() === "") {
-      callerNameHTML = `-${callerNameHTML}`;
+    if (typeof tagColor === "string" && tagColor.trim() !== "") {
+      msgColorDetails.push(that.#commonStyleConfig.commonStyle + tagColor);
+    } else {
+      msgColorDetails.push(that.#commonStyleConfig.commonStyle + that.#commonStyleConfig.tagStyle);
     }
-    /**
-     * 输出消息到控制台
-     * @param message
-     */
-    function consoleMsg(message: any) {
-      if (typeof message === "string") {
-        that.#console.log(
-          `${tagNameHTML}${callerNameHTML} %s`,
-          ...that.#msgColorDetails,
-          `color: ${color};${otherStyle}`,
-          message
-        );
-      } else if (typeof message === "number") {
-        that.#console.log(
-          `${tagNameHTML}${callerNameHTML} %d`,
-          ...that.#msgColorDetails,
-          `color: ${color};${otherStyle}`,
-          message
-        );
-      } else if (typeof message === "object") {
-        that.#console.log(
-          `${tagNameHTML}${callerNameHTML} %o`,
-          ...that.#msgColorDetails,
-          `color: ${color};${otherStyle}`,
-          message
-        );
-      } else {
-        that.#console.log(message);
-      }
+    // 调用的函数名的html输出格式
+    if (callerName.trim() == "") {
+      // 无调用函数名
+    } else {
+      consoleHTML = `${consoleHTML}%c${callerName}`;
+      msgColorDetails.push(that.#commonStyleConfig.commonStyle + that.#commonStyleConfig.callerNameStyle);
     }
     if (Array.isArray(msg)) {
-      for (let index = 0; index < msg.length; index++) {
-        consoleMsg(msg[index]);
-      }
+      that.#console.log(`${consoleHTML}`, ...msgColorDetails, ...msg);
     } else {
-      consoleMsg(msg);
+      that.#console.log(`${consoleHTML}`, ...msgColorDetails, msg);
     }
     if (this.#details.debug) {
       /* 如果开启调试模式，输出堆栈位置 */
@@ -191,7 +165,8 @@ export class Log {
    */
   warn(...args: any[]) {
     if (this.#disable) return;
-    this.printContent(args, this.#details.warnColor, "background: #FEF6D5;padding: 4px 6px 4px 0px;");
+    // , "background: #FEF6D5;padding: 4px 6px 4px 0px;"
+    this.printContent(args, this.#details.warnColor);
   }
   /**
    * 控制台-错误输出
@@ -230,11 +205,11 @@ export class Log {
     /** 堆栈位置 */
     const stackFunctionNamePosition = errorStackParse.position;
     const callerName = stackFunctionName;
-    this.#console.log(
-      `%c[${this.tag}%c-%c${callerName}%c]%c`,
-      ...this.#msgColorDetails,
-      `color: ${this.#details.infoColor};`
-    );
+    const msgColorDetails: string[] = [
+      `${this.#commonStyleConfig.commonStyle + this.#details.infoColor}`,
+      `${this.#commonStyleConfig.commonStyle + this.#commonStyleConfig.callerNameStyle}`,
+    ];
+    this.#console.log(`%c${this.tag}%c${callerName}%c`, msgColorDetails);
     this.#console.table(msg);
     if (this.#details.debug) {
       this.#console.log(stackFunctionNamePosition);

package/src/Utils.ts

@@ -1,34 +1,34 @@
-import { ColorConversion } from "./ColorConversion";
-import { GBKEncoder } from "./GBKEncoder";
-import { UtilsGMCookie } from "./UtilsGMCookie";
+import {
+  clearInterval as WorkerClearInterval,
+  clearTimeout as WorkerClearTimeout,
+  setInterval as WorkerSetInterval,
+  setTimeout as WorkerSetTimeout,
+} from "worker-timers";
+import { version } from "./../package.json";
 import { ajaxHooker } from "./ajaxHooker/ajaxHooker.js";
 import { AjaxHooker1_2_4 } from "./ajaxHooker/ajaxHooker1.2.4";
-import { GMMenu } from "./UtilsGMMenu";
+import { ColorConversion } from "./ColorConversion";
+import { CommonUtil } from "./CommonUtil";
+import { UtilsDictionary } from "./Dictionary";
+import { domUtils } from "./DOMUtils";
+import { GBKEncoder } from "./GBKEncoder";
 import { Hooks } from "./Hooks";
 import { Httpx } from "./Httpx";
 import { indexedDB } from "./indexedDB";
 import { LockFunction } from "./LockFunction";
 import { Log } from "./Log";
+import { ModuleRaid } from "./ModuleRaid";
 import { Progress } from "./Progress";
 import { TryCatch } from "./TryCatch";
-import { UtilsDictionary } from "./Dictionary";
 import type { UtilsAjaxHookResult } from "./types/ajaxHooker";
-import { GenerateUUID } from "./UtilsCommon";
-import { WindowApi } from "./WindowApi";
-import { Vue } from "./Vue";
 import { type ArgsType, type JSTypeNames, type UtilsOwnObject } from "./types/global";
-import type { WindowApiOption } from "./types/WindowApi";
-import {
-  clearInterval as WorkerClearInterval,
-  clearTimeout as WorkerClearTimeout,
-  setInterval as WorkerSetInterval,
-  setTimeout as WorkerSetTimeout,
-} from "worker-timers";
-import { ModuleRaid } from "./ModuleRaid";
-import { domUtils } from "./DOMUtils";
-import { CommonUtil } from "./CommonUtil";
 import type { ReactInstance } from "./types/React";
-import { version } from "./../package.json";
+import type { WindowApiOption } from "./types/WindowApi";
+import { GenerateUUID } from "./UtilsCommon";
+import { UtilsGMCookie } from "./UtilsGMCookie";
+import { GMMenu } from "./UtilsGMMenu";
+import { Vue } from "./Vue";
+import { WindowApi } from "./WindowApi";
 
 class Utils {
   private windowApi: typeof WindowApi.prototype;
@@ -1293,43 +1293,43 @@ class Utils {
   Hooks = Hooks;
 
   /**
-     * 为减少代码量和回调，把GM_xmlhttpRequest封装
-     * 文档地址: https://www.tampermonkey.net/documentation.php?ext=iikm
-     * 其中onloadstart、onprogress、onreadystatechange是回调形式，onabort、ontimeout、onerror可以设置全局回调函数
-     * @param _GM_xmlHttpRequest_ 油猴中的GM_xmlhttpRequest
-     * @example
-      let httpx = new Utils.Httpx(GM_xmlhttpRequest);
-      let postResp = await httpx.post({
-        url:url,
-        data:JSON.stringify({
-          test:1
-        }),
-        timeout: 5000
-      });
-      console.log(postResp);
-      > {
-        status: true,
-        data: {responseText: "...", response: xxx,...},
-        msg: "请求完毕",
-        type: "onload",
-      }
-  
-      if(postResp === "onload" && postResp.status){
-      // onload
-      }else if(postResp === "ontimeout"){
-      // ontimeout
-      }
-     * @example
-      // 也可以先配置全局参数
-      let httpx = new Utils.Httpx(GM_xmlhttpRequest);
-      httpx.config({
-        timeout: 5000,
-        async: false,
-        responseType: "html",
-        redirect: "follow",
-      })
-      // 优先级为 默认details < 全局details < 单独的details
-     */
+   * 为减少代码量和回调，把GM_xmlhttpRequest封装
+   * 文档地址: https://www.tampermonkey.net/documentation.php?ext=iikm
+   * 其中onloadstart、onprogress、onreadystatechange是回调形式，onabort、ontimeout、onerror可以设置全局回调函数
+   * @param _GM_xmlHttpRequest_ 油猴中的GM_xmlhttpRequest
+   * @example
+    let httpx = new Utils.Httpx(GM_xmlhttpRequest);
+    let postResp = await httpx.post({
+      url:url,
+      data:JSON.stringify({
+        test:1
+      }),
+      timeout: 5000
+    });
+    console.log(postResp);
+    > {
+      status: true,
+      data: {responseText: "...", response: xxx,...},
+      msg: "请求完毕",
+      type: "onload",
+    }
+
+    if(postResp === "onload" && postResp.status){
+    // onload
+    }else if(postResp === "ontimeout"){
+    // ontimeout
+    }
+    * @example
+    // 也可以先配置全局参数
+    let httpx = new Utils.Httpx(GM_xmlhttpRequest);
+    httpx.config({
+      timeout: 5000,
+      async: false,
+      responseType: "html",
+      redirect: "follow",
+    })
+    // 优先级为 默认details < 全局details < 单独的details
+    */
   Httpx = Httpx;
   /**
      * 浏览器端的indexedDB操作封装
@@ -3209,7 +3209,7 @@ class Utils {
    */
   tryCatch = TryCatch;
   /**
-   * 数组去重，去除重复的值
+   * 数组去重，去除重复的值，返回新的数组（不修改原数组）
    * @param uniqueArrayData 需要去重的数组
    * @param compareArrayData 用来比较的数组
    * @param compareFun 数组比较方法，如果值相同，去除该数据

package/src/types/ajaxHooker.d.ts

@@ -89,7 +89,9 @@ export declare interface UtilsAjaxHookFilterOptions {
 /** Utils.ajaxHooker */
 export declare interface UtilsAjaxHookResult {
   /**
-     * 劫持
+     * 劫持xhr和fetch
+     * 
+     * 提示：如果多次调用.hook方法，将会多次处理同一个请求
      * @example
         ajaxHooker.hook(request => {
             if (request.url === 'https://www.example.com/') {