@zwa73/utils 1.0.46 → 1.0.47

package/dist/UtilFunctions.js

@@ -108,6 +108,9 @@ var UtilFunc;
      * @returns {Promise<T|null>}       - 结果 null 为全部失败/超时
      */
     async function repeatPromise(procFn, verifyFn, repeatCount = 3, repeatTime = 180) {
+        //计时
+        const timeflag = "repeatPromise " + UtilFunc.genUUID();
+        UtilLogger_1.SLogger.time(timeflag);
         //转换为毫秒
         const hasRepeatTime = (repeatTime >= 10);
         if (hasRepeatTime)
@@ -130,58 +133,70 @@ var UtilFunc;
             resolveFn = null;
         };
         //进行中的请求
-        const plist = new Array(repeatCount)
-            .fill(UtilFunc.getNeverResolvedPromise());
-        for (let i = 0; i < repeatCount;) {
-            UtilLogger_1.SLogger.info("开始第 " + (i + 1) + " 次 repeatPromise");
-            //创建当前任务
-            plist[i] = procFn().then(result => ({ result, stat: verifyFn(result), index: i }));
-            //创建定时器
-            if (timerP == null) {
-                timerP = new Promise(function (resolve, rejecte) {
-                    resolveFn = resolve;
-                    timer = setTimeout(() => resolve("Timeout"), hasRepeatTime ? repeatTime : Infinity); //无限制则无限时间
-                });
-            }
-            //等待完成
-            const currObj = await Promise.race([...plist, timerP]);
-            //超时处理
-            if (currObj == "Timeout") {
-                UtilLogger_1.SLogger.warn(`第 ${(i + 1)} 次 repeatPromise 超时 ${repeatTime} ms 开始重试`);
-                clearTimer();
-                i++;
-                continue;
-            }
-            else {
+        const plist = [];
+        //开始处理
+        try {
+            for (let i = 0; i < repeatCount;) {
+                UtilLogger_1.SLogger.info(`开始第 ${i + 1} 次 repeatPromise`);
+                //创建当前任务
+                if (plist.length < i + 1) {
+                    plist.push(procFn().then(result => ({ result, stat: verifyFn(result), index: i })));
+                }
+                //创建定时器
+                if (timerP == null) {
+                    timerP = new Promise(function (resolve, rejecte) {
+                        resolveFn = resolve;
+                        timer = setTimeout(() => resolve("Timeout"), hasRepeatTime ? repeatTime : Infinity); //无限制则无限时间
+                    });
+                }
+                //等待完成
+                const currObj = await Promise.race([...plist, timerP]);
+                //超时处理
+                if (currObj == "Timeout") {
+                    UtilLogger_1.SLogger.warn(`第 ${i + 1} 次 repeatPromise 超时 ${repeatTime} ms 开始重试`);
+                    clearTimer();
+                    i++;
+                    continue;
+                }
                 const poststat = await currObj.stat;
                 switch (poststat) {
                     case "Completed": //完成
-                        UtilLogger_1.SLogger.info("第 " + (currObj.index + 1) + " 次 repeatPromise 成功");
-                        clearTimer();
+                        UtilLogger_1.SLogger.info(`第 ${currObj.index + 1} 次 repeatPromise 成功`);
+                        //非当前
+                        if (currObj.index != i)
+                            UtilLogger_1.SLogger.info(`成功的 promise 非当前 promise 考虑增大重试间隔\n当前index: ${i}\n当前间隔: ${repeatTime}`);
                         return currObj.result;
                     case "Terminated": //终止
-                        UtilLogger_1.SLogger.warn("第 " + (currObj.index + 1) + " 次 repeatPromise 终止 停止重试");
-                        clearTimer();
+                        UtilLogger_1.SLogger.warn(`第 ${currObj.index + 1} 次 repeatPromise 终止 停止重试`);
                         return currObj.result;
                     case "Failed": //验证失败
+                        //抛弃失败
+                        plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
                         //是当前
                         if (currObj.index == i) {
-                            UtilLogger_1.SLogger.warn("第 " + (currObj.index + 1) + " 次 repeatPromise 失败 开始重试");
+                            UtilLogger_1.SLogger.warn(`第 ${currObj.index + 1} 次 repeatPromise 失败 开始重试`);
                             clearTimer();
                             i++;
                             continue;
                         }
                         //非当前
-                        UtilLogger_1.SLogger.warn("第 " + (currObj.index + 1) + " 次 repeatPromise 失败");
-                        //抛弃失败
-                        plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
+                        UtilLogger_1.SLogger.warn(`第 ${currObj.index + 1} 次 repeatPromise 失败`);
                         continue;
                 }
             }
+            //全部失败或超时则返回null
+            UtilLogger_1.SLogger.warn(`${repeatCount} 次 repeatPromise 尝试均失败`);
+            return null;
+        }
+        catch (err) {
+            UtilLogger_1.SLogger.warn(`repeatPromise 发生错误`, err);
+            return null;
+        }
+        finally {
+            //清理
+            clearTimer();
+            UtilLogger_1.SLogger.timeEnd(timeflag);
         }
-        clearTimer();
-        //全部失败或超时则返回null
-        return null;
     }
     UtilFunc.repeatPromise = repeatPromise;
 })(UtilFunc = exports.UtilFunc || (exports.UtilFunc = {}));

package/dist/UtilInterfaces.d.ts

@@ -54,15 +54,6 @@ type ExclusiveRecursive<B, T, K extends string[], R extends unknown[] = []> = R[
 export type ExclusiveRecord<B, T, K extends string[], TMP = ExclusiveRecursive<B, T, K>> = TMP[keyof TMP];
 /**符合JObject约束的互斥表 */
 export type ExclusiveJObject<B extends JObject, T extends JToken, K extends string[], TMP extends JArray = ExclusiveRecursive<B, T, K>> = TMP[number];
-/**进行中的请求 */
-export type ProcessingPromise<T> = {
-    /**主体请求 */
-    result: T;
-    /**请求状态 */
-    stat: PromiseStat | Promise<PromiseStat>;
-    /**请求下标/序号 */
-    index: number;
-};
 /**请求完成状态 成功/失败/终止
  * 成功/终止 将直接返回
  * 失败 将重试

package/package.json

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

package/src/UtilCom.ts

@@ -1,4 +1,4 @@
-import { JObject, ProcessingPromise, PromiseVerifyFn, stringifyJToken } from "./UtilInterfaces";
+import { JObject, PromiseVerifyFn, stringifyJToken } from "./UtilInterfaces";
 import * as https from 'https';
 import * as http from 'http';
 import { SLogger } from "./UtilLogger";

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { JToken, ProcessingPromise, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
+import { JToken, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "./UtilInterfaces";
 import * as cp from "child_process";
 import { SLogger } from "./UtilLogger";
 
@@ -98,6 +98,16 @@ export function getNeverResolvedPromise<T>():Promise<T>{
     return NeverResolvedPromise as Promise<T>;
 }
 
+/**进行中的请求 */
+type ProcessingPromise<T> = {
+    /**主体请求 */
+    result:T;
+    /**请求状态 */
+    stat:PromiseStat|Promise<PromiseStat>;
+    /**请求下标/序号 */
+    index:number;
+};
+
 /**重复尝试promise  
  * @async
  * @param {PromiseProcFn<T>} [procFn]       - 发起函数
@@ -108,6 +118,11 @@ export function getNeverResolvedPromise<T>():Promise<T>{
  */
 export async function repeatPromise<T>(procFn:PromiseProcFn<T>,verifyFn?:PromiseVerifyFn<T>,
     repeatCount:number=3,repeatTime:number=180):Promise<T|null>{
+
+    //计时
+    const timeflag = "repeatPromise "+UtilFunc.genUUID();
+    SLogger.time(timeflag);
+
     //转换为毫秒
     const hasRepeatTime = (repeatTime>=10);
     if(hasRepeatTime) repeatTime*=1000;
@@ -132,60 +147,72 @@ export async function repeatPromise<T>(procFn:PromiseProcFn<T>,verifyFn?:Promise
     }
 
     //进行中的请求
-	const plist:Promise<ProcessingPromise<T>>[] = new Array(repeatCount)
-        .fill(UtilFunc.getNeverResolvedPromise());
-    for(let i=0;i<repeatCount;){
-        SLogger.info("开始第 "+(i+1)+" 次 repeatPromise");
-        //创建当前任务
-        plist[i] = procFn().then(result =>
-            ({result, stat:verifyFn!(result), index:i}));
-
-        //创建定时器
-        if(timerP==null){
-            timerP = new Promise<"Timeout">(function(resolve, rejecte){
-                resolveFn = resolve;
-                timer = setTimeout(()=>resolve("Timeout"),
-                    hasRepeatTime? repeatTime:Infinity);//无限制则无限时间
-            })
-        }
+	const plist:Promise<ProcessingPromise<T>>[] = [];
+
+    //开始处理
+    try{
+        for(let i=0;i<repeatCount;){
+            SLogger.info(`开始第 ${i+1} 次 repeatPromise`);
+            //创建当前任务
+            if(plist.length<i+1){
+                plist.push(procFn().then(result =>
+                    ({result, stat:verifyFn!(result), index:i})));
+            }
+
+            //创建定时器
+            if(timerP==null){
+                timerP = new Promise<"Timeout">(function(resolve, rejecte){
+                    resolveFn = resolve;
+                    timer = setTimeout(()=>resolve("Timeout"),
+                        hasRepeatTime? repeatTime:Infinity);//无限制则无限时间
+                })
+            }
 
-        //等待完成
-        const currObj = await Promise.race([...plist, timerP]);
+            //等待完成
+            const currObj = await Promise.race([...plist, timerP]);
 
-        //超时处理
-        if(currObj=="Timeout"){
-            SLogger.warn(`第 ${(i+1)} 次 repeatPromise 超时 ${repeatTime} ms 开始重试`);
-            clearTimer(); i++;
-            continue;
-        }else{
+            //超时处理
+            if(currObj=="Timeout"){
+                SLogger.warn(`第 ${i+1} 次 repeatPromise 超时 ${repeatTime} ms 开始重试`);
+                clearTimer(); i++;
+                continue;
+            }
             const poststat = await currObj.stat;
             switch(poststat){
                 case "Completed"://完成
-                    SLogger.info("第 "+(currObj.index+1)+" 次 repeatPromise 成功");
-                    clearTimer();
+                    SLogger.info(`第 ${currObj.index+1} 次 repeatPromise 成功`);
+                    //非当前
+                    if(currObj.index!=i)
+                        SLogger.info(`成功的 promise 非当前 promise 考虑增大重试间隔\n当前index: ${i}\n当前间隔: ${repeatTime}`);
                     return currObj.result;
                 case "Terminated"://终止
-                    SLogger.warn("第 "+(currObj.index+1)+" 次 repeatPromise 终止 停止重试");
-                    clearTimer();
+                    SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 终止 停止重试`);
                     return currObj.result;
                 case "Failed"://验证失败
+                    //抛弃失败
+                    plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
                     //是当前
                     if(currObj.index==i){
-                        SLogger.warn("第 "+(currObj.index+1)+" 次 repeatPromise 失败 开始重试");
+                        SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 失败 开始重试`);
                         clearTimer(); i++;
                         continue;
                     }
                     //非当前
-                    SLogger.warn("第 "+(currObj.index+1)+" 次 repeatPromise 失败");
-                    //抛弃失败
-                    plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
+                    SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 失败`);
                     continue;
             }
         }
+        //全部失败或超时则返回null
+        SLogger.warn(`${repeatCount} 次 repeatPromise 尝试均失败`);
+        return null;
+    }catch(err){
+        SLogger.warn(`repeatPromise 发生错误`,err);
+        return null;
+    }finally{
+        //清理
+        clearTimer();
+        SLogger.timeEnd(timeflag);
     }
-    clearTimer();
-    //全部失败或超时则返回null
-    return null;
 }
 
 }

package/src/UtilInterfaces.ts

@@ -72,16 +72,6 @@ export type ExclusiveJObject<B extends JObject,T extends JToken,K extends string
     TMP extends JArray = ExclusiveRecursive<B,T,K>> = TMP[number];
 
 
-/**进行中的请求 */
-export type ProcessingPromise<T> = {
-    /**主体请求 */
-    result:T;
-    /**请求状态 */
-    stat:PromiseStat|Promise<PromiseStat>;
-    /**请求下标/序号 */
-    index:number;
-};
-
 /**请求完成状态 成功/失败/终止  
  * 成功/终止 将直接返回  
  * 失败 将重试