rivetkit 2.3.12-rc.3 → 2.3.12

package/dist/tsup/{chunk-YYIDQBBM.js → chunk-VOYNLY57.js}

@@ -2,13 +2,13 @@ import {
   deserializeActorKey,
   serializeActorKey
 } from "./chunk-JI6GZ2C2.js";
-import {
-  AsyncMutex
-} from "./chunk-JTHHCZCZ.js";
 import {
   importWebSocket,
   logger
-} from "./chunk-XI4MEUUI.js";
+} from "./chunk-JYTXOMM7.js";
+import {
+  AsyncMutex
+} from "./chunk-JTHHCZCZ.js";
 import {
   EncodingSchema,
   assertUnreachable,
@@ -35,13 +35,13 @@ import {
   serializeWithEncoding,
   stringifyError,
   uint8ArrayToBase64
-} from "./chunk-OLGQYFUW.js";
+} from "./chunk-MF42PRF2.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
   actorNotFound,
   invalidRequest
-} from "./chunk-IXBD7BXC.js";
+} from "./chunk-OUQUIBVW.js";
 
 // src/common/actor-router-consts.ts
 var PATH_CONNECT = "/connect";
@@ -50,6 +50,7 @@ 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";
@@ -2149,6 +2150,20 @@ async function checkForSchedulingError(group, code, actorId, query, driver, rayI
   return null;
 }
 
+// src/common/fetch-like.ts
+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";
+}
+
 // src/client/lifecycle-errors.ts
 function* walkErrorChain(error, maxDepth = 8) {
   let current = error;
@@ -2581,31 +2596,20 @@ function createQueueSender(senderOptions) {
   };
 }
 
-// src/common/fetch-like.ts
-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";
-}
-
 // src/client/raw-utils.ts
 async function rawHttpFetch(driver, target, params, input, init, options = {}) {
   let path;
+  let originalUrl;
   let mergedInit = init || {};
   if (typeof input === "string") {
     path = input;
   } else if (isUrlLike(input)) {
     path = input.pathname + input.search;
+    originalUrl = input.toString();
   } else if (isRequestLike(input)) {
     const url = new URL(input.url);
     path = url.pathname + url.search;
+    originalUrl = url.toString();
     const requestHeaders = new Headers(input.headers);
     const initHeaders = new Headers((init == null ? void 0 : init.headers) || {});
     const mergedHeaders = new Headers(requestHeaders);
@@ -2647,6 +2651,10 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     const normalizedPath = path.startsWith("/") ? path.slice(1) : path;
     const url = 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));
     }
@@ -2776,7 +2784,9 @@ var ActorHandleRaw = class {
   async #sendQueueMessage(name, body, options) {
     return await this.#queueSendMutex.run(async () => {
       const maxAttempts = this.#getDynamicQueryMaxAttempts();
-      let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
+      let useQueryTarget = isDynamicActorQuery(
+        this.#actorResolutionState
+      );
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
@@ -3125,9 +3135,10 @@ var ActorHandleRaw = class {
     return this.#fetchWithResolvedActor(input, init);
   }
   async #fetchWithResolvedActor(input, init) {
-    const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = init ?? {};
+    const hasBody = requestInit.body !== void 0 ? requestInit.body !== null : isRequestLike(input) && input.body !== null;
+    const maxAttempts = hasBody ? 1 : this.#getDynamicQueryMaxAttempts();
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
       {
@@ -4913,23 +4924,19 @@ async function sendHttpRequestToGateway(runConfig, gatewayUrl, actorRequest, opt
     if (actorRequest.bodyUsed) {
       throw new Error("Request body has already been consumed");
     }
-    const reqBody = await actorRequest.arrayBuffer();
-    if (reqBody.byteLength !== 0) {
-      bodyToSend = reqBody;
+    if (actorRequest.body) {
+      bodyToSend = actorRequest.body;
       guardHeaders.delete("transfer-encoding");
       guardHeaders.delete("content-length");
     }
   }
-  const guardRequest = new Request(gatewayUrl, {
+  return fetch(gatewayUrl, {
     method: actorRequest.method,
     headers: guardHeaders,
     body: bodyToSend,
-    signal: actorRequest.signal
+    signal: actorRequest.signal,
+    ...bodyToSend ? { duplex: "half" } : {}
   });
-  return mutableResponse(await fetch(guardRequest));
-}
-function mutableResponse(fetchRes) {
-  return new Response(fetchRes.body, fetchRes);
 }
 function buildGuardHeaders(runConfig, actorRequest, options) {
   const headers = new Headers();
@@ -5899,6 +5906,7 @@ function apiActorToOutput(actor) {
 
 export {
   HEADER_CONN_PARAMS,
+  HEADER_ORIGINAL_REQUEST_URL,
   ALLOWED_PUBLIC_HEADERS,
   ActorClientError,
   ManagerError,
@@ -5915,4 +5923,4 @@ export {
   updateRunnerConfig,
   RemoteEngineControlClient
 };
-//# sourceMappingURL=chunk-YYIDQBBM.js.map
+//# sourceMappingURL=chunk-VOYNLY57.js.map