@frogbotai/plugin-api-keys 0.15.0 → 0.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/ApiKeysManager.d.ts.map +1 -1
- package/dist/client/ApiKeysManager.js +5 -3
- package/dist/client/ApiKeysManager.js.map +1 -1
- package/dist/client/ApiKeysManager.spec.js +3 -3
- package/dist/client/ApiKeysManager.spec.js.map +1 -1
- package/dist/collection.d.ts +1 -2
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +53 -18
- package/dist/collection.js.map +1 -1
- package/dist/fields.d.ts +2 -2
- package/dist/fields.d.ts.map +1 -1
- package/dist/fields.js +9 -39
- package/dist/fields.js.map +1 -1
- package/dist/index.d.ts +4 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +75 -85
- package/dist/index.js.map +1 -1
- package/dist/policy.d.ts +3 -37
- package/dist/policy.d.ts.map +1 -1
- package/dist/policy.js +0 -61
- package/dist/policy.js.map +1 -1
- package/dist/server/services.d.ts +1 -1
- package/dist/server/services.d.ts.map +1 -1
- package/dist/server/services.js +15 -6
- package/dist/server/services.js.map +1 -1
- package/dist/strategy.d.ts.map +1 -1
- package/dist/strategy.js +6 -2
- package/dist/strategy.js.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiKeysManager.d.ts","sourceRoot":"","sources":["../../src/client/ApiKeysManager.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ApiKeysManager.d.ts","sourceRoot":"","sources":["../../src/client/ApiKeysManager.tsx"],"names":[],"mappings":"AAEA,OAAO,cAAc,CAAC;AAiBtB,wBAAgB,cAAc,4CAsI7B;AAED,wBAAgB,YAAY,CAAC,EAC3B,OAAO,GACR,EAAE;IACD,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAC5E,2CAmEA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
3
|
-
import { Button, CopyIcon, Modal, TextInput, Tooltip, useConfig, useListQuery, useModal, useRouteCache } from '@payloadcms/ui';
|
|
4
|
-
import { useState } from 'react';
|
|
5
3
|
import './styles.css';
|
|
4
|
+
import { Button, CopyIcon, Modal, TextInput, Tooltip, useConfig, useListQuery, useModal, useRouteCache, } from '@payloadcms/ui';
|
|
5
|
+
import { useState } from 'react';
|
|
6
6
|
const modalSlug = 'create-api-key-modal';
|
|
7
7
|
export function ApiKeysManager() {
|
|
8
8
|
const { config } = useConfig();
|
|
@@ -83,7 +83,9 @@ export function RevokeApiKey({ rowData, }) {
|
|
|
83
83
|
async function revoke() {
|
|
84
84
|
setLoading(true);
|
|
85
85
|
setError(undefined);
|
|
86
|
-
const response = await fetch(`${config.routes.api}/${collectionSlug}/${rowData.id}/revoke`, {
|
|
86
|
+
const response = await fetch(`${config.routes.api}/${collectionSlug}/${rowData.id}/revoke`, {
|
|
87
|
+
method: 'POST',
|
|
88
|
+
});
|
|
87
89
|
setLoading(false);
|
|
88
90
|
if (!response.ok) {
|
|
89
91
|
const result = (await response.json());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiKeysManager.js","sourceRoot":"","sources":["../../src/client/ApiKeysManager.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,
|
|
1
|
+
{"version":3,"file":"ApiKeysManager.js","sourceRoot":"","sources":["../../src/client/ApiKeysManager.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,11 @@ const closeModal = vi.fn();
|
|
|
5
5
|
const openModal = vi.fn();
|
|
6
6
|
const clearRouteCache = vi.fn();
|
|
7
7
|
vi.mock('@payloadcms/ui', () => ({
|
|
8
|
-
Button: ({ children, ...props }) => _jsx("button", { ...props, children: children }),
|
|
8
|
+
Button: ({ children, ...props }) => (_jsx("button", { ...props, children: children })),
|
|
9
9
|
CopyIcon: () => _jsx("svg", { "data-testid": "copy-icon" }),
|
|
10
|
-
Modal: ({ children, className }) => _jsx("div", { className: className, role: "dialog", children: children }),
|
|
10
|
+
Modal: ({ children, className }) => (_jsx("div", { className: className, role: "dialog", children: children })),
|
|
11
11
|
TextInput: ({ label, ...props }) => _jsx("input", { "aria-label": label, ...props }),
|
|
12
|
-
Tooltip: ({ children, show }) =>
|
|
12
|
+
Tooltip: ({ children, show }) => show ? _jsx("span", { children: children }) : null,
|
|
13
13
|
useConfig: () => ({ config: { routes: { api: '/api' } } }),
|
|
14
14
|
useListQuery: () => ({ collectionSlug: 'api-keys' }),
|
|
15
15
|
useModal: () => ({ closeModal, openModal }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiKeysManager.spec.js","sourceRoot":"","sources":["../../src/client/ApiKeysManager.spec.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAC3B,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAC1B,MAAM,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAEhC,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/B,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAA2B,EAAE,EAAE,CAAC,oBAAY,KAAK,YAAG,QAAQ,GAAU;
|
|
1
|
+
{"version":3,"file":"ApiKeysManager.spec.js","sourceRoot":"","sources":["../../src/client/ApiKeysManager.spec.tsx"],"names":[],"mappings":"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"}
|
package/dist/collection.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import type { CollectionConfig,
|
|
1
|
+
import type { CollectionConfig, FrogbotRequest } from 'frogbot';
|
|
2
2
|
type CollectionOptions = {
|
|
3
3
|
authCollection: string;
|
|
4
4
|
collectionSlug: string;
|
|
5
5
|
tokenPrefix: string;
|
|
6
6
|
usageCollection?: string;
|
|
7
|
-
policyAccess?: FieldAccess;
|
|
8
7
|
canRevokeAnyKey?: (req: FrogbotRequest) => boolean | Promise<boolean>;
|
|
9
8
|
collection?: Partial<CollectionConfig>;
|
|
10
9
|
existing?: CollectionConfig;
|
package/dist/collection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,gBAAgB,EAAmB,
|
|
1
|
+
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,gBAAgB,EAAmB,cAAc,EAAE,MAAM,SAAS,CAAC;AAIzF,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,UAAU,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAkGF,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,gBAAgB,CAkIpF"}
|
package/dist/collection.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ApiKeyServiceError, mintApiKey, revokeApiKey, rotateApiKey } from './server/services.js';
|
|
2
|
-
import { createPolicyFields } from './fields.js';
|
|
3
2
|
const ownKeys = ({ req }) => (req.user ? { owner: { equals: req.user.id } } : false);
|
|
4
3
|
function mergeFields(...groups) {
|
|
5
4
|
const fields = new Map();
|
|
@@ -11,7 +10,7 @@ function mergeFields(...groups) {
|
|
|
11
10
|
}
|
|
12
11
|
return [...fields.values()];
|
|
13
12
|
}
|
|
14
|
-
function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey }) {
|
|
13
|
+
function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey, }) {
|
|
15
14
|
return [
|
|
16
15
|
{
|
|
17
16
|
method: 'post',
|
|
@@ -19,16 +18,19 @@ function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey }) {
|
|
|
19
18
|
handler: async (req) => {
|
|
20
19
|
if (!req.user)
|
|
21
20
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
22
|
-
const body = (await req.json?.().catch(() => null) ?? null);
|
|
21
|
+
const body = ((await req.json?.().catch(() => null)) ?? null);
|
|
23
22
|
const name = typeof body?.name === 'string' ? body.name.trim() : '';
|
|
24
23
|
if (!name)
|
|
25
24
|
return Response.json({ error: 'Name is required' }, { status: 400 });
|
|
26
25
|
try {
|
|
27
|
-
return Response.json(await mintApiKey({ req, collectionSlug, tokenPrefix, name }), {
|
|
26
|
+
return Response.json(await mintApiKey({ req, collectionSlug, tokenPrefix, name }), {
|
|
27
|
+
status: 201,
|
|
28
|
+
});
|
|
28
29
|
}
|
|
29
30
|
catch (error) {
|
|
30
|
-
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required')
|
|
31
|
+
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required') {
|
|
31
32
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
33
|
+
}
|
|
32
34
|
throw error;
|
|
33
35
|
}
|
|
34
36
|
},
|
|
@@ -40,18 +42,21 @@ function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey }) {
|
|
|
40
42
|
if (!req.user)
|
|
41
43
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
42
44
|
const id = req.routeParams?.id;
|
|
43
|
-
if (typeof id !== 'string' || !id)
|
|
45
|
+
if (typeof id !== 'string' || !id) {
|
|
44
46
|
return Response.json({ error: 'API key not found' }, { status: 404 });
|
|
47
|
+
}
|
|
45
48
|
try {
|
|
46
49
|
const anyOwner = (await canRevokeAnyKey?.(req)) === true;
|
|
47
50
|
const { name: _name, owner: _owner, ...result } = await revokeApiKey({ req, collectionSlug, id, anyOwner });
|
|
48
51
|
return Response.json(result);
|
|
49
52
|
}
|
|
50
53
|
catch (error) {
|
|
51
|
-
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required')
|
|
54
|
+
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required') {
|
|
52
55
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
53
|
-
|
|
56
|
+
}
|
|
57
|
+
if (error instanceof ApiKeyServiceError && error.code === 'not_found') {
|
|
54
58
|
return Response.json({ error: 'API key not found' }, { status: 404 });
|
|
59
|
+
}
|
|
55
60
|
throw error;
|
|
56
61
|
}
|
|
57
62
|
},
|
|
@@ -63,17 +68,20 @@ function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey }) {
|
|
|
63
68
|
if (!req.user)
|
|
64
69
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
65
70
|
const id = req.routeParams?.id;
|
|
66
|
-
if (typeof id !== 'string' || !id)
|
|
71
|
+
if (typeof id !== 'string' || !id) {
|
|
67
72
|
return Response.json({ error: 'API key not found' }, { status: 404 });
|
|
73
|
+
}
|
|
68
74
|
try {
|
|
69
75
|
const anyOwner = (await canRevokeAnyKey?.(req)) === true;
|
|
70
76
|
return Response.json(await rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner }), { status: 201 });
|
|
71
77
|
}
|
|
72
78
|
catch (error) {
|
|
73
|
-
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required')
|
|
79
|
+
if (error instanceof ApiKeyServiceError && error.code === 'authentication_required') {
|
|
74
80
|
return Response.json({ error: 'Authentication required' }, { status: 401 });
|
|
75
|
-
|
|
81
|
+
}
|
|
82
|
+
if (error instanceof ApiKeyServiceError && error.code === 'not_found') {
|
|
76
83
|
return Response.json({ error: 'API key not found' }, { status: 404 });
|
|
84
|
+
}
|
|
77
85
|
throw error;
|
|
78
86
|
}
|
|
79
87
|
},
|
|
@@ -81,14 +89,40 @@ function createEndpoints({ collectionSlug, tokenPrefix, canRevokeAnyKey }) {
|
|
|
81
89
|
];
|
|
82
90
|
}
|
|
83
91
|
export function createApiKeysCollection(options) {
|
|
84
|
-
const { authCollection, collectionSlug, collection, existing,
|
|
92
|
+
const { authCollection, collectionSlug, collection, existing, usageCollection } = options;
|
|
85
93
|
const fields = [
|
|
86
94
|
{ name: 'name', type: 'text', required: true },
|
|
87
|
-
{
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
95
|
+
{
|
|
96
|
+
name: 'owner',
|
|
97
|
+
type: 'relationship',
|
|
98
|
+
relationTo: authCollection,
|
|
99
|
+
required: true,
|
|
100
|
+
index: true,
|
|
101
|
+
access: { update: () => false },
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
name: 'prefix',
|
|
105
|
+
type: 'text',
|
|
106
|
+
required: true,
|
|
107
|
+
index: true,
|
|
108
|
+
access: { update: () => false },
|
|
109
|
+
admin: { readOnly: true },
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
name: 'tokenHash',
|
|
113
|
+
type: 'text',
|
|
114
|
+
required: true,
|
|
115
|
+
unique: true,
|
|
116
|
+
index: true,
|
|
117
|
+
access: { read: () => false, update: () => false },
|
|
118
|
+
admin: { hidden: true },
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
name: 'lastUsedAt',
|
|
122
|
+
type: 'date',
|
|
123
|
+
access: { update: () => false },
|
|
124
|
+
admin: { readOnly: true },
|
|
125
|
+
},
|
|
92
126
|
{
|
|
93
127
|
name: 'revokedAt',
|
|
94
128
|
type: 'date',
|
|
@@ -158,7 +192,8 @@ export function createApiKeysCollection(options) {
|
|
|
158
192
|
useAsTitle: 'name',
|
|
159
193
|
...existing?.admin,
|
|
160
194
|
...collection?.admin,
|
|
161
|
-
defaultColumns: collection?.admin?.defaultColumns ??
|
|
195
|
+
defaultColumns: collection?.admin?.defaultColumns ??
|
|
196
|
+
existing?.admin?.defaultColumns ?? [
|
|
162
197
|
'name',
|
|
163
198
|
'prefix',
|
|
164
199
|
...(usageCollection ? ['totalCostUSD'] : []),
|
package/dist/collection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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"}
|
package/dist/fields.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { Field
|
|
2
|
-
export declare function createPolicyFields(
|
|
1
|
+
import type { Field } from 'frogbot';
|
|
2
|
+
export declare function createPolicyFields(modelIDs: string[]): Field[];
|
|
3
3
|
//# sourceMappingURL=fields.d.ts.map
|
package/dist/fields.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../src/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../src/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAa9D"}
|
package/dist/fields.js
CHANGED
|
@@ -1,45 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
function policyField(name, value, manage) {
|
|
3
|
-
return {
|
|
4
|
-
name,
|
|
5
|
-
type: 'group',
|
|
6
|
-
access: { update: manage },
|
|
7
|
-
fields: [
|
|
8
|
-
{
|
|
9
|
-
name: 'mode',
|
|
10
|
-
type: 'select',
|
|
11
|
-
defaultValue: 'inherit',
|
|
12
|
-
required: true,
|
|
13
|
-
options: ['inherit', 'custom', 'unlimited'],
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
...value,
|
|
17
|
-
name: 'value',
|
|
18
|
-
admin: { ...value.admin, condition: (_, siblingData) => siblingData.mode === 'custom' },
|
|
19
|
-
},
|
|
20
|
-
],
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
export function createPolicyFields(includeState, policyAccess = deny) {
|
|
1
|
+
export function createPolicyFields(modelIDs) {
|
|
24
2
|
return [
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
policyField('tpm', { name: 'value', type: 'number', min: 1 }, policyAccess),
|
|
28
|
-
policyField('models', { name: 'value', type: 'json' }, policyAccess),
|
|
3
|
+
{ name: 'monthlyBudget', label: 'Monthly Budget (USD)', type: 'number', min: 0 },
|
|
4
|
+
{ name: 'models', type: 'select', hasMany: true, options: modelIDs },
|
|
29
5
|
{
|
|
30
|
-
name: '
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
access: { update:
|
|
6
|
+
name: 'spendThisPeriodUSD',
|
|
7
|
+
label: 'Monthly Spend (USD)',
|
|
8
|
+
type: 'number',
|
|
9
|
+
defaultValue: 0,
|
|
10
|
+
access: { update: () => false },
|
|
11
|
+
admin: { readOnly: true },
|
|
35
12
|
},
|
|
36
|
-
...(includeState
|
|
37
|
-
? [
|
|
38
|
-
{ name: 'spendThisPeriodUSD', type: 'number', defaultValue: 0, access: { update: () => false }, admin: { readOnly: true } },
|
|
39
|
-
{ name: 'budgetPeriodStartedAt', type: 'date', access: { update: () => false }, admin: { readOnly: true } },
|
|
40
|
-
{ name: 'budgetAlertsSent', type: 'json', access: { update: () => false }, admin: { hidden: true } },
|
|
41
|
-
]
|
|
42
|
-
: []),
|
|
43
13
|
];
|
|
44
14
|
}
|
|
45
15
|
//# sourceMappingURL=fields.js.map
|
package/dist/fields.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fields.js","sourceRoot":"","sources":["../src/fields.ts"],"names":[],"mappings":"AAEA,MAAM,
|
|
1
|
+
{"version":3,"file":"fields.js","sourceRoot":"","sources":["../src/fields.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAC,QAAkB;IACnD,OAAO;QACL,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE;QAChF,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QACpE;YACE,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,qBAAqB;YAC5B,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,CAAC;YACf,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE;YAC/B,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC1B;KACF,CAAC;AACJ,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export type {
|
|
3
|
-
export type { MintApiKeyOptions, RevokeApiKeyOptions, RotateApiKeyOptions } from './server/services.js';
|
|
1
|
+
import { type CollectionConfig, type FrogbotRequest, type Plugin } from 'frogbot';
|
|
2
|
+
export type { PolicyDocument } from './policy.js';
|
|
3
|
+
export type { MintApiKeyOptions, RevokeApiKeyOptions, RotateApiKeyOptions, } from './server/services.js';
|
|
4
4
|
export { ApiKeyServiceError, mintApiKey, revokeApiKey, rotateApiKey } from './server/services.js';
|
|
5
|
-
export type {
|
|
5
|
+
export type { ApiKeyHeaderOptions, ApiKeyTokenOptions } from './server/token.js';
|
|
6
6
|
export { createApiKeyToken, extractApiKeyToken, getApiKeyPrefix, hashApiKeyToken, } from './server/token.js';
|
|
7
7
|
export type { ApiKeyStrategy } from './strategy.js';
|
|
8
8
|
export { isApiKeyStrategy } from './strategy.js';
|
|
@@ -12,14 +12,7 @@ export type ApiKeysPluginOptions = {
|
|
|
12
12
|
tokenPrefix?: string;
|
|
13
13
|
headerNames?: string[];
|
|
14
14
|
collection?: Partial<CollectionConfig>;
|
|
15
|
-
policyAccess?: FieldAccess;
|
|
16
15
|
canRevokeAnyKey?: (req: FrogbotRequest) => boolean | Promise<boolean>;
|
|
17
|
-
defaults?: import('./policy.js').PolicyDefaults;
|
|
18
|
-
alerts?: {
|
|
19
|
-
webhookURL: string;
|
|
20
|
-
thresholds?: number[];
|
|
21
|
-
headers?: Record<string, string>;
|
|
22
|
-
};
|
|
23
16
|
};
|
|
24
17
|
export declare function apiKeysPlugin(options?: ApiKeysPluginOptions): Plugin;
|
|
25
18
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEnB,KAAK,MAAM,EACZ,MAAM,SAAS,CAAC;AAQjB,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,YAAY,EACV,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClG,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACvE,CAAC;AAsBF,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,CAyKxE"}
|
package/dist/index.js
CHANGED
|
@@ -1,54 +1,62 @@
|
|
|
1
|
-
import { calculateModelCostUSD } from '@frogbotai/gateway';
|
|
2
|
-
import { BudgetExceededError, ModelNotAllowedError
|
|
1
|
+
import { calculateCostUSD, calculateModelCostUSD } from '@frogbotai/gateway';
|
|
2
|
+
import { BudgetExceededError, ModelNotAllowedError } from '@frogbotai/gateway/errors';
|
|
3
|
+
import { getConfiguredModelIds, } from 'frogbot';
|
|
3
4
|
import { createApiKeysCollection } from './collection.js';
|
|
4
5
|
import { createPolicyFields } from './fields.js';
|
|
5
|
-
import { SerialQueue
|
|
6
|
+
import { SerialQueue } from './policy.js';
|
|
6
7
|
import { createApiKeyStrategy } from './strategy.js';
|
|
7
8
|
export { ApiKeyServiceError, mintApiKey, revokeApiKey, rotateApiKey } from './server/services.js';
|
|
8
9
|
export { createApiKeyToken, extractApiKeyToken, getApiKeyPrefix, hashApiKeyToken, } from './server/token.js';
|
|
9
10
|
export { isApiKeyStrategy } from './strategy.js';
|
|
11
|
+
function isPricedCustomProvider(entry) {
|
|
12
|
+
return (typeof entry === 'object' &&
|
|
13
|
+
entry !== null &&
|
|
14
|
+
'type' in entry &&
|
|
15
|
+
entry.type === 'openai-compatible' &&
|
|
16
|
+
'models' in entry &&
|
|
17
|
+
Array.isArray(entry.models));
|
|
18
|
+
}
|
|
10
19
|
export function apiKeysPlugin(options = {}) {
|
|
11
|
-
for (const [name, value] of Object.entries(options.defaults ?? {})) {
|
|
12
|
-
if (name !== 'models' && name !== 'budgetBehavior' && (typeof value !== 'number' || !Number.isFinite(value) || value < 0))
|
|
13
|
-
throw new Error(`[plugin-api-keys] Default '${name}' must be a non-negative finite number.`);
|
|
14
|
-
}
|
|
15
|
-
if ((options.defaults?.rpm !== undefined && options.defaults.rpm < 1) || (options.defaults?.tpm !== undefined && options.defaults.tpm < 1))
|
|
16
|
-
throw new Error('[plugin-api-keys] RPM and TPM defaults must be at least 1.');
|
|
17
|
-
if (options.defaults?.budgetBehavior !== undefined && !['block', 'alert-only'].includes(options.defaults.budgetBehavior))
|
|
18
|
-
throw new Error('[plugin-api-keys] Budget behavior must be block or alert-only.');
|
|
19
|
-
if (options.defaults?.models?.some((model) => !model.includes('/')))
|
|
20
|
-
throw new Error('[plugin-api-keys] Default models must use provider/model IDs.');
|
|
21
|
-
if (options.alerts && !options.alerts.webhookURL)
|
|
22
|
-
throw new Error('[plugin-api-keys] Alert webhookURL is required.');
|
|
23
|
-
if (options.alerts?.thresholds?.some((threshold) => !Number.isFinite(threshold) || threshold <= 0 || threshold > 1))
|
|
24
|
-
throw new Error('[plugin-api-keys] Alert thresholds must be greater than 0 and at most 1.');
|
|
25
|
-
const limiter = new SlidingWindowRateLimiter();
|
|
26
20
|
const queue = new SerialQueue();
|
|
27
21
|
return (config) => {
|
|
28
22
|
const authCollection = options.authCollection ?? 'users';
|
|
29
23
|
const collectionSlug = options.collectionSlug ?? 'api-keys';
|
|
24
|
+
const configuredCosts = new Map();
|
|
25
|
+
for (const [provider, entry] of Object.entries(config.ai?.providers ?? {})) {
|
|
26
|
+
if (!isPricedCustomProvider(entry))
|
|
27
|
+
continue;
|
|
28
|
+
for (const model of entry.models) {
|
|
29
|
+
if (!model.cost)
|
|
30
|
+
continue;
|
|
31
|
+
configuredCosts.set(`${provider}/${model.id}`, {
|
|
32
|
+
input: model.cost.input ?? 0,
|
|
33
|
+
output: model.cost.output ?? 0,
|
|
34
|
+
...(model.cost.cache_read !== undefined && { cache_read: model.cost.cache_read }),
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
30
38
|
const auth = config.collections.find((collection) => collection.slug === authCollection);
|
|
31
39
|
if (!auth || auth.auth === undefined || auth.auth === false) {
|
|
32
40
|
throw new Error(`[plugin-api-keys] Auth collection '${authCollection}' must exist and have auth enabled.`);
|
|
33
41
|
}
|
|
34
|
-
const reservedPolicyFields = new Set(['monthlyBudget', '
|
|
42
|
+
const reservedPolicyFields = new Set(['monthlyBudget', 'models', 'spendThisPeriodUSD']);
|
|
35
43
|
const collision = auth.fields.find((field) => 'name' in field && reservedPolicyFields.has(field.name));
|
|
36
|
-
if (collision && 'name' in collision)
|
|
44
|
+
if (collision && 'name' in collision) {
|
|
37
45
|
throw new Error(`[plugin-api-keys] Auth field '${collision.name}' is reserved.`);
|
|
46
|
+
}
|
|
38
47
|
const existing = config.collections.find((collection) => collection.slug === collectionSlug);
|
|
39
48
|
const usageLog = config.ai
|
|
40
|
-
? config.collections.find((item) => item.usageLog === true) ?? {
|
|
49
|
+
? (config.collections.find((item) => item.usageLog === true) ?? {
|
|
41
50
|
slug: 'usage-logs',
|
|
42
51
|
usageLog: true,
|
|
43
52
|
fields: [],
|
|
44
|
-
}
|
|
53
|
+
})
|
|
45
54
|
: undefined;
|
|
46
55
|
const collection = createApiKeysCollection({
|
|
47
56
|
authCollection,
|
|
48
57
|
collectionSlug,
|
|
49
58
|
tokenPrefix: options.tokenPrefix ?? 'fb',
|
|
50
59
|
usageCollection: usageLog?.slug,
|
|
51
|
-
policyAccess: options.policyAccess,
|
|
52
60
|
canRevokeAnyKey: options.canRevokeAnyKey,
|
|
53
61
|
collection: options.collection,
|
|
54
62
|
existing,
|
|
@@ -73,11 +81,8 @@ export function apiKeysPlugin(options = {}) {
|
|
|
73
81
|
const authConfig = typeof next.auth === 'object' ? next.auth : {};
|
|
74
82
|
next = {
|
|
75
83
|
...next,
|
|
76
|
-
fields: [...next.fields, ...createPolicyFields(
|
|
77
|
-
auth: {
|
|
78
|
-
...authConfig,
|
|
79
|
-
strategies: [...(authConfig.strategies ?? []), strategy],
|
|
80
|
-
},
|
|
84
|
+
fields: [...next.fields, ...createPolicyFields(getConfiguredModelIds(config.ai))],
|
|
85
|
+
auth: { ...authConfig, strategies: [...(authConfig.strategies ?? []), strategy] },
|
|
81
86
|
};
|
|
82
87
|
}
|
|
83
88
|
if (item === usageLog)
|
|
@@ -88,26 +93,17 @@ export function apiKeysPlugin(options = {}) {
|
|
|
88
93
|
slug: 'frogbot-reset-ai-budgets',
|
|
89
94
|
schedule: [{ cron: '0 0 1 * *', queue: 'frogbot-reset-ai-budgets' }],
|
|
90
95
|
handler: async ({ req }) => {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
});
|
|
99
|
-
}
|
|
96
|
+
await req.payload.update({
|
|
97
|
+
collection: authCollection,
|
|
98
|
+
where: { id: { exists: true } },
|
|
99
|
+
data: { spendThisPeriodUSD: 0 },
|
|
100
|
+
overrideAccess: true,
|
|
101
|
+
req,
|
|
102
|
+
});
|
|
100
103
|
return { output: {} };
|
|
101
104
|
},
|
|
102
105
|
};
|
|
103
|
-
const
|
|
104
|
-
const jobs = {
|
|
105
|
-
...config.jobs,
|
|
106
|
-
tasks: [...(config.jobs?.tasks ?? []), resetTask],
|
|
107
|
-
autoRun: typeof autoRun === 'function'
|
|
108
|
-
? async (payload) => [...(await autoRun(payload)), { allQueues: true, cron: '* * * * *' }]
|
|
109
|
-
: [...(autoRun ?? []), { allQueues: true, cron: '* * * * *' }],
|
|
110
|
-
};
|
|
106
|
+
const jobs = { ...config.jobs, tasks: [...(config.jobs?.tasks ?? []), resetTask] };
|
|
111
107
|
return {
|
|
112
108
|
...config,
|
|
113
109
|
jobs: config.ai ? jobs : config.jobs,
|
|
@@ -127,67 +123,61 @@ export function apiKeysPlugin(options = {}) {
|
|
|
127
123
|
beforeOperation: [
|
|
128
124
|
...(config.ai.hooks?.beforeOperation ?? []),
|
|
129
125
|
async (args) => {
|
|
130
|
-
const apiKeyId = args.req?.user?.apiKeyId;
|
|
131
126
|
if (!args.req?.user)
|
|
132
127
|
return;
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
return;
|
|
137
|
-
const key = apiKeyId === undefined ? undefined : await args.req.frogbot.findByID({ collection: collectionSlug, id: apiKeyId, depth: 0, overrideAccess: true, req: args.req });
|
|
138
|
-
const user = args.req.user;
|
|
139
|
-
const policy = resolvePolicy({ key: key, user, defaults: options.defaults });
|
|
140
|
-
const userPolicy = resolvePolicy({ user, defaults: options.defaults });
|
|
141
|
-
const subjects = [
|
|
142
|
-
apiKeyId === undefined ? undefined : { subject: `key:${apiKeyId}`, policy },
|
|
143
|
-
{ subject: `user:${args.req.user.id}`, policy: userPolicy },
|
|
144
|
-
].filter((value) => Boolean(value));
|
|
145
|
-
if (subjects.some(({ policy: current }) => current.budgetBehavior === 'block' && current.monthlyBudgetUSD !== undefined && current.spendThisPeriodUSD >= current.monthlyBudgetUSD))
|
|
128
|
+
const policy = args.req.user;
|
|
129
|
+
if (policy.monthlyBudget !== undefined &&
|
|
130
|
+
(policy.spendThisPeriodUSD ?? 0) >= policy.monthlyBudget) {
|
|
146
131
|
throw new BudgetExceededError();
|
|
147
|
-
for (const { subject, policy: current } of subjects) {
|
|
148
|
-
const violation = limiter.admit(subject, current);
|
|
149
|
-
if (violation)
|
|
150
|
-
throw new RateLimitExceededError(violation);
|
|
151
132
|
}
|
|
152
|
-
Object.assign(args.context, {
|
|
133
|
+
Object.assign(args.context, {
|
|
134
|
+
policy,
|
|
135
|
+
...('apiKeyId' in policy && typeof policy.apiKeyId === 'string'
|
|
136
|
+
? { usageFields: { apiKey: policy.apiKeyId } }
|
|
137
|
+
: {}),
|
|
138
|
+
});
|
|
153
139
|
},
|
|
154
140
|
],
|
|
155
141
|
beforeUpstream: [
|
|
156
142
|
...(config.ai.hooks?.beforeUpstream ?? []),
|
|
157
143
|
(args) => {
|
|
158
144
|
const models = args.context.policy?.models;
|
|
159
|
-
if (models && !models.includes(args.model))
|
|
145
|
+
if (models?.length && !models.includes(args.model)) {
|
|
160
146
|
throw new ModelNotAllowedError(args.model);
|
|
147
|
+
}
|
|
161
148
|
},
|
|
162
149
|
],
|
|
163
150
|
afterOperation: [
|
|
164
151
|
...(config.ai.hooks?.afterOperation ?? []),
|
|
165
152
|
async (args) => {
|
|
166
|
-
const context = args.context;
|
|
167
153
|
const req = args.req;
|
|
168
154
|
if (!req?.user || args.error)
|
|
169
155
|
return;
|
|
170
|
-
const
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
156
|
+
const userId = req.user.id;
|
|
157
|
+
const configuredCost = configuredCosts.get(args.model);
|
|
158
|
+
const cost = args.usage
|
|
159
|
+
? configuredCost
|
|
160
|
+
? calculateCostUSD(args.usage, configuredCost)
|
|
161
|
+
: calculateModelCostUSD(args.model, args.usage)
|
|
162
|
+
: 0;
|
|
174
163
|
if (cost <= 0)
|
|
175
164
|
return;
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
165
|
+
await queue.run(String(userId), async () => {
|
|
166
|
+
const user = (await req.frogbot.findByID({
|
|
167
|
+
collection: authCollection,
|
|
168
|
+
id: userId,
|
|
169
|
+
depth: 0,
|
|
170
|
+
overrideAccess: true,
|
|
171
|
+
req,
|
|
172
|
+
}));
|
|
173
|
+
await req.frogbot.update({
|
|
174
|
+
collection: authCollection,
|
|
175
|
+
id: userId,
|
|
176
|
+
data: { spendThisPeriodUSD: (user.spendThisPeriodUSD ?? 0) + cost },
|
|
177
|
+
overrideAccess: true,
|
|
178
|
+
req,
|
|
179
|
+
});
|
|
180
|
+
});
|
|
191
181
|
},
|
|
192
182
|
],
|
|
193
183
|
},
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/policy.d.ts
CHANGED
|
@@ -1,45 +1,11 @@
|
|
|
1
|
-
export type PolicyMode = 'inherit' | 'custom' | 'unlimited';
|
|
2
|
-
export type PolicyValue<T> = {
|
|
3
|
-
mode?: PolicyMode;
|
|
4
|
-
value?: T;
|
|
5
|
-
};
|
|
6
1
|
export type PolicyDocument = {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
tpm?: PolicyValue<number>;
|
|
10
|
-
models?: PolicyValue<string[]>;
|
|
11
|
-
spendThisPeriodUSD?: number;
|
|
12
|
-
budgetBehavior?: 'block' | 'alert-only';
|
|
13
|
-
};
|
|
14
|
-
export type PolicyDefaults = {
|
|
15
|
-
monthlyBudgetUSD?: number;
|
|
16
|
-
rpm?: number;
|
|
17
|
-
tpm?: number;
|
|
2
|
+
apiKeyId?: string;
|
|
3
|
+
monthlyBudget?: number;
|
|
18
4
|
models?: string[];
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
export type EffectivePolicy = PolicyDefaults & {
|
|
22
|
-
spendThisPeriodUSD: number;
|
|
5
|
+
spendThisPeriodUSD?: number;
|
|
23
6
|
};
|
|
24
7
|
export declare class SerialQueue {
|
|
25
8
|
private readonly updates;
|
|
26
|
-
get pending(): number;
|
|
27
9
|
run(subject: string, update: () => Promise<void>): Promise<void>;
|
|
28
10
|
}
|
|
29
|
-
export declare function resolvePolicy(args: {
|
|
30
|
-
key?: PolicyDocument;
|
|
31
|
-
user?: PolicyDocument;
|
|
32
|
-
defaults?: PolicyDefaults;
|
|
33
|
-
}): EffectivePolicy;
|
|
34
|
-
export declare class SlidingWindowRateLimiter {
|
|
35
|
-
private readonly now;
|
|
36
|
-
private readonly windows;
|
|
37
|
-
constructor(now?: () => number);
|
|
38
|
-
admit(subject: string, policy: Pick<EffectivePolicy, 'rpm' | 'tpm'>): {
|
|
39
|
-
kind: 'rpm' | 'tpm';
|
|
40
|
-
retryAfterSeconds: number;
|
|
41
|
-
} | undefined;
|
|
42
|
-
settle(subject: string, tokens: number): void;
|
|
43
|
-
private get;
|
|
44
|
-
}
|
|
45
11
|
//# sourceMappingURL=policy.d.ts.map
|
package/dist/policy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoC;IAE5D,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAUjE"}
|
package/dist/policy.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
export class SerialQueue {
|
|
2
2
|
updates = new Map();
|
|
3
|
-
get pending() {
|
|
4
|
-
return this.updates.size;
|
|
5
|
-
}
|
|
6
3
|
run(subject, update) {
|
|
7
4
|
const next = (this.updates.get(subject) ?? Promise.resolve()).then(update, update);
|
|
8
5
|
let owner;
|
|
@@ -15,62 +12,4 @@ export class SerialQueue {
|
|
|
15
12
|
return next;
|
|
16
13
|
}
|
|
17
14
|
}
|
|
18
|
-
function resolveValue(key, user, fallback) {
|
|
19
|
-
for (const policy of [key, user]) {
|
|
20
|
-
if (policy?.mode === 'unlimited')
|
|
21
|
-
return undefined;
|
|
22
|
-
if (policy?.mode === 'custom')
|
|
23
|
-
return policy.value;
|
|
24
|
-
}
|
|
25
|
-
return fallback;
|
|
26
|
-
}
|
|
27
|
-
export function resolvePolicy(args) {
|
|
28
|
-
const { key, user, defaults = {} } = args;
|
|
29
|
-
const budgetSpend = key?.monthlyBudget?.mode === 'custom'
|
|
30
|
-
? key.spendThisPeriodUSD
|
|
31
|
-
: key?.monthlyBudget?.mode === 'unlimited'
|
|
32
|
-
? 0
|
|
33
|
-
: user?.monthlyBudget?.mode === 'custom'
|
|
34
|
-
? user.spendThisPeriodUSD
|
|
35
|
-
: key?.spendThisPeriodUSD ?? user?.spendThisPeriodUSD;
|
|
36
|
-
return {
|
|
37
|
-
monthlyBudgetUSD: resolveValue(key?.monthlyBudget, user?.monthlyBudget, defaults.monthlyBudgetUSD),
|
|
38
|
-
rpm: resolveValue(key?.rpm, user?.rpm, defaults.rpm),
|
|
39
|
-
tpm: resolveValue(key?.tpm, user?.tpm, defaults.tpm),
|
|
40
|
-
models: resolveValue(key?.models, user?.models, defaults.models),
|
|
41
|
-
budgetBehavior: key?.budgetBehavior ?? user?.budgetBehavior ?? defaults.budgetBehavior ?? 'block',
|
|
42
|
-
spendThisPeriodUSD: budgetSpend ?? 0,
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
export class SlidingWindowRateLimiter {
|
|
46
|
-
now;
|
|
47
|
-
windows = new Map();
|
|
48
|
-
constructor(now = Date.now) {
|
|
49
|
-
this.now = now;
|
|
50
|
-
}
|
|
51
|
-
admit(subject, policy) {
|
|
52
|
-
const now = this.now();
|
|
53
|
-
const entry = this.get(subject, now);
|
|
54
|
-
const retry = (at) => Math.max(1, Math.ceil((at + 60_000 - now) / 1000));
|
|
55
|
-
if (policy.rpm !== undefined && entry.requests.length >= policy.rpm)
|
|
56
|
-
return { kind: 'rpm', retryAfterSeconds: retry(entry.requests[0]) };
|
|
57
|
-
const tokens = entry.tokens.reduce((sum, item) => sum + item.value, 0);
|
|
58
|
-
if (policy.tpm !== undefined && tokens >= policy.tpm)
|
|
59
|
-
return { kind: 'tpm', retryAfterSeconds: retry(entry.tokens[0]?.at ?? now) };
|
|
60
|
-
entry.requests.push(now);
|
|
61
|
-
return undefined;
|
|
62
|
-
}
|
|
63
|
-
settle(subject, tokens) {
|
|
64
|
-
if (tokens <= 0)
|
|
65
|
-
return;
|
|
66
|
-
this.get(subject, this.now()).tokens.push({ at: this.now(), value: tokens });
|
|
67
|
-
}
|
|
68
|
-
get(subject, now) {
|
|
69
|
-
const entry = this.windows.get(subject) ?? { requests: [], tokens: [] };
|
|
70
|
-
entry.requests = entry.requests.filter((at) => at > now - 60_000);
|
|
71
|
-
entry.tokens = entry.tokens.filter(({ at }) => at > now - 60_000);
|
|
72
|
-
this.windows.set(subject, entry);
|
|
73
|
-
return entry;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
15
|
//# sourceMappingURL=policy.js.map
|
package/dist/policy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,WAAW;IACL,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE5D,GAAG,CAAC,OAAe,EAAE,MAA2B;QAC9C,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnF,IAAI,KAAoB,CAAC;QACzB,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxE,CAAC,CAAC;QACF,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -25,7 +25,7 @@ export declare function mintApiKey(options: MintApiKeyOptions): Promise<{
|
|
|
25
25
|
export type RotateApiKeyOptions = RevokeApiKeyOptions & {
|
|
26
26
|
tokenPrefix: string;
|
|
27
27
|
};
|
|
28
|
-
export declare function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner }: RotateApiKeyOptions): Promise<{
|
|
28
|
+
export declare function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner, }: RotateApiKeyOptions): Promise<{
|
|
29
29
|
id: unknown;
|
|
30
30
|
name: string;
|
|
31
31
|
prefix: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/server/services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,cAAc,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,EAAE,cAAc,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../src/server/services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,cAAc,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,EAAE,cAAc,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;aACf,IAAI,EAAE,yBAAyB,GAAG,WAAW;gBAA7C,IAAI,EAAE,yBAAyB,GAAG,WAAW;CAG1E;AAsBD,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB;;;;;;GAU1D;AAED,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,wBAAsB,YAAY,CAAC,EACjC,GAAG,EACH,cAAc,EACd,EAAE,EACF,WAAW,EACX,QAAQ,GACT,EAAE,mBAAmB;;;;;;GASrB;AAED,wBAAsB,YAAY,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,mBAAmB;;;;;GA+B5F"}
|
package/dist/server/services.js
CHANGED
|
@@ -6,15 +6,15 @@ export class ApiKeyServiceError extends Error {
|
|
|
6
6
|
this.code = code;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
async function mintForOwner({ req, collectionSlug, tokenPrefix, name, owner }) {
|
|
9
|
+
async function mintForOwner({ req, collectionSlug, tokenPrefix, name, owner, }) {
|
|
10
10
|
const token = createApiKeyToken({ tokenPrefix });
|
|
11
11
|
const prefix = getApiKeyPrefix(token);
|
|
12
|
-
const doc = await req.frogbot.create({
|
|
12
|
+
const doc = (await req.frogbot.create({
|
|
13
13
|
collection: collectionSlug,
|
|
14
14
|
data: { name, owner, prefix, tokenHash: hashApiKeyToken(token) },
|
|
15
15
|
overrideAccess: true,
|
|
16
16
|
req,
|
|
17
|
-
});
|
|
17
|
+
}));
|
|
18
18
|
return { id: doc.id, name, prefix, token, createdAt: doc.createdAt };
|
|
19
19
|
}
|
|
20
20
|
export async function mintApiKey(options) {
|
|
@@ -29,9 +29,15 @@ export async function mintApiKey(options) {
|
|
|
29
29
|
owner,
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
-
export async function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner }) {
|
|
32
|
+
export async function rotateApiKey({ req, collectionSlug, id, tokenPrefix, anyOwner, }) {
|
|
33
33
|
const revoked = await revokeApiKey({ req, collectionSlug, id, anyOwner });
|
|
34
|
-
return mintForOwner({
|
|
34
|
+
return mintForOwner({
|
|
35
|
+
req,
|
|
36
|
+
collectionSlug,
|
|
37
|
+
tokenPrefix,
|
|
38
|
+
name: revoked.name,
|
|
39
|
+
owner: revoked.owner,
|
|
40
|
+
});
|
|
35
41
|
}
|
|
36
42
|
export async function revokeApiKey({ req, collectionSlug, id, anyOwner }) {
|
|
37
43
|
const owner = req.user?.id;
|
|
@@ -48,7 +54,10 @@ export async function revokeApiKey({ req, collectionSlug, id, anyOwner }) {
|
|
|
48
54
|
: { and: [{ id: { equals: id } }, { owner: { equals: owner } }] },
|
|
49
55
|
});
|
|
50
56
|
const key = result.docs[0];
|
|
51
|
-
if (!key ||
|
|
57
|
+
if (!key ||
|
|
58
|
+
(typeof key.id !== 'string' && typeof key.id !== 'number') ||
|
|
59
|
+
typeof key.name !== 'string' ||
|
|
60
|
+
(typeof key.owner !== 'string' && typeof key.owner !== 'number')) {
|
|
52
61
|
throw new ApiKeyServiceError('not_found');
|
|
53
62
|
}
|
|
54
63
|
const revokedAt = typeof key.revokedAt === 'string' ? key.revokedAt : new Date().toISOString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/server/services.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgBjF,MAAM,OAAO,kBAAmB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/server/services.ts"],"names":[],"mappings":"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"}
|
package/dist/strategy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAI3E,KAAK,eAAe,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"strategy.d.ts","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAI3E,KAAK,eAAe,GAAG;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,cAAc,CAsD7E;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAElE"}
|
package/dist/strategy.js
CHANGED
|
@@ -6,7 +6,8 @@ export function createApiKeyStrategy(options) {
|
|
|
6
6
|
name: 'api-key',
|
|
7
7
|
authenticate: async ({ headers, payload }) => {
|
|
8
8
|
const token = extractApiKeyToken(headers, { headerNames });
|
|
9
|
-
if (!token ||
|
|
9
|
+
if (!token ||
|
|
10
|
+
!new RegExp(`^${tokenPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}_[A-Za-z0-9_-]{43}$`).test(token)) {
|
|
10
11
|
return { user: null };
|
|
11
12
|
}
|
|
12
13
|
const keys = await payload.find({
|
|
@@ -15,7 +16,10 @@ export function createApiKeyStrategy(options) {
|
|
|
15
16
|
limit: 1,
|
|
16
17
|
overrideAccess: true,
|
|
17
18
|
where: {
|
|
18
|
-
and: [
|
|
19
|
+
and: [
|
|
20
|
+
{ tokenHash: { equals: hashApiKeyToken(token) } },
|
|
21
|
+
{ revokedAt: { exists: false } },
|
|
22
|
+
],
|
|
19
23
|
},
|
|
20
24
|
});
|
|
21
25
|
const key = keys.docs[0];
|
package/dist/strategy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIxE,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAAkB,CAAC;AASvD,MAAM,UAAU,oBAAoB,CAAC,OAAwB;IAC3D,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC7E,MAAM,QAAQ,GAAmB;QAC/B,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YAC3C,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAC3D,
|
|
1
|
+
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIxE,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAAkB,CAAC;AASvD,MAAM,UAAU,oBAAoB,CAAC,OAAwB;IAC3D,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC7E,MAAM,QAAQ,GAAmB;QAC/B,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YAC3C,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAC3D,IACE,CAAC,KAAK;gBACN,CAAC,IAAI,MAAM,CACT,IAAI,WAAW,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,CAC5E,CAAC,IAAI,CAAC,KAAK,CAAC,EACb,CAAC;gBACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACxB,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gBAC9B,UAAU,EAAE,cAAc;gBAC1B,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;gBACR,cAAc,EAAE,IAAI;gBACpB,KAAK,EAAE;oBACL,GAAG,EAAE;wBACH,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE;wBACjD,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;qBACjC;iBACF;aACF,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAiE,CAAC;YACzF,IAAI,CAAC,GAAG,EAAE,KAAK;gBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAEvC,MAAM,IAAI,GAAG,MAAM,OAAO;iBACvB,QAAQ,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;iBACvF,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACrB,IAAI,CAAC,IAAI;gBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAEjC,MAAM,OAAO,CAAC,MAAM,CAAC;gBACnB,UAAU,EAAE,cAAc;gBAC1B,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBAC9C,cAAc,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI,EAAE;oBACJ,GAAG,IAAI;oBACP,UAAU,EAAE,cAAc;oBAC1B,SAAS,EAAE,SAAS;oBACpB,QAAQ,EAAE,GAAG,CAAC,EAAE;iBACjB;aACF,CAAC;QACJ,CAAC;KACF,CAAC;IACF,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAwB;IACvD,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@frogbotai/plugin-api-keys",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.17.0",
|
|
4
4
|
"description": "Multiple named API keys for FrogBot.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Colby Gilbert",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"@payloadcms/ui": "3.85.1",
|
|
39
39
|
"react": "^19.0.1 || ^19.1.2 || ^19.2.1",
|
|
40
40
|
"react-dom": "^19.0.1 || ^19.1.2 || ^19.2.1",
|
|
41
|
-
"@frogbotai/gateway": "0.
|
|
42
|
-
"frogbot": "0.
|
|
41
|
+
"@frogbotai/gateway": "0.17.0",
|
|
42
|
+
"frogbot": "0.17.0"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@payloadcms/ui": "3.85.1",
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
"react": "19.2.6",
|
|
49
49
|
"react-dom": "19.2.6",
|
|
50
50
|
"typescript": "5.6.2",
|
|
51
|
-
"@frogbotai/gateway": "0.
|
|
52
|
-
"
|
|
53
|
-
"
|
|
51
|
+
"@frogbotai/gateway": "0.17.0",
|
|
52
|
+
"frogbot": "0.17.0",
|
|
53
|
+
"@frogbotai/plugin-roles": "0.17.0"
|
|
54
54
|
},
|
|
55
55
|
"publishConfig": {
|
|
56
56
|
"access": "public"
|