@zwa73/utils 1.0.130 → 1.0.131

package/dist/UtilCom.d.ts

@@ -2,7 +2,7 @@ import { JObject, ReqVerifyFn } from "./UtilInterfaces";
 import { RepeatPromiseOpt } from "./UtilFunctions";
 type RepeatPostOpt = Partial<{
     /**httppost 超时中断时间限制 */
-    post_timelimit?: number;
+    postTimeLimit?: number;
 }> & RepeatPromiseOpt;
 /**网络工具 */
 export declare namespace UtilCom {

package/dist/UtilCom.js

@@ -149,9 +149,9 @@ var UtilCom;
      */
     async function sRepeatPost(posttype, json, options, verifyFn, opt = {}) {
         opt.count = opt.count ?? 3;
-        opt.try_interval = opt.try_interval ?? 180;
-        opt.try_delay = opt.try_delay ?? 1;
-        const procFn = () => sPost(posttype, json, options, opt.post_timelimit);
+        opt.tryInterval = opt.tryInterval ?? 180;
+        opt.tryDelay = opt.tryDelay ?? 1;
+        const procFn = () => sPost(posttype, json, options, opt.postTimeLimit);
         return UtilFunctions_1.UtilFunc.repeatPromise(procFn, verifyFn, opt);
     }
     /**重复一个 https POST请求并接受数据

package/dist/UtilFunctions.d.ts

@@ -15,9 +15,9 @@ export type RepeatPromiseOpt = Partial<{
     /**尝试间隔时间 超过此事件会重新创建新的Promise
      * 同时等待新的与旧的Promise 秒 默认180
      */
-    try_interval?: number;
+    tryInterval?: number;
     /**尝试延迟 重新尝试时会先等待此秒数 秒 默认0*/
-    try_delay?: number;
+    tryDelay?: number;
 }>;
 type SuccessOut<T> = Outcome<Success, T>;
 type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;

package/dist/UtilFunctions.js

@@ -174,13 +174,13 @@ class UtilFunc {
      */
     static async repeatPromise(procFn, verifyFn, opt = {}) {
         opt.count = opt.count ?? 3;
-        opt.try_interval = opt.try_interval ?? 180;
-        let { count, try_interval } = opt;
+        opt.tryInterval = opt.tryInterval ?? 180;
+        let { count, tryInterval } = opt;
         /**是否含有超时时间 */
-        const hasRepeatTime = (try_interval >= 5);
+        const hasRepeatTime = (tryInterval >= 5);
         //转换为毫秒
         if (hasRepeatTime)
-            try_interval *= 1000;
+            tryInterval *= 1000;
         //验证处理函数
         if (verifyFn === undefined)
             verifyFn = () => UtilSymbol_1.Success;
@@ -190,8 +190,8 @@ class UtilFunc {
         try {
             //根据最大重试次数限制进行循环
             for (let i = 0; i < count;) {
-                if (i > 0 && opt.try_delay)
-                    await this.sleep(opt.try_delay * 1000);
+                if (i > 0 && opt.tryDelay)
+                    await this.sleep(opt.tryDelay * 1000);
                 UtilLogger_1.SLogger.info(`开始第 ${i + 1} 次 repeatPromise`);
                 //如果 plist 中当前下标的任务还未创建 则 创建当前任务
                 if (plist.length < i + 1) {
@@ -200,7 +200,7 @@ class UtilFunc {
                         const result = await procFn();
                         const stat = await verifyFn(result);
                         return { result, stat, index };
-                    }, hasRepeatTime ? try_interval : undefined));
+                    }, hasRepeatTime ? tryInterval : undefined));
                 }
                 //等待任意任务 或当前计时器完成
                 const currObj = await Promise.race([...plist]);
@@ -211,7 +211,7 @@ class UtilFunc {
                         const res = await currObj.result;
                         rslove(UtilFunc.outcome(UtilSymbol_1.Success, res));
                     });
-                    UtilLogger_1.SLogger.warn(`第 ${i + 1} 次 repeatPromise 超时 ${try_interval} ms 开始重试`);
+                    UtilLogger_1.SLogger.warn(`第 ${i + 1} 次 repeatPromise 超时 ${tryInterval} ms 开始重试`);
                     i++;
                     continue;
                 }
@@ -222,7 +222,7 @@ class UtilFunc {
                         UtilLogger_1.SLogger.info(`第 ${postresult.index + 1} 次 repeatPromise 成功`);
                         //非当前
                         if (postresult.index != i)
-                            UtilLogger_1.SLogger.info(`成功的 promise 非当前 promise 考虑增大重试时间\n当前index: ${i}\n当前重试时间: ${try_interval}`);
+                            UtilLogger_1.SLogger.info(`成功的 promise 非当前 promise 考虑增大重试时间\n当前index: ${i}\n当前重试时间: ${tryInterval}`);
                         return postresult.result;
                     },
                     [UtilSymbol_1.Terminated]() {

package/package.json

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

package/scripts/postinstall.js

@@ -15,6 +15,7 @@ const INFO_TABLE = {
         "UtilFT.ensurePathExists 更改参数 dir 移入 可选参数对象 \n" +
         "UtilFT.ensurePathExistsSync 更改参数 dir 移入 可选参数对象 \n",
     "1.0.128":"fileSearch 添加Sync版本, 默认改为异步函数",
+    "1.0.131":"repeatPromise 与 repeatPost 改为传入可选参数表模式",
 }
 
 // 将版本号转换为可以比较的数字
@@ -31,6 +32,7 @@ function showUpgradeMessages(prevVersion, currentVersion) {
     // 遍历infoTable中的所有版本
     for (const version in INFO_TABLE) {
         const versionNumber = versionToNumber(version);
+        console.log(versionNumber,prevVersionNumber,currentVersionNumber)
         // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
         if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
             // 显示这个版本的提示信息
@@ -47,17 +49,15 @@ async function main(){
     const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
     const currentVersion = packageTable.version;
     await UtilFT.ensurePathExists(VERSION_PATH);
-    const versionTable = Object.assign({},
-        await UtilFT.loadJSONFile(VERSION_PATH,{}),
-        {utils:{version:currentVersion}});
+    const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{})
     const prevVersion = versionTable.utils.version;
 
     console.log(`${currentVersion} 版本已安装`);
     // 使用这个函数来显示升级信息
     const hasOut = showUpgradeMessages(prevVersion, currentVersion);
 
-    versionTable.utils.version = currentVersion;
-    await UtilFT.writeJSONFile(VERSION_PATH, versionTable);
+    const ntable = Object.assign({},versionTable,{utils:{version:currentVersion}});
+    await UtilFT.writeJSONFile(VERSION_PATH, ntable);
 
     if(!hasOut) return;
     const rl = readline.createInterface({

package/src/UtilCom.ts

@@ -8,7 +8,7 @@ import { RepeatPromiseOpt, UtilFunc } from "@src/UtilFunctions";
 
 type RepeatPostOpt = Partial<{
     /**httppost 超时中断时间限制 */
-    post_timelimit?   : number;
+    postTimeLimit?   : number;
 }> & RepeatPromiseOpt;
 
 /**网络工具 */
@@ -141,10 +141,10 @@ export function shttpPost(json:JObject,options:Object,timeLimit?:number):Promise
  */
 async function sRepeatPost(posttype:"http"|"https",json:JObject,options:Object,verifyFn?:ReqVerifyFn<JObject|null>,opt:RepeatPostOpt={}):Promise<JObject|null>{
     opt.count        = opt.count??3;
-    opt.try_interval = opt.try_interval??180;
-    opt.try_delay    = opt.try_delay??1;
+    opt.tryInterval = opt.tryInterval??180;
+    opt.tryDelay    = opt.tryDelay??1;
 
-    const procFn = ()=>sPost(posttype,json,options,opt.post_timelimit);
+    const procFn = ()=>sPost(posttype,json,options,opt.postTimeLimit);
     return UtilFunc.repeatPromise(procFn,verifyFn,opt);
 }
 

package/src/UtilFunctions.ts

@@ -25,9 +25,9 @@ export type RepeatPromiseOpt = Partial<{
     /**尝试间隔时间 超过此事件会重新创建新的Promise
      * 同时等待新的与旧的Promise 秒 默认180
      */
-    try_interval? :number;
+    tryInterval? :number;
     /**尝试延迟 重新尝试时会先等待此秒数 秒 默认0*/
-    try_delay?    :number;
+    tryDelay?    :number;
 }>
 
 type SuccessOut<T> = Outcome<Success,T>;
@@ -199,12 +199,12 @@ static getNeverResolvedPromise<T>():Promise<T>{
 @LogTimeAsync("repeatPromise ",true)
 static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt:RepeatPromiseOpt = {}):Promise<T|null>{
     opt.count = opt.count??3;
-    opt.try_interval = opt.try_interval??180;
-    let {count,try_interval} = opt;
+    opt.tryInterval = opt.tryInterval??180;
+    let {count,tryInterval} = opt;
     /**是否含有超时时间 */
-    const hasRepeatTime = (try_interval>=5);
+    const hasRepeatTime = (tryInterval>=5);
     //转换为毫秒
-    if(hasRepeatTime) try_interval*=1000;
+    if(hasRepeatTime) tryInterval*=1000;
 
     //验证处理函数
     if(verifyFn===undefined)
@@ -220,7 +220,7 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt
     try{
         //根据最大重试次数限制进行循环
         for(let i=0;i<count;){
-            if(i>0 && opt.try_delay) await this.sleep(opt.try_delay*1000);
+            if(i>0 && opt.tryDelay) await this.sleep(opt.tryDelay*1000);
             SLogger.info(`开始第 ${i+1} 次 repeatPromise`);
             //如果 plist 中当前下标的任务还未创建 则 创建当前任务
             if(plist.length<i+1){
@@ -229,7 +229,7 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt
                     const result = await procFn();
                     const stat = await verifyFn!(result);
                     return {result, stat, index}
-                },hasRepeatTime?try_interval:undefined));
+                },hasRepeatTime?tryInterval:undefined));
             }
 
             //等待任意任务 或当前计时器完成
@@ -242,7 +242,7 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt
                     const res = await currObj.result;
                     rslove(UtilFunc.outcome(Success,res));
                 })
-                SLogger.warn(`第 ${i+1} 次 repeatPromise 超时 ${try_interval} ms 开始重试`);
+                SLogger.warn(`第 ${i+1} 次 repeatPromise 超时 ${tryInterval} ms 开始重试`);
                 i++;
                 continue;
             }
@@ -254,7 +254,7 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt
                     SLogger.info(`第 ${postresult.index+1} 次 repeatPromise 成功`);
                     //非当前
                     if(postresult.index!=i)
-                        SLogger.info(`成功的 promise 非当前 promise 考虑增大重试时间\n当前index: ${i}\n当前重试时间: ${try_interval}`);
+                        SLogger.info(`成功的 promise 非当前 promise 考虑增大重试时间\n当前index: ${i}\n当前重试时间: ${tryInterval}`);
                     return postresult.result;
                 },
                 [Terminated](){