Update index.js

index.js

@@ -101,24 +101,24 @@ class TokenManager {
     CONFIG.DEFAULT_HEADERS.Cookie = `idToken=${Tokens[currentIndex].idToken}; pr_refresh_token=${Tokens[currentIndex].pr_refresh_token};aws-waf-token=${Tokens[currentIndex].aws_waf_token};cwr_s=${Tokens[currentIndex].cwr_s};cwr_u=${sessionId}`;
     CONFIG.DEFAULT_HEADERS.referer = Tokens[currentIndex].refreshUrl;
     CONFIG.DEFAULT_HEADERS["request-id"] = `request-id-${Utils.uuidv4()}`;
+    CONFIG.DEFAULT_HEADERS["User-Agent"] = await Utils.getRandomUserAgent();
   }
 
   async updateTokens(response, isWaf = false) {
     if (isWaf) {
       const wafToken = await Utils.extractWaf();
       if (wafToken) {
-        // 立即更新内存中的token
-        Tokens[currentIndex].aws_waf_token = wafToken;
-        
-        // 强制刷新请求头
+        if (wafToken === Tokens[currentIndex].aws_waf_token) {
+          console.log("⚠️ 更新后的aws-waf-token与现有token一致");
+        } else {
+          Tokens[currentIndex].aws_waf_token = wafToken;
+          console.log("✅ 成功获取并更新aws-waf-token | 新token长度:", wafToken.length);
+        }
         await this.updateCacheTokens();
-        
-        // 持久化到Redis
         await this.updateRedisTokens();
-        
-        console.log("✅ 成功更新aws-waf-token | 新token长度:", wafToken.length);
+      } else {
+        console.log("❌ 提取aws-waf-token失败");
       }
-      // 无论成功失败都保持当前索引（单账号场景无影响）
     } else {
       const newCsrfToken = response.headers.get('anti-csrftoken-a2z');
       const cookies = response.headers.get('set-cookie');
@@ -129,11 +129,10 @@ class TokenManager {
         if (idTokenMatch && idTokenMatch[1]) {
           Tokens[currentIndex].idToken = idTokenMatch[1];
         }
-        this.updateRedisTokens();//最后更新redis数据库缓存,异步
+        await this.updateRedisTokens();
         console.log("更新缓存完毕");
       }
     }
-    // 保持原有轮换逻辑（单账号场景无副作用）
     currentIndex = (currentIndex + 1) % Tokens.length;
   }
 }
@@ -581,55 +580,45 @@ app.post('/hf/v1/chat/completions', async (req, res) => {
     if (authToken !== CONFIG.API.API_KEY) {
       return res.status(401).json({ error: "Unauthorized" });
     }
+    // 每次请求前确保请求头更新为最新的token信息
     await tokenManager.updateCacheTokens();
     const apiClient = new ApiClient(req.body.model);
     const requestPayload = await apiClient.transformMessages(req.body);
-    
-    try {
-      console.log("开始请求");
-      //发送请求
-      var response = await fetch(`${CONFIG.API.BASE_URL}`, {
+
+    console.log("开始请求");
+    let response = await fetch(`${CONFIG.API.BASE_URL}`, {
+      method: "POST",
+      headers: { ...CONFIG.DEFAULT_HEADERS },
+      body: JSON.stringify(requestPayload)
+    });
+    reqStatus = response.status;
+
+    // 当出现请求受限或人机验证时，先更新token，再重试一次
+    if ([202, 405].includes(reqStatus)) {
+      console.log("请求受限或人机验证，正在更新token并重试请求");
+      await tokenManager.updateTokens(response, true);
+      // 延时1秒，等待新token生效
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      response = await fetch(`${CONFIG.API.BASE_URL}`, {
         method: "POST",
-        headers: {
-          ...CONFIG.DEFAULT_HEADERS
-        },
+        headers: { ...CONFIG.DEFAULT_HEADERS },
         body: JSON.stringify(requestPayload)
       });
       reqStatus = response.status;
-      switch (reqStatus) {
-        case 200:
-          console.log("请求成功");
-          // 异步更新token
-          tokenManager.updateTokens(response)
-          // 处理响应
-          if (req.body.stream) {
-            await ResponseHandler.handleStreamResponse(response, req.body.model, res);
-          } else {
-            await ResponseHandler.handleNormalResponse(response, req.body.model, res);
-          }
-          return;
-        case 202:
-          console.log("请求受限，更新WAF");
-          await tokenManager.updateTokens(response, true);
-          throw new Error(`请求失败! status: ${response.statusText}，已刷新验证信息，请重新请求`);
-        case 405:
-          console.log("人机验证");
-          await tokenManager.updateTokens(response, true);//尝试获取waf，然后返回错误提示。
-          throw new Error(`请求失败! status: ${response.statusText}，人机验证，请重新请求，如果多次失败，请重新更换token`);
-        case 400:
-          console.log("信息过期，请求失败");
-          await tokenManager.updateTokens(response);
-          throw new Error(`请求失败! status: ${response.statusText}，已刷新验证信息，请重新请求`);
-        case 403:
-          console.log("请求被阻止");
-          await tokenManager.updateTokens(response, true);//尝试获取waf，然后返回错误提示。
-          CONFIG.DEFAULT_HEADERS["User-Agent"] = await Utils.getRandomUserAgent();
-          throw new Error(`请求失败! status: ${response.statusText}，请重新请求，如果多次失败，请重新更换token`);
-        default:
-          throw new Error(`请求失败! status: ${response.status}`);
+    }
+
+    if (reqStatus === 200) {
+      console.log("请求成功");
+      // 异步更新token（注意此处可不用 await 以保证响应速度）
+      tokenManager.updateTokens(response);
+      if (req.body.stream) {
+        await ResponseHandler.handleStreamResponse(response, req.body.model, res);
+      } else {
+        await ResponseHandler.handleNormalResponse(response, req.body.model, res);
       }
-    } catch (error) {
-      throw new Error(`请求失败! status: ${response.status}`);
+      return;
+    } else {
+      throw new Error(`请求失败! status: ${response.statusText}`);
     }
   } catch (error) {
     res.status(parseInt(reqStatus)).json({