rivetkit 2.3.9 → 2.3.11-rc.1

package/src/registry/native.ts

@@ -47,7 +47,7 @@ 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 { isResponseLike, type ResponseLike } from "@/common/fetch-like";
 import { decodeWorkflowHistoryTransport } from "@/common/inspector-transport";
 import { deconstructError, stringifyError } from "@/common/utils";
 import type {
@@ -72,13 +72,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 +91,7 @@ import type {
 	RuntimeBytes,
 	RuntimeCronFire,
 	RuntimeCronJobInfo,
+	RuntimeHttpResponse,
 	RuntimeInspectorTabEntry,
 	RuntimeQueueMessage,
 	RuntimeScheduledEventInfo,
@@ -1169,6 +1163,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: ResponseLike,
+): 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 +3716,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 +4420,7 @@ export function buildNativeFactory(
 							);
 							const actorCtx = makeActorCtx(
 								ctx,
-								request
-									? buildNativeHttpRequest(request)
-									: undefined,
+								request ? buildRequest(request) : undefined,
 							);
 							try {
 								await config.onBeforeConnect(
@@ -4436,9 +4457,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 +4512,7 @@ export function buildNativeFactory(
 							);
 							const actorCtx = makeActorCtx(
 								ctx,
-								request
-									? buildNativeHttpRequest(request)
-									: undefined,
+								request ? buildRequest(request) : undefined,
 							);
 							const connAdapter = new NativeConnAdapter(
 								runtime,
@@ -4645,63 +4662,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 +4711,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)) {
 							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 +4759,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 +4919,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 {
@@ -364,20 +356,14 @@ 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;
+	body: RuntimeBytes;
 }
 
 export type RuntimeApplicationFetch = (
-	request: RuntimeApplicationRequest,
-	responseBodyStream?: RuntimeHttpResponseBodyStream,
+	request: RuntimeServerlessRequest,
 ) => Promise<RuntimeApplicationResponse>;
 
 export interface RuntimeApplicationListenerConfig