@ctil/gql 1.1.6 → 1.1.7

package/dist/index.cjs

@@ -4378,8 +4378,8 @@ var rateLimitConfig = {
     mutation: { max: 10, window: 1, debounce: 200 }
   },
   custom: {
-    login: { max: 1, window: 5, debounce: 0 },
-    refreshToken: { max: 2, window: 5, debounce: 0 }
+    login: { max: 2, window: 3, debounce: 0 },
+    refreshToken: { max: 3, window: 5, debounce: 0 }
   }
 };
 
@@ -4515,6 +4515,7 @@ var CCRequest = class {
     this.config = config;
     this._remember = false;
     this.interceptors = [];
+    this.refreshPromise = null;
     this.deviceInfoPromise = getDeviceInfo();
     this.headers = this.buildHeaders(config);
     const loginInfo = this.loadLoginInfo();
@@ -4662,26 +4663,29 @@ var CCRequest = class {
     const loginInfo = this.getLoginInfo();
     if (!loginInfo) return;
     const now = Date.now();
-    const accessExpired = new Date(loginInfo.expireAt).getTime() <= now;
+    const accessExpired = new Date(loginInfo.expireAt).getTime() - now <= 6e5;
     const refreshExpired = new Date(loginInfo.refreshExpireAt).getTime() <= now;
     if (refreshExpired) {
       this.removeLoginInfo();
       throw new Error("Login expired. Please login again.");
     }
-    if (accessExpired && !refreshExpired) {
+    if (!accessExpired) return;
+    if (this.refreshPromise) {
+      return this.refreshPromise;
+    }
+    this.refreshPromise = (async () => {
       try {
-        const refreshResult = await auth.refreshToken({
+        const result = await auth.refreshToken({
           refreshToken: loginInfo.refreshToken,
           remember: this._remember
-          // 使用持久化的 remember
         });
-        const newInfo = refreshResult.refreshToken ?? refreshResult;
+        const newInfo = result.refreshToken ?? result;
         this.setLoginInfo(newInfo, this._remember);
-      } catch (err) {
-        this.removeLoginInfo();
-        throw new Error("Failed to refresh token. Please login again." + err?.message);
+      } finally {
+        this.refreshPromise = null;
       }
-    }
+    })();
+    return this.refreshPromise;
   }
   // ===== 请求逻辑 =====
   async request(query2, variables) {