A2C工单修复

patches/puppeteer-api/lib/cf-handler.js

@@ -5,8 +5,9 @@
  * 否则清除可能过期的 cf_clearance 并重新触发 Turnstile（Whatshub 短链 → work-order-sharing 场景）。
  */
 const { detectCloudflare } = require('./cf-detector');
-const { waitForTurnstile, extractTurnstileSitekey, injectTurnstileToken, waitForTurnstileSurface } = require('./turnstile-handler');
-const { solveTurnstile, isCaptchaConfigured } = require('./captcha-solver');
+const { waitForTurnstile } = require('./turnstile-handler');
+const { isCaptchaConfigured } = require('./captcha-solver');
+const { runCaptchaApiFallback } = require('./cf-api-fallback');
 const { isSessionLikelyValid } = require('./session-store');
 
 /**
@@ -257,15 +258,12 @@ async function handleCloudflareChallenge(page, antiBot, waitForUrlSettled, store
             if (waitForUrlSettled) {
                 await waitForUrlSettled(page).catch(() => {});
             }
-            let sitekey = await waitForTurnstileSurface(page, Math.min(timeoutMs, 25000));
-            if (!sitekey) {
-                sitekey = await extractTurnstileSitekey(page);
-            }
-            const pageUrl = page.url();
-            console.log(`[CF] Captcha API 求解 pageUrl=${pageUrl} sitekey=${sitekey ? 'ok' : 'missing'}`);
-            const { token, provider } = await solveTurnstile({ pageUrl, sitekey });
-            console.log(`[CF] Captcha API (${provider}) 返回 token，注入页面`);
-            await injectTurnstileToken(page, token);
+            await runCaptchaApiFallback(page, {
+                antiBot,
+                navUrl: page.url(),
+                waitForUrlSettled,
+                timeoutMs,
+            });
 
             const apiWaitMs = Math.min(timeoutMs, 30000);
             await waitForTurnstile(page, { timeoutMs: apiWaitMs });