rivetkit 2.3.30 → 3.0.0-preview.2

package/dist/tsup/{chunk-P2PHHJMH.cjs → chunk-25MUHNWE.cjs}

@@ -1,14 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class; var _class2;
 
 
-var _chunkMYWZCDMLcjs = require('./chunk-MYWZCDML.cjs');
+
+var _chunkRTWH3AX3cjs = require('./chunk-RTWH3AX3.cjs');
 
 
 var _chunkKVFIONKQcjs = require('./chunk-KVFIONKQ.cjs');
 
 
 
-var _chunk5SN6GAYXcjs = require('./chunk-5SN6GAYX.cjs');
+var _chunk3SPYZMMEcjs = require('./chunk-3SPYZMME.cjs');
 
 
 
@@ -35,7 +36,7 @@ var _chunk5SN6GAYXcjs = require('./chunk-5SN6GAYX.cjs');
 
 
 
-var _chunk2BIRGEIUcjs = require('./chunk-2BIRGEIU.cjs');
+var _chunkXSOHGU4Gcjs = require('./chunk-XSOHGU4G.cjs');
 
 
 
@@ -2131,7 +2132,7 @@ async function checkForSchedulingError(group, code, actorId, query, driver, rayI
   try {
     const actor = await driver.getForId({ name, actorId });
     if (actor == null ? void 0 : actor.error) {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).info({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).info({
         msg: "found actor scheduling error",
         actorId,
         error: actor.error
@@ -2145,10 +2146,10 @@ async function checkForSchedulingError(group, code, actorId, query, driver, rayI
       );
     }
   } catch (err) {
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
       msg: "failed to fetch actor details for scheduling error check",
       actorId,
-      error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+      error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
     });
   }
   return null;
@@ -2176,6 +2177,56 @@ function readRequestBody(request) {
   ).arrayBuffer();
 }
 
+// src/client/retry-budget.ts
+var DEFAULT_PERCENT = 10;
+var DEFAULT_MAX_TOKENS = 100;
+var RetryBudget = class {
+  #tokens;
+  #maxTokens;
+  #deposit;
+  constructor(options = {}) {
+    const percent = _nullishCoalesce(options.percent, () => ( DEFAULT_PERCENT));
+    const maxTokens = _nullishCoalesce(options.maxTokens, () => ( DEFAULT_MAX_TOKENS));
+    if (!(percent >= 0 && percent <= 100)) {
+      throw new Error("retryBudget.percent must be in 0..=100");
+    }
+    if (!(maxTokens >= 0)) {
+      throw new Error("retryBudget.maxTokens must be at least 0");
+    }
+    this.#maxTokens = maxTokens;
+    this.#tokens = maxTokens;
+    this.#deposit = percent / 100;
+  }
+  /** Credits one request sent. */
+  deposit() {
+    this.#tokens = Math.min(this.#maxTokens, this.#tokens + this.#deposit);
+  }
+  /** Spends one token. Returns `false` when the budget is spent. */
+  tryWithdraw() {
+    if (this.#tokens + 1e-9 < 1) {
+      return false;
+    }
+    this.#tokens = Math.max(0, this.#tokens - 1);
+    return true;
+  }
+};
+function retryAfterMs(error) {
+  if (!(error instanceof _chunkMGI2VVF6cjs.RivetError)) {
+    return void 0;
+  }
+  const metadata = error.metadata;
+  if (metadata === null || typeof metadata !== "object") {
+    return void 0;
+  }
+  const hint = metadata.retry_after_ms;
+  return typeof hint === "number" && hint >= 0 ? hint : void 0;
+}
+function retryDelayMs(attempt, opts) {
+  const backoff = Math.min(opts.initialDelayMs * 2 ** attempt, opts.maxDelayMs);
+  const jittered = backoff / 2 + Math.random() * (backoff / 2);
+  return Math.max(jittered, _nullishCoalesce(opts.hintMs, () => ( 0)));
+}
+
 // src/client/lifecycle-errors.ts
 function* walkErrorChain(error, maxDepth = 8) {
   let current = error;
@@ -2351,9 +2402,11 @@ async function waitWithSignal(ms, signal) {
   });
 }
 async function retryOnLifecycleBoundary(run, opts) {
+  var _a;
   const maxAttempts = _nullishCoalesce((opts == null ? void 0 : opts.maxAttempts), () => ( 5));
   const initialDelayMs = _nullishCoalesce((opts == null ? void 0 : opts.initialDelayMs), () => ( 25));
   const maxDelayMs = _nullishCoalesce((opts == null ? void 0 : opts.maxDelayMs), () => ( 200));
+  (_a = opts == null ? void 0 : opts.budget) == null ? void 0 : _a.deposit();
   let lastError;
   for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
     throwIfAborted(opts == null ? void 0 : opts.signal);
@@ -2367,7 +2420,14 @@ async function retryOnLifecycleBoundary(run, opts) {
       if (attempt === maxAttempts - 1) {
         break;
       }
-      const delayMs = Math.min(initialDelayMs * 2 ** attempt, maxDelayMs);
+      if ((opts == null ? void 0 : opts.budget) && !opts.budget.tryWithdraw()) {
+        break;
+      }
+      const delayMs = retryDelayMs(attempt, {
+        initialDelayMs,
+        maxDelayMs,
+        hintMs: retryAfterMs(error)
+      });
       await waitWithSignal(delayMs, opts == null ? void 0 : opts.signal);
     }
   }
@@ -2460,17 +2520,22 @@ function addOutboundTelemetryHeaders(headers, telemetry) {
 
 // src/client/utils.ts
 
+var RETRY_AFTER_SUFFIX = /^retry_after_ms=(\d+)$/;
 function parseWebSocketCloseReason(reason) {
-  const [mainPart, rayId] = reason.split("#");
+  const [mainPart, suffix] = reason.split("#");
   const [group, code] = mainPart.split(".");
   if (!group || !code) {
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({ msg: "failed to parse close reason", reason });
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({ msg: "failed to parse close reason", reason });
     return void 0;
   }
+  const retryAfter = suffix == null ? void 0 : suffix.match(RETRY_AFTER_SUFFIX);
+  if (retryAfter) {
+    return { group, code, retryAfterMs: Number(retryAfter[1]) };
+  }
   return {
     group,
     code,
-    rayId
+    rayId: suffix
   };
 }
 function messageLength(message) {
@@ -2486,11 +2551,11 @@ function messageLength(message) {
   if (typeof message === "string") {
     return message.length;
   }
-  _chunk2BIRGEIUcjs.assertUnreachable.call(void 0, message);
+  _chunkXSOHGU4Gcjs.assertUnreachable.call(void 0, message);
 }
 async function sendHttpRequest(opts) {
   var _a, _b, _c;
-  _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+  _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
     msg: "sending http request",
     url: opts.url,
     encoding: opts.encoding
@@ -2499,8 +2564,8 @@ async function sendHttpRequest(opts) {
   let bodyData;
   if (opts.method === "POST" || opts.method === "PUT") {
     _invariant2.default.call(void 0, opts.body !== void 0, "missing body");
-    contentType = _chunk2BIRGEIUcjs.contentTypeForEncoding.call(void 0, opts.encoding);
-    bodyData = _chunk2BIRGEIUcjs.serializeWithEncoding.call(void 0, 
+    contentType = _chunkXSOHGU4Gcjs.contentTypeForEncoding.call(void 0, opts.encoding);
+    bodyData = _chunkXSOHGU4Gcjs.serializeWithEncoding.call(void 0, 
       opts.encoding,
       opts.body,
       opts.requestVersionedDataHandler,
@@ -2520,7 +2585,7 @@ async function sendHttpRequest(opts) {
           ...contentType ? {
             "Content-Type": contentType
           } : {},
-          "User-Agent": _chunk2BIRGEIUcjs.httpUserAgent.call(void 0, )
+          "User-Agent": _chunkXSOHGU4Gcjs.httpUserAgent.call(void 0, )
         },
         body: bodyData,
         credentials: "include",
@@ -2538,7 +2603,7 @@ async function sendHttpRequest(opts) {
     const rayId = response.headers.get("x-rivet-ray-id");
     const encoding = (contentType2 == null ? void 0 : contentType2.includes("application/json")) ? "json" : opts.encoding;
     try {
-      const responseData = _chunk2BIRGEIUcjs.deserializeWithEncoding.call(void 0, 
+      const responseData = _chunkXSOHGU4Gcjs.deserializeWithEncoding.call(void 0, 
         encoding,
         new Uint8Array(bufferResponse),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -2556,7 +2621,7 @@ async function sendHttpRequest(opts) {
           group: bare5.group,
           code: bare5.code,
           message: bare5.message,
-          metadata: bare5.metadata ? _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
+          metadata: bare5.metadata ? _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
           actor: bare5.actor ? {
             actorId: bare5.actor.actorId,
             generation: Number(bare5.actor.generation),
@@ -2564,7 +2629,7 @@ async function sendHttpRequest(opts) {
           } : void 0
         })
       );
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
         msg: "http error response",
         group: responseData.group,
         code: responseData.code,
@@ -2611,7 +2676,7 @@ ${textResponse}`
   }
   try {
     const buffer = new Uint8Array(await response.arrayBuffer());
-    return _chunk2BIRGEIUcjs.deserializeWithEncoding.call(void 0, 
+    return _chunkXSOHGU4Gcjs.deserializeWithEncoding.call(void 0, 
       opts.encoding,
       buffer,
       opts.responseVersionedDataHandler,
@@ -2659,8 +2724,8 @@ function createQueueSender(senderOptions) {
       }),
       requestToBare: (value) => ({
         name: _nullishCoalesce(value.name, () => ( name)),
-        body: _chunk2BIRGEIUcjs.bufferToArrayBuffer.call(void 0, 
-          _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, value.body)
+        body: _chunkXSOHGU4Gcjs.bufferToArrayBuffer.call(void 0, 
+          _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, value.body)
         ),
         wait: _nullishCoalesce(value.wait, () => ( false)),
         timeout: value.timeout !== void 0 ? BigInt(value.timeout) : null
@@ -2680,7 +2745,7 @@ function createQueueSender(senderOptions) {
         }
         return {
           status: bare5.status,
-          response: _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.response))
+          response: _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.response))
         };
       }
     });
@@ -2747,7 +2812,7 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}, t
     throw new TypeError("Invalid input type for fetch");
   }
   try {
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug(
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug(
       "directId" in target ? {
         msg: "sending raw http request to actor",
         actorId: target.directId
@@ -2773,7 +2838,7 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}, t
     });
     return driver.sendRequest(target, proxyRequest, options);
   } catch (err) {
-    const { group, code, message, metadata, rayId, actor } = _chunk2BIRGEIUcjs.deconstructError.call(void 0, err, true);
+    const { group, code, message, metadata, rayId, actor } = _chunkXSOHGU4Gcjs.deconstructError.call(void 0, err, true);
     throw new (0, _chunkMGI2VVF6cjs.RivetError)(group, code, message, { metadata, rayId, actor });
   }
 }
@@ -2794,7 +2859,7 @@ async function rawWebSocket(driver, target, params, path, _protocols, options =
     }
   }
   const fullPath = `${PATH_WEBSOCKET_PREFIX}${pathPortion}${queryPortion}`;
-  _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+  _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
     msg: "opening websocket",
     target,
     encoding,
@@ -2868,6 +2933,7 @@ var ActorHandleRaw = class {
   #queueSendMutex = new (0, _chunkKVFIONKQcjs.AsyncMutex)();
   #currentActorInvocation;
   #startCallSpan;
+  #retryBudget;
   /**
    * Do not call this directly.
    *
@@ -2875,7 +2941,7 @@ var ActorHandleRaw = class {
    *
    * @protected
    */
-  constructor(client, driver, params, getParams, encoding, actorResolutionState, gatewayOptions = {}, signal, currentActorInvocation, startCallSpan) {
+  constructor(client, driver, params, getParams, encoding, actorResolutionState, gatewayOptions = {}, signal, currentActorInvocation, startCallSpan, retryBudget = new RetryBudget()) {
     this.#client = client;
     this.#driver = driver;
     this.#encoding = encoding;
@@ -2886,6 +2952,7 @@ var ActorHandleRaw = class {
     this.#signal = signal;
     this.#currentActorInvocation = currentActorInvocation;
     this.#startCallSpan = startCallSpan;
+    this.#retryBudget = retryBudget;
   }
   async #resolveConnectionParams() {
     if (this.#getParams) {
@@ -2902,6 +2969,7 @@ var ActorHandleRaw = class {
       let useQueryTarget = isDynamicActorQuery(
         this.#actorResolutionState
       );
+      this.#retryBudget.deposit();
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
@@ -2931,15 +2999,24 @@ var ActorHandleRaw = class {
             }
           }).send(name, body, options);
         } catch (err) {
-          const { group, code, message, metadata, rayId, actor } = _chunk2BIRGEIUcjs.deconstructError.call(void 0, err, true);
+          const { group, code, message, metadata, rayId, actor } = _chunkXSOHGU4Gcjs.deconstructError.call(void 0, err, true);
           if (this.#shouldRetryQueueDispatchOverload(
             group,
             code,
             metadata,
             attempt,
             maxAttempts
-          )) {
-            await this.#waitForRetryWindow();
+          ) && this.#retryBudget.tryWithdraw()) {
+            await new Promise(
+              (resolve) => setTimeout(
+                resolve,
+                retryDelayMs(attempt, {
+                  initialDelayMs: 25,
+                  maxDelayMs: 1e3,
+                  hintMs: retryAfterMs(err)
+                })
+              )
+            );
             continue;
           }
           if (await this.#shouldRetrySchedulingError(
@@ -3016,7 +3093,10 @@ var ActorHandleRaw = class {
       if (opts.name === "destroy") {
         return await run();
       }
-      return await retryOnLifecycleBoundary(run, { signal });
+      return await retryOnLifecycleBoundary(run, {
+        signal,
+        budget: this.#retryBudget
+      });
     };
     if (!call) {
       return await send();
@@ -3046,13 +3126,13 @@ var ActorHandleRaw = class {
           gatewayOptions
         );
         actorId = "directId" in target ? target.directId : void 0;
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug(
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug(
           actorId ? { msg: "using direct actor gateway target", actorId } : {
             msg: "using query gateway target for action",
             query: this.#actorResolutionState
           }
         );
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
           msg: "handling action",
           name: opts.name,
           encoding: this.#encoding
@@ -3089,19 +3169,19 @@ var ActorHandleRaw = class {
             args
           }),
           requestToBare: (args) => ({
-            args: _chunk2BIRGEIUcjs.bufferToArrayBuffer.call(void 0, 
-              _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, args)
+            args: _chunkXSOHGU4Gcjs.bufferToArrayBuffer.call(void 0, 
+              _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, args)
             )
           }),
           responseFromJson: (json) => json.output,
-          responseFromBare: (bare5) => _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.output))
+          responseFromBare: (bare5) => _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.output))
         });
         if (opts.name === "destroy" && actorId) {
           await this.#waitForDestroyActionToSettle(actorId);
         }
         return output;
       } catch (err) {
-        const { group, code, message, metadata, rayId, actor } = _chunk2BIRGEIUcjs.deconstructError.call(void 0, err, true);
+        const { group, code, message, metadata, rayId, actor } = _chunkXSOHGU4Gcjs.deconstructError.call(void 0, err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
@@ -3257,7 +3337,7 @@ var ActorHandleRaw = class {
    * @returns {ActorConn<AD>} A connection to the actor.
    */
   connect(params, options = {}) {
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "establishing connection from handle",
       query: this.#actorResolutionState
     });
@@ -3334,7 +3414,7 @@ var ActorHandleRaw = class {
         }
         return response;
       } catch (err) {
-        const { group, code, message, metadata, rayId, actor } = _chunk2BIRGEIUcjs.deconstructError.call(void 0, err, true);
+        const { group, code, message, metadata, rayId, actor } = _chunkXSOHGU4Gcjs.deconstructError.call(void 0, err, true);
         if (await this.#shouldRetrySchedulingError(
           group,
           code,
@@ -3430,7 +3510,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 {
-      const error = _chunk2BIRGEIUcjs.deserializeWithEncoding.call(void 0, 
+      const error = _chunkXSOHGU4Gcjs.deserializeWithEncoding.call(void 0, 
         encoding,
         new Uint8Array(await response.clone().arrayBuffer()),
         HTTP_RESPONSE_ERROR_VERSIONED,
@@ -3446,7 +3526,7 @@ var ActorHandleRaw = class {
           group: bare5.group,
           code: bare5.code,
           message: bare5.message,
-          metadata: bare5.metadata ? _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
+          metadata: bare5.metadata ? _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, new Uint8Array(bare5.metadata)) : void 0,
           actor: bare5.actor ? {
             actorId: bare5.actor.actorId,
             generation: Number(bare5.actor.generation),
@@ -3558,6 +3638,7 @@ var ClientRaw = (_class = class {
   #gatewayOptions;
   #currentActorInvocation;
   #startCallSpan;
+  #retryBudget;
   /**
    * Creates an instance of Client.
    */
@@ -3570,6 +3651,7 @@ var ClientRaw = (_class = class {
     this.#gatewayOptions = _nullishCoalesce(options.gateway, () => ( {}));
     this.#currentActorInvocation = options.currentActorInvocation;
     this.#startCallSpan = options.startCallSpan;
+    this.#retryBudget = new RetryBudget(options.retryBudget);
   }
   /**
    * Gets a stateless handle to a actor by its ID.
@@ -3581,7 +3663,7 @@ var ClientRaw = (_class = class {
    * @returns {ActorHandle<AD>} - A handle to the actor.
    */
   getForId(name, actorId, opts) {
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor with id",
       name,
       actorId,
@@ -3612,7 +3694,7 @@ var ClientRaw = (_class = class {
    */
   get(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "get handle to actor",
       name,
       key: keyArray,
@@ -3643,7 +3725,7 @@ var ClientRaw = (_class = class {
    */
   getOrCreate(name, key, opts) {
     const keyArray = typeof key === "string" ? [key] : key || [];
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "get or create handle to actor",
       name,
       key: keyArray,
@@ -3687,7 +3769,7 @@ var ClientRaw = (_class = class {
         key: keyArray
       }
     };
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "create actor handle",
       name,
       key: keyArray,
@@ -3695,7 +3777,7 @@ var ClientRaw = (_class = class {
       create: createQuery.create
     });
     const actorId = await resolveGatewayTarget(this.#driver, createQuery);
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "created actor with ID",
       name,
       key: keyArray,
@@ -3727,7 +3809,8 @@ var ClientRaw = (_class = class {
       this.#gatewayOptions,
       signal,
       this.#currentActorInvocation,
-      this.#startCallSpan
+      this.#startCallSpan,
+      this.#retryBudget
     );
   }
   [CREATE_ACTOR_CONN_PROXY](conn) {
@@ -3742,11 +3825,11 @@ var ClientRaw = (_class = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({ msg: "client already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({ msg: "disposing client" });
     const disposePromises = [];
     for (const conn of this[ACTOR_CONNS_SYMBOL].values()) {
       disposePromises.push(conn.dispose());
@@ -3927,6 +4010,10 @@ function jwtExpiration(token) {
 }
 
 // src/client/actor-conn.ts
+var CONNECT_TIMEOUT_MS = 2e4;
+function isConnectionOpenTimeout(error) {
+  return error instanceof _chunkMGI2VVF6cjs.RivetError && error.group === "client" && error.code === "connection_open_timeout";
+}
 var CONNECT_SYMBOL = /* @__PURE__ */ Symbol("connect");
 var ActorConnRaw = class {
   #disposed = false;
@@ -3954,6 +4041,8 @@ var ActorConnRaw = class {
   #keepNodeAliveInterval;
   /** Promise used to indicate the socket has connected successfully. This will be rejected if the connection fails. */
   #onOpenPromise;
+  /** Sockets given up on by the connect timeout. Their late events are ignored. */
+  #abandonedSockets = /* @__PURE__ */ new WeakSet();
   #websocket;
   #authRetryAvailable = true;
   #client;
@@ -3984,8 +4073,8 @@ var ActorConnRaw = class {
     if ("getForId" in actorResolutionState) {
       this.#actorId = actorResolutionState.getForId.actorId;
     }
-    this.#readyPromise = _chunk2BIRGEIUcjs.promiseWithResolvers.call(void 0, 
-      (reason) => _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+    this.#readyPromise = _chunkXSOHGU4Gcjs.promiseWithResolvers.call(void 0, 
+      (reason) => _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
         msg: "unhandled ready promise rejection",
         reason
       })
@@ -4052,11 +4141,11 @@ var ActorConnRaw = class {
         `Invalid action call: expected an options object { name, args }, got ${typeof opts}. Use conn.actionName(...args) for the shorthand API.`
       );
     }
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({ msg: "action", name: opts.name, args: opts.args });
     const actionId = this.#actionIdCounter;
     this.#actionIdCounter += 1;
-    const { promise, resolve, reject } = _chunk2BIRGEIUcjs.promiseWithResolvers.call(void 0, 
-      (reason) => _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+    const { promise, resolve, reject } = _chunkXSOHGU4Gcjs.promiseWithResolvers.call(void 0, 
+      (reason) => _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
         msg: "unhandled action promise rejection",
         reason
       })
@@ -4066,7 +4155,7 @@ var ActorConnRaw = class {
       resolve,
       reject
     });
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "added action to in-flight map",
       actionId,
       actionName: opts.name,
@@ -4106,9 +4195,9 @@ var ActorConnRaw = class {
       try {
         handler(status);
       } catch (err) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "error in status change handler",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -4118,9 +4207,9 @@ var ActorConnRaw = class {
         try {
           handler();
         } catch (err) {
-          _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+          _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
             msg: "error in open handler",
-            error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+            error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
           });
         }
       }
@@ -4130,9 +4219,9 @@ var ActorConnRaw = class {
         try {
           handler();
         } catch (err) {
-          _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+          _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
             msg: "error in close handler",
-            error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+            error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
           });
         }
       }
@@ -4144,22 +4233,26 @@ var ActorConnRaw = class {
       forever: true,
       minTimeout: 250,
       maxTimeout: 3e4,
-      onFailedAttempt: (error) => {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+      onFailedAttempt: async (error) => {
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
           msg: "failed to reconnect",
           attempt: error.attemptNumber,
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, error)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)
         });
+        const hintMs = retryAfterMs(error);
+        if (hintMs !== void 0) {
+          await new Promise((resolve) => setTimeout(resolve, hintMs));
+        }
       },
       // Cancel retry if aborted
       signal: this.#abortController.signal
     }).catch((err) => {
       if (err instanceof _pretry.AbortError || err.name === "AbortError" || !this.#shouldRetryConnectionOpenError(err)) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).info({ msg: "connection retry aborted" });
       } else {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "unexpected error in connection retry",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -4168,14 +4261,14 @@ var ActorConnRaw = class {
     try {
       if (this.#onOpenPromise)
         throw new Error("#onOpenPromise already defined");
-      this.#onOpenPromise = _chunk2BIRGEIUcjs.promiseWithResolvers.call(void 0, 
-        (reason) => _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+      this.#onOpenPromise = _chunkXSOHGU4Gcjs.promiseWithResolvers.call(void 0, 
+        (reason) => _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
           msg: "unhandled open promise rejection",
           reason
         })
       );
       await this.#connectWebSocket();
-      await this.#onOpenPromise.promise;
+      await this.#waitForOpen(this.#onOpenPromise.promise);
     } catch (error) {
       if (this.#shouldRetryConnectionOpenError(error)) {
         throw error;
@@ -4183,24 +4276,77 @@ var ActorConnRaw = class {
       const actorError = error instanceof _chunkMGI2VVF6cjs.RivetError ? error : new (0, _chunkMGI2VVF6cjs.RivetError)(
         "client",
         "connection_open_failed",
-        `Failed to open connection: ${_chunk2BIRGEIUcjs.stringifyError.call(void 0, error)}`,
-        { error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, error) }
+        `Failed to open connection: ${_chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)}`,
+        { error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error) }
       );
       this.#clearQueuedMessages();
       this.#rejectPendingPromises(actorError, false);
       this.#dispatchActorError(actorError);
       this.#setConnStatus("idle");
       throw new (0, _pretry.AbortError)(
-        error instanceof Error ? error : new Error(_chunk2BIRGEIUcjs.stringifyError.call(void 0, error))
+        error instanceof Error ? error : new Error(_chunkXSOHGU4Gcjs.stringifyError.call(void 0, error))
       );
     } finally {
       this.#onOpenPromise = void 0;
     }
   }
+  /**
+   * Waits for the actor's Init on the current socket, up to {@link CONNECT_TIMEOUT_MS}. A socket
+   * can stay connecting with no open, error or close event, as when the engine holds the
+   * upgrade or a refused connect reports only an error. On timeout the socket is abandoned
+   * and closed, and the retryable `client.connection_open_timeout` starts the next attempt.
+   */
+  async #waitForOpen(open) {
+    let timer;
+    const timedOut = new Promise((_, reject) => {
+      timer = setTimeout(() => {
+        reject(
+          new (0, _chunkMGI2VVF6cjs.RivetError)(
+            "client",
+            "connection_open_timeout",
+            `Connection did not open within ${CONNECT_TIMEOUT_MS} ms`
+          )
+        );
+      }, CONNECT_TIMEOUT_MS);
+    });
+    try {
+      await Promise.race([open, timedOut]);
+    } catch (error) {
+      if (isConnectionOpenTimeout(error)) {
+        this.#abandonCurrentSocket();
+      }
+      throw error;
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  #abandonCurrentSocket() {
+    const ws = this.#websocket;
+    if (!ws) return;
+    this.#websocket = void 0;
+    this.#abandonedSockets.add(ws);
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
+      msg: "connection did not open in time, retrying",
+      connId: this.#connId,
+      readyState: ws.readyState,
+      timeoutMs: CONNECT_TIMEOUT_MS
+    });
+    try {
+      ws.close(1e3, "Connect timeout");
+    } catch (err) {
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
+        msg: "failed to close abandoned websocket",
+        error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
+      });
+    }
+  }
   #shouldRetryConnectionOpenError(error) {
     if (error instanceof ActorConnDisposed) {
       return false;
     }
+    if (isConnectionOpenTimeout(error)) {
+      return true;
+    }
     if (error instanceof _chunkMGI2VVF6cjs.RivetError && isInvalidToken(error.group, error.code) && this.#driver.refreshAuthToken && this.#authRetryAvailable) {
       this.#authRetryAvailable = false;
       return true;
@@ -4215,7 +4361,7 @@ var ActorConnRaw = class {
   }
   #clearQueuedMessages() {
     if (this.#messageQueue.length === 0) return;
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "clearing queued connection messages",
       queueLength: this.#messageQueue.length
     });
@@ -4228,7 +4374,7 @@ var ActorConnRaw = class {
     try {
       return await this.#getParams();
     } catch (err) {
-      const errorMessage = _chunk2BIRGEIUcjs.stringifyError.call(void 0, err);
+      const errorMessage = _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err);
       const error = new (0, _chunkMGI2VVF6cjs.RivetError)(
         "client",
         "get_params_failed",
@@ -4252,7 +4398,7 @@ var ActorConnRaw = class {
       this.#gatewayOptions
     );
     _invariant2.default.call(void 0, ws, "websocket should have been created");
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "opened websocket",
       connId: this.#connId,
       readyState: ws.readyState,
@@ -4260,38 +4406,42 @@ var ActorConnRaw = class {
     });
     this.#websocket = ws;
     ws.addEventListener("open", () => {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      if (this.#abandonedSockets.has(ws)) return;
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "client websocket open",
         connId: this.#connId
       });
     });
     ws.addEventListener("message", async (ev) => {
+      if (this.#abandonedSockets.has(ws)) return;
       try {
         await this.#handleOnMessage(ev.data);
       } catch (err) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "error in websocket message handler",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     });
     ws.addEventListener("close", async (ev) => {
+      if (this.#abandonedSockets.has(ws)) return;
       try {
         await this.#handleOnClose(ev);
       } catch (err) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "error in websocket close handler",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     });
     ws.addEventListener("error", () => {
+      if (this.#abandonedSockets.has(ws)) return;
       try {
         this.#handleOnError();
       } catch (err) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "error in websocket error handler",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     });
@@ -4299,7 +4449,7 @@ var ActorConnRaw = class {
   /** Called by the onopen event from drivers. */
   #handleOnOpen() {
     if (this.#disposed) {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "handleOnOpen called after dispose, closing websocket"
       });
       if (this.#websocket) {
@@ -4315,7 +4465,7 @@ var ActorConnRaw = class {
     queueMicrotask(() => {
       this.#openScheduled = false;
       if (this.#disposed) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
           msg: "handleOnOpen scheduled after dispose, closing websocket"
         });
         if (this.#websocket) {
@@ -4324,7 +4474,7 @@ var ActorConnRaw = class {
         }
         return;
       }
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "socket open",
         messageQueueLength: this.#messageQueue.length,
         connId: this.#connId
@@ -4334,14 +4484,14 @@ var ActorConnRaw = class {
       if (this.#onOpenPromise) {
         this.#onOpenPromise.resolve(void 0);
       } else {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({ msg: "#onOpenPromise is undefined" });
       }
       for (const eventName of this.#eventSubscriptions.keys()) {
         this.#sendSubscription(eventName, true);
       }
       const queue = this.#messageQueue;
       this.#messageQueue = [];
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "flushing message queue",
         queueLength: queue.length
       });
@@ -4353,23 +4503,23 @@ var ActorConnRaw = class {
   /** Called by the onmessage event from drivers. */
   async #handleOnMessage(data) {
     var _a;
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).trace({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).trace({
       msg: "received message",
       dataType: typeof data,
       isBlob: data instanceof Blob,
       isArrayBuffer: data instanceof ArrayBuffer
     });
     const response = await this.#parseMessage(data);
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).trace(
-      _chunk2BIRGEIUcjs.getLogMessage.call(void 0, ) ? {
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).trace(
+      _chunkXSOHGU4Gcjs.getLogMessage.call(void 0, ) ? {
         msg: "parsed message",
-        message: _chunk2BIRGEIUcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
+        message: _chunkXSOHGU4Gcjs.jsonStringifyCompat.call(void 0, response).substring(0, 100) + "..."
       } : { msg: "parsed message" }
     );
     if (response.body.tag === "Init") {
       this.#actorId = response.body.val.actorId;
       this.#connId = response.body.val.connectionId;
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).trace({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).trace({
         msg: "received init message",
         actorId: this.#actorId,
         connId: this.#connId
@@ -4380,7 +4530,7 @@ var ActorConnRaw = class {
       if (actionId !== null) {
         const inFlight = this.#takeActionInFlight(Number(actionId));
         this.#invalidateActorIfStale(group, code);
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
           msg: "action error",
           actionId,
           actionName: inFlight == null ? void 0 : inFlight.name,
@@ -4399,7 +4549,7 @@ var ActorConnRaw = class {
           })
         );
       } else {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
           msg: "connection error",
           group,
           code,
@@ -4447,27 +4597,27 @@ var ActorConnRaw = class {
       }
     } else if (response.body.tag === "ActionResponse") {
       const { id: actionId } = response.body.val;
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "received action response",
         actionId: Number(actionId),
         inFlightCount: this.#actionsInFlight.size,
         inFlightIds: Array.from(this.#actionsInFlight.keys())
       });
       const inFlight = this.#takeActionInFlight(Number(actionId));
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).trace({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).trace({
         msg: "resolving action promise",
         actionId,
         actionName: inFlight == null ? void 0 : inFlight.name
       });
       inFlight.resolve(response.body.val);
     } else if (response.body.tag === "Event") {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).trace({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).trace({
         msg: "received event",
         name: response.body.val.name
       });
       this.#dispatchEvent(response.body.val);
     } else {
-      _chunk2BIRGEIUcjs.assertUnreachable.call(void 0, response.body);
+      _chunkXSOHGU4Gcjs.assertUnreachable.call(void 0, response.body);
     }
   }
   /** Called by the onclose event from drivers. */
@@ -4477,7 +4627,7 @@ var ActorConnRaw = class {
     const closeEvent = event;
     const wasClean = closeEvent.wasClean;
     const wasConnected = this.#connStatus === "connected";
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).info({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).info({
       msg: "socket closed",
       code: closeEvent.code,
       reason: closeEvent.reason,
@@ -4494,7 +4644,8 @@ var ActorConnRaw = class {
       const reason = closeEvent.reason || "";
       const parsed = parseWebSocketCloseReason(reason);
       if (parsed) {
-        const { group, code, rayId } = parsed;
+        const { group, code, rayId, retryAfterMs: retryAfterMs2 } = parsed;
+        const closeOptions = retryAfterMs2 === void 0 ? { rayId } : { rayId, metadata: { retry_after_ms: retryAfterMs2 } };
         if (isInvalidToken(group, code) && closeEvent.code === 1008 && failedSocket) {
           try {
             if (!await ((_b = (_a = this.#driver).refreshAuthToken) == null ? void 0 : _b.call(
@@ -4504,7 +4655,7 @@ var ActorConnRaw = class {
               this.#authRetryAvailable = false;
             }
           } catch (e4) {
-            _chunk5SN6GAYXcjs.logger.call(void 0, ).warn("token renewal failed");
+            _chunk3SPYZMMEcjs.logger.call(void 0, ).warn("token renewal failed");
             this.#authRetryAvailable = false;
           }
         } else if (isInvalidToken(group, code)) {
@@ -4517,7 +4668,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              { rayId }
+              closeOptions
             )
           );
           return;
@@ -4538,7 +4689,7 @@ var ActorConnRaw = class {
               group,
               code,
               `Connection closed: ${reason}`,
-              { rayId }
+              closeOptions
             );
           }
         } else {
@@ -4546,7 +4697,7 @@ var ActorConnRaw = class {
             group,
             code,
             `Connection closed: ${reason}`,
-            { rayId }
+            closeOptions
           );
         }
         this.#invalidateActorIfStale(group, code);
@@ -4560,7 +4711,7 @@ var ActorConnRaw = class {
         this.#dispatchActorError(error);
       }
       if (wasConnected && this.#authRetryAvailable) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
           msg: "triggering reconnect",
           connId: this.#connId
         });
@@ -4584,12 +4735,12 @@ var ActorConnRaw = class {
   /** Called by the onerror event from drivers. */
   #handleOnError() {
     if (this.#disposed) return;
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).warn("socket error");
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).warn("socket error");
   }
   #takeActionInFlight(id) {
     const inFlight = this.#actionsInFlight.get(id);
     if (!inFlight) {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
         msg: "action not found in in-flight map",
         lookupId: id,
         inFlightCount: this.#actionsInFlight.size,
@@ -4604,7 +4755,7 @@ var ActorConnRaw = class {
       throw internalClientError(`No in flight response for ${id}`);
     }
     this.#actionsInFlight.delete(id);
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
       msg: "removed action from in-flight map",
       actionId: id,
       actionName: inFlight.name,
@@ -4631,9 +4782,9 @@ var ActorConnRaw = class {
       try {
         handler(error);
       } catch (err) {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
           msg: "error in connection error handler",
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
         });
       }
     }
@@ -4738,9 +4889,9 @@ var ActorConnRaw = class {
         try {
           callback();
         } catch (err) {
-          _chunk5SN6GAYXcjs.logger.call(void 0, ).error({
+          _chunk3SPYZMMEcjs.logger.call(void 0, ).error({
             msg: "error in open handler",
-            error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, err)
+            error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, err)
           });
         }
       });
@@ -4790,7 +4941,7 @@ var ActorConnRaw = class {
     let queueMessage = false;
     if (this.#websocket) {
       const readyState = this.#websocket.readyState;
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "websocket send attempt",
         readyState,
         readyStateString: readyState === 0 ? "CONNECTING" : readyState === 1 ? "OPEN" : readyState === 2 ? "CLOSING" : "CLOSED",
@@ -4799,7 +4950,7 @@ var ActorConnRaw = class {
         actionName: (_a = message.body.val) == null ? void 0 : _a.name
       });
       if (this.#connStatus !== "connected") {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
           msg: "websocket init pending, queueing message",
           connStatus: this.#connStatus,
           messageType: message.body.tag
@@ -4807,7 +4958,7 @@ var ActorConnRaw = class {
         queueMessage = true;
       } else if (readyState === 1) {
         try {
-          const messageSerialized = _chunk2BIRGEIUcjs.serializeWithEncoding.call(void 0, 
+          const messageSerialized = _chunkXSOHGU4Gcjs.serializeWithEncoding.call(void 0, 
             this.#encoding,
             message,
             CLIENT_PROTOCOL_TO_SERVER,
@@ -4824,8 +4975,8 @@ var ActorConnRaw = class {
                     val: {
                       id: msg.body.val.id,
                       name: msg.body.val.name,
-                      args: _chunk2BIRGEIUcjs.bufferToArrayBuffer.call(void 0, 
-                        _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, 
+                      args: _chunkXSOHGU4Gcjs.bufferToArrayBuffer.call(void 0, 
+                        _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, 
                           msg.body.val.args
                         )
                       )
@@ -4839,12 +4990,12 @@ var ActorConnRaw = class {
           );
           this.#websocket.send(messageSerialized);
           const serializedLength = messageLength(messageSerialized);
-          _chunk5SN6GAYXcjs.logger.call(void 0, ).trace({
+          _chunk3SPYZMMEcjs.logger.call(void 0, ).trace({
             msg: "sent websocket message",
             len: serializedLength
           });
         } catch (error) {
-          _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+          _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
             msg: "failed to send message, added to queue",
             error,
             connId: this.#connId
@@ -4852,19 +5003,19 @@ var ActorConnRaw = class {
           queueMessage = true;
         }
       } else {
-        _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+        _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
           msg: "websocket not open, queueing message",
           readyState
         });
         queueMessage = true;
       }
     } else {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({ msg: "no websocket, queueing message" });
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({ msg: "no websocket, queueing message" });
       queueMessage = true;
     }
     if (!(opts == null ? void 0 : opts.ephemeral) && queueMessage) {
       this.#messageQueue.push(message);
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({
         msg: "queued connection message",
         queueLength: this.#messageQueue.length,
         connId: this.#connId,
@@ -4875,8 +5026,8 @@ var ActorConnRaw = class {
   }
   async #parseMessage(data) {
     _invariant2.default.call(void 0, this.#websocket, "websocket must be defined");
-    const buffer = await _chunk2BIRGEIUcjs.inputDataToBuffer.call(void 0, data);
-    return _chunk2BIRGEIUcjs.deserializeWithEncoding.call(void 0, 
+    const buffer = await _chunkXSOHGU4Gcjs.inputDataToBuffer.call(void 0, data);
+    return _chunkXSOHGU4Gcjs.deserializeWithEncoding.call(void 0, 
       this.#encoding,
       buffer,
       CLIENT_PROTOCOL_TO_CLIENT,
@@ -4911,7 +5062,7 @@ var ActorConnRaw = class {
                 group: msg.body.val.group,
                 code: msg.body.val.code,
                 message: msg.body.val.message,
-                metadata: msg.body.val.metadata ? _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, 
+                metadata: msg.body.val.metadata ? _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(
                     msg.body.val.metadata
                   )
@@ -4933,7 +5084,7 @@ var ActorConnRaw = class {
               tag: "ActionResponse",
               val: {
                 id: msg.body.val.id,
-                output: _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, 
+                output: _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(msg.body.val.output)
                 )
               }
@@ -4945,7 +5096,7 @@ var ActorConnRaw = class {
               tag: "Event",
               val: {
                 name: msg.body.val.name,
-                args: _chunk2BIRGEIUcjs.decodeCborCompat.call(void 0, 
+                args: _chunkXSOHGU4Gcjs.decodeCborCompat.call(void 0, 
                   new Uint8Array(msg.body.val.args)
                 )
               }
@@ -4986,11 +5137,11 @@ var ActorConnRaw = class {
    */
   async dispose() {
     if (this.#disposed) {
-      _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
+      _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({ msg: "connection already disconnected" });
       return;
     }
     this.#disposed = true;
-    _chunk5SN6GAYXcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
+    _chunk3SPYZMMEcjs.logger.call(void 0, ).debug({ msg: "disposing actor conn" });
     this.#setConnStatus("idle");
     clearInterval(this.#keepNodeAliveInterval);
     this.#abortController.abort();
@@ -4998,8 +5149,8 @@ var ActorConnRaw = class {
     if (this.#websocket) {
       const ws = this.#websocket;
       if (ws.readyState !== 2 && ws.readyState !== 3) {
-        const { promise, resolve } = _chunk2BIRGEIUcjs.promiseWithResolvers.call(void 0, 
-          (reason) => _chunk5SN6GAYXcjs.logger.call(void 0, ).warn({
+        const { promise, resolve } = _chunkXSOHGU4Gcjs.promiseWithResolvers.call(void 0, 
+          (reason) => _chunk3SPYZMMEcjs.logger.call(void 0, ).warn({
             msg: "unhandled websocket close promise rejection",
             reason
           })
@@ -5137,7 +5288,7 @@ var ClientConfigSchemaBase = _v42.default.object({
    * Defaults to http://localhost:6420.
    */
   endpoint: _v42.default.string().optional().transform((val) => {
-    const resolved = _nullishCoalesce(_nullishCoalesce(val, () => ( _chunk2BIRGEIUcjs.getRivetEngine.call(void 0, ))), () => ( _chunk2BIRGEIUcjs.getRivetEndpoint.call(void 0, )));
+    const resolved = _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkXSOHGU4Gcjs.getRivetEngine.call(void 0, ))), () => ( _chunkXSOHGU4Gcjs.getRivetEndpoint.call(void 0, )));
     if (!resolved && !hasWarnedMissingEndpoint) {
       hasWarnedMissingEndpoint = true;
       console.warn(
@@ -5147,14 +5298,14 @@ var ClientConfigSchemaBase = _v42.default.object({
     return _nullishCoalesce(resolved, () => ( DEFAULT_ENDPOINT));
   }),
   /** Token to use to authenticate with the API. */
-  token: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk2BIRGEIUcjs.getRivetToken.call(void 0, )))),
+  token: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkXSOHGU4Gcjs.getRivetToken.call(void 0, )))),
   /** Issue and renew a client token on demand. Overrides the static token when provided. */
   getToken: _v42.default.custom().optional(),
   /** Namespace to connect to. */
-  namespace: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk2BIRGEIUcjs.getRivetNamespace.call(void 0, )))),
+  namespace: _v42.default.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkXSOHGU4Gcjs.getRivetNamespace.call(void 0, )))),
   /** Name of the envoy pool. This is used to group together envoys in to different pools. */
-  poolName: _v42.default.string().default(() => _nullishCoalesce(_chunk2BIRGEIUcjs.getRivetPool.call(void 0, ), () => ( "default"))),
-  encoding: _chunk2BIRGEIUcjs.EncodingSchema.default("bare"),
+  poolName: _v42.default.string().default(() => _nullishCoalesce(_chunkXSOHGU4Gcjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  encoding: _chunkXSOHGU4Gcjs.EncodingSchema.default("bare"),
   headers: _v42.default.record(_v42.default.string(), _v42.default.string()).optional().default(() => ({})),
   gateway: _v42.default.object({
     skipReadyWait: _v42.default.boolean().optional().default(false)
@@ -5164,6 +5315,14 @@ var ClientConfigSchemaBase = _v42.default.object({
   // This is required in the client config in order to support
   // `proxyWebSocket`
   getUpgradeWebSocket: _v42.default.custom().optional(),
+  /**
+   * Bounds retries of refused requests: `percent` retries per 100 requests (default 10), with
+   * up to `maxTokens` banked for bursts (default 100). A refusal past the budget is thrown.
+   */
+  retryBudget: _v42.default.object({
+    percent: _v42.default.number().min(0).max(100).optional(),
+    maxTokens: _v42.default.number().int().min(0).optional()
+  }).optional(),
   /** Replaces global fetch for actor HTTP gateway requests. */
   fetch: _v42.default.custom().optional(),
   /** Whether to automatically perform health checks when the client is created. */
@@ -5206,7 +5365,7 @@ function convertRegistryConfigToClientConfig(config) {
     token: config.token,
     getToken: void 0,
     namespace: config.namespace,
-    poolName: config.envoy.poolName,
+    poolName: config.node.poolName,
     headers: config.headers,
     gateway: { skipReadyWait: false },
     encoding: "bare",
@@ -5331,7 +5490,7 @@ function setRemoteHibernatableWebSocketAckTestHooks(websocket, token, enabled) {
 
 // src/engine-client/log.ts
 function logger2() {
-  return _chunk2BIRGEIUcjs.getLogger.call(void 0, "engine-client");
+  return _chunkXSOHGU4Gcjs.getLogger.call(void 0, "engine-client");
 }
 
 // src/engine-client/actor-websocket-client.ts
@@ -5464,7 +5623,7 @@ var BufferedRemoteWebSocket = (_class2 = class {
 function buildActorGatewayUrl(endpoint, actorId, token, path = "") {
   const tokenSegment = token !== void 0 ? `@${encodeURIComponent(token)}` : "";
   const gatewayPath = `/gateway/${encodeURIComponent(actorId)}${tokenSegment}${path}`;
-  return _chunk2BIRGEIUcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
+  return _chunkXSOHGU4Gcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
 }
 function buildActorQueryGatewayUrl(endpoint, namespace, query, token, path = "", maxInputSize = DEFAULT_MAX_QUERY_INPUT_SIZE, crashPolicy = void 0, runnerName, options = {}) {
   if (namespace.length === 0) {
@@ -5530,18 +5689,19 @@ function buildActorQueryGatewayUrl(endpoint, namespace, query, token, path = "",
     separator = "?";
   }
   const gatewayPath = `/gateway/${encodeURIComponent(name)}${path}${separator}${queryString}`;
-  return _chunk2BIRGEIUcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
+  return _chunkXSOHGU4Gcjs.combineUrlPath.call(void 0, endpoint, gatewayPath);
 }
 function pushKeyQueryParams(params, key) {
-  if (key.length > 0) {
-    params.append("rvt-key", key.join(","));
+  const rvtKey = _chunkRTWH3AX3cjs.actorKeyToGatewayQuery.call(void 0, key);
+  if (rvtKey !== void 0) {
+    params.append("rvt-key", rvtKey);
   }
 }
 function pushInputQueryParam(params, input, maxInputSize) {
   if (input === void 0) {
     return;
   }
-  const encodedInput = _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, input);
+  const encodedInput = _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, input);
   if (encodedInput.byteLength > maxInputSize) {
     throw new Error(
       `Actor query input exceeds maxInputSize (${encodedInput.byteLength} > ${maxInputSize} bytes). Increase client maxInputSize to allow larger query payloads.`
@@ -5550,10 +5710,10 @@ function pushInputQueryParam(params, input, maxInputSize) {
   params.append("rvt-input", uint8ArrayToBase64Url(encodedInput));
 }
 function uint8ArrayToBase64Url(value) {
-  return _chunk2BIRGEIUcjs.uint8ArrayToBase64.call(void 0, value).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+  return _chunkXSOHGU4Gcjs.uint8ArrayToBase64.call(void 0, value).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
 async function openWebSocketToGateway(runConfig, gatewayUrl, encoding, params, options = {}) {
-  const WebSocket2 = await _chunk5SN6GAYXcjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunk3SPYZMMEcjs.importWebSocket.call(void 0, );
   const ackHookToken = typeof process !== "undefined" && process.env.VITEST ? crypto.randomUUID() : void 0;
   logger2().debug({
     msg: "opening websocket to actor via guard",
@@ -5621,7 +5781,7 @@ function getEndpoint(config) {
 }
 async function apiCall(config, method, path, body) {
   const endpoint = getEndpoint(config);
-  const url = _chunk2BIRGEIUcjs.combineUrlPath.call(void 0, endpoint, path, {
+  const url = _chunkXSOHGU4Gcjs.combineUrlPath.call(void 0, endpoint, path, {
     namespace: config.namespace
   });
   logger2().debug({ msg: "making api call", method, url });
@@ -5669,7 +5829,7 @@ async function getActor(config, _, actorId) {
   );
 }
 async function getActorByKey(config, name, key) {
-  const serializedKey = _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key);
+  const serializedKey = _chunkRTWH3AX3cjs.serializeActorKey.call(void 0, key);
   return apiCall(
     config,
     "GET",
@@ -5716,8 +5876,8 @@ async function updateRunnerConfig(config, runnerName, request) {
   return apiCall(
     config,
     "PUT",
-    `/runner-configs/${runnerName}`,
-    request
+    `/pools/${encodeURIComponent(runnerName)}`,
+    Object.values(request.datacenters)[0]
   );
 }
 
@@ -5754,7 +5914,7 @@ async function lookupMetadataCached(config) {
             msg: "failed to fetch metadata, retrying",
             endpoint,
             attempt: error.attemptNumber,
-            error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, error)
+            error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)
           });
         }
       }
@@ -5766,7 +5926,7 @@ async function lookupMetadataCached(config) {
 
 // src/engine-client/ws-proxy.ts
 async function createWebSocketProxy(_c, targetUrl, protocols) {
-  const WebSocket2 = await _chunk5SN6GAYXcjs.importWebSocket.call(void 0, );
+  const WebSocket2 = await _chunk3SPYZMMEcjs.importWebSocket.call(void 0, );
   const state = {};
   return {
     onOpen: async (_event, clientWs) => {
@@ -5831,7 +5991,7 @@ async function createWebSocketProxy(_c, targetUrl, protocols) {
         logger2().error({
           msg: "target websocket error",
           targetUrl,
-          error: _chunk2BIRGEIUcjs.stringifyError.call(void 0, error)
+          error: _chunkXSOHGU4Gcjs.stringifyError.call(void 0, error)
         });
         closeWebSocketIfOpen(clientWs, 1011, "Target WebSocket error");
       });
@@ -5912,7 +6072,7 @@ var RemoteEngineControlClient = class {
   #tokenProvider;
   #webSocketTokens = /* @__PURE__ */ new WeakMap();
   constructor(runConfig) {
-    if (_chunk2BIRGEIUcjs.getNextPhase.call(void 0, ) === "phase-production-build") {
+    if (_chunkXSOHGU4Gcjs.getNextPhase.call(void 0, ) === "phase-production-build") {
       logger2().info(
         "detected next.js build phase, disabling health check"
       );
@@ -6049,10 +6209,10 @@ var RemoteEngineControlClient = class {
         (config) => getOrCreateActor(config, {
           datacenter: region,
           name,
-          key: _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key),
-          runner_name_selector: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
-          input: actorInput ? _chunk2BIRGEIUcjs.uint8ArrayToBase64.call(void 0, 
-            _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, actorInput)
+          key: _chunkRTWH3AX3cjs.serializeActorKey.call(void 0, key),
+          pool: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
+          input: actorInput ? _chunkXSOHGU4Gcjs.uint8ArrayToBase64.call(void 0, 
+            _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, actorInput)
           ) : void 0,
           crash_policy: _nullishCoalesce(crashPolicy, () => ( "sleep"))
         })
@@ -6103,10 +6263,10 @@ var RemoteEngineControlClient = class {
       (config) => createActor(config, {
         datacenter: region,
         name,
-        runner_name_selector: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
-        key: _chunkMYWZCDMLcjs.serializeActorKey.call(void 0, key),
-        input: input ? _chunk2BIRGEIUcjs.uint8ArrayToBase64.call(void 0, 
-          _chunk2BIRGEIUcjs.encodeCborCompat.call(void 0, input)
+        pool: _nullishCoalesce(poolName, () => ( this.#config.poolName)),
+        key: _chunkRTWH3AX3cjs.serializeActorKey.call(void 0, key),
+        input: input ? _chunkXSOHGU4Gcjs.uint8ArrayToBase64.call(void 0, 
+          _chunkXSOHGU4Gcjs.encodeCborCompat.call(void 0, input)
         ) : void 0,
         crash_policy: _nullishCoalesce(crashPolicy, () => ( "sleep"))
       })
@@ -6238,7 +6398,7 @@ var RemoteEngineControlClient = class {
     const upgradeWebSocket = (_a = config.getUpgradeWebSocket) == null ? void 0 : _a.call(config);
     _invariant2.default.call(void 0, upgradeWebSocket, "missing getUpgradeWebSocket");
     const endpoint = getEndpoint(config);
-    const guardUrl = _chunk2BIRGEIUcjs.combineUrlPath.call(void 0, endpoint, path);
+    const guardUrl = _chunkXSOHGU4Gcjs.combineUrlPath.call(void 0, endpoint, path);
     const wsGuardUrl = guardUrl.replace("http://", "ws://");
     logger2().debug({
       msg: "forwarding websocket to actor via guard",
@@ -6257,7 +6417,7 @@ var RemoteEngineControlClient = class {
       }
     );
     const args = await createWebSocketProxy(c, wsGuardUrl, protocols);
-    return await upgradeWebSocket(() => args)(c, _chunk2BIRGEIUcjs.noopNext.call(void 0, ));
+    return await upgradeWebSocket(() => args)(c, _chunkXSOHGU4Gcjs.noopNext.call(void 0, ));
   }
   displayInformation() {
     return { properties: {} };
@@ -6268,7 +6428,7 @@ var RemoteEngineControlClient = class {
   #buildGatewayUrlForTarget(config, target, path, options = {}) {
     const endpoint = getEndpoint(config);
     if (shouldSkipReadyWait(options) && directActorIdFromTarget(target) && canUseDirectSkipReadyWaitPath(path)) {
-      return _chunk2BIRGEIUcjs.combineUrlPath.call(void 0, endpoint, path);
+      return _chunkXSOHGU4Gcjs.combineUrlPath.call(void 0, endpoint, path);
     }
     if ("directId" in target) {
       return buildActorGatewayUrl(
@@ -6334,7 +6494,7 @@ function apiActorToOutput(actor) {
   return {
     actorId: actor.actor_id,
     name: actor.name,
-    key: _chunkMYWZCDMLcjs.deserializeActorKey.call(void 0, actor.key),
+    key: _chunkRTWH3AX3cjs.deserializeActorKey.call(void 0, actor.key),
     createTs: actor.create_ts,
     startTs: _nullishCoalesce(actor.start_ts, () => ( null)),
     connectableTs: _nullishCoalesce(actor.connectable_ts, () => ( null)),
@@ -6369,4 +6529,4 @@ function apiActorToOutput(actor) {
 
 
 exports.HEADER_CONN_PARAMS = HEADER_CONN_PARAMS; exports.HEADER_ORIGINAL_REQUEST_URL = HEADER_ORIGINAL_REQUEST_URL; exports.ALLOWED_PUBLIC_HEADERS = ALLOWED_PUBLIC_HEADERS; exports.ActorClientError = ActorClientError; exports.ManagerError = ManagerError; exports.MalformedResponseMessage = MalformedResponseMessage; exports.ActorConnDisposed = ActorConnDisposed; exports.readActiveTraceHeaders = readActiveTraceHeaders; exports.runWithActorInvocationSpan = runWithActorInvocationSpan; exports.ActorConnRaw = ActorConnRaw; exports.isResponseLike = isResponseLike; exports.ActorHandleRaw = ActorHandleRaw; exports.createClientWithDriver = createClientWithDriver; exports.ENGINE_HOST = ENGINE_HOST; exports.ENGINE_PORT = ENGINE_PORT; exports.buildEngineEndpoint = buildEngineEndpoint; exports.isLocalEngineEndpoint = isLocalEngineEndpoint; exports.tryParseEndpoint = tryParseEndpoint; exports.ClientConfigSchema = ClientConfigSchema; exports.convertRegistryConfigToClientConfig = convertRegistryConfigToClientConfig; exports.getDatacenters = getDatacenters; exports.updateRunnerConfig = updateRunnerConfig; exports.RemoteEngineControlClient = RemoteEngineControlClient;
-//# sourceMappingURL=chunk-P2PHHJMH.cjs.map
+//# sourceMappingURL=chunk-25MUHNWE.cjs.map