@kevisual/api 0.0.58 → 0.0.60

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

@@ -172,13 +172,19 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @param refreshToken 刷新token，如果不传，则从缓存中获取
      * @returns
      */
-    refreshLoginUser(refreshToken?: string): Promise<any>;
+    refreshLoginUser(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
      * @returns
      */
-    queryRefreshToken(refreshToken?: string): Promise<any>;
+    queryRefreshToken(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 检查401错误，并刷新token, 如果refreshToken存在，则刷新token, 否则返回401
      * 拦截请求，请使用run401Action， 不要直接使用 afterCheck401ToRefreshToken

package/dist/query-login-node.js

@@ -312,6 +312,16 @@ class BaseQuery {
 }
 
 // query/query-login/login-cache.ts
+var defaultCacheData = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
+
 class LoginCacheStore {
   cache;
   name;
@@ -321,13 +331,7 @@ class LoginCacheStore {
       throw new Error("cache is required");
     }
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
     this.name = opts.name;
   }
   async setValue(value) {
@@ -337,27 +341,13 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
   }
   getValue() {
     return this.cache.get(this.name);
   }
   async init() {
-    const defaultData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined
-    };
+    const defaultData = { ...this.cacheData };
     if (this.cache.init) {
       try {
         const cacheData = await this.cache.init();
@@ -370,18 +360,18 @@ class LoginCacheStore {
     }
     return this.cacheData;
   }
-  async setLoginUser(user) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
-    }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    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;
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
+    }
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -417,22 +407,22 @@ class LoginCacheStore {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData };
     await this.setValue(this.cacheData);
   }
 }
@@ -1011,18 +1001,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async refreshLoginUser(refreshToken) {
-    const res = await this.queryRefreshToken(refreshToken);
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
     if (res.code === 200) {
-      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
     }
     return res;
   }
-  async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken ?? await this.cacheStore.getRefreshToken();
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1042,7 +1040,7 @@ class QueryLogin extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem("token", accessToken || "");
@@ -1126,6 +1124,7 @@ class QueryLogin extends BaseQuery {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log("token过期，正在刷新token", this.cacheStore.cacheData);
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;

package/dist/query-login.d.ts

@@ -172,13 +172,19 @@ declare class QueryLogin<T extends Cache = Cache> extends BaseQuery {
      * @param refreshToken 刷新token，如果不传，则从缓存中获取
      * @returns
      */
-    refreshLoginUser(refreshToken?: string): Promise<any>;
+    refreshLoginUser(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 刷新token
      * @param refreshToken
      * @returns
      */
-    queryRefreshToken(refreshToken?: string): Promise<any>;
+    queryRefreshToken(opts?: {
+        refreshToken?: string;
+        accessToken?: string;
+    }): Promise<any>;
     /**
      * 检查401错误，并刷新token, 如果refreshToken存在，则刷新token, 否则返回401
      * 拦截请求，请使用run401Action， 不要直接使用 afterCheck401ToRefreshToken

package/dist/query-login.js

@@ -312,6 +312,16 @@ class BaseQuery {
 }
 
 // query/query-login/login-cache.ts
+var defaultCacheData = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined
+};
+
 class LoginCacheStore {
   cache;
   name;
@@ -321,13 +331,7 @@ class LoginCacheStore {
       throw new Error("cache is required");
     }
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
     this.name = opts.name;
   }
   async setValue(value) {
@@ -337,27 +341,13 @@ class LoginCacheStore {
   }
   async delValue() {
     await this.cache.del();
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined
-    };
+    this.cacheData = { ...defaultCacheData };
   }
   getValue() {
     return this.cache.get(this.name);
   }
   async init() {
-    const defaultData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined
-    };
+    const defaultData = { ...this.cacheData };
     if (this.cache.init) {
       try {
         const cacheData = await this.cache.init();
@@ -370,18 +360,18 @@ class LoginCacheStore {
     }
     return this.cacheData;
   }
-  async setLoginUser(user) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
-    }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    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;
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
+    }
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
   getCurrentUser() {
@@ -417,22 +407,22 @@ class LoginCacheStore {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData };
     await this.setValue(this.cacheData);
   }
 }
@@ -1011,18 +1001,26 @@ class QueryLogin extends BaseQuery {
       message: "登录失败"
     };
   }
-  async refreshLoginUser(refreshToken) {
-    const res = await this.queryRefreshToken(refreshToken);
+  async refreshLoginUser(opts) {
+    const res = await this.queryRefreshToken(opts);
     if (res.code === 200) {
-      const { accessToken, refreshToken: refreshToken2, accessTokenExpiresIn } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem("token", accessToken || "");
-      await this.beforeSetLoginUser({ accessToken, refreshToken: refreshToken2, accessTokenExpiresIn, check401: false });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
     }
     return res;
   }
-  async queryRefreshToken(refreshToken) {
-    const _refreshToken = refreshToken || await this.cacheStore.getRefreshToken();
-    let data = { refreshToken: _refreshToken };
+  async queryRefreshToken(opts) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken ?? await this.cacheStore.getRefreshToken();
+    let data = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -1042,7 +1040,7 @@ class QueryLogin extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem("token", accessToken || "");
@@ -1126,6 +1124,7 @@ class QueryLogin extends BaseQuery {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log("token过期，正在刷新token", this.cacheStore.cacheData);
       const res = await this.refreshLoginUser();
       if (res.code === 200) {
         return res.data?.accessToken || null;

package/package.json

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

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

@@ -90,6 +90,15 @@ export type LoginCacheStoreOpts<T extends Cache = Cache> = {
   name: string;
   cache: T;
 };
+const defaultCacheData: CacheLogin = {
+  loginUsers: [],
+  user: undefined,
+  id: undefined,
+  accessToken: undefined,
+  refreshToken: undefined,
+  accessTokenExpiresIn: undefined,
+  createdAt: undefined,
+}
 export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
   cache: T;
   name: string;
@@ -100,12 +109,16 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     }
     // @ts-ignore
     this.cache = opts.cache;
-    this.cacheData = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
+    this.cacheData = { ...defaultCacheData };
+    this.name = opts.name;
+  }
+  /**
+   * 设置缓存
+   * @param key
+   * @param value
+   * @returns
+      accessTokenExpiresIn: undefined,
+      createdAt: undefined,
     };
     this.name = opts.name;
   }
@@ -125,13 +138,7 @@ 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,
-    };
+    this.cacheData = { ...defaultCacheData };
   }
   getValue(): Promise<CacheLogin> {
     return this.cache.get(this.name);
@@ -140,15 +147,7 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
    * 初始化,设置默认值
    */
   async init() {
-    const defaultData: CacheLogin = {
-      loginUsers: [],
-      user: undefined,
-      id: undefined,
-      accessToken: undefined,
-      refreshToken: undefined,
-      accessTokenExpiresIn: undefined,
-      createdAt: undefined,
-    };
+    const defaultData: CacheLogin = { ...this.cacheData };
     if (this.cache.init) {
       try {
         const cacheData = await this.cache.init();
@@ -165,18 +164,18 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
    * 设置当前用户
    * @param user
    */
-  async setLoginUser(user: CacheLoginUser) {
-    const has = this.cacheData.loginUsers.find((u) => u.id === user.id);
+  async setLoginUser(loginUser: CacheLoginUser) {
+    const has = this.cacheData.loginUsers.find((u) => u.id === loginUser.id);
     if (has) {
-      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
+      this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== loginUser.id);
     }
-    this.cacheData.loginUsers.push(user);
-    this.cacheData.user = user.user;
-    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;
+    this.cacheData.loginUsers.push(loginUser);
+    this.cacheData.user = loginUser.user;
+    this.cacheData.id = loginUser.id;
+    this.cacheData.accessToken = loginUser.accessToken;
+    this.cacheData.refreshToken = loginUser.refreshToken;
+    this.cacheData.accessTokenExpiresIn = loginUser.accessTokenExpiresIn;
+    this.cacheData.createdAt = loginUser.createdAt;
     await this.setValue(this.cacheData);
   }
 
@@ -214,22 +213,22 @@ export class LoginCacheStore<T extends Cache = Cache> implements CacheStore<T> {
     if (has) {
       this.cacheData.loginUsers = this.cacheData?.loginUsers?.filter((u) => u?.id && u.id !== user.id);
     }
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    const hasOther = this.cacheData.loginUsers.length > 0;
+    const current = this.cacheData.loginUsers[this.cacheData.loginUsers.length - 1];
+    if (hasOther && current) {
+      this.cacheData.user = current.user;
+      this.cacheData.id = current.id;
+      this.cacheData.accessToken = current.accessToken;
+      this.cacheData.refreshToken = current.refreshToken;
+      this.cacheData.accessTokenExpiresIn = current.accessTokenExpiresIn;
+      this.cacheData.createdAt = current.createdAt;
+    } else {
+      this.cacheData = { ...defaultCacheData };
+    }
     await this.setValue(this.cacheData);
   }
   async clearAll() {
-    this.cacheData.loginUsers = [];
-    this.cacheData.user = undefined;
-    this.cacheData.id = undefined;
-    this.cacheData.accessToken = undefined;
-    this.cacheData.refreshToken = undefined;
-    this.cacheData.accessTokenExpiresIn = undefined;
-    this.cacheData.createdAt = undefined;
+    this.cacheData = { ...defaultCacheData };
     await this.setValue(this.cacheData);
   }
 }

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

@@ -179,8 +179,8 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * @param refreshToken 刷新token，如果不传，则从缓存中获取
    * @returns 
    */
-  async refreshLoginUser(refreshToken?: string) {
-    const res = await this.queryRefreshToken(refreshToken);
+  async refreshLoginUser(opts?: { refreshToken?: string, accessToken?: string }) {
+    const res = await this.queryRefreshToken(opts);
     if (res.code === 200) {
       const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem('token', accessToken || '');
@@ -193,9 +193,17 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
    * @param refreshToken
    * @returns
    */
-  async queryRefreshToken(refreshToken?: string) {
-    const _refreshToken = refreshToken || (await this.cacheStore.getRefreshToken());
-    let data = { refreshToken: _refreshToken };
+  async queryRefreshToken(opts?: { refreshToken?: string, accessToken?: string }) {
+    const refreshToken = opts?.refreshToken;
+    let accessToken = opts?.accessToken;
+    const _refreshToken = refreshToken ?? (await this.cacheStore.getRefreshToken());
+    let data: any = {};
+    if (accessToken) {
+      data.accessToken = accessToken;
+    }
+    if (_refreshToken) {
+      data.refreshToken = _refreshToken;
+    }
     if (!_refreshToken) {
       await this.cacheStore.clearCurrentUser();
       return {
@@ -226,7 +234,7 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     if (response?.code === 401) {
       const hasRefreshToken = await that.cacheStore.getRefreshToken();
       if (hasRefreshToken) {
-        const res = await that.queryRefreshToken(hasRefreshToken);
+        const res = await that.queryRefreshToken({ refreshToken: hasRefreshToken });
         if (res.code === 200) {
           const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem('token', accessToken || '');
@@ -352,6 +360,7 @@ export class QueryLogin<T extends Cache = Cache> extends BaseQuery {
     }
     const isExpired = await this.cacheStore.getIsExpired();
     if (isExpired) {
+      console.log('token过期，正在刷新token', this.cacheStore.cacheData);
       const res = await this.refreshLoginUser()
       if (res.code === 200) {
         // 刷新成功，返回新的token

package/query/query-login/test/expire.ts

@@ -0,0 +1,10 @@
+const cacheData = {
+  accessTokenExpiresIn: 604800,
+  createdAt: 1771926793545
+};
+
+const expiresIn = cacheData.createdAt + cacheData.accessTokenExpiresIn * 1000;
+console.log('expiresIn', expiresIn);
+const now = Date.now();
+console.log('now', now);
+console.log('isExpired', now >= expiresIn);