@ctil/gql 1.1.7 → 1.1.9

package/dist/index.d.cts

@@ -93,6 +93,8 @@ declare class CCRequest {
     private headers;
     private deviceInfoPromise;
     private interceptors;
+    private refreshPromise;
+    private logoutPromise;
     constructor(config: RequestConfig);
     /** 注册一个拦截器（支持多个） */
     use(interceptor: RequestInterceptor): void;
@@ -117,10 +119,11 @@ declare class CCRequest {
     getHeaders(): Record<string, string>;
     removeHeader(key: string): void;
     clearHeaders(): void;
-    private refreshPromise;
+    private logoutOnce;
     /** 无感刷新 token */
     private ensureTokenValid;
-    request<T = any>(query: string | DocumentNode, variables?: Record<string, any>): Promise<T>;
+    private refreshToken;
+    request<T = any>(query: string | DocumentNode, variables?: Record<string, any>, _retry?: boolean): Promise<T>;
 }
 
 /** 初始化全局客户端 */

package/dist/index.d.ts

@@ -93,6 +93,8 @@ declare class CCRequest {
     private headers;
     private deviceInfoPromise;
     private interceptors;
+    private refreshPromise;
+    private logoutPromise;
     constructor(config: RequestConfig);
     /** 注册一个拦截器（支持多个） */
     use(interceptor: RequestInterceptor): void;
@@ -117,10 +119,11 @@ declare class CCRequest {
     getHeaders(): Record<string, string>;
     removeHeader(key: string): void;
     clearHeaders(): void;
-    private refreshPromise;
+    private logoutOnce;
     /** 无感刷新 token */
     private ensureTokenValid;
-    request<T = any>(query: string | DocumentNode, variables?: Record<string, any>): Promise<T>;
+    private refreshToken;
+    request<T = any>(query: string | DocumentNode, variables?: Record<string, any>, _retry?: boolean): Promise<T>;
 }
 
 /** 初始化全局客户端 */

package/dist/index.js

@@ -1680,6 +1680,7 @@ var CCRequest = class {
     this._remember = false;
     this.interceptors = [];
     this.refreshPromise = null;
+    this.logoutPromise = null;
     this.deviceInfoPromise = getDeviceInfo();
     this.headers = this.buildHeaders(config);
     const loginInfo = this.loadLoginInfo();
@@ -1821,65 +1822,79 @@ var CCRequest = class {
   clearHeaders() {
     this.headers = { "Content-Type": "application/json" };
   }
-  //无感刷新
+  async logoutOnce() {
+    if (!this.logoutPromise) {
+      this.logoutPromise = (async () => {
+        await this.removeLoginInfo();
+      })();
+    }
+    return this.logoutPromise;
+  }
   /** 无感刷新 token */
   async ensureTokenValid() {
-    const loginInfo = this.getLoginInfo();
+    const loginInfo = await this.getLoginInfo();
     if (!loginInfo) return;
     const now = Date.now();
-    const accessExpired = new Date(loginInfo.expireAt).getTime() - now <= 6e5;
+    const accessExpire = new Date(loginInfo.expireAt).getTime() <= now + 6e5;
     const refreshExpired = new Date(loginInfo.refreshExpireAt).getTime() <= now;
     if (refreshExpired) {
-      this.removeLoginInfo();
+      await this.logoutOnce();
       throw new Error("Login expired. Please login again.");
     }
-    if (!accessExpired) return;
-    if (this.refreshPromise) {
-      return this.refreshPromise;
+    if (accessExpire) {
+      await this.refreshToken();
+    }
+  }
+  async refreshToken() {
+    const loginInfo = await this.getLoginInfo();
+    if (!loginInfo) return;
+    if (!this.refreshPromise) {
+      this.refreshPromise = (async () => {
+        try {
+          const newToken = await auth.refreshToken({
+            refreshToken: loginInfo.refreshToken,
+            remember: this._remember
+          });
+          this.setToken(newToken.refreshToken.token);
+        } catch (e) {
+          await this.logoutOnce();
+          throw e;
+        } finally {
+          this.refreshPromise = null;
+        }
+      })();
     }
-    this.refreshPromise = (async () => {
-      try {
-        const result = await auth.refreshToken({
-          refreshToken: loginInfo.refreshToken,
-          remember: this._remember
-        });
-        const newInfo = result.refreshToken ?? result;
-        this.setLoginInfo(newInfo, this._remember);
-      } finally {
-        this.refreshPromise = null;
-      }
-    })();
     return this.refreshPromise;
   }
   // ===== 请求逻辑 =====
-  async request(query2, variables) {
+  async request(query2, variables, _retry = false) {
     let queryStr = typeof query2 === "string" ? query2 : print(query2);
-    const { deviceId, deviceName } = await this.deviceInfoPromise;
-    let headersWithDevice = Object.fromEntries(
-      Object.entries({
-        ...this.headers,
-        "X-Device-Id": deviceId,
-        "X-Device-Name": deviceName
-      }).filter(([_, v]) => v !== void 0)
-    );
-    for (const interceptor of this.interceptors) {
-      if (interceptor.onRequest) {
-        const result = await interceptor.onRequest({
-          query: queryStr,
-          variables,
-          headers: headersWithDevice
-        });
-        queryStr = result.query;
-        variables = result.variables;
-        headersWithDevice = Object.fromEntries(
-          Object.entries(result.headers).filter(([_, v]) => v !== void 0)
-        );
-      }
-    }
     try {
       if (!/refreshToken/i.test(queryStr)) {
         await this.ensureTokenValid();
       }
+      const { deviceId, deviceName } = await this.deviceInfoPromise;
+      let headersWithDevice = Object.fromEntries(
+        Object.entries({
+          ...this.headers,
+          "X-Device-Id": deviceId,
+          "X-Device-Name": deviceName
+        }).filter(([_, v]) => v !== void 0)
+      );
+      for (const interceptor of this.interceptors) {
+        if (interceptor.onRequest) {
+          const result = await interceptor.onRequest({
+            query: queryStr,
+            variables,
+            headers: headersWithDevice
+          });
+          queryStr = result.query;
+          variables = result.variables;
+          headersWithDevice = Object.fromEntries(
+            Object.entries(result.headers).filter(([_, v]) => v !== void 0)
+          );
+        }
+      }
       const res = await this.client.rawRequest(
         queryStr,
         variables,
@@ -1895,6 +1910,15 @@ var CCRequest = class {
     } catch (err) {
       const message = err.response?.errors?.[0]?.message ?? err.message;
       const status = err.response?.errors?.[0]?.extensions?.code ?? 500;
+      if (status === 401 && !_retry && !/refreshToken/i.test(queryStr)) {
+        try {
+          await this.refreshToken();
+          return this.request(queryStr, variables);
+        } catch {
+          await this.logoutOnce();
+          throw err;
+        }
+      }
       const formattedError = {
         message,
         status,