rivetkit 2.3.12-rc.1 → 2.3.12-rc.3

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

@@ -8,7 +8,7 @@ import {
 import {
   importWebSocket,
   logger
-} from "./chunk-JHHAMABO.js";
+} from "./chunk-XI4MEUUI.js";
 import {
   EncodingSchema,
   assertUnreachable,
@@ -35,13 +35,13 @@ import {
   serializeWithEncoding,
   stringifyError,
   uint8ArrayToBase64
-} from "./chunk-HVHDZDM2.js";
+} from "./chunk-OLGQYFUW.js";
 import {
   INTERNAL_ERROR_CODE,
   RivetError,
   actorNotFound,
   invalidRequest
-} from "./chunk-ZZ3WBRPD.js";
+} from "./chunk-IXBD7BXC.js";
 
 // src/common/actor-router-consts.ts
 var PATH_CONNECT = "/connect";
@@ -108,12 +108,12 @@ var ActorConnDisposed = class extends ActorClientError {
 function isSchedulingError(group, code) {
   return group === "guard" && (code === "actor_ready_timeout" || code === "actor_runner_failed");
 }
-function actorSchedulingError(group, code, actorId, details) {
+function actorSchedulingError(group, code, actorId, details, rayId) {
   return new RivetError(
     group,
     code,
     `Actor failed to start (${actorId}): ${JSON.stringify(details)}`,
-    { metadata: { actorId, details } }
+    { metadata: { actorId, details }, rayId }
   );
 }
 function internalClientError(message, opts) {
@@ -2121,7 +2121,7 @@ function getGatewayTarget(state) {
 function isStaleResolvedActorError(group, code) {
   return group === "actor" && (code === "not_found" || code === "starting" || code === "stopping" || code === "not_configured" || code === "dropped_reply" || code.startsWith("destroyed_"));
 }
-async function checkForSchedulingError(group, code, actorId, query, driver) {
+async function checkForSchedulingError(group, code, actorId, query, driver, rayId) {
   const name = getActorNameFromQuery(query);
   try {
     const actor = await driver.getForId({ name, actorId });
@@ -2131,7 +2131,13 @@ async function checkForSchedulingError(group, code, actorId, query, driver) {
         actorId,
         error: actor.error
       });
-      return actorSchedulingError(group, code, actorId, actor.error);
+      return actorSchedulingError(
+        group,
+        code,
+        actorId,
+        actor.error,
+        rayId
+      );
     }
   } catch (err) {
     logger().warn({
@@ -2453,6 +2459,7 @@ async function sendHttpRequest(opts) {
         code: responseData.code,
         message: responseData.message,
         metadata: responseData.metadata,
+        rayId,
         actorId: (_a = responseData.actor) == null ? void 0 : _a.actorId,
         generation: (_b = responseData.actor) == null ? void 0 : _b.generation,
         actorKey: (_c = responseData.actor) == null ? void 0 : _c.key
@@ -2463,6 +2470,7 @@ async function sendHttpRequest(opts) {
         responseData.message,
         {
           metadata: responseData.metadata,
+          rayId: rayId ?? void 0,
           actor: responseData.actor
         }
       );
@@ -2648,11 +2656,8 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata, actor } = deconstructError(
-      err,
-      true
-    );
-    throw new RivetError(group, code, message, { metadata, actor });
+    const { group, code, message, metadata, rayId, actor } = deconstructError(err, true);
+    throw new RivetError(group, code, message, { metadata, rayId, actor });
   }
 }
 async function rawWebSocket(driver, target, params, path, _protocols, options = {}) {
@@ -2771,7 +2776,7 @@ var ActorHandleRaw = class {
   async #sendQueueMessage(name, body, options) {
     return await this.#queueSendMutex.run(async () => {
       const maxAttempts = this.#getDynamicQueryMaxAttempts();
-      let useQueryTarget = false;
+      let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
@@ -2795,7 +2800,7 @@ var ActorHandleRaw = class {
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata, actor } = deconstructError(err, true);
+          const { group, code, message, metadata, rayId, actor } = deconstructError(err, true);
           if (this.#shouldRetryQueueDispatchOverload(
             group,
             code,
@@ -2811,7 +2816,8 @@ var ActorHandleRaw = class {
             code,
             actorId,
             attempt,
-            maxAttempts
+            maxAttempts,
+            rayId
           )) {
             useQueryTarget = true;
             await this.#waitForRetryWindow();
@@ -2833,14 +2839,16 @@ var ActorHandleRaw = class {
             code
           );
           if (invalidated && attempt < maxAttempts - 1) {
-            useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
-            if (useQueryTarget) {
+            const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+            useQueryTarget = useQueryTarget || waitForReady;
+            if (waitForReady) {
               await this.#waitForRetryWindow();
             }
             continue;
           }
           throw new RivetError(group, code, message, {
             metadata,
+            rayId,
             actor
           });
         }
@@ -2869,7 +2877,7 @@ var ActorHandleRaw = class {
   }
   async #sendActionNow(opts) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
       opts
@@ -2934,13 +2942,14 @@ var ActorHandleRaw = class {
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata, actor } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -2962,7 +2971,7 @@ var ActorHandleRaw = class {
             "actor",
             "not_found",
             "The actor does not exist or was destroyed.",
-            { metadata, actor }
+            { metadata, rayId, actor }
           );
         }
         const invalidated = this.#invalidateResolvedActorId(
@@ -2978,7 +2987,11 @@ var ActorHandleRaw = class {
           }
           continue;
         }
-        throw new RivetError(group, code, message, { metadata, actor });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor
+        });
       }
     }
     throw new Error("unreachable action retry state");
@@ -3020,7 +3033,7 @@ var ActorHandleRaw = class {
     this.#resolvedActorId = void 0;
     this.#resolvingActorId = void 0;
   }
-  async #shouldRetrySchedulingError(group, code, actorId, attempt, maxAttempts) {
+  async #shouldRetrySchedulingError(group, code, actorId, attempt, maxAttempts, rayId) {
     if (!isDynamicActorQuery(this.#actorResolutionState) || !isSchedulingError(group, code) || attempt >= maxAttempts - 1) {
       return false;
     }
@@ -3030,7 +3043,8 @@ var ActorHandleRaw = class {
         code,
         actorId,
         this.#actorResolutionState,
-        this.#driver
+        this.#driver,
+        rayId
       );
       if (schedulingError) {
         throw schedulingError;
@@ -3112,7 +3126,7 @@ var ActorHandleRaw = class {
   }
   async #fetchWithResolvedActor(input, init) {
     const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = false;
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = init ?? {};
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
@@ -3151,13 +3165,14 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata, actor } = deconstructError(err, true);
+        const { group, code, message, metadata, rayId, actor } = deconstructError(err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
           actorId,
           attempt,
-          maxAttempts
+          maxAttempts,
+          rayId
         )) {
           useQueryTarget = true;
           await this.#waitForRetryWindow();
@@ -3179,13 +3194,18 @@ var ActorHandleRaw = class {
           code
         );
         if (invalidated && attempt < maxAttempts - 1) {
-          useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
-          if (useQueryTarget) {
+          const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+          useQueryTarget = useQueryTarget || waitForReady;
+          if (waitForReady) {
             await this.#waitForRetryWindow();
           }
           continue;
         }
-        throw new RivetError(group, code, message, { metadata, actor });
+        throw new RivetError(group, code, message, {
+          metadata,
+          rayId,
+          actor
+        });
       }
     }
     throw new Error("unreachable fetch retry state");
@@ -3198,13 +3218,14 @@ var ActorHandleRaw = class {
     if (!error) {
       return null;
     }
-    const { group, code } = error;
+    const { group, code, rayId } = error;
     if (await this.#shouldRetrySchedulingError(
       group,
       code,
       actorId,
       attempt,
-      maxAttempts
+      maxAttempts,
+      rayId
     )) {
       return {
         useQueryTarget: true,
@@ -3225,10 +3246,10 @@ var ActorHandleRaw = class {
     }
     const invalidated = this.#invalidateResolvedActorId(group, code);
     if (invalidated && attempt < maxAttempts - 1) {
-      const useQueryTarget = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
+      const waitForReady = code === "starting" || code === "stopping" || code.startsWith("destroyed_");
       return {
-        useQueryTarget,
-        waitForRetryWindow: useQueryTarget
+        useQueryTarget: true,
+        waitForRetryWindow: waitForReady
       };
     }
     return null;
@@ -3240,7 +3261,7 @@ var ActorHandleRaw = class {
     const contentType = response.headers.get("content-type");
     const encoding = (contentType == null ? void 0 : contentType.includes("application/json")) ? "json" : this.#encoding;
     try {
-      return deserializeWithEncoding(
+      const error = deserializeWithEncoding(
         encoding,
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -3264,6 +3285,10 @@ var ActorHandleRaw = class {
           } : void 0
         })
       );
+      return {
+        ...error,
+        rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+      };
     } catch {
       return null;
     }
@@ -3327,7 +3352,9 @@ var ActorHandleRaw = class {
         "actor",
         "reload_failed",
         `reload failed with status ${response.status}: ${body}`,
-        {}
+        {
+          rayId: response.headers.get("x-rivet-ray-id") ?? void 0
+        }
       );
     }
   }
@@ -4185,7 +4212,7 @@ var ActorConnRaw = class {
       const reason = closeEvent.reason || "";
       const parsed = parseWebSocketCloseReason(reason);
       if (parsed) {
-        const { group, code } = parsed;
+        const { group, code, rayId } = parsed;
         if (this.#shouldReconnectForStaleActor(group, code)) {
           this.#clearResolvedActorIdentity();
           (_a = this.#onOpenPromise) == null ? void 0 : _a.reject(
@@ -4193,7 +4220,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             )
           );
           return;
@@ -4204,7 +4231,8 @@ var ActorConnRaw = class {
             code,
             this.#actorId,
             this.#actorResolutionState,
-            this.#driver
+            this.#driver,
+            rayId
           );
           if (schedulingError) {
             error = schedulingError;
@@ -4213,7 +4241,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              void 0
+              { rayId }
             );
           }
         } else {
@@ -4221,7 +4249,7 @@ var ActorConnRaw = class {
             group,
             code,
             `Connection closed: ${reason}`,
-            void 0
+            { rayId }
           );
         }
         this.#invalidateActorIfStale(group, code);
@@ -5630,24 +5658,45 @@ var RemoteEngineControlClient = class {
       name,
       key
     });
-    const { actor, created } = await getOrCreateActor(this.#config, {
-      datacenter: region,
-      name,
-      key: serializeActorKey(key),
-      runner_name_selector: poolName ?? this.#config.poolName,
-      input: actorInput ? uint8ArrayToBase64(
-        encodeCborCompat(actorInput)
-      ) : void 0,
-      crash_policy: crashPolicy ?? "sleep"
-    });
-    logger2().info({
-      msg: "getOrCreateWithKey: actor ready",
-      actorId: actor.actor_id,
-      name,
-      key,
-      created
-    });
-    return apiActorToOutput(actor);
+    try {
+      const { actor, created } = await getOrCreateActor(this.#config, {
+        datacenter: region,
+        name,
+        key: serializeActorKey(key),
+        runner_name_selector: poolName ?? this.#config.poolName,
+        input: actorInput ? uint8ArrayToBase64(
+          encodeCborCompat(actorInput)
+        ) : void 0,
+        crash_policy: crashPolicy ?? "sleep"
+      });
+      logger2().info({
+        msg: "getOrCreateWithKey: actor ready",
+        actorId: actor.actor_id,
+        name,
+        key,
+        created
+      });
+      return apiActorToOutput(actor);
+    } catch (error) {
+      if (error instanceof RivetError && error.group === "actor" && error.code === "key_reserved_in_different_datacenter") {
+        logger2().warn({
+          msg: "getOrCreateWithKey: key reserved in different datacenter, retrying as get",
+          name,
+          key
+        });
+        const response = await getActorByKey(this.#config, name, key);
+        const existing = response.actors[0];
+        if (!existing) throw error;
+        logger2().info({
+          msg: "getOrCreateWithKey: resolved existing actor via get",
+          actorId: existing.actor_id,
+          name,
+          key
+        });
+        return apiActorToOutput(existing);
+      }
+      throw error;
+    }
   }
   async createActor({
     name,
@@ -5866,4 +5915,4 @@ export {
   updateRunnerConfig,
   RemoteEngineControlClient
 };
-//# sourceMappingURL=chunk-A5BZEQOG.js.map
+//# sourceMappingURL=chunk-YYIDQBBM.js.map