@zwa73/utils 1.0.77 → 1.0.79

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,6 +15,8 @@ export interface IJData {
      */
     toJSON(): JToken;
 }
+/**任意可作为键值的类型 */
+export type Keyable = string | number | symbol;
 /**转为可写的 */
 export type Writeable<T> = {
     -readonly [P in keyof T]: T[P];
@@ -53,7 +56,7 @@ export type ExclusiveJObject<B extends JObject, T extends JToken, K extends stri
  * 终止 将直接返回  null
  * 失败 将重试
  */
-export type PromiseStat = "Completed" | "Failed" | "Terminated";
+export type PromiseStat = Completed | Failed | Terminated;
 /**promise验证函数 */
 export type PromiseVerifyFn<T> = (obj: T) => Promise<PromiseStat> | PromiseStat;
 /**类型中任意函数的字符串名称 */
@@ -107,12 +110,12 @@ export type WithPrefix<T, P extends string> = {
  * @template K - 类型键值
  * @template V - 值
  */
-export type Outcome<K extends string, V> = {
+export type Outcome<K extends Keyable, V> = {
     /**状态类型 */
     status: K;
     /**值 */
     result: V;
 };
 /**从联合 Outcome 中 根据 id 提取对应 value 的 type */
-export type ExtractOutcome<T, K extends string> = T extends Outcome<K, unknown> ? T : never;
+export type ExtractOutcome<T, K extends Keyable> = T extends Outcome<K, unknown> ? T : never;
 export {};

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/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.77",
+  "version": "1.0.79",
   "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/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;
     }
 }

package/src/UtilFunctions.ts

@@ -1,14 +1,31 @@
 import * as crypto from "crypto";
-import { ComposedClass, ComposedMixinable, ExtractOutcome, FuncPropNames, IJData, JObject, JToken, Mixinable, Outcome, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
+import { ComposedClass, ComposedMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Mixinable, Outcome, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { SLogger } from "@src/UtilLogger";
+import { Completed, Failed, None, Terminated, Timeout } from "./UtilSymbol";
+import { match, outcome } from "./QuickFunction";
+import { LogTimeAsync } from "./UtilDecorators";
 
+
+type CompleteCome<T> = Outcome<Completed,T>;
+type TimeoutCome<T> = Outcome<Timeout,Promise<T>>;
+/**永不完成的Promise单例 */
+const NeverResolvedPromise = new Promise(()=>{});
+/**进行中的请求 */
+type ProcessingPromise<T> = {
+    /**主体请求 */
+    result:T;
+    /**请求状态 */
+    stat:PromiseStat;
+    /**请求下标/序号 */
+    index:number;
+};
 /**常用函数 */
-export namespace UtilFunc{
+export class UtilFunc{
 /**获取当前时间戳  
  * @returns 时间戳
  */
-export function getTime(): number {
+static getTime(): number {
     return new Date().getTime();
 }
 
@@ -19,7 +36,7 @@ export function getTime(): number {
  * @param defaultVal - 默认值
  * @returns 最终值
  */
-export function initField<T extends object,K extends keyof T>(
+static initField<T extends object,K extends keyof T>(
     obj: T,
     field: K,
     defaultVal: T[K]
@@ -33,7 +50,7 @@ export function initField<T extends object,K extends keyof T>(
  * @param checkObj  - 用于检测的对象 在对应key缺失时赋予对应值 如果值为函数, 则赋予执行结果 如果结果为 undefined 则不赋值
  * @returns 完成初始化的对象
  */
-export function initObject<T extends JObject>
+static initObject<T extends JObject>
     (obj:T,checkObj:{[P in keyof T]:T[P]|(()=>void|T[P])}){
     const fixobj = obj as any;
     for(const key in checkObj){
@@ -52,14 +69,14 @@ export function initObject<T extends JObject>
 /**生成一串uuid  
  * @returns uuid
  */
-export function genUUID() {
+static genUUID() {
     return crypto.randomBytes(16).toString("hex");
 }
 /**计算Hash  
  * @param str - 待计算的字符串
  * @returns hash
  */
-export function calcHash(str:string) {
+static calcHash(str:string) {
     return crypto.createHash('md5').update(str).digest('hex');
 }
 
@@ -68,7 +85,7 @@ export function calcHash(str:string) {
  * @param obj  - 克隆目标
  * @returns 克隆结果
  */
-export function deepClone<T extends JToken>(obj: T): T {
+static deepClone<T extends JToken>(obj: T): T {
     return JSON.parse(JSON.stringify(obj));
 }
 
@@ -76,7 +93,7 @@ export function deepClone<T extends JToken>(obj: T): T {
  * @param num - 所要检测的数字
  * @returns 是否安全
  */
-export function isSafeNumber(num: number): boolean {
+static isSafeNumber(num: number): boolean {
     if (num === undefined || num == null || isNaN(num)) return false;
     if(typeof num === 'number') return true;
     return false;
@@ -87,10 +104,18 @@ export function isSafeNumber(num: number): boolean {
  * @param timeMs - 等待的毫秒数
  * @returns
  */
-export async function sleep(timeMs: number): Promise<boolean> {
+static async sleep<T>(timeMs: number): Promise<void>
+/**等待 timeMs 毫秒  
+ * @async
+ * @param timeMs - 等待的毫秒数
+ * @param result - 结果
+ * @returns
+ */
+static async sleep<T>(timeMs: number, result:T): Promise<T>
+static async sleep<T>(timeMs: number, result?:T): Promise<T|undefined> {
     return new Promise(function (resolve, rejecte) {
         let timer = setTimeout(function () {
-            resolve(true);
+            resolve(result);
         }, timeMs);
     });
 }
@@ -98,7 +123,7 @@ export async function sleep(timeMs: number): Promise<boolean> {
 /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise  
  * @param command 指令文本
  */
-export function exec(command: string) {
+static exec(command: string) {
 	return new Promise<{ stdout:string, stderr:string }>
         ((resolve, reject) => {
 		cp.exec(command, (error, stdout, stderr) => {
@@ -110,23 +135,12 @@ export function exec(command: string) {
 	});
 }
 
-/**永不完成的Promise单例 */
-const NeverResolvedPromise = new Promise(()=>{});
+
 /**获得一个永不完成的Promise单例 */
-export function getNeverResolvedPromise<T>():Promise<T>{
+static getNeverResolvedPromise<T>():Promise<T>{
     return NeverResolvedPromise as Promise<T>;
 }
 
-/**进行中的请求 */
-type ProcessingPromise<T> = {
-    /**主体请求 */
-    result:T;
-    /**请求状态 */
-    stat:PromiseStat|Promise<PromiseStat>;
-    /**请求下标/序号 */
-    index:number;
-};
-
 /**重复尝试promise  
  * @async
  * @param procFn      - 发起函数
@@ -135,13 +149,10 @@ type ProcessingPromise<T> = {
  * @param repeatTime  - 超时时间/秒  最小为10秒
  * @returns 结果 null 为全部失败/超时
  */
-export async function repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVerifyFn<T>,
+@LogTimeAsync("repeatPromise ",true)
+static async repeatPromise<T>(procFn:()=>Promise<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);
     //转换为毫秒
@@ -149,23 +160,13 @@ export async function repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVe
 
     //验证处理函数
     if(verifyFn===undefined)
-        verifyFn = ()=>"Completed";
-
-    /**计时器 */
-    let timer:NodeJS.Timer|null = null;
-    /**计时器 Promise */
-    let timerP:Promise<"Timeout">|null=null;
-    /**计时器 Promise 的返回函数 */
-    let resolveFn:((value: "Timeout")=>void)|null = null;
-    /**清理计时器 */
-    const clearTimer = ()=>{
-        if(timer) clearInterval(timer);
-        if(resolveFn) resolveFn("Timeout");
-        timerP = timer = resolveFn = null;
-    }
+        verifyFn = ()=>Completed;
 
     //进行中的请求
-	const plist:Promise<ProcessingPromise<T>>[] = [];
+	const plist:Promise<
+        CompleteCome<ProcessingPromise<T>>|
+        TimeoutCome<ProcessingPromise<T>>
+    >[] = [];
 
     //开始处理
     try{
@@ -175,57 +176,58 @@ export async function repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVe
 
             //如果 plist 中当前下标的任务还未创建 则 创建当前任务
             if(plist.length<i+1){
-                plist.push(procFn().then(result =>
-                    ({result, stat:verifyFn!(result), index:i})));
-            }
-
-            //创建定时器
-            if(timerP==null){
-                timerP = new Promise<"Timeout">((resolve, rejecte)=>{
-                    resolveFn = resolve;
-                    timer = setTimeout(()=>resolve("Timeout"),
-                        hasRepeatTime ? repeatTime : Infinity);//无限制则无限时间
-                })
+                plist.push(UtilFunc.timelimitPromise<ProcessingPromise<T>>(async ()=>{
+                    const index = i;
+                    const result = await procFn();
+                    const stat = await verifyFn!(result);
+                    return {result, stat, index}
+                },hasRepeatTime?repeatTime:undefined));
             }
 
             //等待任意任务 或当前计时器完成
-            const currObj = await Promise.race([...plist, timerP]);
+            const currObj = await Promise.race([...plist]);
 
             //超时处理
-            if(currObj==="Timeout"){
+            if(currObj.status===Timeout){
+                //解除timeout替换原参数
+                plist[i]=new Promise(async (rslove)=>{
+                    const res = await currObj.result;
+                    rslove(outcome(Completed,res));
+                })
                 SLogger.warn(`第 ${i+1} 次 repeatPromise 超时 ${repeatTime} ms 开始重试`);
-                clearTimer(); i++;
+                i++;
                 continue;
             }
 
             //路由请求状态
-            const poststat = await currObj.stat;
-            const result = matchStr(poststat,{
-                Completed(){
-                    SLogger.info(`第 ${currObj.index+1} 次 repeatPromise 成功`);
+            const postresult = currObj.result;
+            const result = match(postresult.stat,{
+                [Completed](){
+                    SLogger.info(`第 ${postresult.index+1} 次 repeatPromise 成功`);
                     //非当前
-                    if(currObj.index!=i)
+                    if(postresult.index!=i)
                         SLogger.info(`成功的 promise 非当前 promise 考虑增大重试间隔\n当前index: ${i}\n当前间隔: ${repeatTime}`);
-                    return currObj.result;
+                    return postresult.result;
                 },
-                Terminated(){
-                    SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 终止 停止重试`);
-                    return currObj.result;
+                [Terminated](){
+                    SLogger.warn(`第 ${postresult.index+1} 次 repeatPromise 终止 停止重试`);
+                    return postresult.result;
                 },
-                Failed(){
+                [Failed]():None{
                     //抛弃失败
-                    plist[currObj.index] = UtilFunc.getNeverResolvedPromise();
+                    plist[postresult.index] = UtilFunc.getNeverResolvedPromise();
                     //是当前
-                    if(currObj.index==i){
-                        SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 失败 开始重试`);
-                        clearTimer(); i++;
-                        return;
+                    if(postresult.index==i){
+                        SLogger.warn(`第 ${postresult.index+1} 次 repeatPromise 失败 开始重试`);
+                        i++;
+                        return None;
                     }
                     //非当前
-                    SLogger.warn(`第 ${currObj.index+1} 次 repeatPromise 失败`);
+                    SLogger.warn(`第 ${postresult.index+1} 次 repeatPromise 失败`);
+                    return None;
                 },
             });
-            if(result !== undefined) return result;
+            if(result !== None) return result;
         }
         //全部失败或超时则返回null
         SLogger.warn(`${repeatCount} 次 repeatPromise 尝试均失败`);
@@ -233,13 +235,47 @@ export async function repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVe
     }catch(err){
         SLogger.warn(`repeatPromise 发生错误`,err);
         return null;
-    }finally{
-        //清理
-        clearTimer();
-        SLogger.timeEnd(timeflag);
     }
 }
 
+
+/**创建一个限时的Promise  
+ * @param func      - 处理函数
+ * @param timeLimit - 毫秒限时
+ * @returns 超时则返回 处理函数委托 完成则返回结果
+ */
+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;
+        const procer = (async ()=>await func())();
+
+        const procerP = new Promise<CompleteCome<T>>(async (resolve)=>{
+            const res = await procer;
+            resolve(outcome(Completed,res));
+            if(clearTimer) clearTimer();
+        });
+
+        const timerP = timeLimit
+            ? new Promise<TimeoutCome<T>>((resolve)=>{
+                const timer = setTimeout(()=>
+                    resolve(outcome(Timeout,procer))
+                ,timeLimit);//无限制则无限时间
+
+                clearTimer = ()=>{
+                    resolve(outcome(Timeout,procer))
+                    clearInterval(timer)
+                }
+            })
+            : UtilFunc.getNeverResolvedPromise<TimeoutCome<T>>();
+
+        const result = Promise.race([procerP,timerP]);
+        reslove(result);
+    })
+}
+
+
+
 /**部分类组合  
  * 将mixin的部分字段混入base  
  * @param base   - 基础类
@@ -248,7 +284,7 @@ export async function repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVe
  * @param fields - 需要混入的字段
  * @returns 混合完成的类
  */
-export function composeClassPart
+static composeClassPart
     <Base extends object,Mixin extends object,Field extends keyof Mixin>
     (base:Base,mixin:Mixin,key:string,...fields:Field[]):ComposedClass<Base,Mixin,typeof key,Field>{
     const compObj = base as any;
@@ -283,7 +319,7 @@ export function composeClassPart
 }
 
 /**根据 MIXIN_FIELDS 自动混入 */
-export function composeMixinable
+static composeMixinable
     <Base extends object, Mixins extends Mixinable<any>[]>
     (base:Base,...mixins:Mixins):
     ComposedMixinable<Base,Mixins>{
@@ -298,7 +334,7 @@ export function composeMixinable
             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 as any;
 }
@@ -310,7 +346,7 @@ export function composeMixinable
  * @param mapper    - 映射函数，接受一个值和一个键，返回一个新的值
  * @returns         - 一个新的对象，它的属性是原对象的属性经过映射函数处理后的结果
  */
-export function mapEntries<T extends Object>
+static mapEntries<T extends Object>
     (obj: T, mapper: (key: keyof T, value: T[keyof T]) => T[keyof T]): T {
     return Object.entries(obj).reduce((result, [key, value]) => {
         result[key as keyof T] = mapper(key as keyof T, value);
@@ -318,33 +354,12 @@ export function mapEntries<T extends Object>
     }, {} as T);
 }
 
-/**处理联合 Outcome
- * @param t       - 目标值
- * @param procObj - 所有可能的id组成的处理函数映射
- * @returns 任意处理函数的返回值
- */
-export function matchOutcome<
-    T extends Outcome<string,unknown>,
-    P extends {[K in T['status']]:(k:K,v:ExtractOutcome<T,K>['result'])=>unknown}>
-    (t:T,procObj:P):{[K in keyof P]:ReturnType<P[K]>}[keyof P]{
-    return (procObj as any)[t.status](t.status,(t as any)?.result)
-}
-/**处理联合 字符串
- * @param t       - 目标值
- * @param procObj - 所有可能的id组成的处理函数映射
- * @returns 任意处理函数的返回值
- */
-export function matchStr<T extends string,P extends {[K in T]:(k:K)=>unknown}>
-    (t:T,procObj:P):{[K in keyof P]:ReturnType<P[K]>}[keyof P]{
-        return (procObj as any)[t](t)
-}
-
 /**将JToken转换为字符串
  * @param token - 待转换的Token
  * @param space - 插入的空格 数字为空格数量 默认为制表符\t
  * @returns 转换完成的字符串
  */
-export function stringifyJToken(token:JToken|IJData,space:string|number|null|undefined="\t"){
+static stringifyJToken(token:JToken|IJData,space:string|number|null|undefined="\t"){
 	if(space==null)
 		space=undefined;
 	return JSON.stringify(token,null,space);

package/src/UtilInterfaces.ts

@@ -1,3 +1,4 @@
+import { Completed, Failed, Terminated } from "./UtilSymbol";
 
 
 /**可以序列化为JSON文件的对象 */
@@ -17,6 +18,9 @@ export interface IJData{
 	toJSON():JToken;
 }
 
+/**任意可作为键值的类型 */
+export type Keyable = string | number | symbol;
+
 /**转为可写的 */
 export type Writeable<T> = {
 	-readonly [P in keyof T]: T[P]
@@ -67,7 +71,7 @@ export type ExclusiveJObject<B extends JObject,T extends JToken,K extends string
  * 终止 将直接返回  null  
  * 失败 将重试  
  */
-export type PromiseStat = "Completed"|"Failed"|"Terminated";
+export type PromiseStat = Completed|Failed|Terminated;
 /**promise验证函数 */
 export type PromiseVerifyFn<T> = (obj:T)=>Promise<PromiseStat>|PromiseStat;
 
@@ -139,7 +143,7 @@ export type WithPrefix<T,P extends string> = {
  * @template K - 类型键值
  * @template V - 值
  */
-export type Outcome<K extends string,V> = {
+export type Outcome<K extends Keyable,V> = {
     /**状态类型 */
     status:K;
     /**值 */
@@ -147,6 +151,6 @@ export type Outcome<K extends string,V> = {
 }
 
 /**从联合 Outcome 中 根据 id 提取对应 value 的 type */
-export type ExtractOutcome<T,K extends string> =
+export type ExtractOutcome<T,K extends Keyable> =
     T extends Outcome<K,unknown> ? T : never;