testdriverai 7.2.79 → 7.2.80

package/lib/captcha/solver.js

@@ -28,6 +28,68 @@ function httpsGet(url) {
   });
 }
 
+/**
+ * Safely parse JSON response that may contain extra characters or multiple objects.
+ * The 2captcha API sometimes returns concatenated JSON or has trailing characters.
+ * @param {string} text - The response text to parse
+ * @returns {object} The parsed JSON object
+ */
+function safeParseJson(text) {
+  // Trim whitespace first
+  const trimmed = text.trim();
+
+  // Try standard parsing first
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    // If standard parsing fails, try to extract the first valid JSON object
+    const jsonStart = trimmed.indexOf("{");
+    if (jsonStart === -1) {
+      throw new Error("No JSON object found in response: " + trimmed);
+    }
+
+    // Find the matching closing brace by counting braces
+    let braceCount = 0;
+    let inString = false;
+    let escape = false;
+
+    for (let i = jsonStart; i < trimmed.length; i++) {
+      const char = trimmed[i];
+
+      if (escape) {
+        escape = false;
+        continue;
+      }
+
+      if (char === "\\") {
+        escape = true;
+        continue;
+      }
+
+      if (char === '"') {
+        inString = !inString;
+        continue;
+      }
+
+      if (!inString) {
+        if (char === "{") {
+          braceCount++;
+        } else if (char === "}") {
+          braceCount--;
+          if (braceCount === 0) {
+            // Found the end of the first complete JSON object
+            const jsonStr = trimmed.substring(jsonStart, i + 1);
+            return JSON.parse(jsonStr);
+          }
+        }
+      }
+    }
+
+    // If we get here, we couldn't find a complete JSON object
+    throw new Error("Invalid JSON in response: " + trimmed);
+  }
+}
+
 // Auto-detection script that runs in the browser context
 const detectCaptchaScript = `
 (function() {
@@ -232,7 +294,7 @@ const checkSuccessScript = `(function() {
 
     // Submit to 2captcha
     console.log("SUBMITTING...");
-    const submitResp = JSON.parse(await httpsGet(submitUrl));
+    const submitResp = safeParseJson(await httpsGet(submitUrl));
     if (submitResp.status !== 1) {
       throw new Error("Submit failed: " + JSON.stringify(submitResp));
     }
@@ -244,7 +306,7 @@ const checkSuccessScript = `(function() {
     const maxAttempts = Math.ceil(config.timeout / config.pollInterval);
     for (let i = 0; i < maxAttempts; i++) {
       await sleep(config.pollInterval);
-      const resultResp = JSON.parse(
+      const resultResp = safeParseJson(
         await httpsGet(
           "https://2captcha.com/res.php?key=" +
             config.apiKey +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "7.2.79",
+  "version": "7.2.80",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "sdk.js",
   "types": "sdk.d.ts",