@zwa73/utils 1.0.184 → 1.0.186

package/dist/UtilCom.d.ts

@@ -110,7 +110,7 @@ export declare namespace UtilCom {
         headers: http.IncomingHttpHeaders;
         /**响应状态码 */
         statusCode?: number;
-    } | undefined> | undefined>;
+    } | undefined>>;
     /**重复一个 http POST请求并接受数据
      * @async
      * @param comReqOpt - 网络请求选项
@@ -125,7 +125,7 @@ export declare namespace UtilCom {
         headers: http.IncomingHttpHeaders;
         /**响应状态码 */
         statusCode?: number;
-    } | undefined> | undefined>;
+    } | undefined>>;
     /**重复一个 https GET 请求并接受数据
      * @async
      * @param comReqOpt - 网络请求选项
@@ -140,7 +140,7 @@ export declare namespace UtilCom {
         headers: http.IncomingHttpHeaders;
         /**响应状态码 */
         statusCode?: number;
-    } | undefined> | undefined>;
+    } | undefined>>;
     /**重复一个 http GET 请求并接受数据
      * @async
      * @param comReqOpt - 网络请求选项
@@ -155,5 +155,5 @@ export declare namespace UtilCom {
         headers: http.IncomingHttpHeaders;
         /**响应状态码 */
         statusCode?: number;
-    } | undefined> | undefined>;
+    } | undefined>>;
 }

package/dist/UtilCom.js

@@ -102,12 +102,12 @@ var UtilCom;
         if (result == undefined)
             return undefined;
         const { data, ...rest } = result;
-        if (data == "") {
+        if (data.trim() == "") {
             UtilLogger_1.SLogger.warn(`${jsonReq.name} 接收反馈错误: 原始字符串为空`);
             return undefined;
         }
         try {
-            const obj = JSON.parse(data);
+            const obj = JSON.parse(data.trim());
             UtilLogger_1.SLogger.http(`${jsonReq.name} 接受信息:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }));
             return { ...rest, data: obj };
         }

package/dist/UtilFunctions.d.ts

@@ -34,7 +34,7 @@ type SuccessOut<T> = Outcome<Success, T>;
 type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;
 /**完成的重试请求 */
 export type RepeatPromiseResult<T> = {
-    completed: T;
+    completed: T | undefined;
     /**还未完成的其他Promise 若是验证失败则会返回undefined */
     pending: Promise<T | undefined>[];
 };
@@ -111,9 +111,9 @@ export declare class UtilFunc {
      * @param procFn      - 发起函数
      * @param verifyFn    - 验证函数
      * @param opt         - 重试参数 默认 延迟:0ms 间隔:180_000ms 重试:3次
-     * @returns 结果 undefined 为全部失败/超时
+     * @returns 重复结果
      */
-    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: ReqVerifyFn<T>, opt?: RepeatPromiseOpt): Promise<RepeatPromiseResult<T> | undefined>;
+    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: ReqVerifyFn<T>, opt?: RepeatPromiseOpt): Promise<RepeatPromiseResult<T>>;
     /**创建一个限时的Promise
      * @param func      - 处理函数
      * @param timeLimit - 毫秒限时

package/dist/UtilFunctions.js

@@ -170,7 +170,7 @@ class UtilFunc {
      * @param procFn      - 发起函数
      * @param verifyFn    - 验证函数
      * @param opt         - 重试参数 默认 延迟:0ms 间隔:180_000ms 重试:3次
-     * @returns 结果 undefined 为全部失败/超时
+     * @returns 重复结果
      */
     static async repeatPromise(procFn, verifyFn, opt = {}) {
         opt.count = opt.count ?? 3;
@@ -262,13 +262,31 @@ class UtilFunc {
                         }),
                     };
             }
-            //全部失败或超时则返回 undefined
+            //全部失败或超时则返回 全pending
             UtilLogger_1.SLogger.warn(`${count} 次 repeatPromise 尝试均失败`);
-            return undefined;
+            return {
+                completed: undefined,
+                pending: plist
+                    .filter(p => p != UtilFunc.getNeverResolvedPromise())
+                    .map(async (p) => {
+                    const curObj = await p;
+                    if (curObj.status == UtilSymbol_1.Success) {
+                        const outres = curObj.result;
+                        if (outres.stat == UtilSymbol_1.Success)
+                            return outres.result;
+                    }
+                    if (curObj.status == UtilSymbol_1.Timeout) {
+                        const outres = await curObj.result;
+                        if (outres.stat == UtilSymbol_1.Success)
+                            return outres.result;
+                    }
+                    return undefined;
+                }),
+            };
         }
         catch (err) {
-            UtilLogger_1.SLogger.warn(`repeatPromise 发生错误`, err);
-            return undefined;
+            UtilLogger_1.SLogger.warn(`repeatPromise 发生意外错误`, err);
+            return { completed: undefined, pending: [] };
         }
     }
     /**创建一个限时的Promise

package/package.json

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

package/src/UtilCom.ts

@@ -162,13 +162,13 @@ async function jsonReq<T extends ComReqOpt>(
     if(result==undefined) return undefined;
     const {data,...rest} = result;
 
-    if(data==""){
+    if(data.trim()==""){
         SLogger.warn(`${jsonReq.name} 接收反馈错误: 原始字符串为空`);
         return undefined;
     }
 
     try{
-        const obj = JSON.parse(data) as JObject;
+        const obj = JSON.parse(data.trim()) as JObject;
         SLogger.http(`${jsonReq.name} 接受信息:`,UtilFunc.stringifyJToken(obj,{compress:true,space:2}));
         return{...rest,data:obj};
     }

package/src/UtilFunctions.ts

@@ -58,7 +58,7 @@ type PromiseResult<T> = {
 
 /**完成的重试请求 */
 export type RepeatPromiseResult<T> = {
-    completed:T;
+    completed:T|undefined;
     /**还未完成的其他Promise 若是验证失败则会返回undefined */
     pending:Promise<T|undefined>[];
 }
@@ -224,11 +224,11 @@ static getNeverResolvedPromise<T>():Promise<T>{
  * @param procFn      - 发起函数
  * @param verifyFn    - 验证函数
  * @param opt         - 重试参数 默认 延迟:0ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为全部失败/超时
+ * @returns 重复结果
  */
 @LogTimeAsync("repeatPromise ",true)
 static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt:RepeatPromiseOpt = {}):
-Promise<RepeatPromiseResult<T>|undefined>{
+Promise<RepeatPromiseResult<T>>{
     opt.count = opt.count??3;
     opt.tryInterval = opt.tryInterval??180_000;
     const {count,tryInterval} = opt;
@@ -323,12 +323,28 @@ Promise<RepeatPromiseResult<T>|undefined>{
                     }),
             };
         }
-        //全部失败或超时则返回 undefined
+        //全部失败或超时则返回 全pending
         SLogger.warn(`${count} 次 repeatPromise 尝试均失败`);
-        return undefined;
+        return {
+            completed:undefined,
+            pending:plist
+                .filter(p=>p!=UtilFunc.getNeverResolvedPromise())
+                .map(async p=>{
+                    const curObj = await p;
+                    if(curObj.status==Success){
+                        const outres = curObj.result;
+                        if(outres.stat==Success) return outres.result;
+                    }
+                    if(curObj.status==Timeout){
+                        const outres = await curObj.result;
+                        if(outres.stat==Success) return outres.result;
+                    }
+                    return undefined;
+                }),
+        };
     }catch(err){
-        SLogger.warn(`repeatPromise 发生错误`,err);
-        return undefined;
+        SLogger.warn(`repeatPromise 发生意外错误`,err);
+        return {completed:undefined,pending:[]};
     }
 }