Update endpoints/recaptchav3.js

endpoints/recaptchav3.js

@@ -3,64 +3,71 @@ module.exports = async function(page, url, siteKey, action = 'submit') {
         const timeout = setTimeout(() => reject(new Error("Timeout waiting for reCAPTCHA v3 token (60s)")), 60000);
 
         try {
-            console.log(`[RV3] Processing: ${url} | Action: ${action}`);
+            console.log(`[RV3] Target: ${url}`);
             
             await page.setRequestInterception(false);
 
-            try {
-                console.log("[RV3] Navigating...");
-                await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 20000 });
-                console.log("[RV3] Page loaded (Standard).");
-            } catch (e) {
-                console.log(`[RV3] Navigation Timeout/Error: ${e.message}.`);
-                console.log("[RV3] HTML likely loaded. Proceeding to inject...");
+            console.log("[RV3] 1. Navigating...");
+            await page.goto(url, { waitUntil: 'networkidle2', timeout: 30000 });
+            console.log("[RV3] 2. Page loaded.");
+
+            console.log("[RV3] 3. Checking for grecaptcha...");
+            const isCaptchaReady = await page.evaluate(async (key) => {
+                if (typeof window.grecaptcha !== 'undefined' && window.grecaptcha.execute) {
+                    return true;
+                }
+                return new Promise((res) => {
+                    const script = document.createElement('script');
+                    script.src = `https://www.google.com/recaptcha/api.js?render=${key}`;
+                    script.onload = () => res(true);
+                    script.onerror = () => res(false);
+                    document.head.appendChild(script);
+                });
+            }, siteKey);
+
+            if (!isCaptchaReady) {
+                clearTimeout(timeout);
+                reject(new Error("Failed to load Google reCAPTCHA Library"));
+                return;
             }
+            console.log("[RV3] 4. grecaptcha Library is READY.");
 
+            try {
+                await page.mouse.move(100, 100);
+                await page.mouse.move(200, 200);
+            } catch(e) {}
+
+            console.log(`[RV3] 5. Executing action: '${action}'...`);
             const token = await page.evaluate(async (key, act) => {
                 return new Promise((res, rej) => {
-
-                    const runCaptcha = () => {
-                        console.log("Browser: Executing grecaptcha...");
-                        if (!window.grecaptcha || !window.grecaptcha.execute) {
-                            rej("grecaptcha object not found");
-                            return;
-                        }
-                        grecaptcha.ready(() => {
-                            window.grecaptcha.execute(key, { action: act })
-                                .then(t => res(t))
-                                .catch(err => rej("Execute Error: " + err));
-                        });
-                    };
-
-                    if (typeof window.grecaptcha !== 'undefined' && window.grecaptcha.execute) {
-                        console.log("Browser: Native script found.");
-                        runCaptcha();
-                    } else {
-                        console.log("Browser: Injecting script manual...");
-                        const script = document.createElement('script');
-                        script.src = `https://www.google.com/recaptcha/api.js?render=${key}`;
-                        script.async = true;
-                        script.onload = () => {
-                            console.log("Browser: Script loaded.");
-                            setTimeout(runCaptcha, 1000);
-                        };
-                        script.onerror = () => rej("Failed to load Google Script from Google Server");
-                        document.head.appendChild(script);
-                    }
+                    const t = setTimeout(() => rej("Google internal execution timed out"), 10000);
+                    
+                    window.grecaptcha.ready(() => {
+                        window.grecaptcha.execute(key, { action: act })
+                            .then(token => {
+                                clearTimeout(t);
+                                res(token);
+                            })
+                            .catch(err => {
+                                clearTimeout(t);
+                                rej(err.message || err);
+                            });
+                    });
                 });
             }, siteKey, action);
 
             clearTimeout(timeout);
             
             if (token) {
-                console.log(`[RV3] Success! Token generated.`);
+                console.log(`[RV3] 6. SUCCESS! Token: ${token.substring(0, 15)}...`);
                 resolve(token);
             } else {
-                reject(new Error("Empty token received"));
+                reject(new Error("Token was null/empty"));
             }
 
         } catch (e) {
             clearTimeout(timeout);
+            console.error(`[RV3] ERROR DETAIL: ${e.message}`);
             reject(e);
         }
     });