mcp-scraper 0.3.18 → 0.3.19

package/dist/bin/api-server.cjs

@@ -9661,8 +9661,8 @@ var init_rates = __esm({
         label: "Interactive browser session",
         aliases: ["browser_open", "browser agent", "browser_agent", "live browser", "browse", "browser control", "interactive browser"],
         credits: mcToCredits(MC_COSTS.browser_minute),
-        unit: "per minute of active time",
-        notes: "Metered per second of active browser work (navigation, clicks, typing, screenshots). Idle and standby time are free. Billed against your balance as you act; close the session to stop the meter."
+        unit: "per minute the browser is open",
+        notes: "Metered for the full time the browser session is open (active or idle) \u2014 every minute the session stays alive is billed. Close the session to stop the meter; abandoned sessions are auto-closed after a short idle window."
       }
     ];
     CONCURRENCY_PRICE_ID = "price_1Ta1NRS8aAcsk3TGwsRnYbix";
@@ -12478,6 +12478,8 @@ var init_screenshot_routes = __esm({
     init_api_auth();
     init_url_utils();
     init_concurrency_gates();
+    init_db();
+    init_rates();
     ScreenshotBodySchema = import_zod14.z.object({
       url: import_zod14.z.string().trim().min(1, "url is required"),
       device: import_zod14.z.string().trim().optional(),
@@ -12516,7 +12518,11 @@ var init_screenshot_routes = __esm({
         metadata: { url: targetUrl, device }
       });
       if (!gate.ok) return c.json(concurrencyLimitExceededResponse(gate), 429, { "Retry-After": String(gate.retryAfterSeconds) });
+      let debited = false;
       try {
+        const { ok, balance_mc } = await debitMc(user.id, MC_COSTS.page_scrape, LedgerOperation.EXTRACT_URL, targetUrl);
+        if (!ok) return c.json(insufficientBalanceResponse(balance_mc, MC_COSTS.page_scrape), 402);
+        debited = true;
         const buf = await captureScreenshot(targetUrl, browserServiceApiKey(), device);
         return new Response(new Uint8Array(buf), {
           status: 200,
@@ -12527,6 +12533,7 @@ var init_screenshot_routes = __esm({
           }
         });
       } catch (err) {
+        if (debited) await creditMc(user.id, MC_COSTS.page_scrape, LedgerOperation.EXTRACT_URL, "failed screenshot refund");
         const msg = err instanceof Error ? err.message : String(err);
         return c.json({ error: msg }, 502);
       } finally {
@@ -23755,7 +23762,7 @@ var PACKAGE_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    PACKAGE_VERSION = "0.3.18";
+    PACKAGE_VERSION = "0.3.19";
   }
 });
 
@@ -25670,6 +25677,14 @@ async function listSessionRows(userId, includeClosed = false) {
   });
   return res.rows;
 }
+async function listIdleOpenSessionRows(idleSeconds) {
+  const db = getDb();
+  const res = await db.execute({
+    sql: `SELECT * FROM browser_agent_sessions WHERE status = 'open' AND COALESCE(last_action_at, created_at) <= datetime('now', ?) ORDER BY created_at LIMIT 200`,
+    args: [`-${Math.max(1, Math.round(idleSeconds))} seconds`]
+  });
+  return res.rows;
+}
 async function addActiveMs(id, deltaMs) {
   const db = getDb();
   await db.execute({
@@ -27062,16 +27077,42 @@ function browserSessionLockTtlSeconds(timeoutSeconds) {
   }
   return DEFAULT_BROWSER_SESSION_LOCK_TTL_SECONDS;
 }
-async function charge(sessionId, userId, startedAtMs) {
-  const elapsedMs = Date.now() - startedAtMs;
-  const { active_ms, billed_mc } = await addActiveMs(sessionId, elapsedMs);
-  const owed = browserActiveCostMc(active_ms);
-  const delta = owed - billed_mc;
+async function charge(sessionId, userId, _startedAtMs) {
+  const row = await getSessionRow(sessionId);
+  if (!row) return;
+  const createdMs = parseAgentDate(row.created_at);
+  if (createdMs == null) return;
+  const uptimeMs = Math.max(0, Date.now() - createdMs);
+  const owed = browserActiveCostMc(uptimeMs);
+  await addActiveMs(sessionId, 0);
+  const delta = owed - Number(row.billed_mc ?? 0);
   if (delta > 0) {
     const res = await debitMc(userId, delta, LedgerOperation.BROWSER_SESSION, sessionId);
     if (res.ok) await setBilledMc(sessionId, owed);
   }
 }
+async function reapIdleBrowserSessions(idleSeconds = 120) {
+  const rows = await listIdleOpenSessionRows(idleSeconds);
+  let reaped = 0;
+  for (const row of rows) {
+    if (row.user_id != null) {
+      try {
+        await charge(row.id, row.user_id);
+      } catch {
+      }
+    }
+    try {
+      await closeSession(row.runtime_session_id);
+    } catch {
+    }
+    await markSessionClosed(row.id).catch(() => {
+    });
+    if (row.concurrency_lock_id) await releaseConcurrencyGate(row.concurrency_lock_id).catch(() => {
+    });
+    reaped++;
+  }
+  return { reaped };
+}
 function publicSession(row) {
   return {
     session_id: row.id,
@@ -27081,10 +27122,16 @@ function publicSession(row) {
     created_at: row.created_at,
     last_action_at: row.last_action_at,
     closed_at: row.closed_at,
-    active_seconds: Math.round((row.active_ms ?? 0) / 1e3),
+    uptime_seconds: uptimeSeconds(row),
     credits_used: Math.round((row.billed_mc ?? 0) / 10) / 100
   };
 }
+function uptimeSeconds(row) {
+  const createdMs = parseAgentDate(row.created_at);
+  const endMs = row.closed_at ? parseAgentDate(row.closed_at) : Date.now();
+  if (createdMs == null || endMs == null) return 0;
+  return Math.max(0, Math.round((endMs - createdMs) / 1e3));
+}
 function failure(err) {
   const msg = err instanceof Error ? err.message : String(err);
   return { error: sanitizeVendorName(msg) };
@@ -27296,6 +27343,7 @@ function buildBrowserAgentRoutes() {
     const user = c.get("user");
     const row = await loadOpenSession(c.req.param("id"), user.id);
     if (!row) return c.json({ error: "not found" }, 404);
+    await charge(row.id, user.id);
     try {
       await closeSession(row.runtime_session_id);
     } catch {
@@ -29240,11 +29288,12 @@ var init_server = __esm({
       const { drainQueue: drainQueue2 } = await Promise.resolve().then(() => (init_worker(), worker_exports));
       const budget = { maxJobs: 10, deadlineMs: Date.now() + 28e4 };
       const workflowDispatchResult = await dispatchDueWorkflowSchedules(`${new URL(c.req.url).protocol}//${new URL(c.req.url).host}`);
-      const [results, sweepResult] = await Promise.all([
+      const [results, sweepResult, reapResult] = await Promise.all([
         drainQueue2(budget),
-        runMonthlyRefreshSweep()
+        runMonthlyRefreshSweep(),
+        reapIdleBrowserSessions(120).catch(() => ({ reaped: 0 }))
       ]);
-      return c.json({ drained: results.length, results, sweepResult, workflowDispatch: workflowDispatchResult });
+      return c.json({ drained: results.length, results, sweepResult, reaped: reapResult, workflowDispatch: workflowDispatchResult });
     });
     app.on(["GET", "POST", "PUT"], "/api/inngest", (0, import_hono14.serve)({ client: inngest, functions: [siteAuditFn, siteExtractFn] }));
     app.route("/api/internal/site-architecture-auditor", siteAuditApp);