@zwa73/utils 1.0.202 → 1.0.203

package/dist/index.d.ts

@@ -4,7 +4,6 @@ export * from './UtilSymbol';
 export * from './UtilClass';
 export * from './UtilCom';
 export * from './UtilCodecs';
-export * from './UtilFfmpegTools';
 export * from './UtilDecorators';
 export * from './UtilFileTools';
 export * from './UtilLogger';

package/dist/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./UtilSymbol"), exports);
 __exportStar(require("./UtilClass"), exports);
 __exportStar(require("./UtilCom"), exports);
 __exportStar(require("./UtilCodecs"), exports);
-__exportStar(require("./UtilFfmpegTools"), exports);
 __exportStar(require("./UtilDecorators"), exports);
 __exportStar(require("./UtilFileTools"), exports);
 __exportStar(require("./UtilLogger"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.202",
+	"version": "1.0.203",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -17,7 +17,6 @@
 	"license": "ISC",
 	"dependencies": {
 		"@deepkit/type": "^1.0.1-alpha.153",
-		"fluent-ffmpeg": "2.1.2",
 		"form-data": "^4.0.2",
 		"glob": "^10.4.1",
 		"handlebars": "^4.7.8",
@@ -33,7 +32,6 @@
 		"winston-daily-rotate-file": "^4.7.1"
 	},
 	"devDependencies": {
-		"@types/fluent-ffmpeg": "^2.1.21",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^20.14.11",
 		"@zwa73/dev-utils": "*",
@@ -41,5 +39,10 @@
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",
 		"typescript": "^5.3.3"
-	}
+	},
+	"files": [
+		"dist",
+		"index.js",
+		"index.d.ts"
+	]
 }

package/compile.bat

@@ -1,2 +0,0 @@
-call npm run compile
-pause

package/dist/UtilFfmpegTools.d.ts

@@ -1,86 +0,0 @@
-import { FfprobeData } from "fluent-ffmpeg";
-/**输入输出路径映射
- * 输入路径:输入路径
- */
-export type IOMap = {
-    [key: string]: string;
-};
-/**ffmpeg工具类
- */
-declare class SFfmpegTool {
-    /**静态构造函数 */
-    static init(): void;
-    /**设置ffmpeg路径 */
-    static setFfmpegPath(ffmpegPath: string): void;
-    /**获取音频文件的元数据
-     * @param inputWavPath - 输入音频文件路径
-     * @returns 返回音频文件的元数据
-     */
-    static getAudioMetaData(inputWavPath: string): Promise<FfprobeData | null>;
-    /**flac转ogg
-     * @param inputFlacFile - 输入flac文件路径
-     * @param outputOggPath - 输出ogg文件路径
-     * @param quality       - 质量
-     */
-    static flac2ogg(inputFlacFile: string, outputOggPath: string, quality?: number): Promise<boolean>;
-    /**flac转wav
-     * @param inputFlacFile - 输入flac文件路径
-     * @param outputWavPath - 输出wav文件路径
-     */
-    static flac2wav(inputFlacFile: string, outputWavPath: string): Promise<boolean>;
-    /**wav转ogg
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputOggPath - 输出ogg文件路径
-     * @param quality       - 质量
-     */
-    static wav2ogg(inputWavPath: string, outputOggPath: string, quality?: number): Promise<boolean>;
-    /**剪切音频
-     * @param audioPath - 输入音频文件路径
-     * @param outPath   - 输出音频文件路径
-     * @param start     - 开始时间
-     * @param time      - 时长
-     */
-    static cutAudio(audioPath: string, outPath: string, start: number, time: number): Promise<boolean>;
-    /**删除首尾静音
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputWavPath - 输出wav文件路径
-     * @param threshold     - 静音阈值/dB
-     * @param silence       - 保留静音时长
-     */
-    static trimSilence(inputWavPath: string, outputWavPath: string, threshold?: number, silence?: number): Promise<boolean>;
-    /**重采样
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputWavPath - 输出wav文件路径
-     */
-    static resample(inputWavPath: string, outputWavPath: string, rate?: number): Promise<boolean>;
-    /**检查WAV文件是否为单声道
-     * @param filePath - 要检查的WAV文件路径
-     */
-    static isMono(filePath: string): Promise<boolean>;
-    /**wav转ogg多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param quality - 质量
-     * @param cpCount - 并发数
-     */
-    static wav2oggMP(ioMap: IOMap, quality?: number, cpCount?: number): Promise<void>;
-    /**flac转ogg多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param quality - 质量
-     * @param cpCount - 并发数
-     */
-    static flac2oggMP(ioMap: IOMap, quality?: number, cpCount?: number): Promise<void>;
-    /**删除静音多线程
-     * @param ioMap     - 输入输出路径映射
-     * @param threshold - 静音阈值/dB
-     * @param silence   - 保留静音时长
-     */
-    static trimSilenceMP(ioMap: IOMap, threshold?: number, silence?: number, cpCount?: number): Promise<void>;
-    /**重采样多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param rate    - 采样率
-     * @param cpCount - 并发数
-     */
-    static resampleMP(ioMap: IOMap, rate?: number, cpCount?: number): Promise<void>;
-}
-export default SFfmpegTool;
-export { SFfmpegTool };

package/dist/UtilFfmpegTools.js

@@ -1,291 +0,0 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SFfmpegTool = void 0;
-const fluent_ffmpeg_1 = __importDefault(require("fluent-ffmpeg"));
-const pathe_1 = __importDefault(require("pathe"));
-const fs = __importStar(require("fs"));
-const UtilLogger_1 = require("./UtilLogger");
-const UtilClass_1 = require("./UtilClass");
-const QuickExport_1 = require("./QuickExport");
-/**ffmpeg工具类
- */
-class SFfmpegTool {
-    /**静态构造函数 */
-    static init() {
-        const ffmpegPath = process?.env?.FFMPEG_PATH;
-        if (ffmpegPath != null) {
-            const exepath = pathe_1.default.join(ffmpegPath, "ffmpeg.exe");
-            SFfmpegTool.setFfmpegPath(exepath);
-        }
-    }
-    /**设置ffmpeg路径 */
-    static setFfmpegPath(ffmpegPath) {
-        fluent_ffmpeg_1.default.setFfmpegPath(ffmpegPath);
-    }
-    /**获取音频文件的元数据
-     * @param inputWavPath - 输入音频文件路径
-     * @returns 返回音频文件的元数据
-     */
-    static async getAudioMetaData(inputWavPath) {
-        return new Promise((resolve, reject) => {
-            fluent_ffmpeg_1.default.ffprobe(inputWavPath, function (err, metadata) {
-                if (err) {
-                    UtilLogger_1.SLogger.error("SFfmpegTool.getAudioMetaData 错误", err);
-                    resolve(null);
-                }
-                else {
-                    resolve(metadata);
-                }
-            });
-        });
-    }
-    /**flac转ogg
-     * @param inputFlacFile - 输入flac文件路径
-     * @param outputOggPath - 输出ogg文件路径
-     * @param quality       - 质量
-     */
-    static async flac2ogg(inputFlacFile, outputOggPath, quality = 10) {
-        const wavPath = pathe_1.default.join(pathe_1.default.dirname(inputFlacFile), `tmp_${pathe_1.default.basename(inputFlacFile, ".flac")}.wav`);
-        await SFfmpegTool.flac2wav(inputFlacFile, wavPath);
-        await SFfmpegTool.wav2ogg(wavPath, outputOggPath, quality);
-        await fs.promises.unlink(wavPath);
-        return true;
-    }
-    /**flac转wav
-     * @param inputFlacFile - 输入flac文件路径
-     * @param outputWavPath - 输出wav文件路径
-     */
-    static async flac2wav(inputFlacFile, outputWavPath) {
-        await new Promise((resolve, reject) => {
-            const ins = (0, fluent_ffmpeg_1.default)(inputFlacFile)
-                .audioCodec("pcm_s16le")
-                .save(outputWavPath)
-                .on("end", () => {
-                resolve(true);
-                ins.kill('SIGTERM');
-            })
-                .on("error", (err) => {
-                reject(err);
-                ins.kill('SIGTERM');
-            });
-        });
-        return true;
-    }
-    /**wav转ogg
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputOggPath - 输出ogg文件路径
-     * @param quality       - 质量
-     */
-    static async wav2ogg(inputWavPath, outputOggPath, quality = 10) {
-        //.audioQuality(10)
-        //.audioBitrate("192k")
-        //.audioChannels(channels)
-        //.noMetadata()
-        return new Promise((resolve, reject) => {
-            const ins = (0, fluent_ffmpeg_1.default)(inputWavPath)
-                .audioQuality(quality)
-                .audioCodec("libvorbis")
-                .save(outputOggPath)
-                .on("end", () => {
-                resolve(true);
-                ins.kill('SIGTERM');
-            })
-                .on("error", (err) => {
-                reject(err);
-                ins.kill('SIGTERM');
-            });
-        });
-    }
-    /**剪切音频
-     * @param audioPath - 输入音频文件路径
-     * @param outPath   - 输出音频文件路径
-     * @param start     - 开始时间
-     * @param time      - 时长
-     */
-    static async cutAudio(audioPath, outPath, start, time) {
-        return new Promise((resolve, reject) => {
-            const ins = (0, fluent_ffmpeg_1.default)(audioPath)
-                .setStartTime(start)
-                .setDuration(time)
-                .save(outPath)
-                .on("end", () => {
-                resolve(true);
-                ins.kill('SIGTERM');
-            })
-                .on("error", (err) => {
-                reject(err);
-                ins.kill('SIGTERM');
-            });
-        });
-    }
-    /**删除首尾静音
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputWavPath - 输出wav文件路径
-     * @param threshold     - 静音阈值/dB
-     * @param silence       - 保留静音时长
-     */
-    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}:detection=peak`)
-                .audioFilters("areverse")
-                .audioFilters(`silenceremove=start_periods=1:start_threshold=${threshold}dB:start_silence=${silence}:detection=peak`)
-                .audioFilters("areverse")
-                .save(outputWavPath)
-                .on("end", () => {
-                resolve(true);
-                ins.kill('SIGTERM');
-            })
-                .on("error", (err) => {
-                reject(err);
-                ins.kill('SIGTERM');
-            });
-        });
-    }
-    /**重采样
-     * @param inputWavPath  - 输入wav文件路径
-     * @param outputWavPath - 输出wav文件路径
-     */
-    static async resample(inputWavPath, outputWavPath, rate = 22050) {
-        return new Promise((resolve, reject) => {
-            const ins = (0, fluent_ffmpeg_1.default)(inputWavPath)
-                .audioFrequency(rate)
-                .save(outputWavPath)
-                .on("end", () => {
-                resolve(true);
-                ins.kill('SIGTERM');
-            })
-                .on("error", (err) => {
-                reject(err);
-                ins.kill('SIGTERM');
-            });
-        });
-    }
-    /**检查WAV文件是否为单声道
-     * @param filePath - 要检查的WAV文件路径
-     */
-    static async isMono(filePath) {
-        const metadata = await SFfmpegTool.getAudioMetaData(filePath);
-        if (metadata == null)
-            (0, QuickExport_1.throwError)("SFfmpegTool.isMono 获取音频元数据失败");
-        // 检查音频流的声道数
-        const audioStream = metadata.streams.find(stream => stream.codec_type === 'audio');
-        if (audioStream == null)
-            (0, QuickExport_1.throwError)("SFfmpegTool.isMono 未找到音频流");
-        return audioStream.channels === 1;
-    }
-    //多线程处理
-    /**wav转ogg多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param quality - 质量
-     * @param cpCount - 并发数
-     */
-    static async wav2oggMP(ioMap, quality = 10, cpCount = 16) {
-        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);
-        })
-            .append();
-    }
-    /**flac转ogg多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param quality - 质量
-     * @param cpCount - 并发数
-     */
-    static async flac2oggMP(ioMap, quality = 10, cpCount = 16) {
-        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);
-        })
-            .append();
-    }
-    /**删除静音多线程
-     * @param ioMap     - 输入输出路径映射
-     * @param threshold - 静音阈值/dB
-     * @param silence   - 保留静音时长
-     */
-    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);
-        })
-            .append();
-    }
-    /**重采样多线程
-     * @param ioMap   - 输入输出路径映射
-     * @param rate    - 采样率
-     * @param cpCount - 并发数
-     */
-    static async resampleMP(ioMap, rate = 22050, cpCount = 16) {
-        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);
-        })
-            .append();
-    }
-}
-exports.SFfmpegTool = SFfmpegTool;
-SFfmpegTool.init();
-/**多线程任务分割器
- * @param iomap   - 输入输出路径映射
- * @param cpCount - 并发数
- */
-function MPClip(iomap, cpCount = 16) {
-    let cpList = [];
-    for (let i = 0; i < cpCount; i++)
-        cpList.push({});
-    let cpCounter = 0;
-    for (let key in iomap) {
-        let cpIndex = cpCounter % cpCount;
-        cpCounter++;
-        cpList[cpIndex][key] = iomap[key];
-    }
-    return cpList;
-}
-/**ffmpeg流
- */
-class SFfmpegStream {
-    iomap;
-    cmdList = [];
-    constructor(iomap) {
-        this.iomap = iomap;
-    }
-    async save() { }
-    //执行函数
-    async cmdAreverse() { }
-}
-exports.default = SFfmpegTool;

package/jest.config.js

@@ -1,16 +0,0 @@
-
-
-
-
-module.exports = {
-    roots: ['./jest'],
-    transform: {
-        '^.+\\.tsx?$': 'ts-jest',
-    },
-    moduleNameMapper: {
-        '^@src/(.*)$': '<rootDir>/dist/$1',
-        '^@/(.*)$': '<rootDir>/$1',
-        '^@$': '<rootDir>/index'
-    },
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-};

package/scripts/compile.ps1

@@ -1,6 +0,0 @@
-npm run expand-macro
-Write-Output 开始删除原dist
-Remove-Item -Recurse -Force dist
-Write-Output 开始编译
-tsc -p tsconfig.compile.json
-tsc-alias -p tsconfig.compile.json

package/scripts/expand-macro.ps1

@@ -1,2 +0,0 @@
-Write-Output 开始展开宏
-npx zcli Expand-Macro

package/scripts/postinstall.js

@@ -1,61 +0,0 @@
-const path = require('path');
-const { UtilFT } = require("../index");
-
-const PACKAGE_PATH = path.join(__dirname,'..','package.json');
-const VERSION_PATH = path.join(__dirname,"..","..","version.json");
-//提示表
-const INFO_TABLE = {
-    "1.0.47":"UtilFT.fileSearch 函数与返回值发生变动, 请使用fileSearchRegex 或 fileSearchGlob",
-    "1.0.104":
-        "UtilFT.fleSearchGlob 更改参数 floder作为第一个参数 ingore 移入 可选参数对象 \n" +
-        "UtilFT.fleSearchRegex 添加了一个可选参数 \n" +
-        "UtilFT.createPath 更改参数 dir 移入 可选参数对象 \n" +
-        "UtilFT.createPathSync 更改参数 dir 移入 可选参数对象 \n" +
-        "UtilFT.ensurePathExists 更改参数 dir 移入 可选参数对象 \n" +
-        "UtilFT.ensurePathExistsSync 更改参数 dir 移入 可选参数对象 \n",
-    "1.0.128":"fileSearch 添加Sync版本, 默认改为异步函数",
-    "1.0.131":"repeatPromise 与 repeatPost 改为传入可选参数表模式",
-}
-const PKG_NAME = "utils";
-
-// 将版本号转换为可以比较的数字
-function versionToNumber(version) {
-    if(version==undefined) return 0;
-    return version.split('.').map(Number).reduce((acc, val) => acc * 1000 + val);
-}
-
-//显示提示
-function showUpgradeMessages(prevVersion, currentVersion) {
-    const prevVersionNumber = versionToNumber(prevVersion);
-    const currentVersionNumber = versionToNumber(currentVersion);
-    let hasOut = false;
-    // 遍历infoTable中的所有版本
-    for (const version in INFO_TABLE) {
-        const versionNumber = versionToNumber(version);
-        // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
-        if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
-            // 显示这个版本的提示信息
-            log(INFO_TABLE[version]);
-            hasOut=true;
-        }
-    }
-    return hasOut;
-}
-
-const log = ()=>undefined;
-
-async function main(){
-    const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
-    const currentVersion = packageTable.version;
-    await UtilFT.ensurePathExists(VERSION_PATH);
-    const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{default:{}});
-    const prevVersion = versionTable[PKG_NAME]?.version ?? "10000.0.0";
-
-    log(`${currentVersion} 版本已安装`);
-
-    const hasOut = showUpgradeMessages(prevVersion, currentVersion);
-
-    const ntable = Object.assign({},versionTable,{[PKG_NAME]:{version:currentVersion}});
-    await UtilFT.writeJSONFile(VERSION_PATH, ntable);
-}
-main()

package/scripts/release.ps1

@@ -1,3 +0,0 @@
-npm run compile
-Write-Output 开始发布
-npx zcli release

package/scripts/watch.ps1

@@ -1,10 +0,0 @@
-# 定义一个函数来运行脚本
-function New-Script {
-    param($command)
-    # 在后台运行命令
-    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
-}
-
-# 开始运行脚本
-New-Script "tsc -w -p tsconfig.compile.json"
-New-Script "tsc-alias -w -p tsconfig.compile.json"

package/src/QuickExport.ts

@@ -1,70 +0,0 @@
-import { UtilFT } from "./UtilFileTools";
-import { UtilFunc } from "./UtilFunctions";
-import { Outcome } from "./UtilInterfaces";
-import { Failed, None, NoneOut, Success } from "./UtilSymbol";
-
-export const {
-    outcome,
-    matchProc,
-    sucesProc,
-    isFailed,
-    isSafeNumber,
-    isSuccess,
-    likeNone,
-    expect,
-    assertType,
-    assertLiteral,
-    deepClone,
-    sleep,
-    stringifyJToken,
-    getTime,
-    mapEntries,
-    dedent,
-    throwError,
-    eitherize,
-    taskEitherize,
-    memoize,
-    ivk,l2s,s2l,
-} = UtilFunc;
-
-export const {
-    stylizePath  ,
-    posixizePath ,
-    win32izePath ,
-    currosizePath,
-} = UtilFT;
-
-if(false){
-    let aaser = assertLiteral({a:1})
-
-    let a:"asd"|"dsa" = null as any;
-    const r = matchProc(a,{
-        "asd":(a)=>"ssa" as const,
-        "dsa":(b)=>"ssb" as const,
-    })
-    let b:Outcome<"a","123">|NoneOut = null as any;
-    const r1 = matchProc(b,{
-        "a":(a,s)=>"ssa" as const,
-        [None]:(b,s)=>"ssb" as const,
-    })
-    let udt = outcome("ssa","None");
-
-    type test = Outcome<"a"|"b",any> extends Outcome<"a",12>|Outcome<"b",34>
-        ? "suc" : "fal"
-    let assa = isFailed(null as any as Failed)
-    let assb = isFailed(null as any as Failed|Success)
-    let assc = isFailed(null as any as Success)
-    let asssc = isFailed(null)
-    let assa1 = isFailed(null as any as Outcome<Failed,unknown>)
-    let assb1 = isFailed(null as any as Outcome<Failed|Success,unknown>)
-    let assc1 = isFailed(null as any as Outcome<Success,unknown>)
-
-    let proct = sucesProc(null as any as Outcome<Failed|Success,"123">|Outcome<Failed,"1234">|Outcome<Success,"1s23">,
-        (s)=>"ssa" as const,
-        (f)=>"ssad" as const,
-        ()=>123 as const)
-
-    let matt = matchProc(null as any as Outcome<symbol,123>,{
-
-    })
-}