@apifuse/provider-sdk 2.1.0-beta.0 → 2.1.0-beta.2

package/src/runtime/http.ts

@@ -83,13 +83,12 @@ async function doRequest(
 		});
 
 		if (!response.ok) {
-			const text = await response.text().catch(() => "");
+			await drainFetchResponse(response);
 			throw new TransportError(
-				`HTTP ${response.status} ${response.statusText}: ${requestUrl}`,
+				`Upstream request failed with status ${response.status}`,
 				{
 					code: "upstream_http_error",
 					status: response.status,
-					fix: `Check the endpoint URL and request parameters. Response: ${text.slice(0, 200)}`,
 				},
 			);
 		}
@@ -121,16 +120,12 @@ async function doRequest(
 		}
 
 		if (error instanceof Error && error.name === "AbortError") {
-			throw new TransportError(
-				`Request timed out: ${resolveUrl(baseUrl, url)}`,
-				{
-					code: "transport_timeout",
-					fix: `Increase timeout option (current: ${timeout}ms)`,
-				},
-			);
+			throw new TransportError("Request timed out", {
+				code: "transport_timeout",
+			});
 		}
 
-		throw new TransportError(`Network error: ${String(error)}`, {
+		throw new TransportError("Network error", {
 			code: "transport_network_error",
 			cause: error instanceof Error ? error : undefined,
 		});
@@ -141,6 +136,27 @@ async function doRequest(
 	}
 }
 
+async function drainFetchResponse(response: Response): Promise<void> {
+	const reader = response.body?.getReader();
+	if (!reader) {
+		return;
+	}
+
+	try {
+		while (true) {
+			const { done } = await reader.read();
+			if (done) {
+				return;
+			}
+		}
+	} catch {
+		// Best-effort drain for transport reuse only; callers still receive the
+		// sanitized upstream error below.
+	} finally {
+		reader.releaseLock();
+	}
+}
+
 function createProxyInit(
 	proxy?: string,
 ): Pick<FetchProxyInit, "dispatcher" | "proxy"> {

package/src/runtime/tls.ts

@@ -19,6 +19,12 @@ const MISSING_PROXY_WARNING =
 
 export type TlsClientOptions = ProxyResolutionOptions & {
 	warn?: (message: string) => void;
+	/**
+	 * Proxy-only TLS transport overrides. Use only for upstream proxy products
+	 * that terminate CONNECT with a private CA instead of tunneling the origin
+	 * certificate chain.
+	 */
+	proxyTls?: { insecureSkipVerify?: boolean };
 };
 
 const REMOVED_CHROME_PROFILE_NAMES = new Set([
@@ -187,14 +193,6 @@ export function normalizeResponse(
 	};
 }
 
-function getErrorMessage(error: unknown): string {
-	if (error instanceof Error) {
-		return error.toString();
-	}
-
-	return String(error);
-}
-
 function normalizeBody(body: TlsFetchOptions["body"]): string | null {
 	if (body === undefined) {
 		return null;
@@ -274,6 +272,7 @@ function createSessionFetcher(
 	let sessionClient: SessionClient | null = null;
 	let activeProxy: string | undefined;
 	let activeTlsIdentifier: string | undefined;
+	let activeInsecureSkipVerify = false;
 	let hasWarnedMissingProxy = false;
 	const warn = clientOptions.warn ?? console.warn;
 
@@ -305,19 +304,22 @@ function createSessionFetcher(
 		sessionClient = null;
 		activeProxy = undefined;
 		activeTlsIdentifier = undefined;
+		activeInsecureSkipVerify = false;
 	}
 
 	function getSessionClient(
 		profile?: string,
 		proxy?: string,
 		ja3?: string,
+		insecureSkipVerify = false,
 	): SessionClient {
 		const tlsIdentifier = ja3 ?? resolveIdentifier(profile ?? defaultProfile);
 
 		if (
 			!sessionClient ||
 			activeProxy !== proxy ||
-			activeTlsIdentifier !== tlsIdentifier
+			activeTlsIdentifier !== tlsIdentifier ||
+			activeInsecureSkipVerify !== insecureSkipVerify
 		) {
 			if (sessionClient) {
 				closeCurrentSession();
@@ -326,10 +328,12 @@ function createSessionFetcher(
 			sessionClient = new SessionClient(moduleClient, {
 				tlsClientIdentifier: tlsIdentifier,
 				...(proxy ? { proxyUrl: proxy } : {}),
+				...(insecureSkipVerify ? { insecureSkipVerify: true } : {}),
 				timeoutSeconds: 30,
 			} as ConstructorParameters<typeof SessionClient>[1]);
 			activeProxy = proxy;
 			activeTlsIdentifier = tlsIdentifier;
+			activeInsecureSkipVerify = insecureSkipVerify;
 		}
 
 		return sessionClient;
@@ -338,10 +342,15 @@ function createSessionFetcher(
 	return {
 		async fetch(url, options = {}) {
 			const proxy = resolveRequestProxy(options);
+			const insecureSkipVerify = Boolean(
+				options.tls?.insecureSkipVerify ??
+					(proxy && clientOptions.proxyTls?.insecureSkipVerify),
+			);
 			const session = getSessionClient(
 				options.profile,
 				proxy,
 				options.tls?.ja3,
+				insecureSkipVerify,
 			);
 			const requestUrl = resolveUrl(baseUrl, url);
 
@@ -352,9 +361,9 @@ function createSessionFetcher(
 					proxy,
 				});
 
-				if (response.status >= 400) {
+				if (response.status >= 400 && options.throwOnHttpError !== false) {
 					throw new TransportError(
-						`HTTP ${response.status}: ${response.body || "Request failed"}`,
+						`Upstream request failed with status ${response.status}`,
 						{
 							status: response.status,
 						},
@@ -367,7 +376,7 @@ function createSessionFetcher(
 					throw error;
 				}
 
-				throw new TransportError(`Network error: ${getErrorMessage(error)}`, {
+				throw new TransportError("Network error", {
 					status: 0,
 					cause: error instanceof Error ? error : undefined,
 				});

package/src/server/serve.ts

@@ -215,9 +215,8 @@ function toErrorResponse(
 		return {
 			error: {
 				code: error.code ?? "provider_error",
-				message: error.message,
+				message: publicProviderErrorMessage(error),
 				...(requestId ? { requestId } : {}),
-				...(error.fix ? { fix: error.fix } : {}),
 				...(error instanceof TransportError && error.status
 					? { details: { upstreamStatus: error.status } }
 					: {}),
@@ -245,6 +244,21 @@ function toErrorResponse(
 	};
 }
 
+function publicProviderErrorMessage(error: ProviderError): string {
+	if (error instanceof TransportError) {
+		if (error.code === "transport_timeout") return "Request timed out";
+		if (error.code === "transport_network_error") return "Network error";
+		if (error.code === "upstream_http_error" && error.status) {
+			return `Upstream request failed with status ${error.status}`;
+		}
+		if (error.status) {
+			return `Upstream request failed with status ${error.status}`;
+		}
+		return "Upstream request failed";
+	}
+	return error.message;
+}
+
 function toStatusCode(error: unknown): 400 | 404 | 500 | 502 | 504 {
 	if (error instanceof z.ZodError) {
 		return 400;
@@ -255,7 +269,7 @@ function toStatusCode(error: unknown): 400 | 404 | 500 | 502 | 504 {
 	}
 
 	if (error instanceof ProviderError) {
-		if (error.code === "NOT_FOUND") {
+		if (error.code === "NOT_FOUND" || error.code === "NO_DATA") {
 			return 404;
 		}
 

package/src/types.ts

@@ -82,7 +82,6 @@ export const OPERATION_TIMEOUT_MS_MAX = 60_000;
 
 export interface OperationRelationships {
 	alternatives?: string[];
-	chainsWith?: string[];
 }
 
 /**
@@ -97,7 +96,15 @@ export interface OperationRelationships {
  */
 
 /** Polling intervals supported by the health-monitor runtime. */
-export type ProbeInterval = "30s" | "1m" | "3m" | "5m" | "15m" | "30m" | "1h";
+export type ProbeInterval =
+	| "30s"
+	| "1m"
+	| "3m"
+	| "5m"
+	| "15m"
+	| "30m"
+	| "1h"
+	| "24h";
 
 export const PROBE_INTERVALS: readonly ProbeInterval[] = [
 	"30s",
@@ -107,6 +114,7 @@ export const PROBE_INTERVALS: readonly ProbeInterval[] = [
 	"15m",
 	"30m",
 	"1h",
+	"24h",
 ] as const;
 
 /**
@@ -222,6 +230,13 @@ export interface ProviderHealthMonitorConfig {
 	 * `requiresConnection: true`.
 	 */
 	requiredSecrets?: string[];
+	/**
+	 * Runtime probe overrides keyed by probe id (for example
+	 * "catchtable/auth-flow" or "catchtable/waiting-lifecycle"). Use this for
+	 * health-monitor probes that are provider-scoped or cross-operation and
+	 * therefore cannot declare an `OperationDefinition.healthCheck.interval`.
+	 */
+	probeOverrides?: Record<string, HealthMonitorProbeOverride>;
 	/**
 	 * Override the default service account ID for this provider's probes.
 	 * Defaults to the runtime's `APIFUSE_SERVICE_ACCOUNT_ID` env var.
@@ -229,6 +244,11 @@ export interface ProviderHealthMonitorConfig {
 	serviceAccount?: string;
 }
 
+export interface HealthMonitorProbeOverride {
+	/** Optional runtime interval override. Must be one of PROBE_INTERVALS. */
+	interval?: ProbeInterval;
+}
+
 export interface OperationErrorCode {
 	code: string;
 	status?: number;
@@ -300,9 +320,15 @@ export interface TlsFetchOptions extends RequestOptions {
 	method?: string;
 	body?: string | Buffer;
 	profile?: string;
+	/**
+	 * Defaults to true. Set to false when callers need to inspect upstream
+	 * non-2xx bodies themselves instead of converting them to TransportError.
+	 */
+	throwOnHttpError?: boolean;
 	tls?: {
 		ja3?: string;
 		h2?: Record<string, unknown>;
+		insecureSkipVerify?: boolean;
 	};
 	headerOrder?: string[];
 }

package/src/composite.ts

@@ -1,43 +0,0 @@
-import type { infer as ZodInfer, ZodType } from "zod";
-
-export interface ClarifyResponse {
-	_type: "clarify";
-	question: string;
-	missing: Array<{ name: string; description: string }>;
-}
-
-export interface CompositeContext {
-	chain: {
-		call: <T>(operationKey: string, params: unknown) => Promise<T>;
-	};
-	clarify: (opts: {
-		question: string;
-		missing: Array<{ name: string; description: string }>;
-	}) => ClarifyResponse;
-	setSlot: (name: string, value: unknown) => void;
-}
-
-export interface CompositeOperationDefinition<
-	TInput extends ZodType = ZodType,
-	TOutput extends ZodType = ZodType,
-> {
-	id: string;
-	description: string;
-	input: TInput;
-	output: TOutput;
-	tags?: string[];
-	chainsWith?: string[];
-	steps: (
-		ctx: CompositeContext,
-		input: ZodInfer<TInput>,
-	) => Promise<ZodInfer<TOutput> | ClarifyResponse>;
-}
-
-export function defineCompositeOperation<
-	TInput extends ZodType,
-	TOutput extends ZodType,
->(
-	config: CompositeOperationDefinition<TInput, TOutput>,
-): CompositeOperationDefinition<TInput, TOutput> {
-	return config;
-}