maxpool 1.5.7 → 1.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxpool",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "Multi-account Claude Code proxy with adaptive, rate-aware load balancing across Claude accounts",
   "type": "module",
   "main": "src/index.js",

package/src/restart-controller.js

@@ -1,14 +1,30 @@
 const NON_UPSTREAM_ROUTES = new Set(['(queued)', '(none available)']);
 
 export class RestartController {
-  constructor({ pauseAdmission, restartNow, log = console.log }) {
+  constructor({
+    pauseAdmission,
+    restartNow,
+    log = console.log,
+    // Bounded drain: wait at most this long for in-flight upstream requests to
+    // finish, then force the restart anyway. Without a bound, a single long
+    // streaming/thinking request (minutes) — or a held stream on the 7-day
+    // heartbeat — pins the restart on "Restart pending…" forever (the stuck-`r`
+    // bug). Dropped requests reconnect after restart, as the message promises.
+    drainTimeoutMs = 10_000,
+    setTimeoutFn = setTimeout,
+    clearTimeoutFn = clearTimeout,
+  }) {
     this.pauseAdmission = pauseAdmission;
     this.restartNow = restartNow;
     this.log = log;
+    this.drainTimeoutMs = drainTimeoutMs;
+    this.setTimeoutFn = setTimeoutFn;
+    this.clearTimeoutFn = clearTimeoutFn;
     this.activeRequests = new Set();
     this.upstreamRequests = new Set();
     this.pending = false;
     this.restarting = false;
+    this._drainTimer = null;
   }
 
   requestStarted(id) {
@@ -41,7 +57,14 @@ export class RestartController {
 
     this.pending = true;
     const queuedOrIdle = Math.max(0, this.activeRequests.size - this.upstreamRequests.size);
-    this.log(`[Maxpool] Restart pending; admission paused while ${this.upstreamRequests.size} upstream request(s) finish. ${queuedOrIdle} queued/idle request(s) will reconnect after restart.`);
+    this.log(`[Maxpool] Restart pending; admission paused while ${this.upstreamRequests.size} upstream request(s) finish (up to ${Math.round(this.drainTimeoutMs / 1000)}s). ${queuedOrIdle} queued/idle request(s) will reconnect after restart.`);
+    // Force the restart if the drain overruns — never hang on a long stream.
+    this._drainTimer = this.setTimeoutFn(() => {
+      if (!this.pending || this.restarting) return;
+      this.log(`[Maxpool] Restart drain timed out; forcing restart with ${this.upstreamRequests.size} upstream request(s) still in flight (they will reconnect).`);
+      this._restart();
+    }, this.drainTimeoutMs);
+    this._drainTimer?.unref?.();
   }
 
   _maybeRestart() {
@@ -53,6 +76,10 @@ export class RestartController {
     if (this.restarting) return;
     this.restarting = true;
     this.pending = false;
+    if (this._drainTimer) {
+      this.clearTimeoutFn(this._drainTimer);
+      this._drainTimer = null;
+    }
     this.restartNow();
   }
 }