rivetkit 2.3.10 → 2.3.11-rc.1

package/dist/tsup/test/mod.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkINXPYXN6cjs = require('../chunk-INXPYXN6.cjs');
+var _chunkJAQHV6LBcjs = require('../chunk-JAQHV6LB.cjs');
 
 
-var _chunkLCWHS6K7cjs = require('../chunk-LCWHS6K7.cjs');
+var _chunkW2YEXCCJcjs = require('../chunk-W2YEXCCJ.cjs');
 require('../chunk-MYWZCDML.cjs');
 require('../chunk-UEULFXUI.cjs');
-require('../chunk-PCJSDS7N.cjs');
-require('../chunk-Z2ESFE5Z.cjs');
+require('../chunk-57ZE43T5.cjs');
+require('../chunk-TWNMQDZK.cjs');
 require('../chunk-4FC7TVS6.cjs');
 
 // src/test/ready.ts
@@ -36,8 +36,8 @@ async function setupTest(c, registry) {
   registry.config.noWelcome = true;
   registry.start();
   await waitForRegistryReady(registry);
-  const client = _chunkINXPYXN6cjs.createClient.call(void 0, {
-    ..._chunkLCWHS6K7cjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
+  const client = _chunkJAQHV6LBcjs.createClient.call(void 0, {
+    ..._chunkW2YEXCCJcjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
     disableMetadataLookup: false
   });
   c.onTestFinished(async () => {

package/dist/tsup/test/mod.d.cts

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { aC as Registry, a2 as Client } from '../config-BobvQpex.cjs';
+import { aC as Registry, a2 as Client } from '../config-Caocy3Z9.cjs';
 import 'zod/v4';
 import '../config-BxOimoGX.cjs';
 import '@rivetkit/rivetkit-wasm';

package/dist/tsup/test/mod.d.ts

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { aC as Registry, a2 as Client } from '../config-BRpVbJCD.js';
+import { aC as Registry, a2 as Client } from '../config-BKAMOHez.js';
 import 'zod/v4';
 import '../config-BxOimoGX.js';
 import '@rivetkit/rivetkit-wasm';

package/dist/tsup/test/mod.js

@@ -1,13 +1,13 @@
 import {
   createClient
-} from "../chunk-6UHZLL6S.js";
+} from "../chunk-L4DYLD7P.js";
 import {
   convertRegistryConfigToClientConfig
-} from "../chunk-DPM73GAL.js";
+} from "../chunk-MMPE77KO.js";
 import "../chunk-JI6GZ2C2.js";
 import "../chunk-7AFZMFPQ.js";
-import "../chunk-Q5H37KNQ.js";
-import "../chunk-X7XY6NCU.js";
+import "../chunk-5FVMFSBH.js";
+import "../chunk-ET2F6BXK.js";
 import "../chunk-ZZ3WBRPD.js";
 
 // src/test/ready.ts

package/dist/tsup/utils.cjs

@@ -19,7 +19,7 @@
 
 
 
-var _chunkZ2ESFE5Zcjs = require('./chunk-Z2ESFE5Z.cjs');
+var _chunkTWNMQDZKcjs = require('./chunk-TWNMQDZK.cjs');
 require('./chunk-4FC7TVS6.cjs');
 
 
@@ -42,5 +42,5 @@ require('./chunk-4FC7TVS6.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunkZ2ESFE5Zcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkZ2ESFE5Zcjs.SinglePromiseQueue; exports.VERSION = _chunkZ2ESFE5Zcjs.VERSION; exports.arrayBuffersEqual = _chunkZ2ESFE5Zcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkZ2ESFE5Zcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkZ2ESFE5Zcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkZ2ESFE5Zcjs.combineUrlPath; exports.dbg = _chunkZ2ESFE5Zcjs.dbg; exports.detectRuntime = _chunkZ2ESFE5Zcjs.detectRuntime; exports.getEnvUniversal = _chunkZ2ESFE5Zcjs.getEnvUniversal; exports.httpUserAgent = _chunkZ2ESFE5Zcjs.httpUserAgent; exports.interval = _chunkZ2ESFE5Zcjs.interval; exports.joinSignals = _chunkZ2ESFE5Zcjs.joinSignals; exports.jsonParseCompat = _chunkZ2ESFE5Zcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkZ2ESFE5Zcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkZ2ESFE5Zcjs.promiseWithResolvers; exports.setLongTimeout = _chunkZ2ESFE5Zcjs.setLongTimeout; exports.sleep = _chunkZ2ESFE5Zcjs.sleep; exports.stringifyError = _chunkZ2ESFE5Zcjs.stringifyError; exports.toUint8Array = _chunkZ2ESFE5Zcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunkTWNMQDZKcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkTWNMQDZKcjs.SinglePromiseQueue; exports.VERSION = _chunkTWNMQDZKcjs.VERSION; exports.arrayBuffersEqual = _chunkTWNMQDZKcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkTWNMQDZKcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkTWNMQDZKcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkTWNMQDZKcjs.combineUrlPath; exports.dbg = _chunkTWNMQDZKcjs.dbg; exports.detectRuntime = _chunkTWNMQDZKcjs.detectRuntime; exports.getEnvUniversal = _chunkTWNMQDZKcjs.getEnvUniversal; exports.httpUserAgent = _chunkTWNMQDZKcjs.httpUserAgent; exports.interval = _chunkTWNMQDZKcjs.interval; exports.joinSignals = _chunkTWNMQDZKcjs.joinSignals; exports.jsonParseCompat = _chunkTWNMQDZKcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkTWNMQDZKcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkTWNMQDZKcjs.promiseWithResolvers; exports.setLongTimeout = _chunkTWNMQDZKcjs.setLongTimeout; exports.sleep = _chunkTWNMQDZKcjs.sleep; exports.stringifyError = _chunkTWNMQDZKcjs.stringifyError; exports.toUint8Array = _chunkTWNMQDZKcjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -19,7 +19,7 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-X7XY6NCU.js";
+} from "./chunk-ET2F6BXK.js";
 import "./chunk-ZZ3WBRPD.js";
 export {
   EXTRA_ERROR_LOG,

package/dist/tsup/workflow/mod.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2;
 
-var _chunkU2A3Y7OKcjs = require('../chunk-U2A3Y7OK.cjs');
-require('../chunk-G6XA2OSW.cjs');
+var _chunkXEOPXHN2cjs = require('../chunk-XEOPXHN2.cjs');
+require('../chunk-K4DNAIWT.cjs');
 
 
 
@@ -12,7 +12,7 @@ var _chunkHNHLBM3Ycjs = require('../chunk-HNHLBM3Y.cjs');
 var _chunkMYWZCDMLcjs = require('../chunk-MYWZCDML.cjs');
 
 
-var _chunkZ2ESFE5Zcjs = require('../chunk-Z2ESFE5Z.cjs');
+var _chunkTWNMQDZKcjs = require('../chunk-TWNMQDZK.cjs');
 
 
 
@@ -716,7 +716,7 @@ function workflow(fn, options = {}) {
   function getWorkflowInspector(actorId) {
     let workflowInspector = workflowInspectors.get(actorId);
     if (!workflowInspector) {
-      workflowInspector = _chunkU2A3Y7OKcjs.createWorkflowInspectorAdapter.call(void 0, );
+      workflowInspector = _chunkXEOPXHN2cjs.createWorkflowInspectorAdapter.call(void 0, );
       workflowInspectors.set(actorId, workflowInspector);
     }
     return workflowInspector;
@@ -784,13 +784,13 @@ function workflow(fn, options = {}) {
       if (shouldRethrowWorkflowError(error)) {
         runCtx.log.error({
           msg: "workflow run failed",
-          error: _chunkZ2ESFE5Zcjs.stringifyError.call(void 0, error)
+          error: _chunkTWNMQDZKcjs.stringifyError.call(void 0, error)
         });
         throw error;
       }
       runCtx.log.warn({
         msg: "workflow failed and will sleep until woken",
-        error: _chunkZ2ESFE5Zcjs.stringifyError.call(void 0, error)
+        error: _chunkTWNMQDZKcjs.stringifyError.call(void 0, error)
       });
     } finally {
       runCtx.abortSignal.removeEventListener("abort", onAbort);

package/dist/tsup/workflow/mod.d.cts

@@ -1,9 +1,9 @@
 import { WorkflowErrorEvent } from '@rivetkit/workflow-engine';
 export { Loop, TryBlockCatchKind, TryBlockConfig, TryBlockFailure, TryBlockResult, TryStepCatchKind, TryStepConfig, TryStepFailure, TryStepResult, WorkflowError, WorkflowErrorEvent } from '@rivetkit/workflow-engine';
-import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BobvQpex.cjs';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-Caocy3Z9.cjs';
 import { A as AnyDatabaseProvider } from '../config-BxOimoGX.cjs';
-import { d as WorkflowContext } from '../context-YEBNJrws.cjs';
-export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-YEBNJrws.cjs';
+import { d as WorkflowContext } from '../context-D1_m5x1D.cjs';
+export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-D1_m5x1D.cjs';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/workflow/mod.d.ts

@@ -1,9 +1,9 @@
 import { WorkflowErrorEvent } from '@rivetkit/workflow-engine';
 export { Loop, TryBlockCatchKind, TryBlockConfig, TryBlockFailure, TryBlockResult, TryStepCatchKind, TryStepConfig, TryStepFailure, TryStepResult, WorkflowError, WorkflowErrorEvent } from '@rivetkit/workflow-engine';
-import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BRpVbJCD.js';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BKAMOHez.js';
 import { A as AnyDatabaseProvider } from '../config-BxOimoGX.js';
-import { d as WorkflowContext } from '../context-Cj-DFyiy.js';
-export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-Cj-DFyiy.js';
+import { d as WorkflowContext } from '../context-AfCExwbr.js';
+export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-AfCExwbr.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/workflow/mod.js

@@ -1,7 +1,7 @@
 import {
   createWorkflowInspectorAdapter
-} from "../chunk-E6IEX6AP.js";
-import "../chunk-XSPAARQ5.js";
+} from "../chunk-5ZS22TOP.js";
+import "../chunk-6ZPMYIZ6.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   RUN_FUNCTION_CONFIG_SYMBOL
@@ -12,7 +12,7 @@ import {
 } from "../chunk-JI6GZ2C2.js";
 import {
   stringifyError
-} from "../chunk-X7XY6NCU.js";
+} from "../chunk-ET2F6BXK.js";
 import {
   RivetError,
   isActorAbortedError

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rivetkit",
-	"version": "2.3.10",
+	"version": "2.3.11-rc.1",
 	"description": "Lightweight libraries for building stateful actors on edge platforms",
 	"license": "Apache-2.0",
 	"keywords": [
@@ -201,14 +201,14 @@
 		"@hono/zod-openapi": "^1.1.5",
 		"@rivet-dev/agent-os-core": "^0.1.1",
 		"@rivetkit/bare-ts": "^0.6.2",
-		"@rivetkit/engine-cli": "2.3.10",
-		"@rivetkit/engine-envoy-protocol": "2.3.10",
+		"@rivetkit/engine-cli": "2.3.11-rc.1",
+		"@rivetkit/engine-envoy-protocol": "2.3.11-rc.1",
 		"@rivetkit/on-change": "6.0.1",
-		"@rivetkit/rivetkit-napi": "2.3.10",
-		"@rivetkit/rivetkit-wasm": "2.3.10",
-		"@rivetkit/traces": "2.3.10",
-		"@rivetkit/virtual-websocket": "2.3.10",
-		"@rivetkit/workflow-engine": "2.3.10",
+		"@rivetkit/rivetkit-napi": "2.3.11-rc.1",
+		"@rivetkit/rivetkit-wasm": "2.3.11-rc.1",
+		"@rivetkit/traces": "2.3.11-rc.1",
+		"@rivetkit/virtual-websocket": "2.3.11-rc.1",
+		"@rivetkit/workflow-engine": "2.3.11-rc.1",
 		"cbor-x": "^1.6.0",
 		"drizzle-orm": "^0.44.2",
 		"hono": "^4.7.0",

package/src/client/raw-utils.ts

@@ -3,6 +3,7 @@ import {
 	PATH_WEBSOCKET_PREFIX,
 } from "@/common/actor-router-consts";
 import { deconstructError } from "@/common/utils";
+import { isRequestLike, isUrlLike } from "@/common/fetch-like";
 import type {
 	EngineControlClient,
 	GatewayRequestOptions,
@@ -28,9 +29,9 @@ export async function rawHttpFetch(
 
 	if (typeof input === "string") {
 		path = input;
-	} else if (input instanceof URL) {
+	} else if (isUrlLike(input)) {
 		path = input.pathname + input.search;
-	} else if (input instanceof Request) {
+	} else if (isRequestLike(input)) {
 		// Extract path from Request URL
 		const url = new URL(input.url);
 		path = url.pathname + url.search;

package/src/common/encoding.ts

@@ -484,7 +484,10 @@ export function jsonStringifyCompat(
 				return [JSON_COMPAT_BIGINT, value.toString()];
 			}
 			if (value instanceof ArrayBuffer) {
-				return [JSON_COMPAT_ARRAY_BUFFER, base64EncodeArrayBuffer(value)];
+				return [
+					JSON_COMPAT_ARRAY_BUFFER,
+					base64EncodeArrayBuffer(value),
+				];
 			}
 			if (value instanceof Uint8Array) {
 				return [JSON_COMPAT_UINT8_ARRAY, base64EncodeUint8Array(value)];

package/src/common/fetch-like.ts

@@ -0,0 +1,49 @@
+type HeadersLike = {
+	entries(): IterableIterator<[string, string]>;
+};
+
+export type RequestLike = Request & {
+	readonly headers: HeadersLike & Request["headers"];
+};
+
+export type ResponseLike = Response & {
+	readonly headers: HeadersLike & Response["headers"];
+};
+
+export function isUrlLike(value: unknown): value is URL {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		typeof (value as URL).href === "string" &&
+		typeof (value as URL).pathname === "string" &&
+		typeof (value as URL).search === "string"
+	);
+}
+
+export function isRequestLike(value: unknown): value is RequestLike {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		typeof (value as Request).url === "string" &&
+		typeof (value as Request).method === "string" &&
+		isHeadersLike((value as Request).headers)
+	);
+}
+
+export function isResponseLike(value: unknown): value is ResponseLike {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		typeof (value as Response).status === "number" &&
+		isHeadersLike((value as Response).headers) &&
+		typeof (value as Response).arrayBuffer === "function"
+	);
+}
+
+function isHeadersLike(value: unknown): value is HeadersLike {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		typeof (value as HeadersLike).entries === "function"
+	);
+}

package/src/registry/index.ts

@@ -1,4 +1,5 @@
 import { isLocalEngineEndpoint } from "@/common/engine";
+import { isResponseLike } from "@/common/fetch-like";
 import { configureBaseLogger } from "@/common/log";
 import { configureServerlessPool } from "@/serverless/configure";
 import { VERSION } from "@/utils";
@@ -15,7 +16,10 @@ import {
 } from "./config";
 import { logger } from "./log";
 import { buildConfiguredRegistry } from "./native";
-import type { RuntimeServerlessResponseHead } from "./runtime";
+import type {
+	RuntimeApplicationFetch,
+	RuntimeServerlessResponseHead,
+} from "./runtime";
 
 type ShutdownSignal = "SIGINT" | "SIGTERM";
 
@@ -37,6 +41,35 @@ function finishShutdownSignal(signal: ShutdownSignal): void {
 	process.kill(process.pid, signal);
 }
 
+function createApplicationFetch(
+	application: RegistryApplication,
+): RuntimeApplicationFetch {
+	return async (request) => {
+		const method = request.method.toUpperCase();
+		const body =
+			method === "GET" || method === "HEAD" || request.body.length === 0
+				? undefined
+				: Uint8Array.from(request.body).buffer;
+		const response = await application.fetch(
+			new Request(request.url, {
+				method,
+				headers: request.headers,
+				body,
+			}),
+		);
+		if (!isResponseLike(response)) {
+			throw new TypeError(
+				"registry.listen() application fetch must return a Response",
+			);
+		}
+		return {
+			status: response.status,
+			headers: Object.fromEntries(response.headers.entries()),
+			body: new Uint8Array(await response.arrayBuffer()),
+		};
+	};
+}
+
 export type FetchHandler = (
 	request: Request,
 	...args: any
@@ -46,6 +79,17 @@ export interface ServerlessHandler {
 	fetch: FetchHandler;
 }
 
+export interface RegistryApplication {
+	fetch: FetchHandler;
+}
+
+export interface RegistryListenOptions {
+	port?: number;
+	host?: string;
+	publicDir?: string;
+	application?: RegistryApplication;
+}
+
 export interface RegistryRoutes {
 	health(): Promise<Response>;
 	metadata(): Promise<Response>;
@@ -79,6 +123,7 @@ export class Registry<A extends RegistryActors> {
 	#runtimeReadyPromise?: Promise<void>;
 	#runtimeServeConfiguredPromise?: ReturnType<typeof buildConfiguredRegistry>;
 	#runtimeServerlessPromise?: ReturnType<typeof buildConfiguredRegistry>;
+	#applicationListenerPromise?: Promise<void>;
 	#configureServerlessPoolPromise?: Promise<void>;
 	#welcomePrinted = false;
 	#shutdownInstalled = false;
@@ -348,19 +393,68 @@ export class Registry<A extends RegistryActors> {
 	 * @param opts.host      Address to bind. Defaults to `0.0.0.0`.
 	 * @param opts.publicDir If set, serves static files from this directory
 	 *                       as a fallback below the framework routes.
+	 * @param opts.application If set, handles requests that do not match a
+	 *                         framework route.
 	 *
 	 * @example
 	 * ```ts
 	 * await registry.listen();
-	 * await registry.listen({ port: 8080, publicDir: "./public" });
+	 * await registry.listen({ application: app });
 	 * ```
 	 */
-	public async listen(
-		opts: { port?: number; host?: string; publicDir?: string } = {},
-	): Promise<void> {
+	public async listen(opts: RegistryListenOptions = {}): Promise<void> {
 		const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3000;
 		const publicDir = opts.publicDir ?? getRivetkitPublicDir();
 		const config = this.parseConfig();
+		const application = opts.application
+			? createApplicationFetch(opts.application)
+			: undefined;
+
+		if (application && getRivetkitRuntimeMode() !== "serverless") {
+			if (config.runtime === "wasm") {
+				throw new Error(
+					"registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly",
+				);
+			}
+			this.#installSignalHandlers(config);
+			this.#printWelcome(config, "serverful", {
+				port,
+				host: opts.host,
+				publicDir,
+			});
+			this.#startEnvoy(config, true);
+			const readyPromise = this.startAndWait();
+			const configuredRegistryPromise =
+				this.#runtimeServeConfiguredPromise;
+			if (!configuredRegistryPromise) {
+				throw new Error("registry envoy startup did not initialize");
+			}
+			const { runtime, registry, serveConfig } =
+				await configuredRegistryPromise;
+			const listenerPromise = runtime.serveApplicationListener(
+				registry,
+				{
+					port,
+					host: opts.host,
+					publicDir,
+					application,
+				},
+				serveConfig,
+			);
+			this.#applicationListenerPromise = listenerPromise;
+			const serveLifecyclePromise = this.#runtimeServeLifecyclePromise;
+			if (!serveLifecyclePromise) {
+				throw new Error(
+					"registry envoy serve lifecycle did not initialize",
+				);
+			}
+			await Promise.all([
+				readyPromise,
+				listenerPromise,
+				serveLifecyclePromise,
+			]);
+			return;
+		}
 
 		// Cache on both promise fields so the shutdown drain sees Mode A and B.
 		const configuredRegistryPromise = buildConfiguredRegistry(config);
@@ -381,7 +475,12 @@ export class Registry<A extends RegistryActors> {
 			await configuredRegistryPromise;
 		await runtime.serveListener(
 			registry,
-			{ port, host: opts.host, publicDir },
+			{
+				port,
+				host: opts.host,
+				publicDir,
+				application,
+			},
 			serveConfig,
 		);
 	}
@@ -499,15 +598,14 @@ export class Registry<A extends RegistryActors> {
 					await runtime.serveRegistry(registry, serveConfig);
 				},
 			);
-			this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch(
-				(error) => {
+			this.#runtimeServePromise =
+				this.#runtimeServeLifecyclePromise.catch((error) => {
 					// Always-attached catch so the stored promise never leaves a
 					// rejection unhandled. Downstream awaits (e.g. #runShutdown's
 					// Promise.race) attach their own catches and still observe
 					// resolution via the race.
 					logger().warn({ error }, "runtime registry serve errored");
-				},
-			);
+				});
 			// Install signal handlers once an envoy lifecycle has begun. Only
 			// Mode A ever reaches here. Mode B (handler(request)) intentionally
 			// does not install handlers because it runs on Workers/Vercel/Deno
@@ -653,6 +751,9 @@ export class Registry<A extends RegistryActors> {
 				// already logged any serve-side error.
 				await runtimeServePromise.catch(() => undefined);
 			}
+			if (this.#applicationListenerPromise !== undefined) {
+				await this.#applicationListenerPromise.catch(() => undefined);
+			}
 		};
 		await Promise.race([
 			drain(),
@@ -712,7 +813,9 @@ export class Registry<A extends RegistryActors> {
 	public startAndWait(): Promise<void> {
 		if (this.#shutdownInFlight !== null) {
 			return Promise.reject(
-				new Error("registry.startAndWait() cannot run after shutdown has begun"),
+				new Error(
+					"registry.startAndWait() cannot run after shutdown has begun",
+				),
 			);
 		}
 		if (this.#runtimeReadyPromise) return this.#runtimeReadyPromise;
@@ -755,7 +858,9 @@ export class Registry<A extends RegistryActors> {
 		const readinessPromise = (async () => {
 			const { runtime, registry } = await configuredRegistryPromise;
 			const stoppedBeforeReady = serveLifecyclePromise.then(() => {
-				throw new Error("RivetKit registry stopped before becoming ready");
+				throw new Error(
+					"RivetKit registry stopped before becoming ready",
+				);
 			});
 			await Promise.race([
 				runtime.waitRegistryReady(registry),

package/src/registry/napi-runtime.ts

@@ -14,6 +14,8 @@ import type {
 	CoreRuntime,
 	RegistryHandle,
 	RuntimeActorConfig,
+	RuntimeApplicationFetch,
+	RuntimeApplicationListenerConfig,
 	RuntimeBytes,
 	RuntimeCronFire,
 	RuntimeCronJobInfo,
@@ -135,6 +137,31 @@ 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;
+		},
+	) => {
+		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),
+		});
+		return {
+			...response,
+			body: toNapiBuffer(response.body),
+		};
+	};
+}
+
 function toNapiHttpRequest(
 	request?: RuntimeHttpRequest | undefined | null,
 ): Parameters<NativeActorContext["connectConn"]>[1] {
@@ -296,6 +323,9 @@ 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,
@@ -303,6 +333,23 @@ 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,6 +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, type ResponseLike } from "@/common/fetch-like";
 import { decodeWorkflowHistoryTransport } from "@/common/inspector-transport";
 import { deconstructError, stringifyError } from "@/common/utils";
 import type {
@@ -1183,7 +1184,7 @@ function buildRequest(init: {
 }
 
 async function toRuntimeHttpResponse(
-	response: Response,
+	response: ResponseLike,
 ): Promise<RuntimeHttpResponse> {
 	const headers = Object.fromEntries(response.headers.entries());
 	const body = new Uint8Array(await response.arrayBuffer());
@@ -4717,7 +4718,7 @@ export function buildNativeFactory(
 							requestCtx,
 							jsRequest,
 						);
-						if (!(response instanceof Response)) {
+						if (!isResponseLike(response)) {
 							throw new Error(
 								"onRequest handler must return a Response",
 							);

package/src/registry/runtime.ts

@@ -346,6 +346,7 @@ export interface RuntimeListenerConfig {
 	port: number;
 	host?: string;
 	publicDir?: string;
+	application?: RuntimeApplicationFetch;
 }
 
 export interface RuntimeServerlessRequest {
@@ -355,6 +356,21 @@ export interface RuntimeServerlessRequest {
 	body: RuntimeBytes;
 }
 
+export interface RuntimeApplicationResponse {
+	status: number;
+	headers: Record<string, string>;
+	body: RuntimeBytes;
+}
+
+export type RuntimeApplicationFetch = (
+	request: RuntimeServerlessRequest,
+) => Promise<RuntimeApplicationResponse>;
+
+export interface RuntimeApplicationListenerConfig
+	extends RuntimeListenerConfig {
+	application: RuntimeApplicationFetch;
+}
+
 export interface RuntimeServerlessResponseHead {
 	status: number;
 	headers: Record<string, string>;
@@ -429,6 +445,11 @@ export interface CoreRuntime {
 		listener: RuntimeListenerConfig,
 		config: RuntimeServeConfig,
 	): Promise<void>;
+	serveApplicationListener(
+		registry: RegistryHandle,
+		listener: RuntimeApplicationListenerConfig,
+		config: RuntimeServeConfig,
+	): Promise<void>;
 	registryHealth?(
 		registry: RegistryHandle,
 	): Promise<RuntimeRegistryRouteResponse>;