@kevisual/api 0.0.54 → 0.0.56

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

@@ -39,7 +39,7 @@ type CacheLoginUser = {
 type CacheLogin = {
     loginUsers: CacheLoginUser[];
 } & CacheLoginUser;
-type CacheStore<T = Cache> = {
+type CacheStore<T extends Cache = Cache> = {
     name: string;
     /**
      * 缓存数据
@@ -81,15 +81,16 @@ type CacheStore<T = Cache> = {
     getValue(): Promise<CacheLogin>;
     setValue(value: CacheLogin): Promise<CacheLogin>;
     delValue(): Promise<void>;
-    init(): Promise<any>;
+    init(): Promise<CacheLogin>;
+    getIsExpired(): Promise<boolean>;
 };
 
-type QueryLoginOpts = {
+type QueryLoginOpts<T extends Cache = Cache> = {
     query?: Query;
     isBrowser?: boolean;
     onLoad?: () => void;
     storage?: Storage;
-    cache: Cache;
+    cache: T;
 };
 type QueryLoginData = {
     username?: string;
@@ -100,16 +101,16 @@ type QueryLoginResult = {
     accessToken: string;
     refreshToken: string;
 };
-declare class QueryLogin extends BaseQuery {
+declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     /**
      * query login cache， 非实际操作， 一个cache的包裹模块
      */
-    cacheStore: CacheStore;
+    cacheStore: CacheStore<T>;
     isBrowser: boolean;
     load?: boolean;
     storage: Storage;
     onLoad?: () => void;
-    constructor(opts?: QueryLoginOpts);
+    constructor(opts?: QueryLoginOpts<T>);
     setQuery(query: Query): void;
     private init;
     post<T = any>(data: any, opts?: DataOpts): Promise<any>;
@@ -228,6 +229,7 @@ declare class QueryLogin extends BaseQuery {
      * @returns
      */
     checkLocalToken(): Promise<boolean>;
+    checkTokenValid(): Promise<boolean>;
     /**
      * 检查本地用户列表
      * @returns
@@ -299,7 +301,6 @@ declare class StorageNode implements Storage {
     cacheData: any;
     filePath: string;
     hostname: string;
-    isLoaded: boolean;
     constructor(opts?: {
         baseURL?: string;
         load?: boolean;
@@ -307,7 +308,7 @@ declare class StorageNode implements Storage {
     setHostName(hostname: string, opts?: {
         load?: boolean;
     }): void;
-    loadCache(force?: boolean): void;
+    loadCache(): void;
     get length(): number;
     getItem(key: string): any;
     setItem(key: string, value: any): void;
@@ -317,7 +318,6 @@ declare class StorageNode implements Storage {
 }
 declare class LoginNodeCache implements Cache {
     filepath: string;
-    isLoaded: boolean;
     constructor(opts?: {
         baseURL?: string;
         load?: boolean;
@@ -325,14 +325,14 @@ declare class LoginNodeCache implements Cache {
     get(_key: string): Promise<any>;
     set(_key: string, value: any): Promise<void>;
     del(): Promise<void>;
-    loadCache(filePath: string, force?: boolean): any;
+    loadCache(filePath: string): any;
     init(): any;
 }
 
 type QueryLoginNodeOptsWithoutCache = Omit<QueryLoginOpts, 'cache'>;
 
 declare const cache: LoginNodeCache;
-declare class QueryLoginNode extends QueryLogin {
+declare class QueryLoginNode extends QueryLogin<LoginNodeCache> {
     storage: StorageNode;
     constructor(opts: QueryLoginNodeOptsWithoutCache);
 }

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);
   }
 }
@@ -1063,6 +1089,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 || "";
@@ -1244,7 +1273,6 @@ class StorageNode {
   cacheData;
   filePath = "";
   hostname = "";
-  isLoaded = false;
   constructor(opts) {
     this.cacheData = {};
     const hostname = getHostName(opts?.baseURL);
@@ -1263,14 +1291,11 @@ class StorageNode {
       this.loadCache();
     }
   }
-  loadCache(force) {
-    if (this.isLoaded && !force)
-      return;
+  loadCache() {
     const filePath = this.filePath;
     try {
       const data = readConfigFile(filePath);
       this.cacheData = data;
-      this.isLoaded = true;
     } catch (error) {
       this.cacheData = {};
       writeFileSync(filePath, JSON.stringify(this.cacheData, null, 2));
@@ -1301,7 +1326,6 @@ class StorageNode {
 
 class LoginNodeCache {
   filepath;
-  isLoaded = false;
   constructor(opts) {
     this.filepath = join(homedir(), ".config", "envision", "config", `${getHostName(opts?.baseURL)}-login.json`);
     fileExists(this.filepath, { isFile: true });
@@ -1331,13 +1355,10 @@ class LoginNodeCache {
   async del() {
     unlinkSync(this.filepath);
   }
-  loadCache(filePath, force) {
-    if (this.isLoaded && !force)
-      return;
+  loadCache(filePath) {
     try {
       const data = readFileSync(filePath, "utf-8");
       const jsonData = JSON.parse(data);
-      this.isLoaded = true;
       return jsonData;
     } catch (error) {
       console.log("create new cache file:", filePath);

package/dist/query-login.d.ts

@@ -39,7 +39,7 @@ type CacheLoginUser = {
 type CacheLogin = {
     loginUsers: CacheLoginUser[];
 } & CacheLoginUser;
-type CacheStore<T = Cache> = {
+type CacheStore<T extends Cache = Cache> = {
     name: string;
     /**
      * 缓存数据
@@ -81,15 +81,16 @@ type CacheStore<T = Cache> = {
     getValue(): Promise<CacheLogin>;
     setValue(value: CacheLogin): Promise<CacheLogin>;
     delValue(): Promise<void>;
-    init(): Promise<any>;
+    init(): Promise<CacheLogin>;
+    getIsExpired(): Promise<boolean>;
 };
 
-type QueryLoginOpts = {
+type QueryLoginOpts<T extends Cache = Cache> = {
     query?: Query;
     isBrowser?: boolean;
     onLoad?: () => void;
     storage?: Storage;
-    cache: Cache;
+    cache: T;
 };
 type QueryLoginData = {
     username?: string;
@@ -100,16 +101,16 @@ type QueryLoginResult = {
     accessToken: string;
     refreshToken: string;
 };
-declare class QueryLogin extends BaseQuery {
+declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     /**
      * query login cache， 非实际操作， 一个cache的包裹模块
      */
-    cacheStore: CacheStore;
+    cacheStore: CacheStore<T>;
     isBrowser: boolean;
     load?: boolean;
     storage: Storage;
     onLoad?: () => void;
-    constructor(opts?: QueryLoginOpts);
+    constructor(opts?: QueryLoginOpts<T>);
     setQuery(query: Query): void;
     private init;
     post<T = any>(data: any, opts?: DataOpts): Promise<any>;
@@ -228,6 +229,7 @@ declare class QueryLogin extends BaseQuery {
      * @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);
   }
 }
@@ -1063,6 +1089,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.54",
+  "version": "0.0.56",
   "description": "",
   "main": "mod.ts",
   "scripts": {

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

@@ -38,7 +38,7 @@ type CacheLogin = {
   loginUsers: CacheLoginUser[];
 } & CacheLoginUser;
 
-export type CacheStore<T = Cache> = {
+export type CacheStore<T extends Cache = Cache> = {
   name: string;
   /**
    * 缓存数据
@@ -82,18 +82,19 @@ export type CacheStore<T = Cache> = {
   getValue(): Promise<CacheLogin>;
   setValue(value: CacheLogin): Promise<CacheLogin>;
   delValue(): Promise<void>;
-  init(): Promise<any>;
+  init(): Promise<CacheLogin>;
+  getIsExpired(): Promise<boolean>;
 };
 
-export type LoginCacheStoreOpts = {
+export type LoginCacheStoreOpts<T extends Cache = Cache> = {
   name: string;
-  cache: Cache;
+  cache: T;
 };
-export class LoginCacheStore implements CacheStore<any> {
-  cache: Cache;
+export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
+  cache: T;
   name: string;
   cacheData: CacheLogin;
-  constructor(opts: LoginCacheStoreOpts) {
+  constructor(opts: LoginCacheStoreOpts<T>) {
     if (!opts.cache) {
       throw new Error('cache is required');
     }
@@ -124,6 +125,13 @@ export class LoginCacheStore implements CacheStore<any> {
    */
   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 implements CacheStore<any> {
    * 初始化,设置默认值
    */
   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 implements CacheStore<any> {
     } else {
       this.cacheData = (await this.getValue()) || defaultData;
     }
+    return this.cacheData;
   }
   /**
    * 设置当前用户
@@ -184,6 +195,18 @@ export class LoginCacheStore implements CacheStore<any> {
     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 implements CacheStore<any> {
     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 implements CacheStore<any> {
     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/login-node-cache.ts

@@ -51,7 +51,6 @@ export class StorageNode implements Storage {
   cacheData: any;
   filePath: string = '';
   hostname: string = '';
-  isLoaded: boolean = false;
   constructor(opts?: { baseURL?: string, load?: boolean }) {
     this.cacheData = {};
     const hostname = getHostName(opts?.baseURL);
@@ -70,13 +69,11 @@ export class StorageNode implements Storage {
       this.loadCache();
     }
   }
-  loadCache(force?: boolean) {
-    if (this.isLoaded && !force) return;
+  loadCache() {
     const filePath = this.filePath;
     try {
       const data = readConfigFile(filePath);
       this.cacheData = data;
-      this.isLoaded = true;
     } catch (error) {
       this.cacheData = {};
       writeFileSync(filePath, JSON.stringify(this.cacheData, null, 2));
@@ -106,7 +103,6 @@ export class StorageNode implements Storage {
 }
 export class LoginNodeCache implements Cache {
   filepath: string;
-  isLoaded: boolean = false;
   constructor(opts?: { baseURL?: string, load?: boolean }) {
     this.filepath = join(homedir(), '.config', 'envision', 'config', `${getHostName(opts?.baseURL)}-login.json`);
     fileExists(this.filepath, { isFile: true });
@@ -136,12 +132,10 @@ export class LoginNodeCache implements Cache {
   async del() {
     unlinkSync(this.filepath);
   }
-  loadCache(filePath: string, force?: boolean) {
-    if (this.isLoaded && !force) return;
+  loadCache(filePath: string) {
     try {
       const data = readFileSync(filePath, 'utf-8');
       const jsonData = JSON.parse(data);
-      this.isLoaded = true;
       return jsonData;
     } catch (error) {
       // console.log('loadCache error', error);

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

@@ -3,7 +3,7 @@ import { LoginNodeCache, StorageNode } from './login-node-cache.ts';
 type QueryLoginNodeOptsWithoutCache = Omit<QueryLoginOpts, 'cache'>;
 export { StorageNode }
 export const cache = new LoginNodeCache();
-export class QueryLoginNode extends QueryLogin {
+export class QueryLoginNode extends QueryLogin<LoginNodeCache> {
   declare storage: StorageNode;
   constructor(opts: QueryLoginNodeOptsWithoutCache) {
     const baseURL = opts?.query?.baseURL;

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

@@ -3,12 +3,12 @@ import type { Result, DataOpts } from '@kevisual/query/query';
 import { LoginCacheStore, CacheStore } from './login-cache.ts';
 import { Cache } from './login-cache.ts';
 import { BaseLoad } from '@kevisual/load';
-export type QueryLoginOpts = {
+export type QueryLoginOpts<T extends Cache = Cache> = {
   query?: Query;
   isBrowser?: boolean;
   onLoad?: () => void;
   storage?: Storage;
-  cache: Cache;
+  cache: T;
 };
 export type QueryLoginData = {
   username?: string;
@@ -20,21 +20,21 @@ export type QueryLoginResult = {
   refreshToken: string;
 };
 
-export class QueryLogin extends BaseQuery {
+export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
   /**
    * query login cache， 非实际操作， 一个cache的包裹模块
    */
-  cacheStore: CacheStore;
+  cacheStore: CacheStore<T>;
   isBrowser: boolean;
   load?: boolean;
   storage: Storage;
   onLoad?: () => void;
 
-  constructor(opts?: QueryLoginOpts) {
+  constructor(opts?: QueryLoginOpts<T>) {
     super({
       query: opts?.query || new Query(),
     });
-    this.cacheStore = new LoginCacheStore({ name: 'login', cache: opts?.cache! });
+    this.cacheStore = new LoginCacheStore<T>({ name: 'login', cache: opts?.cache! });
     this.isBrowser = opts?.isBrowser ?? true;
     this.init();
     this.onLoad = opts?.onLoad;
@@ -305,6 +305,9 @@ export class QueryLogin extends BaseQuery {
     const token = this.storage.getItem('token');
     return !!token;
   }
+  async checkTokenValid() {
+    return this.cacheStore.getIsExpired();
+  }
   /**
    * 检查本地用户列表
    * @returns
@@ -313,6 +316,7 @@ export class QueryLogin extends BaseQuery {
     const token = this.storage.getItem('token');
     return token || '';
   }
+
   async beforeRequest(opts: any = {}) {
     const token = this.storage.getItem('token');
     if (token) {