@drawbridge/drawbridge-utils 0.0.28 → 0.0.31

package/dist/ai.cjs

@@ -19,6 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // ai.js
 var ai_exports = {};
 __export(ai_exports, {
+  MARKUP: () => MARKUP,
+  cost: () => cost,
+  costForRequest: () => costForRequest,
   google: () => google,
   priceForRequest: () => priceForRequest,
   pricing: () => pricing
@@ -78,100 +81,76 @@ var circuit = ({
 };
 
 // transactions.js
-var recordTransaction = async ({
+var insertTransaction = async ({
   db,
-  authenticated,
+  user,
   userId,
+  type,
   category,
-  tags,
+  source,
   amount,
-  balance,
-  provider,
+  _id,
   stripeInvoiceId,
-  stripeEventId
+  stripeEventId,
+  session,
+  ...rest
 }) => {
+  var _a;
+  const beforeRaw = (_a = user == null ? void 0 : user.balance) == null ? void 0 : _a[type];
+  const balance = typeof beforeRaw === "number" ? { before: beforeRaw, after: beforeRaw + amount } : void 0;
   await db.create({
-    authenticated,
-    collection: "transactions",
+    authenticated: user,
+    collection: "transaction",
     data: {
+      ..._id && { _id },
       userId,
-      billable: {
-        item: "ai"
-      },
+      type,
       category,
-      tags,
+      source,
       amount,
-      balance,
-      ...provider && { provider },
+      ...balance && { balance },
+      ...rest,
       ...stripeInvoiceId && { stripeInvoiceId },
       ...stripeEventId && { stripeEventId }
-    }
+    },
+    ...session && { options: { session } }
   });
 };
-var InsufficientCreditsError = class extends Error {
-  constructor(message = "Insufficient AI credits") {
-    super(message);
-    this.name = "InsufficientCreditsError";
-    this.status = 402;
-  }
-};
 var debit = async ({
   db,
-  authenticated,
+  user,
   userId,
   amount,
+  type,
   category,
-  tags = [],
-  provider,
+  source,
   stripeInvoiceId,
-  stripeEventId
+  stripeEventId,
+  session,
+  ...rest
 }) => {
-  var _a, _b, _c;
   if (!Number.isInteger(amount) || amount <= 0) {
     throw new Error(`debit() requires a positive integer amount, got ${amount}`);
   }
-  const result = await db.update({
-    authenticated,
-    collection: "users",
-    query: {
-      id: userId,
-      "balance.ai": {
-        $gte: amount
-      }
-    },
-    data: {
-      $inc: {
-        "balance.ai": -amount
-      }
-    }
-  });
-  const after = ((_b = (_a = result == null ? void 0 : result.value) == null ? void 0 : _a.balance) == null ? void 0 : _b.ai) ?? ((_c = result == null ? void 0 : result.balance) == null ? void 0 : _c.ai);
-  if (typeof after !== "number") {
-    throw new InsufficientCreditsError();
+  if (!type) {
+    throw new Error('debit() requires a type (e.g., "ai")');
+  }
+  if (!source) {
+    throw new Error('debit() requires a source ("system" | "admin" | "user")');
   }
-  const before = after + amount;
-  await recordTransaction({
+  await insertTransaction({
     db,
-    authenticated,
+    user,
     userId,
+    type,
     category,
-    tags,
+    source,
     amount: -amount,
-    balance: {
-      before,
-      after
-    },
-    provider,
     stripeInvoiceId,
-    stripeEventId
+    stripeEventId,
+    session,
+    ...rest
   });
-  return {
-    amount: -amount,
-    balance: {
-      before,
-      after
-    }
-  };
 };
 
 // ai.js
@@ -187,7 +166,7 @@ var models = {
   image: "gemini-2.5-flash-image",
   text: "gemini-2.5-flash"
 };
-var pricing = {
+var cost = {
   "gemini-2.5-flash": {
     cached: 3,
     input: 30,
@@ -199,18 +178,33 @@ var pricing = {
     output: 250
   }
 };
+var MARKUP = 1.3;
+var pricing = Object.fromEntries(
+  Object.entries(cost).map(([model, rates]) => [
+    model,
+    {
+      cached: Math.round(rates.cached * MARKUP),
+      input: Math.round(rates.input * MARKUP),
+      output: Math.round(rates.output * MARKUP)
+    }
+  ])
+);
+var sumCents = (rates, tokens) => Math.ceil(
+  (Number((tokens == null ? void 0 : tokens.cached) || 0) * rates.cached + Number((tokens == null ? void 0 : tokens.input) || 0) * rates.input + Number((tokens == null ? void 0 : tokens.output) || 0) * rates.output) / 1e6
+);
 var priceForRequest = (model, usage) => {
   const rates = pricing[model];
   if (!rates) {
     throw new Error(`Unknown model for pricing: ${model}`);
   }
-  const tokens = {
-    cached: Number(usage == null ? void 0 : usage.cached) || 0,
-    input: Number(usage == null ? void 0 : usage.input) || 0,
-    output: Number(usage == null ? void 0 : usage.output) || 0
-  };
-  const sum = tokens.cached * rates.cached + tokens.input * rates.input + tokens.output * rates.output;
-  return Math.ceil(sum / 1e6);
+  return sumCents(rates, usage);
+};
+var costForRequest = (model, usage) => {
+  const rates = cost[model];
+  if (!rates) {
+    throw new Error(`Unknown model for cost: ${model}`);
+  }
+  return sumCents(rates, usage);
 };
 var tokensFromMetadata = (metadata) => ({
   cached: Number(metadata == null ? void 0 : metadata.cachedContentTokenCount) || 0,
@@ -224,19 +218,29 @@ var billRequest = async ({
   model,
   usage
 }) => {
-  const amount = priceForRequest(model, usage);
+  const gross = priceForRequest(model, usage);
+  const cogs = costForRequest(model, usage);
   await debit({
     db,
     authenticated,
     userId,
-    amount,
+    amount: gross,
+    type: "ai",
     category: "usage",
-    tags: ["google", model],
-    provider: {
+    source: "user",
+    ai: {
       name: "google",
       model,
       tokens: usage,
-      snapshot: pricing[model]
+      rates: {
+        wholesale: cost[model],
+        retail: pricing[model]
+      },
+      totals: {
+        cost: cogs,
+        net: gross - cogs,
+        gross
+      }
     }
   });
 };
@@ -322,6 +326,9 @@ var google = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MARKUP,
+  cost,
+  costForRequest,
   google,
   priceForRequest,
   pricing

package/dist/ai.d.cts

@@ -36,14 +36,12 @@ const models = {
 	text : 'gemini-2.5-flash'
 };
 
-// Per-model pricing in cents per 1,000,000 tokens. Source of truth for what
-// users get charged; reviewed in PRs.
-//
-// Values mirror LiteLLM's published pricing at the time of writing. Model
-// providers update pricing periodically — verify against
+// Raw per-model provider rates in cents per 1,000,000 tokens. This is what
+// Drawbridge pays the provider — the wholesale cost. Sync from LiteLLM:
 // https://github.com/BerriAI/litellm/blob/main/litellm/model_prices_and_context_window_backup.json
-// before any change.
-const pricing = {
+// Never apply markup here; the MARKUP constant below derives the retail
+// `pricing` table.
+const cost = {
 	'gemini-2.5-flash' : {
 		cached : 3,
 		input : 30,
@@ -56,9 +54,37 @@ const pricing = {
 	}
 };
 
-// Cost in cents for a single request, rounded up so we never charge fractional
-// cents and never under-bill. Throws on an unknown model so a typo doesn't
-// silently fall back to a wrong price.
+// Markup multiplier applied to every model's cost to produce the retail
+// price. 1.3 = 30% margin. Change one number, all pricing updates. Mirrors
+// the per-customer markup Stripe rate cards used to provide; keeping it
+// global (rather than per-model or per-plan) for simplicity — easy to
+// refactor later if tier-based pricing becomes a real need.
+const MARKUP = 1.3;
+
+// Derived retail pricing in cents per 1,000,000 tokens — what users pay.
+// Rounded so the per-1M rate is a whole-cent value; per-request rounding
+// happens in priceForRequest via Math.ceil so we never under-bill.
+const pricing = Object.fromEntries(
+	Object.entries( cost ).map( ( [ model, rates ] ) => [
+		model,
+		{
+			cached : Math.round( rates.cached * MARKUP ),
+			input : Math.round( rates.input * MARKUP ),
+			output : Math.round( rates.output * MARKUP )
+		}
+	] )
+);
+
+const sumCents = ( rates, tokens ) => Math.ceil(
+	(
+		Number( tokens?.cached || 0 ) * rates.cached +
+		Number( tokens?.input || 0 ) * rates.input +
+		Number( tokens?.output || 0 ) * rates.output
+	) / 1_000_000
+);
+
+// What we charge the user, rounded up so we never under-bill. Throws on an
+// unknown model so a typo doesn't silently fall back to a wrong price.
 const priceForRequest = ( model, usage ) => {
 
 	const rates = pricing[ model ];
@@ -69,19 +95,23 @@ const priceForRequest = ( model, usage ) => {
 
 	}
 
-	const tokens = {
-		cached : Number( usage?.cached ) || 0,
-		input : Number( usage?.input ) || 0,
-		output : Number( usage?.output ) || 0
-	};
+	return sumCents( rates, usage );
+
+};
+
+// What we pay the provider. Recorded on each transaction row so margin is
+// computable per request without backfilling from git history.
+const costForRequest = ( model, usage ) => {
 
-	const sum = (
-		tokens.cached * rates.cached +
-		tokens.input * rates.input +
-		tokens.output * rates.output
-	);
+	const rates = cost[ model ];
 
-	return Math.ceil( sum / 1_000_000 );
+	if( !rates ){
+
+		throw new Error( `Unknown model for cost: ${ model }` );
+
+	}
+
+	return sumCents( rates, usage );
 
 };
 
@@ -92,8 +122,11 @@ const tokensFromMetadata = ( metadata ) => ({
 	output : Number( metadata?.candidatesTokenCount ) || 0
 });
 
-// Compute cost from response usage and atomically debit the user. Shared by
-// both image/text handlers so the accounting path is identical for both.
+// Compute gross + cost from response usage and atomically debit the user.
+// Records the full income-statement line on the transaction row's `ai`
+// sub-doc: wholesale + retail per-1M rate snapshots, plus rolled-up cost,
+// net, and gross totals. Margin per request is `ai.net`; margin per query
+// is a single $sum: '$ai.net'.
 const billRequest = async ({
 	db,
 	authenticated,
@@ -102,20 +135,30 @@ const billRequest = async ({
 	usage
 }) => {
 
-	const amount = priceForRequest( model, usage );
+	const gross = priceForRequest( model, usage );
+	const cogs = costForRequest( model, usage );
 
 	await debit({
 		db,
 		authenticated,
 		userId,
-		amount,
+		amount : gross,
+		type : 'ai',
 		category : 'usage',
-		tags : [ 'google', model ],
-		provider : {
+		source : 'user',
+		ai : {
 			name : 'google',
 			model,
 			tokens : usage,
-			snapshot : pricing[ model ]
+			rates : {
+				wholesale : cost[ model ],
+				retail : pricing[ model ]
+			},
+			totals : {
+				cost : cogs,
+				net : gross - cogs,
+				gross
+			}
 		}
 	});
 
@@ -241,4 +284,4 @@ const google = {
 
 };
 
-export { google, priceForRequest, pricing };
+export { MARKUP, cost, costForRequest, google, priceForRequest, pricing };

package/dist/ai.d.ts

@@ -36,14 +36,12 @@ const models = {
 	text : 'gemini-2.5-flash'
 };
 
-// Per-model pricing in cents per 1,000,000 tokens. Source of truth for what
-// users get charged; reviewed in PRs.
-//
-// Values mirror LiteLLM's published pricing at the time of writing. Model
-// providers update pricing periodically — verify against
+// Raw per-model provider rates in cents per 1,000,000 tokens. This is what
+// Drawbridge pays the provider — the wholesale cost. Sync from LiteLLM:
 // https://github.com/BerriAI/litellm/blob/main/litellm/model_prices_and_context_window_backup.json
-// before any change.
-const pricing = {
+// Never apply markup here; the MARKUP constant below derives the retail
+// `pricing` table.
+const cost = {
 	'gemini-2.5-flash' : {
 		cached : 3,
 		input : 30,
@@ -56,9 +54,37 @@ const pricing = {
 	}
 };
 
-// Cost in cents for a single request, rounded up so we never charge fractional
-// cents and never under-bill. Throws on an unknown model so a typo doesn't
-// silently fall back to a wrong price.
+// Markup multiplier applied to every model's cost to produce the retail
+// price. 1.3 = 30% margin. Change one number, all pricing updates. Mirrors
+// the per-customer markup Stripe rate cards used to provide; keeping it
+// global (rather than per-model or per-plan) for simplicity — easy to
+// refactor later if tier-based pricing becomes a real need.
+const MARKUP = 1.3;
+
+// Derived retail pricing in cents per 1,000,000 tokens — what users pay.
+// Rounded so the per-1M rate is a whole-cent value; per-request rounding
+// happens in priceForRequest via Math.ceil so we never under-bill.
+const pricing = Object.fromEntries(
+	Object.entries( cost ).map( ( [ model, rates ] ) => [
+		model,
+		{
+			cached : Math.round( rates.cached * MARKUP ),
+			input : Math.round( rates.input * MARKUP ),
+			output : Math.round( rates.output * MARKUP )
+		}
+	] )
+);
+
+const sumCents = ( rates, tokens ) => Math.ceil(
+	(
+		Number( tokens?.cached || 0 ) * rates.cached +
+		Number( tokens?.input || 0 ) * rates.input +
+		Number( tokens?.output || 0 ) * rates.output
+	) / 1_000_000
+);
+
+// What we charge the user, rounded up so we never under-bill. Throws on an
+// unknown model so a typo doesn't silently fall back to a wrong price.
 const priceForRequest = ( model, usage ) => {
 
 	const rates = pricing[ model ];
@@ -69,19 +95,23 @@ const priceForRequest = ( model, usage ) => {
 
 	}
 
-	const tokens = {
-		cached : Number( usage?.cached ) || 0,
-		input : Number( usage?.input ) || 0,
-		output : Number( usage?.output ) || 0
-	};
+	return sumCents( rates, usage );
+
+};
+
+// What we pay the provider. Recorded on each transaction row so margin is
+// computable per request without backfilling from git history.
+const costForRequest = ( model, usage ) => {
 
-	const sum = (
-		tokens.cached * rates.cached +
-		tokens.input * rates.input +
-		tokens.output * rates.output
-	);
+	const rates = cost[ model ];
 
-	return Math.ceil( sum / 1_000_000 );
+	if( !rates ){
+
+		throw new Error( `Unknown model for cost: ${ model }` );
+
+	}
+
+	return sumCents( rates, usage );
 
 };
 
@@ -92,8 +122,11 @@ const tokensFromMetadata = ( metadata ) => ({
 	output : Number( metadata?.candidatesTokenCount ) || 0
 });
 
-// Compute cost from response usage and atomically debit the user. Shared by
-// both image/text handlers so the accounting path is identical for both.
+// Compute gross + cost from response usage and atomically debit the user.
+// Records the full income-statement line on the transaction row's `ai`
+// sub-doc: wholesale + retail per-1M rate snapshots, plus rolled-up cost,
+// net, and gross totals. Margin per request is `ai.net`; margin per query
+// is a single $sum: '$ai.net'.
 const billRequest = async ({
 	db,
 	authenticated,
@@ -102,20 +135,30 @@ const billRequest = async ({
 	usage
 }) => {
 
-	const amount = priceForRequest( model, usage );
+	const gross = priceForRequest( model, usage );
+	const cogs = costForRequest( model, usage );
 
 	await debit({
 		db,
 		authenticated,
 		userId,
-		amount,
+		amount : gross,
+		type : 'ai',
 		category : 'usage',
-		tags : [ 'google', model ],
-		provider : {
+		source : 'user',
+		ai : {
 			name : 'google',
 			model,
 			tokens : usage,
-			snapshot : pricing[ model ]
+			rates : {
+				wholesale : cost[ model ],
+				retail : pricing[ model ]
+			},
+			totals : {
+				cost : cogs,
+				net : gross - cogs,
+				gross
+			}
 		}
 	});
 
@@ -241,4 +284,4 @@ const google = {
 
 };
 
-export { google, priceForRequest, pricing };
+export { MARKUP, cost, costForRequest, google, priceForRequest, pricing };

package/dist/ai.js

@@ -1,6 +1,6 @@
 import {
   debit
-} from "./chunk-RC5E56UB.js";
+} from "./chunk-6S43OFA7.js";
 import {
   circuit
 } from "./chunk-6HH36OK6.js";
@@ -19,7 +19,7 @@ var models = {
   image: "gemini-2.5-flash-image",
   text: "gemini-2.5-flash"
 };
-var pricing = {
+var cost = {
   "gemini-2.5-flash": {
     cached: 3,
     input: 30,
@@ -31,18 +31,33 @@ var pricing = {
     output: 250
   }
 };
+var MARKUP = 1.3;
+var pricing = Object.fromEntries(
+  Object.entries(cost).map(([model, rates]) => [
+    model,
+    {
+      cached: Math.round(rates.cached * MARKUP),
+      input: Math.round(rates.input * MARKUP),
+      output: Math.round(rates.output * MARKUP)
+    }
+  ])
+);
+var sumCents = (rates, tokens) => Math.ceil(
+  (Number((tokens == null ? void 0 : tokens.cached) || 0) * rates.cached + Number((tokens == null ? void 0 : tokens.input) || 0) * rates.input + Number((tokens == null ? void 0 : tokens.output) || 0) * rates.output) / 1e6
+);
 var priceForRequest = (model, usage) => {
   const rates = pricing[model];
   if (!rates) {
     throw new Error(`Unknown model for pricing: ${model}`);
   }
-  const tokens = {
-    cached: Number(usage == null ? void 0 : usage.cached) || 0,
-    input: Number(usage == null ? void 0 : usage.input) || 0,
-    output: Number(usage == null ? void 0 : usage.output) || 0
-  };
-  const sum = tokens.cached * rates.cached + tokens.input * rates.input + tokens.output * rates.output;
-  return Math.ceil(sum / 1e6);
+  return sumCents(rates, usage);
+};
+var costForRequest = (model, usage) => {
+  const rates = cost[model];
+  if (!rates) {
+    throw new Error(`Unknown model for cost: ${model}`);
+  }
+  return sumCents(rates, usage);
 };
 var tokensFromMetadata = (metadata) => ({
   cached: Number(metadata == null ? void 0 : metadata.cachedContentTokenCount) || 0,
@@ -56,19 +71,29 @@ var billRequest = async ({
   model,
   usage
 }) => {
-  const amount = priceForRequest(model, usage);
+  const gross = priceForRequest(model, usage);
+  const cogs = costForRequest(model, usage);
   await debit({
     db,
     authenticated,
     userId,
-    amount,
+    amount: gross,
+    type: "ai",
     category: "usage",
-    tags: ["google", model],
-    provider: {
+    source: "user",
+    ai: {
       name: "google",
       model,
       tokens: usage,
-      snapshot: pricing[model]
+      rates: {
+        wholesale: cost[model],
+        retail: pricing[model]
+      },
+      totals: {
+        cost: cogs,
+        net: gross - cogs,
+        gross
+      }
     }
   });
 };
@@ -153,6 +178,9 @@ var google = {
   }
 };
 export {
+  MARKUP,
+  cost,
+  costForRequest,
   google,
   priceForRequest,
   pricing