@zwa73/utils 1.0.78 → 1.0.79

package/dist/UtilFunctions.js

@@ -142,10 +142,11 @@ class UtilFunc {
                 //如果 plist 中当前下标的任务还未创建 则 创建当前任务
                 if (plist.length < i + 1) {
                     plist.push(UtilFunc.timelimitPromise(async () => {
+                        const index = i;
                         const result = await procFn();
                         const stat = await verifyFn(result);
-                        return { result, stat, index: i };
-                    }));
+                        return { result, stat, index };
+                    }, hasRepeatTime ? repeatTime : undefined));
                 }
                 //等待任意任务 或当前计时器完成
                 const currObj = await Promise.race([...plist]);
@@ -208,18 +209,18 @@ class UtilFunc {
     static timelimitPromise(func, timeLimit) {
         return new Promise((reslove) => {
             let clearTimer = null;
-            let proc = (async () => await func())();
+            const procer = (async () => await func())();
             const procerP = new Promise(async (resolve) => {
-                const res = await proc;
+                const res = await procer;
+                resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Completed, res));
                 if (clearTimer)
                     clearTimer();
-                resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Completed, res));
             });
             const timerP = timeLimit
                 ? new Promise((resolve) => {
-                    const timer = setTimeout(() => resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Timeout, proc)), timeLimit); //无限制则无限时间
+                    const timer = setTimeout(() => resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Timeout, procer)), timeLimit); //无限制则无限时间
                     clearTimer = () => {
-                        resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Timeout, proc));
+                        resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Timeout, procer));
                         clearInterval(timer);
                     };
                 })

package/dist/test/repeatTest.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/repeatTest.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("..");
+// 模拟的异步函数，有一定几率失败
+async function mockAsyncFunction() {
+    return new Promise((resolve, reject) => {
+        setTimeout(() => {
+            Math.random() > 0.5 ? resolve("Success") : reject("Failure");
+        }, Math.random() % 2000);
+    });
+}
+// 验证函数，只有当结果为 "Success" 时才认为成功
+function mockVerifyFunction(result) {
+    return result === "Success" ? __1.Completed : __1.Failed;
+}
+// 测试 repeatPromise 函数
+__1.UtilFunc.repeatPromise(mockAsyncFunction, mockVerifyFunction, 3, 10)
+    .then(result => {
+    console.log("then");
+    if (result === null) {
+        console.log("全部超时");
+    }
+    else {
+        console.log("成功:", result);
+    }
+})
+    .catch(err => {
+    console.error("出现错误", err);
+});

package/package.json

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

package/src/UtilFunctions.ts

@@ -177,10 +177,11 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVerifyFn<T>
             //如果 plist 中当前下标的任务还未创建 则 创建当前任务
             if(plist.length<i+1){
                 plist.push(UtilFunc.timelimitPromise<ProcessingPromise<T>>(async ()=>{
+                    const index = i;
                     const result = await procFn();
                     const stat = await verifyFn!(result);
-                    return {result, stat, index:i}
-                }));
+                    return {result, stat, index}
+                },hasRepeatTime?repeatTime:undefined));
             }
 
             //等待任意任务 或当前计时器完成
@@ -247,22 +248,22 @@ static timelimitPromise<T>
     (func:()=>Promise<T>|T,timeLimit?:number):Promise<CompleteCome<T>|TimeoutCome<T>>{
     return new Promise<CompleteCome<T>|TimeoutCome<T>>((reslove)=>{
         let clearTimer:(()=>void)| null = null;
-        let proc = (async ()=>await func())();
+        const procer = (async ()=>await func())();
 
         const procerP = new Promise<CompleteCome<T>>(async (resolve)=>{
-            const res = await proc;
+            const res = await procer;
+            resolve(outcome(Completed,res));
             if(clearTimer) clearTimer();
-            resolve(outcome(Completed,res))
         });
 
         const timerP = timeLimit
             ? new Promise<TimeoutCome<T>>((resolve)=>{
                 const timer = setTimeout(()=>
-                    resolve(outcome(Timeout,proc))
+                    resolve(outcome(Timeout,procer))
                 ,timeLimit);//无限制则无限时间
 
                 clearTimer = ()=>{
-                    resolve(outcome(Timeout,proc))
+                    resolve(outcome(Timeout,procer))
                     clearInterval(timer)
                 }
             })

package/src/test/repeatTest.ts

@@ -0,0 +1,29 @@
+import { Completed, Failed, PromiseStat, PromiseVerifyFn, UtilFunc } from "..";
+
+// 模拟的异步函数，有一定几率失败
+async function mockAsyncFunction(): Promise<string> {
+    return new Promise((resolve, reject) => {
+        setTimeout(() => {
+            Math.random() > 0.5 ? resolve("Success") : reject("Failure");
+        }, Math.random()%2000);
+    });
+}
+
+// 验证函数，只有当结果为 "Success" 时才认为成功
+function mockVerifyFunction(result: string): PromiseStat {
+    return result === "Success" ? Completed : Failed;
+}
+
+// 测试 repeatPromise 函数
+UtilFunc.repeatPromise(mockAsyncFunction, mockVerifyFunction, 3, 10)
+    .then(result => {
+        console.log("then")
+        if (result === null) {
+            console.log("全部超时");
+        } else {
+            console.log("成功:", result);
+        }
+    })
+    .catch(err => {
+        console.error("出现错误", err);
+    });

package/test/test.bat

@@ -0,0 +1,2 @@
+node test.js
+pause

package/test/test.js

@@ -0,0 +1,37 @@
+const { Completed, Failed, PromiseStat, PromiseVerifyFn, UtilFunc } = require("../dist");
+
+
+let timeList = [21000,5000,1000000]
+let resList  = ["Success","Failure","Failure"]
+let index = 0;
+// 模拟的异步函数，有一定几率失败
+async function mockAsyncFunction() {
+    return new Promise((resolve, reject) => {
+		
+		let delay =timeList[index];
+		let result = resList[index];
+		console.log("延迟: "+delay,"结果: "+result)
+        setTimeout(() => {
+            resolve(result);
+        }, delay);
+		index++;
+    });
+}
+
+// 验证函数，只有当结果为 "Success" 时才认为成功
+function mockVerifyFunction(result) {
+    return result === "Success" ? Completed : Failed;
+}
+
+// 测试 repeatPromise 函数
+UtilFunc.repeatPromise(mockAsyncFunction, mockVerifyFunction, 3, 10)
+    .then(result => {
+        if (result === null) {
+            console.log("全部超时");
+        } else {
+            console.log("成功:", result);
+        }
+    })
+    .catch(err => {
+        console.error("出现错误", err);
+    });