Update index.js

index.js

@@ -98,75 +98,97 @@ class CapsolverClient {
   }
 
   async createTask(websiteURL, websiteKey, extraParams = {}) {
-    // 首先获取验证码图片
-    const captchaResponse = await fetch(extraParams.captchaUrl, {
+    // 第一步：发送初始化请求获取验证码
+    const initResponse = await fetch(extraParams.captchaUrl + '/init', {
+      method: 'POST',
       headers: {
+        'Content-Type': 'application/json',
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
+        'sec-ch-ua': '"Not(A:Brand";v="99", "Google Chrome";v="133", "Chromium";v="133"',
+        'sec-ch-ua-platform': '"Windows"',
+        'sec-ch-ua-mobile': '?0',
         'Referer': 'https://partyrock.aws/',
-        'Origin': 'https://partyrock.aws',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36'
-      }
+        'Origin': 'https://partyrock.aws'
+      },
+      body: JSON.stringify({
+        gokuProps: extraParams.gokuProps
+      })
     });
 
-    if (!captchaResponse.ok) {
-      throw new Error('获取验证码失败');
+    if (!initResponse.ok) {
+      console.error('初始化验证码失败:', await initResponse.text());
+      throw new Error('初始化验证码失败');
     }
 
-    const captchaData = await captchaResponse.json();
-    console.log('验证码数据:', captchaData);
+    const initData = await initResponse.json();
+    console.log('验证码初始化数据:', initData);
 
+    // 第二步：创建 Capsolver 任务
     const requestBody = JSON.stringify({
       clientKey: this.apiKey,
       task: {
         type: "AwsWafClassification",
         websiteURL: websiteURL,
-        images: captchaData.images || [],
-        question: captchaData.question || "aws:grid:bed" // 默认值，应该从验证码响应中获取
+        websiteKey: websiteKey,
+        metadata: {
+          images: initData.images || [],
+          question: initData.question || '',
+          context: extraParams.gokuProps.context,
+          iv: extraParams.gokuProps.iv,
+          key: extraParams.gokuProps.key
+        }
       }
     });
 
     console.log('发送到Capsolver的数据:', requestBody);
 
-    try {
-      const response = await fetch(`${CAPSOLVER_CONFIG.API_URL}/createTask`, {
+    const response = await fetch(`${CAPSOLVER_CONFIG.API_URL}/createTask`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: requestBody
+    });
+
+    if (!response.ok) {
+      console.error('Capsolver API 响应不成功:', response.status);
+      const errorText = await response.text();
+      console.error('错误响应内容:', errorText);
+      throw new Error(`Capsolver API 请求失败: ${response.status}`);
+    }
+
+    const result = await response.json();
+    console.log('Capsolver 返回结果:', result);
+
+    // 第三步：提交验证结果
+    if (result.solution) {
+      const verifyResponse = await fetch(extraParams.captchaUrl + '/verify', {
         method: 'POST',
         headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
+          'sec-ch-ua': '"Not(A:Brand";v="99", "Google Chrome";v="133", "Chromium";v="133"',
+          'sec-ch-ua-platform': '"Windows"',
+          'sec-ch-ua-mobile': '?0',
+          'Referer': 'https://partyrock.aws/',
+          'Origin': 'https://partyrock.aws'
         },
-        body: requestBody
+        body: JSON.stringify({
+          solution: result.solution,
+          context: extraParams.gokuProps.context,
+          iv: extraParams.gokuProps.iv,
+          key: extraParams.gokuProps.key
+        })
       });
 
-      if (!response.ok) {
-        console.error('Capsolver API 响应不成功:', response.status);
-        const errorText = await response.text();
-        console.error('错误响应内容:', errorText);
-        throw new Error(`Capsolver API 请求失败: ${response.status}`);
-      }
-
-      const result = await response.json();
-      console.log('Capsolver API 响应:', result);
-
-      // 如果成功识别，提交验证结果
-      if (result.status === 'ready') {
-        const verifyResponse = await fetch(extraParams.captchaUrl + '/verify', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Referer': 'https://partyrock.aws/',
-            'Origin': 'https://partyrock.aws'
-          },
-          body: JSON.stringify({
-            solution: result.solution
-          })
-        });
-
-        return await verifyResponse.json();
+      if (!verifyResponse.ok) {
+        throw new Error('验证提交失败');
       }
 
-      return result;
-    } catch (error) {
-      console.error('调用 Capsolver API 时出错:', error);
-      throw error;
+      return await verifyResponse.json();
     }
+
+    return result;
   }
 }