mcp-scraper 0.35.1 → 0.37.0

package/dist/{chunk-XVVNKASZ.js → chunk-LOPKN3YL.js}

@@ -5,7 +5,7 @@ import {
   currentCostContext,
   recordKernelSession,
   runWithCostContext
-} from "./chunk-4ZB3X6BQ.js";
+} from "./chunk-MA5JBAUZ.js";
 import {
   postToMemoryLibrary
 } from "./chunk-K443GQY5.js";
@@ -22,7 +22,7 @@ import {
   RECAPTCHA_INSTRUCTIONS,
   RequestAbortedError,
   sanitizeVendorName
-} from "./chunk-M2S27J6Z.js";
+} from "./chunk-44HZLHDV.js";
 
 // src/driver/BrowserDriver.ts
 import { chromium } from "playwright-extra";
@@ -136,8 +136,6 @@ var MOBILE_USER_AGENT = "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X)
 var DEFAULT_KERNEL_BROWSER_TIMEOUT_SECONDS = 180;
 var KERNEL_BROWSER_CLOSE_TIMEOUT_MS = 3e3;
 var KERNEL_SESSION_DELETE_TIMEOUT_MS = 5e3;
-var DEFAULT_SERP_CHALLENGE_SOLVE_WAIT_MS = 2500;
-var SERP_CHALLENGE_SOLVE_POLL_MS = 500;
 function positiveIntFromEnv(name, fallback) {
   const raw = process.env[name];
   if (!raw) return fallback;
@@ -509,8 +507,7 @@ var BrowserDriver = class {
     }
     if (await this.isSerpChallengeVisible()) {
       await this.updateSerpNavigationDebug(navDebug, url, { hasPaa: false, captchaDetected: true });
-      const solved = await this.waitForSerpChallengeToClear(navDebug, url);
-      if (!solved) throw new CaptchaError(this.captchaMessage());
+      throw new CaptchaError(this.captchaMessage());
     }
     const fastFound = await this.page.waitForSelector(PAASelectors.item, { timeout: 4e3 }).catch(() => null);
     if (fastFound) {
@@ -519,8 +516,7 @@ var BrowserDriver = class {
     }
     if (await this.isSerpChallengeVisible()) {
       await this.updateSerpNavigationDebug(navDebug, url, { hasPaa: false, captchaDetected: true });
-      const solved = await this.waitForSerpChallengeToClear(navDebug, url);
-      if (!solved) throw new CaptchaError(this.captchaMessage());
+      throw new CaptchaError(this.captchaMessage());
     }
     for (let i = 1; i <= 6; i++) {
       await this.page.evaluate((f) => {
@@ -548,23 +544,6 @@ var BrowserDriver = class {
     }).catch(() => "");
     return /recaptcha|unusual traffic|are you a robot|about this page|detected unusual traffic/i.test(bodySnippet);
   }
-  async waitForSerpChallengeToClear(navDebug, requestedUrl) {
-    if (!this.kernelClient || !this.page) return false;
-    const waitMs = positiveIntFromEnv("SERP_CHALLENGE_SOLVE_WAIT_MS", DEFAULT_SERP_CHALLENGE_SOLVE_WAIT_MS);
-    const deadline = Date.now() + waitMs;
-    while (Date.now() < deadline) {
-      await this.page.waitForTimeout(Math.min(SERP_CHALLENGE_SOLVE_POLL_MS, Math.max(250, deadline - Date.now())));
-      if (!await this.isSerpChallengeVisible()) {
-        await this.page.waitForTimeout(1e3);
-        if (!await this.isSerpChallengeVisible()) {
-          await this.updateSerpNavigationDebug(navDebug, requestedUrl, { hasPaa: null, captchaDetected: false });
-          return true;
-        }
-      }
-    }
-    await this.updateSerpNavigationDebug(navDebug, requestedUrl, { hasPaa: false, captchaDetected: true });
-    return false;
-  }
   async updateSerpNavigationDebug(navDebug, requestedUrl, state) {
     if (!navDebug || !this.page) return;
     try {
@@ -613,8 +592,7 @@ var BrowserDriver = class {
     try {
       await this.page.goto(url, { waitUntil: "domcontentloaded", timeout: 45e3 });
       if (/google\.[^/]+\/search\?/i.test(url) && await this.isSerpChallengeVisible()) {
-        const solved = await this.waitForSerpChallengeToClear(null, url);
-        if (!solved) throw new CaptchaError(this.captchaMessage());
+        throw new CaptchaError(this.captchaMessage());
       }
     } catch (err) {
       if (err instanceof CaptchaError) throw err;
@@ -844,6 +822,27 @@ function normalizeLocation(input) {
   return input;
 }
 
+// src/serp-location-query.ts
+function normalizedTerms(value) {
+  return value.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
+}
+function includesTermSequence(query, phrase) {
+  const queryTerms = normalizedTerms(query);
+  const phraseTerms = normalizedTerms(phrase);
+  if (phraseTerms.length === 0 || phraseTerms.length > queryTerms.length) return false;
+  return queryTerms.some((_, start) => phraseTerms.every((term, index) => queryTerms[start + index] === term));
+}
+function cityFromCanonicalLocation(location, fallback) {
+  return location.split(",", 1)[0]?.trim() || fallback.split(",", 1)[0]?.trim() || fallback.trim();
+}
+function buildLocalizedSerpQuery(query, location, canonicalLocation) {
+  const normalizedQuery = query.trim();
+  const requestedLocation = location?.trim();
+  if (!requestedLocation || !canonicalLocation) return normalizedQuery;
+  const city = cityFromCanonicalLocation(canonicalLocation, requestedLocation);
+  return includesTermSequence(normalizedQuery, city) ? normalizedQuery : `${normalizedQuery} ${requestedLocation}`;
+}
+
 // src/serp-location-debug.ts
 var STATE_TO_CODE = {
   alabama: "AL",
@@ -1097,6 +1096,11 @@ async function extractAISurfacesFromDocument(config) {
     if (!el) return "";
     return (el.innerText ?? el.textContent ?? "").trim();
   }
+  function hasSubstantiveContent(text) {
+    if (!text) return false;
+    const normalized = text.replace(/\s+/g, " ").trim();
+    return normalized.length >= 16 && normalized.split(" ").filter(Boolean).length >= 2;
+  }
   function hasAIOverviewLabel(el) {
     const heading = el.querySelector(selectors.aio.heading);
     if (textOf(heading) === "AI Overview") return true;
@@ -1259,19 +1263,22 @@ async function extractAISurfacesFromDocument(config) {
     aioCitations = extractCitations(aioRoot);
   }
   const aimRoot = document.querySelector(selectors.aim.root);
-  const aimDetected = surface === "aim" && !!aimRoot;
+  const aimRootDetected = surface === "aim" && !!aimRoot;
   const aimContainer = aimRoot?.closest(selectors.aim.wrapper) ?? aimRoot;
-  const aimText = cleanText(aimContainer);
+  const rawAimText = aimRootDetected ? cleanText(aimContainer) : null;
+  const aimDetected = aimRootDetected && hasSubstantiveContent(rawAimText);
+  const aimText = aimDetected ? rawAimText : null;
   const aimCitations = aimDetected ? extractCitations(aimContainer) : [];
+  const aiOverviewDetected = !!aioRoot && hasSubstantiveContent(aioText);
   return {
     surface,
     aiOverview: {
-      detected: !!aioRoot && aioText !== null,
-      text: aioText,
-      citations: aioCitations,
-      expanded: aioExpanded,
-      fullyExpanded: aioFullyExpanded,
-      sections: aioSections
+      detected: aiOverviewDetected,
+      text: aiOverviewDetected ? aioText : null,
+      citations: aiOverviewDetected ? aioCitations : [],
+      expanded: aiOverviewDetected ? aioExpanded : false,
+      fullyExpanded: aiOverviewDetected ? aioFullyExpanded : false,
+      sections: aiOverviewDetected ? aioSections : []
     },
     aiMode: {
       detected: aimDetected && aimText !== null,
@@ -2045,8 +2052,10 @@ var PAAExtractor = class {
       this.throwIfAborted(signal);
       const canonicalLocation = options.location ? normalizeLocation(options.location) : null;
       const uule = canonicalLocation ? encodeUule(canonicalLocation) : null;
+      const executedQuery = buildLocalizedSerpQuery(options.query, options.location, canonicalLocation);
+      const executionOptions = executedQuery === options.query ? options : { ...options, query: executedQuery };
       const { hasPaa } = await this.driver.navigateToSERP(
-        options.query,
+        executionOptions.query,
         uule,
         options.gl,
         options.hl,
@@ -2071,8 +2080,7 @@ var PAAExtractor = class {
         let locationEvidence2 = options.debug ? inferSerpLocationEvidence(canonicalLocation, organicResults2, localPack2) : void 0;
         let allOrganic2 = organicResults2;
         if ((options.pages ?? 1) >= 2) {
-          const p2params = new URLSearchParams({ q: options.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
-          if (recencyToTbs(options.recency)) p2params.set("tbs", recencyToTbs(options.recency));
+          const p2params = new URLSearchParams({ q: executionOptions.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
           if (recencyToTbs(options.recency)) p2params.set("tbs", recencyToTbs(options.recency));
           if (uule) p2params.set("uule", uule);
           await this.driver.navigateTo("https://www.google.com/search?" + p2params.toString());
@@ -2084,7 +2092,7 @@ var PAAExtractor = class {
           }
         }
         const stats2 = {
-          seed: options.query,
+          seed: executionOptions.query,
           totalQuestions: 0,
           maxDepthReached: 0,
           durationMs: Date.now() - startMs,
@@ -2092,14 +2100,14 @@ var PAAExtractor = class {
         };
         this.reporter.onComplete(stats2);
         return {
-          seed: options.query,
+          seed: executionOptions.query,
           location: options.location ?? null,
           extractedAt: (/* @__PURE__ */ new Date()).toISOString(),
           diagnostics: {
             completionStatus: "serp_only",
             problem: null,
             completeness: { ...this.completeness },
-            ...options.debug ? { debug: this.buildHarvestDebugSnapshot(options, canonicalLocation, uule, locationEvidence2) } : {}
+            ...options.debug ? { debug: this.buildHarvestDebugSnapshot(executionOptions, canonicalLocation, uule, locationEvidence2) } : {}
           },
           totalQuestions: 0,
           surface: aiSurfaces2.surface,
@@ -2132,8 +2140,7 @@ var PAAExtractor = class {
         let noPaaOrganic = organicResults;
         let locationEvidence2 = initialLocationEvidence;
         if ((options.pages ?? 1) >= 2) {
-          const p2params = new URLSearchParams({ q: options.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
-          if (recencyToTbs(options.recency)) p2params.set("tbs", recencyToTbs(options.recency));
+          const p2params = new URLSearchParams({ q: executionOptions.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
           if (recencyToTbs(options.recency)) p2params.set("tbs", recencyToTbs(options.recency));
           if (uule) p2params.set("uule", uule);
           await this.driver.navigateTo("https://www.google.com/search?" + p2params.toString());
@@ -2146,7 +2153,7 @@ var PAAExtractor = class {
         }
         const aiSurfaces2 = await this.extractAISurfaces(page, options);
         const stats2 = {
-          seed: options.query,
+          seed: executionOptions.query,
           totalQuestions: 0,
           maxDepthReached: 0,
           durationMs: Date.now() - startMs,
@@ -2154,14 +2161,14 @@ var PAAExtractor = class {
         };
         this.reporter.onComplete(stats2);
         return {
-          seed: options.query,
+          seed: executionOptions.query,
           location: options.location ?? null,
           extractedAt: (/* @__PURE__ */ new Date()).toISOString(),
           diagnostics: {
             completionStatus: "no_paa",
             problem: null,
             completeness: { ...this.completeness },
-            ...options.debug ? { debug: this.buildHarvestDebugSnapshot(options, canonicalLocation, uule, locationEvidence2) } : {}
+            ...options.debug ? { debug: this.buildHarvestDebugSnapshot(executionOptions, canonicalLocation, uule, locationEvidence2) } : {}
           },
           totalQuestions: 0,
           surface: aiSurfaces2.surface,
@@ -2178,10 +2185,10 @@ var PAAExtractor = class {
           stats: stats2
         };
       }
-      const flat = await this.runBFS(page, options, signal);
+      const flat = await this.runBFS(page, executionOptions, signal);
       this.throwIfAborted(signal);
       const aiSurfaces = await this.extractAISurfaces(page, options);
-      const shortVidsParams = new URLSearchParams({ q: options.query, gl: options.gl, hl: options.hl, pws: "0", udm: ShortVideoSelectors.udm });
+      const shortVidsParams = new URLSearchParams({ q: executionOptions.query, gl: options.gl, hl: options.hl, pws: "0", udm: ShortVideoSelectors.udm });
       if (uule) shortVidsParams.set("uule", uule);
       let shortVideos = [];
       try {
@@ -2200,7 +2207,7 @@ var PAAExtractor = class {
       let allOrganic = organicResults;
       let locationEvidence = initialLocationEvidence;
       if ((options.pages ?? 1) >= 2) {
-        const p2params = new URLSearchParams({ q: options.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
+        const p2params = new URLSearchParams({ q: executionOptions.query, gl: options.gl, hl: options.hl, pws: "0", start: "10" });
         if (recencyToTbs(options.recency)) p2params.set("tbs", recencyToTbs(options.recency));
         if (uule) p2params.set("uule", uule);
         await this.driver.navigateTo("https://www.google.com/search?" + p2params.toString());
@@ -2212,9 +2219,9 @@ var PAAExtractor = class {
         }
       }
       const allVideos = [...videos, ...shortVideos];
-      const tree = this.buildTree(flat, options.query);
+      const tree = this.buildTree(flat, executionOptions.query);
       const stats = {
-        seed: options.query,
+        seed: executionOptions.query,
         totalQuestions: flat.length,
         maxDepthReached: flat.reduce((m, r) => Math.max(m, r.depth), 0),
         durationMs: Date.now() - startMs,
@@ -2222,7 +2229,7 @@ var PAAExtractor = class {
       };
       this.reporter.onComplete(stats);
       return {
-        seed: options.query,
+        seed: executionOptions.query,
         location: options.location ?? null,
         extractedAt: (/* @__PURE__ */ new Date()).toISOString(),
         diagnostics: {
@@ -2230,7 +2237,7 @@ var PAAExtractor = class {
           problem: null,
           completeness: { ...this.completeness },
           ...diagnosticWarnings.length > 0 ? { warnings: diagnosticWarnings } : {},
-          ...options.debug ? { debug: this.buildHarvestDebugSnapshot(options, canonicalLocation, uule, locationEvidence) } : {}
+          ...options.debug ? { debug: this.buildHarvestDebugSnapshot(executionOptions, canonicalLocation, uule, locationEvidence) } : {}
         },
         totalQuestions: flat.length,
         surface: aiSurfaces.surface,
@@ -2951,8 +2958,33 @@ function classifyAttemptError(err) {
   return /timeout|timed out|Timeout \d+ms exceeded|deadline/i.test(message) ? "timeout" : "error";
 }
 function classifyAttemptResult(result) {
+  if (result.diagnostics.degradedResult) return "degraded_result";
   return result.diagnostics?.completionStatus ?? (result.totalQuestions > 0 ? "paa_found" : "no_paa");
 }
+function resultHasUsableContent(result) {
+  return result.flat.length > 0 || result.organicResults.length > 0 || result.localPack.length > 0 || result.videos.length > 0 || result.forums.length > 0 || result.whatPeopleSaying.length > 0 || result.aiOverview.detected || result.aiMode.detected;
+}
+function withResultQuality(result) {
+  const hasUsableContent = resultHasUsableContent(result);
+  const hasWarnings = (result.diagnostics.warnings?.length ?? 0) > 0;
+  const resultQuality = hasUsableContent ? hasWarnings ? "partial" : "complete" : "degraded";
+  const degradedResult = resultQuality === "degraded";
+  result.diagnostics = {
+    ...result.diagnostics,
+    resultQuality,
+    degradedResult,
+    degradationReasons: degradedResult ? ["empty_primary_serp"] : [],
+    retryRecommended: degradedResult
+  };
+  return result;
+}
+function degradedResultMessage(result) {
+  const reasons = result.diagnostics.degradationReasons ?? [];
+  if (reasons.includes("empty_primary_serp")) {
+    return "No usable primary SERP surface was captured; the result may be incomplete.";
+  }
+  return "The harvest result was marked degraded.";
+}
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -3122,60 +3154,60 @@ async function harvest(rawOptions) {
       const attempt = baseCtx ? await runWithCostContext({ ...baseCtx, forceHeadful: true }, () => extractOnce(attemptOptions, signal)) : await extractOnce(attemptOptions, signal);
       if (attempt.error) {
         const err = attempt.error;
-        const outcome = classifyAttemptError(err);
-        if ((outcome === "captcha" || outcome === "proxy_tunnel_failed") && effectiveProxyMode === "location") {
+        const outcome2 = classifyAttemptError(err);
+        if ((outcome2 === "captcha" || outcome2 === "proxy_tunnel_failed") && effectiveProxyMode === "location") {
           proxyFailures++;
           if (proxyFailures >= 2) effectiveProxyMode = "none";
         }
-        const willRetry = i < maxAttempts - 1 && (outcome === "captcha" || proxyMode === "location" && retryableLocationProxyError(outcome));
-        if (outcome === "captcha") {
+        const willRetry2 = i < maxAttempts - 1 && (outcome2 === "captcha" || proxyMode === "location" && retryableLocationProxyError(outcome2));
+        if (outcome2 === "captcha") {
           console.warn(JSON.stringify({
             event: "harvest_attempt_captcha",
             attempt_number: attemptNumber,
             max_attempts: maxAttempts,
             message: errorMessage(err),
-            will_retry: willRetry
+            will_retry: willRetry2
           }));
-        } else if (willRetry) {
+        } else if (willRetry2) {
           console.warn(JSON.stringify({
             event: "harvest_attempt_proxy_retry",
             attempt_number: attemptNumber,
             max_attempts: maxAttempts,
-            outcome,
+            outcome: outcome2,
             message: errorMessage(err),
-            will_retry: willRetry
+            will_retry: willRetry2
           }));
         }
         await emitAttemptEvent(onAttemptEvent, {
           type: "finished",
           attemptNumber,
           maxAttempts,
-          outcome,
+          outcome: outcome2,
           kernelSessionId: attempt.cleanup.kernelSessionId,
           questionCount: 0,
           durationMs: Date.now() - startedAtMs,
           error: errorMessage(err),
-          willRetry,
+          willRetry: willRetry2,
           cleanup: attempt.cleanup,
           debug: attempt.debug,
           completedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         await cleanupDisposableProxy(kernelApiKey, resolution2.disposableProxyId);
         lastError = err;
-        if (willRetry) continue;
+        if (willRetry2) continue;
         break;
       }
       const result = attempt.result;
       if (!result) throw new Error("Harvest attempt completed without a result");
       if (shouldRetryLocationMismatch(result, proxyMode)) {
         const err = new LocationMismatchError(locationMismatchMessage(result));
-        const willRetry = i < maxAttempts - 1;
+        const willRetry2 = i < maxAttempts - 1;
         console.warn(JSON.stringify({
           event: "harvest_attempt_location_mismatch",
           attempt_number: attemptNumber,
           max_attempts: maxAttempts,
           message: err.message,
-          will_retry: willRetry
+          will_retry: willRetry2
         }));
         await emitAttemptEvent(onAttemptEvent, {
           type: "finished",
@@ -3186,32 +3218,45 @@ async function harvest(rawOptions) {
           questionCount: result.totalQuestions,
           durationMs: Date.now() - startedAtMs,
           error: err.message,
-          willRetry,
+          willRetry: willRetry2,
           cleanup: attempt.cleanup,
           debug: attempt.debug,
           completedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         await cleanupDisposableProxy(kernelApiKey, resolution2.disposableProxyId);
         lastError = err;
-        if (willRetry) continue;
+        if (willRetry2) continue;
         break;
       }
-      const finalResult = stripInternalDebug(result, requestedDebug);
+      const finalResult = withResultQuality(stripInternalDebug(result, requestedDebug));
+      const outcome = classifyAttemptResult(finalResult);
+      const willRetry = outcome === "degraded_result" && i < maxAttempts - 1;
+      const resultError = outcome === "degraded_result" ? degradedResultMessage(finalResult) : null;
+      if (willRetry) {
+        console.warn(JSON.stringify({
+          event: "harvest_attempt_degraded_result",
+          attempt_number: attemptNumber,
+          max_attempts: maxAttempts,
+          degradation_reasons: finalResult.diagnostics.degradationReasons,
+          will_retry: true
+        }));
+      }
       await emitAttemptEvent(onAttemptEvent, {
         type: "finished",
         attemptNumber,
         maxAttempts,
-        outcome: classifyAttemptResult(finalResult),
+        outcome,
         kernelSessionId: attempt.cleanup.kernelSessionId,
         questionCount: finalResult.totalQuestions,
         durationMs: Date.now() - startedAtMs,
-        error: null,
-        willRetry: false,
+        error: resultError,
+        willRetry,
         cleanup: attempt.cleanup,
         debug: attempt.debug,
         completedAt: (/* @__PURE__ */ new Date()).toISOString()
       });
       await cleanupDisposableProxy(kernelApiKey, resolution2.disposableProxyId);
+      if (willRetry) continue;
       if (attemptOptions.format === "json" || attemptOptions.format === "both") {
         await serializer.writeJSON(finalResult, attemptOptions.outputDir);
       }
@@ -3301,4 +3346,4 @@ export {
   resolveKernelProxyId,
   harvest
 };
-//# sourceMappingURL=chunk-XVVNKASZ.js.map
+//# sourceMappingURL=chunk-LOPKN3YL.js.map