gzjs-utils 1.0.18 → 1.0.21

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "gzjs-utils",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "description": "smart js utils",
   "main": "lib/index.js",
   "typings": "types/index.d.ts",
   "scripts": {
-    "dev": "npx webpack serve",
+    "dev": "npx nodemon",
     "build": "cross-env NODE_ENV=production webpack",
     "test": ""
   },

package/types/index.d.ts

@@ -1,26 +1,2 @@
-import { Utils } from "./utils/Utils";
-import { WebRTCIP } from "./utils/WebRTCIP";
-import { Bytes } from "./utils/Bytes";
-import { Base64 } from "./utils/Base64";
-import { MD5 } from "./utils/MD5";
-import { Env } from "./utils/Env";
-import EnumBuilder from "./utils/EnumBuilder";
-import { AES } from "./utils/AES";
-import _Hmac_ from "./utils/Hmac";
-import _SHA_ from "./utils/SHA";
-import { KeyTool } from "./utils/types/KeyTool";
-export type GzjsUtils = Utils & WebRTCIP & {
-    Bytes: Bytes;
-    Base64: Base64;
-    Utils: Utils;
-    MD5: MD5;
-    AES: AES;
-    Hmac: typeof _Hmac_;
-    SHA: typeof _SHA_;
-    EnumBuilder: typeof EnumBuilder;
-    KeyTool: KeyTool;
-    getEnvironments(): Env;
-    version: string;
-};
-declare const JsUtils: GzjsUtils;
-export default JsUtils;
+import _JsUtils_ from "./utils";
+export default _JsUtils_;

package/types/utils/AES.d.ts

@@ -1,4 +1,22 @@
-import { Options } from "./types/AesType";
+export type IV = number[] | string | Uint8Array | Int8Array;
+export type Options = {
+    /**
+     * 填充方式 pck7padding
+     */
+    padding?: string | "PKCS#5" | "PKCS#7" | "NoPadding" | "PKCS5Padding" | "PKCS7Padding" | "pkcs5padding" | "pkcs7padding";
+    /**
+     * 16 bytes iv
+     */
+    iv?: IV;
+    /**
+     * 分段大小
+     */
+    segmentSize?: number;
+    /**
+     * CTR 模式参数 向量初始值
+     */
+    count?: IV | number;
+};
 declare const provders: {
     ECB: {
         /**

package/types/utils/Bytes.d.ts

@@ -60,11 +60,16 @@ declare function toHex(str: string | number | number[] | Int8Array | Uint8Array)
  * @param hexs
  */
 declare function fromHex(hexs: string): Int8Array;
+/**
+ * 十六进制字符串转String
+ * @param hex
+ */
+declare function hex2str(hex: string): string;
 /**
  *
  * @param str
  */
 declare function toUint8Array(str: string | Int8Array | Uint8Array | number[] | any): Uint8Array;
 declare const _Bytes_: Bytes;
-export { toBytes, fromBytes, toHex, fromHex, byte, toUint8Array };
+export { toBytes, fromBytes, toHex, hex2str, fromHex, byte, toUint8Array };
 export default _Bytes_;

package/types/utils/DateUtils.d.ts

@@ -0,0 +1,45 @@
+/**
+ * 日期工具类
+ */
+export type DateUtils = {
+    /**
+     * 指定日期获取值，返回格式 yyyy-MM-dd hh:mm:ss
+     * @param date 指定时间, 默认=当前时间
+     */
+    getDateTime(date?: Date): string;
+    /**
+     * 指定日期获取值， 返回格式 yyyy-MM-dd
+     * @param date 指定时间, 默认=当前时间
+     */
+    getDateString(date?: Date): string;
+    /**
+     * 指定日期获取值，返回格式 yyyyMMdd
+     * @param date 指定时间, 默认=当前时间
+     */
+    getDateInt(date?: Date): string;
+    /**
+     * 日期格式化<br>
+     *
+     * <pre>
+     * fmt 参数 接受内容如下：
+     * Y|y     = 年， 范围：yy | yyyy | YY |YYYY。yy|YY = 表示2025 中的25
+     * M       = 月， 范围：M: 1-12，MM: 01-12
+     * d       = 日， 范围：d: 1-31，dd: 01-31
+     * H       = 时， 范围：H: 0-23，HH: 00-23
+     * H       = 时， 范围：h: 0-12，hh: 00-12
+     * m       = 分， 范围：h: 0-59，mm: 00-59
+     * s       = 秒， 范围：s: 0-59，ss: 00-59
+     * f|F|S   = 毫秒,范围：s: 0-9，ff: 00-99，fff:000-999
+     * A       = AM | PM
+     * a       = am | pm
+     * w       = 一周中的一天，范围：w: 0-6，ww:00-06
+     * W       = 星期几，Sunday - Saturday
+     * </pre>
+     *
+     * @param date
+     * @param fmt 格式内容
+     */
+    format(date: Date, fmt: string): string;
+};
+declare const _DateUtils_: DateUtils;
+export default _DateUtils_;

package/types/utils/EnumBuilder.d.ts

@@ -1,4 +1,4 @@
-import { EnumItem } from "./types/Global";
+import { EnumItem } from "./index";
 type SimpleType = string | number | undefined | null;
 interface ET extends EnumItem {
 }

package/types/utils/Env.d.ts

@@ -1,2 +1,2 @@
-export type Env = NodeJS.ProcessEnv;
+export type Env = typeof process.env;
 export declare const getEnvironments: () => Env;

package/types/utils/TreeUtils.d.ts

@@ -0,0 +1,87 @@
+export type TreeNodeEF = {
+    __level__: number;
+    __isRoot__: boolean;
+};
+/**
+ * @param curr 当前项
+ * @param parent 父项
+ * @param idx 当前项目所在列表中的索引
+ * @param arr 当前项所在的列表对象
+ */
+export type EachTreeConsumer<T> = {
+    /**
+     *
+     * @param curr 当前节点
+     * @param parent 父节点
+     * @param idx  当前节点所在列表的索引
+     * @param arr 当前节点所在的列表
+     */
+    (curr: T, parent?: T | null, idx?: number, arr?: T[]): any;
+};
+/**
+ * 筛选器
+ * @param c 当前节点
+ * @param p 父节点
+ * @param idx  当前节点在列表中的索引
+ * @param arr 当前节点所在的列表
+ */
+export type TreeFilter<T> = {
+    /**
+     *
+     * @param c 当前节点
+     * @param p 父节点
+     * @param idx  当前节点在列表中的索引
+     * @param arr 当前节点所在的列表
+     * */
+    (c: T, p: T | null, idx: number, arr?: T[]): boolean;
+};
+declare const _TreeUtils_: {
+    /**
+     * 构建树型结构
+     * @param arr   数据列表
+     * @param idField id 唯一标识节点名称.默认=id
+     * @param parentField 父级节点名称.默认=parentId
+     * @param childrenField 子节点名称 .默认=children
+     */
+    buildTree<T, R = T & TreeNodeEF>(arr: T[], idField?: string | "id", parentField?: string | "parentId", childrenField?: string | "children"): R[];
+    /**
+     * 遍历树节点
+     * @param arr
+     * @param callback
+     * @param childrenField 默认=children
+     */
+    eachTree<T, R = T>(arr: T[], callback: EachTreeConsumer<T>, childrenField?: string | "children"): R[];
+    /**
+     * 查找 树节点 只返回一项
+     * @param treeList
+     * @param filter
+     * @param childrenField 默认=children
+     */
+    findTreeItem<T>(treeList: T[], filter: TreeFilter<T>, childrenField?: string | "children"): T | null;
+    /**
+     * 输转 数组
+     * @param arr
+     * @param childrenField 默认=children
+     * @param removeChildren 是否删除 children 节点
+     */
+    treeToArray<T>(arr: T[] | T, childrenField?: string, removeChildren?: boolean): T[];
+    /**
+     * 查找 一项
+     * @param arr 数据源
+     * @param filter 筛选器
+     * @param childrenField 默认=children
+     *
+     * @return The first element in the array that satisfies the provided testing function. Otherwise, undefined  is returned.
+     */
+    find<T>(arr: T[], filter: TreeFilter<T>, childrenField?: string | "children"): T | null;
+    /**
+     * 查找数
+     * @param arr 数列表
+     * @param filter 过滤器
+     * @param childrenField 默认=children
+     * @return A shallow copy of the given array containing just the elements that pass the test. If no elements pass the test, an empty array is returned.
+     */
+    filter<T>(arr: T[], filter: TreeFilter<T>, childrenField?: string | "children"): T[];
+};
+export default _TreeUtils_;
+export type TreeUtils = typeof _TreeUtils_;

package/types/utils/Utils.d.ts

@@ -17,19 +17,6 @@ declare type day = number;
  * 2=trim右边空白
  */
 declare type TrimMode = 0 | 1 | 2;
-export type TreeNodeEF = {
-    __level__: number;
-    __isRoot__: boolean;
-};
-/**
- * @param curr 当前项
- * @param parent 父项
- * @param idx 当前项目所在列表中的索引
- * @param arr 当前项所在的列表对象
- */
-export type EachTreeProcesstor<T> = {
-    (curr: T, parent: T | null, idx: number, arr: T[]): any;
-};
 export type URI = {
     "source": string | "";
     "protocol": string | "";
@@ -44,11 +31,13 @@ export type URI = {
     "directory": string | "";
     "file": string | "";
     "query": string | "";
-    anchor: string | "";
+    "anchor": string | "";
     "origin": string | "";
-    params: {
+    "hash": string | "";
+    "params": {
         [key: string]: string | boolean | any[] | "";
     };
+    toURLString: () => string;
 };
 export type RandomTypeOrSource = 1 | 2 | 3 | (number | string)[] | string;
 export declare type Utils = {
@@ -143,21 +132,45 @@ export declare type Utils = {
     /**
      * 给定uri 解析
      * @param source
+     * @param strictMode 是否严格模式
      */
-    parseUri(source: string | ""): URI;
+    parseUri(source: string | "", strictMode?: boolean): URI;
     /**
      * 解析url查询参数 并封装为 参数 对象
      * @param search
+     * @param strictMode
      */
-    parseQuery(search: string | ""): {
-        [key: string]: string | boolean | any[] | "";
-    };
+    parseQuery(search: string | "", strictMode?: boolean): Record<string, any>;
     /**
      * 获取查询参数
      * @param search 查询参数，如果为空则会 从url 读取
      * @param allowFromLocation 允许从 location 上获取
      */
-    getQueryParams(search?: string, allowFromLocation?: boolean): Record<any, string | number | boolean | null> | object;
+    getQueryParams(search?: string, allowFromLocation?: boolean): Record<any, any> | object;
+    /**
+     * 新增参数到URL上
+     * @param url url
+     * @param key 参数名
+     * @param value 参数值
+     * @param override 是否覆盖原有参数，默认=false
+     * @return new url
+     */
+    addParamToURL(url: string, key: string, value: any, override?: boolean): string;
+    /**
+     * 新增参数到URL上
+     * @param url url
+     * @param params 参数对象
+     * @param override 是否覆盖原有参数，默认=false
+     * @return new url
+     */
+    addParamObjToURL(url: string, params: Record<any, any> | object, override?: boolean): string;
+    /**
+     * 删除参数到URL上
+     * @param url url
+     * @param keys 参数
+     * @return new url
+     **/
+    removeParamFromURL(url: string, keys?: string[] | string): string;
     /**
      * 字符串是否全部是中文
      * @param obj
@@ -234,35 +247,6 @@ export declare type Utils = {
      * @param v6
      */
     isIP(str: any_str, v6?: boolean): boolean;
-    /**
-     * 构建树型结构
-     * @param arr   数据列表
-     * @param idField id 唯一标识节点名称
-     * @param parentField 父级节点名称
-     * @param childrenField 子节点名称
-     */
-    buildTree<T, R = T & TreeNodeEF>(arr: T[], idField?: "id", parentField?: "parentId", childrenField?: "children"): R[];
-    /**
-     * 遍历树节点
-     * @param arr
-     * @param processter
-     * @param childrenKey
-     */
-    eachTree<T, R = T>(arr: T[], processter: EachTreeProcesstor<T>, childrenKey?: string | 'children'): R[];
-    /**
-     * 输转 数组
-     * @param arr
-     * @param childrenKey
-     * @param removeChildren 是否删除 children 节点
-     */
-    treeToArray<T>(arr: T[] | T, childrenKey?: string, removeChildren?: boolean): T[];
-    /**
-     * 查找 树节点 只返回一项
-     * @param treeList
-     * @param filter
-     * @param childrenKey
-     */
-    findTreeItem<T>(treeList: T[], filter: (c: T, p: T | null) => boolean, childrenKey?: string | ((c: T) => T[])): T | null;
     getDPI(): number;
     /**
      * 毫米转像素

package/types/utils/index.d.ts

@@ -0,0 +1,123 @@
+import { Utils } from "./Utils";
+import { WebRTCIP } from "./WebRTCIP";
+import { Bytes } from "./Bytes";
+import { Base64 } from "./Base64";
+import { MD5 } from "./MD5";
+import { AES } from "./AES";
+import _Hmac_ from "./Hmac";
+import _SHA_ from "./SHA";
+import EnumBuilder from "./EnumBuilder";
+import { Env } from "./Env";
+import { TreeUtils } from "./TreeUtils";
+import { DateUtils } from "./DateUtils";
+export type KeyInfo = {
+    /**
+     * 请求过期时长，单位/秒
+     */
+    req: number;
+    /**
+     * 申请日期, yyyy-MM-dd HH:mm:ss
+     */
+    begin: string;
+    /**
+     * 到期时间，yyyy-MM-dd HH:mm:ss
+     */
+    end: string;
+    /**
+     * 是否可用
+     */
+    enabled: boolean;
+    /**
+     * 相对有效 日期 的可用时长，如果 enabled=false,则表示 已过期的时长
+     */
+    diff: number;
+    /**
+     * 扩展数据
+     */
+    data?: string;
+};
+/**
+ * 枚举项
+ */
+export interface EnumItem {
+    /**
+     * 枚举项名称
+     */
+    label: string;
+    /**
+     * 枚举项描述
+     */
+    desc?: string;
+    /**
+     * 枚举项编码，默认枚举值
+     */
+    value: string | number;
+    /**
+     * 扩展值
+     */
+    values?: (string | number)[];
+    /**
+     * 比较是否相等,
+     * @param val
+     */
+    eq?: (val: any | string) => boolean;
+    /**
+     * 文字颜色值
+     */
+    color?: string;
+    /**
+     * 背景颜色
+     */
+    bgColor?: string;
+}
+export type KeyTool = {
+    version: string;
+    /**
+     * 读取授权码信息
+     * @param key
+     */
+    readKey(key: string): KeyInfo;
+    /**
+     * 创建授权码
+     * @param  seconds 授权码授权时长，单位/秒
+     * @param ext_data 扩展数据
+     */
+    createKey(seconds?: number, ext_data?: any): string;
+};
+/**
+ * 分页参数
+ */
+export type PageParam = {
+    pageNo?: number | 1;
+    pageSize?: number | 10;
+};
+/**
+ * 分页结果对象
+ */
+export type PageResult<T = any> = {
+    list: T[];
+    total: number;
+};
+type TreeUtilBase = Pick<TreeUtils, 'buildTree' | 'eachTree' | 'findTreeItem' | 'treeToArray'>;
+export type JsUtils = Utils & TreeUtilBase & WebRTCIP & {
+    Bytes: Bytes;
+    Base64: Base64;
+    Utils: Utils;
+    DateUtils: DateUtils;
+    TreeUtils: TreeUtils;
+    MD5: MD5;
+    AES: AES;
+    Hmac: typeof _Hmac_;
+    SHA: typeof _SHA_;
+    EnumBuilder: typeof EnumBuilder;
+    readonly KeyTool: KeyTool;
+    getEnvironments(): Env;
+    readonly version: string;
+    /**
+     * 关闭工具日志警告
+     * @param flag
+     */
+    disable_warning?: (flag?: boolean) => void;
+};
+declare const _JsUtils_: JsUtils;
+export default _JsUtils_;

package/types/utils/RTCHttpClient.d.ts

@@ -1,86 +0,0 @@
-export declare class RTCHttpHeader {
-    private store;
-    getHeader(name: string): any;
-    addHeader(name: string, value: string | number): void;
-    getHeaderNames(): string[];
-    removeHeader(name: string): void;
-    values(): string[];
-    has(name: string): boolean;
-    entries(): [string, any][];
-}
-export declare class HttpResult {
-    private headers;
-    private responseData;
-    private statusCode;
-    private statusMsg;
-    constructor(props: {
-        headers: Record<string, string>;
-        statusCode: number;
-        statusMsg: string;
-        responseData: Int8Array | null;
-        config: any;
-    });
-    /**
-     * 获取HTTP响应头
-     */
-    getHeaders(): Record<any, string>;
-    /**
-     * 指定获取响应头
-     * @param name
-     */
-    getHeader(name: string): string;
-    /**
-     * 获取响应状态码
-     */
-    getStatusCode(): number;
-    /**
-     * 获取状态码消息
-     */
-    getStatusMsg(): string;
-    /**
-     * 获取获取响应文本
-     */
-    getResponseText(): string | null;
-    /**
-     * 获取响应数据流
-     */
-    getResponseData(): Int8Array | null;
-}
-export type HttpRequestConfig = {};
-export declare class RTCHttpClient {
-    private readonly id;
-    constructor(props: HttpRequestConfig);
-    getId(): string;
-    /**
-     * post 请求
-     * @param url
-     * @param data 请求数据
-     * @param params url 参数
-     * @param headers 自定义请求头
-     */
-    post(url: string, data?: any, params?: Record<any, any>, headers?: Record<any, string>): Promise<HttpResult>;
-    /**
-     * get 请求
-     * @param url
-     * @param params
-     * @param headers
-     */
-    get(url: string, params?: Record<any, any>, headers?: Record<any, string>): Promise<HttpResult>;
-    request(params: {
-        url: string;
-        method?: string | "GET";
-        params?: Record<string, any>;
-        data?: any;
-        headers?: Record<string, string>;
-    }): Promise<HttpResult>;
-}
-export declare const instance: (config: HttpRequestConfig) => RTCHttpClient;
-export declare function request(params: {
-    url: string;
-    method?: string | "GET";
-    params?: Record<string, any>;
-    data?: any;
-    headers?: Record<string, string>;
-}, config?: HttpRequestConfig): Promise<HttpResult>;
-declare const defaults: RTCHttpClient;
-export default defaults;

package/types/utils/types/AesType.d.ts

@@ -1,19 +0,0 @@
-export type IV = number[] | string | Uint8Array | Int8Array;
-export type Options = {
-    /**
-     * 填充方式 pck7padding
-     */
-    padding?: string | "PKCS#5" | "PKCS#7" | "NoPadding" | "PKCS5Padding" | "PKCS7Padding" | "pkcs5padding" | "pkcs7padding";
-    /**
-     * 16 bytes iv
-     */
-    iv?: IV;
-    /**
-     * 分段大小
-     */
-    segmentSize?: number;
-    /**
-     * CTR 模式参数 向量初始值
-     */
-    count?: IV | number;
-};

package/types/utils/types/Global.d.ts

@@ -1,64 +0,0 @@
-export type PageParam = {
-    pageNo: number | 1;
-    pageSize: number | 10;
-};
-export type KeyInfo = {
-    /**
-     * 请求过期时长，单位/秒
-     */
-    req: number;
-    /**
-     * 申请日期, yyyy-MM-dd HH:mm:ss
-     */
-    begin: string;
-    /**
-     * 到期时间，yyyy-MM-dd HH:mm:ss
-     */
-    end: string;
-    /**
-     * 是否可用
-     */
-    enabled: boolean;
-    /**
-     * 相对有效 日期 的可用时长，如果 enabled=false,则表示 已过期的时长
-     */
-    diff: number;
-    /**
-     * 扩展数据
-     */
-    data?: string;
-};
-/**
- * 枚举项
- */
-export interface EnumItem {
-    /**
-     * 枚举项名称
-     */
-    label: string;
-    /**
-     * 枚举项描述
-     */
-    desc?: string;
-    /**
-     * 枚举项编码，默认枚举值
-     */
-    value: string | number;
-    /**
-     * 扩展值
-     */
-    values?: (string | number)[];
-    /**
-     * 比较是否相等,
-     * @param val
-     */
-    eq?: (val: any | string) => boolean;
-    /**
-     * 文字颜色值
-     */
-    color?: string;
-    /**
-     * 背景颜色
-     */
-    bgColor?: string;
-}

package/types/utils/types/KeyTool.d.ts

@@ -1,14 +0,0 @@
-import { KeyInfo } from "./Global";
-export type KeyTool = {
-    version: string;
-    /**
-     * 读取授权码信息
-     * @param key
-     */
-    readKey(key: string): KeyInfo;
-    /**
-     * 创建授权码
-     * @param seconds 授权码授权时长，单位/秒
-     */
-    createKey(seconds?: number): string;
-};

package/types/utils/types/PageResult.d.ts

@@ -1,7 +0,0 @@
-/**
- * 分页结果对象
- */
-export type PageResult<T = any> = {
-    list: T[];
-    total: number;
-};