@zwa73/utils 1.0.14 → 1.0.16

package/dist/UtilDecorators.d.ts

@@ -0,0 +1,16 @@
+/**用于打印方法的调用
+ * @returns {void}
+ */
+export declare function DLogger(): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+/**用于打印异步方法的调用
+ * @returns {void}
+ */
+export declare function DLoggerAsync(): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+/**用于捕获方法中的错误
+ * @returns {void}
+ */
+export declare function DCatchErrors(): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+/**用于捕获异步方法中的错误
+ * @returns {void}
+ */
+export declare function DCatchErrorsAsync(): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;

package/dist/UtilDecorators.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DCatchErrorsAsync = exports.DCatchErrors = exports.DLoggerAsync = exports.DLogger = void 0;
+/**用于打印方法的调用
+ * @returns {void}
+ */
+function DLogger() {
+    return function (target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = function (...args) {
+            let result = originalMethod.apply(this, args);
+            console.log(`Call: ${propertyKey}(${args}) => ${result}`);
+            return result;
+        };
+    };
+}
+exports.DLogger = DLogger;
+/**用于打印异步方法的调用
+ * @returns {void}
+ */
+function DLoggerAsync() {
+    return function (target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = async function (...args) {
+            let result = await originalMethod.apply(this, args);
+            console.log(`Call: ${propertyKey}(${args}) => ${result}`);
+            return result;
+        };
+    };
+}
+exports.DLoggerAsync = DLoggerAsync;
+/**用于捕获方法中的错误
+ * @returns {void}
+ */
+function DCatchErrors() {
+    return function (target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = function (...args) {
+            try {
+                originalMethod.apply(this, args);
+            }
+            catch (err) {
+                console.log(`Error in method ${propertyKey}: ${err}`);
+            }
+        };
+    };
+}
+exports.DCatchErrors = DCatchErrors;
+/**用于捕获异步方法中的错误
+ * @returns {void}
+ */
+function DCatchErrorsAsync() {
+    return function (target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value;
+        descriptor.value = async function (...args) {
+            try {
+                await originalMethod.apply(this, args);
+            }
+            catch (err) {
+                console.log(`Error in method ${propertyKey}: ${err}`);
+            }
+        };
+    };
+}
+exports.DCatchErrorsAsync = DCatchErrorsAsync;

package/dist/UtilFfmpegTools.d.ts

@@ -48,45 +48,29 @@ declare class SFfmpegTool {
      */
     static resample(inputWavPath: string, outputWavPath: string, rate?: number): Promise<boolean>;
     /**wav转ogg多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} quality - 质量
      * @param {number} cpCount - 并发数
      */
-    static wav2oggMP(iomap: IOMap, quality?: number, cpCount?: number): Promise<void>;
-    /**wav转ogg子线程
-     * @param {IOMap} iomap - 输入输出路径映射
-     * @param {number} quality - 质量
-     */
-    private static wav2oggCP;
+    static wav2oggMP(ioMap: IOMap, quality?: number, cpCount?: number): Promise<void>;
     /**flac转ogg多线程
-     * @param {IOMap} iomap - 输入输出路径映射
-     * @param {number} quality - 质量
-     * @param {number} cpCount - 并发数
-     */
-    static flac2oggMP(iomap: IOMap, quality?: number, cpCount?: number): Promise<void>;
-    /**flac转ogg子线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} quality - 质量
      * @param {number} cpCount - 并发数
      */
-    private static flac2oggCP;
+    static flac2oggMP(ioMap: IOMap, quality?: number, cpCount?: number): Promise<void>;
     /**删除静音多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} threshold - 静音阈值/dB
      * @param {number} silence - 保留静音时长
      */
-    static trimSilenceMP(iomap: IOMap, threshold?: number, silence?: number, cpCount?: number): Promise<void>;
-    /**删除静音子线程
-     */
-    private static trimSilenceCP;
+    static trimSilenceMP(ioMap: IOMap, threshold?: number, silence?: number, cpCount?: number): Promise<void>;
     /**重采样多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} rate - 采样率
      * @param {number} cpCount - 并发数
      */
     static resampleMP(ioMap: IOMap, rate?: number, cpCount?: number): Promise<void>;
-    /**重采样子线程*/
-    private static resampleCP;
 }
 export default SFfmpegTool;
 export { SFfmpegTool };

package/dist/UtilFfmpegTools.js

@@ -4,6 +4,7 @@ exports.SFfmpegTool = void 0;
 const fluentFfmpeg = require("fluent-ffmpeg");
 const path = require("path");
 const fs = require("fs");
+const UtilClass_1 = require("./UtilClass");
 /**ffmpeg工具类
  */
 class SFfmpegTool {
@@ -124,84 +125,60 @@ class SFfmpegTool {
     }
     //多线程处理
     /**wav转ogg多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} quality - 质量
      * @param {number} cpCount - 并发数
      */
-    static async wav2oggMP(iomap, quality = 10, cpCount = 16) {
-        let cpList = MPClip(iomap, cpCount);
-        for (let cpMap of cpList)
-            SFfmpegTool.wav2oggCP(cpMap, quality);
-    }
-    /**wav转ogg子线程
-     * @param {IOMap} iomap - 输入输出路径映射
-     * @param {number} quality - 质量
-     */
-    static async wav2oggCP(iomap, quality = 10) {
-        for (let inPath in iomap) {
-            let outpath = iomap[inPath];
-            console.log("正在处理:" + outpath);
-            await SFfmpegTool.wav2ogg(inPath, outpath, quality);
-        }
+    static async wav2oggMP(ioMap, quality = 10, cpCount = 16) {
+        await new UtilClass_1.SList(Object.entries(ioMap))
+            .toSStream(cpCount)
+            .map(async ([inPath, outPath]) => {
+            console.log("正在处理:" + outPath);
+            await SFfmpegTool.wav2ogg(inPath, outPath, quality);
+        })
+            .appendOperations();
     }
     /**flac转ogg多线程
-     * @param {IOMap} iomap - 输入输出路径映射
-     * @param {number} quality - 质量
-     * @param {number} cpCount - 并发数
-     */
-    static async flac2oggMP(iomap, quality = 10, cpCount = 16) {
-        let cpList = MPClip(iomap, cpCount);
-        for (let cpMap of cpList)
-            SFfmpegTool.flac2oggCP(cpMap, quality);
-    }
-    /**flac转ogg子线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} quality - 质量
      * @param {number} cpCount - 并发数
      */
-    static async flac2oggCP(iomap, quality = 10) {
-        for (let inPath in iomap) {
-            let outpath = iomap[inPath];
-            console.log("正在处理:" + outpath);
-            await SFfmpegTool.flac2ogg(inPath, outpath, quality);
-        }
+    static async flac2oggMP(ioMap, quality = 10, cpCount = 16) {
+        await new UtilClass_1.SList(Object.entries(ioMap))
+            .toSStream(cpCount)
+            .map(async ([inPath, outPath]) => {
+            console.log("正在处理:" + outPath);
+            await SFfmpegTool.flac2ogg(inPath, outPath, quality);
+        })
+            .appendOperations();
     }
     /**删除静音多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} threshold - 静音阈值/dB
      * @param {number} silence - 保留静音时长
      */
-    static async trimSilenceMP(iomap, threshold = -50, silence = 0.2, cpCount = 16) {
-        let cpList = MPClip(iomap, cpCount);
-        for (let cpMap of cpList)
-            SFfmpegTool.trimSilenceCP(cpMap, threshold, silence);
-    }
-    /**删除静音子线程
-     */
-    static async trimSilenceCP(iomap, threshold = -50, silence = 0.2) {
-        for (let inPath in iomap) {
-            let outpath = iomap[inPath];
-            console.log("正在处理:" + outpath);
-            await SFfmpegTool.trimSilence(inPath, outpath, threshold, silence);
-        }
+    static async trimSilenceMP(ioMap, threshold = -50, silence = 0.2, cpCount = 16) {
+        await new UtilClass_1.SList(Object.entries(ioMap))
+            .toSStream(cpCount)
+            .map(async ([inPath, outPath]) => {
+            console.log("正在处理:" + outPath);
+            await SFfmpegTool.trimSilence(inPath, outPath, threshold, silence);
+        })
+            .appendOperations();
     }
     /**重采样多线程
-     * @param {IOMap} iomap - 输入输出路径映射
+     * @param {IOMap} ioMap - 输入输出路径映射
      * @param {number} rate - 采样率
      * @param {number} cpCount - 并发数
      */
     static async resampleMP(ioMap, rate = 22050, cpCount = 16) {
-        let cpList = MPClip(ioMap, cpCount);
-        for (let cpMap of cpList)
-            SFfmpegTool.resampleCP(cpMap, rate);
-    }
-    /**重采样子线程*/
-    static async resampleCP(ioMap, rate = 22050) {
-        for (let inPath in ioMap) {
-            let outpath = ioMap[inPath];
-            console.log("正在处理:" + outpath);
-            await SFfmpegTool.resample(inPath, outpath, rate);
-        }
+        await new UtilClass_1.SList(Object.entries(ioMap))
+            .toSStream(cpCount)
+            .map(async ([inPath, outPath]) => {
+            console.log("正在处理:" + outPath);
+            await SFfmpegTool.resample(inPath, outPath, rate);
+        })
+            .appendOperations();
     }
 }
 exports.SFfmpegTool = SFfmpegTool;

package/dist/UtilFunctions.d.ts

@@ -1,12 +1,50 @@
-import { JObject } from './UtilInterfaces';
+import { JObject } from "./UtilInterfaces";
+/**获取当前时间戳
+ * number ()
+ * @returns {number} 时间戳
+ */
 export declare function getTime(): number;
-export declare function initField(obj: Record<string, any>, field: string, defaultVal: any): void;
-/**加载json文件
+/**初始化对象的字段
+ * void (Object,string,any)
+ * @param {Record<string,T>} obj   - 所要初始化的对象
+ * @param {string} field 		   - 所要初始化的字段
+ * @param {T} defaultVal 		   - 默认值
+ * @returns {T} - 最终值
+ */
+export declare function initField<T>(obj: Record<string, T>, field: string, defaultVal: T): T;
+/**验证路径 文件或文件夹 是否存在 异步
+ * @param {string} filePath - 待验证的路径
+ * @returns {Promise<boolean>} - 是否存在
+ */
+export declare function pathExists(filePath: string): Promise<boolean>;
+/**验证路径 文件或文件夹 是否存在 同步
+ * @param {string} filePath - 待验证的路径
+ * @returns {boolean} - 是否存在
+ */
+export declare function pathExistsSync(filePath: string): boolean;
+/**创建路径 path.sep 结尾时创建文件夹 异步
+ * @param {string} filePath - 待创建的路径
+ * @returns {Promise<boolean>} - 是否成功创建
+ */
+export declare function createPath(filePath: string): Promise<boolean>;
+/**创建路径 path.sep 结尾时创建文件夹 同步
+ * @param {string} filePath - 待创建的路径
+ * @returns {boolean} - 是否成功创建
+ */
+export declare function createPathSync(filePath: string): boolean;
+/**加载json文件 同步
  * Object (string)
  * @param {string} filePath - 文件路径
  * @returns {JObject}
  */
-export declare function loadJSONFile(filePath: string): JObject;
+export declare function loadJSONFileSync(filePath: string): JObject;
+/**加载json文件 异步
+ * Object (string)
+ * @async
+ * @param {string} filePath - 文件路径
+ * @returns {JObject}
+ */
+export declare function loadJSONFile(filePath: string): Promise<JObject>;
 /**写入JSON文件
  * void (string,Object)
  * @async

package/dist/UtilFunctions.js

@@ -1,37 +1,131 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileSearch = exports.sleep = exports.isSafeNumber = exports.deepClone = exports.genUUID = exports.writeJSONFile = exports.loadJSONFile = exports.initField = exports.getTime = void 0;
+exports.fileSearch = exports.sleep = exports.isSafeNumber = exports.deepClone = exports.genUUID = exports.writeJSONFile = exports.loadJSONFile = exports.loadJSONFileSync = exports.createPathSync = exports.createPath = exports.pathExistsSync = exports.pathExists = exports.initField = exports.getTime = void 0;
 const fs = require("fs");
 const crypto = require("crypto");
 const path = require("path");
+/**获取当前时间戳
+ * number ()
+ * @returns {number} 时间戳
+ */
 function getTime() {
     return new Date().getTime();
 }
 exports.getTime = getTime;
+/**初始化对象的字段
+ * void (Object,string,any)
+ * @param {Record<string,T>} obj   - 所要初始化的对象
+ * @param {string} field 		   - 所要初始化的字段
+ * @param {T} defaultVal 		   - 默认值
+ * @returns {T} - 最终值
+ */
 function initField(obj, field, defaultVal) {
     if (!(field in obj))
         obj[field] = defaultVal;
+    return obj[field];
 }
 exports.initField = initField;
-/**加载json文件
+/**验证路径 文件或文件夹 是否存在 异步
+ * @param {string} filePath - 待验证的路径
+ * @returns {Promise<boolean>} - 是否存在
+ */
+async function pathExists(filePath) {
+    try {
+        const stats = await fs.promises.stat(filePath);
+        await fs.promises.access(filePath);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+exports.pathExists = pathExists;
+/**验证路径 文件或文件夹 是否存在 同步
+ * @param {string} filePath - 待验证的路径
+ * @returns {boolean} - 是否存在
+ */
+function pathExistsSync(filePath) {
+    try {
+        fs.accessSync(filePath);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+exports.pathExistsSync = pathExistsSync;
+/**创建路径 path.sep 结尾时创建文件夹 异步
+ * @param {string} filePath - 待创建的路径
+ * @returns {Promise<boolean>} - 是否成功创建
+ */
+async function createPath(filePath) {
+    try {
+        if (filePath.endsWith(path.sep)) {
+            await fs.promises.mkdir(filePath, { recursive: true });
+            return true;
+        }
+        await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
+        await fs.promises.open(filePath, 'w');
+        return true;
+    }
+    catch (e) {
+        console.log("createPath 错误");
+        console.log(e);
+        return false;
+    }
+}
+exports.createPath = createPath;
+/**创建路径 path.sep 结尾时创建文件夹 同步
+ * @param {string} filePath - 待创建的路径
+ * @returns {boolean} - 是否成功创建
+ */
+function createPathSync(filePath) {
+    try {
+        if (filePath.endsWith(path.sep)) {
+            fs.mkdirSync(filePath, { recursive: true });
+            return true;
+        }
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+        fs.openSync(filePath, 'w');
+        return true;
+    }
+    catch (e) {
+        console.log("createPath 错误");
+        console.log(e);
+        return false;
+    }
+}
+exports.createPathSync = createPathSync;
+/**加载json文件 同步
  * Object (string)
  * @param {string} filePath - 文件路径
  * @returns {JObject}
  */
-function loadJSONFile(filePath) {
-    if (filePath.indexOf(".json") == -1)
-        filePath += ".json";
+function loadJSONFileSync(filePath) {
+    if (path.extname(filePath) !== '.json')
+        filePath += '.json';
+    let str = "";
     // 判断文件路径是否存在
-    if (!fs.existsSync(filePath)) {
-        // 如果路径不存在，创建文件夹
-        try {
-            fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        }
-        catch (e) { }
-        // 创建文件
-        fs.writeFileSync(filePath, '');
-    }
-    let str = fs.readFileSync(filePath);
+    if (pathExistsSync(filePath))
+        str = fs.readFileSync(filePath, "utf-8");
+    if (str == "" || str == null)
+        str = "{}";
+    return JSON.parse(str);
+}
+exports.loadJSONFileSync = loadJSONFileSync;
+/**加载json文件 异步
+ * Object (string)
+ * @async
+ * @param {string} filePath - 文件路径
+ * @returns {JObject}
+ */
+async function loadJSONFile(filePath) {
+    if (path.extname(filePath) !== '.json')
+        filePath += '.json';
+    let str = "";
+    // 判断文件路径是否存在
+    if (await pathExists(filePath))
+        str = await fs.promises.readFile(filePath, "utf-8");
     if (str == "" || str == null)
         str = "{}";
     return JSON.parse(str);
@@ -46,35 +140,20 @@ exports.loadJSONFile = loadJSONFile;
  */
 async function writeJSONFile(filePath, obj) {
     let str = JSON.stringify(obj, null, "\t");
-    if (filePath.indexOf(".json") === -1)
-        filePath += ".json";
-    // 判断文件路径是否存在
-    await new Promise((resolve, reject) => {
-        fs.exists(filePath, (ex) => {
-            if (!ex) {
-                try {
-                    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-                }
-                catch (e) {
-                    console.log("创建文件错误:" + e);
-                }
-            }
-            resolve(true);
-        });
-    });
-    return new Promise((resolve, reject) => {
-        fs.writeFile(filePath, str, function (err) {
-            if (err === null) {
-                console.log(`${filePath} writeJSONFile 成功`);
-                resolve();
-            }
-            else {
-                console.log(`${filePath} writeJSONFile 错误`);
-                console.log(err);
-                reject(err);
-            }
-        });
-    });
+    if (path.extname(filePath) !== '.json')
+        filePath += '.json';
+    // 判断文件路径是否存在 不存在则创建
+    if (!(await pathExists(filePath)))
+        await createPath(filePath);
+    // 写入文件
+    try {
+        await fs.promises.writeFile(filePath, str);
+        console.log(`${filePath} writeJSONFile 成功`);
+    }
+    catch (err) {
+        console.log(`${filePath} writeJSONFile 错误`);
+        console.log(err);
+    }
 }
 exports.writeJSONFile = writeJSONFile;
 /**生成一串uuid
@@ -82,7 +161,7 @@ exports.writeJSONFile = writeJSONFile;
  * @returns {string} uuid
  */
 function genUUID() {
-    return crypto.randomBytes(16).toString('hex');
+    return crypto.randomBytes(16).toString("hex");
 }
 exports.genUUID = genUUID;
 /**深克隆 序列化并反序列化
@@ -101,7 +180,9 @@ exports.deepClone = deepClone;
 function isSafeNumber(num) {
     if (num === undefined || num == null || isNaN(num))
         return false;
-    return true;
+    if (typeof num === 'number')
+        return true;
+    return false;
 }
 exports.isSafeNumber = isSafeNumber;
 /**等待 timeMs 毫秒
@@ -131,7 +212,7 @@ function fileSearch(folder, traitRegex) {
         let stat = fs.lstatSync(subFilePath);
         //判断是否是文件夹，递归调用
         if (stat.isDirectory()) {
-            let subMap = fileSearch(path.join(subFilePath, "/"), traitRegex);
+            let subMap = fileSearch(path.join(subFilePath, path.sep), traitRegex);
             for (let key in subMap)
                 outMap[key] = subMap[key];
             continue;

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export * from './UtilClass';
 export * from './UtilCom';
 export * from './UtilCodecs';
 export * from './UtilFfmpegTools';
+export * from './UtilDecorators';

package/dist/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./UtilClass"), exports);
 __exportStar(require("./UtilCom"), exports);
 __exportStar(require("./UtilCodecs"), exports);
 __exportStar(require("./UtilFfmpegTools"), exports);
+__exportStar(require("./UtilDecorators"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "my utils",
   "main": "index.js",
   "scripts": {