@zwa73/utils 1.0.180 → 1.0.181

package/dist/UtilCom.js

@@ -28,7 +28,7 @@ var UtilCom;
                     //请求超时
                     if (hasTimeLimit) {
                         res.setTimeout(timeLimit, () => {
-                            UtilLogger_1.SLogger.warn(`${flagName} 接收反馈超时(timeLimit): ${timeLimit} ms`);
+                            UtilLogger_1.SLogger.warn(`${flagName} 接收反馈超时: ${timeLimit} ms`);
                             resolve(undefined);
                         });
                     }
@@ -60,13 +60,13 @@ var UtilCom;
             //请求超时
             if (hasTimeLimit) {
                 req.setTimeout(timeLimit, () => {
-                    UtilLogger_1.SLogger.warn(`${flagName} 发送请求超时(timeLimit): ${timeLimit} ms`);
-                    req.destroy();
-                });
-                req.on('timeout', () => {
-                    UtilLogger_1.SLogger.warn(`${flagName} 发送请求超时(timeout): ${timeLimit} ms`);
+                    UtilLogger_1.SLogger.warn(`${flagName} 发送请求超时: ${timeLimit} ms`);
                     req.destroy();
                 });
+                //req.on('timeout', ()=>{
+                //    SLogger.warn(`${flagName} 发送请求超时(timeout): ${timeLimit} ms`);
+                //    req.destroy();
+                //});
             }
             req.on('error', (e) => {
                 UtilLogger_1.SLogger.warn(`${flagName} 发送请求错误:${e}`);

package/package.json

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

package/src/UtilCom.ts

@@ -1,8 +1,8 @@
-import { AnyString, JObject, PRecord, ReqVerifyFn } from "@src/UtilInterfaces";
+import { AnyString, JObject, PRecord, ReqVerifyFn } from "@/src/UtilInterfaces";
 import https from 'https';
 import http from 'http';
-import { SLogger } from "@src/UtilLogger";
-import { RepeatPromiseOpt, RepeatPromiseResult, UtilFunc } from "@src/UtilFunctions";
+import { SLogger } from "@/src/UtilLogger";
+import { RepeatPromiseOpt, RepeatPromiseResult, UtilFunc } from "@/src/UtilFunctions";
 import qs from "querystring";
 
 /**网络请求返回值 */
@@ -78,7 +78,7 @@ export async function comReq<T>(
                 //请求超时
                 if(hasTimeLimit){
                     res.setTimeout(timeLimit!, ()=>{
-                        SLogger.warn(`${flagName} 接收反馈超时(timeLimit): ${timeLimit} ms`);
+                        SLogger.warn(`${flagName} 接收反馈超时: ${timeLimit} ms`);
                         resolve(undefined);
                     });
                 }
@@ -113,13 +113,13 @@ export async function comReq<T>(
         //请求超时
         if(hasTimeLimit){
             req.setTimeout(timeLimit!, ()=>{
-                SLogger.warn(`${flagName} 发送请求超时(timeLimit): ${timeLimit} ms`);
-                req.destroy();
-            });
-            req.on('timeout', ()=>{
-                SLogger.warn(`${flagName} 发送请求超时(timeout): ${timeLimit} ms`);
+                SLogger.warn(`${flagName} 发送请求超时: ${timeLimit} ms`);
                 req.destroy();
             });
+            //req.on('timeout', ()=>{
+            //    SLogger.warn(`${flagName} 发送请求超时(timeout): ${timeLimit} ms`);
+            //    req.destroy();
+            //});
         }
 
         req.on('error', (e)=>{

package/src/UtilFfmpegTools.ts

@@ -2,7 +2,7 @@ import { FfprobeData } from "fluent-ffmpeg";
 import fluentFfmpeg from "fluent-ffmpeg";
 import path from "pathe";
 import * as fs from "fs";
-import { SLogger } from "@src/UtilLogger";
+import { SLogger } from "@/src/UtilLogger";
 import { Stream } from "./UtilClass";
 
 /**输入输出路径映射

package/src/UtilFileTools.ts

@@ -1,8 +1,8 @@
 import * as fs from "fs";
 import path from 'pathe';
 import * as os from "os";
-import { JObject, JToken } from "@src/UtilInterfaces";
-import { SLogger } from "@src/UtilLogger";
+import { JObject, JToken } from "@/src/UtilInterfaces";
+import { SLogger } from "@/src/UtilLogger";
 import * as JSON5 from 'json5';
 import { globSync, glob } from "glob";
 import { UtilFunc } from "./UtilFunctions";

package/src/UtilFunctions.ts

@@ -1,7 +1,7 @@
 import * as crypto from "crypto";
-import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends } from "@src/UtilInterfaces";
+import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends } from "@/src/UtilInterfaces";
 import * as cp from "child_process";
-import { LogLevel, SLogger } from "@src/UtilLogger";
+import { LogLevel, SLogger } from "@/src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
 import { LogTimeAsync } from "./UtilDecorators";
 import opath from 'path';