pi-lean-search 0.5.0 → 0.6.0

package/index.ts

@@ -177,9 +177,6 @@ export { _resetStateForTest };
 // ─── Extension entry point ───────────────────────────────────────
 
 export default function (pi: ExtensionAPI) {
-	// Read config at startup
-	_searxngUrl = readSearxngUrl();
-
 	// ── Register the web-search tool ─────────────────────────
 	pi.registerTool(webSearchTool);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-lean-search",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"description": "SearXNG web search for Pi. Self-hosted or public instance, no API keys or quotas; returns a setup message instead of erroring when unreachable. Pairs with pi-lean-portal's /web toggle or works standalone.",
 	"keywords": [
 		"pi-package",

package/web-search-tool.ts

@@ -393,6 +393,19 @@ export const webSearchTool = defineTool({
 			controller.abort();
 		}, timeoutSeconds * 1000);
 
+		// Abort can surface in either fetch or the body read; label it correctly.
+		const abortFail = () => {
+			if (timedOut) {
+				return fail(
+					`Web search timed out after ${timeoutSeconds}s. ` +
+						`The SearXNG instance at \`${searxngUrl}\` may be slow ` +
+						"or unresponsive.",
+					{ timedOut: true, timeout: timeoutSeconds },
+				);
+			}
+			return fail("Web search was cancelled.", { cancelled: true });
+		};
+
 		try {
 			// ── Layer 1: Connection-level error handling ──
 			let response: Response;
@@ -402,20 +415,11 @@ export const webSearchTool = defineTool({
 					headers: { Accept: "application/json" },
 				});
 			} catch (connectionErr) {
-				clearTimeout(timeoutId);
 				if (
 					connectionErr instanceof DOMException &&
 					connectionErr.name === "AbortError"
 				) {
-					if (timedOut) {
-						return fail(
-							`Web search timed out after ${timeoutSeconds}s. ` +
-								`The SearXNG instance at \`${searxngUrl}\` may be slow ` +
-								"or unresponsive.",
-							{ timedOut: true, timeout: timeoutSeconds },
-						);
-					}
-					return fail("Web search was cancelled.", { cancelled: true });
+					return abortFail();
 				}
 				return fail(
 					"Web search connection failed: " +
@@ -426,8 +430,6 @@ export const webSearchTool = defineTool({
 				);
 			}
 
-			clearTimeout(timeoutId);
-
 			// ── Layer 2: HTTP error handling ──
 			if (!response.ok) {
 				return fail(
@@ -444,6 +446,10 @@ export const webSearchTool = defineTool({
 					? (JSON.parse(text) as SearXNGResponse)
 					: { results: [], answers: [], suggestions: [] };
 			} catch (parseErr) {
+				// Abort can surface here if the body read stalls past the timeout.
+				if (parseErr instanceof DOMException && parseErr.name === "AbortError") {
+					return abortFail();
+				}
 				return fail(
 					"Web search returned unexpected response format. " +
 						"SearXNG may be misconfigured. Error: " +
@@ -545,7 +551,6 @@ export const webSearchTool = defineTool({
 				},
 			};
 		} catch (unexpectedErr) {
-			clearTimeout(timeoutId);
 			return fail(
 				"An unexpected error occurred during web search: " +
 					(unexpectedErr instanceof Error
@@ -553,6 +558,10 @@ export const webSearchTool = defineTool({
 						: String(unexpectedErr)),
 				{ unexpectedError: true },
 			);
+		} finally {
+			// Timer stays armed through the body read, so `timeout` bounds the
+			// whole request, not just the response headers.
+			clearTimeout(timeoutId);
 		}
 	},