@open-pencil/cloud 0.17.0-beta.1 → 0.17.0-beta.4
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/README.md +1 -1
- package/dist/bin/{ai-relay.mjs → services.mjs} +8 -8
- package/dist/bin/services.mjs.map +1 -0
- package/dist/client.d.ts +236 -46
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +649 -400
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +680 -443
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +9 -1
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +99 -58
- package/dist/email.js.map +1 -1
- package/dist/index.d.ts +468 -64
- package/dist/index.d.ts.map +1 -1
- package/dist/listen.mjs +575 -738
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-node.d.mts +6564 -2934
- package/dist/runtime-node.d.mts.map +1 -1
- package/dist/runtime-node.mjs +6 -5
- package/dist/runtime-node.mjs.map +1 -1
- package/dist/server.d.ts +8931 -4198
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +5260 -3859
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +5686 -3736
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +101 -79
- package/dist/server2.mjs.map +1 -1
- package/package.json +9 -6
- package/src/admin/api/routes.ts +103 -33
- package/src/admin/audit/service.ts +25 -6
- package/src/admin/documents/service.ts +361 -0
- package/src/admin/errors.ts +9 -1
- package/src/admin/index.ts +6 -0
- package/src/admin/operations/service.ts +7 -0
- package/src/admin/reports/service.ts +147 -0
- package/src/admin/schema.ts +6 -0
- package/src/client/api.ts +36 -21
- package/src/client/auth/navigation.ts +6 -5
- package/src/client/index.ts +7 -7
- package/src/client/portal/account.ts +25 -0
- package/src/client/portal/administration.ts +56 -0
- package/src/client/{ai.ts → services.ts} +44 -27
- package/src/contract/account.ts +58 -2
- package/src/contract/admin/index.ts +67 -3
- package/src/contract/collaboration.ts +6 -1
- package/src/contract/discovery.ts +22 -4
- package/src/contract/documents.ts +27 -0
- package/src/contract/entitlements.ts +2 -2
- package/src/contract/index.ts +63 -37
- package/src/contract/relay.ts +6 -0
- package/src/contract/reports.ts +42 -0
- package/src/contract/services.ts +233 -0
- package/src/contract/sharing.ts +3 -9
- package/src/email/render.ts +26 -0
- package/src/email/schema.ts +11 -1
- package/src/email/templates/brand.ts +1 -1
- package/src/runtime/cloudflare/environment.ts +31 -6
- package/src/runtime/cloudflare/index.ts +1 -1
- package/src/runtime/cloudflare/logging.ts +15 -0
- package/src/runtime/cloudflare/maintenance.ts +31 -0
- package/src/runtime/cloudflare/relay/index.ts +176 -0
- package/src/runtime/cloudflare/relay/sockets.ts +112 -0
- package/src/runtime/cloudflare/worker.ts +89 -26
- package/src/runtime/node/application.ts +5 -3
- package/src/runtime/node/bootstrap.ts +20 -4
- package/src/runtime/node/cleanup.ts +16 -3
- package/src/runtime/node/entitlements/main.ts +14 -11
- package/src/runtime/node/index.ts +1 -1
- package/src/runtime/node/migrate.ts +5 -1
- package/src/runtime/node/relay.ts +8 -2
- package/src/runtime/node/request-id.ts +13 -0
- package/src/runtime/node/server.ts +71 -15
- package/src/runtime/node/{ai-relay → services}/main.ts +6 -6
- package/src/runtime/node/{ai-relay → services}/server.ts +18 -18
- package/src/runtime/postgres/database.ts +20 -1
- package/src/runtime/posthog/errors.ts +32 -0
- package/src/runtime/s3/objects.ts +50 -1
- package/src/runtime/site/server.ts +33 -4
- package/src/server/account/actions.ts +5 -0
- package/src/server/account/deletion.ts +302 -0
- package/src/server/account/routes.ts +47 -3
- package/src/server/account/terms.ts +42 -0
- package/src/server/api/router.ts +12 -7
- package/src/server/api/types.ts +9 -0
- package/src/server/app.ts +93 -15
- package/src/server/auth/access-control.ts +63 -0
- package/src/server/auth/adapter.ts +11 -0
- package/src/server/auth/endpoints.ts +5 -1
- package/src/server/auth/factory.ts +30 -3
- package/src/server/auth/index.ts +10 -1
- package/src/server/cleanup/configured.ts +12 -5
- package/src/server/cleanup/documents.ts +165 -71
- package/src/server/cleanup/objects.ts +10 -2
- package/src/server/cleanup/revisions.ts +24 -7
- package/src/server/cleanup/uploads.ts +8 -2
- package/src/server/cleanup/worker.ts +5 -2
- package/src/server/collaboration/index.ts +3 -0
- package/src/server/collaboration/relay/connection.ts +196 -0
- package/src/server/collaboration/relay/documents.ts +13 -10
- package/src/server/collaboration/relay/hub.ts +279 -195
- package/src/server/collaboration/relay/index.ts +3 -1
- package/src/server/collaboration/relay/log.ts +79 -0
- package/src/server/collaboration/relay/persistence.ts +147 -22
- package/src/server/collaboration/relay/resume.ts +28 -0
- package/src/server/collaboration/routes.ts +27 -16
- package/src/server/collaboration/service.ts +27 -31
- package/src/server/config/deployment.ts +35 -4
- package/src/server/config/public.ts +5 -4
- package/src/server/config/schema.ts +104 -16
- package/src/server/db/expressions.ts +15 -1
- package/src/server/db/migrate.ts +34 -114
- package/src/server/db/migrations/001_accounts.ts +79 -0
- package/src/server/db/migrations/002_workspaces.ts +48 -0
- package/src/server/db/migrations/003_storage.ts +44 -0
- package/src/server/db/migrations/004_documents.ts +193 -0
- package/src/server/db/migrations/005_sharing.ts +95 -0
- package/src/server/db/migrations/006_operations.ts +110 -0
- package/src/server/db/migrations/007_trash.ts +33 -0
- package/src/server/db/migrations/008_terms.ts +18 -0
- package/src/server/db/migrations/schema.ts +71 -0
- package/src/server/db/tables.ts +70 -7
- package/src/server/documents/access.ts +66 -55
- package/src/server/documents/errors.ts +7 -0
- package/src/server/documents/images.ts +2 -1
- package/src/server/documents/limits.ts +9 -9
- package/src/server/documents/purge.ts +75 -0
- package/src/server/documents/repository.ts +2 -0
- package/src/server/documents/routes.ts +132 -80
- package/src/server/documents/service.ts +18 -4
- package/src/server/documents/summary.ts +1 -0
- package/src/server/documents/trash.ts +203 -0
- package/src/server/documents/versions/checkpoint.ts +2 -1
- package/src/server/documents/versions/history.ts +11 -7
- package/src/server/documents/versions/routes.ts +36 -25
- package/src/server/documents/versions/service.ts +22 -4
- package/src/server/errors/index.ts +99 -0
- package/src/server/errors/posthog.ts +80 -0
- package/src/server/index.ts +56 -16
- package/src/server/internal/index.ts +3 -3
- package/src/server/internal/routes.ts +7 -15
- package/src/server/internal/schema.ts +1 -1
- package/src/server/internal/service.ts +17 -23
- package/src/server/invitations/budget.ts +66 -0
- package/src/server/invitations/index.ts +1 -0
- package/src/server/logging.ts +76 -0
- package/src/server/objects/types.ts +12 -0
- package/src/server/pictures/routes.ts +4 -2
- package/src/server/pictures/service.ts +2 -1
- package/src/server/policy/database.ts +39 -25
- package/src/server/policy/index.ts +2 -1
- package/src/server/policy/keys.ts +5 -2
- package/src/server/policy/policy.ts +1 -0
- package/src/server/policy/schema.ts +2 -2
- package/src/server/policy/service.ts +12 -9
- package/src/server/policy/static.ts +5 -5
- package/src/server/policy/workspace.ts +41 -0
- package/src/server/quota/reconcile.ts +2 -0
- package/src/server/quota/storage.ts +69 -31
- package/src/server/rate-limit/cleanup.ts +17 -5
- package/src/server/rate-limit/index.ts +4 -1
- package/src/server/rate-limit/middleware.ts +100 -12
- package/src/server/reports/index.ts +8 -0
- package/src/server/reports/routes.ts +37 -0
- package/src/server/reports/service.ts +123 -0
- package/src/server/services/errors.ts +7 -0
- package/src/server/services/index.ts +8 -0
- package/src/server/{ai → services}/keys.ts +11 -11
- package/src/server/services/routes.ts +47 -0
- package/src/server/{ai/service.ts → services/tokens.ts} +23 -20
- package/src/server/sharing/capabilities/service.ts +68 -22
- package/src/server/sharing/document-routes.ts +30 -22
- package/src/server/sharing/grants/service.ts +11 -18
- package/src/server/sharing/http.ts +4 -0
- package/src/server/sharing/invitations/service.ts +21 -11
- package/src/server/sharing/policy.ts +9 -14
- package/src/server/sharing/routes.ts +108 -85
- package/src/server/sharing/service.ts +1 -17
- package/src/server/validation.ts +59 -2
- package/src/server/workspaces/index.ts +1 -0
- package/src/server/workspaces/members.ts +89 -38
- package/src/server/workspaces/repository.ts +2 -1
- package/src/server/workspaces/routes.ts +67 -45
- package/src/{ai-relay → services}/app.ts +48 -44
- package/src/{ai-relay → services}/config.ts +25 -19
- package/src/services/db/index.ts +10 -0
- package/src/services/db/migrate.ts +37 -0
- package/src/{ai-relay/db/migrations/001_usage.ts → services/db/migrations/001_baseline.ts} +18 -7
- package/src/services/db/schema.ts +22 -0
- package/src/services/index.ts +18 -0
- package/src/{ai-relay → services}/metering.ts +2 -2
- package/src/{ai-relay → services}/usage.ts +43 -19
- package/dist/bin/ai-relay.mjs.map +0 -1
- package/src/ai-relay/db/index.ts +0 -10
- package/src/ai-relay/db/migrate.ts +0 -32
- package/src/ai-relay/db/schema.ts +0 -20
- package/src/ai-relay/index.ts +0 -18
- package/src/contract/ai.ts +0 -150
- package/src/runtime/cloudflare/relay.ts +0 -136
- package/src/server/ai/errors.ts +0 -7
- package/src/server/ai/index.ts +0 -4
- package/src/server/ai/routes.ts +0 -43
- package/src/server/auth/workspace-access.ts +0 -23
- package/src/server/db/migrations/001_foundation.ts +0 -164
- package/src/server/db/migrations/002_upload_cleanup_claims.ts +0 -34
- package/src/server/db/migrations/003_document_cleanup_claims.ts +0 -23
- package/src/server/db/migrations/004_document_sharing.ts +0 -82
- package/src/server/db/migrations/005_document_collaboration_epoch.ts +0 -13
- package/src/server/db/migrations/006_invitation_continuation.ts +0 -27
- package/src/server/db/migrations/007_collaboration_state.ts +0 -25
- package/src/server/db/migrations/008_storage_reservations.ts +0 -37
- package/src/server/db/migrations/009_workspace_entitlements.ts +0 -22
- package/src/server/db/migrations/010_upload_finalization.ts +0 -22
- package/src/server/db/migrations/011_upload_finalization_lease.ts +0 -12
- package/src/server/db/migrations/012_transactional_email.ts +0 -48
- package/src/server/db/migrations/013_admin_enrollment.ts +0 -54
- package/src/server/db/migrations/014_enrollment_email_kinds.ts +0 -30
- package/src/server/db/migrations/015_cloud_rate_limit.ts +0 -22
- package/src/server/db/migrations/016_auth_schema.ts +0 -16
- package/src/server/db/migrations/017_authentication_email_kinds.ts +0 -32
- package/src/server/db/migrations/018_authentication_mfa.ts +0 -78
- package/src/server/db/migrations/019_better_auth_account_issuer.ts +0 -42
- package/src/server/db/migrations/020_workspace_invitations.ts +0 -57
- package/src/server/db/migrations/021_document_versions.ts +0 -66
- package/src/server/db/migrations/022_entitlement_external_version.ts +0 -17
- package/src/server/db/migrations/023_document_images.ts +0 -61
- package/src/server/db/migrations/024_account_activity.ts +0 -66
- package/src/server/db/migrations/025_table_names.ts +0 -58
- package/src/server/db/migrations/026_user_picture.ts +0 -30
- package/src/server/db/migrations/027_document_kind.ts +0 -19
- package/src/server/db/migrations/helpers.ts +0 -78
- /package/dist/bin/{ai-relay.d.mts → services.d.mts} +0 -0
|
@@ -9,8 +9,11 @@ import type {
|
|
|
9
9
|
} from '#cloud/contract'
|
|
10
10
|
import { cloudInvitationURL } from '#cloud/contract'
|
|
11
11
|
import type { CloudActor } from '#cloud/server/auth'
|
|
12
|
+
import { workspaceRoleCan, type AccessRequest } from '#cloud/server/auth/access-control'
|
|
12
13
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
13
14
|
import type { TransactionalEmailService } from '#cloud/server/email/types'
|
|
15
|
+
import { spendInvitationBudget } from '#cloud/server/invitations'
|
|
16
|
+
import { lockStorageAllowance } from '#cloud/server/quota/storage'
|
|
14
17
|
import {
|
|
15
18
|
invitationMatchesActor,
|
|
16
19
|
invitationTokenIsActive,
|
|
@@ -19,7 +22,7 @@ import {
|
|
|
19
22
|
import { dateString } from '#cloud/server/sharing/contracts'
|
|
20
23
|
import { hashCapability } from '#cloud/server/sharing/crypto'
|
|
21
24
|
import { findWorkspace, type WorkspaceDatabase } from '#cloud/server/workspaces/repository'
|
|
22
|
-
import type { Kysely } from 'kysely'
|
|
25
|
+
import type { Kysely, Transaction } from 'kysely'
|
|
23
26
|
|
|
24
27
|
import { randomHex } from '@open-pencil/scene-graph/random'
|
|
25
28
|
|
|
@@ -101,6 +104,45 @@ function invitationContract(row: {
|
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
|
|
107
|
+
/**
|
|
108
|
+
* Passes the workspace to its longest-standing other admin when its owner leaves or stops being
|
|
109
|
+
* an admin, so its limits come from someone still running it. The last-admin guard keeps one.
|
|
110
|
+
*/
|
|
111
|
+
export async function handOverOwnership(
|
|
112
|
+
database: Transaction<CloudDatabase>,
|
|
113
|
+
workspaceId: string,
|
|
114
|
+
leavingUserId: string
|
|
115
|
+
): Promise<void> {
|
|
116
|
+
const workspace = await database
|
|
117
|
+
.selectFrom('workspace')
|
|
118
|
+
.select('ownerId')
|
|
119
|
+
.where('id', '=', workspaceId)
|
|
120
|
+
// Changing the owner changes no key, so a reservation's foreign-key check on this row is
|
|
121
|
+
// never kept waiting behind it while the transfer waits for that reservation's lock.
|
|
122
|
+
.forNoKeyUpdate()
|
|
123
|
+
.executeTakeFirstOrThrow()
|
|
124
|
+
if (workspace.ownerId !== leavingUserId) return
|
|
125
|
+
const successor = await database
|
|
126
|
+
.selectFrom('workspaceMember')
|
|
127
|
+
.select('userId')
|
|
128
|
+
.where('workspaceId', '=', workspaceId)
|
|
129
|
+
.where('role', '=', 'admin')
|
|
130
|
+
.where('userId', '!=', leavingUserId)
|
|
131
|
+
.orderBy('createdAt')
|
|
132
|
+
.orderBy('userId')
|
|
133
|
+
.executeTakeFirst()
|
|
134
|
+
if (!successor) return
|
|
135
|
+
// Reservations count this workspace under its owner's lock: hold both owners', in one order.
|
|
136
|
+
for (const owner of [leavingUserId, successor.userId].toSorted()) {
|
|
137
|
+
await lockStorageAllowance(database, owner)
|
|
138
|
+
}
|
|
139
|
+
await database
|
|
140
|
+
.updateTable('workspace')
|
|
141
|
+
.set({ ownerId: successor.userId, updatedAt: new Date() })
|
|
142
|
+
.where('id', '=', workspaceId)
|
|
143
|
+
.execute()
|
|
144
|
+
}
|
|
145
|
+
|
|
104
146
|
async function adminCount(database: WorkspaceDatabase, workspaceId: string): Promise<number> {
|
|
105
147
|
const rows = await database
|
|
106
148
|
.selectFrom('workspaceMember')
|
|
@@ -143,9 +185,13 @@ export function createWorkspaceMemberService(
|
|
|
143
185
|
return workspace
|
|
144
186
|
}
|
|
145
187
|
|
|
146
|
-
async function
|
|
188
|
+
async function requireAccess(
|
|
189
|
+
userId: string,
|
|
190
|
+
workspaceId: string,
|
|
191
|
+
request: AccessRequest
|
|
192
|
+
): Promise<WorkspaceSummary> {
|
|
147
193
|
const workspace = await membership(userId, workspaceId)
|
|
148
|
-
if (workspace.role
|
|
194
|
+
if (!workspaceRoleCan(workspace.role, request)) throw new WorkspaceForbiddenError()
|
|
149
195
|
return workspace
|
|
150
196
|
}
|
|
151
197
|
|
|
@@ -175,7 +221,7 @@ export function createWorkspaceMemberService(
|
|
|
175
221
|
workspaceId: string,
|
|
176
222
|
input: CreateWorkspaceInvitationInput
|
|
177
223
|
): Promise<CreatedWorkspaceInvitation> {
|
|
178
|
-
const workspace = await
|
|
224
|
+
const workspace = await requireAccess(userId, workspaceId, { workspace: ['invite'] })
|
|
179
225
|
const existing = await memberUsers(workspaceId)
|
|
180
226
|
.select('workspaceMember.userId')
|
|
181
227
|
.where((expression) =>
|
|
@@ -193,6 +239,7 @@ export function createWorkspaceMemberService(
|
|
|
193
239
|
const expiresAt = new Date(Date.now() + INVITATION_LIFETIME_MS)
|
|
194
240
|
const url = acceptanceURL(id, token)
|
|
195
241
|
const row = await database.transaction().execute(async (transaction) => {
|
|
242
|
+
await spendInvitationBudget(transaction, { senderId: userId, email: input.email })
|
|
196
243
|
await transaction
|
|
197
244
|
.updateTable('workspaceInvitation')
|
|
198
245
|
.set({ revokedAt: new Date() })
|
|
@@ -241,7 +288,7 @@ export function createWorkspaceMemberService(
|
|
|
241
288
|
|
|
242
289
|
return {
|
|
243
290
|
async rename(userId: string, workspaceId: string, name: string): Promise<WorkspaceSummary> {
|
|
244
|
-
await
|
|
291
|
+
await requireAccess(userId, workspaceId, { workspace: ['update'] })
|
|
245
292
|
await database
|
|
246
293
|
.updateTable('workspace')
|
|
247
294
|
.set({ name, updatedAt: new Date() })
|
|
@@ -263,35 +310,34 @@ export function createWorkspaceMemberService(
|
|
|
263
310
|
])
|
|
264
311
|
.orderBy('workspaceMember.createdAt')
|
|
265
312
|
.execute()
|
|
266
|
-
const invitations =
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
.
|
|
271
|
-
|
|
272
|
-
expression(
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
expression.ref('workspaceInvitation.invitedBy')
|
|
276
|
-
)
|
|
313
|
+
const invitations = workspaceRoleCan(workspace.role, { workspace: ['invite'] })
|
|
314
|
+
? await database
|
|
315
|
+
.selectFrom('workspaceInvitation')
|
|
316
|
+
.leftJoin('user', (join) =>
|
|
317
|
+
join.on((expression) =>
|
|
318
|
+
expression(
|
|
319
|
+
expression.cast(expression.ref('user.id'), 'text'),
|
|
320
|
+
'=',
|
|
321
|
+
expression.ref('workspaceInvitation.invitedBy')
|
|
277
322
|
)
|
|
278
323
|
)
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
324
|
+
)
|
|
325
|
+
.select([
|
|
326
|
+
'workspaceInvitation.id',
|
|
327
|
+
'workspaceInvitation.emailNormalized',
|
|
328
|
+
'workspaceInvitation.role',
|
|
329
|
+
'workspaceInvitation.invitedAt',
|
|
330
|
+
'workspaceInvitation.expiresAt',
|
|
331
|
+
'workspaceInvitation.invitedBy',
|
|
332
|
+
'user.name as inviterName'
|
|
333
|
+
])
|
|
334
|
+
.where('workspaceInvitation.workspaceId', '=', workspaceId)
|
|
335
|
+
.where('workspaceInvitation.acceptedAt', 'is', null)
|
|
336
|
+
.where('workspaceInvitation.revokedAt', 'is', null)
|
|
337
|
+
.where('workspaceInvitation.expiresAt', '>', new Date())
|
|
338
|
+
.orderBy('workspaceInvitation.invitedAt')
|
|
339
|
+
.execute()
|
|
340
|
+
: []
|
|
295
341
|
return {
|
|
296
342
|
members: members.map((member) => ({
|
|
297
343
|
userId: member.userId,
|
|
@@ -313,7 +359,7 @@ export function createWorkspaceMemberService(
|
|
|
313
359
|
workspaceId: string,
|
|
314
360
|
invitationId: string
|
|
315
361
|
): Promise<CreatedWorkspaceInvitation> {
|
|
316
|
-
await
|
|
362
|
+
await requireAccess(userId, workspaceId, { workspace: ['invite'] })
|
|
317
363
|
const invitation = await database
|
|
318
364
|
.selectFrom('workspaceInvitation')
|
|
319
365
|
.select(['emailNormalized', 'role'])
|
|
@@ -334,7 +380,7 @@ export function createWorkspaceMemberService(
|
|
|
334
380
|
workspaceId: string,
|
|
335
381
|
invitationId: string
|
|
336
382
|
): Promise<void> {
|
|
337
|
-
await
|
|
383
|
+
await requireAccess(userId, workspaceId, { workspace: ['invite'] })
|
|
338
384
|
const result = await database
|
|
339
385
|
.updateTable('workspaceInvitation')
|
|
340
386
|
.set({ revokedAt: new Date() })
|
|
@@ -352,7 +398,7 @@ export function createWorkspaceMemberService(
|
|
|
352
398
|
memberId: string,
|
|
353
399
|
role: WorkspaceRole
|
|
354
400
|
): Promise<void> {
|
|
355
|
-
await
|
|
401
|
+
await requireAccess(userId, workspaceId, { workspace: ['manage-members'] })
|
|
356
402
|
await database.transaction().execute(async (transaction) => {
|
|
357
403
|
const member = await lockedMember(transaction, workspaceId, memberId)
|
|
358
404
|
if (member.role === 'admin' && role !== 'admin') {
|
|
@@ -364,12 +410,13 @@ export function createWorkspaceMemberService(
|
|
|
364
410
|
.where('workspaceId', '=', workspaceId)
|
|
365
411
|
.where('userId', '=', memberId)
|
|
366
412
|
.execute()
|
|
413
|
+
if (role !== 'admin') await handOverOwnership(transaction, workspaceId, memberId)
|
|
367
414
|
})
|
|
368
415
|
},
|
|
369
416
|
|
|
370
417
|
/** Deletes an empty workspace, with its members and invitations. */
|
|
371
418
|
async delete(userId: string, workspaceId: string): Promise<void> {
|
|
372
|
-
await
|
|
419
|
+
await requireAccess(userId, workspaceId, { workspace: ['delete'] })
|
|
373
420
|
await database.transaction().execute(async (transaction) => {
|
|
374
421
|
// Locked first, so a document created meanwhile waits and then finds no workspace.
|
|
375
422
|
await transaction
|
|
@@ -391,10 +438,13 @@ export function createWorkspaceMemberService(
|
|
|
391
438
|
})
|
|
392
439
|
},
|
|
393
440
|
|
|
394
|
-
/**
|
|
441
|
+
/**
|
|
442
|
+
* Removes a member, or lets someone leave; the last administrator cannot go, and an owner who
|
|
443
|
+
* goes leaves the workspace to the longest-standing other admin.
|
|
444
|
+
*/
|
|
395
445
|
async remove(userId: string, workspaceId: string, memberId: string): Promise<void> {
|
|
396
446
|
if (memberId === userId) await membership(userId, workspaceId)
|
|
397
|
-
else await
|
|
447
|
+
else await requireAccess(userId, workspaceId, { workspace: ['manage-members'] })
|
|
398
448
|
await database.transaction().execute(async (transaction) => {
|
|
399
449
|
const member = await lockedMember(transaction, workspaceId, memberId)
|
|
400
450
|
if (member.role === 'admin' && (await adminCount(transaction, workspaceId)) <= 1) {
|
|
@@ -405,6 +455,7 @@ export function createWorkspaceMemberService(
|
|
|
405
455
|
.where('workspaceId', '=', workspaceId)
|
|
406
456
|
.where('userId', '=', memberId)
|
|
407
457
|
.execute()
|
|
458
|
+
await handOverOwnership(transaction, workspaceId, memberId)
|
|
408
459
|
})
|
|
409
460
|
},
|
|
410
461
|
|
|
@@ -6,8 +6,19 @@ import {
|
|
|
6
6
|
} from '#cloud/contract'
|
|
7
7
|
import type { CloudActor } from '#cloud/server/auth'
|
|
8
8
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
9
|
+
import { InvitationLimitError } from '#cloud/server/invitations'
|
|
10
|
+
import {
|
|
11
|
+
CLOUD_RATE_LIMITS,
|
|
12
|
+
createRouteRateLimiter,
|
|
13
|
+
routeParamResource,
|
|
14
|
+
createResourceRateLimiter
|
|
15
|
+
} from '#cloud/server/rate-limit'
|
|
16
|
+
import {
|
|
17
|
+
validatedJSON,
|
|
18
|
+
workspaceInvitationParams,
|
|
19
|
+
workspaceMemberParams,
|
|
20
|
+
workspaceParams
|
|
21
|
+
} from '#cloud/server/validation'
|
|
11
22
|
import {
|
|
12
23
|
WorkspaceAlreadyMemberError,
|
|
13
24
|
WorkspaceForbiddenError,
|
|
@@ -48,6 +59,9 @@ async function memberRoute<T>(context: Context, action: () => Promise<T>): Promi
|
|
|
48
59
|
if (error instanceof WorkspaceAlreadyMemberError) {
|
|
49
60
|
return context.json({ error: { code: 'already_member' as const } }, 409)
|
|
50
61
|
}
|
|
62
|
+
if (error instanceof InvitationLimitError) {
|
|
63
|
+
return context.json({ error: { code: 'rate_limited' as const } }, 429)
|
|
64
|
+
}
|
|
51
65
|
throw error
|
|
52
66
|
}
|
|
53
67
|
}
|
|
@@ -71,22 +85,22 @@ export function createWorkspaceRoutes(
|
|
|
71
85
|
// Resending mails the invitation again, so it counts against the same budget as sending.
|
|
72
86
|
router.use(
|
|
73
87
|
'/:workspaceId/invitations/:invitationId/resend',
|
|
74
|
-
|
|
88
|
+
createResourceRateLimiter(
|
|
75
89
|
rateLimit.database,
|
|
76
90
|
rateLimit.secret,
|
|
77
91
|
CLOUD_RATE_LIMITS.invitationMutation,
|
|
78
|
-
()
|
|
79
|
-
(
|
|
92
|
+
routeParamResource('workspaceId'),
|
|
93
|
+
() => false
|
|
80
94
|
)
|
|
81
95
|
)
|
|
82
96
|
router.use(
|
|
83
97
|
'/:workspaceId/invitations',
|
|
84
|
-
|
|
98
|
+
createResourceRateLimiter(
|
|
85
99
|
rateLimit.database,
|
|
86
100
|
rateLimit.secret,
|
|
87
101
|
CLOUD_RATE_LIMITS.invitationMutation,
|
|
88
|
-
(
|
|
89
|
-
(context) => context.req.
|
|
102
|
+
routeParamResource('workspaceId'),
|
|
103
|
+
(context) => context.req.method !== 'POST'
|
|
90
104
|
)
|
|
91
105
|
)
|
|
92
106
|
}
|
|
@@ -109,88 +123,96 @@ export function createWorkspaceRoutes(
|
|
|
109
123
|
throw error
|
|
110
124
|
}
|
|
111
125
|
})
|
|
112
|
-
.get('/:workspaceId', async (context) => {
|
|
126
|
+
.get('/:workspaceId', workspaceParams, async (context) => {
|
|
113
127
|
const workspace = await service.get(
|
|
114
128
|
context.get('actor').userId,
|
|
115
|
-
context.req.
|
|
129
|
+
context.req.valid('param').workspaceId
|
|
116
130
|
)
|
|
117
131
|
if (!workspace) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
118
132
|
return context.json({ workspace })
|
|
119
133
|
})
|
|
120
|
-
.patch('/:workspaceId', validatedJSON(parseUpdateWorkspace), (context) =>
|
|
134
|
+
.patch('/:workspaceId', workspaceParams, validatedJSON(parseUpdateWorkspace), (context) =>
|
|
121
135
|
memberRoute(context, async () =>
|
|
122
136
|
context.json({
|
|
123
137
|
workspace: await members.rename(
|
|
124
138
|
context.get('actor').userId,
|
|
125
|
-
context.req.
|
|
139
|
+
context.req.valid('param').workspaceId,
|
|
126
140
|
context.req.valid('json').name
|
|
127
141
|
)
|
|
128
142
|
})
|
|
129
143
|
)
|
|
130
144
|
)
|
|
131
|
-
.delete('/:workspaceId', (context) =>
|
|
145
|
+
.delete('/:workspaceId', workspaceParams, (context) =>
|
|
132
146
|
memberRoute(context, async () => {
|
|
133
|
-
await members.delete(context.get('actor').userId, context.req.
|
|
147
|
+
await members.delete(context.get('actor').userId, context.req.valid('param').workspaceId)
|
|
134
148
|
return context.body(null, 204)
|
|
135
149
|
})
|
|
136
150
|
)
|
|
137
|
-
.get('/:workspaceId/members', (context) =>
|
|
151
|
+
.get('/:workspaceId/members', workspaceParams, (context) =>
|
|
138
152
|
memberRoute(context, async () =>
|
|
139
153
|
context.json(
|
|
140
|
-
await members.list(context.get('actor').userId, context.req.
|
|
154
|
+
await members.list(context.get('actor').userId, context.req.valid('param').workspaceId)
|
|
141
155
|
)
|
|
142
156
|
)
|
|
143
157
|
)
|
|
144
|
-
.post(
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
158
|
+
.post(
|
|
159
|
+
'/:workspaceId/invitations',
|
|
160
|
+
workspaceParams,
|
|
161
|
+
validatedJSON(parseCreateWorkspaceInvitation),
|
|
162
|
+
(context) =>
|
|
163
|
+
memberRoute(context, async () =>
|
|
164
|
+
context.json(
|
|
165
|
+
await members.invite(
|
|
166
|
+
context.get('actor').userId,
|
|
167
|
+
context.req.valid('param').workspaceId,
|
|
168
|
+
context.req.valid('json')
|
|
169
|
+
),
|
|
170
|
+
201
|
|
171
|
+
)
|
|
153
172
|
)
|
|
154
|
-
)
|
|
155
173
|
)
|
|
156
|
-
.post('/:workspaceId/invitations/:invitationId/resend', (context) =>
|
|
174
|
+
.post('/:workspaceId/invitations/:invitationId/resend', workspaceInvitationParams, (context) =>
|
|
157
175
|
memberRoute(context, async () =>
|
|
158
176
|
context.json(
|
|
159
177
|
await members.resendInvitation(
|
|
160
178
|
context.get('actor').userId,
|
|
161
|
-
context.req.
|
|
162
|
-
context.req.
|
|
179
|
+
context.req.valid('param').workspaceId,
|
|
180
|
+
context.req.valid('param').invitationId
|
|
163
181
|
)
|
|
164
182
|
)
|
|
165
183
|
)
|
|
166
184
|
)
|
|
167
|
-
.delete('/:workspaceId/invitations/:invitationId', (context) =>
|
|
185
|
+
.delete('/:workspaceId/invitations/:invitationId', workspaceInvitationParams, (context) =>
|
|
168
186
|
memberRoute(context, async () => {
|
|
169
187
|
await members.revokeInvitation(
|
|
170
188
|
context.get('actor').userId,
|
|
171
|
-
context.req.
|
|
172
|
-
context.req.
|
|
189
|
+
context.req.valid('param').workspaceId,
|
|
190
|
+
context.req.valid('param').invitationId
|
|
173
191
|
)
|
|
174
192
|
return context.body(null, 204)
|
|
175
193
|
})
|
|
176
194
|
)
|
|
177
|
-
.patch(
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
195
|
+
.patch(
|
|
196
|
+
'/:workspaceId/members/:userId',
|
|
197
|
+
workspaceMemberParams,
|
|
198
|
+
validatedJSON(parseUpdateWorkspaceMember),
|
|
199
|
+
(context) =>
|
|
200
|
+
memberRoute(context, async () => {
|
|
201
|
+
await members.updateRole(
|
|
202
|
+
context.get('actor').userId,
|
|
203
|
+
context.req.valid('param').workspaceId,
|
|
204
|
+
context.req.valid('param').userId,
|
|
205
|
+
context.req.valid('json').role
|
|
206
|
+
)
|
|
207
|
+
return context.body(null, 204)
|
|
208
|
+
})
|
|
187
209
|
)
|
|
188
|
-
.delete('/:workspaceId/members/:userId', (context) =>
|
|
210
|
+
.delete('/:workspaceId/members/:userId', workspaceMemberParams, (context) =>
|
|
189
211
|
memberRoute(context, async () => {
|
|
190
212
|
await members.remove(
|
|
191
213
|
context.get('actor').userId,
|
|
192
|
-
context.req.
|
|
193
|
-
context.req.
|
|
214
|
+
context.req.valid('param').workspaceId,
|
|
215
|
+
context.req.valid('param').userId
|
|
194
216
|
)
|
|
195
217
|
return context.body(null, 204)
|
|
196
218
|
})
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
type
|
|
8
|
-
type
|
|
9
|
-
type
|
|
2
|
+
SERVICE_ERROR_STATUS,
|
|
3
|
+
servicesTokenClaimsSchema,
|
|
4
|
+
CLOUD_SERVICES_API_PATHS,
|
|
5
|
+
CLOUD_SERVICES_TOKEN_AUDIENCE,
|
|
6
|
+
parseUsageQuery,
|
|
7
|
+
type ServiceError,
|
|
8
|
+
type ServiceErrorCode,
|
|
9
|
+
type ServicesTokenClaims
|
|
10
10
|
} from '#cloud/contract'
|
|
11
11
|
import { validatedQuery } from '#cloud/server/validation'
|
|
12
12
|
import { pick } from 'es-toolkit'
|
|
@@ -17,14 +17,14 @@ import { jwtVerify, type JWTVerifyGetKey } from 'jose'
|
|
|
17
17
|
import type { Kysely } from 'kysely'
|
|
18
18
|
import * as v from 'valibot'
|
|
19
19
|
|
|
20
|
-
import type {
|
|
21
|
-
import type {
|
|
20
|
+
import type { ServicesConfig } from './config'
|
|
21
|
+
import type { ServicesDatabase } from './db'
|
|
22
22
|
import { creditsFor, meteredUsage } from './metering'
|
|
23
|
-
import {
|
|
23
|
+
import { ServicesUsageCursorError, createServicesUsageStore, spender } from './usage'
|
|
24
24
|
|
|
25
|
-
export type
|
|
26
|
-
config:
|
|
27
|
-
database: Kysely<
|
|
25
|
+
export type ServicesAppDependencies = {
|
|
26
|
+
config: ServicesConfig
|
|
27
|
+
database: Kysely<ServicesDatabase>
|
|
28
28
|
/** Resolves Cloud's signing keys, normally `createRemoteJWKSet` on Cloud's JWKS. */
|
|
29
29
|
keys: JWTVerifyGetKey
|
|
30
30
|
/** Reaches the upstream model API. */
|
|
@@ -39,7 +39,7 @@ export type AIRelayServices = {
|
|
|
39
39
|
upstreamTimeoutMs?: number
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
type
|
|
42
|
+
type ServicesEnvironment = { Variables: { claims: ServicesTokenClaims } }
|
|
43
43
|
|
|
44
44
|
const chatRequestSchema = v.looseObject({
|
|
45
45
|
model: v.pipe(v.string(), v.minLength(1)),
|
|
@@ -77,27 +77,30 @@ const DEFAULT_UPSTREAM_TIMEOUT_MS = 10 * 60_000
|
|
|
77
77
|
|
|
78
78
|
function aiError(
|
|
79
79
|
context: Context,
|
|
80
|
-
code:
|
|
81
|
-
details: Omit<
|
|
80
|
+
code: ServiceErrorCode,
|
|
81
|
+
details: Omit<ServiceError['error'], 'code'> = {}
|
|
82
82
|
) {
|
|
83
|
-
return context.json({ error: { code, ...details } },
|
|
83
|
+
return context.json({ error: { code, ...details } }, SERVICE_ERROR_STATUS[code])
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
/**
|
|
86
|
+
/**
|
|
87
|
+
* Counts each account's model requests in flight, within one process: its workspaces spend the
|
|
88
|
+
* same credits, so they share one limit.
|
|
89
|
+
*/
|
|
87
90
|
function concurrencyLimiter(maximum: number) {
|
|
88
91
|
const inFlight = new Map<string, number>()
|
|
89
92
|
return {
|
|
90
|
-
acquire(
|
|
91
|
-
const count = inFlight.get(
|
|
93
|
+
acquire(accountId: string): (() => void) | null {
|
|
94
|
+
const count = inFlight.get(accountId) ?? 0
|
|
92
95
|
if (count >= maximum) return null
|
|
93
|
-
inFlight.set(
|
|
96
|
+
inFlight.set(accountId, count + 1)
|
|
94
97
|
let released = false
|
|
95
98
|
return () => {
|
|
96
99
|
if (released) return
|
|
97
100
|
released = true
|
|
98
|
-
const remaining = (inFlight.get(
|
|
99
|
-
if (remaining > 0) inFlight.set(
|
|
100
|
-
else inFlight.delete(
|
|
101
|
+
const remaining = (inFlight.get(accountId) ?? 1) - 1
|
|
102
|
+
if (remaining > 0) inFlight.set(accountId, remaining)
|
|
103
|
+
else inFlight.delete(accountId)
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
}
|
|
@@ -109,36 +112,36 @@ function concurrencyLimiter(maximum: number) {
|
|
|
109
112
|
* A request is admitted while the workspace has credits left and charged once its usage is known,
|
|
110
113
|
* so concurrent requests can overdraw the allowance by what they cost.
|
|
111
114
|
*/
|
|
112
|
-
export function
|
|
115
|
+
export function createServicesApp(services: ServicesAppDependencies) {
|
|
113
116
|
const { config } = services
|
|
114
117
|
const upstreamFetch = services.fetch ?? ((input, init) => fetch(input, init))
|
|
115
118
|
const now = services.now ?? (() => new Date())
|
|
116
|
-
const usage =
|
|
119
|
+
const usage = createServicesUsageStore(services.database)
|
|
117
120
|
const models = new Map(config.catalog.models.map((model) => [model.id, model]))
|
|
118
121
|
const limiter = concurrencyLimiter(config.maximumConcurrentRequests)
|
|
119
122
|
const allowedOrigins = new Set(config.allowedOrigins)
|
|
120
123
|
const reportBackgroundError =
|
|
121
124
|
services.onBackgroundError ??
|
|
122
|
-
((error: unknown) => console.error('[
|
|
125
|
+
((error: unknown) => console.error('[Services] Metering failed:', error))
|
|
123
126
|
|
|
124
|
-
const requireToken = async (context: Context<
|
|
127
|
+
const requireToken = async (context: Context<ServicesEnvironment>, next: () => Promise<void>) => {
|
|
125
128
|
const header = context.req.header('Authorization')
|
|
126
129
|
const token = header?.startsWith('Bearer ') ? header.slice('Bearer '.length) : undefined
|
|
127
130
|
if (!token) return aiError(context, 'unauthorized')
|
|
128
131
|
try {
|
|
129
132
|
const { payload } = await jwtVerify(token, services.keys, {
|
|
130
133
|
issuer: config.cloudURL,
|
|
131
|
-
audience:
|
|
134
|
+
audience: CLOUD_SERVICES_TOKEN_AUDIENCE,
|
|
132
135
|
algorithms: ['ES256']
|
|
133
136
|
})
|
|
134
|
-
context.set('claims', v.parse(
|
|
137
|
+
context.set('claims', v.parse(servicesTokenClaimsSchema, payload))
|
|
135
138
|
} catch {
|
|
136
139
|
return aiError(context, 'unauthorized')
|
|
137
140
|
}
|
|
138
141
|
return next()
|
|
139
142
|
}
|
|
140
143
|
|
|
141
|
-
return new Hono<
|
|
144
|
+
return new Hono<ServicesEnvironment>()
|
|
142
145
|
.use(
|
|
143
146
|
'*',
|
|
144
147
|
cors({
|
|
@@ -148,28 +151,26 @@ export function createAIRelayApp(services: AIRelayServices) {
|
|
|
148
151
|
maxAge: 600
|
|
149
152
|
})
|
|
150
153
|
)
|
|
151
|
-
.use(`${
|
|
152
|
-
.get(
|
|
153
|
-
.get(
|
|
154
|
+
.use(`${CLOUD_SERVICES_API_PATHS.base}/*`, requireToken)
|
|
155
|
+
.get(CLOUD_SERVICES_API_PATHS.catalog, (context) => context.json(config.catalog))
|
|
156
|
+
.get(CLOUD_SERVICES_API_PATHS.wallet, async (context) => {
|
|
154
157
|
const claims = context.get('claims')
|
|
155
|
-
return context.json(
|
|
156
|
-
await usage.wallet(claims.workspaceId, claims.monthlyCreditAllowance, now())
|
|
157
|
-
)
|
|
158
|
+
return context.json(await usage.wallet(spender(claims), claims.monthlyCreditAllowance, now()))
|
|
158
159
|
})
|
|
159
|
-
.get(
|
|
160
|
+
.get(CLOUD_SERVICES_API_PATHS.usage, validatedQuery(parseUsageQuery), async (context) => {
|
|
160
161
|
try {
|
|
161
162
|
return context.json(
|
|
162
163
|
await usage.page(context.get('claims').workspaceId, context.req.valid('query').cursor)
|
|
163
164
|
)
|
|
164
165
|
} catch (error) {
|
|
165
|
-
if (error instanceof
|
|
166
|
+
if (error instanceof ServicesUsageCursorError) {
|
|
166
167
|
return context.json({ error: { code: 'invalid_request' as const } }, 400)
|
|
167
168
|
}
|
|
168
169
|
throw error
|
|
169
170
|
}
|
|
170
171
|
})
|
|
171
172
|
.post(
|
|
172
|
-
|
|
173
|
+
CLOUD_SERVICES_API_PATHS.chatCompletions,
|
|
173
174
|
// Counted as it streams in, so a body without Content-Length is bounded too.
|
|
174
175
|
bodyLimit({
|
|
175
176
|
maxSize: config.maximumRequestBytes,
|
|
@@ -183,13 +184,13 @@ export function createAIRelayApp(services: AIRelayServices) {
|
|
|
183
184
|
const request = pick(parsed.output, FORWARDED_FIELDS)
|
|
184
185
|
const model = models.get(request.model)
|
|
185
186
|
if (!model) return aiError(context, 'model_not_allowed')
|
|
186
|
-
const wallet = await usage.wallet(claims
|
|
187
|
+
const wallet = await usage.wallet(spender(claims), claims.monthlyCreditAllowance, now())
|
|
187
188
|
if (wallet.balance === 0) {
|
|
188
189
|
return aiError(context, 'insufficient_credits', {
|
|
189
190
|
resetsAt: wallet.buckets[0]?.expiresAt ?? undefined
|
|
190
191
|
})
|
|
191
192
|
}
|
|
192
|
-
const release = limiter.acquire(claims.
|
|
193
|
+
const release = limiter.acquire(spender(claims).accountId)
|
|
193
194
|
if (!release) return aiError(context, 'rate_limited')
|
|
194
195
|
|
|
195
196
|
const streamed = request.stream === true
|
|
@@ -231,6 +232,9 @@ export function createAIRelayApp(services: AIRelayServices) {
|
|
|
231
232
|
await usage.record({
|
|
232
233
|
id: crypto.randomUUID(),
|
|
233
234
|
workspaceId: claims.workspaceId,
|
|
235
|
+
// A token from a Cloud without accounts names none; the row then counts for its
|
|
236
|
+
// workspace, and once Cloud upgrades, for that workspace's owner as well.
|
|
237
|
+
accountId: claims.accountId ?? null,
|
|
234
238
|
userId: claims.sub,
|
|
235
239
|
modelId: model.id,
|
|
236
240
|
inputTokens: tokens.inputTokens,
|
|
@@ -248,4 +252,4 @@ export function createAIRelayApp(services: AIRelayServices) {
|
|
|
248
252
|
)
|
|
249
253
|
}
|
|
250
254
|
|
|
251
|
-
export type
|
|
255
|
+
export type ServicesApp = ReturnType<typeof createServicesApp>
|