@open-pencil/cloud 0.17.0-beta.4 → 0.17.0-beta.6
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 +2 -1
- package/dist/bin/server.mjs +1 -1
- package/dist/bin/server.mjs.map +1 -1
- package/dist/bin/services.mjs +1 -1
- package/dist/bin/services.mjs.map +1 -1
- package/dist/client.d.ts +783 -47
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1651 -382
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +701 -45
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +2138 -34
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +4343 -306
- package/dist/email.js.map +1 -1
- package/dist/errors.d.ts +2 -0
- package/dist/errors.js +61 -0
- package/dist/errors.js.map +1 -0
- package/dist/index.d.ts +1338 -44
- package/dist/index.d.ts.map +1 -1
- package/dist/index2.d.ts +45 -0
- package/dist/index2.d.ts.map +1 -0
- package/dist/listen.mjs +958 -340
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-cloudflare.d.ts +93 -0
- package/dist/runtime-cloudflare.d.ts.map +1 -0
- package/dist/runtime-cloudflare.js +18032 -0
- package/dist/runtime-cloudflare.js.map +1 -0
- package/dist/runtime-node.d.mts +12615 -5249
- package/dist/runtime-node.d.mts.map +1 -1
- package/dist/server.d.ts +17367 -8567
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +13587 -7333
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +11601 -5401
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +84 -62
- package/dist/server2.mjs.map +1 -1
- package/package.json +31 -5
- package/src/admin/api/routes.ts +263 -190
- package/src/admin/audit/service.ts +11 -3
- package/src/admin/bootstrap.ts +86 -0
- package/src/admin/documents/service.ts +195 -10
- package/src/admin/email/service.ts +2 -1
- package/src/admin/enrollment/email.ts +17 -3
- package/src/admin/enrollment/service.ts +71 -10
- package/src/admin/errors.ts +5 -0
- package/src/admin/index.ts +1 -0
- package/src/admin/reports/service.ts +15 -3
- package/src/admin/schema.ts +6 -5
- package/src/admin/users/service.ts +173 -16
- package/src/client/api.ts +52 -473
- package/src/client/auth/client.ts +22 -3
- package/src/client/comments.ts +205 -0
- package/src/client/community.ts +40 -0
- package/src/client/device-authorization.ts +4 -20
- package/src/client/discovery.ts +39 -11
- package/src/client/documents.ts +160 -0
- package/src/client/files/archive.ts +60 -0
- package/src/client/files/checksum.ts +7 -0
- package/src/client/files/download.ts +122 -0
- package/src/client/files/images.ts +89 -0
- package/src/client/files/index.ts +15 -0
- package/src/client/files/objects.ts +173 -0
- package/src/client/files/save.ts +79 -0
- package/src/client/index.ts +4 -0
- package/src/client/portal/account.ts +73 -3
- package/src/client/portal/administration.ts +52 -5
- package/src/client/portal/request.ts +6 -2
- package/src/client/response.ts +21 -0
- package/src/client/schema.ts +8 -0
- package/src/client/services.ts +23 -18
- package/src/client/sharing.ts +262 -0
- package/src/client/tour.ts +44 -0
- package/src/client/versions.ts +110 -0
- package/src/contract/account.ts +111 -11
- package/src/contract/admin/index.ts +48 -3
- package/src/contract/billing.ts +235 -0
- package/src/contract/collaboration.ts +5 -0
- package/src/contract/comments.ts +223 -0
- package/src/contract/community.ts +60 -0
- package/src/contract/discovery.ts +94 -5
- package/src/contract/entitlements.ts +10 -0
- package/src/contract/index.ts +64 -5
- package/src/contract/links.ts +62 -4
- package/src/contract/locale.ts +27 -0
- package/src/contract/portal.ts +12 -1
- package/src/contract/relay.ts +3 -1
- package/src/contract/routes.ts +10 -0
- package/src/contract/services.ts +62 -20
- package/src/contract/workspaces.ts +5 -0
- package/src/email/i18n.ts +174 -0
- package/src/email/index.ts +13 -2
- package/src/email/locales/ar.json +169 -0
- package/src/email/locales/de.json +169 -0
- package/src/email/locales/es.json +169 -0
- package/src/email/locales/fr.json +169 -0
- package/src/email/locales/it.json +169 -0
- package/src/email/locales/ja.json +169 -0
- package/src/email/locales/pl.json +169 -0
- package/src/email/locales/pt-br.json +169 -0
- package/src/email/locales/ru.json +169 -0
- package/src/email/locales/zh-cn.json +169 -0
- package/src/email/messages.ts +235 -0
- package/src/email/render.ts +160 -276
- package/src/email/samples.ts +142 -0
- package/src/email/schema.ts +98 -8
- package/src/email/templates/BrandEmail.vue +56 -0
- package/src/email/templates/CommentNotification.vue +39 -0
- package/src/email/templates/DocumentBlocked.vue +45 -0
- package/src/email/templates/DocumentInvitation.vue +24 -0
- package/src/email/templates/DocumentReport.vue +32 -0
- package/src/email/templates/DocumentReportDecided.vue +36 -0
- package/src/email/templates/DocumentReportReceived.vue +18 -0
- package/src/email/templates/DocumentRestored.vue +24 -0
- package/src/email/templates/EmailChangeRequested.vue +24 -0
- package/src/email/templates/EmailRoot.vue +19 -0
- package/src/email/templates/EmailText.vue +9 -0
- package/src/email/templates/EmailVerification.vue +38 -0
- package/src/email/templates/EnrollmentInvitation.vue +53 -0
- package/src/email/templates/EnrollmentNotification.vue +24 -0
- package/src/email/templates/EnrollmentUpdate.vue +52 -0
- package/src/email/templates/NewSignIn.vue +37 -0
- package/src/email/templates/PasswordChanged.vue +22 -0
- package/src/email/templates/PasswordReset.vue +23 -0
- package/src/email/templates/StorageLimitReached.vue +28 -0
- package/src/email/templates/TwoStepChanged.vue +47 -0
- package/src/email/templates/WaitlistConfirmation.vue +29 -0
- package/src/email/templates/WorkspaceInvitation.vue +28 -0
- package/src/email/templates/brand.ts +15 -61
- package/src/email/templates/localization.ts +17 -0
- package/src/errors/index.ts +6 -0
- package/src/{server/errors → errors}/posthog.ts +28 -4
- package/src/global.d.ts +7 -0
- package/src/runtime/cloudflare/email.ts +2 -0
- package/src/runtime/cloudflare/relay/index.ts +28 -7
- package/src/runtime/cloudflare/tsconfig.json +2 -1
- package/src/runtime/cloudflare/worker.ts +14 -1
- package/src/runtime/cloudflare/xml.ts +12 -0
- package/src/runtime/node/admin.ts +51 -47
- package/src/runtime/node/cleanup.ts +5 -1
- package/src/runtime/node/email/runtime.ts +1 -0
- package/src/runtime/node/email/transport.ts +14 -10
- package/src/runtime/node/main.ts +1 -1
- package/src/runtime/node/server.ts +20 -4
- package/src/runtime/node/services/main.ts +1 -1
- package/src/runtime/posthog/errors.ts +5 -2
- package/src/runtime/s3/objects.ts +17 -0
- package/src/runtime/site/community.ts +101 -0
- package/src/runtime/site/server.ts +17 -1
- package/src/server/account/actions.ts +3 -1
- package/src/server/account/deletion.ts +40 -4
- package/src/server/account/routes.ts +305 -253
- package/src/server/account/tokens.ts +57 -0
- package/src/server/api/router.ts +44 -6
- package/src/server/app/checks.ts +89 -0
- package/src/server/app/cors.ts +44 -0
- package/src/server/app/editors.ts +20 -0
- package/src/server/app/index.ts +128 -0
- package/src/server/app/indexing.ts +40 -0
- package/src/server/app/limiters.ts +53 -0
- package/src/server/app/routes.ts +123 -0
- package/src/server/app/services.ts +219 -0
- package/src/server/auth/access-control.ts +13 -8
- package/src/server/auth/access-tokens.ts +62 -0
- package/src/server/auth/account.ts +13 -12
- package/src/server/auth/activity.ts +7 -2
- package/src/server/auth/adapter.ts +36 -3
- package/src/server/auth/email.ts +33 -18
- package/src/server/auth/endpoints.ts +4 -0
- package/src/server/auth/enrollment.ts +116 -0
- package/src/server/auth/factory.ts +165 -189
- package/src/server/auth/index.ts +1 -1
- package/src/server/auth/logger.ts +23 -0
- package/src/server/auth/methods.ts +162 -0
- package/src/server/auth/mfa-assurance.ts +190 -2
- package/src/server/auth/passwords.ts +43 -0
- package/src/server/auth/rate-limit.ts +31 -0
- package/src/server/auth/runtime.ts +19 -5
- package/src/server/auth/session.ts +2 -0
- package/src/server/auth/social-providers.ts +70 -24
- package/src/server/billing/index.ts +8 -0
- package/src/server/billing/notify.ts +55 -0
- package/src/server/billing/routes.ts +27 -0
- package/src/server/billing/seats.ts +17 -0
- package/src/server/billing/tokens.ts +37 -0
- package/src/server/cleanup/configured.ts +16 -3
- package/src/server/cleanup/documents.ts +5 -2
- package/src/server/cleanup/revisions.ts +6 -3
- package/src/server/cleanup/uploads.ts +2 -1
- package/src/server/cleanup/worker.ts +10 -1
- package/src/server/collaboration/relay/connection.ts +7 -2
- package/src/server/collaboration/relay/hub.ts +80 -166
- package/src/server/collaboration/relay/room.ts +154 -0
- package/src/server/collaboration/routes.ts +8 -5
- package/src/server/collaboration/service.ts +21 -2
- package/src/server/comments/index.ts +9 -0
- package/src/server/comments/notify.ts +277 -0
- package/src/server/comments/routes.ts +352 -0
- package/src/server/comments/rows.ts +249 -0
- package/src/server/comments/service.ts +570 -0
- package/src/server/community/index.ts +2 -0
- package/src/server/community/routes.ts +93 -0
- package/src/server/community/service.ts +134 -0
- package/src/server/config/deployment.ts +35 -10
- package/src/server/config/index.ts +2 -2
- package/src/server/config/public.ts +25 -6
- package/src/server/config/schema.ts +53 -293
- package/src/server/config/toml/schema.ts +330 -0
- package/src/server/db/index.ts +3 -1
- package/src/server/db/migrate.ts +33 -1
- package/src/server/db/migrations/009_access_tokens.ts +47 -0
- package/src/server/db/migrations/010_storage_limit_notices.ts +50 -0
- package/src/server/db/migrations/011_account_ids.ts +30 -0
- package/src/server/db/migrations/012_email_locales.ts +34 -0
- package/src/server/db/migrations/013_document_block_emails.ts +40 -0
- package/src/server/db/migrations/014_report_replies.ts +28 -0
- package/src/server/db/migrations/015_comments.ts +57 -0
- package/src/server/db/migrations/016_comment_notifications.ts +76 -0
- package/src/server/db/migrations/017_invitation_emails.ts +19 -0
- package/src/server/db/migrations/018_enrollment_source.ts +17 -0
- package/src/server/db/migrations/schema.ts +26 -1
- package/src/server/db/tables.ts +122 -3
- package/src/server/db/users.ts +22 -0
- package/src/server/documents/access.ts +17 -0
- package/src/server/documents/images.ts +6 -1
- package/src/server/documents/index.ts +1 -1
- package/src/server/documents/limits.ts +7 -1
- package/src/server/documents/routes.ts +12 -12
- package/src/server/documents/service.ts +31 -407
- package/src/server/documents/summary.ts +15 -0
- package/src/server/documents/uploads.ts +450 -0
- package/src/server/documents/versions/routes.ts +7 -8
- package/src/server/documents/versions/service.ts +86 -26
- package/src/server/email/invitations.ts +1 -0
- package/src/server/email/service.ts +39 -6
- package/src/server/email/types.ts +13 -0
- package/src/server/errors/index.ts +49 -12
- package/src/server/index.ts +27 -6
- package/src/server/internal/routes.ts +8 -2
- package/src/server/internal/service.ts +10 -0
- package/src/server/invitations/budget.ts +3 -1
- package/src/server/invitations/index.ts +1 -0
- package/src/server/invitations/links.ts +6 -0
- package/src/server/invitations/types.ts +5 -1
- package/src/server/objects/types.ts +5 -0
- package/src/server/pictures/service.ts +3 -1
- package/src/server/policy/configured.ts +9 -3
- package/src/server/policy/database.ts +13 -2
- package/src/server/policy/policy.ts +39 -12
- package/src/server/policy/service.ts +71 -52
- package/src/server/policy/storage.ts +33 -0
- package/src/server/policy/workspace.ts +5 -2
- package/src/server/quota/index.ts +6 -0
- package/src/server/quota/notices.ts +121 -0
- package/src/server/quota/storage.ts +5 -0
- package/src/server/rate-limit/middleware.ts +4 -0
- package/src/server/reports/index.ts +1 -0
- package/src/server/reports/replies.ts +55 -0
- package/src/server/reports/routes.ts +5 -3
- package/src/server/reports/service.ts +27 -3
- package/src/server/services/routes.ts +2 -2
- package/src/server/sharing/capabilities/service.ts +3 -4
- package/src/server/sharing/document-routes.ts +3 -3
- package/src/server/sharing/invitations/service.ts +17 -8
- package/src/server/sharing/routes.ts +15 -15
- package/src/server/validation.ts +35 -24
- package/src/server/workspaces/members.ts +57 -31
- package/src/server/workspaces/repository.ts +23 -12
- package/src/server/workspaces/routes.ts +8 -8
- package/src/services/app.ts +31 -22
- package/src/services/config.ts +48 -8
- package/src/services/metering.ts +15 -27
- package/src/services/usage.ts +6 -14
- package/src/email/templates/document-invitation.ts +0 -35
- package/src/email/templates/enrollment.ts +0 -27
- package/src/email/templates/layout.ts +0 -18
- package/src/server/app.ts +0 -453
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { CloudActor } from '#cloud/server/auth'
|
|
2
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
|
+
import { CLOUD_RATE_LIMITS, createRouteRateLimiter } from '#cloud/server/rate-limit'
|
|
4
|
+
import { Hono } from 'hono'
|
|
5
|
+
import type { Kysely } from 'kysely'
|
|
6
|
+
|
|
7
|
+
import type { BillingTokenService } from './tokens'
|
|
8
|
+
|
|
9
|
+
export type BillingRouteEnvironment = { Variables: { actor: CloudActor } }
|
|
10
|
+
|
|
11
|
+
/** Without a billing service, the deployment sells nothing and the token route is not found. */
|
|
12
|
+
export function createBillingRoutes(
|
|
13
|
+
service: BillingTokenService | undefined,
|
|
14
|
+
rateLimit?: { database: Kysely<CloudDatabase>; secret: string }
|
|
15
|
+
) {
|
|
16
|
+
const router = new Hono<BillingRouteEnvironment>()
|
|
17
|
+
if (service && rateLimit) {
|
|
18
|
+
router.use(
|
|
19
|
+
'/billing/token',
|
|
20
|
+
createRouteRateLimiter(rateLimit.database, rateLimit.secret, CLOUD_RATE_LIMITS.billingToken)
|
|
21
|
+
)
|
|
22
|
+
}
|
|
23
|
+
return router.post('/billing/token', async (context) => {
|
|
24
|
+
if (!service) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
25
|
+
return context.json(await service.issue(context.get('actor')))
|
|
26
|
+
})
|
|
27
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
2
|
+
import type { Kysely } from 'kysely'
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* An account's seats: the people who can edit in the workspaces it owns, each counted once
|
|
6
|
+
* however many of them they edit, the owner too. Viewers take no seat.
|
|
7
|
+
*/
|
|
8
|
+
export async function accountSeats(database: Kysely<CloudDatabase>, accountId: string) {
|
|
9
|
+
const row = await database
|
|
10
|
+
.selectFrom('workspaceMember')
|
|
11
|
+
.innerJoin('workspace', 'workspace.id', 'workspaceMember.workspaceId')
|
|
12
|
+
.select((eb) => eb.fn.count<string>('workspaceMember.userId').distinct().as('seats'))
|
|
13
|
+
.where('workspace.ownerId', '=', accountId)
|
|
14
|
+
.where('workspaceMember.role', 'in', ['editor', 'admin'])
|
|
15
|
+
.executeTakeFirst()
|
|
16
|
+
return Number(row?.seats ?? 0)
|
|
17
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { CLOUD_BILLING_TOKEN_AUDIENCE, type BillingToken } from '#cloud/contract'
|
|
2
|
+
import type { CloudActor } from '#cloud/server/auth'
|
|
3
|
+
import { SERVICES_SIGNING_ALGORITHM, type ServicesSigningKey } from '#cloud/server/services/keys'
|
|
4
|
+
import { SignJWT } from 'jose'
|
|
5
|
+
|
|
6
|
+
export type BillingTokenServiceOptions = {
|
|
7
|
+
/** The Cloud public URL, which billing checks as the token's `iss`. */
|
|
8
|
+
issuer: string
|
|
9
|
+
/** The services' key, whose public half Cloud publishes for billing to verify with. */
|
|
10
|
+
signingKey: ServicesSigningKey
|
|
11
|
+
lifetimeSeconds: number
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function createBillingTokenService(options: BillingTokenServiceOptions) {
|
|
15
|
+
const { privateKey, publicJWK } = options.signingKey
|
|
16
|
+
return {
|
|
17
|
+
/**
|
|
18
|
+
* Signs a token that lets the signed-in person buy or manage their own account's plan and
|
|
19
|
+
* credits with billing; nobody else's, since an account is the person.
|
|
20
|
+
*/
|
|
21
|
+
async issue(actor: Pick<CloudActor, 'userId' | 'email'>): Promise<BillingToken> {
|
|
22
|
+
const issuedAt = Math.floor(Date.now() / 1000)
|
|
23
|
+
const expiresAt = issuedAt + options.lifetimeSeconds
|
|
24
|
+
const token = await new SignJWT({ email: actor.email })
|
|
25
|
+
.setProtectedHeader({ alg: SERVICES_SIGNING_ALGORITHM, kid: publicJWK.kid, typ: 'JWT' })
|
|
26
|
+
.setIssuer(options.issuer)
|
|
27
|
+
.setAudience(CLOUD_BILLING_TOKEN_AUDIENCE)
|
|
28
|
+
.setSubject(actor.userId)
|
|
29
|
+
.setIssuedAt(issuedAt)
|
|
30
|
+
.setExpirationTime(expiresAt)
|
|
31
|
+
.sign(privateKey)
|
|
32
|
+
return { token, expiresAt: new Date(expiresAt * 1000).toISOString() }
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export type BillingTokenService = ReturnType<typeof createBillingTokenService>
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { CloudServerConfig } from '#cloud/server/config'
|
|
2
2
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
|
+
import type { TransactionalEmailService } from '#cloud/server/email'
|
|
3
4
|
import type { CloudErrorReporter } from '#cloud/server/errors'
|
|
4
5
|
import type { ObjectStore } from '#cloud/server/objects'
|
|
5
6
|
import type { CloudPolicy } from '#cloud/server/policy/policy'
|
|
7
|
+
import { createStorageLimitNoticeService } from '#cloud/server/quota'
|
|
6
8
|
import { createRateLimitCleanupService } from '#cloud/server/rate-limit/cleanup'
|
|
7
9
|
import type { Kysely } from 'kysely'
|
|
8
10
|
|
|
@@ -14,13 +16,15 @@ import type { CleanupPassOptions, CleanupServices } from './worker'
|
|
|
14
16
|
/**
|
|
15
17
|
* Every cleanup service, over a deployment's database and bucket. Each reports what it couldn't
|
|
16
18
|
* clean through `reportError`, where a deployment tracks errors, and carries on with the rest.
|
|
19
|
+
* With `email`, a deployment that sends mail, it also tells accounts their storage is full.
|
|
17
20
|
*/
|
|
18
21
|
export function createCleanupServices(
|
|
19
|
-
config: Pick<CloudServerConfig, 'deployment'>,
|
|
22
|
+
config: Pick<CloudServerConfig, 'deployment' | 'publicURL' | 'billingEndpoint'>,
|
|
20
23
|
database: Kysely<CloudDatabase>,
|
|
21
24
|
objects: ObjectStore,
|
|
22
25
|
policy: CloudPolicy,
|
|
23
|
-
reportError?: CloudErrorReporter
|
|
26
|
+
reportError?: CloudErrorReporter,
|
|
27
|
+
email?: TransactionalEmailService
|
|
24
28
|
): CleanupServices {
|
|
25
29
|
return {
|
|
26
30
|
uploads: createUploadCleanupService(database, objects, reportError),
|
|
@@ -30,7 +34,16 @@ export function createCleanupServices(
|
|
|
30
34
|
deploymentMode: config.deployment,
|
|
31
35
|
reportError
|
|
32
36
|
}),
|
|
33
|
-
rateLimits: createRateLimitCleanupService(database)
|
|
37
|
+
rateLimits: createRateLimitCleanupService(database),
|
|
38
|
+
storageLimits: email
|
|
39
|
+
? createStorageLimitNoticeService(database, {
|
|
40
|
+
policy,
|
|
41
|
+
email,
|
|
42
|
+
publicURL: config.publicURL,
|
|
43
|
+
upgradable: config.billingEndpoint !== undefined,
|
|
44
|
+
deploymentMode: config.deployment
|
|
45
|
+
})
|
|
46
|
+
: undefined
|
|
34
47
|
}
|
|
35
48
|
}
|
|
36
49
|
|
|
@@ -111,12 +111,15 @@ export function createDocumentCleanupService(
|
|
|
111
111
|
} catch (error) {
|
|
112
112
|
result.failed++
|
|
113
113
|
result.failures.push(error)
|
|
114
|
-
// Only the document's
|
|
114
|
+
// Only the document's and its workspace's IDs: its name and the people on it stay out.
|
|
115
115
|
await reportCloudError(
|
|
116
116
|
options.reportError,
|
|
117
117
|
`Cleaning up document ${document.id} failed`,
|
|
118
118
|
error,
|
|
119
|
-
{
|
|
119
|
+
{
|
|
120
|
+
source: 'cleanup',
|
|
121
|
+
resources: { documentId: document.id, workspaceId: document.workspaceId }
|
|
122
|
+
}
|
|
120
123
|
)
|
|
121
124
|
// Out of Trash already, a document whose files are partly gone is never restorable; the
|
|
122
125
|
// next pass tries again.
|
|
@@ -56,8 +56,8 @@ export function createRevisionCompactionService(
|
|
|
56
56
|
} = {}
|
|
57
57
|
): RevisionCompactionService {
|
|
58
58
|
const deploymentMode = options.deploymentMode ?? 'self-hosted'
|
|
59
|
-
const report = (message: string, error: unknown) =>
|
|
60
|
-
reportCloudError(options.reportError, message, error, { source: 'cleanup' })
|
|
59
|
+
const report = (message: string, error: unknown, resources?: Record<string, string>) =>
|
|
60
|
+
reportCloudError(options.reportError, message, error, { source: 'cleanup', resources })
|
|
61
61
|
async function pruneVersions(now: Date, batchSize: number): Promise<number> {
|
|
62
62
|
if (!options.policy) return 0
|
|
63
63
|
const limitedBefore = new Date(now.getTime() - LIMITED_HISTORY_DAYS * 24 * 60 * 60_000)
|
|
@@ -225,7 +225,10 @@ export function createRevisionCompactionService(
|
|
|
225
225
|
result.bytesReclaimed += compacted.bytes
|
|
226
226
|
} catch (error) {
|
|
227
227
|
result.failed++
|
|
228
|
-
await report(`Compacting document ${documentId} failed`, error
|
|
228
|
+
await report(`Compacting document ${documentId} failed`, error, {
|
|
229
|
+
documentId,
|
|
230
|
+
workspaceId
|
|
231
|
+
})
|
|
229
232
|
}
|
|
230
233
|
}
|
|
231
234
|
// Compaction just freed the images of the saves it deleted; the release lets their grace pass.
|
|
@@ -102,7 +102,8 @@ export function createUploadCleanupService(
|
|
|
102
102
|
} catch (error) {
|
|
103
103
|
failed++
|
|
104
104
|
await reportCloudError(reportError, `Cleaning up upload ${upload.id} failed`, error, {
|
|
105
|
-
source: 'cleanup'
|
|
105
|
+
source: 'cleanup',
|
|
106
|
+
resources: { uploadId: upload.id }
|
|
106
107
|
})
|
|
107
108
|
await database
|
|
108
109
|
.updateTable('upload')
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { StorageLimitNoticeResult, StorageLimitNoticeService } from '#cloud/server/quota'
|
|
2
|
+
|
|
1
3
|
import { startPeriodicWorker } from '../worker/periodic'
|
|
2
4
|
import type { DocumentCleanupResult, DocumentCleanupService } from './documents'
|
|
3
5
|
import {
|
|
@@ -23,6 +25,7 @@ export type CleanupResult = {
|
|
|
23
25
|
documents: DocumentCleanupResult
|
|
24
26
|
revisions: RevisionCompactionResult | null
|
|
25
27
|
rateLimits: number
|
|
28
|
+
storageLimits: StorageLimitNoticeResult | null
|
|
26
29
|
}
|
|
27
30
|
|
|
28
31
|
export type CleanupServices = {
|
|
@@ -30,6 +33,8 @@ export type CleanupServices = {
|
|
|
30
33
|
uploads: UploadCleanupService
|
|
31
34
|
revisions?: RevisionCompactionService
|
|
32
35
|
rateLimits?: { cleanupExpired(before: Date): Promise<number> }
|
|
36
|
+
/** Emails accounts whose storage became full; only where the server sends email. */
|
|
37
|
+
storageLimits?: Pick<StorageLimitNoticeService, 'notifyStorageLimits'>
|
|
33
38
|
}
|
|
34
39
|
|
|
35
40
|
export type CleanupWorker = {
|
|
@@ -66,7 +71,11 @@ export async function runCleanup(
|
|
|
66
71
|
const rateLimits = cleanup.rateLimits
|
|
67
72
|
? await cleanup.rateLimits.cleanupExpired(new Date(Date.now() - 24 * 60 * 60_000))
|
|
68
73
|
: 0
|
|
69
|
-
|
|
74
|
+
// After documents, so storage they freed counts before anyone is told theirs is full.
|
|
75
|
+
const storageLimits = cleanup.storageLimits
|
|
76
|
+
? await cleanup.storageLimits.notifyStorageLimits()
|
|
77
|
+
: null
|
|
78
|
+
return { uploads, documents, revisions, rateLimits, storageLimits }
|
|
70
79
|
}
|
|
71
80
|
|
|
72
81
|
export function startCleanupWorker(
|
|
@@ -52,7 +52,8 @@ export type ConnectionRelay = {
|
|
|
52
52
|
/** Handles a peer's room message; a promise while it waits for the room's document. */
|
|
53
53
|
deliver(peer: RelayPeer, frame: RelayRoomFrame): Promise<void> | undefined
|
|
54
54
|
depart(peer: RelayPeer): void
|
|
55
|
-
|
|
55
|
+
/** Reports a failure, naming the ticket's document and person once the ticket verified. */
|
|
56
|
+
report(message: string, error: unknown, authorization?: RelayAuthorization): void
|
|
56
57
|
}
|
|
57
58
|
|
|
58
59
|
/**
|
|
@@ -66,6 +67,8 @@ export function openRelayConnection(
|
|
|
66
67
|
relay: ConnectionRelay
|
|
67
68
|
): RelayConnection {
|
|
68
69
|
let peer: RelayPeer | null = resumed
|
|
70
|
+
/** The last ticket that passed every check, which a failure handling it reports. */
|
|
71
|
+
let verified: RelayAuthorization | undefined
|
|
69
72
|
/** Read through an object, since it changes across awaits and between messages. */
|
|
70
73
|
const state = { closed: false, busy: false }
|
|
71
74
|
const isClosed = () => state.closed
|
|
@@ -107,11 +110,13 @@ export function openRelayConnection(
|
|
|
107
110
|
socket.close(RELAY_CLOSE.unauthorized, 'Ticket is for a different room or person')
|
|
108
111
|
return
|
|
109
112
|
}
|
|
113
|
+
verified = authorization
|
|
110
114
|
peer.authorization = authorization
|
|
111
115
|
relay.refreshed(peer)
|
|
112
116
|
return
|
|
113
117
|
}
|
|
114
118
|
clearTimeout(authTimer)
|
|
119
|
+
verified = authorization
|
|
115
120
|
const admitted = await relay.admit(socket, authorization)
|
|
116
121
|
// The socket may have closed while the room loaded.
|
|
117
122
|
if (admitted && isClosed()) relay.depart(admitted)
|
|
@@ -138,7 +143,7 @@ export function openRelayConnection(
|
|
|
138
143
|
state.busy = true
|
|
139
144
|
void authenticate(frame.token)
|
|
140
145
|
.catch((error: unknown) => {
|
|
141
|
-
relay.report('
|
|
146
|
+
relay.report('Checking a collaboration ticket failed', error, verified)
|
|
142
147
|
socket.close(RELAY_CLOSE.protocol, 'Could not open the collaboration room')
|
|
143
148
|
})
|
|
144
149
|
.finally(() => {
|