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 search credit tracking (#3850)
firecrawl-spring[bot]9ec642cdc220
diff --git a/apps/api/src/services/billing/__tests__/batch_billing.test.ts b/apps/api/src/services/billing/__tests__/batch_billing.test.tsindex d2c3d5c7c..8d8e5e4e7 100644--- a/apps/api/src/services/billing/__tests__/batch_billing.test.ts+++ b/apps/api/src/services/billing/__tests__/batch_billing.test.ts@@ -151,26 +151,20 @@ beforeEach(() => {});describe("processBillingBatch", () => {- it("tracks queued Autumn usage when the request path did not", async () => {+ it("commits the ledger but never re-tracks usage to Autumn", async () => {+ // Even when an op was not request-tracked, the batch must not track usage+ // to Autumn β request-time tracking is the single source, so re-tracking+ // here would double-count. The batch only commits the ledger.queue = [makeOp()];await processBillingBatch();expect(billTeam6).toHaveBeenCalled();- expect(trackCredits).toHaveBeenCalledWith({- teamId: "team-1",- value: 10,- properties: {- source: "processBillingBatch",- endpoint: "extract",- apiKeyId: 123,- subscriptionId: "sub-1",- },- });+ expect(trackCredits).not.toHaveBeenCalled();expect(captureException).not.toHaveBeenCalled();});- it("skips Autumn tracking when the request path already tracked the op", async () => {+ it("does not re-track even when the op was already tracked at request time", async () => {queue = [makeOp({ autumnTrackInRequest: true })];await processBillingBatch();@@ -179,7 +173,7 @@ describe("processBillingBatch", () => {expect(trackCredits).not.toHaveBeenCalled();});- it("continues when billing returns success false", async () => {+ it("refunds request-tracked credits when billing returns success false", async () => {queue = [makeOp({ autumnTrackInRequest: true })];billTeam6.mockRejectedValueOnce(new Error("db failed"));@@ -194,11 +188,12 @@ describe("processBillingBatch", () => {apiKeyId: 123,subscriptionId: "sub-1",},+ featureId: "CREDITS",});expect(captureException).toHaveBeenCalled();});- it("captures exceptions when billing throws", async () => {+ it("captures exceptions and refunds when billing throws", async () => {queue = [makeOp({ autumnTrackInRequest: true })];billTeam6.mockRejectedValueOnce(new Error("rpc exploded"));@@ -213,11 +208,12 @@ describe("processBillingBatch", () => {apiKeyId: 123,subscriptionId: "sub-1",},+ featureId: "CREDITS",});expect(captureException).toHaveBeenCalled();});- it("continues processing later groups when Autumn refund fails", async () => {+ it("continues processing later groups when an Autumn refund fails", async () => {queue = [makeOp({team_id: "team-1",@@ -227,7 +223,7 @@ describe("processBillingBatch", () => {makeOp({team_id: "team-2",subscription_id: "sub-2",- autumnTrackInRequest: false,+ autumnTrackInRequest: true,}),];billTeam6@@ -246,18 +242,11 @@ describe("processBillingBatch", () => {apiKeyId: 123,subscriptionId: "sub-1",},+ featureId: "CREDITS",});expect(billTeam6).toHaveBeenCalledTimes(2);- expect(trackCredits).toHaveBeenCalledWith({- teamId: "team-2",- value: 10,- properties: {- source: "processBillingBatch",- endpoint: "extract",- apiKeyId: 123,- subscriptionId: "sub-2",- },- });+ // The batch never tracks usage to Autumn, regardless of the request-time flag.+ expect(trackCredits).not.toHaveBeenCalled();expect(captureException).toHaveBeenCalled();});});diff --git a/apps/api/src/services/billing/batch_billing.ts b/apps/api/src/services/billing/batch_billing.tsindex 920062dda..f236b2ee3 100644--- a/apps/api/src/services/billing/batch_billing.ts+++ b/apps/api/src/services/billing/batch_billing.ts@@ -1,5 +1,4 @@import { logger } from "../../lib/logger";-import { config } from "../../config";import { getRedisConnection } from "../queue-service";import { billTeam6 } from "../../db/rpc";import * as Sentry from "@sentry/node";@@ -180,10 +179,6 @@ export async function processBillingBatch() {continue;}- const batchTrackedCredits = group.operations- .filter(op => !op.autumnTrackInRequest)- .reduce((sum, op) => sum + op.credits, 0);-try {// Execute the actual billingconst billingResult = await withAuth(supaBillTeam, {@@ -215,19 +210,7 @@ export async function processBillingBatch() {`β Successfully billed team ${group.team_id} for ${group.total_credits} credits`,);- if (batchTrackedCredits > 0) {- await autumnService.trackCredits({- teamId: group.team_id,- value: batchTrackedCredits,- properties: {- source: "processBillingBatch",- ...toAutumnBillingProperties(group.billing),- apiKeyId: group.api_key_id,- subscriptionId: group.subscription_id,- },- featureId: featureIdForBillingEndpoint(group.billing.endpoint),- });- }+ // Ledger commit only β usage is tracked to Autumn at request time, not here.} catch (error) {await refundRequestTrackedCredits(group);logger.error(`β Failed to bill team ${group.team_id}`, {