Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

fix(browser): close sessions Hangar no longer knows instead of failing DELETE (#5584)

tomsideguideedf02642c8f0
diff --git a/apps/api/src/lib/browser-lifecycle.ts b/apps/api/src/lib/browser-lifecycle.ts
index 18daa61c5..f4746bc9a 100644
--- a/apps/api/src/lib/browser-lifecycle.ts
+++ b/apps/api/src/lib/browser-lifecycle.ts
@@ -418,6 +418,24 @@ async function settleBrowserSessionInternal(
return { sessionDurationMs, creditsBilled };
}
+/** Hangar answers 400 for an ID it never issued and 404 for a browser it no longer has. */
+function isUnknownToHangar(error: unknown) {
+ return (
+ error instanceof HangarError &&
+ (error.status === 400 || error.status === 404)
+ );
+}
+
+/** Closes a session Hangar cannot account for. Without a duration there is nothing to bill. */
+async function closeUnknownBrowserSession(session: BrowserSessionRow) {
+ const { creditsBilled } = await settleBrowserSessionOnce(
+ session.id,
+ async () => 0,
+ );
+ await finalizeBrowserSession(session, creditsBilled);
+ return { creditsBilled };
+}
+
async function finalizeBrowserSession(
session: BrowserSessionRow,
credits: number,
@@ -510,29 +528,39 @@ async function stopBrowserSessionInternal(session: BrowserSessionRow) {
creditsBilled: session.credits_used ?? 0,
};
}
- let browser = await stopHangarBrowser(session.browser_id);
- if (!["stopping", "stopped", "failed"].includes(browser.status))
- throw new HangarError(502, "Hangar did not confirm the stop request.");
- // A successful public DELETE includes final duration and billing, even
- // though Hangar's stop endpoint acknowledges cleanup asynchronously.
- const deadline = Date.now() + 30_000;
- while (browser.status === "stopping") {
- const remaining = deadline - Date.now();
- if (remaining <= 0)
- throw new HangarError(
- 502,
- "Browser is still stopping. Retry deletion shortly.",
+ let browser: HangarBrowser;
+ try {
+ browser = await stopHangarBrowser(session.browser_id);
+ if (!["stopping", "stopped", "failed"].includes(browser.status))
+ throw new HangarError(502, "Hangar did not confirm the stop request.");
+ // A successful public DELETE includes final duration and billing, even
+ // though Hangar's stop endpoint acknowledges cleanup asynchronously.
+ const deadline = Date.now() + 30_000;
+ while (browser.status === "stopping") {
+ const remaining = deadline - Date.now();
+ if (remaining <= 0)
+ throw new HangarError(
+ 502,
+ "Browser is still stopping. Retry deletion shortly.",
+ );
+ browser = await getHangarBrowser(
+ session.browser_id,
+ 0,
+ Math.min(remaining, 5000),
);
- browser = await getHangarBrowser(
- session.browser_id,
- 0,
- Math.min(remaining, 5000),
- );
- if (browser.status === "stopping")
- await new Promise(resolve => setTimeout(resolve, 250));
+ if (browser.status === "stopping")
+ await new Promise(resolve => setTimeout(resolve, 250));
+ }
+ if (browser.status !== "stopped" && browser.status !== "failed")
+ throw new HangarError(502, "Hangar did not confirm session release.");
+ } catch (error) {
+ if (!isUnknownToHangar(error)) throw error;
+ return {
+ success: true,
+ status: "stopped",
+ ...(await closeUnknownBrowserSession(session)),
+ };
}
- if (browser.status !== "stopped" && browser.status !== "failed")
- throw new HangarError(502, "Hangar did not confirm session release.");
const settled = await settleBrowserSession(session, browser);
return {
success: true,
@@ -584,10 +612,16 @@ export async function reconcileBrowserSessions() {
if (session.credits_used !== null) {
await finalizeBrowserSession(session, session.credits_used);
} else {
- await settleBrowserSession(
- session,
- await getHangarBrowser(session.browser_id, 0, 5000),
- );
+ const browser = await getHangarBrowser(
+ session.browser_id,
+ 0,
+ 5000,
+ ).catch(error => {
+ if (isUnknownToHangar(error)) return null;
+ throw error;
+ });
+ if (browser) await settleBrowserSession(session, browser);
+ else await closeUnknownBrowserSession(session);
}
} catch (error) {
failures = Math.min(Number(state.failures ?? 0) + 1, 5);
diff --git a/apps/api/src/lib/browser-sessions.ts b/apps/api/src/lib/browser-sessions.ts
index 2393e0bcb..03f59baa3 100644
--- a/apps/api/src/lib/browser-sessions.ts
+++ b/apps/api/src/lib/browser-sessions.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
import { createHash } from "node:crypto";
-import { and, asc, desc, eq, gt, like, lte, ne, sql } from "drizzle-orm";
+import { and, asc, desc, eq, gt, lte, ne, sql } from "drizzle-orm";
import { deleteKey, getValue, setValue } from "../services/redis";
import { redisRateLimitClient } from "../services/rate-limiter";
import { db } from "../db/connection";
@@ -37,10 +37,7 @@ export async function listUnsettledHangarSessions(cursor: {
after?: string;
through?: string;
}): Promise<{ sessions: BrowserSessionRow[]; through: string | null }> {
- const unsettled = and(
- eq(schema.browser_sessions.status, "active"),
- like(schema.browser_sessions.browser_id, "br\\_%"),
- );
+ const unsettled = eq(schema.browser_sessions.status, "active");
let through = cursor.through;
const after = through ? cursor.after : undefined;
if (!through) {