@zwa73/utils 1.0.190 → 1.0.192

package/dist/UtilClass.d.ts

@@ -26,7 +26,13 @@ export declare class Stream<T> implements Iterable<T> {
     private _list;
     /**加工函数列表*/
     private _operation;
-    constructor(base?: Array<T> | number, concurrent?: number);
+    private constructor();
+    /**从arraylike创建流 */
+    static from<T>(args: Parameters<typeof Array.from<T>>[0], concurrent?: number): Stream<T>;
+    /**从数组创建流 */
+    static of<T>(...args: T[]): Stream<T>;
+    /**设置并发数 */
+    concurrent(count: number): Stream<T>;
     /**平分数组
      * @param count - 份数
      * @param mode  - 模式 average:轮询平均分 chunk:切块均分

package/dist/UtilClass.js

@@ -49,6 +49,19 @@ class Stream {
             this._list = new Array(...base);
         this._concurrent = concurrent;
     }
+    /**从arraylike创建流 */
+    static from(args, concurrent = 1) {
+        return new Stream(Array.from(args), concurrent);
+    }
+    /**从数组创建流 */
+    static of(...args) {
+        return new Stream(args);
+    }
+    /**设置并发数 */
+    concurrent(count) {
+        this._concurrent = count;
+        return this;
+    }
     /**平分数组
      * @param count - 份数
      * @param mode  - 模式 average:轮询平均分 chunk:切块均分

package/dist/UtilFfmpegTools.js

@@ -150,12 +150,12 @@ class SFfmpegTool {
      * @param threshold     - 静音阈值/dB
      * @param silence       - 保留静音时长
      */
-    static async trimSilence(inputWavPath, outputWavPath, threshold = -50, silence = 0.2) {
+    static async trimSilence(inputWavPath, outputWavPath, threshold = -50, silence = 0.1) {
         return new Promise((resolve, reject) => {
             const ins = (0, fluent_ffmpeg_1.default)(inputWavPath)
-                .audioFilters(`silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}`)
+                .audioFilters(`silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}:detection=peak`)
                 .audioFilters("areverse")
-                .audioFilters(`silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}`)
+                .audioFilters(`silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}:detection=peak`)
                 .audioFilters("areverse")
                 .save(outputWavPath)
                 .on("end", () => {
@@ -207,7 +207,8 @@ class SFfmpegTool {
      * @param cpCount - 并发数
      */
     static async wav2oggMP(ioMap, quality = 10, cpCount = 16) {
-        await new UtilClass_1.Stream(Object.entries(ioMap), cpCount)
+        await UtilClass_1.Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
             UtilLogger_1.SLogger.info(`SFfmpegTool.wav2oggMP 正在处理:${outPath}`);
             await SFfmpegTool.wav2ogg(inPath, outPath, quality);
@@ -220,7 +221,8 @@ class SFfmpegTool {
      * @param cpCount - 并发数
      */
     static async flac2oggMP(ioMap, quality = 10, cpCount = 16) {
-        await new UtilClass_1.Stream(Object.entries(ioMap), cpCount)
+        await UtilClass_1.Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
             UtilLogger_1.SLogger.info(`SFfmpegTool.flac2oggMP 正在处理:${outPath}`);
             await SFfmpegTool.flac2ogg(inPath, outPath, quality);
@@ -232,8 +234,9 @@ class SFfmpegTool {
      * @param threshold - 静音阈值/dB
      * @param silence   - 保留静音时长
      */
-    static async trimSilenceMP(ioMap, threshold = -50, silence = 0.2, cpCount = 16) {
-        await new UtilClass_1.Stream(Object.entries(ioMap), cpCount)
+    static async trimSilenceMP(ioMap, threshold = -50, silence = 0.1, cpCount = 16) {
+        await UtilClass_1.Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
             UtilLogger_1.SLogger.info(`SFfmpegTool.trimSilenceMP 正在处理:${outPath}`);
             await SFfmpegTool.trimSilence(inPath, outPath, threshold, silence);
@@ -246,7 +249,8 @@ class SFfmpegTool {
      * @param cpCount - 并发数
      */
     static async resampleMP(ioMap, rate = 22050, cpCount = 16) {
-        await new UtilClass_1.Stream(Object.entries(ioMap), cpCount)
+        await UtilClass_1.Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
             UtilLogger_1.SLogger.info(`SFfmpegTool.resampleMP 正在处理:${outPath}`);
             await SFfmpegTool.resample(inPath, outPath, rate);

package/package.json

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

package/src/UtilClass.ts

@@ -46,12 +46,25 @@ export class Stream<T> implements Iterable<T>{
     private _list: T[];
     /**加工函数列表*/
     private _operation: Array<StreamOperation<T, T>> = [];
-    constructor(base?: Array<T>|number, concurrent: number = 1) {
+    private constructor(base?: Array<T>|number, concurrent: number = 1) {
         if(base==undefined) this._list = new Array();
         else if(typeof base === 'number') this._list = new Array(base);
         else this._list = new Array(...base);
         this._concurrent = concurrent;
     }
+    /**从arraylike创建流 */
+    static from<T>(args:Parameters<typeof Array.from<T>>[0],concurrent:number=1){
+        return new Stream<T>(Array.from(args),concurrent);
+    }
+    /**从数组创建流 */
+    static of<T>(...args:T[]){
+        return new Stream<T>(args);
+    }
+    /**设置并发数 */
+    concurrent(count: number): Stream<T> {
+        this._concurrent = count;
+        return this;
+    }
     /**平分数组
      * @param count - 份数
      * @param mode  - 模式 average:轮询平均分 chunk:切块均分

package/src/UtilFfmpegTools.ts

@@ -155,16 +155,16 @@ class SFfmpegTool {
         inputWavPath: string,
         outputWavPath: string,
         threshold: number = -50,
-        silence: number = 0.2
+        silence: number = 0.1
     ): Promise<boolean> {
         return new Promise((resolve, reject) => {
             const ins = fluentFfmpeg(inputWavPath)
                 .audioFilters(
-                    `silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}`
+                    `silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}:detection=peak`
                 )
                 .audioFilters("areverse")
                 .audioFilters(
-                    `silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}`
+                    `silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}:detection=peak`
                 )
                 .audioFilters("areverse")
                 .save(outputWavPath)
@@ -217,7 +217,8 @@ class SFfmpegTool {
      * @param cpCount - 并发数
      */
     static async wav2oggMP(ioMap: IOMap, quality = 10, cpCount = 16) {
-        await new Stream(Object.entries(ioMap),cpCount)
+        await Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
                 SLogger.info(`SFfmpegTool.wav2oggMP 正在处理:${outPath}`);
                 await SFfmpegTool.wav2ogg(inPath, outPath, quality);
@@ -234,7 +235,8 @@ class SFfmpegTool {
         quality: number = 10,
         cpCount: number = 16
     ) {
-        await new Stream(Object.entries(ioMap),cpCount)
+        await Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
                 SLogger.info(`SFfmpegTool.flac2oggMP 正在处理:${outPath}`);
                 await SFfmpegTool.flac2ogg(inPath, outPath, quality);
@@ -249,10 +251,11 @@ class SFfmpegTool {
     static async trimSilenceMP(
         ioMap: IOMap,
         threshold: number = -50,
-        silence: number = 0.2,
+        silence: number = 0.1,
         cpCount: number = 16
     ) {
-        await new Stream(Object.entries(ioMap),cpCount)
+        await Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
                 SLogger.info(`SFfmpegTool.trimSilenceMP 正在处理:${outPath}`);
                 await SFfmpegTool.trimSilence(inPath, outPath, threshold, silence);
@@ -266,7 +269,8 @@ class SFfmpegTool {
      * @param cpCount - 并发数
      */
     static async resampleMP(ioMap: IOMap, rate: number = 22050, cpCount: number = 16) {
-        await new Stream(Object.entries(ioMap),cpCount)
+        await Stream.from(Object.entries(ioMap))
+            .concurrent(cpCount)
             .map(async ([inPath, outPath]) => {
                 SLogger.info(`SFfmpegTool.resampleMP 正在处理:${outPath}`);
                 await SFfmpegTool.resample(inPath, outPath, rate);