rivetkit 2.3.10 → 2.3.11-rc.2

package/dist/tsup/mod.d.cts

@@ -1,12 +1,12 @@
-import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-BobvQpex.cjs';
-export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryConfig, aF as RegistryConfigInput, aG as RegistryConfigSchema, aH as RegistryDeps, aI as RegistryRoutes, aJ as RunConfig, aK as RunConfigSchema, aL as RunInspectorConfig, aM as RuntimeKind, aN as RuntimeKindSchema, aO as ScheduledEventInfo, aP as ScheduledFireInfo, aQ as ServerlessHandler, aR as SqliteBackend, aS as SqliteBackendSchema, aT as SqliteConfig, aU as SqliteConfigSchema, aV as TestConfig, aW as TestConfigSchema, aX as Type, aY as WasmRuntimeBindings, aZ as WasmRuntimeConfig, a_ as WasmRuntimeConfigSchema, a$ as WasmRuntimeInitInput, b0 as WorkflowInspectorConfig, b1 as actor, b2 as buildActorNames, b3 as createClientWithDriver, b4 as disposeRunInspector, b5 as event, b6 as getRunFunction, b7 as getRunInspectorConfig, b8 as getRunMetadata, b9 as isStaticActorDefinition, ba as isStaticActorInstance, bb as lookupInRegistry, bc as queue, bd as setup, be as test } from './config-BobvQpex.cjs';
+import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-Caocy3Z9.cjs';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryApplication, aF as RegistryConfig, aG as RegistryConfigInput, aH as RegistryConfigSchema, aI as RegistryDeps, aJ as RegistryListenOptions, aK as RegistryRoutes, aL as RunConfig, aM as RunConfigSchema, aN as RunInspectorConfig, aO as RuntimeKind, aP as RuntimeKindSchema, aQ as ScheduledEventInfo, aR as ScheduledFireInfo, aS as ServerlessHandler, aT as SqliteBackend, aU as SqliteBackendSchema, aV as SqliteConfig, aW as SqliteConfigSchema, aX as TestConfig, aY as TestConfigSchema, aZ as Type, a_ as WasmRuntimeBindings, a$ as WasmRuntimeConfig, b0 as WasmRuntimeConfigSchema, b1 as WasmRuntimeInitInput, b2 as WorkflowInspectorConfig, b3 as actor, b4 as buildActorNames, b5 as createClientWithDriver, b6 as disposeRunInspector, b7 as event, b8 as getRunFunction, b9 as getRunInspectorConfig, ba as getRunMetadata, bb as isStaticActorDefinition, bc as isStaticActorInstance, bd as lookupInRegistry, be as queue, bf as setup, bg as test } from './config-Caocy3Z9.cjs';
 export { E as Encoding, t as toUint8Array } from './utils-DQDCphrl.cjs';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
 import { A as AnyDatabaseProvider } from './config-BxOimoGX.cjs';
 export { R as ActorError, R as RivetError, a as RivetErrorLike, b as RivetErrorOptions, U as UserError, c as UserErrorOptions, n as noopNext } from './utils-CqDnC_PS.cjs';
 import { WSContext } from 'hono/ws';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-YEBNJrws.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-D1_m5x1D.cjs';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.d.ts

@@ -1,12 +1,12 @@
-import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-BRpVbJCD.js';
-export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryConfig, aF as RegistryConfigInput, aG as RegistryConfigSchema, aH as RegistryDeps, aI as RegistryRoutes, aJ as RunConfig, aK as RunConfigSchema, aL as RunInspectorConfig, aM as RuntimeKind, aN as RuntimeKindSchema, aO as ScheduledEventInfo, aP as ScheduledFireInfo, aQ as ServerlessHandler, aR as SqliteBackend, aS as SqliteBackendSchema, aT as SqliteConfig, aU as SqliteConfigSchema, aV as TestConfig, aW as TestConfigSchema, aX as Type, aY as WasmRuntimeBindings, aZ as WasmRuntimeConfig, a_ as WasmRuntimeConfigSchema, a$ as WasmRuntimeInitInput, b0 as WorkflowInspectorConfig, b1 as actor, b2 as buildActorNames, b3 as createClientWithDriver, b4 as disposeRunInspector, b5 as event, b6 as getRunFunction, b7 as getRunInspectorConfig, b8 as getRunMetadata, b9 as isStaticActorDefinition, ba as isStaticActorInstance, bb as lookupInRegistry, bc as queue, bd as setup, be as test } from './config-BRpVbJCD.js';
+import { A as AnyActorDefinition, B as BaseActorDefinition, E as EventSchemaConfig, Q as QueueSchemaConfig, a as ActionContext, b as BeforeActionResponseContext, c as BeforeConnectContext, C as ConnectContext, d as CreateConnStateContext, e as CreateContext, f as CreateVarsContext, D as DestroyContext, g as DisconnectContext, M as MigrateContext, R as RequestContext, h as RunContext, S as SleepContext, i as StateChangeContext, W as WakeContext, j as WebSocketContext } from './config-BKAMOHez.js';
+export { k as ACTOR_CONTEXT_INTERNAL_SYMBOL, l as ActionInputSchemas, m as Actions, n as ActorConfig, o as ActorConfigInput, p as ActorConfigSchema, q as ActorContext, r as ActorContextOf, s as ActorCron, t as ActorCronEveryOptions, u as ActorCronSetOptions, v as ActorDefinition, w as ActorInspectorConfig, x as ActorInspectorConfigSchema, y as ActorKey, z as ActorKv, F as ActorLogger, G as ActorOptions, H as ActorOptionsInput, I as ActorOptionsSchema, J as ActorQuery, K as ActorQueue, L as ActorSchedule, N as ActorTypes, O as ActorsSchema, P as AnyActorInstance, T as AnyClient, U as AnyConn, V as AnyStaticActorDefinition, X as AnyStaticActorInstance, Y as AuthIntent, Z as BUILTIN_INSPECTOR_TAB_IDS, _ as BaseActorInstance, $ as BuiltinInspectorTabIdSchema, a0 as CONN_DRIVER_SYMBOL, a1 as CONN_STATE_MANAGER_SYMBOL, a2 as Client, a3 as Conn, a4 as CronFire, a5 as CronJobInfo, a6 as CustomInspectorTabEntrySchema, a7 as DEFAULT_SLEEP_GRACE_PERIOD, a8 as DocActorConfigSchema, a9 as DocActorOptionsSchema, aa as DocConfigurePoolSchema, ab as DocEnvoyConfigSchema, ac as DocRegistryConfigSchema, ad as DocServerlessConfigSchema, ae as DocSqliteConfigSchema, af as FetchHandler, ag as GlobalActorOptions, ah as GlobalActorOptionsInput, ai as GlobalActorOptionsSchema, aj as HideInspectorTabEntrySchema, ak as InspectorTabEntrySchema, al as InspectorUnsubscribe, am as InstanceActorOptions, an as InstanceActorOptionsInput, ao as InstanceActorOptionsSchema, ap as QueueEnqueueAndWaitOptions, aq as QueueFilterName, ar as QueueIterOptions, as as QueueMessageOf, at as QueueName, au as QueueNextBatchOptions, av as QueueNextOptions, aw as QueueResultMessageForName, ax as QueueTryNextBatchOptions, ay as QueueTryNextOptions, az as QueueWaitOptions, aA as RAW_STATE_SYMBOL, aB as RUN_FUNCTION_CONFIG_SYMBOL, aC as Registry, aD as RegistryActors, aE as RegistryApplication, aF as RegistryConfig, aG as RegistryConfigInput, aH as RegistryConfigSchema, aI as RegistryDeps, aJ as RegistryListenOptions, aK as RegistryRoutes, aL as RunConfig, aM as RunConfigSchema, aN as RunInspectorConfig, aO as RuntimeKind, aP as RuntimeKindSchema, aQ as ScheduledEventInfo, aR as ScheduledFireInfo, aS as ServerlessHandler, aT as SqliteBackend, aU as SqliteBackendSchema, aV as SqliteConfig, aW as SqliteConfigSchema, aX as TestConfig, aY as TestConfigSchema, aZ as Type, a_ as WasmRuntimeBindings, a$ as WasmRuntimeConfig, b0 as WasmRuntimeConfigSchema, b1 as WasmRuntimeInitInput, b2 as WorkflowInspectorConfig, b3 as actor, b4 as buildActorNames, b5 as createClientWithDriver, b6 as disposeRunInspector, b7 as event, b8 as getRunFunction, b9 as getRunInspectorConfig, ba as getRunMetadata, bb as isStaticActorDefinition, bc as isStaticActorInstance, bd as lookupInRegistry, be as queue, bf as setup, bg as test } from './config-BKAMOHez.js';
 export { E as Encoding, t as toUint8Array } from './utils-CV0akuDD.js';
 import { UniversalWebSocket } from '@rivetkit/virtual-websocket';
 export { RivetCloseEvent, RivetEvent, RivetMessageEvent, UniversalWebSocket } from '@rivetkit/virtual-websocket';
 import { A as AnyDatabaseProvider } from './config-BxOimoGX.js';
 export { R as ActorError, R as RivetError, a as RivetErrorLike, b as RivetErrorOptions, U as UserError, c as UserErrorOptions, n as noopNext } from './utils-CqDnC_PS.js';
 import { WSContext } from 'hono/ws';
-export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-Cj-DFyiy.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from './context-AfCExwbr.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/mod.js

@@ -1,6 +1,6 @@
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-XSPAARQ5.js";
+} from "./chunk-NLAW2MIM.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
@@ -20,15 +20,16 @@ import {
   convertRegistryConfigToClientConfig,
   createClientWithDriver,
   getDatacenters,
+  isResponseLike,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-DPM73GAL.js";
+} from "./chunk-XR2KF2ZA.js";
 import {
   makePrefixedKey,
   removePrefixFromKey
 } from "./chunk-JI6GZ2C2.js";
 import "./chunk-7AFZMFPQ.js";
-import "./chunk-Q5H37KNQ.js";
+import "./chunk-RVJQMOAA.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -61,7 +62,7 @@ import {
   parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-X7XY6NCU.js";
+} from "./chunk-XWIXH7JF.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -1433,6 +1434,22 @@ function toNapiSqlBatchStatement(statement) {
 function toNapiBuffer(value) {
   return Buffer.from(value);
 }
+function toNapiApplication(application) {
+  return async (error, request) => {
+    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) {
   if (!request) {
     return request;
@@ -1539,12 +1556,25 @@ var NapiCoreRuntime = class {
     );
   }
   async serveListener(registry, listener, config) {
+    const application = listener.application ? toNapiApplication(listener.application) : void 0;
     await asNativeRegistry(registry).serveListener(
       {
         port: listener.port,
         host: listener.host,
         publicDir: listener.publicDir
       },
+      config,
+      application
+    );
+  }
+  async serveApplicationListener(registry, listener, config) {
+    await asNativeRegistry(registry).serveApplicationListener(
+      {
+        port: listener.port,
+        host: listener.host,
+        publicDir: listener.publicDir
+      },
+      toNapiApplication(listener.application),
       config
     );
   }
@@ -2204,6 +2234,11 @@ var WasmCoreRuntime = class {
       "registry.listen() is not supported on the wasm runtime; use registry.serve() and mount the handler in your platform's HTTP server instead"
     );
   }
+  async serveApplicationListener(_registry, _listener, _config) {
+    throw new Error(
+      "registry.listen() is not supported on the wasm runtime; use an application-owned HTTP server instead"
+    );
+  }
   createActorFactory(callbacks, config) {
     return callWasmSync(
       () => asActorFactoryHandle2(
@@ -6046,7 +6081,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
               requestCtx,
               jsRequest
             );
-            if (!(response instanceof Response)) {
+            if (!isResponseLike(response)) {
               throw new Error(
                 "onRequest handler must return a Response"
               );
@@ -6318,6 +6353,29 @@ function finishShutdownSignal(signal) {
   }
   process.kill(process.pid, signal);
 }
+function createApplicationFetch(application) {
+  return async (request) => {
+    const method2 = request.method.toUpperCase();
+    const body = method2 === "GET" || method2 === "HEAD" || request.body.length === 0 ? void 0 : Uint8Array.from(request.body).buffer;
+    const response = await application.fetch(
+      new Request(request.url, {
+        method: method2,
+        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())
+    };
+  };
+}
 var Registry = class {
   #config;
   #buildConfiguredRegistry;
@@ -6333,6 +6391,7 @@ var Registry = class {
   #runtimeReadyPromise;
   #runtimeServeConfiguredPromise;
   #runtimeServerlessPromise;
+  #applicationListenerPromise;
   #configureServerlessPoolPromise;
   #welcomePrinted = false;
   #shutdownInstalled = false;
@@ -6558,17 +6617,63 @@ var Registry = class {
    * @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 });
    * ```
    */
   async listen(opts = {}) {
     const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3e3;
     const publicDir = opts.publicDir ?? getRivetkitPublicDir();
     const config = this.parseConfig();
+    const application = opts.application ? createApplicationFetch(opts.application) : void 0;
+    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 configuredRegistryPromise2 = this.#runtimeServeConfiguredPromise;
+      if (!configuredRegistryPromise2) {
+        throw new Error("registry envoy startup did not initialize");
+      }
+      const { runtime: runtime2, registry: registry2, serveConfig: serveConfig2 } = await configuredRegistryPromise2;
+      const listenerPromise = runtime2.serveApplicationListener(
+        registry2,
+        {
+          port,
+          host: opts.host,
+          publicDir,
+          application
+        },
+        serveConfig2
+      );
+      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;
+    }
     const configuredRegistryPromise = buildConfiguredRegistry(config);
     this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
     this.#runtimeServerlessPromise = configuredRegistryPromise;
@@ -6582,7 +6687,12 @@ var Registry = class {
     const { runtime, registry, serveConfig } = await configuredRegistryPromise;
     await runtime.serveListener(
       registry,
-      { port, host: opts.host, publicDir },
+      {
+        port,
+        host: opts.host,
+        publicDir,
+        application
+      },
       serveConfig
     );
   }
@@ -6682,11 +6792,9 @@ var Registry = class {
           await runtime.serveRegistry(registry, serveConfig);
         }
       );
-      this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch(
-        (error) => {
-          logger2().warn({ error }, "runtime registry serve errored");
-        }
-      );
+      this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch((error) => {
+        logger2().warn({ error }, "runtime registry serve errored");
+      });
       this.#installSignalHandlers(config);
     }
     if (printWelcome) {
@@ -6793,6 +6901,9 @@ var Registry = class {
       if (runtimeServePromise !== void 0) {
         await runtimeServePromise.catch(() => void 0);
       }
+      if (this.#applicationListenerPromise !== void 0) {
+        await this.#applicationListenerPromise.catch(() => void 0);
+      }
     };
     await Promise.race([
       drain(),
@@ -6843,7 +6954,9 @@ var Registry = class {
   startAndWait() {
     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;
@@ -6884,7 +6997,9 @@ var Registry = class {
     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),