@zwa73/utils 1.0.221 → 1.0.223

package/dist/QuickExport.d.ts

@@ -1,4 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
-export declare const outcome: typeof import("@zwa73/js-utils").JsFunc.outcome, success: typeof import("@zwa73/js-utils").JsFunc.success, failed: typeof import("@zwa73/js-utils").JsFunc.failed, match: typeof import("@zwa73/js-utils").JsFunc.match, isSafeNumber: typeof import("@zwa73/js-utils").JsFunc.isSafeNumber, assertType: typeof import("@zwa73/js-utils").JsFunc.assertType, assertLiteral: typeof import("@zwa73/js-utils").JsFunc.assertLiteral, deepClone: typeof import("@zwa73/js-utils").JsFunc.deepClone, sleep: typeof import("@zwa73/js-utils").JsFunc.sleep, stringifyJToken: typeof import("@zwa73/js-utils").JsFunc.stringifyJToken, getTime: typeof import("@zwa73/js-utils").JsFunc.getTime, mapEntries: typeof import("@zwa73/js-utils").JsFunc.mapEntries, dedent: typeof import("@zwa73/js-utils").JsFunc.dedent, throwError: typeof import("@zwa73/js-utils").JsFunc.throwError, eitherize: typeof import("@zwa73/js-utils").JsFunc.eitherize, memoize: typeof import("@zwa73/js-utils").JsFunc.memoize, ivk: typeof import("@zwa73/js-utils").JsFunc.ivk, l2s: typeof import("@zwa73/js-utils").JsFunc.l2s, s2l: typeof import("@zwa73/js-utils").JsFunc.s2l;
+export declare const outcome: typeof import("@zwa73/js-utils").JsFunc.outcome, success: typeof import("@zwa73/js-utils").JsFunc.success, failed: typeof import("@zwa73/js-utils").JsFunc.failed, match: typeof import("@zwa73/js-utils").JsFunc.match, isSafeNumber: typeof import("@zwa73/js-utils").JsFunc.isSafeNumber, assertType: typeof import("@zwa73/js-utils").JsFunc.assertType, assertLiteral: typeof import("@zwa73/js-utils").JsFunc.assertLiteral, deepClone: typeof import("@zwa73/js-utils").JsFunc.deepClone, sleep: typeof import("@zwa73/js-utils").JsFunc.sleep, stringifyJToken: typeof import("@zwa73/js-utils").JsFunc.stringifyJToken, getTime: typeof import("@zwa73/js-utils").JsFunc.getTime, mapEntries: typeof import("@zwa73/js-utils").JsFunc.mapEntries, dedent: typeof import("@zwa73/js-utils").JsFunc.dedent, throwError: typeof import("@zwa73/js-utils").JsFunc.throwError, eitherize: typeof import("@zwa73/js-utils").JsFunc.eitherize, memoize: typeof import("@zwa73/js-utils").JsFunc.memoize, ivk: typeof import("@zwa73/js-utils").JsFunc.ivk, l2s: typeof import("@zwa73/js-utils").JsFunc.l2s, s2l: typeof import("@zwa73/js-utils").JsFunc.s2l, structEqual: typeof import("@zwa73/js-utils").JsFunc.structEqual;
 export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath, currosizePath: typeof UtilFT.currosizePath;
 export declare const when: <S extends import("@zwa73/js-utils").Keyable, T, R>(stat: import("@zwa73/js-utils").Literal<S>, f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<S>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends S ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<S, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<S>> | R), map: typeof import("@zwa73/js-utils").JsFP.map, flow: typeof import("@zwa73/js-utils").JsFP.flow, pipe: typeof import("@zwa73/js-utils").JsFP.pipe, chain: <T, R>(f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Success>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends typeof import("@zwa73/js-utils").Success ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<typeof import("@zwa73/js-utils").Success, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Success>> | R), alt: <T, R>(f: (arg: Extract<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Failed>>) => R) => (arg: T) => ("E" extends import("@zwa73/js-utils").ProperSubsetCheck<symbol, T> ? T | R : import("@zwa73/js-utils").MatchableFlag<T> extends typeof import("@zwa73/js-utils").Failed ? R : import("@zwa73/js-utils").MatchableFlag<T> extends Exclude<typeof import("@zwa73/js-utils").Failed, import("@zwa73/js-utils").MatchableFlag<T>> ? T : Exclude<T, import("@zwa73/js-utils").Matchable<typeof import("@zwa73/js-utils").Failed>> | R), tap: typeof import("@zwa73/js-utils").JsFP.tap, curry: typeof import("@zwa73/js-utils").JsFP.curry;

package/dist/QuickExport.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.curry = exports.tap = exports.alt = exports.chain = exports.pipe = exports.flow = exports.map = exports.when = exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.s2l = exports.l2s = exports.ivk = exports.memoize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.isSafeNumber = exports.match = exports.failed = exports.success = exports.outcome = void 0;
+exports.curry = exports.tap = exports.alt = exports.chain = exports.pipe = exports.flow = exports.map = exports.when = exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.structEqual = exports.s2l = exports.l2s = exports.ivk = exports.memoize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.isSafeNumber = exports.match = exports.failed = exports.success = exports.outcome = void 0;
 const UtilFileTools_1 = require("./UtilFileTools");
 const UtilFP_1 = require("./UtilFP");
 const UtilFunctions_1 = require("./UtilFunctions");
-exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.success = UtilFunctions_1.UtilFunc.success, exports.failed = UtilFunctions_1.UtilFunc.failed, exports.match = UtilFunctions_1.UtilFunc.match, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize, exports.ivk = UtilFunctions_1.UtilFunc.ivk, exports.l2s = UtilFunctions_1.UtilFunc.l2s, exports.s2l = UtilFunctions_1.UtilFunc.s2l;
+exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.success = UtilFunctions_1.UtilFunc.success, exports.failed = UtilFunctions_1.UtilFunc.failed, exports.match = UtilFunctions_1.UtilFunc.match, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize, exports.ivk = UtilFunctions_1.UtilFunc.ivk, exports.l2s = UtilFunctions_1.UtilFunc.l2s, exports.s2l = UtilFunctions_1.UtilFunc.s2l, exports.structEqual = UtilFunctions_1.UtilFunc.structEqual;
 exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath, exports.currosizePath = UtilFileTools_1.UtilFT.currosizePath;
 exports.when = UtilFP_1.UtilFP.when, exports.map = UtilFP_1.UtilFP.map, exports.flow = UtilFP_1.UtilFP.flow, exports.pipe = UtilFP_1.UtilFP.pipe, exports.chain = UtilFP_1.UtilFP.chain, exports.alt = UtilFP_1.UtilFP.alt, exports.tap = UtilFP_1.UtilFP.tap, exports.curry = UtilFP_1.UtilFP.curry;
 if (false) {

package/dist/UtilClass/Hbs.d.ts

@@ -0,0 +1,18 @@
+import { Keyable } from '@zwa73/js-utils';
+import Handlebars from 'handlebars';
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+export declare class Hbs<T extends Record<Keyable, any> = Record<Keyable, any>> {
+    hbs: typeof Handlebars;
+    context: T;
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(context?: T);
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template: string): string;
+}

package/dist/UtilClass/Hbs.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Hbs = void 0;
+const UtilLogger_1 = require("../UtilLogger");
+const handlebars_1 = __importDefault(require("handlebars"));
+/**文本模板渲染器
+ * @template T - 上下文对象的类型，默认为记录类型
+ */
+class Hbs {
+    hbs = handlebars_1.default.create();
+    context;
+    /**创建一个新的 Hbs 实例
+    * @param context - 上下文对象，用于在渲染模板时提供数据
+    */
+    constructor(context = {}) {
+        this.context = context;
+        this.hbs.registerHelper('def', (name, options) => {
+            const value = options.fn(this.context).trim();
+            this.context[name] = value;
+            return '';
+        });
+        this.hbs.registerHelper('defli', (name, options) => {
+            const rawvalue = options.fn(this.context);
+            const values = rawvalue
+                .split('[[br]]')
+                .map(value => value.trim());
+            this.context[name] = values;
+            return '';
+        });
+    }
+    /**渲染模板
+     * @param template - 要渲染的 Handlebars 模板字符串
+     * @returns 渲染后的字符串
+     */
+    render(template) {
+        try {
+            return this.hbs.compile(template)(this.context);
+        }
+        catch (e) {
+            UtilLogger_1.SLogger.error(e);
+            return '';
+        }
+    }
+}
+exports.Hbs = Hbs;

package/dist/UtilClass/index.d.ts

@@ -0,0 +1,2 @@
+export * from './Hbs';
+export { BridgeInterface, Bridge, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, DLinkedList, Piper, PromoseQueueOption, PromiseQueue, SmartCache, Stream } from "@zwa73/js-utils";

package/dist/{UtilClass.js → UtilClass/index.js}

@@ -1,10 +1,24 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stream = exports.SmartCache = exports.PromiseQueue = exports.Piper = exports.DLinkedList = exports.Hbs = exports.Bridge = void 0;
+exports.Stream = exports.SmartCache = exports.PromiseQueue = exports.Piper = exports.DLinkedList = exports.Bridge = void 0;
+__exportStar(require("./Hbs"), exports);
 //#region UtilClass转导
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Bridge", { enumerable: true, get: function () { return js_utils_1.Bridge; } });
-Object.defineProperty(exports, "Hbs", { enumerable: true, get: function () { return js_utils_1.Hbs; } });
 Object.defineProperty(exports, "DLinkedList", { enumerable: true, get: function () { return js_utils_1.DLinkedList; } });
 Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
 Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });

package/dist/UtilFileTools.d.ts

@@ -1,4 +1,5 @@
 import { JToken } from "./UtilInterfaces";
+import { HashAlgorithm } from "./UtilFunctions";
 /**创建文件选项 */
 type CreatePathOpt = Partial<{
     /**创建一个目录 默认 false
@@ -17,6 +18,8 @@ type EnsurePathExistsOpt = Partial<{
 type FileSearchGlobOpt = Partial<{
     /**忽略的文件 默认 undefined */
     ingore: string | string[];
+    /**忽略目录 默认 true */
+    nodir: boolean;
 }>;
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
@@ -24,6 +27,8 @@ type FileSearchRegexOpt = Partial<{
     recursive: boolean;
     /**无效项 */
     relative: never;
+    /**忽略目录 默认 true */
+    nodir: boolean;
 }>;
 /**json文件加载选项 */
 type LoadJsonFileOpt<T> = Partial<{
@@ -187,5 +192,23 @@ export declare namespace UtilFT {
      * @param filePath - 需要验证的文件路径
      */
     function isValidFilePath(filePath: string): boolean;
+    /**计算文件的部分md5
+     * @param filePath   - 目标文件路径
+     * @param opt        - 可选参数
+     * @param opt.algorithm  - hash算法 默认md5
+     * @param opt.sampled    - 抽取部分计算 默认false
+     * @param opt.chunkSize  - 抽取的块大小 默认1024
+     * @param opt.chunkCount - 抽取的块的数量 默认10
+     */
+    function calculateHash(filePath: string, opt?: {
+        /**hash算法 默认md5 */
+        algorithm?: HashAlgorithm;
+        /**抽取部分计算 默认false */
+        sampled?: boolean;
+        /**抽取的块大小 默认1024 */
+        chunkSize?: number;
+        /**抽取的块的数量 默认10 */
+        chunkCount?: number;
+    }): Promise<string>;
 }
 export {};

package/dist/UtilFileTools.js

@@ -34,6 +34,7 @@ const UtilLogger_1 = require("./UtilLogger");
 const JSON5 = __importStar(require("json5"));
 const glob_1 = require("glob");
 const UtilFunctions_1 = require("./UtilFunctions");
+const crypto_1 = __importDefault(require("crypto"));
 /**文件工具 */
 var UtilFT;
 (function (UtilFT) {
@@ -279,7 +280,7 @@ var UtilFT;
      * @returns 文件名路径数组
      */
     async function fileSearchRegex(dir, traitRegex, opt) {
-        const fixopt = Object.assign({ recursive: true }, opt);
+        const fixopt = Object.assign({ recursive: true, nodir: true }, opt);
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
         const regex = new RegExp(traitRegex);
         const recursive = async (curPath) => {
@@ -289,8 +290,11 @@ var UtilFT;
                 const subFilePath = pathe_1.default.join(subDir, subFile.name);
                 const nextPath = pathe_1.default.join(curPath, subFile.name);
                 //判断是否是文件夹，递归调用
-                if (subFile.isDirectory() && fixopt.recursive)
-                    return recursive(nextPath);
+                if (subFile.isDirectory() && fixopt.recursive) {
+                    if (fixopt.nodir)
+                        return recursive(nextPath);
+                    return [nextPath, ...await recursive(nextPath)];
+                }
                 if (regex.test(nextPath))
                     return [subFilePath];
                 return [undefined];
@@ -310,7 +314,7 @@ var UtilFT;
      * @returns 文件名路径数组
      */
     function fileSearchRegexSync(dir, traitRegex, opt) {
-        const fixopt = Object.assign({ recursive: true }, opt);
+        const fixopt = Object.assign({ recursive: true, nodir: true }, opt);
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
         const regex = new RegExp(traitRegex);
         const recursive = (curPath) => {
@@ -320,8 +324,11 @@ var UtilFT;
                 const subFilePath = pathe_1.default.join(subDir, subFile.name);
                 const nextPath = pathe_1.default.join(curPath, subFile.name);
                 //判断是否是文件夹，递归调用
-                if (subFile.isDirectory() && fixopt.recursive)
-                    return recursive(nextPath);
+                if (subFile.isDirectory() && fixopt.recursive) {
+                    if (fixopt.nodir)
+                        return recursive(nextPath);
+                    return [nextPath, ...recursive(nextPath)];
+                }
                 if (regex.test(nextPath))
                     return [subFilePath];
                 return [undefined];
@@ -343,9 +350,9 @@ var UtilFT;
     async function fileSearchGlob(dir, globPattern, opt) {
         const fixedPath = typeof globPattern === "string"
             ? pathe_1.default.join(dir, globPattern)
-            : globPattern.map((p) => pathe_1.default.join(dir, p));
-        return (await (0, glob_1.glob)(fixedPath, { ignore: opt?.ingore, absolute: true }))
-            .map((filePath) => pathe_1.default.normalize(filePath));
+            : globPattern.map(p => pathe_1.default.join(dir, p));
+        return (await (0, glob_1.glob)(fixedPath, { absolute: true, ...(opt ?? {}) }))
+            .map(filePath => pathe_1.default.normalize(filePath));
     }
     UtilFT.fileSearchGlob = fileSearchGlob;
     /**搜索符合Glob匹配的文件 同步版本
@@ -358,9 +365,9 @@ var UtilFT;
     function fileSearchGlobSync(dir, globPattern, opt) {
         const fixedPath = typeof globPattern === "string"
             ? pathe_1.default.join(dir, globPattern)
-            : globPattern.map((p) => pathe_1.default.join(dir, p));
-        return (0, glob_1.globSync)(fixedPath, { ignore: opt?.ingore, absolute: true })
-            .map((filePath) => pathe_1.default.normalize(filePath));
+            : globPattern.map(p => pathe_1.default.join(dir, p));
+        return (0, glob_1.globSync)(fixedPath, { absolute: true, ...(opt ?? {}) })
+            .map(filePath => pathe_1.default.normalize(filePath));
     }
     UtilFT.fileSearchGlobSync = fileSearchGlobSync;
     /**是一个有效的文件路径
@@ -377,4 +384,47 @@ var UtilFT;
         return true;
     }
     UtilFT.isValidFilePath = isValidFilePath;
+    /**计算文件的部分md5
+     * @param filePath   - 目标文件路径
+     * @param opt        - 可选参数
+     * @param opt.algorithm  - hash算法 默认md5
+     * @param opt.sampled    - 抽取部分计算 默认false
+     * @param opt.chunkSize  - 抽取的块大小 默认1024
+     * @param opt.chunkCount - 抽取的块的数量 默认10
+     */
+    async function calculateHash(filePath, opt) {
+        const { algorithm = "md5", chunkSize = 1024, chunkCount = 10, sampled = false } = opt ?? {};
+        const chash = async (filePath) => new Promise((resolve, reject) => {
+            const hash = crypto_1.default.createHash(algorithm);
+            const stream = fs.createReadStream(filePath);
+            stream.on("data", (data) => hash.update(data));
+            stream.on("end", () => resolve(hash.digest("hex")));
+            stream.on("error", reject);
+        });
+        if (!sampled)
+            return chash(filePath);
+        const stats = await fs.promises.stat(filePath);
+        const totalSize = stats.size;
+        //抽取量大于文件大小则直接计算完整hash
+        if (totalSize < chunkSize * chunkCount)
+            return chash(filePath);
+        const poslist = Array.from({ length: chunkCount }, (_, i) => Math.floor((totalSize / chunkCount) * i));
+        const hash = crypto_1.default.createHash(algorithm);
+        for (const pos of poslist) {
+            const buffer = await new Promise((resolve, reject) => {
+                const stream = fs.createReadStream(filePath, {
+                    start: pos,
+                    end: Math.min(pos + chunkSize - 1, totalSize - 1),
+                    highWaterMark: chunkSize,
+                });
+                const chunks = [];
+                stream.on("data", (chunk) => chunks.push(chunk));
+                stream.on("end", () => resolve(Buffer.concat(chunks)));
+                stream.on("error", reject);
+            });
+            hash.update(buffer);
+        }
+        return hash.digest("hex");
+    }
+    UtilFT.calculateHash = calculateHash;
 })(UtilFT || (exports.UtilFT = UtilFT = {}));

package/dist/UtilFunctions.d.ts

@@ -1,9 +1,8 @@
 import { LogLevel } from "./UtilInterfaces";
 import { JsFunc } from "@zwa73/js-utils";
-import { ComposedClass } from "@zwa73/modular-mixer";
 export { PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";
-declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
-type HashMethod = typeof HashMethodList[number];
+declare const HashAlgorithmList: readonly ["RSA-MD5", "RSA-RIPEMD160", "RSA-SHA1", "RSA-SHA1-2", "RSA-SHA224", "RSA-SHA256", "RSA-SHA3-224", "RSA-SHA3-256", "RSA-SHA3-384", "RSA-SHA3-512", "RSA-SHA384", "RSA-SHA512", "RSA-SHA512/224", "RSA-SHA512/256", "RSA-SM3", "blake2b512", "blake2s256", "id-rsassa-pkcs1-v1_5-with-sha3-224", "id-rsassa-pkcs1-v1_5-with-sha3-256", "id-rsassa-pkcs1-v1_5-with-sha3-384", "id-rsassa-pkcs1-v1_5-with-sha3-512", "md5", "md5-sha1", "md5WithRSAEncryption", "ripemd", "ripemd160", "ripemd160WithRSA", "rmd160", "sha1", "sha1WithRSAEncryption", "sha224", "sha224WithRSAEncryption", "sha256", "sha256WithRSAEncryption", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "sha384", "sha384WithRSAEncryption", "sha512", "sha512-224", "sha512-224WithRSAEncryption", "sha512-256", "sha512-256WithRSAEncryption", "sha512WithRSAEncryption", "shake128", "shake256", "sm3", "sm3WithRSAEncryption", "ssl3-md5", "ssl3-sha1"];
+export type HashAlgorithm = typeof HashAlgorithmList[number];
 /**执行选项 */
 type ExecOpt = Partial<{
     outlvl: LogLevel;
@@ -20,7 +19,10 @@ declare class _UtilFunc {
      * @param method - hash算法
      * @returns hash
      */
-    static calcHash(str: string, method?: HashMethod): string;
+    static calcHash(str: string, opt?: {
+        /**hash算法 默认md5 */
+        algorithm?: HashAlgorithm;
+    }): string;
     /**是否需要检查环境 */
     private static checkEnv;
     /**是否有正在运行的exec */
@@ -58,5 +60,5 @@ declare class _UtilFunc {
      */
     static dynamicImport(moduleName: string): Promise<any>;
 }
-export declare const UtilFunc: ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "concurrencyProc" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "concurrency" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilFunctions.js

@@ -35,7 +35,21 @@ const UtilFileTools_1 = require("./UtilFileTools");
 const UtilLogger_1 = require("./UtilLogger");
 const js_utils_1 = require("@zwa73/js-utils");
 const modular_mixer_1 = require("@zwa73/modular-mixer");
-const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
+const HashAlgorithmList = [
+    'RSA-MD5', 'RSA-RIPEMD160', 'RSA-SHA1', 'RSA-SHA1-2', 'RSA-SHA224',
+    'RSA-SHA256', 'RSA-SHA3-224', 'RSA-SHA3-256', 'RSA-SHA3-384', 'RSA-SHA3-512',
+    'RSA-SHA384', 'RSA-SHA512', 'RSA-SHA512/224', 'RSA-SHA512/256', 'RSA-SM3',
+    'blake2b512', 'blake2s256', 'id-rsassa-pkcs1-v1_5-with-sha3-224',
+    'id-rsassa-pkcs1-v1_5-with-sha3-256', 'id-rsassa-pkcs1-v1_5-with-sha3-384',
+    'id-rsassa-pkcs1-v1_5-with-sha3-512', 'md5', 'md5-sha1',
+    'md5WithRSAEncryption', 'ripemd', 'ripemd160', 'ripemd160WithRSA', 'rmd160',
+    'sha1', 'sha1WithRSAEncryption', 'sha224', 'sha224WithRSAEncryption',
+    'sha256', 'sha256WithRSAEncryption', 'sha3-224', 'sha3-256', 'sha3-384',
+    'sha3-512', 'sha384', 'sha384WithRSAEncryption', 'sha512', 'sha512-224',
+    'sha512-224WithRSAEncryption', 'sha512-256', 'sha512-256WithRSAEncryption',
+    'sha512WithRSAEncryption', 'shake128', 'shake256', 'sm3',
+    'sm3WithRSAEncryption', 'ssl3-md5', 'ssl3-sha1'
+];
 /**常用函数 */
 class _UtilFunc {
     /**计算Hash
@@ -43,8 +57,9 @@ class _UtilFunc {
      * @param method - hash算法
      * @returns hash
      */
-    static calcHash(str, method = 'md5') {
-        return crypto.createHash(method).update(str).digest('hex');
+    static calcHash(str, opt) {
+        const { algorithm = "md5" } = opt ?? {};
+        return crypto.createHash(algorithm).update(str).digest('hex');
     }
     /**是否需要检查环境 */
     static checkEnv = true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.221",
+	"version": "1.0.223",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -17,8 +17,8 @@
 	"license": "ISC",
 	"dependencies": {
 		"@deepkit/type": "^1.0.1-alpha.153",
-		"@zwa73/js-utils": "^1.0.0",
-		"@zwa73/modular-mixer": "^1.0.2",
+		"@zwa73/js-utils": "*",
+		"@zwa73/modular-mixer": "*",
 		"form-data": "^4.0.2",
 		"glob": "^10.4.1",
 		"handlebars": "^4.7.8",

package/dist/UtilClass.d.ts

@@ -1 +0,0 @@
-export { BridgeInterface, Bridge, Hbs, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, DLinkedList, Piper, PromoseQueueOption, PromiseQueue, SmartCache, Stream } from "@zwa73/js-utils";