ph-utils 0.16.1 → 0.16.3

package/lib/crypto.d.ts

@@ -12,7 +12,7 @@ export declare function bufferToHex(bf: ArrayBuffer | Uint8Array, upper?: boolea
  * @param algorithm   hash算法, 支持: SHA-1、SHA-256、SHA-384、SHA-512; 默认为: SHA-256
  * @returns
  */
-export declare function sha(message: string, upper?: boolean, algorithm?: string): Promise<string>;
+export declare function sha(message: string | ArrayBuffer, upper?: boolean, algorithm?: string): Promise<string>;
 /**
  * 哈希算法
  * @param message     待进行 hash 的数据
@@ -20,7 +20,7 @@ export declare function sha(message: string, upper?: boolean, algorithm?: string
  * @param algorithm   hash算法, 支持: SHA-1、SHA-256、SHA-384、SHA-512; 默认为: SHA-256
  * @returns
  */
-export declare function hash(message: string, upper?: boolean, algorithm?: string): Promise<string>;
+export declare function hash(message: string | ArrayBuffer, upper?: boolean, algorithm?: string): Promise<string>;
 type HMACAlgorithm = "SHA-256" | "SHA-512";
 /**
  * 使用 HMAC 算法计算消息的哈希值

package/lib/crypto.js

@@ -59,8 +59,11 @@ function base64ToBuffer(data) {
  * @returns
  */
 export async function sha(message, upper = false, algorithm = "SHA-256") {
-    const msgUint8 = new TextEncoder().encode(message);
-    const hashBuffer = await globalThis.crypto.subtle.digest(algorithm || "SHA-256", msgUint8);
+    let msgBuffer = message;
+    if (typeof message === "string") {
+        msgBuffer = new TextEncoder().encode(message);
+    }
+    const hashBuffer = await globalThis.crypto.subtle.digest(algorithm || "SHA-256", msgBuffer);
     return bufferToHex(hashBuffer, upper);
 }
 /**

package/lib/crypto_node.d.ts

@@ -43,7 +43,7 @@ export declare function aesEncrypt(key: string, input: string, upper?: boolean):
  * @param iv    向量
  * @returns
  */
-export declare function aesDecrypt(input: string, key: string, iv: string): string;
+export declare function aesDecrypt(input: string, key: string | Buffer, iv?: string | Buffer, algorithm?: string): string;
 /**
  * RSA 公钥加密
  * @param input 待加密字符串

package/lib/crypto_node.js

@@ -73,6 +73,16 @@ export function aesEncrypt(key, input, upper = false) {
         iv.toString("hex"),
     ];
 }
+function aesAlgorithm(key) {
+    if (key.startsWith("aes-"))
+        return key;
+    let prefix = "aes-";
+    // 如果 key 不是以数字开头，则加上数字，例如：128，256 等
+    if (!/^\d/.test(key)) {
+        prefix += "256-";
+    }
+    return `${prefix}${key}`;
+}
 /**
  * AES 解密
  * @param input 加密后的数据
@@ -80,8 +90,19 @@ export function aesEncrypt(key, input, upper = false) {
  * @param iv    向量
  * @returns
  */
-export function aesDecrypt(input, key, iv) {
-    const cipher = createDecipheriv("aes-256-cbc", Buffer.from(key, "hex"), Buffer.from(iv, "hex"));
+export function aesDecrypt(input, key, iv, algorithm = "aes-256-cbc") {
+    let ivBuffer = null;
+    if (iv && !Buffer.isBuffer(iv)) {
+        ivBuffer = Buffer.from(iv, "hex");
+    }
+    let keyBuffer;
+    if (Buffer.isBuffer(key)) {
+        keyBuffer = key;
+    }
+    else {
+        keyBuffer = Buffer.from(key, "hex");
+    }
+    const cipher = createDecipheriv(aesAlgorithm(algorithm), keyBuffer, ivBuffer);
     let decryptedData = cipher.update(input, "hex", "utf-8");
     decryptedData += cipher.final("utf-8");
     return decryptedData;

package/lib/dom.d.ts

@@ -75,6 +75,7 @@ export declare function hasClass(elem: HTMLElement, clazz: string): boolean;
  * @param clazz - 要切换的类名。
  */
 export declare function toggleClass(el: HTMLElement, clazz: string): void;
+type EventHandler = EventListenerOrEventListenerObject | ((e: CustomEvent) => void);
 /**
  * 为节点添加事件处理
  * @param {HTMLElement} element   添加事件的节点
@@ -82,7 +83,7 @@ export declare function toggleClass(el: HTMLElement, clazz: string): void;
  * @param {function}    event     事件处理函数
  * @param {boolean}     onceOrConfig  是否是只运行一次的处理函数或者配置，其中 eventFlag 为 string，如果配置该项，则表明为委托事件
  */
-export declare function on(element: HTMLElement | ShadowRoot | Document | HTMLCollection | NodeListOf<HTMLElement> | HTMLElement[], listener: string, fn: EventListener, option?: boolean | (AddEventListenerOptions & {
+export declare function on(element: HTMLElement | ShadowRoot | Document | HTMLCollection | NodeListOf<HTMLElement> | HTMLElement[], listener: string, fn: EventHandler, option?: boolean | (AddEventListenerOptions & {
     eventFlag?: string;
 })): void;
 /**
@@ -91,7 +92,7 @@ export declare function on(element: HTMLElement | ShadowRoot | Document | HTMLCo
  * @param listener - 事件名称。
  * @param fn - 要移除的事件监听器函数。
  */
-export declare function off(el: HTMLElement | ShadowRoot | Document | HTMLCollection | NodeListOf<HTMLElement> | HTMLElement[], listener: string, fn: EventListener, option?: boolean | EventListenerOptions): void;
+export declare function off(el: HTMLElement | ShadowRoot | Document | HTMLCollection | NodeListOf<HTMLElement> | HTMLElement[], listener: string, fn: EventHandler, option?: boolean | EventListenerOptions): void;
 /**
  * 判断事件是否应该继续传递。
  * 从事件目标开始向上遍历DOM树，检查每个节点上是否存在指定的属性。

package/lib/dom.js

@@ -55,7 +55,7 @@ export function create(tag, option = {}, ctx) {
                     if (value === true) {
                         $el.setAttribute(key, "");
                     }
-                    else if (typeof value === "string") {
+                    else {
                         $el.setAttribute(key, value);
                     }
                 }

package/lib/web.js

@@ -86,7 +86,8 @@ export function debounce(fn, interval = 500) {
         if (_t)
             clearTimeout(_t);
         _t = setTimeout(() => {
-            fn(...args);
+            //@ts-ignore
+            fn.apply(this, args);
         }, interval);
     };
     handle.cancel = function () {

package/package.json

@@ -68,7 +68,7 @@
     },
     "./*": "./lib/*"
   },
-  "version": "0.16.1",
+  "version": "0.16.3",
   "type": "module",
   "repository": {
     "type": "git",