rivetkit 2.3.8 → 2.3.10

package/src/registry/napi-runtime.ts

@@ -4,7 +4,6 @@ import type {
 	CancellationToken as NativeCancellationToken,
 	ConnHandle as NativeConnHandle,
 	CoreRegistry as NativeCoreRegistry,
-	HttpResponseBodyStream as NativeHttpResponseBodyStream,
 	WebSocket as NativeWebSocket,
 } from "@rivetkit/rivetkit-napi";
 import type {
@@ -15,13 +14,10 @@ import type {
 	CoreRuntime,
 	RegistryHandle,
 	RuntimeActorConfig,
-	RuntimeApplicationFetch,
-	RuntimeApplicationListenerConfig,
 	RuntimeBytes,
 	RuntimeCronFire,
 	RuntimeCronJobInfo,
 	RuntimeHttpRequest,
-	RuntimeHttpResponseBodyStream,
 	RuntimeKvEntry,
 	RuntimeKvListOptions,
 	RuntimeListenerConfig,
@@ -139,56 +135,6 @@ function toNapiBuffer(value: RuntimeBytes): Buffer {
 	return Buffer.from(value);
 }
 
-function toNapiApplication(application: RuntimeApplicationFetch) {
-	return async (
-		error: unknown,
-		request?: {
-			method: string;
-			url: string;
-			headers: Record<string, string>;
-			body: Buffer;
-			cancelToken?: NativeCancellationToken;
-			responseBodyStream?: RuntimeHttpResponseBodyStream;
-		},
-	) => {
-		if (error) throw error;
-		if (!request) {
-			throw new Error("application fetch callback received no request");
-		}
-		const response = await application(
-			{
-				...request,
-				body: new Uint8Array(request.body),
-				cancelToken:
-					request.cancelToken as unknown as CancellationTokenHandle,
-			},
-			request.responseBodyStream
-				? fromNapiHttpResponseBodyStream(
-						request.responseBodyStream as unknown as NativeHttpResponseBodyStream,
-					)
-				: undefined,
-		);
-		return {
-			...response,
-			body:
-				response.body === undefined
-					? undefined
-					: toNapiBuffer(response.body),
-		};
-	};
-}
-
-function fromNapiHttpResponseBodyStream(
-	stream: NativeHttpResponseBodyStream,
-): RuntimeHttpResponseBodyStream {
-	return {
-		cancelled: () => stream.cancelled(),
-		write: (chunk) => stream.write(Buffer.from(chunk)),
-		end: () => stream.end(),
-		error: (message) => stream.error(message),
-	};
-}
-
 function toNapiHttpRequest(
 	request?: RuntimeHttpRequest | undefined | null,
 ): Parameters<NativeActorContext["connectConn"]>[1] {
@@ -350,9 +296,6 @@ export class NapiCoreRuntime implements CoreRuntime {
 		listener: RuntimeListenerConfig,
 		config: RuntimeServeConfig,
 	): Promise<void> {
-		const application = listener.application
-			? toNapiApplication(listener.application)
-			: undefined;
 		await asNativeRegistry(registry).serveListener(
 			{
 				port: listener.port,
@@ -360,23 +303,6 @@ export class NapiCoreRuntime implements CoreRuntime {
 				publicDir: listener.publicDir,
 			},
 			config,
-			application,
-		);
-	}
-
-	async serveApplicationListener(
-		registry: RegistryHandle,
-		listener: RuntimeApplicationListenerConfig,
-		config: RuntimeServeConfig,
-	): Promise<void> {
-		await asNativeRegistry(registry).serveApplicationListener(
-			{
-				port: listener.port,
-				host: listener.host,
-				publicDir: listener.publicDir,
-			},
-			toNapiApplication(listener.application),
-			config,
 		);
 	}
 

package/src/registry/native.ts

@@ -47,7 +47,6 @@ import { HEADER_CONN_PARAMS } from "@/common/actor-router-consts";
 import type { AnyDatabaseProvider } from "@/common/database/config";
 import { wrapJsNativeDatabase } from "@/common/database/native-database";
 import { assertJsonCompatValue, type JsonCompatValue } from "@/common/encoding";
-import { isResponseLike } from "@/common/fetch-like";
 import { decodeWorkflowHistoryTransport } from "@/common/inspector-transport";
 import { deconstructError, stringifyError } from "@/common/utils";
 import type {
@@ -72,13 +71,6 @@ import {
 } from "@/utils/node";
 import { logger } from "./log";
 import { loadNapiRuntime } from "./napi-runtime";
-import {
-	buildNativeHttpRequest,
-	cancelNativeHttpRequestBody,
-	convertNativeHttpResponse,
-	type NativeHttpRequestBodyStream,
-	type NativeHttpResponseBodyStream,
-} from "./native-http";
 import {
 	type NativeValidationConfig,
 	validateActionArgs,
@@ -98,6 +90,7 @@ import type {
 	RuntimeBytes,
 	RuntimeCronFire,
 	RuntimeCronJobInfo,
+	RuntimeHttpResponse,
 	RuntimeInspectorTabEntry,
 	RuntimeQueueMessage,
 	RuntimeScheduledEventInfo,
@@ -1169,6 +1162,38 @@ function decodeArgs(value?: RuntimeBytes | null): unknown[] {
 	return normalizeArgs(decoded);
 }
 
+function buildRequest(init: {
+	method: string;
+	uri: string;
+	headers?: Record<string, string>;
+	body?: RuntimeBytes;
+}): Request {
+	const url = init.uri.startsWith("http")
+		? init.uri
+		: new URL(init.uri, "http://127.0.0.1").toString();
+	const body =
+		init.body && init.body.length > 0
+			? runtimeBytesToArrayBuffer(init.body)
+			: undefined;
+	return new Request(url, {
+		method: init.method,
+		headers: init.headers,
+		body,
+	});
+}
+
+async function toRuntimeHttpResponse(
+	response: Response,
+): Promise<RuntimeHttpResponse> {
+	const headers = Object.fromEntries(response.headers.entries());
+	const body = new Uint8Array(await response.arrayBuffer());
+	return {
+		status: response.status,
+		headers,
+		body,
+	};
+}
+
 function toActorKey(
 	segments: Array<{
 		kind: string;
@@ -3690,22 +3715,19 @@ export function buildNativeFactory(
 		);
 	const maybeHandleNativeInspectorRequest = async (
 		ctx: ActorContextHandle,
-		rawRequest: {
+		_rawRequest: {
 			method: string;
 			uri: string;
 			headers?: Record<string, string>;
 			body?: RuntimeBytes;
 		},
+		jsRequest: Request,
 	): Promise<Response | undefined> => {
-		const rawUrl = rawRequest.uri.startsWith("http")
-			? rawRequest.uri
-			: new URL(rawRequest.uri, "http://127.0.0.1").toString();
-		const url = new URL(rawUrl);
+		const url = new URL(jsRequest.url);
 		if (!url.pathname.startsWith("/inspector/")) {
 			return undefined;
 		}
 
-		const jsRequest = buildNativeHttpRequest(rawRequest);
 		const jsonResponse = (body: unknown, init?: ResponseInit) =>
 			new Response(JSON.stringify(body), {
 				status: init?.status ?? 200,
@@ -4397,9 +4419,7 @@ export function buildNativeFactory(
 							);
 							const actorCtx = makeActorCtx(
 								ctx,
-								request
-									? buildNativeHttpRequest(request)
-									: undefined,
+								request ? buildRequest(request) : undefined,
 							);
 							try {
 								await config.onBeforeConnect(
@@ -4436,9 +4456,7 @@ export function buildNativeFactory(
 								unwrapTsfnPayload(error, payload);
 							const actorCtx = makeActorCtx(
 								ctx,
-								request
-									? buildNativeHttpRequest(request)
-									: undefined,
+								request ? buildRequest(request) : undefined,
 							);
 							const connAdapter = new NativeConnAdapter(
 								runtime,
@@ -4493,9 +4511,7 @@ export function buildNativeFactory(
 							);
 							const actorCtx = makeActorCtx(
 								ctx,
-								request
-									? buildNativeHttpRequest(request)
-									: undefined,
+								request ? buildRequest(request) : undefined,
 							);
 							const connAdapter = new NativeConnAdapter(
 								runtime,
@@ -4645,63 +4661,38 @@ export function buildNativeFactory(
 						uri: string;
 						headers?: Record<string, string>;
 						body?: RuntimeBytes;
-						bodyStream?: NativeHttpRequestBodyStream;
 					};
 					cancelToken?: CancellationTokenHandle;
-					responseBodyStream?: NativeHttpResponseBodyStream;
 				},
 			) => {
 				try {
-					const { ctx, request, cancelToken, responseBodyStream } =
-						unwrapTsfnPayload(error, payload);
+					const { ctx, request, cancelToken } = unwrapTsfnPayload(
+						error,
+						payload,
+					);
+					const jsRequest = buildRequest(request);
 					const inspectorResponse =
-						await maybeHandleNativeInspectorRequest(ctx, request);
+						await maybeHandleNativeInspectorRequest(
+							ctx,
+							request,
+							jsRequest,
+						);
 					if (inspectorResponse) {
-						await cancelNativeHttpRequestBody(request.bodyStream);
-						return (
-							await convertNativeHttpResponse(
-								inspectorResponse,
-								responseBodyStream,
-							)
-						).response;
+						return await toRuntimeHttpResponse(inspectorResponse);
 					}
 
 					if (typeof config.onRequest !== "function") {
-						await cancelNativeHttpRequestBody(request.bodyStream);
-						return (
-							await convertNativeHttpResponse(
-								new Response(null, { status: 404 }),
-								responseBodyStream,
-							)
-						).response;
+						return await toRuntimeHttpResponse(
+							new Response(null, { status: 404 }),
+						);
 					}
 
-					const requestAbortController = new AbortController();
-					const handlerRequest = buildNativeHttpRequest({
-						...request,
-						abortController: requestAbortController,
-					});
 					const rawConnParams =
-						handlerRequest.headers.get(HEADER_CONN_PARAMS);
+						jsRequest.headers.get(HEADER_CONN_PARAMS);
 					let requestCtx:
 						| ReturnType<typeof withConnContext>
 						| undefined;
 					let conn: ConnHandle | undefined;
-					let removeRequestAbortListener: (() => void) | undefined;
-					let cleanupDeferredToBody = false;
-					let cleanedUp = false;
-					const cleanupRequest = async () => {
-						if (cleanedUp) return;
-						cleanedUp = true;
-						removeRequestAbortListener?.();
-						try {
-							await requestCtx?.dispose();
-						} finally {
-							if (conn) {
-								await runtime.connDisconnect(conn);
-							}
-						}
-					};
 					try {
 						const connParams = validateConnParams(
 							schemaConfig.connParamsSchema,
@@ -4719,62 +4710,23 @@ export function buildNativeFactory(
 						requestCtx = makeConnCtx(
 							ctx,
 							conn,
-							handlerRequest,
+							jsRequest,
 							cancelToken,
 						);
-						const ctxAbortSignal = requestCtx.abortSignal;
-						const abortRequest = () =>
-							requestAbortController.abort(ctxAbortSignal.reason);
-						if (ctxAbortSignal.aborted) {
-							abortRequest();
-						} else {
-							ctxAbortSignal.addEventListener(
-								"abort",
-								abortRequest,
-								{ once: true },
-							);
-							removeRequestAbortListener = () =>
-								ctxAbortSignal.removeEventListener(
-									"abort",
-									abortRequest,
-								);
-						}
 						const response = await config.onRequest(
 							requestCtx,
-							handlerRequest,
+							jsRequest,
 						);
-						if (!isResponseLike(response)) {
+						if (!(response instanceof Response)) {
 							throw new Error(
 								"onRequest handler must return a Response",
 							);
 						}
-						const conversion = await convertNativeHttpResponse(
-							response,
-							responseBodyStream,
-						);
-						if (conversion.bodyCompletion) {
-							cleanupDeferredToBody = true;
-							void conversion.bodyCompletion
-								.then(cleanupRequest)
-								.catch((cleanupError) => {
-									logger().error({
-										msg: "failed to clean up native streaming http request",
-										error: cleanupError,
-									});
-								});
-						}
-						return conversion.response;
+						return await toRuntimeHttpResponse(response);
 					} finally {
-						try {
-							// Handler completion ends upload ownership even when
-							// the Web Request body is locked or partly consumed.
-							await cancelNativeHttpRequestBody(
-								request.bodyStream,
-							);
-						} finally {
-							if (!cleanupDeferredToBody) {
-								await cleanupRequest();
-							}
+						await requestCtx?.dispose();
+						if (conn) {
+							await runtime.connDisconnect(conn);
 						}
 					}
 				} catch (error) {
@@ -4806,7 +4758,7 @@ export function buildNativeFactory(
 							const { ctx, conn, ws, request } =
 								unwrapTsfnPayload(error, payload);
 							const jsRequest = request
-								? buildNativeHttpRequest(request)
+								? buildRequest(request)
 								: undefined;
 							const actorCtx = makeConnCtx(ctx, conn, jsRequest);
 							try {
@@ -4966,7 +4918,7 @@ export function buildNativeFactory(
 					timeoutMs,
 					cancelToken,
 				} = unwrapTsfnPayload(error, payload);
-				const jsRequest = buildNativeHttpRequest(request);
+				const jsRequest = buildRequest(request);
 				const actorCtx = withConnContext(
 					runtime,
 					ctx,

package/src/registry/runtime.ts

@@ -36,14 +36,6 @@ export interface RuntimeHttpResponse {
 	status?: number;
 	headers?: Record<string, string>;
 	body?: RuntimeBytes;
-	stream?: boolean;
-}
-
-export interface RuntimeHttpResponseBodyStream {
-	cancelled(): Promise<void>;
-	write(chunk: Uint8Array): Promise<void>;
-	end(): Promise<void>;
-	error(message: string): Promise<void>;
 }
 
 export interface RuntimeStateDeltaPayload {
@@ -354,7 +346,6 @@ export interface RuntimeListenerConfig {
 	port: number;
 	host?: string;
 	publicDir?: string;
-	application?: RuntimeApplicationFetch;
 }
 
 export interface RuntimeServerlessRequest {
@@ -364,27 +355,6 @@ export interface RuntimeServerlessRequest {
 	body: RuntimeBytes;
 }
 
-export interface RuntimeApplicationRequest extends RuntimeServerlessRequest {
-	cancelToken?: CancellationTokenHandle;
-}
-
-export interface RuntimeApplicationResponse {
-	status: number;
-	headers: Record<string, string>;
-	body?: RuntimeBytes;
-	stream?: boolean;
-}
-
-export type RuntimeApplicationFetch = (
-	request: RuntimeApplicationRequest,
-	responseBodyStream?: RuntimeHttpResponseBodyStream,
-) => Promise<RuntimeApplicationResponse>;
-
-export interface RuntimeApplicationListenerConfig
-	extends RuntimeListenerConfig {
-	application: RuntimeApplicationFetch;
-}
-
 export interface RuntimeServerlessResponseHead {
 	status: number;
 	headers: Record<string, string>;
@@ -459,11 +429,6 @@ export interface CoreRuntime {
 		listener: RuntimeListenerConfig,
 		config: RuntimeServeConfig,
 	): Promise<void>;
-	serveApplicationListener(
-		registry: RegistryHandle,
-		listener: RuntimeApplicationListenerConfig,
-		config: RuntimeServeConfig,
-	): Promise<void>;
 	registryHealth?(
 		registry: RegistryHandle,
 	): Promise<RuntimeRegistryRouteResponse>;

package/src/registry/wasm-runtime.ts

@@ -21,7 +21,6 @@ import type {
 	RegistryHandle,
 	RuntimeActorConfig,
 	RuntimeActorKeySegment,
-	RuntimeApplicationListenerConfig,
 	RuntimeBytes,
 	RuntimeHttpRequest,
 	RuntimeInspectorSnapshot,
@@ -326,16 +325,6 @@ export class WasmCoreRuntime implements CoreRuntime {
 		);
 	}
 
-	async serveApplicationListener(
-		_registry: RegistryHandle,
-		_listener: RuntimeApplicationListenerConfig,
-		_config: RuntimeServeConfig,
-	): Promise<void> {
-		throw new Error(
-			"registry.listen() is not supported on the wasm runtime; use an application-owned HTTP server instead",
-		);
-	}
-
 	createActorFactory(
 		callbacks: object,
 		config?: RuntimeActorConfig | undefined | null,