Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥
TypeScript aiai-agentsai-crawlerai-scrapingai-searchcrawlerdata-extractionhtml-to-markdownllmmarkdownscraperscrapingweb-crawlerweb-dataweb-data-extractionweb-scraperweb-scrapingweb-searchwebscraping
fix(billing): use Autumn remaining credits in 402 responses (#3286)
firecrawl-spring[bot]ff8264be4285
diff --git a/apps/api/src/controllers/v2/browser.ts b/apps/api/src/controllers/v2/browser.tsindex 8712e7865..256ebf22f 100644--- a/apps/api/src/controllers/v2/browser.ts+++ b/apps/api/src/controllers/v2/browser.ts@@ -226,13 +226,13 @@ export async function browserCreateController(// 0a. Check if team has enough credits for the full TTLconst estimatedCredits = calculateBrowserSessionCredits(ttl * 1000);- const autumnAllowed = await autumnService.checkCredits({+ const autumnResult = await autumnService.checkCredits({teamId: req.auth.team_id,value: estimatedCredits,properties: { source: "browserCreate", path: req.path },});- if (autumnAllowed === false) {+ if (autumnResult !== null && !autumnResult.allowed) {logger.warn("Insufficient credits for browser session TTL", {estimatedCredits,ttl,diff --git a/apps/api/src/controllers/v2/scrape-browser.ts b/apps/api/src/controllers/v2/scrape-browser.tsindex ebbcf4fd9..3ace5ac03 100644--- a/apps/api/src/controllers/v2/scrape-browser.ts+++ b/apps/api/src/controllers/v2/scrape-browser.ts@@ -466,13 +466,13 @@ async function createSessionForScrape(// Credit check (uses base rate — actual billing may be higher if prompts are used)const estimatedCredits = calculateBrowserSessionCredits(ttl * 1000);- const autumnAllowed = await autumnService.checkCredits({+ const autumnResult = await autumnService.checkCredits({teamId: req.auth.team_id,value: estimatedCredits,properties: { source: "scrapeBrowserCreate", path: req.path },});- if (autumnAllowed === false) {+ if (autumnResult !== null && !autumnResult.allowed) {return {status: 402,body: {diff --git a/apps/api/src/routes/shared.ts b/apps/api/src/routes/shared.tsindex 49a422724..112f6b4ae 100644--- a/apps/api/src/routes/shared.ts+++ b/apps/api/src/routes/shared.ts@@ -131,7 +131,7 @@ export function checkCreditsMiddleware(source: "checkCreditsMiddleware",path: req.path,};- const [legacyCheck, autumnAllowed] = await Promise.all([+ const [legacyCheck, autumnResult] = await Promise.all([checkTeamCredits(req.acuc ?? null, req.auth.team_id, requestedCredits),useAutumnCheck? autumnService.checkCredits({@@ -143,14 +143,15 @@ export function checkCreditsMiddleware(]);let { success, remainingCredits, chunk } = legacyCheck;- if (autumnAllowed !== null) {+ if (autumnResult !== null) {const dryRun = isAutumnCheckDryRun();- if (autumnAllowed !== legacyCheck.success) {+ if (autumnResult.allowed !== legacyCheck.success) {logger.warn("Autumn check result diverged from legacy credit gate", {teamId: req.auth.team_id,path: req.path,requestedCredits,- autumnAllowed,+ autumnAllowed: autumnResult.allowed,+ autumnRemaining: autumnResult.remaining,legacyAllowed: legacyCheck.success,dryRun,});@@ -160,13 +161,14 @@ export function checkCreditsMiddleware(teamId: req.auth.team_id,path: req.path,requestedCredits,- autumnAllowed,+ autumnAllowed: autumnResult.allowed,+ autumnRemaining: autumnResult.remaining,legacyAllowed: legacyCheck.success,});} else {- success = autumnAllowed;+ success = autumnResult.allowed;+ remainingCredits = autumnResult.remaining;}- remainingCredits = legacyCheck.remainingCredits;}if (chunk) {diff --git a/apps/api/src/services/autumn/__tests__/autumn.service.test.ts b/apps/api/src/services/autumn/__tests__/autumn.service.test.tsindex f24c3772e..4c9d64364 100644--- a/apps/api/src/services/autumn/__tests__/autumn.service.test.ts+++ b/apps/api/src/services/autumn/__tests__/autumn.service.test.ts@@ -381,8 +381,13 @@ describe("checkCredits", () => {expect(mockCheck).not.toHaveBeenCalled();});- it("returns allowed on happy path without a lock", async () => {+ it("returns allowed and remaining on happy path without a lock", async () => {config.AUTUMN_CHECK_ENABLED = "true";+ mockCheck.mockResolvedValue({+ allowed: true,+ customerId: "org-1",+ balance: { remaining: 500 },+ });const svc = makeService();const result = await svc.checkCredits({teamId: "team-1",@@ -390,7 +395,7 @@ describe("checkCredits", () => {properties: { source: "checkCreditsMiddleware" },});- expect(result).toBe(true);+ expect(result).toEqual({ allowed: true, remaining: 500 });expect(mockCheck).toHaveBeenCalledWith(expect.objectContaining({customerId: "org-1",@@ -405,7 +410,7 @@ describe("checkCredits", () => {);});- it("returns false when Autumn denies the check", async () => {+ it("returns allowed false with remaining 0 when balance is null", async () => {config.AUTUMN_CHECK_ENABLED = "true";mockCheck.mockResolvedValue({allowed: false,@@ -414,7 +419,7 @@ describe("checkCredits", () => {});const svc = makeService();const result = await svc.checkCredits({ teamId: "team-1", value: 10 });- expect(result).toBe(false);+ expect(result).toEqual({ allowed: false, remaining: 0 });});});diff --git a/apps/api/src/services/autumn/autumn.service.ts b/apps/api/src/services/autumn/autumn.service.tsindex 4bb06f145..824a6bded 100644--- a/apps/api/src/services/autumn/autumn.service.ts+++ b/apps/api/src/services/autumn/autumn.service.ts@@ -391,7 +391,10 @@ export class AutumnService {teamId,value,properties,- }: TrackCreditsParams): Promise<boolean | null> {+ }: TrackCreditsParams): Promise<{+ allowed: boolean;+ remaining: number;+ } | null> {if (!autumnClient || this.isPreviewTeam(teamId)) {return null;}@@ -400,7 +403,7 @@ export class AutumnService {if (!isAutumnCheckEnabled(orgId)) return null;const customerId = await this.ensureTrackingContext(teamId);- const { allowed } = await autumnClient.check({+ const { allowed, balance } = await autumnClient.check({customerId,entityId: teamId,featureId: CREDITS_FEATURE_ID,@@ -408,14 +411,17 @@ export class AutumnService {properties,});+ const remaining = balance?.remaining ?? 0;+logger.debug("Autumn checkCredits completed", {customerId,entityId: teamId,featureId: CREDITS_FEATURE_ID,value,allowed,+ remaining,});- return allowed;+ return { allowed, remaining };} catch (error) {logger.error("Autumn checkCredits failed — billing API may be unavailable, falling back",