seo 0.13.1 → 0.13.2

package/dist/mcp.js

@@ -1,5 +1,5 @@
 import { createRequire as __seoCreateRequire } from 'node:module'; const require = __seoCreateRequire(import.meta.url);
-import { i as __toESM, n as version, r as __commonJSMin, t as load } from "./esm-BIXGSxFJ.js";
+import { i as __toESM, n as version, r as __commonJSMin, t as load } from "./esm-Dmtr8qrP.js";
 import { createHash, randomUUID, sign } from "node:crypto";
 import { ZodOptional, z } from "zod";
 import { arch, homedir, platform, tmpdir, totalmem } from "node:os";
@@ -39546,25 +39546,64 @@ function need(headers, provider) {
 	if (values.some((value) => !value)) throw new CommandError("NO_KEY", `No ${provider} key. Hosted MCP: save it at https://seoskill.dev/account#keys. CLI and local MCP: run \`seo login\` to use the account's keys, or \`seo providers ${provider} connect\`.`);
 	return values;
 }
+const TASK_TIMEOUT_MS = 6e4;
+const READ_TIMEOUT_MS = 3e4;
+const RETRY_DELAY_MS = 250;
+const retryStatus = (status) => status === 429 || status >= 500;
 async function call(provider, request) {
-	const response = await fetch(request);
-	if (response.ok) return response;
-	const text = (await response.text()).slice(0, 300);
-	throw new CommandError(response.status === 401 || response.status === 403 ? "NO_KEY" : "PROVIDER_ERROR", `${provider} answered ${response.status}. ${text}`);
+	const read = request.method === "GET";
+	const timeoutMs = read ? READ_TIMEOUT_MS : TASK_TIMEOUT_MS;
+	for (let attempt = 1;; attempt += 1) {
+		const last = attempt === 2;
+		let response;
+		try {
+			response = await fetch(request.clone(), { signal: AbortSignal.timeout(timeoutMs) });
+		} catch (error) {
+			if (read && !last) {
+				await wait(RETRY_DELAY_MS);
+				continue;
+			}
+			throw new CommandError("PROVIDER_ERROR", error.name === "TimeoutError" ? `${provider} did not answer within ${timeoutMs / 1e3} seconds.` : `${provider} could not be reached: ${error.message}`);
+		}
+		if (response.ok) return response;
+		if (retryStatus(response.status) && !last) {
+			await response.body?.cancel();
+			await wait(RETRY_DELAY_MS);
+			continue;
+		}
+		const text = (await response.text()).slice(0, 300);
+		throw new CommandError(response.status === 401 || response.status === 403 ? "NO_KEY" : response.status === 429 ? "RATE_LIMITED" : "PROVIDER_ERROR", `${provider} answered ${response.status}. ${text}`);
+	}
 }
+const wait = (ms) => new Promise((done) => setTimeout(done, ms));
 function requireInput(input) {
 	const needsKeywords = input.action === "keyword_metrics" || input.action === "serp";
 	if (needsKeywords && input.keywords.length === 0) throw new CommandError("INVALID_INPUT", `${input.action} needs keywords.`);
 	if (!needsKeywords && !input.target) throw new CommandError("INVALID_INPUT", `${input.action} needs a target domain or URL.`);
 }
+async function eachKeyword(keywords, missed, rowsFor) {
+	const rows = [];
+	let failure;
+	for (const keyword of keywords) try {
+		rows.push(...await rowsFor(keyword));
+	} catch (error) {
+		if (error instanceof CommandError && error.code === "NO_KEY") throw error;
+		failure ??= error;
+		missed.push(keyword);
+	}
+	if (missed.length === keywords.length) throw failure;
+	return rows;
+}
 async function research(provider, headers, input) {
 	requireInput(input);
 	const keys = need(headers, provider);
 	if (provider === "dataforseo") return dataForSeo(keys, input);
+	const missed = [];
 	return {
-		rows: await ahrefs(keys[0] ?? "", input),
+		rows: await ahrefs(keys[0] ?? "", input, missed),
 		costUsd: null,
-		partial: false
+		partial: false,
+		missed
 	};
 }
 function countryName(code) {
@@ -39630,12 +39669,14 @@ const PARTIAL = 40106;
 async function dataForSeo(keys, input) {
 	const spent = {
 		cost: 0,
-		partial: false
+		partial: false,
+		missed: []
 	};
 	return {
 		rows: await dataForSeoRows(keys, input, spent),
 		costUsd: Math.round(spent.cost * 1e4) / 1e4,
-		partial: spent.partial
+		partial: spent.partial,
+		missed: spent.missed
 	};
 }
 async function dataForSeoRows(keys, input, spent) {
@@ -39677,28 +39718,20 @@ async function dataForSeoRows(keys, input, spent) {
 		keyword_difficulty: "keyword_data.keyword_properties.keyword_difficulty",
 		main_intent: "keyword_data.search_intent_info.main_intent"
 	}));
-	if (input.action === "serp") {
-		const rows = [];
-		for (const keyword of input.keywords.slice(0, 5)) {
-			const items = await post("v3/serp/google/organic/live/advanced", {
-				keyword,
-				depth: Math.min(input.limit, 100)
-			});
-			for (const item of items) {
-				if (item.type !== "organic") continue;
-				rows.push({
-					keyword,
-					...pick(item, {
-						position: "rank_absolute",
-						url: "url",
-						domain: "domain",
-						title: "title"
-					})
-				});
-			}
-		}
-		return rows;
-	}
+	if (input.action === "serp") return eachKeyword(input.keywords.slice(0, 5), spent.missed, async (keyword) => {
+		return (await post("v3/serp/google/organic/live/advanced", {
+			keyword,
+			depth: Math.min(input.limit, 100)
+		})).filter((item) => item.type === "organic").map((item) => ({
+			keyword,
+			...pick(item, {
+				position: "rank_absolute",
+				url: "url",
+				domain: "domain",
+				title: "title"
+			})
+		}));
+	});
 	if (input.action === "backlinks") return (await post("v3/backlinks/referring_domains/live", {
 		target: bareTarget(input.target),
 		limit: input.limit,
@@ -39727,7 +39760,7 @@ function isPage(target) {
 function bareTarget(target) {
 	return target.replace(/^https?:\/\//, "").replace(/\/$/, "");
 }
-async function ahrefs(key, input) {
+async function ahrefs(key, input, missed) {
 	const get = async (path, params) => {
 		const url = new URL(`https://api.ahrefs.com/v3/${path}`);
 		for (const [name, value] of Object.entries(params)) url.searchParams.set(name, value);
@@ -39751,22 +39784,17 @@ async function ahrefs(key, input) {
 		limit: String(input.limit),
 		order_by: "sum_traffic:desc"
 	})).keywords ?? [];
-	if (input.action === "serp") {
-		const rows = [];
-		for (const keyword of input.keywords.slice(0, 5)) {
-			const data = await get("serp-overview/serp-overview", {
-				select: "position,type,url,title,domain_rating,traffic,keywords",
-				keyword,
-				country: input.country,
-				top_positions: String(Math.min(input.limit, 100))
-			});
-			for (const row of data.positions ?? []) rows.push({
-				keyword,
-				...row
-			});
-		}
-		return rows;
-	}
+	if (input.action === "serp") return eachKeyword(input.keywords.slice(0, 5), missed, async (keyword) => {
+		return ((await get("serp-overview/serp-overview", {
+			select: "position,type,url,title,domain_rating,traffic,keywords",
+			keyword,
+			country: input.country,
+			top_positions: String(Math.min(input.limit, 100))
+		})).positions ?? []).map((row) => ({
+			keyword,
+			...row
+		}));
+	});
 	if (input.action === "backlinks") return (await get("site-explorer/refdomains", {
 		select: "domain,domain_rating,links_to_target,dofollow_links,first_seen,last_seen",
 		target: input.target,
@@ -42488,7 +42516,7 @@ async function runResearch(input, keys, options) {
 	const offset = input.offset ?? 0;
 	const language = input.provider === "dataforseo" ? dataForSeoLanguage(country) : null;
 	if (input.action === "ai_answers") throw new CommandError("INVALID_INPUT", "ai_answers runs on its own.");
-	const { rows: found, costUsd, partial } = await research(input.provider, keys, {
+	const { rows: found, costUsd, partial, missed } = await research(input.provider, keys, {
 		action: input.action,
 		keywords: input.keywords ?? [],
 		target,
@@ -42514,6 +42542,7 @@ async function runResearch(input, keys, options) {
 				`${input.provider} estimates, in the provider’s own units.`,
 				...costUsd !== null ? [`DataForSEO cost: $${costUsd}.`] : [],
 				...partial ? ["Partial: DataForSEO could not fetch some pages of results, so rows may be missing."] : [],
+				...missed.length ? [`Partial: ${input.provider} failed for ${missed.join(", ")}, so those keywords have no rows. Ask for them again.`] : [],
 				...note ? [note] : [],
 				...hasTargetDr ? [`${bareDomain(target)} domain_rating: ${targetDr}.`] : [],
 				...rated.added || hasTargetDr ? [DR_ATTRIBUTION] : []
@@ -42531,6 +42560,7 @@ async function runResearch(input, keys, options) {
 			leftOut: note,
 			costUsd,
 			partial,
+			missedKeywords: missed,
 			total: rated.rows.length,
 			offset,
 			rows: rated.rows.slice(offset, offset + 50)