@xynogen/pix-9router 0.3.9 → 0.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-9router",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"description": "Pi extension — 9Router provider + fetch/search tools via router API",
 	"type": "module",
 	"main": "src/index.ts",
@@ -46,6 +46,6 @@
 		"@xynogen/pix-data": "^0.4.0",
 		"@xynogen/pix-pretty": "^1.7.21",
 		"typebox": "^1.1.38",
-		"@xynogen/pix-runtime": "^0.3.0"
+		"@xynogen/pix-runtime": "^0.4.0"
 	}
 }

package/src/http.ts

@@ -8,11 +8,9 @@
  */
 
 import { type ExecFileException, execFile } from "node:child_process";
+import { ioTimeoutMs, ioTimeoutSignal } from "@xynogen/pix-runtime/io";
 import { routerBaseUrl } from "./data.js";
 
-/** Default request timeout — audio transcription overrides with a longer one. */
-export const REQUEST_TIMEOUT_MS = 30_000;
-
 export function auth(): string | undefined {
 	return process.env.ROUTER_API_KEY;
 }
@@ -22,32 +20,27 @@ export async function apiPost(
 	path: string,
 	body: Record<string, unknown>,
 	signal?: AbortSignal,
-	timeoutMs: number = REQUEST_TIMEOUT_MS,
+	timeoutMs: number = ioTimeoutMs(),
 ): Promise<string> {
 	const url = `${routerBaseUrl()}${path}`;
 	const key = auth();
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), timeoutMs);
-	const s = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
-
-	try {
-		const res = await fetch(url, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				...(key ? { Authorization: `Bearer ${key}` } : {}),
-			},
-			body: JSON.stringify(body),
-			signal: s,
-		});
-		if (!res.ok) {
-			const errText = await res.text().catch(() => "");
-			throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
-		}
-		return await res.text();
-	} finally {
-		clearTimeout(timeout);
+	const timeoutSignal =
+		timeoutMs === ioTimeoutMs() ? ioTimeoutSignal() : AbortSignal.timeout(timeoutMs);
+	const requestSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+	const res = await fetch(url, {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+			...(key ? { Authorization: `Bearer ${key}` } : {}),
+		},
+		body: JSON.stringify(body),
+		signal: requestSignal,
+	});
+	if (!res.ok) {
+		const errText = await res.text().catch(() => "");
+		throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
 	}
+	return res.text();
 }
 
 export interface CurlOptions {
@@ -61,7 +54,9 @@ export interface CurlOptions {
 
 /** Run curl with sane defaults, rejecting on non-zero exit or timeout. */
 export function curl(args: string[], opts: CurlOptions = {}): Promise<string> {
-	const { maxTime = 25, timeoutMs = 30_000, stdin } = opts;
+	const timeoutMs = opts.timeoutMs ?? ioTimeoutMs();
+	const maxTime = opts.maxTime ?? timeoutMs / 1000;
+	const { stdin } = opts;
 	return new Promise((resolve, reject) => {
 		const child = execFile(
 			"curl",

package/src/transcribe.ts

@@ -16,12 +16,12 @@ import { access, lstat, mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, extname, isAbsolute, resolve } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { ioTimeoutSignal } from "@xynogen/pix-runtime/io";
 import { Type } from "typebox";
 import { routerBaseUrl } from "./data.js";
 import { auth, curl } from "./http.js";
 import { makeRenderCall, makeRenderResult } from "./render.js";
 
-const REQUEST_TIMEOUT_MS = 120_000; // audio transcription can take longer
 const CHAT_TRUNCATE_LIMIT = 50_000; // only when no output_file is provided
 const DEFAULT_MODEL = "dg/nova-3";
 
@@ -71,35 +71,28 @@ async function apiMultipart(
 ): Promise<string> {
 	const url = `${routerBaseUrl()}${path}`;
 	const key = auth();
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
-	const s = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
-
-	try {
-		const fileData = await readFile(filePath);
-		const blob = new Blob([fileData], { type: mimeType(filePath) });
-
-		const form = new FormData();
-		form.append("file", blob, basename(filePath));
-		form.append("model", model);
-		if (language) form.append("language", language);
-
-		const res = await fetch(url, {
-			method: "POST",
-			headers: {
-				...(key ? { Authorization: `Bearer ${key}` } : {}),
-			},
-			body: form,
-			signal: s,
-		});
-		if (!res.ok) {
-			const errText = await res.text().catch(() => "");
-			throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
-		}
-		return await res.text();
-	} finally {
-		clearTimeout(timeout);
+	const requestSignal = ioTimeoutSignal(signal);
+	const fileData = await readFile(filePath, { signal: requestSignal });
+	const blob = new Blob([fileData], { type: mimeType(filePath) });
+
+	const form = new FormData();
+	form.append("file", blob, basename(filePath));
+	form.append("model", model);
+	if (language) form.append("language", language);
+
+	const res = await fetch(url, {
+		method: "POST",
+		headers: {
+			...(key ? { Authorization: `Bearer ${key}` } : {}),
+		},
+		body: form,
+		signal: requestSignal,
+	});
+	if (!res.ok) {
+		const errText = await res.text().catch(() => "");
+		throw new Error(`API ${res.status}: ${errText.slice(0, 500)}`);
 	}
+	return res.text();
 }
 
 /** Extract the `text` field from a JSON envelope, or return the raw string. */
@@ -448,7 +441,7 @@ export default function registerTranscribe(pi: ExtensionAPI): void {
 					`${routerBaseUrl()}/audio/transcriptions`,
 				];
 
-				const raw = await curl(curlArgs, { maxTime: 120, timeoutMs: REQUEST_TIMEOUT_MS });
+				const raw = await curl(curlArgs);
 				return await run("curl-fallback", raw);
 			} catch (curlErr: unknown) {
 				const curlMsg = curlErr instanceof Error ? curlErr.message : String(curlErr);