@xynogen/pix-9router 0.3.20 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-9router",
-	"version": "0.3.20",
+	"version": "0.3.21",
 	"description": "Pi extension — 9Router provider + fetch/search tools via router API",
 	"type": "module",
 	"main": "src/index.ts",

package/src/http.ts

@@ -7,7 +7,8 @@
  * so both are parameters with the old per-file defaults.
  */
 
-import { type ExecFileException, execFile } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { basename } from "node:path";
 import { ioTimeoutMs, ioTimeoutSignal } from "@xynogen/pix-runtime/io";
 import { routerBaseUrl } from "./data.js";
 
@@ -44,41 +45,90 @@ export async function apiPost(
 }
 
 export interface CurlOptions {
-	/** curl --max-time in seconds (default 25). */
-	maxTime?: number;
-	/** child-process kill timeout in ms (default 30_000). */
+	/** Request timeout in ms (default ioTimeoutMs()). */
 	timeoutMs?: number;
-	/** Optional stdin body piped into curl. */
+	/** Optional request body (was piped to curl stdin). */
 	stdin?: string;
 }
 
-/** Run curl with sane defaults, rejecting on non-zero exit or timeout. */
-export function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
-	const timeoutMs = opts.timeoutMs ?? ioTimeoutMs();
-	const maxTime = opts.maxTime ?? timeoutMs / 1000;
-	const { stdin } = opts;
-	return new Promise((resolve, reject) => {
-		const child = execFile(
-			"curl",
-			["-sS", "--connect-timeout", "10", "--max-time", String(maxTime), ...args],
-			{ maxBuffer: 10 * 1024 * 1024, timeout: timeoutMs },
-			(err, stdout, stderr) => {
-				if (err) {
-					const e = err as ExecFileException;
-					const msg = e.killed
-						? "curl timed out"
-						: `curl exit ${e.code ?? "??"}: ${stderr.slice(0, 300)}`;
-					reject(new Error(msg));
-					return;
+// ponytail: this is NOT a general curl shim — it parses only the flag forms the
+// three fallback call sites actually pass (-L, -X, -H, -d, -F key=value /
+// file=@path, plus the -sS/--connect-timeout/--max-time defaults added below).
+// New curl flags won't work here; extend the parser or call fetch directly.
+function curlArgsToRequest(args: string[]): { url: string; init: RequestInit } {
+	const headers = new Headers();
+	let method = "GET";
+	let body: string | undefined;
+	let form: FormData | undefined;
+	let url = "";
+	for (let i = 0; i < args.length; i++) {
+		const a = args[i] ?? "";
+		switch (a) {
+			case "-sS":
+			case "-L":
+				break; // silent / follow-redirects are fetch defaults
+			case "--connect-timeout":
+			case "--max-time":
+				i++; // value handled by AbortSignal below
+				break;
+			case "-X":
+				method = args[++i] ?? method;
+				break;
+			case "-H": {
+				const h = args[++i] ?? "";
+				const idx = h.indexOf(":");
+				if (idx >= 0) headers.set(h.slice(0, idx).trim(), h.slice(idx + 1).trim());
+				break;
+			}
+			case "-d":
+				body = args[++i] ?? "";
+				break;
+			case "-F": {
+				form ??= new FormData();
+				const field = args[++i] ?? "";
+				const eq = field.indexOf("=");
+				const key = field.slice(0, eq);
+				const val = field.slice(eq + 1);
+				if (val.startsWith("@")) {
+					const path = val.slice(1);
+					form.set(key, new Blob([readFileSync(path)]), basename(path));
+				} else {
+					form.set(key, val);
 				}
-				resolve(stdout);
-			},
-		);
-		if (stdin && child.stdin) {
-			child.stdin.write(stdin);
-			child.stdin.end();
+				break;
+			}
+			default:
+				if (!a.startsWith("-")) url = a; // positional = URL
 		}
-	});
+	}
+	const init: RequestInit = { method };
+	if (form)
+		init.body = form; // let fetch set the multipart boundary
+	else if (body !== undefined) init.body = body;
+	if ([...headers.keys()].length > 0) init.headers = headers;
+	return { url, init };
+}
+
+/** Raw fetch fallback (curl-signature compatible), rejecting on non-2xx or timeout. */
+export async function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
+	const timeoutMs = opts.timeoutMs ?? ioTimeoutMs();
+	const { url, init } = curlArgsToRequest(args);
+	if (opts.stdin !== undefined) init.body = opts.stdin;
+	init.signal = AbortSignal.timeout(timeoutMs);
+	let res: Response;
+	try {
+		res = await fetch(url, init);
+	} catch (err) {
+		if (err instanceof DOMException && err.name === "TimeoutError") {
+			throw new Error("curl timed out");
+		}
+		throw new Error(`curl failed: ${err instanceof Error ? err.message : String(err)}`);
+	}
+	if (!res.ok) {
+		const errText = await res.text().catch(() => "");
+		throw new Error(`curl exit ${res.status}: ${errText.slice(0, 300)}`);
+	}
+	return res.text();
 }
 
 export function isCancelled(error: unknown, signal: AbortSignal | undefined): boolean {