@zwa73/utils 1.0.76 → 1.0.78

package/dist/UtilFunctions.js

@@ -1,19 +1,31 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilFunc = void 0;
 const crypto = require("crypto");
 const cp = require("child_process");
 const UtilLogger_1 = require("./UtilLogger");
+const UtilSymbol_1 = require("./UtilSymbol");
+const QuickFunction_1 = require("./QuickFunction");
+const UtilDecorators_1 = require("./UtilDecorators");
+/**永不完成的Promise单例 */
+const NeverResolvedPromise = new Promise(() => { });
 /**常用函数 */
-var UtilFunc;
-(function (UtilFunc) {
+class UtilFunc {
     /**获取当前时间戳
      * @returns 时间戳
      */
-    function getTime() {
+    static getTime() {
         return new Date().getTime();
     }
-    UtilFunc.getTime = getTime;
     /**初始化对象的字段
      * 会改变obj
      * @param obj        - 所要初始化的对象
@@ -21,18 +33,17 @@ var UtilFunc;
      * @param defaultVal - 默认值
      * @returns 最终值
      */
-    function initField(obj, field, defaultVal) {
+    static initField(obj, field, defaultVal) {
         if (!(field in obj))
             obj[field] = defaultVal;
         return obj[field];
     }
-    UtilFunc.initField = initField;
     /**初始化一个数据对象
      * @param obj       - 目标对象
      * @param checkObj  - 用于检测的对象 在对应key缺失时赋予对应值 如果值为函数, 则赋予执行结果 如果结果为 undefined 则不赋值
      * @returns 完成初始化的对象
      */
-    function initObject(obj, checkObj) {
+    static initObject(obj, checkObj) {
         const fixobj = obj;
         for (const key in checkObj) {
             if (obj[key] !== undefined)
@@ -48,60 +59,49 @@ var UtilFunc;
         }
         return fixobj;
     }
-    UtilFunc.initObject = initObject;
     /**生成一串uuid
      * @returns uuid
      */
-    function genUUID() {
+    static genUUID() {
         return crypto.randomBytes(16).toString("hex");
     }
-    UtilFunc.genUUID = genUUID;
     /**计算Hash
      * @param str - 待计算的字符串
      * @returns hash
      */
-    function calcHash(str) {
+    static calcHash(str) {
         return crypto.createHash('md5').update(str).digest('hex');
     }
-    UtilFunc.calcHash = calcHash;
     /**深克隆 序列化并反序列化
      * @template T - JToken类型的泛型
      * @param obj  - 克隆目标
      * @returns 克隆结果
      */
-    function deepClone(obj) {
+    static deepClone(obj) {
         return JSON.parse(JSON.stringify(obj));
     }
-    UtilFunc.deepClone = deepClone;
     /**是否为安全的数字
      * @param num - 所要检测的数字
      * @returns 是否安全
      */
-    function isSafeNumber(num) {
+    static isSafeNumber(num) {
         if (num === undefined || num == null || isNaN(num))
             return false;
         if (typeof num === 'number')
             return true;
         return false;
     }
-    UtilFunc.isSafeNumber = isSafeNumber;
-    /**等待 timeMs 毫秒
-     * @async
-     * @param timeMs - 等待的毫秒数
-     * @returns
-     */
-    async function sleep(timeMs) {
+    static async sleep(timeMs, result) {
         return new Promise(function (resolve, rejecte) {
             let timer = setTimeout(function () {
-                resolve(true);
+                resolve(result);
             }, timeMs);
         });
     }
-    UtilFunc.sleep = sleep;
     /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise
      * @param command 指令文本
      */
-    function exec(command) {
+    static exec(command) {
         return new Promise((resolve, reject) => {
             cp.exec(command, (error, stdout, stderr) => {
                 if (error)
@@ -111,98 +111,85 @@ var UtilFunc;
             });
         });
     }
-    UtilFunc.exec = exec;
-    /**永不完成的Promise单例 */
-    const NeverResolvedPromise = new Promise(() => { });
     /**获得一个永不完成的Promise单例 */
-    function getNeverResolvedPromise() {
+    static getNeverResolvedPromise() {
         return NeverResolvedPromise;
     }
-    UtilFunc.getNeverResolvedPromise = getNeverResolvedPromise;
     /**重复尝试promise
      * @async
      * @param procFn      - 发起函数
      * @param verifyFn    - 验证函数
      * @param repeatCount - 重试次数
      * @param repeatTime  - 超时时间/秒  最小为10秒
-     * @returns           - 结果 null 为全部失败/超时
+     * @returns 结果 null 为全部失败/超时
      */
-    async function repeatPromise(procFn, verifyFn, repeatCount = 3, repeatTime = 180) {
-        //计时
-        const timeflag = "repeatPromise " + UtilFunc.genUUID();
-        UtilLogger_1.SLogger.time(timeflag);
-        //转换为毫秒
+    static async repeatPromise(procFn, verifyFn, repeatCount = 3, repeatTime = 180) {
+        /**是否含有超时时间 */
         const hasRepeatTime = (repeatTime >= 10);
+        //转换为毫秒
         if (hasRepeatTime)
             repeatTime *= 1000;
         //验证处理函数
         if (verifyFn === undefined)
-            verifyFn = () => "Completed";
-        //计时器
-        let timer = null;
-        let timerP = null;
-        let resolveFn = null;
-        /**清理计时器 */
-        const clearTimer = () => {
-            if (timer != null)
-                clearInterval(timer);
-            if (resolveFn != null)
-                resolveFn("Timeout");
-            timerP = null;
-            timer = null;
-            resolveFn = null;
-        };
+            verifyFn = () => UtilSymbol_1.Completed;
         //进行中的请求
         const plist = [];
         //开始处理
         try {
+            //根据最大重试次数限制进行循环
             for (let i = 0; i < repeatCount;) {
                 UtilLogger_1.SLogger.info(`开始第 ${i + 1} 次 repeatPromise`);
-                //创建当前任务
+                //如果 plist 中当前下标的任务还未创建 则 创建当前任务
                 if (plist.length < i + 1) {
-                    plist.push(procFn().then(result => ({ result, stat: verifyFn(result), index: i })));
+                    plist.push(UtilFunc.timelimitPromise(async () => {
+                        const result = await procFn();
+                        const stat = await verifyFn(result);
+                        return { result, stat, 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]);
+                //等待任意任务 或当前计时器完成
+                const currObj = await Promise.race([...plist]);
                 //超时处理
-                if (currObj == "Timeout") {
+                if (currObj.status === UtilSymbol_1.Timeout) {
+                    //解除timeout替换原参数
+                    plist[i] = new Promise(async (rslove) => {
+                        const res = await currObj.result;
+                        rslove((0, QuickFunction_1.outcome)(UtilSymbol_1.Completed, res));
+                    });
                     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 成功`);
+                //路由请求状态
+                const postresult = currObj.result;
+                const result = (0, QuickFunction_1.match)(postresult.stat, {
+                    [UtilSymbol_1.Completed]() {
+                        UtilLogger_1.SLogger.info(`第 ${postresult.index + 1} 次 repeatPromise 成功`);
                         //非当前
-                        if (currObj.index != i)
+                        if (postresult.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 终止 停止重试`);
-                        return currObj.result;
-                    case "Failed": //验证失败
+                        return postresult.result;
+                    },
+                    [UtilSymbol_1.Terminated]() {
+                        UtilLogger_1.SLogger.warn(`第 ${postresult.index + 1} 次 repeatPromise 终止 停止重试`);
+                        return postresult.result;
+                    },
+                    [UtilSymbol_1.Failed]() {
                         //抛弃失败
-                        plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
+                        plist[postresult.index] = UtilFunc.getNeverResolvedPromise();
                         //是当前
-                        if (currObj.index == i) {
-                            UtilLogger_1.SLogger.warn(`第 ${currObj.index + 1} 次 repeatPromise 失败 开始重试`);
-                            clearTimer();
+                        if (postresult.index == i) {
+                            UtilLogger_1.SLogger.warn(`第 ${postresult.index + 1} 次 repeatPromise 失败 开始重试`);
                             i++;
-                            continue;
+                            return UtilSymbol_1.None;
                         }
                         //非当前
-                        UtilLogger_1.SLogger.warn(`第 ${currObj.index + 1} 次 repeatPromise 失败`);
-                        continue;
-                }
+                        UtilLogger_1.SLogger.warn(`第 ${postresult.index + 1} 次 repeatPromise 失败`);
+                        return UtilSymbol_1.None;
+                    },
+                });
+                if (result !== UtilSymbol_1.None)
+                    return result;
             }
             //全部失败或超时则返回null
             UtilLogger_1.SLogger.warn(`${repeatCount} 次 repeatPromise 尝试均失败`);
@@ -212,13 +199,35 @@ var UtilFunc;
             UtilLogger_1.SLogger.warn(`repeatPromise 发生错误`, err);
             return null;
         }
-        finally {
-            //清理
-            clearTimer();
-            UtilLogger_1.SLogger.timeEnd(timeflag);
-        }
     }
-    UtilFunc.repeatPromise = repeatPromise;
+    /**创建一个限时的Promise
+     * @param func      - 处理函数
+     * @param timeLimit - 毫秒限时
+     * @returns 超时则返回 处理函数委托 完成则返回结果
+     */
+    static timelimitPromise(func, timeLimit) {
+        return new Promise((reslove) => {
+            let clearTimer = null;
+            let proc = (async () => await func())();
+            const procerP = new Promise(async (resolve) => {
+                const res = await proc;
+                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); //无限制则无限时间
+                    clearTimer = () => {
+                        resolve((0, QuickFunction_1.outcome)(UtilSymbol_1.Timeout, proc));
+                        clearInterval(timer);
+                    };
+                })
+                : UtilFunc.getNeverResolvedPromise();
+            const result = Promise.race([procerP, timerP]);
+            reslove(result);
+        });
+    }
     /**部分类组合
      * 将mixin的部分字段混入base
      * @param base   - 基础类
@@ -227,7 +236,7 @@ var UtilFunc;
      * @param fields - 需要混入的字段
      * @returns 混合完成的类
      */
-    function composeClassPart(base, mixin, key, ...fields) {
+    static composeClassPart(base, mixin, key, ...fields) {
         const compObj = base;
         if (compObj[key] !== undefined)
             UtilLogger_1.SLogger.warn(`key: ${key} 已存在于基础类中, 混入可能导致类型问题`);
@@ -259,9 +268,8 @@ var UtilFunc;
         }
         return compObj;
     }
-    UtilFunc.composeClassPart = composeClassPart;
     /**根据 MIXIN_FIELDS 自动混入 */
-    function composeMixinable(base, ...mixins) {
+    static composeMixinable(base, ...mixins) {
         let out = base;
         const fieldsSet = new Set();
         for (const rawmixin of mixins) {
@@ -273,22 +281,37 @@ var UtilFunc;
                 else
                     fieldsSet.add(fixField);
             }
-            out = composeClassPart(base, mixin, mixin.MIXIN_KEY, ...mixin.MIXIN_FIELDS);
+            out = UtilFunc.composeClassPart(base, mixin, mixin.MIXIN_KEY, ...mixin.MIXIN_FIELDS);
         }
         return out;
     }
-    UtilFunc.composeMixinable = composeMixinable;
     /**对对象的每个属性应用映射函数，并返回一个新的对象。
      * @template T      - 对象的类型
      * @param obj       - 要处理的对象
      * @param mapper    - 映射函数，接受一个值和一个键，返回一个新的值
      * @returns         - 一个新的对象，它的属性是原对象的属性经过映射函数处理后的结果
      */
-    function mapEntries(obj, mapper) {
+    static mapEntries(obj, mapper) {
         return Object.entries(obj).reduce((result, [key, value]) => {
             result[key] = mapper(key, value);
             return result;
         }, {});
     }
-    UtilFunc.mapEntries = mapEntries;
-})(UtilFunc = exports.UtilFunc || (exports.UtilFunc = {}));
+    /**将JToken转换为字符串
+     * @param token - 待转换的Token
+     * @param space - 插入的空格 数字为空格数量 默认为制表符\t
+     * @returns 转换完成的字符串
+     */
+    static stringifyJToken(token, space = "\t") {
+        if (space == null)
+            space = undefined;
+        return JSON.stringify(token, null, space);
+    }
+}
+__decorate([
+    (0, UtilDecorators_1.LogTimeAsync)("repeatPromise ", true),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Function, Function, Number, Number]),
+    __metadata("design:returntype", Promise)
+], UtilFunc, "repeatPromise", null);
+exports.UtilFunc = UtilFunc;

package/dist/UtilInterfaces.d.ts

@@ -1,3 +1,4 @@
+import { Completed, Failed, Terminated } from "./UtilSymbol";
 /**可以序列化为JSON文件的对象 */
 export type JToken = JObject | JArray | JValue | IJData;
 /**在stringify输出时 undefine 会被转为 null */
@@ -14,12 +15,8 @@ export interface IJData {
      */
     toJSON(): JToken;
 }
-/**将JToken转换为字符串
- * @param token - 待转换的Token
- * @param space - 插入的空格 数字为空格数量 默认为制表符\t
- * @returns 转换完成的字符串
- */
-export declare function stringifyJToken(token: JToken | IJData, space?: string | number | null | undefined): string;
+/**任意可作为键值的类型 */
+export type Keyable = string | number | symbol;
 /**转为可写的 */
 export type Writeable<T> = {
     -readonly [P in keyof T]: T[P];
@@ -55,24 +52,23 @@ export type ExclusiveRecord<B, T, K extends string[], TMP = ExclusiveRecursive<B
 /**符合JObject约束的互斥表 */
 export type ExclusiveJObject<B extends JObject, T extends JToken, K extends string[], TMP extends JArray = ExclusiveRecursive<B, T, K>> = TMP[number];
 /**请求完成状态 成功/失败/终止
- * 成功/终止 将直接返回
+ * 成功 将直接返回  结果
+ * 终止 将直接返回  null
  * 失败 将重试
  */
-export type PromiseStat = "Completed" | "Failed" | "Terminated";
+export type PromiseStat = Completed | Failed | Terminated;
 /**promise验证函数 */
 export type PromiseVerifyFn<T> = (obj: T) => Promise<PromiseStat> | PromiseStat;
-/**发起promise的函数 */
-export type PromiseProcFn<T> = () => Promise<T>;
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {
-    [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
+    [K in keyof T]: T[K] extends (...args: unknown[]) => unknown ? K : never;
 }[keyof T];
 /**部分组合的类
  * @template Base     - 基类
  * @template Mixin    - 待混入的类
  * @template PropKeys - 需要混入的成员key
  */
-export type ComposedClass<Base extends object, Mixin extends object, Key extends string, PropKeys extends keyof Mixin> = Base & Pick<Mixin, PropKeys> & {
+export type ComposedClass<Base, Mixin, Key extends string, PropKeys extends keyof Mixin> = Base & Pick<Mixin, PropKeys> & {
     [P in Key]: Mixin;
 };
 /**可自动混入的类型 */
@@ -87,5 +83,39 @@ export type Mixinable<Mixin> = {
     readonly MIXIN_FIELDS: readonly (keyof Mixin)[];
 };
 /**自动组合可混入的类 */
-export type ComposedMixinable<B extends object, Ms extends unknown[]> = Ms extends [infer M, ...infer Rest] ? M extends Mixinable<M> ? ComposedMixinable<ComposedClass<B, M, M['MIXIN_KEY'], M['MIXIN_FIELDS'][number]>, Rest> : "一个混入类没有实现 Mixinable<self>" & Error : B;
+export type ComposedMixinable<B, Ms extends unknown[]> = Ms extends [infer M, ...infer Rest] ? M extends Mixinable<M> ? ComposedMixinable<ComposedClass<B, M, M['MIXIN_KEY'], M['MIXIN_FIELDS'][number]>, Rest> : "一个混入类没有实现 Mixinable<self>" & Error : B;
+/** extends封装
+ * @template B - 基础类型
+ * @template T - 判断的目标类型
+ * @template Y - 如果为真的返回值
+ * @template N - 如果为假的返回值
+ */
+export type ExtendThen<B, T, Y, N = never> = B extends T ? Y : N;
+/** 一个联合类型 B 中如果包含 T
+ * @template B - 基础类型
+ * @template T - 判断的目标类型
+ * @template Y - 如果为真的返回值
+ * @template N - 如果为假的返回值
+ */
+export type UnionInclude<B, T, Y, N = never> = B extends Exclude<B, T> ? Y : N;
+/**排除可选字段 */
+export type RequiredOnly<T> = {
+    [K in keyof T as UnionInclude<T[K], undefined, never, K>]: T[K];
+};
+/**添加前缀 */
+export type WithPrefix<T, P extends string> = {
+    [K in (keyof T) as K extends string ? `${P}_${K}` : K]: T[K];
+};
+/**返回结果
+ * @template K - 类型键值
+ * @template V - 值
+ */
+export type Outcome<K extends Keyable, V> = {
+    /**状态类型 */
+    status: K;
+    /**值 */
+    result: V;
+};
+/**从联合 Outcome 中 根据 id 提取对应 value 的 type */
+export type ExtractOutcome<T, K extends Keyable> = T extends Outcome<K, unknown> ? T : never;
 export {};

package/dist/UtilInterfaces.js

@@ -1,14 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyJToken = void 0;
-/**将JToken转换为字符串
- * @param token - 待转换的Token
- * @param space - 插入的空格 数字为空格数量 默认为制表符\t
- * @returns 转换完成的字符串
- */
-function stringifyJToken(token, space = "\t") {
-    if (space == null)
-        space = undefined;
-    return JSON.stringify(token, null, space);
-}
-exports.stringifyJToken = stringifyJToken;

package/dist/UtilSymbol.d.ts

@@ -0,0 +1,15 @@
+/**完成 */
+export declare const Completed: unique symbol;
+export type Completed = typeof Completed;
+/**失败 */
+export declare const Failed: unique symbol;
+export type Failed = typeof Failed;
+/**终止 */
+export declare const Terminated: unique symbol;
+export type Terminated = typeof Terminated;
+/**不存在 */
+export declare const None: unique symbol;
+export type None = typeof None;
+/**超时 */
+export declare const Timeout: unique symbol;
+export type Timeout = typeof Timeout;

package/dist/UtilSymbol.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Timeout = exports.None = exports.Terminated = exports.Failed = exports.Completed = void 0;
+/**完成 */
+exports.Completed = Symbol("Completed");
+/**失败 */
+exports.Failed = Symbol("Failed");
+/**终止 */
+exports.Terminated = Symbol("Terminated");
+/**不存在 */
+exports.None = Symbol("None");
+/**超时 */
+exports.Timeout = Symbol("Timeout");

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from './UtilFunctions';
 export * from './UtilInterfaces';
+export * from './UtilSymbol';
 export * from './UtilClass';
 export * from './UtilCom';
 export * from './UtilCodecs';
@@ -8,3 +9,4 @@ export * from './UtilDecorators';
 export * from './UtilFileTools';
 export * from './UtilLogger';
 export * from './UtilFP';
+export * from './QuickFunction';

package/dist/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./UtilFunctions"), exports);
 __exportStar(require("./UtilInterfaces"), exports);
+__exportStar(require("./UtilSymbol"), exports);
 __exportStar(require("./UtilClass"), exports);
 __exportStar(require("./UtilCom"), exports);
 __exportStar(require("./UtilCodecs"), exports);
@@ -24,3 +25,4 @@ __exportStar(require("./UtilDecorators"), exports);
 __exportStar(require("./UtilFileTools"), exports);
 __exportStar(require("./UtilLogger"), exports);
 __exportStar(require("./UtilFP"), exports);
+__exportStar(require("./QuickFunction"), exports);

package/package.json

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

package/src/QuickFunction.ts

@@ -0,0 +1,36 @@
+import { ExtractOutcome, Keyable, Outcome } from "./UtilInterfaces";
+
+/**创建一个outcome */
+export function outcome<K extends Keyable,V> (key:K,value:V):Outcome<K,V>{
+    return {status:key,result:value}
+}
+
+/**处理联合 简单值
+ * @param t       - 目标值
+ * @param procObj - 所有可能的id组成的处理函数映射
+ * @returns 任意处理函数的返回值
+ */
+export function match<
+    T extends Keyable | Outcome<Keyable, unknown>,
+    P extends (T extends Keyable
+        ? {[K in T]:(k:K)=>unknown}
+        : T extends Outcome<Keyable,unknown> 
+            ? {[K in T['status']]:(k:K,v:ExtractOutcome<T,K>['result'])=>unknown}
+            : never)>
+    (t:T, procObj:P):
+    P extends Record<any,(...args:any)=>any>
+        ? {[K in keyof P]: ReturnType<P[K]>}[keyof P]
+        : never {
+    if (typeof t === 'string' || typeof t === 'number' || typeof t === 'symbol')
+        return (procObj as any)[t](t);
+    else
+        return (procObj as any)[t.status](t.status,t.result);
+}
+if(false){
+    let a:"asd"|"dsa" = null as any;
+    const r = match(a,{
+        "asd":(a)=>"ssa" as const,
+        "dsa":(b)=>"ssb" as const,
+    })
+}
+

package/src/UtilCom.ts

@@ -1,4 +1,4 @@
-import { JObject, PromiseVerifyFn, stringifyJToken } from "@src/UtilInterfaces";
+import { JObject, PromiseVerifyFn } from "@src/UtilInterfaces";
 import * as https from 'https';
 import * as http from 'http';
 import { SLogger } from "@src/UtilLogger";
@@ -21,7 +21,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
     if(hasTimeLimit)
         timeLimit*=1000
 
-    const jsonStr = stringifyJToken(json);
+    const jsonStr = UtilFunc.stringifyJToken(json);
     const funcName = `s${posttype}Psot`;
 
     return new Promise((resolve, rejecte)=>{
@@ -55,7 +55,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
                     }
                     try{
                         let obj = JSON.parse(resdata);
-                        SLogger.http(funcName+" 接受信息:",stringifyJToken(obj));
+                        SLogger.http(funcName+" 接受信息:",UtilFunc.stringifyJToken(obj));
                         resolve(obj);
                         return;
                     }

package/src/UtilDecorators.ts

@@ -1,3 +1,4 @@
+import { UtilFunc } from "./UtilFunctions";
 import { SLogger } from "./UtilLogger";
 
 type TDTg<T> = 
@@ -6,6 +7,41 @@ type TDTg<T> =
 type DTg = (target:Object, propertyKey:string, descriptor:PropertyDescriptor)=>
     PropertyDescriptor;
 
+/**用于打印方法运行时间  
+ * @param flag      - 时间标签
+ * @param suffixUID - 是否尾随uid
+ */
+export function LogTime(flag:string,suffixUID?:boolean):DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = function(...args:any[]){
+            const uid = suffixUID ? UtilFunc.genUUID() : "";
+            SLogger.time(flag+uid);
+            let result = originalMethod.apply(this, args);
+            SLogger.timeEnd(flag+uid);
+            return result;
+        }
+        return descriptor;
+    }
+}
+/**用于打印异步方法运行时间  
+ * @param flag      - 时间标签
+ * @param suffixUID - 是否尾随uid
+ */
+export function LogTimeAsync(flag:string,suffixUID?:boolean):DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = async function(...args:any[]){
+            const uid = suffixUID ? UtilFunc.genUUID() : "";
+            SLogger.time(flag+uid);
+            let result = await originalMethod.apply(this, args);
+            SLogger.timeEnd(flag+uid);
+            return result;
+        }
+        return descriptor;
+    }
+}
+
 /**用于打印方法的调用 */
 export function LogCall():DTg{
     return function (target, propertyKey, descriptor){
@@ -162,7 +198,7 @@ class Example {
     }
     @LogCall()
     @Defer((a,b)=>null)
-    async myMethod1(num: number,ss:string) {
+    static async myMethod1(num: number,ss:string) {
         return 312;
     }
 }