@madarco/agentbox 0.11.0 → 0.11.2

package/dist/{chunk-GUNUBIRB.js → chunk-ZJXTIH6C.js}

@@ -1870,42 +1870,71 @@ async function loadQueue() {
   out.sort((a, b) => a.createdAt < b.createdAt ? -1 : a.createdAt > b.createdAt ? 1 : 0);
   return out;
 }
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function countInFlightCreateJobs(jobs, accountedBoxIds) {
+  let n = 0;
+  for (const j of jobs) {
+    if (j.status !== "running") continue;
+    if (j.boxId && accountedBoxIds.has(j.boxId)) continue;
+    if (typeof j.pid === "number" && !processAlive(j.pid)) continue;
+    n += 1;
+  }
+  return n;
+}
 var RUNNING_COUNT_CACHE_MS = 3e3;
-var runningCountCache = null;
+var boxStateCache = null;
 async function defaultCountRunningBoxes() {
+  const { boxCount, stateIds } = await cachedBoxState();
+  let jobs;
+  try {
+    jobs = await loadQueue();
+  } catch {
+    return boxCount;
+  }
+  return boxCount + countInFlightCreateJobs(jobs, stateIds);
+}
+async function cachedBoxState() {
   const now = Date.now();
-  if (runningCountCache && runningCountCache.expiresAt > now) {
-    return runningCountCache.value;
+  if (boxStateCache && boxStateCache.expiresAt > now) {
+    return { boxCount: boxStateCache.boxCount, stateIds: boxStateCache.stateIds };
   }
-  const value = await uncachedCountRunningBoxes();
-  runningCountCache = { value, expiresAt: now + RUNNING_COUNT_CACHE_MS };
-  return value;
+  const fresh = await uncachedBoxStateCount();
+  boxStateCache = { ...fresh, expiresAt: now + RUNNING_COUNT_CACHE_MS };
+  return fresh;
 }
-async function uncachedCountRunningBoxes() {
+async function uncachedBoxStateCount() {
   let boxes;
   try {
     boxes = (await readState(STATE_FILE)).boxes;
   } catch {
-    return 0;
+    return { boxCount: 0, stateIds: /* @__PURE__ */ new Set() };
   }
-  if (boxes.length === 0) return 0;
-  let count = 0;
+  const stateIds = new Set(boxes.map((b) => b.id));
+  if (boxes.length === 0) return { boxCount: 0, stateIds };
+  let boxCount = 0;
   const dockerBoxes = [];
   for (const b of boxes) {
     const provider = b.provider ?? "docker";
     if (provider === "docker") {
       dockerBoxes.push(b);
     } else {
-      count += 1;
+      boxCount += 1;
     }
   }
   if (dockerBoxes.length > 0) {
     const states = await Promise.all(dockerBoxes.map((b) => inspectDockerState(b.container)));
     for (const s of states) {
-      if (s === "running") count += 1;
+      if (s === "running") boxCount += 1;
     }
   }
-  return count;
+  return { boxCount, stateIds };
 }
 function inspectDockerState(containerName) {
   return new Promise((resolveP) => {
@@ -5464,7 +5493,7 @@ async function ensureRelay(opts = {}) {
     await reclaimRelay(health.pid, log);
   } else {
     const existingPid = await readPidFile();
-    if (existingPid !== null && await processAlive(existingPid)) {
+    if (existingPid !== null && await processAlive2(existingPid)) {
       for (let i = 0; i < 10; i++) {
         if (await pingHealthz(300)) return ENDPOINT;
         await delay2(200);
@@ -5493,7 +5522,7 @@ async function reclaimRelay(reportedPid, log) {
   for (const pid of [reportedPid, pidFromFile]) {
     if (typeof pid !== "number" || pid <= 0 || seen.has(pid)) continue;
     seen.add(pid);
-    if (!await processAlive(pid)) continue;
+    if (!await processAlive2(pid)) continue;
     log(`stopping crippled relay pid ${String(pid)}`);
     await killPid(pid);
   }
@@ -5512,7 +5541,7 @@ async function killPid(pid) {
     return;
   }
   for (let i = 0; i < 20; i++) {
-    if (!await processAlive(pid)) return;
+    if (!await processAlive2(pid)) return;
     await delay2(100);
   }
   try {
@@ -5663,7 +5692,7 @@ async function stopRelay() {
   if (pid === null) {
     return { stopped: false, pid: null };
   }
-  if (!await processAlive(pid)) {
+  if (!await processAlive2(pid)) {
     await unlink2(PID_FILE).catch(() => {
     });
     return { stopped: false, pid };
@@ -5673,10 +5702,10 @@ async function stopRelay() {
   } catch {
   }
   for (let i = 0; i < 20; i++) {
-    if (!await processAlive(pid)) break;
+    if (!await processAlive2(pid)) break;
     await delay2(100);
   }
-  if (await processAlive(pid)) {
+  if (await processAlive2(pid)) {
     try {
       process.kill(pid, "SIGKILL");
     } catch {
@@ -5688,7 +5717,7 @@ async function stopRelay() {
 }
 async function getRelayStatus() {
   const pid = await readPidFile();
-  const pidAlive2 = pid !== null && await processAlive(pid);
+  const pidAlive2 = pid !== null && await processAlive2(pid);
   const health = await fetchHealthz(300);
   return {
     running: health !== null,
@@ -5772,7 +5801,7 @@ async function readPidFile() {
     return null;
   }
 }
-async function processAlive(pid) {
+async function processAlive2(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -8449,4 +8478,4 @@ export {
   browserSessionActive,
   ensureBoxBrowser
 };
-//# sourceMappingURL=chunk-GUNUBIRB.js.map
+//# sourceMappingURL=chunk-ZJXTIH6C.js.map