Update index.js

index.js

@@ -106,14 +106,25 @@ class TokenManager {
 
   async updateTokens(response, isWaf = false) {
     if (isWaf) {
-      const wafToken = await Utils.extractWaf();
+      let wafToken = await Utils.extractWaf();
+      console.log("原aws-waf-token:", Tokens[currentIndex].aws_waf_token);
+      
+      // 如果新 token 与旧 token 相同，等待后重试一次
+      if (wafToken === Tokens[currentIndex].aws_waf_token) {
+        console.log("⚠️ 更新后的aws-waf-token与现有token一致，等待后重试一次");
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        wafToken = await Utils.extractWaf();
+      }
+      
       if (wafToken) {
-        if (wafToken === Tokens[currentIndex].aws_waf_token) {
-          console.log("⚠️ 更新后的aws-waf-token与现有token一致");
-        } else {
+        console.log("新获取的aws-waf-token:", wafToken);
+        if (wafToken !== Tokens[currentIndex].aws_waf_token) {
+          console.log("✅ 成功更新aws-waf-token | 新token长度:", wafToken.length);
           Tokens[currentIndex].aws_waf_token = wafToken;
-          console.log("✅ 成功获取并更新aws-waf-token | 新token长度:", wafToken.length);
+        } else {
+          console.log("⚠️ 重试后aws-waf-token依旧与现有token一致");
         }
+        // 更新内存缓存和Redis持久化
         await this.updateCacheTokens();
         await this.updateRedisTokens();
       } else {
@@ -133,6 +144,7 @@ class TokenManager {
         console.log("更新缓存完毕");
       }
     }
+    // 单账号场景下轮换仍然无副作用
     currentIndex = (currentIndex + 1) % Tokens.length;
   }
 }
@@ -189,10 +201,15 @@ class Utils {
     }
   }
   static async extractWaf() {
-    puppeteer.use(StealthPlugin())
+    puppeteer.use(StealthPlugin());
     const browser = await puppeteer.launch({
       headless: true,
-      args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage', '--disable-gpu'],
+      args: [
+        '--no-sandbox',
+        '--disable-setuid-sandbox',
+        '--disable-dev-shm-usage',
+        '--disable-gpu'
+      ],
       executablePath: CONFIG.CHROME_PATH
     });
 
@@ -201,28 +218,21 @@ class Utils {
       await page.setExtraHTTPHeaders({
         cookie: `pr_refresh_token=${Tokens[currentIndex].pr_refresh_token};idToken=${Tokens[currentIndex].idToken};aws-waf-token=${Tokens[currentIndex].aws_waf_token};cwr_s=${Tokens[currentIndex].cwr_s};cwr_u=${Utils.uuidv4()}`
       });
-      await page.setUserAgent(
-        CONFIG.DEFAULT_HEADERS["User-Agent"]
-      )
+      await page.setUserAgent(CONFIG.DEFAULT_HEADERS["User-Agent"]);
 
-      // 监听验证挑战
+      // 监听验证挑战事件，自动截屏并解决挑战
       page.on('response', async (response) => {
         if (response.url().includes('aws-waf-challenge')) {
           const screenshots = [];
-          
-          // 截取验证图片
           const challengeElements = await page.$$('.aws-waf-challenge');
           for (const element of challengeElements) {
             const screenshot = await element.screenshot({ encoding: 'base64' });
             screenshots.push(`data:image/png;base64,${screenshot}`);
           }
 
-          // 调用Capsolver
           const solution = await this.solveAwsWaf(screenshots, 'aws:grid');
-          
           if (solution?.objects) {
             console.log(`🎯 验证答案位置: ${solution.objects.join(', ')}`);
-            // 自动点击验证答案
             await page.evaluate((objects) => {
               document.querySelectorAll('.grid-item').forEach((el, index) => {
                 if (objects.includes(index)) el.click();
@@ -232,15 +242,21 @@ class Utils {
         }
       });
 
+      // 进入验证页
       await page.goto(Tokens[currentIndex].refreshUrl, {
         waitUntil: 'networkidle2',
         timeout: 30000
       });
 
-      // 获取最终token
-      const awsWafToken = (await page.cookies()).find(
+      // 延长等待时间让挑战完成（根据实际情况可调整）
+      await page.waitForTimeout(5000);
+
+      // 再次等待，确保所有动态变动已结束
+      const cookies = await page.cookies();
+      const awsWafCookie = cookies.find(
         cookie => cookie.name.toLowerCase() === 'aws-waf-token'
-      )?.value;
+      );
+      const awsWafToken = awsWafCookie ? awsWafCookie.value : null;
 
       if (awsWafToken) {
         console.log(`🔑 成功获取aws-waf-token | 长度: ${awsWafToken.length}字符`);
@@ -250,7 +266,6 @@ class Utils {
 
       await browser.close();
       return awsWafToken;
-
     } catch (error) {
       console.error('获取aws-waf-token出错:', error);
       await browser.close();