dsh-web-search-enhanced 0.2.2 → 0.2.3

package/lib/index.js

@@ -150,10 +150,23 @@ function decodeJsonEscapes(value) {
 }
 //#endregion
 //#region ../core/src/host/adapter.ts
+/** The default: generic wording with the generic explanation, as today. */
+const statusVerdict = (response) => ({
+	kind: "status",
+	detail: response.explanation
+});
 function mapWire(wire, map) {
+	const parseFailure = wire.parseFailure === void 0 ? void 0 : wire.parseFailure.bind(wire);
 	const mapped = {
 		request: (input, endpoint, auth) => wire.request(input, endpoint, auth),
-		parse: (payload, input) => map(wire.parse(payload, input))
+		parse: (payload, input) => map(wire.parse(payload, input)),
+		...parseFailure === void 0 ? {} : { parseFailure(response, input) {
+			const verdict = parseFailure(response, input);
+			return verdict.kind === "status" ? verdict : {
+				kind: "outcome",
+				outcome: map(verdict.outcome)
+			};
+		} }
 	};
 	const route = wire.keyless;
 	if (route === void 0) return mapped;
@@ -216,8 +229,7 @@ function runAdapter(io, wire, target, input, signal) {
 					}, deadline, upstream);
 					return route.parse(result, input);
 				}
-				const request = wire.request(input, target.endpoint, { kind: "keyless" });
-				return wire.parse(await io.transport.requestJson(request, deadline, upstream), input);
+				return await runRest(io, wire, wire.request(input, target.endpoint, { kind: "keyless" }), input, deadline, upstream);
 			}
 			const stored = storedApiKey(await adapterCredential(io, target.credentialRef, deadline));
 			if (stored.kind === "missing") throw io.errors.error("WEB_PROVIDER_CREDENTIAL_MISSING", io.credentialMissing(target.credentialRef));
@@ -229,17 +241,23 @@ function runAdapter(io, wire, target, input, signal) {
 				onDiagnostic: io.onDiagnostic,
 				matcher
 			};
-			const request = wire.request(input, target.endpoint, {
+			return await runRest(io, wire, wire.request(input, target.endpoint, {
 				kind: "api-key",
 				key: stored.key
-			});
-			return redactJson(wire.parse(await io.transport.requestJson(request, deadline, upstream), input), matcher);
+			}), input, deadline, upstream);
 		} catch (error) {
 			if (error instanceof WebError) throw error;
 			throw redactDiagnostic(error, matcher === void 0 ? secretMatcher([]) : matcher);
 		}
 	});
 }
+async function runRest(io, wire, request, input, signal, upstream) {
+	const exchange = await io.transport.exchangeJson(request, signal, upstream);
+	if (exchange.kind === "ok") return redactJson(wire.parse(exchange.payload, input), upstream.matcher);
+	const verdict = wire.parseFailure === void 0 ? statusVerdict(exchange.response) : wire.parseFailure(exchange.response, input);
+	if (verdict.kind === "status") throw io.transport.statusFailure(exchange.response.status, upstream, verdict.detail);
+	return verdict.outcome;
+}
 async function adapterCredential(io, ref, signal) {
 	try {
 		return await io.errors.abortable(io.credential(ref), signal);
@@ -304,9 +322,8 @@ function createTransport(errors, { timeoutMs, maxResponseBytes, messages }) {
 			clearTimeout(timer);
 		}
 	}
-	async function send(request, signal, upstream) {
+	async function exchangeResponse(request, signal, upstream, matcher) {
 		throwIfAborted(signal);
-		const matcher = upstream.matcher === void 0 ? secretMatcher([]) : upstream.matcher;
 		let response;
 		try {
 			response = await fetch(request.url, {
@@ -321,14 +338,25 @@ function createTransport(errors, { timeoutMs, maxResponseBytes, messages }) {
 			throwIfAborted(signal);
 			throw capabilityError("WEB_PROVIDER_ERROR", messages.unreachable(upstream.label));
 		}
-		if (!response.ok) {
-			const failure = statusError(response.status, upstream);
-			const body = await readFailureText(response, signal, upstream, matcher);
-			const detail = failureExplanation(body.text, matcher, body.truncated);
-			if (detail === void 0) throw failure;
-			throw new WebError(failure.message + upstreamSuffix(upstream.label, detail), failure.code);
-		}
-		return response;
+		if (response.ok) return {
+			kind: "ok",
+			response
+		};
+		const body = await readFailureText(response, signal, upstream, matcher);
+		return {
+			kind: "failure",
+			response: failureResponse(response.status, body.text, matcher, body.truncated)
+		};
+	}
+	async function send(request, signal, upstream) {
+		const exchange = await exchangeResponse(request, signal, upstream, upstream.matcher === void 0 ? secretMatcher([]) : upstream.matcher);
+		if (exchange.kind === "failure") throw statusFailure(exchange.response.status, upstream, exchange.response.explanation);
+		return exchange.response;
+	}
+	function statusFailure(status, upstream, detail) {
+		const failure = statusError(status, upstream);
+		if (detail === void 0) return failure;
+		return new WebError(failure.message + upstreamSuffix(upstream.label, detail), failure.code);
 	}
 	function statusError(status, { label, access }) {
 		if (status === 401 || status === 403) {
@@ -448,12 +476,19 @@ function createTransport(errors, { timeoutMs, maxResponseBytes, messages }) {
 		}
 		return payload;
 	}
-	async function requestJson(request, signal, upstream) {
+	async function exchangeJson(request, signal, upstream) {
 		const matcher = upstream.matcher === void 0 ? secretMatcher([]) : upstream.matcher;
-		return redactJson(await readJson(await send(request, signal, {
-			...upstream,
-			matcher
-		}), signal, upstream.onDiagnostic, matcher), matcher);
+		const exchange = await exchangeResponse(request, signal, upstream, matcher);
+		if (exchange.kind === "failure") return exchange;
+		return {
+			kind: "ok",
+			payload: redactJson(await readJson(exchange.response, signal, upstream.onDiagnostic, matcher), matcher)
+		};
+	}
+	async function requestJson(request, signal, upstream) {
+		const exchange = await exchangeJson(request, signal, upstream);
+		if (exchange.kind === "failure") throw statusFailure(exchange.response.status, upstream, exchange.response.explanation);
+		return exchange.payload;
 	}
 	function invalidResponse(detail) {
 		return capabilityError("WEB_PROVIDER_ERROR", messages.invalidResponse(detail));
@@ -467,6 +502,8 @@ function createTransport(errors, { timeoutMs, maxResponseBytes, messages }) {
 		readText,
 		readJson,
 		requestJson,
+		exchangeJson,
+		statusFailure,
 		invalidResponse
 	};
 }
@@ -479,26 +516,55 @@ function upstreamText(value) {
 	const boundary = last >= 55296 && last <= 56319 ? 1998 : 1999;
 	return text.slice(0, boundary) + "…";
 }
+function screenedText(value) {
+	return value.trim() === "" ? void 0 : {
+		kind: "text",
+		text: value
+	};
+}
+/** Text from a successful body, already redacted by transport: uncut, never withheld. */
+function bodyDetail(value) {
+	return typeof value === "string" ? screenedText(value) : void 0;
+}
 /** Sensitive raw explanations are withheld, not precisely edited. */
 function upstreamDetail(value, matcher, truncated = false) {
 	if (containsSecret(value, matcher)) return { kind: "withheld" };
-	const text = upstreamText(truncated ? stripPrefix(value, matcher) : value);
-	return text === void 0 ? void 0 : {
-		kind: "text",
-		text
-	};
+	return screenedText(truncated ? stripPrefix(value, matcher) : value);
 }
 function upstreamSuffix(label, detail) {
 	if (detail === void 0) return "";
-	if (detail.kind === "withheld") return "\n\n" + label + "'s response was withheld because it contained this request's credential.";
-	return "\n\n" + label + " responded (untrusted): " + detail.text;
+	if ("text" in detail) {
+		const text = upstreamText(detail.text);
+		return text === void 0 ? "" : "\n\n" + label + " responded (untrusted): " + text;
+	}
+	return "\n\n" + label + "'s response was withheld because it contained this request's credential.";
 }
 function stripPrefix(text, matcher) {
 	for (let length = Math.min(7, text.length); length > 0; length--) if (matcher.prefixes.has(text.slice(-length))) return text.slice(0, -length);
 	return text;
 }
-function failureExplanation(body, matcher, truncated) {
-	if (containsSecret(body, matcher)) return { kind: "withheld" };
+function failureResponse(status, body, matcher, truncated) {
+	const sensitive = containsSecret(body, matcher);
+	return {
+		status,
+		json: truncated ? void 0 : redactJson(failureJson(body), matcher),
+		explanation: failureExplanation(body, matcher, truncated, sensitive),
+		explain(value) {
+			if (sensitive) return { kind: "withheld" };
+			return typeof value === "string" ? upstreamDetail(value, matcher) : void 0;
+		}
+	};
+}
+function failureJson(body) {
+	try {
+		return JSON.parse(body);
+	} catch (error) {
+		if (!(error instanceof SyntaxError)) throw error;
+		return;
+	}
+}
+function failureExplanation(body, matcher, truncated, sensitive) {
+	if (sensitive) return { kind: "withheld" };
 	const text = truncated ? stripPrefix(body, matcher) : body;
 	let payload;
 	try {
@@ -16617,7 +16683,7 @@ function envelope(payload) {
 			payload.message
 		]) {
 			if (typeof candidate !== "string") continue;
-			detail = upstreamText(candidate);
+			detail = bodyDetail(candidate);
 			if (detail !== void 0) break;
 		}
 		return {
@@ -16935,6 +17001,54 @@ const tinyfishSearch = {
 	}
 };
 //#endregion
+//#region ../core/src/host/providers/anysearch.ts
+/** AnySearch REST search and extract. The catalog offers personal keys only; there is no anonymous route here. */
+/** 402 means the quota is spent; its body is ignored (for anonymous callers it carries a generated account). */
+function quotaVerdict(response) {
+	return response.status === 402 ? {
+		kind: "status",
+		detail: void 0
+	} : void 0;
+}
+const anysearchSearch = {
+	request(input, endpoint, auth) {
+		return postJson(endpoint, bearer(auth), {
+			...input.options,
+			query: input.query,
+			...count("max_results", input.maxResults, 10)
+		});
+	},
+	parse(payload) {
+		if (!isRecord(payload)) return {
+			kind: "failure",
+			failure: "invalid",
+			reason: "not-object"
+		};
+		if (typeof payload.code !== "number") return {
+			kind: "failure",
+			failure: "invalid",
+			reason: "code-number"
+		};
+		if (payload.code !== 0) return {
+			kind: "failure",
+			failure: "api",
+			detail: bodyDetail(payload.message)
+		};
+		const rows = isRecord(payload.data) ? payload.data.results : void 0;
+		if (!Array.isArray(rows)) return {
+			kind: "failure",
+			failure: "invalid",
+			reason: "data-results-array"
+		};
+		return mapRows(rows, (row) => ({
+			url: row.url,
+			title: row.title,
+			snippet: text$1(row.snippet) ?? row.content
+		}));
+	},
+	parseFailure: (response) => quotaVerdict(response) ?? statusVerdict(response)
+};
+//#endregion
 //#region ../core/src/host/providers/openalex.ts
 /** OpenAlex works search, scholarly field mapping and bounded inverted abstracts. */
 /** OpenAlex asks anonymous clients to identify themselves for the polite pool. */
@@ -17431,7 +17545,7 @@ const { withDeadline, readJson, requestJson, invalidResponse } = transport;
 const mcp = createMcpClient(transport, searchErrors, {
 	clientInfo: {
 		name: SEARCH.packageName,
-		version: "0.2.2"
+		version: "0.2.3"
 	},
 	messages: {
 		toolFailed: (label, detail) => label + " could not complete the search; retry later or choose another search connection" + upstreamSuffix(label, detail),
@@ -17780,6 +17894,30 @@ const CATALOG = {
 			}
 		}
 	},
+	anysearch: {
+		label: "AnySearch",
+		endpoint: "https://api.anysearch.com/v1/search",
+		access: {
+			keyless: false,
+			apiKey: { credentialRef: "ANYSEARCH_API_KEY" },
+			account: false
+		},
+		kind: "adapter",
+		remote: true,
+		optIn: true,
+		freshness: [],
+		homepage: "https://www.anysearch.com",
+		options: {
+			zone: {
+				kind: "enum",
+				values: ["cn", "intl"]
+			},
+			language: {
+				kind: "text",
+				pattern: /^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8}){0,2}$/u
+			}
+		}
+	},
 	openalex: {
 		label: "OpenAlex",
 		endpoint: "https://api.openalex.org/works",
@@ -18157,6 +18295,8 @@ contract.options;
 /** What the search service returned, in the model-facing invalid-response message. */
 const INVALID_DETAIL = {
 	"not-object": "a body that is not a JSON object",
+	"code-number": "no numeric \"code\" field",
+	"data-results-array": "no \"data.results\" array",
 	"results-array": "no \"results\" array",
 	"data-array": "no \"data\" array",
 	"data-web-array": "no \"data.web\" array",
@@ -18172,11 +18312,7 @@ function searchSources(outcome) {
 		for (const row of outcome.rows) list.add(row);
 		return list.sources;
 	}
-	if (outcome.failure === "api") {
-		const detail = outcome.detail === void 0 ? void 0 : upstreamText(outcome.detail);
-		const message = "the search service reported an API error; retry later or choose another search connection";
-		throw searchError("WEB_PROVIDER_ERROR", detail === void 0 ? message : message + "\n\nThe search service responded (untrusted): " + detail);
-	}
+	if (outcome.failure === "api") throw searchError("WEB_PROVIDER_ERROR", "the search service reported an API error; retry later or choose another search connection" + upstreamSuffix("The search service", outcome.detail));
 	throw invalidResponse(INVALID_DETAIL[outcome.reason]);
 }
 //#endregion
@@ -18186,6 +18322,7 @@ const ADAPTER_WIRES = {
 	firecrawl: mapWire(firecrawlSearch, searchSources),
 	tavily: mapWire(tavilySearch, searchSources),
 	tinyfish: mapWire(tinyfishSearch, searchSources),
+	anysearch: mapWire(anysearchSearch, searchSources),
 	openalex: mapWire(openalexSearch, searchSources),
 	semanticscholar: mapWire(semanticscholarSearch, searchSources)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-web-search-enhanced",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "web_search provider for DeepSeek Harness with switchable search backends; installed through dsh-tool-web-enhanced-profile",
   "keywords": [
     "deepseek-harness",