@kevisual/api 0.0.48 → 0.0.50

package/dist/query-ai.d.ts

@@ -1,3 +1,4 @@
+import { QueryUtil } from '@kevisual/router/define';
 import { Query, BaseQuery, DataOpts } from '@kevisual/query/query';
 
 type Message = {
@@ -31,7 +32,13 @@ type ChatOpts = {
      */
     options?: any;
 };
-declare const appDefine: any;
+declare const appDefine: QueryUtil<{
+    chat: {
+        path: string;
+        key: string;
+        description: string;
+    };
+}>;
 
 declare class QueryApp<T extends Query = Query> extends BaseQuery<T, typeof appDefine> {
     constructor(opts?: {
@@ -43,7 +50,13 @@ declare class QueryApp<T extends Query = Query> extends BaseQuery<T, typeof appD
      * @param opts
      * @returns
      */
-    postChat(data: PostChat, opts?: DataOpts): any;
+    postChat(data: PostChat, opts?: DataOpts): Promise<{
+        code: number;
+        data?: {
+            [x: string]: any;
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 获取模型列表
      * @param opts
@@ -51,7 +64,11 @@ declare class QueryApp<T extends Query = Query> extends BaseQuery<T, typeof appD
      */
     getModelList(data?: {
         usernames?: string[];
-    }, opts?: DataOpts): any;
+    }, opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
     /**
      * 聊天对话模型
      * @param data
@@ -59,20 +76,36 @@ declare class QueryApp<T extends Query = Query> extends BaseQuery<T, typeof appD
      * @param opts
      * @returns
      */
-    chat(data: ChatDataOpts, chatOpts: ChatOpts, opts?: DataOpts): any;
-    clearConfigCache(opts?: DataOpts): any;
+    chat(data: ChatDataOpts, chatOpts: ChatOpts, opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
+    clearConfigCache(opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
     /**
      * 获取聊天使用情况
      * @param opts
      * @returns
      */
-    getChatUsage(opts?: DataOpts): any;
+    getChatUsage(opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
     /**
      * 清除当前用户模型自己的统计
      * @param opts
      * @returns
      */
-    clearSelfUsage(opts?: DataOpts): any;
+    clearSelfUsage(opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
 }
 
 export { QueryApp, appDefine };

package/dist/query-app.d.ts

@@ -1,17 +1,183 @@
+import * as _kevisual_router_define from '@kevisual/router/define';
+import { QueryUtil } from '@kevisual/router/define';
 import { BaseQuery, Query, DataOpts } from '@kevisual/query/query';
 
-declare const appDefine: any;
+declare const appDefine: QueryUtil<{
+    getApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    updateApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    deleteApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    listApps: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    canUploadFiles: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    uploadFiles: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    publishApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    getMinioList: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    detectVersionList: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    publicList: {
+        path: string;
+        key: string;
+        description: string;
+    };
+}>;
 
-declare const userAppDefine: any;
+declare const userAppDefine: QueryUtil<{
+    listUserApps: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    getUserApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    updateUserApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    deleteUserApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+    testUserApp: {
+        path: string;
+        key: string;
+        description: string;
+    };
+}>;
 
 declare class QueryApp extends BaseQuery {
-    appDefine: any;
-    userAppDefine: any;
+    appDefine: _kevisual_router_define.QueryUtil<{
+        getApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        updateApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        deleteApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        listApps: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        canUploadFiles: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        uploadFiles: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        publishApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        getMinioList: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        detectVersionList: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        publicList: {
+            path: string;
+            key: string;
+            description: string;
+        };
+    }>;
+    userAppDefine: _kevisual_router_define.QueryUtil<{
+        listUserApps: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        getUserApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        updateUserApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        deleteUserApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+        testUserApp: {
+            path: string;
+            key: string;
+            description: string;
+        };
+    }>;
     constructor(opts?: {
         query: Query;
     });
-    getList(data: any, opts?: DataOpts): any;
-    getPublicApp(data: any, opts?: DataOpts): any;
+    getList(data: any, opts?: DataOpts): Promise<{
+        code: number;
+        data?: {
+            [x: string]: any;
+        } | undefined;
+        message?: string;
+    }>;
+    getPublicApp(data: any, opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
     getApp(data: {
         key?: string;
         version?: string;
@@ -20,7 +186,11 @@ declare class QueryApp extends BaseQuery {
          * 之后上传文件就好了，会执行检测任务
          */
         create?: boolean;
-    }, opts?: DataOpts): any;
+    }, opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
     /**
      * 发布应用
      * @param data
@@ -33,7 +203,11 @@ declare class QueryApp extends BaseQuery {
         detect?: boolean;
         appKey?: string;
         version?: string;
-    }, opts?: DataOpts): any;
+    }, opts?: DataOpts): Promise<{
+        code: number;
+        data?: any;
+        message?: string;
+    }>;
 }
 
 export { QueryApp, appDefine, userAppDefine };

package/dist/query-config.d.ts

@@ -30,41 +30,101 @@ type DefaultConfigKey = (typeof defaultConfigKeys)[number];
 declare class QueryConfig {
     query: Query;
     constructor(opts?: QueryConfigOpts);
-    post<T = Config>(data: any): Promise<any>;
+    post<T = Config>(data: any): Promise<{
+        code: number;
+        data?: T | undefined;
+        message?: string;
+    }>;
     getConfig({ id, key }: {
         id?: string;
         key?: string;
-    }, opts?: PostOpts): Promise<any>;
-    updateConfig(data: Config, opts?: PostOpts): Promise<any>;
+    }, opts?: PostOpts): Promise<{
+        code: number;
+        data?: Config<any> | undefined;
+        message?: string;
+    }>;
+    updateConfig(data: Config, opts?: PostOpts): Promise<{
+        code: number;
+        data?: Config<any> | undefined;
+        message?: string;
+    }>;
     deleteConfig(data: {
         id?: string;
         key?: string;
-    }, opts?: PostOpts): Promise<any>;
-    listConfig(opts?: PostOpts): Promise<any>;
+    }, opts?: PostOpts): Promise<{
+        code: number;
+        data?: Config<any> | undefined;
+        message?: string;
+    }>;
+    listConfig(opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            list: Config[];
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 获取上传配置
      * @returns
      */
-    getUploadConfig(opts?: PostOpts): Promise<any>;
+    getUploadConfig(opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            code: number;
+            data?: Config<UploadConfig> | undefined;
+            message?: string;
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 更新上传配置
      * @param data
      * @returns
      */
-    updateUploadConfig(data: Config, opts?: PostOpts): Promise<any>;
+    updateUploadConfig(data: Config, opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            code: number;
+            data?: Config<UploadConfig> | undefined;
+            message?: string;
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 检测配置是否存在
      * @param id
      * @returns
      */
-    detectConfig(opts?: PostOpts): Promise<any>;
+    detectConfig(opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            updateList: Config[];
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 获取配置, 获取默认的配置项
      * @param key
      * @returns
      */
-    getConfigByKey(key: DefaultConfigKey, opts?: PostOpts): Promise<any>;
-    getByKey<T = any>(key: string, opts?: PostOpts): Promise<any>;
+    getConfigByKey(key: DefaultConfigKey, opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            code: number;
+            data?: Config<any> | undefined;
+            message?: string;
+        } | undefined;
+        message?: string;
+    }>;
+    getByKey<T = any>(key: string, opts?: PostOpts): Promise<{
+        code: number;
+        data?: {
+            code: number;
+            data?: Config<T> | undefined;
+            message?: string;
+        } | undefined;
+        message?: string;
+    }>;
 }
 
 export { QueryConfig, defaultConfigKeys };

package/dist/query-login.d.ts

@@ -33,6 +33,8 @@ type CacheLoginUser = {
     id?: string;
     accessToken?: string;
     refreshToken?: string;
+    accessTokenExpiresIn?: number;
+    createdAt?: number;
 };
 type CacheLogin = {
     loginUsers: CacheLoginUser[];
@@ -133,6 +135,7 @@ declare class QueryLogin extends BaseQuery {
     setLoginToken(token: {
         accessToken: string;
         refreshToken: string;
+        accessTokenExpiresIn?: number;
     }): Promise<void>;
     loginByWechat(data: {
         code: string;
@@ -149,7 +152,8 @@ declare class QueryLogin extends BaseQuery {
      * 登陆成功，需要获取用户信息进行缓存
      * @param param0
      */
-    beforeSetLoginUser({ accessToken, refreshToken, check401 }: {
+    beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: {
+        accessTokenExpiresIn?: number;
         accessToken?: string;
         refreshToken?: string;
         check401?: boolean;
@@ -218,7 +222,7 @@ declare class QueryLogin extends BaseQuery {
         orgs?: string[];
         type?: string;
         username?: string;
-    }>;
+    } | null>;
     /**
      * 检查本地token是否存在，简单的判断是否已经属于登陆状态
      * @returns
@@ -264,7 +268,7 @@ declare class QueryLogin extends BaseQuery {
      *
      *
   
-  import MD5 from 'crypto-js/md5.js';
+  // import MD5 from 'crypto-js/md5.js';
   import jsonwebtoken from 'jsonwebtoken';
   
      */

package/dist/query-login.js

@@ -352,6 +352,8 @@ class LoginCacheStore {
     this.cacheData.id = user.id;
     this.cacheData.accessToken = user.accessToken;
     this.cacheData.refreshToken = user.refreshToken;
+    this.cacheData.accessTokenExpiresIn = user.accessTokenExpiresIn;
+    this.cacheData.createdAt = user.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -856,7 +858,7 @@ class QueryLogin extends BaseQuery {
     this.isBrowser = opts?.isBrowser ?? true;
     this.init();
     this.onLoad = opts?.onLoad;
-    this.storage = opts?.storage || localStorage;
+    this.storage = opts?.storage || globalThis?.localStorage;
   }
   setQuery(query) {
     this.query = query;
@@ -879,32 +881,32 @@ class QueryLogin extends BaseQuery {
   async login(data) {
     const res = await this.post({ key: "login", ...data });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
   async loginByCode(data) {
     const res = await this.post({ path: "sms", key: "login", data });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
   async setLoginToken(token) {
-    const { accessToken, refreshToken } = token;
+    const { accessToken, refreshToken, accessTokenExpiresIn } = token;
     this.storage.setItem("token", accessToken || "");
-    await this.beforeSetLoginUser({ accessToken, refreshToken });
+    await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
   }
   async loginByWechat(data) {
     const res = await this.post({ path: "wx", key: "open-login", code: data.code });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -921,7 +923,7 @@ class QueryLogin extends BaseQuery {
       }
     }
   }
-  async beforeSetLoginUser({ accessToken, refreshToken, check401 }) {
+  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }) {
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -931,7 +933,9 @@ class QueryLogin extends BaseQuery {
             user,
             id: user.id,
             accessToken,
-            refreshToken
+            refreshToken,
+            accessTokenExpiresIn,
+            createdAt: Date.now()
           });
         } else {
           console.error("登录失败");
@@ -964,9 +968,9 @@ class QueryLogin extends BaseQuery {
       if (hasRefreshToken) {
         const res = await that.queryRefreshToken(hasRefreshToken);
         if (res.code === 200) {
-          const { accessToken, refreshToken } = res?.data || {};
+          const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem("token", accessToken || "");
-          await that.beforeSetLoginUser({ accessToken, refreshToken, check401: false });
+          await that.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
           if (refetch && ctx && ctx.req && ctx.req.url && ctx.fetch) {
             await new Promise((resolve) => setTimeout(resolve, 1500));
             const url = ctx.req?.url;
@@ -1059,12 +1063,17 @@ class QueryLogin extends BaseQuery {
     const user = localUserList.find((userItem) => userItem.user.username === username);
     if (user) {
       this.storage.setItem("token", user.accessToken || "");
-      await this.beforeSetLoginUser({ accessToken: user.accessToken, refreshToken: user.refreshToken });
+      await this.beforeSetLoginUser({
+        accessToken: user.accessToken,
+        refreshToken: user.refreshToken,
+        accessTokenExpiresIn: user.accessTokenExpiresIn
+      });
       return {
         code: 200,
         data: {
           accessToken: user.accessToken,
-          refreshToken: user.refreshToken
+          refreshToken: user.refreshToken,
+          accessTokenExpiresIn: user.accessTokenExpiresIn
         },
         success: true,
         message: "切换用户成功"
@@ -1072,9 +1081,9 @@ class QueryLogin extends BaseQuery {
     }
     const res = await this.postSwitchUser(username);
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -1112,9 +1121,9 @@ class QueryLogin extends BaseQuery {
       loginToken: token
     });
     if (res.code === 200) {
-      const accessToken = res.data?.accessToken;
+      const { accessTokenExpiresIn, accessToken, refreshToken } = res.data;
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken: res.data?.refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
       return res;
     }
     return false;

package/dist/query-mark.d.ts

@@ -69,12 +69,24 @@ declare class QueryMarkBase<T extends SimpleObject = SimpleObject> {
     setQuery(query: Query): void;
     private init;
     post<T = Result<any>>(data: any, opts?: DataOpts): Promise<T>;
-    getMarkList(search: SearchOpts, opts?: DataOpts): Promise<Result<ResultMarkList>>;
-    getMark(id: string, opts?: DataOpts): Promise<Result<Mark>>;
-    getVersion(id: string, opts?: DataOpts): Promise<Result<{
-        version: number;
-        id: string;
-    }>>;
+    getMarkList(search: SearchOpts, opts?: DataOpts): Promise<{
+        code: number;
+        data?: ResultMarkList | undefined;
+        message?: string;
+    }>;
+    getMark(id: string, opts?: DataOpts): Promise<{
+        code: number;
+        data?: Mark | undefined;
+        message?: string;
+    }>;
+    getVersion(id: string, opts?: DataOpts): Promise<{
+        code: number;
+        data?: {
+            version: number;
+            id: string;
+        } | undefined;
+        message?: string;
+    }>;
     /**
      * 检查版本
      * 当需要更新时，返回true
@@ -84,16 +96,32 @@ declare class QueryMarkBase<T extends SimpleObject = SimpleObject> {
      * @returns
      */
     checkVersion(id: string, version?: number, opts?: DataOpts): Promise<boolean>;
-    updateMark(data: any, opts?: DataOpts): Promise<Result<Mark>>;
-    deleteMark(id: string, opts?: DataOpts): Promise<Result<Mark>>;
+    updateMark(data: any, opts?: DataOpts): Promise<{
+        code: number;
+        data?: Mark | undefined;
+        message?: string;
+    }>;
+    deleteMark(id: string, opts?: DataOpts): Promise<{
+        code: number;
+        data?: Mark | undefined;
+        message?: string;
+    }>;
 }
 declare class QueryMark extends QueryMarkBase<SimpleObject> {
     markType: string;
     constructor(opts?: QueryMarkOpts & {
         markType?: MarkType;
     });
-    getMarkList(search?: SearchOpts, opts?: DataOpts): Promise<Result<ResultMarkList>>;
-    updateMark(data: any, opts?: DataOpts): Promise<Result<Mark>>;
+    getMarkList(search?: SearchOpts, opts?: DataOpts): Promise<{
+        code: number;
+        data?: ResultMarkList | undefined;
+        message?: string;
+    }>;
+    updateMark(data: any, opts?: DataOpts): Promise<{
+        code: number;
+        data?: Mark | undefined;
+        message?: string;
+    }>;
 }
 
 export { QueryMark, QueryMarkBase, markType };