@rivetkit/supabase 2.3.9 → 2.3.11-rc.1

package/dist/mod.mjs

@@ -471,7 +471,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-UBYPRYJR.js
+// ../rivetkit/dist/tsup/chunk-ET2F6BXK.js
 import {
   pino,
   stdTimeFunctions
@@ -13147,7 +13147,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-UBYPRYJR.js
+// ../rivetkit/dist/tsup/chunk-ET2F6BXK.js
 var import_invariant = __toESM(require_invariant(), 1);
 import * as cbor from "cbor-x";
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13312,7 +13312,7 @@ function noopNext() {
 }
 var package_default = {
   name: "rivetkit",
-  version: "2.3.9",
+  version: "2.3.11-rc.1",
   description: "Lightweight libraries for building stateful actors on edge platforms",
   license: "Apache-2.0",
   keywords: [
@@ -14605,7 +14605,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-CQ23UFQ4.js
+// ../rivetkit/dist/tsup/chunk-6ZPMYIZ6.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -15478,7 +15478,7 @@ var AsyncMutex = class {
   }
 };
 
-// ../rivetkit/dist/tsup/chunk-X25YYVFL.js
+// ../rivetkit/dist/tsup/chunk-5FVMFSBH.js
 function logger() {
   return getLogger("actor-client");
 }
@@ -15516,7 +15516,7 @@ async function importWebSocket() {
   return webSocketPromise;
 }
 
-// ../rivetkit/dist/tsup/chunk-MQDQ3A72.js
+// ../rivetkit/dist/tsup/chunk-MMPE77KO.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15694,7 +15694,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-MQDQ3A72.js
+// ../rivetkit/dist/tsup/chunk-MMPE77KO.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -15703,7 +15703,6 @@ var PATH_WEBSOCKET_PREFIX = "/websocket/";
 var HEADER_ACTOR_QUERY = "x-rivet-query";
 var HEADER_ENCODING = "x-rivet-encoding";
 var HEADER_CONN_PARAMS = "x-rivet-conn-params";
-var HEADER_ORIGINAL_REQUEST_URL = "x-rivet-internal-original-request-url";
 var HEADER_ACTOR_ID = "x-rivet-actor";
 var HEADER_ACTOR_GENERATION = "x-rivet-actor-generation";
 var HEADER_ACTOR_KEY = "x-rivet-actor-key";
@@ -17756,18 +17755,6 @@ async function checkForSchedulingError(group, code, actorId, query, driver) {
   }
   return null;
 }
-function isUrlLike(value) {
-  return typeof value === "object" && value !== null && typeof value.href === "string" && typeof value.pathname === "string" && typeof value.search === "string";
-}
-function isRequestLike(value) {
-  return typeof value === "object" && value !== null && typeof value.url === "string" && typeof value.method === "string" && isHeadersLike(value.headers);
-}
-function isResponseLike(value) {
-  return typeof value === "object" && value !== null && typeof value.status === "number" && isHeadersLike(value.headers) && typeof value.arrayBuffer === "function";
-}
-function isHeadersLike(value) {
-  return typeof value === "object" && value !== null && typeof value.entries === "function";
-}
 function* walkErrorChain(error46, maxDepth = 8) {
   let current = error46;
   let depth = 0;
@@ -18191,19 +18178,28 @@ function createQueueSender(senderOptions) {
     send
   };
 }
+function isUrlLike(value) {
+  return typeof value === "object" && value !== null && typeof value.href === "string" && typeof value.pathname === "string" && typeof value.search === "string";
+}
+function isRequestLike(value) {
+  return typeof value === "object" && value !== null && typeof value.url === "string" && typeof value.method === "string" && isHeadersLike(value.headers);
+}
+function isResponseLike(value) {
+  return typeof value === "object" && value !== null && typeof value.status === "number" && isHeadersLike(value.headers) && typeof value.arrayBuffer === "function";
+}
+function isHeadersLike(value) {
+  return typeof value === "object" && value !== null && typeof value.entries === "function";
+}
 async function rawHttpFetch(driver, target, params, input, init, options = {}) {
   let path2;
-  let originalUrl;
   let mergedInit = init || {};
   if (typeof input === "string") {
     path2 = input;
   } else if (isUrlLike(input)) {
     path2 = input.pathname + input.search;
-    originalUrl = input.toString();
   } else if (isRequestLike(input)) {
     const url2 = new URL(input.url);
     path2 = url2.pathname + url2.search;
-    originalUrl = url2.toString();
     const requestHeaders = new Headers(input.headers);
     const initHeaders = new Headers((init == null ? void 0 : init.headers) || {});
     const mergedHeaders = new Headers(requestHeaders);
@@ -18245,10 +18241,6 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     const normalizedPath = path2.startsWith("/") ? path2.slice(1) : path2;
     const url2 = new URL(`http://actor/request/${normalizedPath}`);
     const proxyRequestHeaders = new Headers(mergedInit.headers);
-    proxyRequestHeaders.delete(HEADER_ORIGINAL_REQUEST_URL);
-    if (originalUrl) {
-      proxyRequestHeaders.set(HEADER_ORIGINAL_REQUEST_URL, originalUrl);
-    }
     if (params) {
       proxyRequestHeaders.set(HEADER_CONN_PARAMS, JSON.stringify(params));
     }
@@ -18717,7 +18709,6 @@ var ActorHandleRaw = class {
   async #fetchWithResolvedActor(input, init) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
     let useQueryTarget = false;
-    const retryableRequest = isRequestLike(input) ? input.clone() : void 0;
     const { skipReadyWait, ...requestInit } = init ?? {};
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
@@ -18737,7 +18728,7 @@ var ActorHandleRaw = class {
           this.#driver,
           target,
           this.#params,
-          retryableRequest ? retryableRequest.clone() : input,
+          input,
           requestInit,
           gatewayOptions
         );
@@ -20470,19 +20461,23 @@ async function sendHttpRequestToGateway(runConfig, gatewayUrl, actorRequest, opt
     if (actorRequest.bodyUsed) {
       throw new Error("Request body has already been consumed");
     }
-    if (actorRequest.body) {
-      bodyToSend = actorRequest.body;
+    const reqBody = await actorRequest.arrayBuffer();
+    if (reqBody.byteLength !== 0) {
+      bodyToSend = reqBody;
       guardHeaders.delete("transfer-encoding");
       guardHeaders.delete("content-length");
     }
   }
-  return fetch(gatewayUrl, {
+  const guardRequest = new Request(gatewayUrl, {
     method: actorRequest.method,
     headers: guardHeaders,
     body: bodyToSend,
-    signal: actorRequest.signal,
-    ...bodyToSend ? { duplex: "half" } : {}
+    signal: actorRequest.signal
   });
+  return mutableResponse(await fetch(guardRequest));
+}
+function mutableResponse(fetchRes) {
+  return new Response(fetchRes.body, fetchRes);
 }
 function buildGuardHeaders(runConfig, actorRequest, options) {
   const headers = new Headers();
@@ -23962,30 +23957,16 @@ function toNapiApplication(application) {
     if (!request) {
       throw new Error("application fetch callback received no request");
     }
-    const response = await application(
-      {
-        ...request,
-        body: new Uint8Array(request.body),
-        cancelToken: request.cancelToken
-      },
-      request.responseBodyStream ? fromNapiHttpResponseBodyStream(
-        request.responseBodyStream
-      ) : void 0
-    );
+    const response = await application({
+      ...request,
+      body: new Uint8Array(request.body)
+    });
     return {
       ...response,
-      body: response.body === void 0 ? void 0 : toNapiBuffer(response.body)
+      body: toNapiBuffer(response.body)
     };
   };
 }
-function fromNapiHttpResponseBodyStream(stream) {
-  return {
-    cancelled: () => stream.cancelled(),
-    write: (chunk) => stream.write(Buffer.from(chunk)),
-    end: () => stream.end(),
-    error: (message) => stream.error(message)
-  };
-}
 function toNapiHttpRequest(request) {
   if (!request) {
     return request;
@@ -24497,135 +24478,6 @@ async function loadNapiRuntime() {
     runtime: new NapiCoreRuntime(bindings)
   };
 }
-var HTTP_BODY_CHUNK_SIZE = 64 * 1024;
-function runtimeBytesToArrayBuffer(value) {
-  return value.buffer.slice(
-    value.byteOffset,
-    value.byteOffset + value.byteLength
-  );
-}
-function buildNativeHttpRequest(init) {
-  var _a2;
-  const headers = new Headers(init.headers);
-  const originalUrl = headers.get(HEADER_ORIGINAL_REQUEST_URL);
-  headers.delete(HEADER_ORIGINAL_REQUEST_URL);
-  const url2 = originalUrl ?? (init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString());
-  const method2 = init.method.toUpperCase();
-  const bodyForbidden = method2 === "GET" || method2 === "HEAD";
-  const body = bodyForbidden ? void 0 : init.bodyStream ? new ReadableStream({
-    async pull(controller) {
-      var _a22, _b;
-      try {
-        if (init.body && init.body.length > 0) {
-          controller.enqueue(new Uint8Array(init.body));
-          init.body = void 0;
-          return;
-        }
-        const chunk = await ((_a22 = init.bodyStream) == null ? void 0 : _a22.read());
-        if (!chunk) {
-          controller.close();
-        } else {
-          controller.enqueue(new Uint8Array(chunk));
-        }
-      } catch (error46) {
-        (_b = init.abortController) == null ? void 0 : _b.abort(error46);
-        controller.error(error46);
-      }
-    },
-    async cancel() {
-      var _a22;
-      await ((_a22 = init.bodyStream) == null ? void 0 : _a22.cancel());
-    }
-  }) : init.body && init.body.length > 0 ? runtimeBytesToArrayBuffer(init.body) : void 0;
-  const streamInit = init.bodyStream && !bodyForbidden ? { duplex: "half" } : {};
-  return new Request(url2, {
-    method: method2,
-    headers,
-    body,
-    signal: ((_a2 = init.abortController) == null ? void 0 : _a2.signal) ?? init.signal,
-    ...streamInit
-  });
-}
-async function cancelNativeHttpRequestBody(bodyStream) {
-  await (bodyStream == null ? void 0 : bodyStream.cancel());
-}
-async function writeResponseChunk(stream, chunk) {
-  for (let offset = 0; offset < chunk.byteLength; offset += HTTP_BODY_CHUNK_SIZE) {
-    await stream.write(
-      chunk.subarray(offset, offset + HTTP_BODY_CHUNK_SIZE)
-    );
-  }
-}
-async function pumpResponseBody(reader, stream) {
-  var _a2;
-  const cancelled = stream.cancelled().then(() => ({ cancelled: true }));
-  try {
-    for (; ; ) {
-      const read = reader.read().then((next2) => ({ cancelled: false, next: next2 }));
-      const result = await Promise.race([read, cancelled]);
-      if (result.cancelled) {
-        await reader.cancel(
-          new Error("native http response stream receiver dropped")
-        );
-        return;
-      }
-      const { next } = result;
-      if (next.done) {
-        await stream.end();
-        return;
-      }
-      if ((_a2 = next.value) == null ? void 0 : _a2.byteLength) {
-        await writeResponseChunk(stream, next.value);
-      }
-    }
-  } catch (error46) {
-    try {
-      await stream.error(stringifyError(error46));
-    } catch (streamError) {
-      logger22().debug({
-        msg: "failed to report native http response stream error",
-        error: streamError
-      });
-    }
-    try {
-      await reader.cancel(error46);
-    } catch {
-    }
-  } finally {
-    reader.releaseLock();
-  }
-}
-async function convertNativeHttpResponse(response, responseBodyStream) {
-  const headers = Object.fromEntries(response.headers.entries());
-  if (!response.body) {
-    return {
-      response: {
-        status: response.status,
-        headers,
-        body: new Uint8Array()
-      }
-    };
-  }
-  if (responseBodyStream) {
-    const reader = response.body.getReader();
-    const bodyCompletion = pumpResponseBody(reader, responseBodyStream);
-    return {
-      response: {
-        status: response.status,
-        headers,
-        stream: true
-      },
-      bodyCompletion
-    };
-  }
-  return {
-    response: {
-      status: response.status,
-      headers,
-      body: new Uint8Array(await response.arrayBuffer())
-    }
-  };
-}
 var CONN_PARAMS_KEY = "__conn_params__";
 function validateActionArgs(schemas, name, args) {
   if (!(schemas == null ? void 0 : schemas[name])) {
@@ -25752,7 +25604,7 @@ function toRuntimeBytes(value) {
 function arrayBufferViewToRuntimeBytes(value) {
   return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
 }
-function runtimeBytesToArrayBuffer2(value) {
+function runtimeBytesToArrayBuffer(value) {
   return value.buffer.slice(
     value.byteOffset,
     value.byteOffset + value.byteLength
@@ -26082,6 +25934,24 @@ function decodeArgs(value) {
   const decoded = decodeValue(value);
   return normalizeArgs(decoded);
 }
+function buildRequest(init) {
+  const url2 = 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) : void 0;
+  return new Request(url2, {
+    method: init.method,
+    headers: init.headers,
+    body
+  });
+}
+async function toRuntimeHttpResponse(response) {
+  const headers = Object.fromEntries(response.headers.entries());
+  const body = new Uint8Array(await response.arrayBuffer());
+  return {
+    status: response.status,
+    headers,
+    body
+  };
+}
 function toActorKey(segments) {
   return segments.map(
     (segment) => segment.kind === "number" ? String(segment.numberValue ?? 0) : segment.stringValue ?? ""
@@ -26746,7 +26616,7 @@ var NativeWebSocketAdapter = class {
     this.#runtime.webSocketSetEventCallback(this.#ws, (event2) => {
       if (event2.kind === "message") {
         this.#virtual.triggerMessage(
-          event2.binary ? runtimeBytesToArrayBuffer2(event2.data) : event2.data,
+          event2.binary ? runtimeBytesToArrayBuffer(event2.data) : event2.data,
           event2.messageIndex
         );
         return;
@@ -27978,14 +27848,12 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onStateChange,
     cancelToken
   );
-  const maybeHandleNativeInspectorRequest = async (ctx, rawRequest) => {
+  const maybeHandleNativeInspectorRequest = async (ctx, _rawRequest, jsRequest) => {
     var _a22, _b, _c, _d;
-    const rawUrl = rawRequest.uri.startsWith("http") ? rawRequest.uri : new URL(rawRequest.uri, "http://127.0.0.1").toString();
-    const url2 = new URL(rawUrl);
+    const url2 = new URL(jsRequest.url);
     if (!url2.pathname.startsWith("/inspector/")) {
       return void 0;
     }
-    const jsRequest = buildNativeHttpRequest(rawRequest);
     const jsonResponse = (body, init) => new Response(JSON.stringify(body), {
       status: (init == null ? void 0 : init.status) ?? 200,
       headers: {
@@ -28516,7 +28384,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildNativeHttpRequest(request) : void 0
+          request ? buildRequest(request) : void 0
         );
         try {
           await config3.onBeforeConnect(
@@ -28536,7 +28404,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx, conn, params, request } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildNativeHttpRequest(request) : void 0
+          request ? buildRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -28573,7 +28441,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildNativeHttpRequest(request) : void 0
+          request ? buildRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -28678,45 +28546,27 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onRequest: wrapNativeCallback(
       async (error46, payload) => {
         try {
-          const { ctx, request, cancelToken, responseBodyStream } = unwrapTsfnPayload(error46, payload);
-          const inspectorResponse = await maybeHandleNativeInspectorRequest(ctx, request);
+          const { ctx, request, cancelToken } = unwrapTsfnPayload(
+            error46,
+            payload
+          );
+          const jsRequest = buildRequest(request);
+          const inspectorResponse = await maybeHandleNativeInspectorRequest(
+            ctx,
+            request,
+            jsRequest
+          );
           if (inspectorResponse) {
-            await cancelNativeHttpRequestBody(request.bodyStream);
-            return (await convertNativeHttpResponse(
-              inspectorResponse,
-              responseBodyStream
-            )).response;
+            return await toRuntimeHttpResponse(inspectorResponse);
           }
           if (typeof config3.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);
+          const rawConnParams = jsRequest.headers.get(HEADER_CONN_PARAMS);
           let requestCtx;
           let conn;
-          let removeRequestAbortListener;
-          let cleanupDeferredToBody = false;
-          let cleanedUp = false;
-          const cleanupRequest = async () => {
-            if (cleanedUp) return;
-            cleanedUp = true;
-            removeRequestAbortListener == null ? void 0 : removeRequestAbortListener();
-            try {
-              await (requestCtx == null ? void 0 : requestCtx.dispose());
-            } finally {
-              if (conn) {
-                await runtime.connDisconnect(conn);
-              }
-            }
-          };
           try {
             const connParams = validateConnParams(
               schemaConfig.connParamsSchema,
@@ -28732,56 +28582,23 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             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 config3.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) => {
-                logger22().error({
-                  msg: "failed to clean up native streaming http request",
-                  error: cleanupError
-                });
-              });
-            }
-            return conversion.response;
+            return await toRuntimeHttpResponse(response);
           } finally {
-            try {
-              await cancelNativeHttpRequestBody(
-                request.bodyStream
-              );
-            } finally {
-              if (!cleanupDeferredToBody) {
-                await cleanupRequest();
-              }
+            await (requestCtx == null ? void 0 : requestCtx.dispose());
+            if (conn) {
+              await runtime.connDisconnect(conn);
             }
           }
         } catch (error210) {
@@ -28796,7 +28613,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onWebSocket: typeof config3.onWebSocket === "function" ? wrapNativeCallback(
       async (error46, payload) => {
         const { ctx, conn, ws, request } = unwrapTsfnPayload(error46, payload);
-        const jsRequest = request ? buildNativeHttpRequest(request) : void 0;
+        const jsRequest = request ? buildRequest(request) : void 0;
         const actorCtx = makeConnCtx(ctx, conn, jsRequest);
         try {
           await config3.onWebSocket(
@@ -28893,7 +28710,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           timeoutMs,
           cancelToken
         } = unwrapTsfnPayload(error46, payload);
-        const jsRequest = buildNativeHttpRequest(request);
+        const jsRequest = buildRequest(request);
         const actorCtx = withConnContext(
           runtime,
           ctx,
@@ -29042,27 +28859,15 @@ function finishShutdownSignal(signal) {
   }
   process.kill(process.pid, signal);
 }
-function createApplicationFetch(application, runtime) {
-  return async (request, responseBodyStream) => {
+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 abortController = new AbortController();
-    if (request.cancelToken) {
-      if (runtime.cancellationTokenAborted(request.cancelToken)) {
-        abortController.abort();
-      } else {
-        runtime.onCancellationTokenCancelled(
-          request.cancelToken,
-          () => abortController.abort()
-        );
-      }
-    }
     const response = await application.fetch(
       new Request(request.url, {
         method: method2,
         headers: request.headers,
-        body,
-        signal: abortController.signal
+        body
       })
     );
     if (!isResponseLike(response)) {
@@ -29070,23 +28875,10 @@ function createApplicationFetch(application, runtime) {
         "registry.listen() application fetch must return a Response"
       );
     }
-    const conversion = await convertNativeHttpResponse(
-      response,
-      responseBodyStream
-    );
-    if (conversion.bodyCompletion) {
-      void conversion.bodyCompletion.catch((error46) => {
-        logger22().error({
-          msg: "application response stream failed",
-          error: error46
-        });
-      });
-    }
     return {
-      status: conversion.response.status ?? response.status,
-      headers: conversion.response.headers ?? Object.fromEntries(response.headers.entries()),
-      body: conversion.response.body,
-      stream: conversion.response.stream
+      status: response.status,
+      headers: Object.fromEntries(response.headers.entries()),
+      body: new Uint8Array(await response.arrayBuffer())
     };
   };
 }
@@ -29344,7 +29136,8 @@ var Registry = class {
     const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3e3;
     const publicDir = opts.publicDir ?? getRivetkitPublicDir();
     const config3 = this.parseConfig();
-    if (opts.application && getRivetkitRuntimeMode() !== "serverless") {
+    const application = opts.application ? createApplicationFetch(opts.application) : void 0;
+    if (application && getRivetkitRuntimeMode() !== "serverless") {
       if (config3.runtime === "wasm") {
         throw new Error(
           "registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly"
@@ -29363,18 +29156,13 @@ var Registry = class {
         throw new Error("registry envoy startup did not initialize");
       }
       const { runtime: runtime2, registry: registry22, serveConfig: serveConfig2 } = await configuredRegistryPromise2;
-      const application2 = createApplicationFetch(
-        opts.application,
-        runtime2
-      );
-      await readyPromise;
       const listenerPromise = runtime2.serveApplicationListener(
         registry22,
         {
           port,
           host: opts.host,
           publicDir,
-          application: application2
+          application
         },
         serveConfig2
       );
@@ -29386,12 +29174,13 @@ var Registry = class {
         );
       }
       await Promise.all([
+        readyPromise,
         listenerPromise,
         serveLifecyclePromise
       ]);
       return;
     }
-    const configuredRegistryPromise = this.#buildConfiguredRegistry(config3);
+    const configuredRegistryPromise = buildConfiguredRegistry(config3);
     this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
     this.#runtimeServerlessPromise = configuredRegistryPromise;
     this.#installSignalHandlers(config3);
@@ -29402,7 +29191,6 @@ var Registry = class {
     });
     this.#ensureServerlessPoolConfigured(config3);
     const { runtime, registry: registry2, serveConfig } = await configuredRegistryPromise;
-    const application = opts.application ? createApplicationFetch(opts.application, runtime) : void 0;
     await runtime.serveListener(
       registry2,
       {