@zwa73/utils 1.0.169 → 1.0.170

package/dist/UtilCom.d.ts

@@ -30,7 +30,7 @@ export declare namespace UtilCom {
      * @param timeLimit - 超时时间/秒  最小为10秒
      * @returns 结果 null 为未能成功接收
      */
-    function httpsPost(json: JObject, options: ComPostOption, timeLimit?: number): Promise<JObject | null>;
+    function httpsPost(json: JObject, options: ComPostOption, timeLimit?: number): Promise<JObject | undefined>;
     /**发送一个 http POST请求并接受数据
      * @async
      * @param json 	    - 数据对象
@@ -38,7 +38,7 @@ export declare namespace UtilCom {
      * @param timeLimit - 超时时间/秒  最小为10秒
      * @returns 结果 null 为未能成功接收
      */
-    function httpPost(json: JObject, options: ComPostOption, timeLimit?: number): Promise<JObject | null>;
+    function httpPost(json: JObject, options: ComPostOption, timeLimit?: number): Promise<JObject | undefined>;
     /**重复一个 https POST请求并接受数据
      * @async
      * @param json 	   - 数据对象
@@ -51,7 +51,7 @@ export declare namespace UtilCom {
      * @param opt.try_delay      - 重试间隔 秒 默认0
      * @returns 结果 null 为未能成功接收
      */
-    function httpsRepeatPost(json: JObject, options: ComPostOption, verifyFn?: ReqVerifyFn<JObject | null>, opt?: RepeatPostOpt): Promise<RepeatPromiseResult<JObject | null> | null>;
+    function httpsRepeatPost(json: JObject, options: ComPostOption, verifyFn?: ReqVerifyFn<JObject | undefined>, opt?: RepeatPostOpt): Promise<RepeatPromiseResult<JObject | undefined> | undefined>;
     /**重复一个 http POST请求并接受数据
      * Object ()
      * @async
@@ -65,6 +65,6 @@ export declare namespace UtilCom {
      * @param opt.try_delay      - 重试间隔 秒 默认0
      * @returns 结果 null 为未能成功接收
      */
-    function httpRepeatPost(json: JObject, options: ComPostOption, verifyFn?: ReqVerifyFn<JObject | null>, opt?: RepeatPostOpt): Promise<RepeatPromiseResult<JObject | null> | null>;
+    function httpRepeatPost(json: JObject, options: ComPostOption, verifyFn?: ReqVerifyFn<JObject | undefined>, opt?: RepeatPostOpt): Promise<RepeatPromiseResult<JObject | undefined> | undefined>;
 }
 export {};

package/dist/UtilCom.js

@@ -36,7 +36,7 @@ var UtilCom;
      * @param json 	    - 数据对象
      * @param options   - 参数对象
      * @param timeLimit - 超时时间/秒  最小为10秒
-     * @returns 结果 null 为未能成功接收
+     * @returns 结果 undefined 为未能成功接收
      */
     function post(posttype, json, options, timeLimit) {
         //转换为毫秒
@@ -54,7 +54,7 @@ var UtilCom;
                         res.setTimeout(fixlimit, () => {
                             //res.abort();
                             UtilLogger_1.SLogger.warn(`${funcName} 接收反馈超时: ${timeLimit} ms`);
-                            resolve(null);
+                            resolve(undefined);
                             return;
                         });
                     }
@@ -63,13 +63,13 @@ var UtilCom;
                     res.on('data', (chunk) => resdata += chunk);
                     res.on('error', (e) => {
                         UtilLogger_1.SLogger.warn(`${funcName} 接收反馈错误:${e}`);
-                        resolve(null);
+                        resolve(undefined);
                         return;
                     });
                     res.on('end', () => {
                         if (resdata == "") {
                             UtilLogger_1.SLogger.warn(funcName + " 接收反馈错误: resdata 为空");
-                            resolve(null);
+                            resolve(undefined);
                             return;
                         }
                         try {
@@ -80,14 +80,14 @@ var UtilCom;
                         }
                         catch (e) {
                             UtilLogger_1.SLogger.warn(`${funcName} 接收反馈错误:${e}\n原始字符串:${resdata}`);
-                            resolve(null);
+                            resolve(undefined);
                             return;
                         }
                     });
                 }
                 catch (err) {
                     UtilLogger_1.SLogger.warn(`${funcName} 未知错误:${err}`);
-                    resolve(null);
+                    resolve(undefined);
                     return;
                 }
             };
@@ -106,7 +106,7 @@ var UtilCom;
             }
             req.on('error', (e) => {
                 UtilLogger_1.SLogger.warn(`${funcName} 发送请求错误:${e}`);
-                resolve(null);
+                resolve(undefined);
             });
             req.write(jsonStr);
             req.end();

package/dist/UtilFunctions.d.ts

@@ -35,7 +35,8 @@ type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;
 /**完成的重试请求 */
 export type RepeatPromiseResult<T> = {
     completed: T;
-    pending: Promise<T | None>[];
+    /**还未完成的其他Promise 若是验证失败则会返回undefined */
+    pending: Promise<T | undefined>[];
 };
 /**遍历对象的回调函数
  * @param key       - 字段名
@@ -113,9 +114,9 @@ export declare class UtilFunc {
      * @param opt.count        - 重试次数 默认3
      * @param opt.tryInterval  - 超时时间/秒  默认180 最小为5秒
      * @param opt.tryDelay     - 重试间隔时间 默认0
-     * @returns 结果 null 为全部失败/超时
+     * @returns 结果 undefined 为全部失败/超时
      */
-    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: ReqVerifyFn<T>, opt?: RepeatPromiseOpt): Promise<RepeatPromiseResult<T> | null>;
+    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: ReqVerifyFn<T>, opt?: RepeatPromiseOpt): Promise<RepeatPromiseResult<T> | undefined>;
     /**创建一个限时的Promise
      * @param func      - 处理函数
      * @param timeLimit - 毫秒限时

package/dist/UtilFunctions.js

@@ -173,7 +173,7 @@ class UtilFunc {
      * @param opt.count        - 重试次数 默认3
      * @param opt.tryInterval  - 超时时间/秒  默认180 最小为5秒
      * @param opt.tryDelay     - 重试间隔时间 默认0
-     * @returns 结果 null 为全部失败/超时
+     * @returns 结果 undefined 为全部失败/超时
      */
     static async repeatPromise(procFn, verifyFn, opt = {}) {
         opt.count = opt.count ?? 3;
@@ -264,17 +264,17 @@ class UtilFunc {
                                 if (outres.stat == UtilSymbol_1.Success)
                                     return outres.result;
                             }
-                            return UtilSymbol_1.None;
+                            return undefined;
                         }),
                     };
             }
-            //全部失败或超时则返回null
+            //全部失败或超时则返回 undefined
             UtilLogger_1.SLogger.warn(`${count} 次 repeatPromise 尝试均失败`);
-            return null;
+            return undefined;
         }
         catch (err) {
             UtilLogger_1.SLogger.warn(`repeatPromise 发生错误`, err);
-            return null;
+            return undefined;
         }
     }
     /**创建一个限时的Promise

package/dist/UtilLogger.d.ts

@@ -83,7 +83,7 @@ export declare class SLogger {
      * @param level - log等级 === null时不产生log
      * @returns 格式化的时间字符串
      */
-    timeEnd(flag: string, level?: LogLevel | null): string | null;
+    timeEnd(flag: string, level?: LogLevel | null): string | undefined;
     /**名称为default的slogger实例 */
     private static get defaultInstance();
     /**让名称为default的logger 产生一条对应等级的log 返回自身

package/dist/UtilLogger.js

@@ -242,7 +242,7 @@ class SLogger {
         const start = SLogger.timeTable[flag];
         if (start == null) {
             this.warn("SLogger.timeEnd 错误 flag:" + flag + " 不存在");
-            return null;
+            return;
         }
         const timelen = process.hrtime(start);
         const totalMicroseconds = (timelen[0] * 1e9 + timelen[1]) / 1000;

package/package.json

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

package/src/UtilCom.ts

@@ -35,9 +35,9 @@ export namespace UtilCom{
  * @param json 	    - 数据对象
  * @param options   - 参数对象
  * @param timeLimit - 超时时间/秒  最小为10秒
- * @returns 结果 null 为未能成功接收
+ * @returns 结果 undefined 为未能成功接收
  */
-function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|null>{
+function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|undefined>{
     //转换为毫秒
     const hasTimeLimit = (timeLimit ? timeLimit>=10 : false );
     if(hasTimeLimit && timeLimit!=undefined) timeLimit*=1000;
@@ -54,7 +54,7 @@ function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLim
                     res.setTimeout(fixlimit, ()=>{
                         //res.abort();
                         SLogger.warn(`${funcName} 接收反馈超时: ${timeLimit} ms`);
-                        resolve(null);
+                        resolve(undefined);
                         return;
                     });
                 }
@@ -65,14 +65,14 @@ function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLim
 
                 res.on('error',(e)=>{
                     SLogger.warn(`${funcName} 接收反馈错误:${e}`);
-                    resolve(null);
+                    resolve(undefined);
                     return;
                 });
 
                 res.on('end',()=>{
                     if(resdata==""){
                         SLogger.warn(funcName+" 接收反馈错误: resdata 为空");
-                        resolve(null);
+                        resolve(undefined);
                         return;
                     }
                     try{
@@ -83,13 +83,13 @@ function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLim
                     }
                     catch(e){
                         SLogger.warn(`${funcName} 接收反馈错误:${e}\n原始字符串:${resdata}`);
-                        resolve(null);
+                        resolve(undefined);
                         return;
                     }
                 });
             }catch(err){
                 SLogger.warn(`${funcName} 未知错误:${err}`);
-                resolve(null);
+                resolve(undefined);
                 return;
             }
         };
@@ -110,7 +110,7 @@ function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLim
 
         req.on('error', (e)=>{
             SLogger.warn(`${funcName} 发送请求错误:${e}`);
-            resolve(null);
+            resolve(undefined);
         });
 
         req.write(jsonStr);
@@ -125,7 +125,7 @@ function post(posttype:"http"|"https",json:JObject,options:ComPostOption,timeLim
  * @param timeLimit - 超时时间/秒  最小为10秒
  * @returns 结果 null 为未能成功接收
  */
-export function httpsPost(json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|null>{
+export function httpsPost(json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|undefined>{
     return post("https",json,options,timeLimit);
 }
 
@@ -136,7 +136,7 @@ export function httpsPost(json:JObject,options:ComPostOption,timeLimit?:number):
  * @param timeLimit - 超时时间/秒  最小为10秒
  * @returns 结果 null 为未能成功接收
  */
-export function httpPost(json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|null>{
+export function httpPost(json:JObject,options:ComPostOption,timeLimit?:number):Promise<JObject|undefined>{
     return post("http",json,options,timeLimit);
 }
 
@@ -155,8 +155,8 @@ export function httpPost(json:JObject,options:ComPostOption,timeLimit?:number):P
  * @param opt.try_delay      - 重试间隔 秒 默认0
  * @returns 结果 null 为未能成功接收
  */
-async function repeatPost(posttype:"http"|"https",json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|null>,opt:RepeatPostOpt={}):
-Promise<RepeatPromiseResult<JObject|null>|null>{
+async function repeatPost(posttype:"http"|"https",json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|undefined>,opt:RepeatPostOpt={}):
+Promise<RepeatPromiseResult<JObject|undefined>|undefined>{
     opt.count        = opt.count??3;
     opt.tryInterval = opt.tryInterval??180;
     opt.tryDelay    = opt.tryDelay??1;
@@ -178,8 +178,8 @@ Promise<RepeatPromiseResult<JObject|null>|null>{
  * @param opt.try_delay      - 重试间隔 秒 默认0
  * @returns 结果 null 为未能成功接收
  */
-export function httpsRepeatPost(json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|null>,opt?:RepeatPostOpt):
-Promise<RepeatPromiseResult<JObject|null>|null>{
+export function httpsRepeatPost(json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|undefined>,opt?:RepeatPostOpt):
+Promise<RepeatPromiseResult<JObject|undefined>|undefined>{
     return repeatPost("https",json,options,verifyFn,opt);
 }
 
@@ -196,8 +196,8 @@ Promise<RepeatPromiseResult<JObject|null>|null>{
  * @param opt.try_delay      - 重试间隔 秒 默认0
  * @returns 结果 null 为未能成功接收
  */
-export function httpRepeatPost(json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|null>,opt?:RepeatPostOpt):
-Promise<RepeatPromiseResult<JObject|null>|null>{
+export function httpRepeatPost(json:JObject,options:ComPostOption,verifyFn?:ReqVerifyFn<JObject|undefined>,opt?:RepeatPostOpt):
+Promise<RepeatPromiseResult<JObject|undefined>|undefined>{
     return repeatPost("http",json,options,verifyFn,opt);
 }
 

package/src/UtilFunctions.ts

@@ -59,7 +59,8 @@ type PromiseResult<T> = {
 /**完成的重试请求 */
 export type RepeatPromiseResult<T> = {
     completed:T;
-    pending:Promise<T|None>[];
+    /**还未完成的其他Promise 若是验证失败则会返回undefined */
+    pending:Promise<T|undefined>[];
 }
 
 
@@ -226,11 +227,11 @@ static getNeverResolvedPromise<T>():Promise<T>{
  * @param opt.count        - 重试次数 默认3
  * @param opt.tryInterval  - 超时时间/秒  默认180 最小为5秒
  * @param opt.tryDelay     - 重试间隔时间 默认0
- * @returns 结果 null 为全部失败/超时
+ * @returns 结果 undefined 为全部失败/超时
  */
 @LogTimeAsync("repeatPromise ",true)
 static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,opt:RepeatPromiseOpt = {}):
-Promise<RepeatPromiseResult<T>|null>{
+Promise<RepeatPromiseResult<T>|undefined>{
     opt.count = opt.count??3;
     opt.tryInterval = opt.tryInterval??180;
     let {count,tryInterval} = opt;
@@ -323,16 +324,16 @@ Promise<RepeatPromiseResult<T>|null>{
                             const outres = await curObj.result;
                             if(outres.stat==Success) return outres.result;
                         }
-                        return None;
+                        return undefined;
                     }),
             };
         }
-        //全部失败或超时则返回null
+        //全部失败或超时则返回 undefined
         SLogger.warn(`${count} 次 repeatPromise 尝试均失败`);
-        return null;
+        return undefined;
     }catch(err){
         SLogger.warn(`repeatPromise 发生错误`,err);
-        return null;
+        return undefined;
     }
 }
 

package/src/UtilLogger.ts

@@ -230,11 +230,11 @@ export class SLogger{
      * @param level - log等级 === null时不产生log
      * @returns 格式化的时间字符串
      */
-    timeEnd(flag:string,level:LogLevel|null="info"):string|null{
+    timeEnd(flag:string,level:LogLevel|null="info"):string|undefined{
         const start = SLogger.timeTable[flag];
         if(start==null){
             this.warn("SLogger.timeEnd 错误 flag:"+flag+" 不存在");
-            return null;
+            return;
         }
         const timelen = process.hrtime(start as any as [number,number]);