@zwa73/utils 1.0.19 → 1.0.21

package/dist/UtilCom.js

@@ -90,26 +90,26 @@ function shttpPost(json, options, timeLimit = -1) {
     let jsonStr = JSON.stringify(json);
     return new Promise(function (resolve, rejecte) {
         let req = http.request(options, function (res) {
-            //请求超时
-            if (hasTimeLimit) {
-                res.setTimeout(timeLimit, function () {
-                    //res.abort();
-                    console.log("shttpPost 接收反馈超时: " + timeLimit + " ms");
-                    resolve(null);
+            try {
+                //请求超时
+                if (hasTimeLimit) {
+                    res.setTimeout(timeLimit, () => {
+                        //res.abort();
+                        throw "shttpPost 接收反馈超时: " + timeLimit + " ms";
+                    });
+                }
+                let resdata = "";
+                res.setEncoding('utf8');
+                res.on('data', (chunk) => {
+                    //console.log(chunk);
+                    resdata += chunk;
                 });
-            }
-            let resdata = "";
-            res.setEncoding('utf8');
-            res.on('data', function (chunk) {
-                //console.log(chunk);
-                resdata += chunk;
-            });
-            res.on('error', function (e) {
-                console.log("shttpPost 接收反馈错误:" + e);
-                resolve(null);
-            });
-            res.on('end', function () {
-                if (resdata != "") {
+                res.on('error', (e) => {
+                    throw "shttpPost 接收反馈错误:" + e;
+                });
+                res.on('end', function () {
+                    if (resdata == "")
+                        throw "shttpPost 接收反馈错误: resdata 为空";
                     try {
                         let obj = JSON.parse(resdata);
                         console.log("shttpPost 接受信息:\r\n" + JSON.stringify(obj));
@@ -118,16 +118,17 @@ function shttpPost(json, options, timeLimit = -1) {
                         return;
                     }
                     catch (e) {
-                        console.log("shttpPost 接收反馈错误:" + e);
-                        console.log("原始字符串:" + resdata);
-                        resolve(null);
-                        return;
+                        throw "shttpPost 接收反馈错误:" + e + "\n原始字符串:" + resdata;
                     }
-                }
-                console.log("shttpPost 接收反馈错误: resdata 为空");
+                });
+            }
+            catch (err) {
+                if (typeof err != "string")
+                    throw err;
+                console.log(err);
                 resolve(null);
                 return;
-            });
+            }
         });
         //请求超时
         if (hasTimeLimit) {

package/dist/UtilFfmpegTools.d.ts

@@ -8,6 +8,9 @@ export type IOMap = {
 /**ffmpeg工具类
  */
 declare class SFfmpegTool {
+    /**静态构造函数
+     */
+    static init(): void;
     /**设置ffmpeg路径
      */
     static setFfmpegPath(ffmpegPath: string): void;

package/dist/UtilFfmpegTools.js

@@ -8,6 +8,17 @@ const UtilClass_1 = require("./UtilClass");
 /**ffmpeg工具类
  */
 class SFfmpegTool {
+    /**静态构造函数
+     */
+    static init() {
+        let ffmpegPath = process.env.FFMPEG_PATH;
+        if (ffmpegPath != null) {
+            let exepath = path.join(ffmpegPath, "ffmpeg.exe");
+            //console.log("ffmpegPath")
+            //console.log(exepath)
+            SFfmpegTool.setFfmpegPath(exepath);
+        }
+    }
     /**设置ffmpeg路径
      */
     static setFfmpegPath(ffmpegPath) {
@@ -182,6 +193,7 @@ class SFfmpegTool {
     }
 }
 exports.SFfmpegTool = SFfmpegTool;
+SFfmpegTool.init();
 /**多线程任务分割器
  * @param {IOMap} iomap - 输入输出路径映射
  * @param {number} cpCount - 并发数

package/dist/UtilInterfaces.d.ts

@@ -17,3 +17,10 @@ export type MessageEntity = {
     role: string;
     content: string;
 };
+export interface IJObjectData {
+    saveToJObject(): JObject;
+}
+export type JObjectData = {
+    [key: string]: JToken | JObjectData | IJObjectData;
+};
+export declare function parseJObjectData(): void;

package/dist/UtilInterfaces.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseJObjectData = void 0;
+function parseJObjectData() { }
+exports.parseJObjectData = parseJObjectData;

package/package.json

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

package/src/UtilCom.ts

@@ -101,29 +101,29 @@ export function shttpPost(json:JObject,options:Object,timeLimit:number=-1):Promi
 
     return new Promise(function(resolve, rejecte){
         let req = http.request(options, function(res){
-            //请求超时
-            if(hasTimeLimit){
-                res.setTimeout(timeLimit, function() {
-                    //res.abort();
-                    console.log("shttpPost 接收反馈超时: "+timeLimit+" ms");
-                    resolve(null);
-                });
-            }
+            try{
+                //请求超时
+                if(hasTimeLimit){
+                    res.setTimeout(timeLimit, ()=>{
+                        //res.abort();
+                        throw "shttpPost 接收反馈超时: "+timeLimit+" ms";
+                    });
+                }
 
-            let resdata = "";
-            res.setEncoding('utf8');
-            res.on('data',function(chunk){
-                //console.log(chunk);
-                resdata+=chunk;
-            });
+                let resdata = "";
+                res.setEncoding('utf8');
+                res.on('data',(chunk)=>{
+                    //console.log(chunk);
+                    resdata+=chunk;
+                });
 
-            res.on('error',function(e){
-                console.log("shttpPost 接收反馈错误:"+e);
-                resolve(null);
-            });
+                res.on('error',(e)=>{
+                    throw "shttpPost 接收反馈错误:"+e
+                });
 
-            res.on('end',function(){
-                if(resdata!=""){
+                res.on('end',function(){
+                    if(resdata=="")
+                        throw "shttpPost 接收反馈错误: resdata 为空";
                     try{
                         let obj = JSON.parse(resdata);
                         console.log("shttpPost 接受信息:\r\n"+JSON.stringify(obj));
@@ -132,17 +132,16 @@ export function shttpPost(json:JObject,options:Object,timeLimit:number=-1):Promi
                         return;
                     }
                     catch(e){
-                        console.log("shttpPost 接收反馈错误:"+e);
-                        console.log("原始字符串:"+resdata);
-                        resolve(null);
-                        return;
+                        throw "shttpPost 接收反馈错误:"+e+"\n原始字符串:"+resdata;
                     }
-                }
-                console.log("shttpPost 接收反馈错误: resdata 为空");
+                });
+            }catch(err){
+                if(typeof err != "string")
+                    throw err;
+                console.log(err);
                 resolve(null);
                 return;
-            });
-
+            }
         });
 
         //请求超时

package/src/UtilFfmpegTools.ts

@@ -12,6 +12,17 @@ export type IOMap = { [key: string]: string };
 /**ffmpeg工具类
  */
 class SFfmpegTool {
+    /**静态构造函数
+     */
+    static init() {
+        let ffmpegPath = process.env.FFMPEG_PATH;
+        if(ffmpegPath!=null){
+            let exepath = path.join(ffmpegPath,"ffmpeg.exe");
+            //console.log("ffmpegPath")
+            //console.log(exepath)
+            SFfmpegTool.setFfmpegPath(exepath);
+        }
+    }
     /**设置ffmpeg路径
      */
     static setFfmpegPath(ffmpegPath: string) {
@@ -221,6 +232,8 @@ class SFfmpegTool {
             .appendOperations();
     }
 }
+SFfmpegTool.init();
+
 
 /**多线程任务分割器
  * @param {IOMap} iomap - 输入输出路径映射

package/src/UtilInterfaces.ts

@@ -21,4 +21,13 @@ export type AnyObject={
 export type MessageEntity={
 	role: string;
 	content:string;
-}
+}
+
+export interface IJObjectData{
+	saveToJObject():JObject;
+}
+export type JObjectData = {
+    [key:string]:JToken|JObjectData|IJObjectData;
+}
+
+export function parseJObjectData(){}

package/test.js

@@ -1,4 +1,4 @@
-let {SList,SHashMap,SEntry,SFfmpegTool,fileSearch} = require('./dist');
+let {SList,SHashMap,SEntry,SFfmpegTool,fileSearch,sleep} = require('./dist');
 
 let slist = new SList([1,2,3,3,4,5,6]);
 slist.each(val => console.log(val));
@@ -11,18 +11,23 @@ map.put("789",111)
 for(let {key,value} of map)
     console.log(key,value)
 
-SFfmpegTool.setFfmpegPath("E:/系统工具/ffmpeg-master-latest-win64-gpl/bin/ffmpeg.exe");
-(async function(){
+//SFfmpegTool.setFfmpegPath("E:/系统工具/ffmpeg-master-latest-win64-gpl/bin/ffmpeg.exe");
+async function main(){
+	//SFfmpegTool.setFfmpegPath("E:/系统工具/ffmpeg-master-latest-win64-gpl/bin/ffmpeg.exe");
+	//console.log(111111111111)
     let data = await SFfmpegTool.getAudioMetaData("input.wav");
+	//console.log(22)
     console.log(data);
-
-    let fileMap = fileSearch("F:/Sosarciel/SoulTide-Collection-VITS-TrainingSet/TrainingSet/Akaset/sliced_audio",'.*\\.wav');
-    let ioMap = {};
-    for(let key in fileMap){
-        let value = fileMap[key];
-        ioMap[value] = "./test/"+key;
-    }
+	//
+    //let fileMap = fileSearch("F:/Sosarciel/SoulTide-Collection-VITS-TrainingSet/TrainingSet/Akaset/sliced_audio",'.*\\.wav');
+    //let ioMap = {};
+    //for(let key in fileMap){
+    //    let value = fileMap[key];
+    //    ioMap[value] = "./test/"+key;
+    //}
     //console.log(ioMap)
-    await SFfmpegTool.resampleMP(ioMap)
-}())
+    //await SFfmpegTool.resampleMP(ioMap)
+}
+main();
+