sandcms 0.6.3 → 0.8.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/README.md +15 -11
- package/dist/admin/Account.svelte +2 -0
- package/dist/admin/Admin.svelte +21 -6
- package/dist/admin/AssetAttachment.svelte +9 -6
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -1
- package/dist/admin/BlueprintFields.svelte +0 -3
- package/dist/admin/BlueprintFields.svelte.d.ts +0 -1
- package/dist/admin/Editor.svelte +5 -10
- package/dist/admin/Fields.svelte +2 -8
- package/dist/admin/Fields.svelte.d.ts +0 -1
- package/dist/admin/Gallery.svelte +221 -80
- package/dist/admin/Gallery.svelte.d.ts +0 -1
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/LinkField.svelte +0 -3
- package/dist/admin/LinkField.svelte.d.ts +0 -1
- package/dist/admin/MediaLibrary.svelte +10 -7
- package/dist/admin/MediaPicker.svelte +43 -35
- package/dist/admin/MediaPicker.svelte.d.ts +0 -1
- package/dist/admin/Navigation.svelte +13 -2
- package/dist/admin/Pages.svelte +195 -0
- package/dist/admin/Pages.svelte.d.ts +7 -0
- package/dist/admin/Shell.svelte +27 -5
- package/dist/admin/SortableList.svelte +82 -61
- package/dist/admin/SortableList.svelte.d.ts +3 -1
- package/dist/admin/ThemePicker.svelte +72 -0
- package/dist/admin/ThemePicker.svelte.d.ts +18 -0
- package/dist/admin/UploadButton.svelte +2 -1
- package/dist/admin/UploadProgress.svelte +24 -0
- package/dist/admin/UploadProgress.svelte.d.ts +7 -0
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/client.d.ts +3 -670
- package/dist/admin/client.js +2 -1
- package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
- package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
- package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
- package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
- package/dist/admin/generated/admin.css +823 -115
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/theme-context.d.ts +7 -0
- package/dist/admin/theme-context.js +3 -0
- package/dist/admin/theme.d.ts +7 -0
- package/dist/admin/theme.js +14 -0
- package/dist/admin/types.d.ts +3 -1
- package/dist/admin/uploads.d.ts +8 -1
- package/dist/admin/uploads.js +94 -16
- package/dist/blueprints/files.js +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +16 -2
- package/dist/blueprints/types.d.ts +4 -1
- package/dist/cli/admin.d.ts +39 -0
- package/dist/cli/admin.js +95 -0
- package/dist/cli/backup.js +4 -4
- package/dist/cli/doctor.d.ts +10 -1
- package/dist/cli/doctor.js +98 -33
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.d.ts +2 -6
- package/dist/cli/files.js +12 -2
- package/dist/cli/index.js +401 -95
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/scaffold.js +8 -8
- package/dist/cli/setup.js +16 -26
- package/dist/cli/upgrade.js +34 -7
- package/dist/env.d.ts +26 -2
- package/dist/env.js +48 -6
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +85 -5
- package/dist/server/admin-load.js +26 -1
- package/dist/server/api-access.d.ts +4 -0
- package/dist/server/api-access.js +15 -2
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api-pagination.d.ts +3 -0
- package/dist/server/api.js +21 -63
- package/dist/server/auth.d.ts +10 -9
- package/dist/server/cms.d.ts +63 -21
- package/dist/server/cms.js +64 -7
- package/dist/server/db/auto-migrate.d.ts +0 -4
- package/dist/server/db/auto-migrate.js +12 -3
- package/dist/server/db/legacy.d.ts +13 -0
- package/dist/server/db/legacy.js +60 -0
- package/dist/server/db/migration-data.js +2 -34
- package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
- package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
- package/dist/server/db/migrations/meta/_journal.json +2 -58
- package/dist/server/db/schema.d.ts +119 -2
- package/dist/server/db/schema.js +23 -9
- package/dist/server/db/store.d.ts +25 -2
- package/dist/server/db/store.js +90 -26
- package/dist/server/forms.js +2 -1
- package/dist/server/hooks.js +155 -81
- package/dist/server/media/contracts.d.ts +115 -0
- package/dist/server/media/contracts.js +12 -0
- package/dist/server/media/deletions.d.ts +2 -1
- package/dist/server/media/deletions.js +3 -3
- package/dist/server/media/delivery.js +7 -11
- package/dist/server/media/processor-child.d.ts +2 -0
- package/dist/server/media/processor-child.js +236 -0
- package/dist/server/media/processor.d.ts +51 -0
- package/dist/server/media/processor.js +135 -0
- package/dist/server/media/render-math.d.ts +24 -0
- package/dist/server/media/render-math.js +50 -0
- package/dist/server/media/runner.d.ts +30 -1
- package/dist/server/media/runner.js +418 -165
- package/dist/server/media/service.d.ts +53 -11
- package/dist/server/media/service.js +307 -98
- package/dist/server/media/storage.d.ts +5 -0
- package/dist/server/media/storage.js +279 -0
- package/dist/server/media/upload-ticket.d.ts +12 -0
- package/dist/server/media/upload-ticket.js +35 -0
- package/dist/server/media/verify.d.ts +64 -0
- package/dist/server/media/verify.js +201 -0
- package/dist/server/platform/http.d.ts +27 -0
- package/dist/server/platform/http.js +77 -0
- package/dist/server/platform/index.d.ts +52 -0
- package/dist/server/platform/index.js +98 -0
- package/dist/server/platform/snapshots.d.ts +18 -0
- package/dist/server/platform/snapshots.js +110 -0
- package/dist/server/platform/volume.d.ts +20 -0
- package/dist/server/platform/volume.js +60 -0
- package/docs/acceptance.md +7 -5
- package/docs/api.md +56 -4
- package/docs/cloudflare.md +26 -152
- package/docs/content.md +20 -5
- package/docs/deployment.md +222 -57
- package/docs/email.md +6 -0
- package/docs/forms.md +2 -2
- package/docs/media.md +94 -21
- package/docs/package.md +21 -18
- package/docs/plans/0.7-self-hosted.md +264 -0
- package/docs/releases.md +37 -1
- package/docs/upgrades.md +72 -9
- package/package.json +37 -44
- package/templates/Dockerfile +32 -0
- package/templates/integration.ts +26 -5
- package/templates/openship.json +9 -0
- package/templates/railpack.json +1 -1
- package/templates/sandcms/blueprints/files/image.yaml +1 -1
- package/templates/sandcms/config.yaml +1 -1
- package/dist/cli/cloudflare.d.ts +0 -8
- package/dist/cli/cloudflare.js +0 -135
- package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
- package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
- package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
- package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
- package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
- package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
- package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
- package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
- package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
- package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
- package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
- package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
- package/dist/worker/index.d.ts +0 -10
- package/dist/worker/index.js +0 -460
- package/dist/worker/local.d.ts +0 -5
- package/dist/worker/local.js +0 -57
- package/dist/worker/source.d.ts +0 -2
- package/dist/worker/source.js +0 -31
- package/dist/worker/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
- package/templates/sandcms/worker/index.ts +0 -1
- package/templates/sandcms/worker/local.ts +0 -1
- package/templates/sandcms/worker/wrangler.jsonc +0 -6
- /package/dist/{worker → server/media}/svg.d.ts +0 -0
- /package/dist/{worker → server/media}/svg.js +0 -0
package/dist/server/hooks.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import { error } from '@sveltejs/kit';
|
|
1
|
+
import { error, isHttpError } from '@sveltejs/kit';
|
|
2
2
|
import { svelteKitHandler } from 'better-auth/svelte-kit';
|
|
3
3
|
import { eq } from 'drizzle-orm';
|
|
4
4
|
import { createHash } from 'node:crypto';
|
|
5
|
+
import { applyIndexingHeaders, platformHandle } from './platform/index.js';
|
|
5
6
|
import { user, apikey, audit } from './db/schema.js';
|
|
6
7
|
import { rateLimit } from './forms.js';
|
|
7
8
|
import { boundedJson, clientAddress } from './request.js';
|
|
8
|
-
import { apiKeyRoute } from './api-access.js';
|
|
9
|
+
import { apiKeyRoute, principalUserId, uploadChunkRoute } from './api-access.js';
|
|
9
10
|
import { mediaDelivery } from './media/delivery.js';
|
|
11
|
+
import { MediaRequestError, UPLOAD_TICKET_HEADER } from './media/contracts.js';
|
|
10
12
|
const authPaths = new Set([
|
|
11
13
|
'/sign-in/email',
|
|
12
14
|
'/sign-out',
|
|
@@ -19,90 +21,162 @@ const authPaths = new Set([
|
|
|
19
21
|
'/two-factor/get-totp-uri',
|
|
20
22
|
'/two-factor/generate-backup-codes'
|
|
21
23
|
]);
|
|
24
|
+
const tooLarge = () => Response.json({ error: 'Request too large' }, { status: 413, headers: { 'cache-control': 'no-store' } });
|
|
25
|
+
/**
|
|
26
|
+
* Enforce the request body limit before anything reads the body. Declared lengths are checked up front;
|
|
27
|
+
* bodies without a length (chunked, HTTP/2) are counted while read and fail with 413 past the limit.
|
|
28
|
+
*/
|
|
29
|
+
function guardBody(event, limit) {
|
|
30
|
+
const { request } = event, length = request.headers.get('content-length');
|
|
31
|
+
if (length !== null)
|
|
32
|
+
return Number(length) <= limit ? event : tooLarge();
|
|
33
|
+
if (!request.body || ['GET', 'HEAD'].includes(request.method))
|
|
34
|
+
return event;
|
|
35
|
+
let seen = 0;
|
|
36
|
+
const body = request.body.pipeThrough(new TransformStream({
|
|
37
|
+
transform(chunk, controller) {
|
|
38
|
+
seen += chunk.byteLength;
|
|
39
|
+
if (seen <= limit)
|
|
40
|
+
return controller.enqueue(chunk);
|
|
41
|
+
try {
|
|
42
|
+
error(413, 'Request too large');
|
|
43
|
+
}
|
|
44
|
+
catch (cause) {
|
|
45
|
+
controller.error(cause);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}));
|
|
49
|
+
const guarded = new Request(request.url, {
|
|
50
|
+
method: request.method,
|
|
51
|
+
headers: request.headers,
|
|
52
|
+
body,
|
|
53
|
+
signal: request.signal,
|
|
54
|
+
duplex: 'half'
|
|
55
|
+
});
|
|
56
|
+
return { ...event, request: guarded };
|
|
57
|
+
}
|
|
58
|
+
const noStore = { 'cache-control': 'private, no-store' };
|
|
59
|
+
/** `PUT …/media/upload/{id}?index=N` stores one chunk; `GET …/media/upload/{id}` lists stored chunks. */
|
|
60
|
+
async function uploadChunk(cms, event, id) {
|
|
61
|
+
const { request } = event;
|
|
62
|
+
try {
|
|
63
|
+
if (request.method !== 'PUT' && request.method !== 'GET')
|
|
64
|
+
return new Response(null, { status: 405, headers: { allow: 'GET, PUT', ...noStore } });
|
|
65
|
+
const userId = await principalUserId(cms, request, 'media/upload/' + id), ticket = request.headers.get(UPLOAD_TICKET_HEADER);
|
|
66
|
+
if (request.method === 'GET')
|
|
67
|
+
return Response.json(await cms.media.uploadStatus(id, ticket, userId), { headers: noStore });
|
|
68
|
+
const index = event.url.searchParams.get('index') ?? '';
|
|
69
|
+
if (!/^\d{1,6}$/.test(index))
|
|
70
|
+
return Response.json({ error: 'Invalid chunk index' }, { status: 400, headers: noStore });
|
|
71
|
+
const body = request.body ?? new ReadableStream({ start: (c) => c.close() });
|
|
72
|
+
return Response.json(await cms.media.receiveChunk(id, Number(index), body, ticket, userId), {
|
|
73
|
+
headers: noStore
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
catch (cause) {
|
|
77
|
+
if (cause instanceof MediaRequestError || isHttpError(cause))
|
|
78
|
+
return Response.json({ error: cause instanceof MediaRequestError ? cause.message : cause.body.message }, { status: cause.status, headers: noStore });
|
|
79
|
+
throw cause;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
22
82
|
export function cmsHandle(getCMS, building = false) {
|
|
23
83
|
return async ({ event, resolve }) => {
|
|
24
84
|
if (building)
|
|
25
85
|
return resolve(event);
|
|
26
|
-
const cms = getCMS()
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
86
|
+
const cms = getCMS();
|
|
87
|
+
// Every response, including media, auth and upload responses, carries noindex on preview sites.
|
|
88
|
+
return applyIndexingHeaders(cms, await handleRequest(cms, event, resolve, building));
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
async function handleRequest(cms, input, resolve, building) {
|
|
92
|
+
const platform = platformHandle(cms, input);
|
|
93
|
+
if (platform)
|
|
94
|
+
return platform;
|
|
95
|
+
const path = input.url.pathname, apiPath = path.startsWith('/api/cms/') ? path.slice('/api/cms/'.length) : '';
|
|
96
|
+
if (uploadChunkRoute(apiPath))
|
|
97
|
+
return uploadChunk(cms, input, apiPath.slice('media/upload/'.length));
|
|
98
|
+
const event = guardBody(input, cms.options.requestLimit ?? 1_048_576);
|
|
99
|
+
if (event instanceof Response)
|
|
100
|
+
return event;
|
|
101
|
+
const isCms = path === '/admin' || path.startsWith('/admin/') || path.startsWith('/api/cms/');
|
|
102
|
+
if (isCms &&
|
|
103
|
+
!['GET', 'HEAD', 'OPTIONS'].includes(event.request.method) &&
|
|
104
|
+
event.request.headers.get('origin') !== cms.options.origin &&
|
|
105
|
+
!(event.request.headers.has('x-api-key') &&
|
|
106
|
+
path.startsWith('/api/cms/') &&
|
|
107
|
+
apiKeyRoute(path.slice('/api/cms/'.length), event.request.method)))
|
|
108
|
+
error(403, 'Invalid request origin');
|
|
109
|
+
if (isCms &&
|
|
110
|
+
event.request.headers.has('x-api-key') &&
|
|
111
|
+
!(path.startsWith('/api/cms/') &&
|
|
112
|
+
apiKeyRoute(path.slice('/api/cms/'.length), event.request.method)))
|
|
113
|
+
error(403, 'API keys can only access content and media');
|
|
114
|
+
if (cms.seo && (path === '/robots.txt' || path === '/sitemap.xml')) {
|
|
115
|
+
if (!['GET', 'HEAD'].includes(event.request.method))
|
|
116
|
+
return new Response(null, { status: 405, headers: { allow: 'GET, HEAD' } });
|
|
117
|
+
const robots = path === '/robots.txt';
|
|
118
|
+
return new Response(event.request.method === 'HEAD' ? null : robots ? cms.seo.robots() : cms.seo.sitemap(), {
|
|
119
|
+
headers: {
|
|
120
|
+
'content-type': robots ? 'text/plain; charset=utf-8' : 'application/xml; charset=utf-8',
|
|
121
|
+
'cache-control': 'no-store'
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
if (path.startsWith('/_sandcms/media/'))
|
|
126
|
+
return mediaDelivery(cms, event, false);
|
|
127
|
+
if (path.startsWith('/api/cms/media/') &&
|
|
128
|
+
path !== '/api/cms/media/list' &&
|
|
129
|
+
['GET', 'HEAD'].includes(event.request.method))
|
|
130
|
+
return mediaDelivery(cms, event, true);
|
|
131
|
+
if (path.startsWith('/api/cms/auth/')) {
|
|
132
|
+
const endpoint = path.slice('/api/cms/auth'.length);
|
|
133
|
+
if (!authPaths.has(endpoint))
|
|
134
|
+
error(404, 'Not found');
|
|
135
|
+
if (endpoint === '/sign-in/email') {
|
|
136
|
+
const body = await boundedJson(event.request.clone(), 8192);
|
|
137
|
+
const email = typeof body.email === 'string' ? body.email.toLowerCase() : '';
|
|
138
|
+
const client = clientAddress(event, cms.options.trustedProxyHeader);
|
|
139
|
+
try {
|
|
140
|
+
rateLimit(cms.store, 'login-ip:' + createHash('sha256').update(client).digest('hex'), 40);
|
|
141
|
+
rateLimit(cms.store, 'login-email:' + createHash('sha256').update(email).digest('hex'), 8);
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
error(429, 'Too many login attempts. Try again in a minute.');
|
|
71
145
|
}
|
|
72
|
-
const current = endpoint === '/change-password'
|
|
73
|
-
? await cms.auth.api.getSession({ headers: event.request.headers })
|
|
74
|
-
: null;
|
|
75
|
-
const response = await svelteKitHandler({ event, resolve, auth: cms.auth, building });
|
|
76
|
-
if (endpoint === '/change-password' && response.ok && current)
|
|
77
|
-
cms.store.db.transaction((tx) => {
|
|
78
|
-
tx.update(user)
|
|
79
|
-
.set({ mustChangePassword: false })
|
|
80
|
-
.where(eq(user.id, current.user.id))
|
|
81
|
-
.run();
|
|
82
|
-
const revoked = tx
|
|
83
|
-
.delete(apikey)
|
|
84
|
-
.where(eq(apikey.referenceId, current.user.id))
|
|
85
|
-
.returning({ id: apikey.id })
|
|
86
|
-
.all();
|
|
87
|
-
tx.insert(audit)
|
|
88
|
-
.values({
|
|
89
|
-
id: crypto.randomUUID(),
|
|
90
|
-
actor: current.user.id,
|
|
91
|
-
action: 'password.change',
|
|
92
|
-
detail: { revokedKeys: revoked.length },
|
|
93
|
-
createdAt: Date.now()
|
|
94
|
-
})
|
|
95
|
-
.run();
|
|
96
|
-
});
|
|
97
|
-
response.headers.set('cache-control', 'private, no-store');
|
|
98
|
-
return response;
|
|
99
|
-
}
|
|
100
|
-
const response = await resolve(event);
|
|
101
|
-
if (isCms || event.url.searchParams.has('cmsPreview')) {
|
|
102
|
-
response.headers.set('cache-control', 'private, no-store');
|
|
103
|
-
response.headers.set('vary', 'Cookie, x-api-key');
|
|
104
|
-
response.headers.set('x-robots-tag', 'noindex, nofollow');
|
|
105
146
|
}
|
|
147
|
+
const current = endpoint === '/change-password'
|
|
148
|
+
? await cms.auth.api.getSession({ headers: event.request.headers })
|
|
149
|
+
: null;
|
|
150
|
+
const response = await svelteKitHandler({ event, resolve, auth: cms.auth, building });
|
|
151
|
+
if (endpoint === '/change-password' && response.ok && current)
|
|
152
|
+
cms.store.db.transaction((tx) => {
|
|
153
|
+
tx.update(user)
|
|
154
|
+
.set({ mustChangePassword: false })
|
|
155
|
+
.where(eq(user.id, current.user.id))
|
|
156
|
+
.run();
|
|
157
|
+
const revoked = tx
|
|
158
|
+
.delete(apikey)
|
|
159
|
+
.where(eq(apikey.referenceId, current.user.id))
|
|
160
|
+
.returning({ id: apikey.id })
|
|
161
|
+
.all();
|
|
162
|
+
tx.insert(audit)
|
|
163
|
+
.values({
|
|
164
|
+
id: crypto.randomUUID(),
|
|
165
|
+
actor: current.user.id,
|
|
166
|
+
action: 'password.change',
|
|
167
|
+
detail: { revokedKeys: revoked.length },
|
|
168
|
+
createdAt: Date.now()
|
|
169
|
+
})
|
|
170
|
+
.run();
|
|
171
|
+
});
|
|
172
|
+
response.headers.set('cache-control', 'private, no-store');
|
|
106
173
|
return response;
|
|
107
|
-
}
|
|
174
|
+
}
|
|
175
|
+
const response = await resolve(event);
|
|
176
|
+
if (isCms || event.url.searchParams.has('cmsPreview')) {
|
|
177
|
+
response.headers.set('cache-control', 'private, no-store');
|
|
178
|
+
response.headers.set('vary', 'Cookie, x-api-key');
|
|
179
|
+
response.headers.set('x-robots-tag', 'noindex, nofollow');
|
|
180
|
+
}
|
|
181
|
+
return response;
|
|
108
182
|
}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import type { Variant } from '../db/schema.js';
|
|
2
|
+
/** One requested output. `svg` is produced by the parent from the sanitized original, never by sharp. */
|
|
3
|
+
export interface VariantSpec {
|
|
4
|
+
preset: string;
|
|
5
|
+
size: number;
|
|
6
|
+
format: string;
|
|
7
|
+
quality: number;
|
|
8
|
+
aspectRatio?: number;
|
|
9
|
+
focus?: {
|
|
10
|
+
x: number;
|
|
11
|
+
y: number;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
/** Thrown for request-level failures; HTTP layers map `status` directly to the response. */
|
|
15
|
+
export declare class MediaRequestError extends Error {
|
|
16
|
+
readonly status: number;
|
|
17
|
+
constructor(status: number, message: string);
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Local-disk layout under `root` (default `<dirname(SANDCMS_DATABASE)>/media`):
|
|
21
|
+
* originals/{id}
|
|
22
|
+
* variants/{id}/{version}/{preset}-{size}.{format} (variant key = `{id}/{version}/{preset}-{size}.{format}`)
|
|
23
|
+
* tmp/{id}/{attempt}/{index} (upload chunks)
|
|
24
|
+
* tmp/{id}/work/… (processor scratch, master images, staged variants)
|
|
25
|
+
* Every write is temp file → fsync → rename → fsync(dir). Nothing is reported as stored before that completes.
|
|
26
|
+
*/
|
|
27
|
+
export interface MediaStorage {
|
|
28
|
+
readonly root: string;
|
|
29
|
+
/**
|
|
30
|
+
* Stream one upload chunk to tmp/{id}/{attempt}/{index}, replacing an earlier copy. Throws if more than `maxBytes`
|
|
31
|
+
* arrive, or (with `exact`) fewer; a rejected chunk is never stored. Returns bytes written.
|
|
32
|
+
*/
|
|
33
|
+
writeChunk(id: string, attempt: string, index: number, body: ReadableStream<Uint8Array>, maxBytes: number, exact?: boolean): Promise<number>;
|
|
34
|
+
/** Indexes of chunks already stored for this attempt (for resume). */
|
|
35
|
+
listChunks(id: string, attempt: string): Promise<number[]>;
|
|
36
|
+
/** Concatenate chunks 0..n-1 into one staged file; throws unless the total equals `totalBytes`. Returns the staged path. */
|
|
37
|
+
assemble(id: string, attempt: string, totalBytes: number): Promise<string>;
|
|
38
|
+
/** Move a staged file to originals/{id}. Fails (throws) if an original already exists. */
|
|
39
|
+
promoteOriginal(id: string, stagedPath: string): Promise<void>;
|
|
40
|
+
/** Absolute path of the original, or null when missing. */
|
|
41
|
+
originalPath(id: string): string | null;
|
|
42
|
+
/** Scratch directory for processing this asset (created on demand, removed by removeWork). */
|
|
43
|
+
workDir(id: string): Promise<string>;
|
|
44
|
+
removeWork(id: string): Promise<void>;
|
|
45
|
+
/** Durably move a finished temp file into variants/{key}. Returns the strong ETag value (without quotes). */
|
|
46
|
+
writeVariant(key: string, tmpPath: string): Promise<{
|
|
47
|
+
etag: string;
|
|
48
|
+
bytes: number;
|
|
49
|
+
}>;
|
|
50
|
+
/** Absolute path of a stored variant, or null when missing. */
|
|
51
|
+
variantPath(key: string): string | null;
|
|
52
|
+
/** Remove the original, all variants and all tmp data for an asset. Idempotent. */
|
|
53
|
+
removeAsset(id: string): Promise<void>;
|
|
54
|
+
/** Remove tmp/{id}/{attempt} chunk data. Idempotent. */
|
|
55
|
+
removeUpload(id: string, attempt: string): Promise<void>;
|
|
56
|
+
/** Delete tmp entries older than `olderThan`. Returns the number removed. */
|
|
57
|
+
sweepTmp(olderThan: Date): Promise<number>;
|
|
58
|
+
/** Bytes used by originals + variants, and free bytes on the filesystem holding `root`. */
|
|
59
|
+
usage(): Promise<{
|
|
60
|
+
bytes: number;
|
|
61
|
+
free: number;
|
|
62
|
+
}>;
|
|
63
|
+
}
|
|
64
|
+
export interface InspectResult {
|
|
65
|
+
/** Orientation-corrected dimensions. */
|
|
66
|
+
width: number;
|
|
67
|
+
height: number;
|
|
68
|
+
}
|
|
69
|
+
export type RenderedVariant = Omit<Variant, 'etag'>;
|
|
70
|
+
/** One result per spec, reported as soon as it is written. `tmpPath` is a finished file inside the asset's workDir. */
|
|
71
|
+
export type RenderReport = {
|
|
72
|
+
index: number;
|
|
73
|
+
tmpPath: string;
|
|
74
|
+
variant: RenderedVariant;
|
|
75
|
+
} | {
|
|
76
|
+
index: number;
|
|
77
|
+
error: string;
|
|
78
|
+
};
|
|
79
|
+
export interface MediaProcessor {
|
|
80
|
+
/**
|
|
81
|
+
* Validate and measure a raster original. Rejects (MediaRequestError 415/413) when the decoded format does
|
|
82
|
+
* not match `mime`, the loader is not allowed, or the area exceeds `maxPixels`.
|
|
83
|
+
*/
|
|
84
|
+
inspect(path: string, mime: string, maxPixels: number): Promise<InspectResult>;
|
|
85
|
+
/**
|
|
86
|
+
* Decode `sourcePath` once and render every spec sequentially into `workDir`. `onReport` is awaited for each
|
|
87
|
+
* result before the next spec starts (the parent commits the file and extends the job lease there).
|
|
88
|
+
* Resolves when all specs are reported; rejects only if the child process dies or times out, in which case
|
|
89
|
+
* unreported specs count as failed attempts.
|
|
90
|
+
*/
|
|
91
|
+
render(input: {
|
|
92
|
+
id: string;
|
|
93
|
+
version: string;
|
|
94
|
+
sourcePath: string;
|
|
95
|
+
mime: string;
|
|
96
|
+
maxPixels: number;
|
|
97
|
+
workDir: string;
|
|
98
|
+
specs: VariantSpec[];
|
|
99
|
+
}, onReport: (report: RenderReport) => Promise<void>): Promise<void>;
|
|
100
|
+
close(): void;
|
|
101
|
+
}
|
|
102
|
+
/** Upload initiation response, returned to browsers and API clients. */
|
|
103
|
+
export interface UploadTicketResponse {
|
|
104
|
+
id: string;
|
|
105
|
+
/** Absolute URL of the chunk endpoint: PUT `${url}?index=N`, GET `${url}` lists stored chunks. */
|
|
106
|
+
url: string;
|
|
107
|
+
chunkSize: number;
|
|
108
|
+
/** Headers every chunk request must send (contains the signed ticket). */
|
|
109
|
+
headers: Record<string, string>;
|
|
110
|
+
expiresAt: number;
|
|
111
|
+
}
|
|
112
|
+
export declare const UPLOAD_CHUNK_SIZE: number;
|
|
113
|
+
export declare const UPLOAD_TICKET_HEADER = "x-sandcms-upload";
|
|
114
|
+
/** Lease name for the single per-site media processor (leases table). */
|
|
115
|
+
export declare const PROCESSOR_LEASE = "media-processor";
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Thrown for request-level failures; HTTP layers map `status` directly to the response. */
|
|
2
|
+
export class MediaRequestError extends Error {
|
|
3
|
+
status;
|
|
4
|
+
constructor(status, message) {
|
|
5
|
+
super(message);
|
|
6
|
+
this.status = status;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
export const UPLOAD_CHUNK_SIZE = 8 * 1024 * 1024;
|
|
10
|
+
export const UPLOAD_TICKET_HEADER = 'x-sandcms-upload';
|
|
11
|
+
/** Lease name for the single per-site media processor (leases table). */
|
|
12
|
+
export const PROCESSOR_LEASE = 'media-processor';
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import type { Store } from '../db/store.js';
|
|
2
|
-
|
|
2
|
+
import type { MediaStorage } from './contracts.js';
|
|
3
|
+
export declare function createDeletionRunner(store: Store, storage: MediaStorage): (id?: string) => Promise<boolean>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { and, eq, gt, lte, notExists } from 'drizzle-orm';
|
|
2
2
|
import { jobs, media, mediaDeletions, uploads, uploadSessions } from '../db/schema.js';
|
|
3
|
-
export function createDeletionRunner(store,
|
|
3
|
+
export function createDeletionRunner(store, storage) {
|
|
4
4
|
const { db } = store;
|
|
5
5
|
return async (id) => {
|
|
6
6
|
const now = Date.now();
|
|
@@ -9,7 +9,7 @@ export function createDeletionRunner(store, worker) {
|
|
|
9
9
|
.select()
|
|
10
10
|
.from(mediaDeletions)
|
|
11
11
|
.where(and(id === undefined ? undefined : eq(mediaDeletions.mediaId, id), lte(mediaDeletions.nextAttempt, now), lte(mediaDeletions.leaseUntil, now),
|
|
12
|
-
// A
|
|
12
|
+
// A write already in progress must finish before its objects are removed.
|
|
13
13
|
notExists(db
|
|
14
14
|
.select()
|
|
15
15
|
.from(jobs)
|
|
@@ -32,7 +32,7 @@ export function createDeletionRunner(store, worker) {
|
|
|
32
32
|
if (!deletion)
|
|
33
33
|
return false;
|
|
34
34
|
try {
|
|
35
|
-
await
|
|
35
|
+
await storage.removeAsset(deletion.mediaId);
|
|
36
36
|
// Cascades remove the queue entry and processing records only after storage succeeds.
|
|
37
37
|
db.delete(media)
|
|
38
38
|
.where(and(eq(media.id, deletion.mediaId), eq(media.status, 'deleting')))
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { variantKeyPattern } from './storage.js';
|
|
1
2
|
// Both routes are intercepted by cmsHandle, so integrations need no extra route files.
|
|
2
3
|
export async function mediaDelivery(cms, event, preview) {
|
|
4
|
+
// Service responses are built locally (Bun.file bodies with Content-Length), so headers are adjusted in place.
|
|
3
5
|
const finish = (response) => {
|
|
4
|
-
const headers =
|
|
6
|
+
const { headers } = response;
|
|
5
7
|
// Only authorized public representations (including revalidation) may be cached.
|
|
6
8
|
const cacheable = !preview && (response.status === 200 || response.status === 304);
|
|
7
9
|
headers.set('Cache-Control', cacheable ? 'public, max-age=86400, s-maxage=2592000' : 'private, no-store');
|
|
@@ -14,14 +16,9 @@ export async function mediaDelivery(cms, event, preview) {
|
|
|
14
16
|
headers.set('X-Robots-Tag', 'noindex, nofollow');
|
|
15
17
|
headers.delete('ETag');
|
|
16
18
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
headers
|
|
20
|
-
headers.delete('Transfer-Encoding');
|
|
21
|
-
return new Response(event.request.method === 'HEAD' ? null : response.body, {
|
|
22
|
-
status: response.status,
|
|
23
|
-
headers
|
|
24
|
-
});
|
|
19
|
+
if (event.request.method !== 'HEAD' || response.body === null)
|
|
20
|
+
return response;
|
|
21
|
+
return new Response(null, { status: response.status, headers });
|
|
25
22
|
};
|
|
26
23
|
const method = event.request.method;
|
|
27
24
|
if (method !== 'GET' && method !== 'HEAD')
|
|
@@ -35,8 +32,7 @@ export async function mediaDelivery(cms, event, preview) {
|
|
|
35
32
|
}
|
|
36
33
|
const prefix = preview ? '/api/cms/media/' : '/_sandcms/media/';
|
|
37
34
|
const key = event.url.pathname.slice(prefix.length);
|
|
38
|
-
if (event.url.search ||
|
|
39
|
-
!/^([a-f0-9-]{36})\/([a-f0-9]{16})\/([a-z][a-z0-9_-]*)-(\d+)\.(webp|avif|jpeg|svg)$/.test(key))
|
|
35
|
+
if (event.url.search || !variantKeyPattern.test(key))
|
|
40
36
|
return finish(new Response('Not found', { status: 404 }));
|
|
41
37
|
return finish(await cms.media.deliver(key, method, preview, preview ? null : event.request.headers.get('if-none-match')));
|
|
42
38
|
}
|