sandcms 0.6.3 → 0.7.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.
Files changed (124) hide show
  1. package/README.md +14 -10
  2. package/dist/admin/Account.svelte +2 -0
  3. package/dist/admin/Admin.svelte +14 -1
  4. package/dist/admin/AssetAttachment.svelte +1 -3
  5. package/dist/admin/AssetAttachment.svelte.d.ts +0 -1
  6. package/dist/admin/BlueprintFields.svelte +0 -3
  7. package/dist/admin/BlueprintFields.svelte.d.ts +0 -1
  8. package/dist/admin/Editor.svelte +0 -1
  9. package/dist/admin/Fields.svelte +0 -7
  10. package/dist/admin/Fields.svelte.d.ts +0 -1
  11. package/dist/admin/Gallery.svelte +2 -6
  12. package/dist/admin/Gallery.svelte.d.ts +0 -1
  13. package/dist/admin/LinkField.svelte +0 -3
  14. package/dist/admin/LinkField.svelte.d.ts +0 -1
  15. package/dist/admin/MediaLibrary.svelte +10 -7
  16. package/dist/admin/MediaPicker.svelte +7 -15
  17. package/dist/admin/MediaPicker.svelte.d.ts +0 -1
  18. package/dist/admin/ThemePicker.svelte +72 -0
  19. package/dist/admin/ThemePicker.svelte.d.ts +18 -0
  20. package/dist/admin/UploadButton.svelte +2 -1
  21. package/dist/admin/UploadProgress.svelte +24 -0
  22. package/dist/admin/UploadProgress.svelte.d.ts +7 -0
  23. package/dist/admin/client.d.ts +3 -670
  24. package/dist/admin/client.js +2 -1
  25. package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
  26. package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
  27. package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
  28. package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
  29. package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
  30. package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
  31. package/dist/admin/generated/admin.css +529 -101
  32. package/dist/admin/theme-context.d.ts +7 -0
  33. package/dist/admin/theme-context.js +3 -0
  34. package/dist/admin/theme.d.ts +7 -0
  35. package/dist/admin/theme.js +14 -0
  36. package/dist/admin/types.d.ts +2 -1
  37. package/dist/admin/uploads.d.ts +8 -1
  38. package/dist/admin/uploads.js +94 -16
  39. package/dist/blueprints/files.js +1 -0
  40. package/dist/blueprints/load.js +7 -2
  41. package/dist/blueprints/types.d.ts +4 -1
  42. package/dist/cli/doctor.d.ts +3 -1
  43. package/dist/cli/doctor.js +85 -30
  44. package/dist/cli/files.d.ts +2 -6
  45. package/dist/cli/files.js +11 -2
  46. package/dist/cli/index.js +99 -31
  47. package/dist/cli/scaffold.js +8 -8
  48. package/dist/cli/setup.js +16 -26
  49. package/dist/cli/upgrade.js +21 -2
  50. package/dist/env.d.ts +32 -0
  51. package/dist/env.js +53 -3
  52. package/dist/server/admin-load.d.ts +13 -5
  53. package/dist/server/admin-load.js +6 -1
  54. package/dist/server/api-access.d.ts +4 -0
  55. package/dist/server/api-access.js +15 -2
  56. package/dist/server/api-pagination.d.ts +3 -0
  57. package/dist/server/api.js +5 -2
  58. package/dist/server/auth.d.ts +10 -9
  59. package/dist/server/cms.d.ts +65 -18
  60. package/dist/server/cms.js +62 -6
  61. package/dist/server/db/migration-data.js +4 -0
  62. package/dist/server/db/migrations/0009_local_media.sql +9 -0
  63. package/dist/server/db/migrations/meta/0009_snapshot.json +1763 -0
  64. package/dist/server/db/migrations/meta/_journal.json +7 -0
  65. package/dist/server/db/schema.d.ts +119 -2
  66. package/dist/server/db/schema.js +15 -3
  67. package/dist/server/hooks.js +155 -81
  68. package/dist/server/media/contracts.d.ts +115 -0
  69. package/dist/server/media/contracts.js +12 -0
  70. package/dist/server/media/deletions.d.ts +2 -1
  71. package/dist/server/media/deletions.js +3 -3
  72. package/dist/server/media/delivery.js +7 -11
  73. package/dist/server/media/import-r2.d.ts +56 -0
  74. package/dist/server/media/import-r2.js +342 -0
  75. package/dist/server/media/processor-child.d.ts +2 -0
  76. package/dist/server/media/processor-child.js +236 -0
  77. package/dist/server/media/processor.d.ts +51 -0
  78. package/dist/server/media/processor.js +135 -0
  79. package/dist/server/media/render-math.d.ts +24 -0
  80. package/dist/server/media/render-math.js +50 -0
  81. package/dist/server/media/runner.d.ts +30 -1
  82. package/dist/server/media/runner.js +418 -165
  83. package/dist/server/media/service.d.ts +56 -10
  84. package/dist/server/media/service.js +309 -98
  85. package/dist/server/media/storage.d.ts +5 -0
  86. package/dist/server/media/storage.js +279 -0
  87. package/dist/server/media/svg.d.ts +5 -0
  88. package/dist/server/media/svg.js +142 -0
  89. package/dist/server/media/upload-ticket.d.ts +12 -0
  90. package/dist/server/media/upload-ticket.js +35 -0
  91. package/dist/server/media/verify.d.ts +36 -0
  92. package/dist/server/media/verify.js +109 -0
  93. package/dist/server/platform/http.d.ts +27 -0
  94. package/dist/server/platform/http.js +77 -0
  95. package/dist/server/platform/index.d.ts +52 -0
  96. package/dist/server/platform/index.js +98 -0
  97. package/dist/server/platform/snapshots.d.ts +18 -0
  98. package/dist/server/platform/snapshots.js +110 -0
  99. package/dist/server/platform/volume.d.ts +20 -0
  100. package/dist/server/platform/volume.js +60 -0
  101. package/dist/worker/svg.d.ts +1 -5
  102. package/dist/worker/svg.js +2 -142
  103. package/docs/acceptance.md +6 -4
  104. package/docs/api.md +41 -3
  105. package/docs/cloudflare.md +48 -142
  106. package/docs/content.md +2 -2
  107. package/docs/deployment.md +159 -57
  108. package/docs/forms.md +1 -1
  109. package/docs/media.md +85 -21
  110. package/docs/package.md +21 -18
  111. package/docs/plans/0.7-self-hosted.md +264 -0
  112. package/docs/releases.md +17 -1
  113. package/docs/upgrades.md +35 -6
  114. package/package.json +36 -37
  115. package/templates/Dockerfile +28 -0
  116. package/templates/integration.ts +18 -2
  117. package/templates/railpack.json +1 -1
  118. package/templates/sandcms/blueprints/files/image.yaml +1 -1
  119. package/templates/sandcms/config.yaml +0 -1
  120. package/dist/cli/cloudflare.d.ts +0 -8
  121. package/dist/cli/cloudflare.js +0 -135
  122. package/templates/sandcms/worker/index.ts +0 -1
  123. package/templates/sandcms/worker/local.ts +0 -1
  124. package/templates/sandcms/worker/wrangler.jsonc +0 -6
@@ -64,6 +64,13 @@
64
64
  "when": 1791407294932,
65
65
  "tag": "0008_search_text_cache",
66
66
  "breakpoints": true
67
+ },
68
+ {
69
+ "idx": 9,
70
+ "version": "6",
71
+ "when": 1794886948774,
72
+ "tag": "0009_local_media",
73
+ "breakpoints": true
67
74
  }
68
75
  ]
69
76
  }
@@ -1670,6 +1670,8 @@ export interface Variant {
1670
1670
  width: number;
1671
1671
  height: number;
1672
1672
  format: string;
1673
+ /** Strong validator for local delivery (short sha256 of the bytes); absent on legacy rows. */
1674
+ etag?: string;
1673
1675
  }
1674
1676
  export declare const media: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
1675
1677
  name: "media";
@@ -1918,6 +1920,59 @@ export declare const media: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
1918
1920
  }, {}, {
1919
1921
  length: undefined;
1920
1922
  }>;
1923
+ width: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1924
+ name: "width";
1925
+ tableName: "media";
1926
+ dataType: "number";
1927
+ columnType: "SQLiteInteger";
1928
+ data: number;
1929
+ driverParam: number;
1930
+ notNull: false;
1931
+ hasDefault: false;
1932
+ isPrimaryKey: false;
1933
+ isAutoincrement: false;
1934
+ hasRuntimeDefault: false;
1935
+ enumValues: undefined;
1936
+ baseColumn: never;
1937
+ identity: undefined;
1938
+ generated: undefined;
1939
+ }, {}, {}>;
1940
+ height: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1941
+ name: "height";
1942
+ tableName: "media";
1943
+ dataType: "number";
1944
+ columnType: "SQLiteInteger";
1945
+ data: number;
1946
+ driverParam: number;
1947
+ notNull: false;
1948
+ hasDefault: false;
1949
+ isPrimaryKey: false;
1950
+ isAutoincrement: false;
1951
+ hasRuntimeDefault: false;
1952
+ enumValues: undefined;
1953
+ baseColumn: never;
1954
+ identity: undefined;
1955
+ generated: undefined;
1956
+ }, {}, {}>;
1957
+ uploadAttempt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
1958
+ name: "uploadAttempt";
1959
+ tableName: "media";
1960
+ dataType: "string";
1961
+ columnType: "SQLiteText";
1962
+ data: string;
1963
+ driverParam: string;
1964
+ notNull: false;
1965
+ hasDefault: false;
1966
+ isPrimaryKey: false;
1967
+ isAutoincrement: false;
1968
+ hasRuntimeDefault: false;
1969
+ enumValues: [string, ...string[]];
1970
+ baseColumn: never;
1971
+ identity: undefined;
1972
+ generated: undefined;
1973
+ }, {}, {
1974
+ length: undefined;
1975
+ }>;
1921
1976
  };
1922
1977
  dialect: "sqlite";
1923
1978
  }>;
@@ -2843,14 +2898,14 @@ export declare const uploadSessions: import("drizzle-orm/sqlite-core").SQLiteTab
2843
2898
  tableName: "upload_sessions";
2844
2899
  dataType: "string";
2845
2900
  columnType: "SQLiteText";
2846
- data: "pending" | "uploading" | "expired";
2901
+ data: "pending" | "uploading" | "receiving" | "expired";
2847
2902
  driverParam: string;
2848
2903
  notNull: true;
2849
2904
  hasDefault: true;
2850
2905
  isPrimaryKey: false;
2851
2906
  isAutoincrement: false;
2852
2907
  hasRuntimeDefault: false;
2853
- enumValues: ["uploading", "pending", "expired"];
2908
+ enumValues: ["uploading", "receiving", "pending", "expired"];
2854
2909
  baseColumn: never;
2855
2910
  identity: undefined;
2856
2911
  generated: undefined;
@@ -3033,3 +3088,65 @@ export declare const mediaDocumentLinks: import("drizzle-orm/sqlite-core").SQLit
3033
3088
  };
3034
3089
  dialect: "sqlite";
3035
3090
  }>;
3091
+ export declare const leases: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
3092
+ name: "leases";
3093
+ schema: undefined;
3094
+ columns: {
3095
+ name: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3096
+ name: "name";
3097
+ tableName: "leases";
3098
+ dataType: "string";
3099
+ columnType: "SQLiteText";
3100
+ data: string;
3101
+ driverParam: string;
3102
+ notNull: true;
3103
+ hasDefault: false;
3104
+ isPrimaryKey: true;
3105
+ isAutoincrement: false;
3106
+ hasRuntimeDefault: false;
3107
+ enumValues: [string, ...string[]];
3108
+ baseColumn: never;
3109
+ identity: undefined;
3110
+ generated: undefined;
3111
+ }, {}, {
3112
+ length: undefined;
3113
+ }>;
3114
+ owner: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3115
+ name: "owner";
3116
+ tableName: "leases";
3117
+ dataType: "string";
3118
+ columnType: "SQLiteText";
3119
+ data: string;
3120
+ driverParam: string;
3121
+ notNull: true;
3122
+ hasDefault: false;
3123
+ isPrimaryKey: false;
3124
+ isAutoincrement: false;
3125
+ hasRuntimeDefault: false;
3126
+ enumValues: [string, ...string[]];
3127
+ baseColumn: never;
3128
+ identity: undefined;
3129
+ generated: undefined;
3130
+ }, {}, {
3131
+ length: undefined;
3132
+ }>;
3133
+ leaseUntil: import("drizzle-orm/sqlite-core").SQLiteColumn<{
3134
+ name: "leaseUntil";
3135
+ tableName: "leases";
3136
+ dataType: "number";
3137
+ columnType: "SQLiteInteger";
3138
+ data: number;
3139
+ driverParam: number;
3140
+ notNull: true;
3141
+ hasDefault: false;
3142
+ isPrimaryKey: false;
3143
+ isAutoincrement: false;
3144
+ hasRuntimeDefault: false;
3145
+ enumValues: undefined;
3146
+ baseColumn: never;
3147
+ identity: undefined;
3148
+ generated: undefined;
3149
+ }, {}, {}>;
3150
+ };
3151
+ dialect: "sqlite";
3152
+ }>;
@@ -150,7 +150,12 @@ export const media = sqliteTable('media', {
150
150
  error: text(),
151
151
  createdAt: integer().notNull(),
152
152
  // Normalized search text cache; NULL means stale or not yet computed. Maintained by triggers.
153
- searchText: text()
153
+ searchText: text(),
154
+ // Oriented original dimensions, recorded when the original is stored locally (0.7.0+).
155
+ width: integer(),
156
+ height: integer(),
157
+ // Upload attempt that produced the stored original; guards against a replaced original.
158
+ uploadAttempt: text()
154
159
  }, (t) => [index('media_api_page').on(t.createdAt, t.id)]);
155
160
  export const jobs = sqliteTable('jobs', {
156
161
  id: text().primaryKey(),
@@ -225,14 +230,15 @@ export const formNotifications = sqliteTable('form_notifications', {
225
230
  formId: text().primaryKey(),
226
231
  settings: text({ mode: 'json' }).$type().notNull()
227
232
  });
228
- // Metadata only: browser transfers go directly to private R2 staging.
233
+ // Metadata only: chunk bytes are staged on disk under media/tmp/{mediaId}/{attempt}.
234
+ // 'receiving' means at least one chunk arrived; its lease is extended by every chunk.
229
235
  export const uploadSessions = sqliteTable('upload_sessions', {
230
236
  mediaId: text()
231
237
  .primaryKey()
232
238
  .references(() => media.id, { onDelete: 'cascade' }),
233
239
  attempt: text().notNull(),
234
240
  expiresAt: integer().notNull(),
235
- status: text({ enum: ['uploading', 'pending', 'expired'] })
241
+ status: text({ enum: ['uploading', 'receiving', 'pending', 'expired'] })
236
242
  .notNull()
237
243
  .default('uploading'),
238
244
  attempts: integer().notNull().default(0),
@@ -259,3 +265,9 @@ export const mediaDocumentLinks = sqliteTable('media_document_links', {
259
265
  primaryKey({ columns: [t.mediaId, t.documentId] }),
260
266
  index('media_document_link_document').on(t.documentId)
261
267
  ]);
268
+ // Named exclusive leases shared by the server and CLI processes (e.g. the single media processor).
269
+ export const leases = sqliteTable('leases', {
270
+ name: text().primaryKey(),
271
+ owner: text().notNull(),
272
+ leaseUntil: integer().notNull()
273
+ });
@@ -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(), path = event.url.pathname, isCms = path === '/admin' || path.startsWith('/admin/') || path.startsWith('/api/cms/');
27
- if (isCms &&
28
- !['GET', 'HEAD', 'OPTIONS'].includes(event.request.method) &&
29
- event.request.headers.get('origin') !== cms.options.origin &&
30
- !(event.request.headers.has('x-api-key') &&
31
- path.startsWith('/api/cms/') &&
32
- apiKeyRoute(path.slice('/api/cms/'.length), event.request.method)))
33
- error(403, 'Invalid request origin');
34
- if (isCms &&
35
- event.request.headers.has('x-api-key') &&
36
- !(path.startsWith('/api/cms/') &&
37
- apiKeyRoute(path.slice('/api/cms/'.length), event.request.method)))
38
- error(403, 'API keys can only access content and media');
39
- if (cms.seo && (path === '/robots.txt' || path === '/sitemap.xml')) {
40
- if (!['GET', 'HEAD'].includes(event.request.method))
41
- return new Response(null, { status: 405, headers: { allow: 'GET, HEAD' } });
42
- const robots = path === '/robots.txt';
43
- return new Response(event.request.method === 'HEAD' ? null : robots ? cms.seo.robots() : cms.seo.sitemap(), {
44
- headers: {
45
- 'content-type': robots ? 'text/plain; charset=utf-8' : 'application/xml; charset=utf-8',
46
- 'cache-control': 'no-store'
47
- }
48
- });
49
- }
50
- if (path.startsWith('/_sandcms/media/'))
51
- return mediaDelivery(cms, event, false);
52
- if (path.startsWith('/api/cms/media/') &&
53
- path !== '/api/cms/media/list' &&
54
- ['GET', 'HEAD'].includes(event.request.method))
55
- return mediaDelivery(cms, event, true);
56
- if (path.startsWith('/api/cms/auth/')) {
57
- const endpoint = path.slice('/api/cms/auth'.length);
58
- if (!authPaths.has(endpoint))
59
- error(404, 'Not found');
60
- if (endpoint === '/sign-in/email') {
61
- const body = await boundedJson(event.request.clone(), 8192);
62
- const email = typeof body.email === 'string' ? body.email.toLowerCase() : '';
63
- const client = clientAddress(event, cms.options.trustedProxyHeader);
64
- try {
65
- rateLimit(cms.store, 'login-ip:' + createHash('sha256').update(client).digest('hex'), 40);
66
- rateLimit(cms.store, 'login-email:' + createHash('sha256').update(email).digest('hex'), 8);
67
- }
68
- catch {
69
- error(429, 'Too many login attempts. Try again in a minute.');
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
- export declare function createDeletionRunner(store: Store, worker: (path: string, init?: RequestInit) => Promise<Response>): (id?: string) => Promise<boolean>;
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, worker) {
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 remote write already in progress must finish before its objects are removed.
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 worker('assets/' + deletion.mediaId, { method: 'DELETE' });
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')))