@drawbridge/drawbridge-utils 0.0.31 → 0.0.33

package/dist/ai.cjs

@@ -84,7 +84,6 @@ var circuit = ({
 var insertTransaction = async ({
   db,
   user,
-  userId,
   type,
   category,
   source,
@@ -103,7 +102,7 @@ var insertTransaction = async ({
     collection: "transaction",
     data: {
       ..._id && { _id },
-      userId,
+      userId: user == null ? void 0 : user.id,
       type,
       category,
       source,
@@ -119,7 +118,6 @@ var insertTransaction = async ({
 var debit = async ({
   db,
   user,
-  userId,
   amount,
   type,
   category,
@@ -141,7 +139,6 @@ var debit = async ({
   await insertTransaction({
     db,
     user,
-    userId,
     type,
     category,
     source,
@@ -175,7 +172,7 @@ var cost = {
   "gemini-2.5-flash-image": {
     cached: 3,
     input: 30,
-    output: 250
+    output: 3e3
   }
 };
 var MARKUP = 1.3;
@@ -213,8 +210,7 @@ var tokensFromMetadata = (metadata) => ({
 });
 var billRequest = async ({
   db,
-  authenticated,
-  userId,
+  user,
   model,
   usage
 }) => {
@@ -222,8 +218,7 @@ var billRequest = async ({
   const cogs = costForRequest(model, usage);
   await debit({
     db,
-    authenticated,
-    userId,
+    user,
     amount: gross,
     type: "ai",
     category: "usage",
@@ -251,8 +246,7 @@ var google = {
     reference = null
   }, {
     db,
-    authenticated,
-    userId
+    user
   }) => {
     var _a, _b, _c, _d, _e, _f;
     const model = models.image;
@@ -260,68 +254,57 @@ var google = {
       ...reference ? [{ inlineData: { data: reference.data, mimeType: reference.mimeType } }] : [],
       { text: prompt.join("\n") }
     ];
-    try {
-      const response = await googleCircuit(() => google_client.models.generateContent({
-        model,
-        contents: { parts },
-        config: {
-          ...config,
-          responseModalities: ["Image"]
-        }
-      }));
-      const content = (_f = (_e = (_d = (_c = (_b = (_a = response == null ? void 0 : response.candidates) == null ? void 0 : _a[0]) == null ? void 0 : _b.content) == null ? void 0 : _c.parts) == null ? void 0 : _d[0]) == null ? void 0 : _e.inlineData) == null ? void 0 : _f.data;
-      if (!content) {
-        throw new Error("Could not generate from prompt. Please try again with a different prompt.");
-      }
-      if (userId) {
-        await billRequest({
-          db,
-          authenticated,
-          userId,
-          model,
-          usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
-        });
+    const response = await googleCircuit(() => google_client.models.generateContent({
+      model,
+      contents: { parts },
+      config: {
+        ...config,
+        responseModalities: ["Image"]
       }
-      return { content };
-    } catch (error) {
-      throw new Error((error == null ? void 0 : error.message) || "AI error, please try again");
+    }));
+    const content = (_f = (_e = (_d = (_c = (_b = (_a = response == null ? void 0 : response.candidates) == null ? void 0 : _a[0]) == null ? void 0 : _b.content) == null ? void 0 : _c.parts) == null ? void 0 : _d[0]) == null ? void 0 : _e.inlineData) == null ? void 0 : _f.data;
+    if (!content) {
+      throw new Error("Could not generate from prompt. Please try again with a different prompt.");
     }
+    if (user == null ? void 0 : user.id) {
+      await billRequest({
+        db,
+        user,
+        model,
+        usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
+      });
+    }
+    return { content };
   },
   text: async ({
     config = {},
     prompt = []
   }, {
     db,
-    authenticated,
-    userId
+    user
   }) => {
     const model = models.text;
-    try {
-      const response = await googleCircuit(() => google_client.models.generateContent({
-        config: {
-          ...config,
-          responseModalities: ["Text"]
-        },
-        contents: prompt.join("\n"),
-        model
-      }));
-      const content = response == null ? void 0 : response.text;
-      if (!content) {
-        throw new Error("Could not generate from prompt. Please try again with a different prompt.");
-      }
-      if (userId) {
-        await billRequest({
-          db,
-          authenticated,
-          userId,
-          model,
-          usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
-        });
-      }
-      return { content };
-    } catch (error) {
-      throw new Error((error == null ? void 0 : error.message) || "AI error, please try again");
+    const response = await googleCircuit(() => google_client.models.generateContent({
+      config: {
+        ...config,
+        responseModalities: ["Text"]
+      },
+      contents: prompt.join("\n"),
+      model
+    }));
+    const content = response == null ? void 0 : response.text;
+    if (!content) {
+      throw new Error("Could not generate from prompt. Please try again with a different prompt.");
+    }
+    if (user == null ? void 0 : user.id) {
+      await billRequest({
+        db,
+        user,
+        model,
+        usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
+      });
     }
+    return { content };
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/ai.d.cts

@@ -50,7 +50,7 @@ const cost = {
 	'gemini-2.5-flash-image' : {
 		cached : 3,
 		input : 30,
-		output : 250
+		output : 3000
 	}
 };
 
@@ -129,8 +129,7 @@ const tokensFromMetadata = ( metadata ) => ({
 // is a single $sum: '$ai.net'.
 const billRequest = async ({
 	db,
-	authenticated,
-	userId,
+	user,
 	model,
 	usage
 }) => {
@@ -140,8 +139,7 @@ const billRequest = async ({
 
 	await debit({
 		db,
-		authenticated,
-		userId,
+		user,
 		amount : gross,
 		type : 'ai',
 		category : 'usage',
@@ -174,8 +172,7 @@ const google = {
 		},
 		{
 			db,
-			authenticated,
-			userId
+			user
 		}
 	) => {
 
@@ -186,45 +183,36 @@ const google = {
 			{ text : prompt.join( '\n' ) }
 		];
 
-		try {
-
-			const response = await googleCircuit( () => google_client.models.generateContent({
-				model,
-				contents : { parts },
-				config : {
-					...config,
-					responseModalities : [ 'Image' ]
-				}
-			}) );
-
-			const content = response?.candidates?.[ 0 ]?.content?.parts?.[ 0 ]?.inlineData?.data;
-
-			if( !content ){
-
-				throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
-
+		const response = await googleCircuit( () => google_client.models.generateContent({
+			model,
+			contents : { parts },
+			config : {
+				...config,
+				responseModalities : [ 'Image' ]
 			}
+		}) );
 
-			if( userId ){
+		const content = response?.candidates?.[ 0 ]?.content?.parts?.[ 0 ]?.inlineData?.data;
 
-				await billRequest({
-					db,
-					authenticated,
-					userId,
-					model,
-					usage : tokensFromMetadata( response?.usageMetadata )
-				});
+		if( !content ){
 
-			}
+			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
-			return { content };
+		}
 
-		} catch ( error ) {
+		if( user?.id ){
 
-			throw new Error( error?.message || 'AI error, please try again' );
+			await billRequest({
+				db,
+				user,
+				model,
+				usage : tokensFromMetadata( response?.usageMetadata )
+			});
 
 		}
 
+		return { content };
+
 	},
 
 	text : async (
@@ -234,52 +222,42 @@ const google = {
 		},
 		{
 			db,
-			authenticated,
-			userId
+			user
 		}
 	) => {
 
 		const model = models.text;
 
-		try {
-
-			const response = await googleCircuit( () => google_client.models.generateContent({
-				config : {
-					...config,
-					responseModalities : [ 'Text' ]
-				},
-				contents : prompt.join( '\n' ),
-				model
-			}) );
-
-			const content = response?.text;
-
-			if( !content ){
-
-				throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
-
-			}
+		const response = await googleCircuit( () => google_client.models.generateContent({
+			config : {
+				...config,
+				responseModalities : [ 'Text' ]
+			},
+			contents : prompt.join( '\n' ),
+			model
+		}) );
 
-			if( userId ){
+		const content = response?.text;
 
-				await billRequest({
-					db,
-					authenticated,
-					userId,
-					model,
-					usage : tokensFromMetadata( response?.usageMetadata )
-				});
+		if( !content ){
 
-			}
+			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
-			return { content };
+		}
 
-		} catch ( error ) {
+		if( user?.id ){
 
-			throw new Error( error?.message || 'AI error, please try again' );
+			await billRequest({
+				db,
+				user,
+				model,
+				usage : tokensFromMetadata( response?.usageMetadata )
+			});
 
 		}
 
+		return { content };
+
 	}
 
 };

package/dist/ai.d.ts

@@ -50,7 +50,7 @@ const cost = {
 	'gemini-2.5-flash-image' : {
 		cached : 3,
 		input : 30,
-		output : 250
+		output : 3000
 	}
 };
 
@@ -129,8 +129,7 @@ const tokensFromMetadata = ( metadata ) => ({
 // is a single $sum: '$ai.net'.
 const billRequest = async ({
 	db,
-	authenticated,
-	userId,
+	user,
 	model,
 	usage
 }) => {
@@ -140,8 +139,7 @@ const billRequest = async ({
 
 	await debit({
 		db,
-		authenticated,
-		userId,
+		user,
 		amount : gross,
 		type : 'ai',
 		category : 'usage',
@@ -174,8 +172,7 @@ const google = {
 		},
 		{
 			db,
-			authenticated,
-			userId
+			user
 		}
 	) => {
 
@@ -186,45 +183,36 @@ const google = {
 			{ text : prompt.join( '\n' ) }
 		];
 
-		try {
-
-			const response = await googleCircuit( () => google_client.models.generateContent({
-				model,
-				contents : { parts },
-				config : {
-					...config,
-					responseModalities : [ 'Image' ]
-				}
-			}) );
-
-			const content = response?.candidates?.[ 0 ]?.content?.parts?.[ 0 ]?.inlineData?.data;
-
-			if( !content ){
-
-				throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
-
+		const response = await googleCircuit( () => google_client.models.generateContent({
+			model,
+			contents : { parts },
+			config : {
+				...config,
+				responseModalities : [ 'Image' ]
 			}
+		}) );
 
-			if( userId ){
+		const content = response?.candidates?.[ 0 ]?.content?.parts?.[ 0 ]?.inlineData?.data;
 
-				await billRequest({
-					db,
-					authenticated,
-					userId,
-					model,
-					usage : tokensFromMetadata( response?.usageMetadata )
-				});
+		if( !content ){
 
-			}
+			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
-			return { content };
+		}
 
-		} catch ( error ) {
+		if( user?.id ){
 
-			throw new Error( error?.message || 'AI error, please try again' );
+			await billRequest({
+				db,
+				user,
+				model,
+				usage : tokensFromMetadata( response?.usageMetadata )
+			});
 
 		}
 
+		return { content };
+
 	},
 
 	text : async (
@@ -234,52 +222,42 @@ const google = {
 		},
 		{
 			db,
-			authenticated,
-			userId
+			user
 		}
 	) => {
 
 		const model = models.text;
 
-		try {
-
-			const response = await googleCircuit( () => google_client.models.generateContent({
-				config : {
-					...config,
-					responseModalities : [ 'Text' ]
-				},
-				contents : prompt.join( '\n' ),
-				model
-			}) );
-
-			const content = response?.text;
-
-			if( !content ){
-
-				throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
-
-			}
+		const response = await googleCircuit( () => google_client.models.generateContent({
+			config : {
+				...config,
+				responseModalities : [ 'Text' ]
+			},
+			contents : prompt.join( '\n' ),
+			model
+		}) );
 
-			if( userId ){
+		const content = response?.text;
 
-				await billRequest({
-					db,
-					authenticated,
-					userId,
-					model,
-					usage : tokensFromMetadata( response?.usageMetadata )
-				});
+		if( !content ){
 
-			}
+			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
-			return { content };
+		}
 
-		} catch ( error ) {
+		if( user?.id ){
 
-			throw new Error( error?.message || 'AI error, please try again' );
+			await billRequest({
+				db,
+				user,
+				model,
+				usage : tokensFromMetadata( response?.usageMetadata )
+			});
 
 		}
 
+		return { content };
+
 	}
 
 };

package/dist/ai.js

@@ -1,6 +1,6 @@
 import {
   debit
-} from "./chunk-6S43OFA7.js";
+} from "./chunk-RW2FJVIV.js";
 import {
   circuit
 } from "./chunk-6HH36OK6.js";
@@ -28,7 +28,7 @@ var cost = {
   "gemini-2.5-flash-image": {
     cached: 3,
     input: 30,
-    output: 250
+    output: 3e3
   }
 };
 var MARKUP = 1.3;
@@ -66,8 +66,7 @@ var tokensFromMetadata = (metadata) => ({
 });
 var billRequest = async ({
   db,
-  authenticated,
-  userId,
+  user,
   model,
   usage
 }) => {
@@ -75,8 +74,7 @@ var billRequest = async ({
   const cogs = costForRequest(model, usage);
   await debit({
     db,
-    authenticated,
-    userId,
+    user,
     amount: gross,
     type: "ai",
     category: "usage",
@@ -104,8 +102,7 @@ var google = {
     reference = null
   }, {
     db,
-    authenticated,
-    userId
+    user
   }) => {
     var _a, _b, _c, _d, _e, _f;
     const model = models.image;
@@ -113,68 +110,57 @@ var google = {
       ...reference ? [{ inlineData: { data: reference.data, mimeType: reference.mimeType } }] : [],
       { text: prompt.join("\n") }
     ];
-    try {
-      const response = await googleCircuit(() => google_client.models.generateContent({
-        model,
-        contents: { parts },
-        config: {
-          ...config,
-          responseModalities: ["Image"]
-        }
-      }));
-      const content = (_f = (_e = (_d = (_c = (_b = (_a = response == null ? void 0 : response.candidates) == null ? void 0 : _a[0]) == null ? void 0 : _b.content) == null ? void 0 : _c.parts) == null ? void 0 : _d[0]) == null ? void 0 : _e.inlineData) == null ? void 0 : _f.data;
-      if (!content) {
-        throw new Error("Could not generate from prompt. Please try again with a different prompt.");
-      }
-      if (userId) {
-        await billRequest({
-          db,
-          authenticated,
-          userId,
-          model,
-          usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
-        });
+    const response = await googleCircuit(() => google_client.models.generateContent({
+      model,
+      contents: { parts },
+      config: {
+        ...config,
+        responseModalities: ["Image"]
       }
-      return { content };
-    } catch (error) {
-      throw new Error((error == null ? void 0 : error.message) || "AI error, please try again");
+    }));
+    const content = (_f = (_e = (_d = (_c = (_b = (_a = response == null ? void 0 : response.candidates) == null ? void 0 : _a[0]) == null ? void 0 : _b.content) == null ? void 0 : _c.parts) == null ? void 0 : _d[0]) == null ? void 0 : _e.inlineData) == null ? void 0 : _f.data;
+    if (!content) {
+      throw new Error("Could not generate from prompt. Please try again with a different prompt.");
+    }
+    if (user == null ? void 0 : user.id) {
+      await billRequest({
+        db,
+        user,
+        model,
+        usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
+      });
     }
+    return { content };
   },
   text: async ({
     config = {},
     prompt = []
   }, {
     db,
-    authenticated,
-    userId
+    user
   }) => {
     const model = models.text;
-    try {
-      const response = await googleCircuit(() => google_client.models.generateContent({
-        config: {
-          ...config,
-          responseModalities: ["Text"]
-        },
-        contents: prompt.join("\n"),
-        model
-      }));
-      const content = response == null ? void 0 : response.text;
-      if (!content) {
-        throw new Error("Could not generate from prompt. Please try again with a different prompt.");
-      }
-      if (userId) {
-        await billRequest({
-          db,
-          authenticated,
-          userId,
-          model,
-          usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
-        });
-      }
-      return { content };
-    } catch (error) {
-      throw new Error((error == null ? void 0 : error.message) || "AI error, please try again");
+    const response = await googleCircuit(() => google_client.models.generateContent({
+      config: {
+        ...config,
+        responseModalities: ["Text"]
+      },
+      contents: prompt.join("\n"),
+      model
+    }));
+    const content = response == null ? void 0 : response.text;
+    if (!content) {
+      throw new Error("Could not generate from prompt. Please try again with a different prompt.");
+    }
+    if (user == null ? void 0 : user.id) {
+      await billRequest({
+        db,
+        user,
+        model,
+        usage: tokensFromMetadata(response == null ? void 0 : response.usageMetadata)
+      });
     }
+    return { content };
   }
 };
 export {

package/dist/{chunk-6S43OFA7.js → chunk-RW2FJVIV.js}

@@ -2,7 +2,6 @@
 var insertTransaction = async ({
   db,
   user,
-  userId,
   type,
   category,
   source,
@@ -21,7 +20,7 @@ var insertTransaction = async ({
     collection: "transaction",
     data: {
       ..._id && { _id },
-      userId,
+      userId: user == null ? void 0 : user.id,
       type,
       category,
       source,
@@ -37,7 +36,6 @@ var insertTransaction = async ({
 var credit = async ({
   db,
   user,
-  userId,
   amount,
   type,
   category,
@@ -60,7 +58,6 @@ var credit = async ({
   await insertTransaction({
     db,
     user,
-    userId,
     type,
     category,
     source,
@@ -75,7 +72,6 @@ var credit = async ({
 var debit = async ({
   db,
   user,
-  userId,
   amount,
   type,
   category,
@@ -97,7 +93,6 @@ var debit = async ({
   await insertTransaction({
     db,
     user,
-    userId,
     type,
     category,
     source,

package/dist/transactions.cjs

@@ -26,7 +26,6 @@ module.exports = __toCommonJS(transactions_exports);
 var insertTransaction = async ({
   db,
   user,
-  userId,
   type,
   category,
   source,
@@ -45,7 +44,7 @@ var insertTransaction = async ({
     collection: "transaction",
     data: {
       ..._id && { _id },
-      userId,
+      userId: user == null ? void 0 : user.id,
       type,
       category,
       source,
@@ -61,7 +60,6 @@ var insertTransaction = async ({
 var credit = async ({
   db,
   user,
-  userId,
   amount,
   type,
   category,
@@ -84,7 +82,6 @@ var credit = async ({
   await insertTransaction({
     db,
     user,
-    userId,
     type,
     category,
     source,
@@ -99,7 +96,6 @@ var credit = async ({
 var debit = async ({
   db,
   user,
-  userId,
   amount,
   type,
   category,
@@ -121,7 +117,6 @@ var debit = async ({
   await insertTransaction({
     db,
     user,
-    userId,
     type,
     category,
     source,

package/dist/transactions.d.cts

@@ -29,7 +29,6 @@
 const insertTransaction = async ({
 	db,
 	user,
-	userId,
 	type,
 	category,
 	source,
@@ -51,7 +50,7 @@ const insertTransaction = async ({
 		collection : 'transaction',
 		data : {
 			...( _id && { _id }),
-			userId,
+			userId : user?.id,
 			type,
 			category,
 			source,
@@ -73,7 +72,6 @@ const insertTransaction = async ({
 const credit = async ({
 	db,
 	user,
-	userId,
 	amount,
 	type,
 	category,
@@ -106,7 +104,6 @@ const credit = async ({
 	await insertTransaction({
 		db,
 		user,
-		userId,
 		type,
 		category,
 		source,
@@ -134,7 +131,6 @@ const credit = async ({
 const debit = async ({
 	db,
 	user,
-	userId,
 	amount,
 	type,
 	category,
@@ -166,7 +162,6 @@ const debit = async ({
 	await insertTransaction({
 		db,
 		user,
-		userId,
 		type,
 		category,
 		source,

package/dist/transactions.d.ts

@@ -29,7 +29,6 @@
 const insertTransaction = async ({
 	db,
 	user,
-	userId,
 	type,
 	category,
 	source,
@@ -51,7 +50,7 @@ const insertTransaction = async ({
 		collection : 'transaction',
 		data : {
 			...( _id && { _id }),
-			userId,
+			userId : user?.id,
 			type,
 			category,
 			source,
@@ -73,7 +72,6 @@ const insertTransaction = async ({
 const credit = async ({
 	db,
 	user,
-	userId,
 	amount,
 	type,
 	category,
@@ -106,7 +104,6 @@ const credit = async ({
 	await insertTransaction({
 		db,
 		user,
-		userId,
 		type,
 		category,
 		source,
@@ -134,7 +131,6 @@ const credit = async ({
 const debit = async ({
 	db,
 	user,
-	userId,
 	amount,
 	type,
 	category,
@@ -166,7 +162,6 @@ const debit = async ({
 	await insertTransaction({
 		db,
 		user,
-		userId,
 		type,
 		category,
 		source,

package/dist/transactions.js

@@ -1,7 +1,7 @@
 import {
   credit,
   debit
-} from "./chunk-6S43OFA7.js";
+} from "./chunk-RW2FJVIV.js";
 export {
   credit,
   debit

package/package.json

@@ -103,5 +103,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.31"
+  "version": "0.0.33"
 }