@drawbridge/drawbridge-utils 0.0.43 → 0.0.45

package/dist/ai.cjs

@@ -293,16 +293,10 @@ var google = {
     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),
-        tools: toolsFromResponse(response)
-      });
-    }
-    return { content };
+    const usage = tokensFromMetadata(response == null ? void 0 : response.usageMetadata);
+    const tools = toolsFromResponse(response);
+    const bill = (user == null ? void 0 : user.id) ? () => billRequest({ db, user, model, usage, tools }) : () => Promise.resolve();
+    return { content, bill };
   },
   text: async ({
     config = {},
@@ -324,16 +318,10 @@ var google = {
     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),
-        tools: toolsFromResponse(response)
-      });
-    }
-    return { content };
+    const usage = tokensFromMetadata(response == null ? void 0 : response.usageMetadata);
+    const tools = toolsFromResponse(response);
+    const bill = (user == null ? void 0 : user.id) ? () => billRequest({ db, user, model, usage, tools }) : () => Promise.resolve();
+    return { content, bill };
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/ai.d.cts

@@ -247,19 +247,14 @@ const google = {
 
 		}
 
-		if( user?.id ){
+		const usage = tokensFromMetadata( response?.usageMetadata );
+		const tools = toolsFromResponse( response );
 
-			await billRequest({
-				db,
-				user,
-				model,
-				usage : tokensFromMetadata( response?.usageMetadata ),
-				tools : toolsFromResponse( response )
-			});
+		const bill = user?.id
+			? () => billRequest({ db, user, model, usage, tools })
+			: () => Promise.resolve();
 
-		}
-
-		return { content };
+		return { content, bill };
 
 	},
 
@@ -287,25 +282,20 @@ const google = {
 
 		const content = response?.text;
 
-		if( !content ){
+		if( ! content ){
 
 			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
 		}
 
-		if( user?.id ){
+		const usage = tokensFromMetadata( response?.usageMetadata );
+		const tools = toolsFromResponse( response );
 
-			await billRequest({
-				db,
-				user,
-				model,
-				usage : tokensFromMetadata( response?.usageMetadata ),
-				tools : toolsFromResponse( response )
-			});
-
-		}
+		const bill = user?.id
+			? () => billRequest({ db, user, model, usage, tools })
+			: () => Promise.resolve();
 
-		return { content };
+		return { content, bill };
 
 	}
 

package/dist/ai.d.ts

@@ -247,19 +247,14 @@ const google = {
 
 		}
 
-		if( user?.id ){
+		const usage = tokensFromMetadata( response?.usageMetadata );
+		const tools = toolsFromResponse( response );
 
-			await billRequest({
-				db,
-				user,
-				model,
-				usage : tokensFromMetadata( response?.usageMetadata ),
-				tools : toolsFromResponse( response )
-			});
+		const bill = user?.id
+			? () => billRequest({ db, user, model, usage, tools })
+			: () => Promise.resolve();
 
-		}
-
-		return { content };
+		return { content, bill };
 
 	},
 
@@ -287,25 +282,20 @@ const google = {
 
 		const content = response?.text;
 
-		if( !content ){
+		if( ! content ){
 
 			throw new Error( 'Could not generate from prompt. Please try again with a different prompt.' );
 
 		}
 
-		if( user?.id ){
+		const usage = tokensFromMetadata( response?.usageMetadata );
+		const tools = toolsFromResponse( response );
 
-			await billRequest({
-				db,
-				user,
-				model,
-				usage : tokensFromMetadata( response?.usageMetadata ),
-				tools : toolsFromResponse( response )
-			});
-
-		}
+		const bill = user?.id
+			? () => billRequest({ db, user, model, usage, tools })
+			: () => Promise.resolve();
 
-		return { content };
+		return { content, bill };
 
 	}
 

package/dist/ai.js

@@ -263,16 +263,10 @@ var google = {
     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),
-        tools: toolsFromResponse(response)
-      });
-    }
-    return { content };
+    const usage = tokensFromMetadata(response == null ? void 0 : response.usageMetadata);
+    const tools = toolsFromResponse(response);
+    const bill = (user == null ? void 0 : user.id) ? () => billRequest({ db, user, model, usage, tools }) : () => Promise.resolve();
+    return { content, bill };
   },
   text: async ({
     config = {},
@@ -294,16 +288,10 @@ var google = {
     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),
-        tools: toolsFromResponse(response)
-      });
-    }
-    return { content };
+    const usage = tokensFromMetadata(response == null ? void 0 : response.usageMetadata);
+    const tools = toolsFromResponse(response);
+    const bill = (user == null ? void 0 : user.id) ? () => billRequest({ db, user, model, usage, tools }) : () => Promise.resolve();
+    return { content, bill };
   }
 };
 export {

package/dist/oauth/index.cjs

@@ -32,11 +32,14 @@ __export(oauth_exports, {
   compare: () => compare,
   createOAuthClient: () => createOAuthClient,
   developer: () => developer,
+  developerOptions: () => developerOptions,
   generateToken: () => generateToken,
   hashToken: () => hashToken,
   intersect: () => intersect,
   isDeveloperAllowed: () => isDeveloperAllowed,
   parse: () => parse,
+  scopeLabels: () => scopeLabels,
+  scopeOptions: () => scopeOptions,
   scopes: () => scopes,
   validate: () => validate
 });
@@ -113,6 +116,29 @@ var intersect = (requested, allowed) => {
   return r.filter((scope) => a.includes(scope));
 };
 var isDeveloperAllowed = (scope) => developer.includes(scope);
+var scopeLabels = {
+  "profile:read": "Read own profile",
+  "profile:write": "Update own profile",
+  "organization:read": "Read organization info",
+  "organization:write": "Manage organization",
+  "campaigns:read": "Read campaigns",
+  "campaigns:write": "Manage campaigns",
+  "contacts:read": "Read contacts",
+  "contacts:write": "Manage contacts",
+  "workflows:read": "Read workflows",
+  "workflows:write": "Manage workflows",
+  "connections:read": "Read integrations",
+  "connections:write": "Manage integrations",
+  "billing:read": "Read billing",
+  "billing:write": "Manage billing",
+  admin: "Admin access"
+};
+var toOption = (scope) => ({
+  key: scopeLabels[scope] || scope,
+  value: scope
+});
+var developerOptions = developer.map(toOption);
+var scopeOptions = scopes.map(toOption);
 var hashToken = (raw) => hash(raw, process.env.OAUTH_TOKEN_HMAC_KEY);
 var generateToken = () => generate(32, "base64url");
 var REFRESH_LEAD_SECONDS = 60;
@@ -186,11 +212,14 @@ var createOAuthClient = ({
   compare,
   createOAuthClient,
   developer,
+  developerOptions,
   generateToken,
   hashToken,
   intersect,
   isDeveloperAllowed,
   parse,
+  scopeLabels,
+  scopeOptions,
   scopes,
   validate
 });

package/dist/oauth/index.d.cts

@@ -83,6 +83,38 @@ const intersect = ( requested, allowed ) => {
 
 const isDeveloperAllowed = ( scope ) => developer.includes( scope );
 
+// User-facing labels for each scope — used by UI components rendering
+// scope pickers. Centralized here so the dashboard, future admin tools,
+// and any other consumer surface the same strings.
+const scopeLabels = {
+	'profile:read' : 'Read own profile',
+	'profile:write' : 'Update own profile',
+	'organization:read' : 'Read organization info',
+	'organization:write' : 'Manage organization',
+	'campaigns:read' : 'Read campaigns',
+	'campaigns:write' : 'Manage campaigns',
+	'contacts:read' : 'Read contacts',
+	'contacts:write' : 'Manage contacts',
+	'workflows:read' : 'Read workflows',
+	'workflows:write' : 'Manage workflows',
+	'connections:read' : 'Read integrations',
+	'connections:write' : 'Manage integrations',
+	'billing:read' : 'Read billing',
+	'billing:write' : 'Manage billing',
+	admin : 'Admin access'
+};
+
+const toOption = ( scope ) => ({
+	key : scopeLabels[ scope ] || scope,
+	value : scope
+});
+
+// `{ key, value }` option arrays ready to feed any standard checkbox-list
+// component. Derived from the canonical scope arrays so vocabulary
+// changes auto-propagate to every consumer on the next utils bump.
+const developerOptions = developer.map( toOption );
+const scopeOptions = scopes.map( toOption );
+
 // ─────────────────────────────────────────────────────────────────────────
 // Token primitives — convenience wrappers over drawbridge-utils/token that
 // fix the OAuth-specific conventions (32 bytes base64url, env-keyed HMAC)
@@ -228,4 +260,4 @@ const createOAuthClient = ({
 
 };
 
-export { createOAuthClient, developer, generateToken, hashToken, intersect, isDeveloperAllowed, parse, scopes, validate };
+export { createOAuthClient, developer, developerOptions, generateToken, hashToken, intersect, isDeveloperAllowed, parse, scopeLabels, scopeOptions, scopes, validate };

package/dist/oauth/index.d.ts

@@ -83,6 +83,38 @@ const intersect = ( requested, allowed ) => {
 
 const isDeveloperAllowed = ( scope ) => developer.includes( scope );
 
+// User-facing labels for each scope — used by UI components rendering
+// scope pickers. Centralized here so the dashboard, future admin tools,
+// and any other consumer surface the same strings.
+const scopeLabels = {
+	'profile:read' : 'Read own profile',
+	'profile:write' : 'Update own profile',
+	'organization:read' : 'Read organization info',
+	'organization:write' : 'Manage organization',
+	'campaigns:read' : 'Read campaigns',
+	'campaigns:write' : 'Manage campaigns',
+	'contacts:read' : 'Read contacts',
+	'contacts:write' : 'Manage contacts',
+	'workflows:read' : 'Read workflows',
+	'workflows:write' : 'Manage workflows',
+	'connections:read' : 'Read integrations',
+	'connections:write' : 'Manage integrations',
+	'billing:read' : 'Read billing',
+	'billing:write' : 'Manage billing',
+	admin : 'Admin access'
+};
+
+const toOption = ( scope ) => ({
+	key : scopeLabels[ scope ] || scope,
+	value : scope
+});
+
+// `{ key, value }` option arrays ready to feed any standard checkbox-list
+// component. Derived from the canonical scope arrays so vocabulary
+// changes auto-propagate to every consumer on the next utils bump.
+const developerOptions = developer.map( toOption );
+const scopeOptions = scopes.map( toOption );
+
 // ─────────────────────────────────────────────────────────────────────────
 // Token primitives — convenience wrappers over drawbridge-utils/token that
 // fix the OAuth-specific conventions (32 bytes base64url, env-keyed HMAC)
@@ -228,4 +260,4 @@ const createOAuthClient = ({
 
 };
 
-export { createOAuthClient, developer, generateToken, hashToken, intersect, isDeveloperAllowed, parse, scopes, validate };
+export { createOAuthClient, developer, developerOptions, generateToken, hashToken, intersect, isDeveloperAllowed, parse, scopeLabels, scopeOptions, scopes, validate };

package/dist/oauth/index.js

@@ -69,6 +69,29 @@ var intersect = (requested, allowed) => {
   return r.filter((scope) => a.includes(scope));
 };
 var isDeveloperAllowed = (scope) => developer.includes(scope);
+var scopeLabels = {
+  "profile:read": "Read own profile",
+  "profile:write": "Update own profile",
+  "organization:read": "Read organization info",
+  "organization:write": "Manage organization",
+  "campaigns:read": "Read campaigns",
+  "campaigns:write": "Manage campaigns",
+  "contacts:read": "Read contacts",
+  "contacts:write": "Manage contacts",
+  "workflows:read": "Read workflows",
+  "workflows:write": "Manage workflows",
+  "connections:read": "Read integrations",
+  "connections:write": "Manage integrations",
+  "billing:read": "Read billing",
+  "billing:write": "Manage billing",
+  admin: "Admin access"
+};
+var toOption = (scope) => ({
+  key: scopeLabels[scope] || scope,
+  value: scope
+});
+var developerOptions = developer.map(toOption);
+var scopeOptions = scopes.map(toOption);
 var hashToken = (raw) => hash(raw, process.env.OAUTH_TOKEN_HMAC_KEY);
 var generateToken = () => generate(32, "base64url");
 var REFRESH_LEAD_SECONDS = 60;
@@ -141,11 +164,14 @@ export {
   compare,
   createOAuthClient,
   developer,
+  developerOptions,
   generateToken,
   hashToken,
   intersect,
   isDeveloperAllowed,
   parse,
+  scopeLabels,
+  scopeOptions,
   scopes,
   validate
 };

package/dist/oauth/server.cjs

@@ -59,6 +59,23 @@ var compare = (a, b) => {
 };
 
 // lib/oauth/index.js
+var scopes = [
+  "profile:read",
+  "profile:write",
+  "organization:read",
+  "organization:write",
+  "campaigns:read",
+  "campaigns:write",
+  "contacts:read",
+  "contacts:write",
+  "workflows:read",
+  "workflows:write",
+  "connections:read",
+  "connections:write",
+  "billing:read",
+  "billing:write",
+  "admin"
+];
 var developer = [
   "profile:read",
   "organization:read",
@@ -81,6 +98,29 @@ var intersect = (requested, allowed) => {
   const a = parse(allowed);
   return r.filter((scope) => a.includes(scope));
 };
+var scopeLabels = {
+  "profile:read": "Read own profile",
+  "profile:write": "Update own profile",
+  "organization:read": "Read organization info",
+  "organization:write": "Manage organization",
+  "campaigns:read": "Read campaigns",
+  "campaigns:write": "Manage campaigns",
+  "contacts:read": "Read contacts",
+  "contacts:write": "Manage contacts",
+  "workflows:read": "Read workflows",
+  "workflows:write": "Manage workflows",
+  "connections:read": "Read integrations",
+  "connections:write": "Manage integrations",
+  "billing:read": "Read billing",
+  "billing:write": "Manage billing",
+  admin: "Admin access"
+};
+var toOption = (scope) => ({
+  key: scopeLabels[scope] || scope,
+  value: scope
+});
+var developerOptions = developer.map(toOption);
+var scopeOptions = scopes.map(toOption);
 var hashToken = (raw) => hash(raw, process.env.OAUTH_TOKEN_HMAC_KEY);
 var generateToken = () => generate(32, "base64url");
 

package/dist/oauth/server.js

@@ -24,6 +24,23 @@ var compare = (a, b) => {
 };
 
 // lib/oauth/index.js
+var scopes = [
+  "profile:read",
+  "profile:write",
+  "organization:read",
+  "organization:write",
+  "campaigns:read",
+  "campaigns:write",
+  "contacts:read",
+  "contacts:write",
+  "workflows:read",
+  "workflows:write",
+  "connections:read",
+  "connections:write",
+  "billing:read",
+  "billing:write",
+  "admin"
+];
 var developer = [
   "profile:read",
   "organization:read",
@@ -46,6 +63,29 @@ var intersect = (requested, allowed) => {
   const a = parse(allowed);
   return r.filter((scope) => a.includes(scope));
 };
+var scopeLabels = {
+  "profile:read": "Read own profile",
+  "profile:write": "Update own profile",
+  "organization:read": "Read organization info",
+  "organization:write": "Manage organization",
+  "campaigns:read": "Read campaigns",
+  "campaigns:write": "Manage campaigns",
+  "contacts:read": "Read contacts",
+  "contacts:write": "Manage contacts",
+  "workflows:read": "Read workflows",
+  "workflows:write": "Manage workflows",
+  "connections:read": "Read integrations",
+  "connections:write": "Manage integrations",
+  "billing:read": "Read billing",
+  "billing:write": "Manage billing",
+  admin: "Admin access"
+};
+var toOption = (scope) => ({
+  key: scopeLabels[scope] || scope,
+  value: scope
+});
+var developerOptions = developer.map(toOption);
+var scopeOptions = scopes.map(toOption);
 var hashToken = (raw) => hash(raw, process.env.OAUTH_TOKEN_HMAC_KEY);
 var generateToken = () => generate(32, "base64url");
 

package/package.json

@@ -130,5 +130,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.43"
+  "version": "0.0.45"
 }