@kevisual/api 0.0.55 → 0.0.57

package/dist/query-login-node.d.ts

@@ -81,7 +81,8 @@ type CacheStore<T extends Cache = Cache> = {
     getValue(): Promise<CacheLogin>;
     setValue(value: CacheLogin): Promise<CacheLogin>;
     delValue(): Promise<void>;
-    init(): Promise<any>;
+    init(): Promise<CacheLogin>;
+    getIsExpired(): Promise<boolean>;
 };
 
 type QueryLoginOpts<T extends Cache = Cache> = {
@@ -152,12 +153,12 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 登陆成功，需要获取用户信息进行缓存
      * @param param0
      */
-    beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: {
+    beforeSetLoginUser(opts: {
         accessTokenExpiresIn?: number;
         accessToken?: string;
         refreshToken?: string;
         check401?: boolean;
-    }): Promise<void>;
+    }): Promise<Result<User>>;
     /**
      * 刷新token
      * @param refreshToken
@@ -214,20 +215,13 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 检查本地用户，如果本地用户存在，则返回本地用户，否则返回null
      * @returns
      */
-    checkLocalUser(): Promise<{
-        avatar?: string;
-        description?: string;
-        id?: string;
-        needChangePassword?: boolean;
-        orgs?: string[];
-        type?: string;
-        username?: string;
-    } | null>;
+    checkLocalUser(): Promise<User | null>;
     /**
      * 检查本地token是否存在，简单的判断是否已经属于登陆状态
      * @returns
      */
     checkLocalToken(): Promise<boolean>;
+    checkTokenValid(): Promise<boolean>;
     /**
      * 检查本地用户列表
      * @returns

package/dist/query-login-node.js

@@ -337,6 +337,13 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
+    this.cacheData = {
+      loginUsers: [],
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined
+    };
   }
   getValue() {
     return this.cache.get(this.name);
@@ -344,10 +351,12 @@ class LoginCacheStore {
   async init() {
     const defaultData = {
       loginUsers: [],
-      user: null,
-      id: null,
-      accessToken: null,
-      refreshToken: null
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined,
+      accessTokenExpiresIn: undefined,
+      createdAt: undefined
     };
     if (this.cache.init) {
       try {
@@ -359,6 +368,7 @@ class LoginCacheStore {
     } else {
       this.cacheData = await this.getValue() || defaultData;
     }
+    return this.cacheData;
   }
   async setLoginUser(user) {
     const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
@@ -389,6 +399,18 @@ class LoginCacheStore {
     const cacheData = this.cacheData;
     return Promise.resolve(cacheData.accessToken || "");
   }
+  getIsExpired() {
+    const cacheData = this.cacheData;
+    if (!cacheData.accessToken) {
+      return Promise.resolve(true);
+    }
+    if (!cacheData.createdAt || !cacheData.accessTokenExpiresIn) {
+      return Promise.resolve(false);
+    }
+    const now = Date.now();
+    const expiresIn = cacheData.createdAt + cacheData.accessTokenExpiresIn * 1000;
+    return Promise.resolve(now >= expiresIn);
+  }
   async clearCurrentUser() {
     const user = await this.getCurrentUser();
     const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
@@ -399,6 +421,8 @@ class LoginCacheStore {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
   async clearAll() {
@@ -407,6 +431,8 @@ class LoginCacheStore {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
 }
@@ -944,7 +970,8 @@ class QueryLogin extends BaseQuery {
       }
     }
   }
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }) {
+  async beforeSetLoginUser(opts) {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -962,7 +989,12 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
   }
   async queryRefreshToken(refreshToken) {
     const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
@@ -1063,6 +1095,9 @@ class QueryLogin extends BaseQuery {
     const token = this.storage.getItem("token");
     return !!token;
   }
+  async checkTokenValid() {
+    return this.cacheStore.getIsExpired();
+  }
   async getToken() {
     const token = this.storage.getItem("token");
     return token || "";

package/dist/query-login.d.ts

@@ -81,7 +81,8 @@ type CacheStore<T extends Cache = Cache> = {
     getValue(): Promise<CacheLogin>;
     setValue(value: CacheLogin): Promise<CacheLogin>;
     delValue(): Promise<void>;
-    init(): Promise<any>;
+    init(): Promise<CacheLogin>;
+    getIsExpired(): Promise<boolean>;
 };
 
 type QueryLoginOpts<T extends Cache = Cache> = {
@@ -152,12 +153,12 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 登陆成功，需要获取用户信息进行缓存
      * @param param0
      */
-    beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: {
+    beforeSetLoginUser(opts: {
         accessTokenExpiresIn?: number;
         accessToken?: string;
         refreshToken?: string;
         check401?: boolean;
-    }): Promise<void>;
+    }): Promise<Result<User>>;
     /**
      * 刷新token
      * @param refreshToken
@@ -214,20 +215,13 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * 检查本地用户，如果本地用户存在，则返回本地用户，否则返回null
      * @returns
      */
-    checkLocalUser(): Promise<{
-        avatar?: string;
-        description?: string;
-        id?: string;
-        needChangePassword?: boolean;
-        orgs?: string[];
-        type?: string;
-        username?: string;
-    } | null>;
+    checkLocalUser(): Promise<User | null>;
     /**
      * 检查本地token是否存在，简单的判断是否已经属于登陆状态
      * @returns
      */
     checkLocalToken(): Promise<boolean>;
+    checkTokenValid(): Promise<boolean>;
     /**
      * 检查本地用户列表
      * @returns

package/dist/query-login.js

@@ -337,6 +337,13 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
+    this.cacheData = {
+      loginUsers: [],
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined
+    };
   }
   getValue() {
     return this.cache.get(this.name);
@@ -344,10 +351,12 @@ class LoginCacheStore {
   async init() {
     const defaultData = {
       loginUsers: [],
-      user: null,
-      id: null,
-      accessToken: null,
-      refreshToken: null
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined,
+      accessTokenExpiresIn: undefined,
+      createdAt: undefined
     };
     if (this.cache.init) {
       try {
@@ -359,6 +368,7 @@ class LoginCacheStore {
     } else {
       this.cacheData = await this.getValue() || defaultData;
     }
+    return this.cacheData;
   }
   async setLoginUser(user) {
     const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
@@ -389,6 +399,18 @@ class LoginCacheStore {
     const cacheData = this.cacheData;
     return Promise.resolve(cacheData.accessToken || "");
   }
+  getIsExpired() {
+    const cacheData = this.cacheData;
+    if (!cacheData.accessToken) {
+      return Promise.resolve(true);
+    }
+    if (!cacheData.createdAt || !cacheData.accessTokenExpiresIn) {
+      return Promise.resolve(false);
+    }
+    const now = Date.now();
+    const expiresIn = cacheData.createdAt + cacheData.accessTokenExpiresIn * 1000;
+    return Promise.resolve(now >= expiresIn);
+  }
   async clearCurrentUser() {
     const user = await this.getCurrentUser();
     const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
@@ -399,6 +421,8 @@ class LoginCacheStore {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
   async clearAll() {
@@ -407,6 +431,8 @@ class LoginCacheStore {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
 }
@@ -944,7 +970,8 @@ class QueryLogin extends BaseQuery {
       }
     }
   }
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }) {
+  async beforeSetLoginUser(opts) {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -962,7 +989,12 @@ class QueryLogin extends BaseQuery {
           console.error("登录失败");
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: "登录失败"
+    };
   }
   async queryRefreshToken(refreshToken) {
     const _refreshToken = refreshToken || this.cacheStore.getRefreshToken();
@@ -1063,6 +1095,9 @@ class QueryLogin extends BaseQuery {
     const token = this.storage.getItem("token");
     return !!token;
   }
+  async checkTokenValid() {
+    return this.cacheStore.getIsExpired();
+  }
   async getToken() {
     const token = this.storage.getItem("token");
     return token || "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.55",
+  "version": "0.0.57",
   "description": "",
   "main": "mod.ts",
   "scripts": {

package/query/query-login/login-cache.ts

@@ -16,7 +16,7 @@ export interface Cache {
    */
   init?: () => Promise<any>;
 }
-type User = {
+export type User = {
   avatar?: string;
   description?: string;
   id?: string;
@@ -82,7 +82,8 @@ export type CacheStore<T extends Cache = Cache> = {
   getValue(): Promise<CacheLogin>;
   setValue(value: CacheLogin): Promise<CacheLogin>;
   delValue(): Promise<void>;
-  init(): Promise<any>;
+  init(): Promise<CacheLogin>;
+  getIsExpired(): Promise<boolean>;
 };
 
 export type LoginCacheStoreOpts<T extends Cache = Cache> = {
@@ -124,6 +125,13 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
    */
   async delValue() {
     await this.cache.del();
+    this.cacheData = {
+      loginUsers: [],
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined,
+    };
   }
   getValue(): Promise<CacheLogin> {
     return this.cache.get(this.name);
@@ -132,12 +140,14 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
    * 初始化,设置默认值
    */
   async init() {
-    const defaultData = {
+    const defaultData: CacheLogin = {
       loginUsers: [],
-      user: null,
-      id: null,
-      accessToken: null,
-      refreshToken: null,
+      user: undefined,
+      id: undefined,
+      accessToken: undefined,
+      refreshToken: undefined,
+      accessTokenExpiresIn: undefined,
+      createdAt: undefined,
     };
     if (this.cache.init) {
       try {
@@ -149,6 +159,7 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     } else {
       this.cacheData = (await this.getValue()) || defaultData;
     }
+    return this.cacheData;
   }
   /**
    * 设置当前用户
@@ -184,6 +195,18 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     const cacheData = this.cacheData;
     return Promise.resolve(cacheData.accessToken || '');
   }
+  getIsExpired(): Promise<boolean> {
+    const cacheData = this.cacheData;
+    if (!cacheData.accessToken) {
+      return Promise.resolve(true);
+    }
+    if (!cacheData.createdAt || !cacheData.accessTokenExpiresIn) {
+      return Promise.resolve(false);
+    }
+    const now = Date.now();
+    const expiresIn = cacheData.createdAt + cacheData.accessTokenExpiresIn * 1000;
+    return Promise.resolve(now >= expiresIn);
+  }
 
   async clearCurrentUser() {
     const user = await this.getCurrentUser();
@@ -195,6 +218,8 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
   async clearAll() {
@@ -203,6 +228,8 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     this.cacheData.id = undefined;
     this.cacheData.accessToken = undefined;
     this.cacheData.refreshToken = undefined;
+    this.cacheData.accessTokenExpiresIn = undefined;
+    this.cacheData.createdAt = undefined;
     await this.setValue(this.cacheData);
   }
 }

package/query/query-login/query-login.ts

@@ -1,6 +1,6 @@
 import { Query, BaseQuery } from '@kevisual/query';
 import type { Result, DataOpts } from '@kevisual/query/query';
-import { LoginCacheStore, CacheStore } from './login-cache.ts';
+import { LoginCacheStore, CacheStore, User } from './login-cache.ts';
 import { Cache } from './login-cache.ts';
 import { BaseLoad } from '@kevisual/load';
 export type QueryLoginOpts<T extends Cache = Cache> = {
@@ -128,7 +128,8 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * 登陆成功，需要获取用户信息进行缓存
    * @param param0
    */
-  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }) {
+  async beforeSetLoginUser(opts: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }): Promise<Result<User>> {
+    const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts;
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -146,7 +147,12 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
           console.error('登录失败');
         }
       }
+      return resUser;
     }
+    return {
+      code: 400,
+      message: '登录失败',
+    };
   }
   /**
    * 刷新token
@@ -305,6 +311,9 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     const token = this.storage.getItem('token');
     return !!token;
   }
+  async checkTokenValid() {
+    return this.cacheStore.getIsExpired();
+  }
   /**
    * 检查本地用户列表
    * @returns
@@ -313,6 +322,7 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     const token = this.storage.getItem('token');
     return token || '';
   }
+
   async beforeRequest(opts: any = {}) {
     const token = this.storage.getItem('token');
     if (token) {