Update index.js

index.js

@@ -97,7 +97,7 @@ class CapsolverClient {
     this.apiKey = apiKey;
   }
 
-  async createTask(websiteURL, websiteKey) {
+  async createTask(websiteURL, websiteKey, extraParams = {}) {
     const response = await fetch(`${CAPSOLVER_CONFIG.API_URL}/createTask`, {
       method: 'POST',
       headers: {
@@ -109,6 +109,9 @@ class CapsolverClient {
           type: "AwsWafCaptcha",
           websiteURL: websiteURL,
           websiteKey: websiteKey,
+          gokuProps: extraParams.gokuProps,
+          captchaUrl: extraParams.captchaUrl,
+          challengeUrl: extraParams.challengeUrl,
           proxy: {
             // 如果需要代理可以在这里配置
           }
@@ -152,26 +155,68 @@ class TokenManager {
     CONFIG.DEFAULT_HEADERS["request-id"] = `request-id-${Utils.uuidv4()}`;
   }
 
-  async solveCaptcha(url) {
+  async extractChallengeInfo(html) {
+    console.log('开始提取验证码信息...');
+    try {
+      // 提取 gokuProps
+      const gokuPropsMatch = html.match(/window\.gokuProps\s*=\s*({[\s\S]*?});/);
+      if (!gokuPropsMatch) {
+        console.error('未找到 gokuProps');
+        return null;
+      }
+
+      // 提取验证码和challenge URL
+      const captchaUrlMatch = html.match(/src="(https:\/\/[^"]+\/captcha\.js)"/);
+      const challengeUrlMatch = html.match(/src="(https:\/\/[^"]+\/challenge\.js)"/);
+
+      if (!captchaUrlMatch || !challengeUrlMatch) {
+        console.error('未找到验证码或challenge URL');
+        return null;
+      }
+
+      const gokuProps = JSON.parse(gokuPropsMatch[1]);
+      const captchaUrl = captchaUrlMatch[1].replace('/captcha.js', '');
+      const challengeUrl = challengeUrlMatch[1].replace('/challenge.js', '');
+
+      console.log('提取的信息:', {
+        gokuProps,
+        captchaUrl,
+        challengeUrl
+      });
+
+      return {
+        gokuProps,
+        captchaUrl,
+        challengeUrl
+      };
+    } catch (error) {
+      console.error('提取验证码信息时出错:', error);
+      return null;
+    }
+  }
+
+  async solveCaptcha(challengeInfo) {
     console.log('开始处理验证码...');
-    console.log('验证码URL:', url);
-    
     const capsolverClient = new CapsolverClient(CAPSOLVER_CONFIG.API_KEY);
     
     try {
-      const websiteKey = url.split('/')[2].split('.')[0];
+      const websiteKey = challengeInfo.captchaUrl.split('/')[2].split('.')[0];
       console.log('提取的websiteKey:', websiteKey);
 
       console.log('创建验证码任务...');
       const createTaskResponse = await capsolverClient.createTask(
         "partyrock.aws",
-        websiteKey
+        websiteKey,
+        {
+          gokuProps: challengeInfo.gokuProps,
+          captchaUrl: challengeInfo.captchaUrl,
+          challengeUrl: challengeInfo.challengeUrl
+        }
       );
 
       console.log('创建任务响应:', JSON.stringify(createTaskResponse, null, 2));
 
       if (createTaskResponse.errorId > 0) {
-        console.error('创建验证码任务失败:', createTaskResponse.errorDescription);
         throw new Error(`创建验证码任务失败: ${createTaskResponse.errorDescription}`);
       }
 
@@ -209,57 +254,67 @@ class TokenManager {
       try {
         console.log('Response headers:', JSON.stringify(Object.fromEntries([...response.headers]), null, 2));
         
-        // 获取验证码URL
-        const captchaUrl = response.headers.get('x-amz-waf-challenge-url');
-        console.log('验证码URL:', captchaUrl);
-
-        if (captchaUrl) {
-          console.log('开始处理WAF验证码...');
-          const solution = await this.solveCaptcha(captchaUrl);
-          
-          console.log('提交验证码解决方案...');
-          const verifyResponse = await fetch(captchaUrl, {
+        // 获取HTML内容
+        const html = await response.text();
+        console.log('收到HTML响应');
+        
+        // 提取验证码信息
+        const challengeInfo = await this.extractChallengeInfo(html);
+        if (!challengeInfo) {
+          throw new Error('无法提取验证码信息');
+        }
+
+        console.log('开始处理WAF验证码...');
+        const solution = await this.solveCaptcha(challengeInfo);
+        
+        console.log('提交验证码解决方案...');
+        const verifyResponse = await fetch(`${challengeInfo.captchaUrl}/verify`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Referer': 'https://partyrock.aws/',
+            'Origin': 'https://partyrock.aws'
+          },
+          body: JSON.stringify(solution)
+        });
+
+        console.log('验证响应状态:', verifyResponse.status);
+        console.log('验证响应headers:', JSON.stringify(Object.fromEntries([...verifyResponse.headers]), null, 2));
+
+        if (verifyResponse.ok) {
+          const voucherResponse = await verifyResponse.json();
+          console.log('获取到voucher:', voucherResponse);
+
+          // 提交voucher
+          const submitResponse = await fetch(`${challengeInfo.challengeUrl}/voucher`, {
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              ...CONFIG.DEFAULT_HEADERS
+              'Referer': 'https://partyrock.aws/',
+              'Origin': 'https://partyrock.aws'
             },
-            body: JSON.stringify(solution)
+            body: JSON.stringify({
+              voucher: voucherResponse.voucher
+            })
           });
 
-          console.log('验证响应状态:', verifyResponse.status);
-          console.log('验证响应headers:', JSON.stringify(Object.fromEntries([...verifyResponse.headers]), null, 2));
-
-          if (verifyResponse.ok) {
+          if (submitResponse.ok) {
             console.log('验证成功，更新WAF token...');
             const wafToken = await Utils.extractWaf();
-            console.log('提取的WAF token:', wafToken);
-            
             if (wafToken) {
               Tokens[currentIndex].aws_waf_token = wafToken;
               await this.updateCacheTokens();
               this.updateRedisTokens();
               console.log("成功更新 aws-waf-token");
-            } else {
-              console.error('无法提取WAF token');
             }
-          } else {
-            console.error('验证响应不成功');
-            const responseText = await verifyResponse.text();
-            console.error('验证响应内容:', responseText);
           }
-        } else {
-          console.error('未找到验证码URL');
-          console.log('完整响应:', await response.text());
         }
       } catch (error) {
         console.error('处理验证码过程中发生错误:', error);
         console.error('错误堆栈:', error.stack);
       }
       
-      console.log(`切换到下一个token (当前索引: ${currentIndex})`);
       currentIndex = (currentIndex + 1) % Tokens.length;
-      console.log(`新的token索引: ${currentIndex}`);
       
     } else {
       const newCsrfToken = response.headers.get('anti-csrftoken-a2z');