rivetkit 2.3.12-rc.3 → 2.3.12

package/dist/tsup/mod.js

@@ -1,6 +1,6 @@
 import {
   decodeWorkflowHistoryTransport
-} from "./chunk-WVFTFWJL.js";
+} from "./chunk-GEN4NHXM.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   ActorConfigSchema,
@@ -20,6 +20,7 @@ import {
 import {
   ALLOWED_PUBLIC_HEADERS,
   HEADER_CONN_PARAMS,
+  HEADER_ORIGINAL_REQUEST_URL,
   RemoteEngineControlClient,
   convertRegistryConfigToClientConfig,
   createClientWithDriver,
@@ -27,18 +28,18 @@ import {
   isResponseLike,
   tryParseEndpoint,
   updateRunnerConfig
-} from "./chunk-YYIDQBBM.js";
+} from "./chunk-VOYNLY57.js";
 import {
   makePrefixedKey,
   removePrefixFromKey
 } from "./chunk-JI6GZ2C2.js";
+import "./chunk-JYTXOMM7.js";
 import {
   bindNativeStateTransactionContext,
   db,
   registerNativeStateTransactionOpener
-} from "./chunk-PSXMESQJ.js";
+} from "./chunk-EBXARMGI.js";
 import "./chunk-JTHHCZCZ.js";
-import "./chunk-XI4MEUUI.js";
 import {
   LogLevelSchema,
   VERSION,
@@ -61,6 +62,7 @@ import {
   getRivetRunEngineHost,
   getRivetRunEnginePort,
   getRivetRunEngineVersion,
+  getRivetRunServices,
   getRivetToken,
   getRivetTotalSlots,
   getRivetkitPublicDir,
@@ -71,7 +73,7 @@ import {
   parsePortEnv,
   stringifyError,
   toUint8Array
-} from "./chunk-OLGQYFUW.js";
+} from "./chunk-MF42PRF2.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
@@ -83,7 +85,7 @@ import {
   isRivetErrorLike,
   toRivetError,
   unsupportedFeature
-} from "./chunk-IXBD7BXC.js";
+} from "./chunk-OUQUIBVW.js";
 
 // src/actor/log.ts
 function loggerWithoutContext() {
@@ -729,6 +731,12 @@ var RegistryConfigSchema = z3.object({
   enginePort: z3.number().int().min(1).max(65535).optional().default(() => getRivetRunEnginePort() ?? ENGINE_PORT),
   /** @experimental */
   engineVersion: z3.string().optional().default(() => getRivetRunEngineVersion() ?? VERSION),
+  /**
+   * Starts the first-party Services actor host when RivetKit manages
+   * a local engine. Defaults to the local-engine decision. Set
+   * RIVET_RUN_SERVICES=0 or 1 to override it.
+   */
+  startServices: z3.boolean().optional(),
   /**
    * @experimental
    *
@@ -809,6 +817,7 @@ var RegistryConfigSchema = z3.object({
     config.enginePort
   );
   const endpoint = config.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? localEngineEndpoint : void 0);
+  const startServices = config.startServices ?? getRivetRunServices() ?? Boolean(endpoint && isLocalEngineEndpoint(endpoint));
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
@@ -832,6 +841,7 @@ var RegistryConfigSchema = z3.object({
     ...config,
     sqlite,
     endpoint,
+    startServices,
     namespace,
     token,
     publicEndpoint,
@@ -945,6 +955,9 @@ var DocRegistryConfigSchema = z3.object({
   engineVersion: z3.string().optional().describe(
     "Version of the local engine package to use. Defaults to the current RivetKit version."
   ),
+  startServices: z3.boolean().optional().describe(
+    "Starts Services when RivetKit manages a local Engine. Defaults to the local-Engine decision. Set RIVET_RUN_SERVICES=0 or 1 to override."
+  ),
   configurePool: DocConfigurePoolSchema.describe(
     "Automatically configure serverless runners in the engine."
   ),
@@ -1466,16 +1479,30 @@ function toNapiApplication(application) {
     if (!request) {
       throw new Error("application fetch callback received no request");
     }
-    const response = await application({
-      ...request,
-      body: new Uint8Array(request.body)
-    });
+    const response = await application(
+      {
+        ...request,
+        body: new Uint8Array(request.body),
+        cancelToken: request.cancelToken
+      },
+      request.responseBodyStream ? fromNapiHttpResponseBodyStream(
+        request.responseBodyStream
+      ) : void 0
+    );
     return {
       ...response,
-      body: toNapiBuffer(response.body)
+      body: response.body === void 0 ? void 0 : 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;
@@ -2019,6 +2046,149 @@ async function loadNapiRuntime() {
   };
 }
 
+// src/registry/native-http.ts
+var HTTP_BODY_CHUNK_SIZE = 64 * 1024;
+function runtimeBytesToArrayBuffer(value) {
+  return value.buffer.slice(
+    value.byteOffset,
+    value.byteOffset + value.byteLength
+  );
+}
+function buildNativeHttpRequest(init) {
+  var _a;
+  const headers = new Headers(init.headers);
+  const originalUrl = headers.get(HEADER_ORIGINAL_REQUEST_URL);
+  headers.delete(HEADER_ORIGINAL_REQUEST_URL);
+  const url = 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 _a2, _b;
+      try {
+        if (init.body && init.body.length > 0) {
+          controller.enqueue(new Uint8Array(init.body));
+          init.body = void 0;
+          return;
+        }
+        const chunk = await ((_a2 = init.bodyStream) == null ? void 0 : _a2.read());
+        if (!chunk) {
+          controller.close();
+        } else {
+          controller.enqueue(new Uint8Array(chunk));
+        }
+      } catch (error) {
+        (_b = init.abortController) == null ? void 0 : _b.abort(error);
+        controller.error(error);
+      }
+    },
+    async cancel() {
+      var _a2;
+      await ((_a2 = init.bodyStream) == null ? void 0 : _a2.cancel());
+    }
+  }) : init.body && init.body.length > 0 ? runtimeBytesToArrayBuffer(init.body) : void 0;
+  const streamInit = init.bodyStream && !bodyForbidden ? { duplex: "half" } : {};
+  return new Request(url, {
+    method: method2,
+    headers,
+    body,
+    signal: ((_a = init.abortController) == null ? void 0 : _a.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 _a;
+  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) {
+        void reader.cancel(
+          new Error(
+            "native http response stream receiver dropped"
+          )
+        ).catch((error) => {
+          logger2().debug({
+            msg: "failed to cancel native http response reader",
+            error
+          });
+        });
+        return;
+      }
+      const { next } = result;
+      if (next.done) {
+        await stream.end();
+        return;
+      }
+      if ((_a = next.value) == null ? void 0 : _a.byteLength) {
+        await writeResponseChunk(stream, next.value);
+      }
+    }
+  } catch (error) {
+    try {
+      await stream.error(stringifyError(error));
+    } catch (streamError) {
+      logger2().debug({
+        msg: "failed to report native http response stream error",
+        error: streamError
+      });
+    }
+    void reader.cancel(error).catch(() => {
+    });
+  } finally {
+    try {
+      reader.releaseLock();
+    } catch (error) {
+      logger2().debug({
+        msg: "failed to release native http response reader lock",
+        error
+      });
+    }
+  }
+}
+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())
+    }
+  };
+}
+
 // src/registry/native-validation.ts
 var CONN_PARAMS_KEY = "__conn_params__";
 function validateActionArgs(schemas, name, args) {
@@ -3477,7 +3647,7 @@ function toRuntimeBytes(value) {
 function arrayBufferViewToRuntimeBytes(value) {
   return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
 }
-function runtimeBytesToArrayBuffer(value) {
+function runtimeBytesToArrayBuffer2(value) {
   return value.buffer.slice(
     value.byteOffset,
     value.byteOffset + value.byteLength
@@ -3523,6 +3693,9 @@ function decodeNativeKvValue(value, options) {
 async function loadEngineCli() {
   return import(["@rivetkit", "engine-cli"].join("/"));
 }
+async function loadServices() {
+  return import(["@rivet-dev", "services"].join("/"));
+}
 function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
@@ -3808,24 +3981,6 @@ function decodeArgs(value) {
   const decoded = decodeValue(value);
   return normalizeArgs(decoded);
 }
-function buildRequest(init) {
-  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) : void 0;
-  return new Request(url, {
-    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 ?? ""
@@ -4538,7 +4693,7 @@ var NativeWebSocketAdapter = class {
     this.#runtime.webSocketSetEventCallback(this.#ws, (event2) => {
       if (event2.kind === "message") {
         this.#virtual.triggerMessage(
-          event2.binary ? runtimeBytesToArrayBuffer(event2.data) : event2.data,
+          event2.binary ? runtimeBytesToArrayBuffer2(event2.data) : event2.data,
           event2.messageIndex
         );
         return;
@@ -5921,12 +6076,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     cancelToken,
     run !== void 0
   );
-  const maybeHandleNativeInspectorRequest = async (ctx, _rawRequest, jsRequest) => {
+  const maybeHandleNativeInspectorRequest = async (ctx, rawRequest) => {
     var _a2, _b, _c, _d;
-    const url = new URL(jsRequest.url);
+    const rawUrl = rawRequest.uri.startsWith("http") ? rawRequest.uri : new URL(rawRequest.uri, "http://127.0.0.1").toString();
+    const url = new URL(rawUrl);
     if (!url.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: {
@@ -6457,7 +6614,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         try {
           await config.onBeforeConnect(
@@ -6477,7 +6634,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx, conn, params, request } = unwrapTsfnPayload(error, payload);
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -6515,7 +6672,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -6622,27 +6779,45 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onRequest: wrapNativeCallback(
       async (error, payload) => {
         try {
-          const { ctx, request, cancelToken } = unwrapTsfnPayload(
-            error,
-            payload
-          );
-          const jsRequest = buildRequest(request);
-          const inspectorResponse = await maybeHandleNativeInspectorRequest(
-            ctx,
-            request,
-            jsRequest
-          );
+          const { ctx, request, cancelToken, responseBodyStream } = unwrapTsfnPayload(error, payload);
+          const inspectorResponse = await maybeHandleNativeInspectorRequest(ctx, request);
           if (inspectorResponse) {
-            return await toRuntimeHttpResponse(inspectorResponse);
+            await cancelNativeHttpRequestBody(request.bodyStream);
+            return (await convertNativeHttpResponse(
+              inspectorResponse,
+              responseBodyStream
+            )).response;
           }
           if (typeof config.onRequest !== "function") {
-            return await toRuntimeHttpResponse(
-              new Response(null, { status: 404 })
-            );
+            await cancelNativeHttpRequestBody(request.bodyStream);
+            return (await convertNativeHttpResponse(
+              new Response(null, { status: 404 }),
+              responseBodyStream
+            )).response;
           }
-          const rawConnParams = jsRequest.headers.get(HEADER_CONN_PARAMS);
+          const requestAbortController = new AbortController();
+          const handlerRequest = buildNativeHttpRequest({
+            ...request,
+            abortController: requestAbortController
+          });
+          const rawConnParams = handlerRequest.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,
@@ -6658,23 +6833,56 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             requestCtx = makeConnCtx(
               ctx,
               conn,
-              jsRequest,
+              handlerRequest,
               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,
-              jsRequest
+              handlerRequest
             );
             if (!isResponseLike(response)) {
               throw new Error(
                 "onRequest handler must return a Response"
               );
             }
-            return await toRuntimeHttpResponse(response);
+            const conversion = await convertNativeHttpResponse(
+              response,
+              responseBodyStream
+            );
+            if (conversion.bodyCompletion) {
+              cleanupDeferredToBody = true;
+              void conversion.bodyCompletion.then(cleanupRequest).catch((cleanupError) => {
+                logger2().error({
+                  msg: "failed to clean up native streaming http request",
+                  error: cleanupError
+                });
+              });
+            }
+            return conversion.response;
           } finally {
-            await (requestCtx == null ? void 0 : requestCtx.dispose());
-            if (conn) {
-              await runtime.connDisconnect(conn);
+            try {
+              await cancelNativeHttpRequestBody(
+                request.bodyStream
+              );
+            } finally {
+              if (!cleanupDeferredToBody) {
+                await cleanupRequest();
+              }
             }
           }
         } catch (error2) {
@@ -6689,7 +6897,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onWebSocket: typeof config.onWebSocket === "function" ? wrapNativeCallback(
       async (error, payload) => {
         const { ctx, conn, ws, request } = unwrapTsfnPayload(error, payload);
-        const jsRequest = request ? buildRequest(request) : void 0;
+        const jsRequest = request ? buildNativeHttpRequest(request) : void 0;
         const actorCtx = makeConnCtx(ctx, conn, jsRequest);
         try {
           await config.onWebSocket(
@@ -6795,7 +7003,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           timeoutMs,
           cancelToken
         } = unwrapTsfnPayload(error, payload);
-        const jsRequest = buildRequest(request);
+        const jsRequest = buildNativeHttpRequest(request);
         const actorCtx = withConnContext(
           runtime,
           ctx,
@@ -6865,7 +7073,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     buildActorConfig(definition, registryConfig, runtime.kind)
   );
 }
-async function buildServeConfig(config) {
+async function buildServeConfig(config, resolveServicesBinary = true) {
   var _a;
   if (!config.endpoint) {
     throw nativeEndpointNotConfiguredError();
@@ -6876,6 +7084,7 @@ async function buildServeConfig(config) {
     token: config.token,
     namespace: config.namespace,
     poolName: config.envoy.poolName,
+    startServices: resolveServicesBinary && config.startServices,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config.serverless.basePath,
     serverlessPackageVersion: VERSION,
@@ -6894,6 +7103,17 @@ async function buildServeConfig(config) {
       error: stringifyError(error)
     });
   }
+  if (resolveServicesBinary && config.startServices) {
+    try {
+      const { getServicesPath } = await loadServices();
+      serveConfig.servicesBinaryPath = getServicesPath();
+    } catch (error) {
+      logger2().warn({
+        msg: "could not resolve the Services binary; a local engine will fail with services.binary_unavailable \u2014 set RIVET_RUN_SERVICES=0 to disable Services or RIVET_SERVICES_BINARY to a local rivet-services binary",
+        error: stringifyError(error)
+      });
+    }
+  }
   serveConfig.engineHost = config.engineHost;
   serveConfig.enginePort = config.enginePort;
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
@@ -6920,7 +7140,7 @@ async function buildRegistryWithRuntime(config, runtime) {
   return {
     runtime,
     registry,
-    serveConfig: await buildServeConfig(config)
+    serveConfig: await buildServeConfig(config, runtime.kind === "napi")
   };
 }
 async function buildConfiguredRegistry(config) {
@@ -6947,15 +7167,27 @@ function finishShutdownSignal(signal) {
   }
   process.kill(process.pid, signal);
 }
-function createApplicationFetch(application) {
-  return async (request) => {
+function createApplicationFetch(application, runtime) {
+  return async (request, responseBodyStream) => {
     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
+        body,
+        signal: abortController.signal
       })
     );
     if (!isResponseLike(response)) {
@@ -6963,10 +7195,23 @@ function createApplicationFetch(application) {
         "registry.listen() application fetch must return a Response"
       );
     }
+    const conversion = await convertNativeHttpResponse(
+      response,
+      responseBodyStream
+    );
+    if (conversion.bodyCompletion) {
+      void conversion.bodyCompletion.catch((error) => {
+        logger2().error({
+          msg: "application response stream failed",
+          error
+        });
+      });
+    }
     return {
-      status: response.status,
-      headers: Object.fromEntries(response.headers.entries()),
-      body: new Uint8Array(await response.arrayBuffer())
+      status: conversion.response.status ?? response.status,
+      headers: conversion.response.headers ?? Object.fromEntries(response.headers.entries()),
+      body: conversion.response.body,
+      stream: conversion.response.stream
     };
   };
 }
@@ -7224,8 +7469,7 @@ var Registry = class {
     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 (opts.application && getRivetkitRuntimeMode() !== "serverless") {
       if (config.runtime === "wasm") {
         throw new Error(
           "registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly"
@@ -7244,13 +7488,18 @@ var Registry = class {
         throw new Error("registry envoy startup did not initialize");
       }
       const { runtime: runtime2, registry: registry2, serveConfig: serveConfig2 } = await configuredRegistryPromise2;
+      const application2 = createApplicationFetch(
+        opts.application,
+        runtime2
+      );
+      await readyPromise;
       const listenerPromise = runtime2.serveApplicationListener(
         registry2,
         {
           port,
           host: opts.host,
           publicDir,
-          application
+          application: application2
         },
         serveConfig2
       );
@@ -7261,14 +7510,10 @@ var Registry = class {
           "registry envoy serve lifecycle did not initialize"
         );
       }
-      await Promise.all([
-        readyPromise,
-        listenerPromise,
-        serveLifecyclePromise
-      ]);
+      await Promise.all([listenerPromise, serveLifecyclePromise]);
       return;
     }
-    const configuredRegistryPromise = buildConfiguredRegistry(config);
+    const configuredRegistryPromise = this.#buildConfiguredRegistry(config);
     this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
     this.#runtimeServerlessPromise = configuredRegistryPromise;
     this.#installSignalHandlers(config);
@@ -7279,6 +7524,7 @@ var Registry = class {
     });
     this.#ensureServerlessPoolConfigured(config);
     const { runtime, registry, serveConfig } = await configuredRegistryPromise;
+    const application = opts.application ? createApplicationFetch(opts.application, runtime) : void 0;
     await runtime.serveListener(
       registry,
       {