sandcms 0.6.2 → 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 (260) hide show
  1. package/README.md +14 -10
  2. package/dist/admin/Account.svelte +286 -83
  3. package/dist/admin/Admin.svelte +14 -1
  4. package/dist/admin/ApiKeys.svelte +146 -79
  5. package/dist/admin/AssetAttachment.svelte +10 -12
  6. package/dist/admin/AssetAttachment.svelte.d.ts +0 -1
  7. package/dist/admin/BlueprintFields.svelte +20 -5
  8. package/dist/admin/BlueprintFields.svelte.d.ts +2 -1
  9. package/dist/admin/Collection.svelte +111 -54
  10. package/dist/admin/Dashboard.svelte +3 -37
  11. package/dist/admin/DateField.svelte +75 -0
  12. package/dist/admin/DateField.svelte.d.ts +11 -0
  13. package/dist/admin/Editor.svelte +70 -65
  14. package/dist/admin/Fields.svelte +24 -23
  15. package/dist/admin/Fields.svelte.d.ts +0 -1
  16. package/dist/admin/FocusPicker.svelte +1 -2
  17. package/dist/admin/Gallery.svelte +2 -7
  18. package/dist/admin/Gallery.svelte.d.ts +0 -1
  19. package/dist/admin/GlobalSearch.svelte +54 -26
  20. package/dist/admin/HoverHint.svelte +37 -0
  21. package/dist/admin/HoverHint.svelte.d.ts +8 -0
  22. package/dist/admin/Inbox.svelte +6 -11
  23. package/dist/admin/LinkField.svelte +128 -66
  24. package/dist/admin/LinkField.svelte.d.ts +0 -1
  25. package/dist/admin/Login.svelte +0 -1
  26. package/dist/admin/MediaLibrary.svelte +70 -56
  27. package/dist/admin/MediaPicker.svelte +62 -55
  28. package/dist/admin/MediaPicker.svelte.d.ts +0 -1
  29. package/dist/admin/NotificationSettings.svelte +35 -27
  30. package/dist/admin/RichText.svelte +2 -2
  31. package/dist/admin/RowMenu.svelte +28 -0
  32. package/dist/admin/RowMenu.svelte.d.ts +10 -0
  33. package/dist/admin/SearchList.svelte +51 -14
  34. package/dist/admin/Shell.svelte +64 -29
  35. package/dist/admin/ThemePicker.svelte +72 -0
  36. package/dist/admin/ThemePicker.svelte.d.ts +18 -0
  37. package/dist/admin/UploadButton.svelte +2 -1
  38. package/dist/admin/UploadProgress.svelte +24 -0
  39. package/dist/admin/UploadProgress.svelte.d.ts +7 -0
  40. package/dist/admin/Users.svelte +106 -50
  41. package/dist/admin/client.d.ts +5 -670
  42. package/dist/admin/client.js +20 -1
  43. package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
  44. package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
  45. package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
  46. package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
  47. package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
  48. package/dist/admin/components/ui/calendar/calendar-caption.svelte +76 -0
  49. package/dist/admin/components/ui/calendar/calendar-caption.svelte.d.ts +19 -0
  50. package/dist/admin/components/ui/calendar/calendar-cell.svelte +19 -0
  51. package/dist/admin/components/ui/calendar/calendar-cell.svelte.d.ts +4 -0
  52. package/dist/admin/components/ui/calendar/calendar-day.svelte +33 -0
  53. package/dist/admin/components/ui/calendar/calendar-day.svelte.d.ts +4 -0
  54. package/dist/admin/components/ui/calendar/calendar-grid-body.svelte +12 -0
  55. package/dist/admin/components/ui/calendar/calendar-grid-body.svelte.d.ts +4 -0
  56. package/dist/admin/components/ui/calendar/calendar-grid-head.svelte +12 -0
  57. package/dist/admin/components/ui/calendar/calendar-grid-head.svelte.d.ts +4 -0
  58. package/dist/admin/components/ui/calendar/calendar-grid-row.svelte +12 -0
  59. package/dist/admin/components/ui/calendar/calendar-grid-row.svelte.d.ts +4 -0
  60. package/dist/admin/components/ui/calendar/calendar-grid.svelte +16 -0
  61. package/dist/admin/components/ui/calendar/calendar-grid.svelte.d.ts +4 -0
  62. package/dist/admin/components/ui/calendar/calendar-head-cell.svelte +19 -0
  63. package/dist/admin/components/ui/calendar/calendar-head-cell.svelte.d.ts +4 -0
  64. package/dist/admin/components/ui/calendar/calendar-header.svelte +19 -0
  65. package/dist/admin/components/ui/calendar/calendar-header.svelte.d.ts +4 -0
  66. package/dist/admin/components/ui/calendar/calendar-heading.svelte +16 -0
  67. package/dist/admin/components/ui/calendar/calendar-heading.svelte.d.ts +4 -0
  68. package/dist/admin/components/ui/calendar/calendar-month-select.svelte +48 -0
  69. package/dist/admin/components/ui/calendar/calendar-month-select.svelte.d.ts +4 -0
  70. package/dist/admin/components/ui/calendar/calendar-month.svelte +15 -0
  71. package/dist/admin/components/ui/calendar/calendar-month.svelte.d.ts +5 -0
  72. package/dist/admin/components/ui/calendar/calendar-months.svelte +19 -0
  73. package/dist/admin/components/ui/calendar/calendar-months.svelte.d.ts +5 -0
  74. package/dist/admin/components/ui/calendar/calendar-nav.svelte +19 -0
  75. package/dist/admin/components/ui/calendar/calendar-nav.svelte.d.ts +5 -0
  76. package/dist/admin/components/ui/calendar/calendar-next-button.svelte +37 -0
  77. package/dist/admin/components/ui/calendar/calendar-next-button.svelte.d.ts +8 -0
  78. package/dist/admin/components/ui/calendar/calendar-prev-button.svelte +37 -0
  79. package/dist/admin/components/ui/calendar/calendar-prev-button.svelte.d.ts +8 -0
  80. package/dist/admin/components/ui/calendar/calendar-year-select.svelte +47 -0
  81. package/dist/admin/components/ui/calendar/calendar-year-select.svelte.d.ts +4 -0
  82. package/dist/admin/components/ui/calendar/calendar.svelte +115 -0
  83. package/dist/admin/components/ui/calendar/calendar.svelte.d.ts +21 -0
  84. package/dist/admin/components/ui/calendar/index.d.ts +19 -0
  85. package/dist/admin/components/ui/calendar/index.js +21 -0
  86. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-group.svelte +16 -0
  87. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-group.svelte.d.ts +4 -0
  88. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte +46 -0
  89. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte.d.ts +9 -0
  90. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-content.svelte +31 -0
  91. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-content.svelte.d.ts +10 -0
  92. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte +22 -0
  93. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte.d.ts +8 -0
  94. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group.svelte +7 -0
  95. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group.svelte.d.ts +4 -0
  96. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-item.svelte +27 -0
  97. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-item.svelte.d.ts +8 -0
  98. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-label.svelte +24 -0
  99. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-label.svelte.d.ts +8 -0
  100. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-portal.svelte +7 -0
  101. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-portal.svelte.d.ts +3 -0
  102. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-group.svelte +16 -0
  103. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-group.svelte.d.ts +4 -0
  104. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte +36 -0
  105. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte.d.ts +4 -0
  106. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-separator.svelte +17 -0
  107. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-separator.svelte.d.ts +4 -0
  108. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte +23 -0
  109. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte.d.ts +5 -0
  110. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte +31 -0
  111. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte.d.ts +10 -0
  112. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte +29 -0
  113. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte.d.ts +7 -0
  114. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub.svelte +7 -0
  115. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub.svelte.d.ts +3 -0
  116. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-trigger.svelte +7 -0
  117. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-trigger.svelte.d.ts +4 -0
  118. package/dist/admin/components/ui/dropdown-menu/dropdown-menu.svelte +7 -0
  119. package/dist/admin/components/ui/dropdown-menu/dropdown-menu.svelte.d.ts +3 -0
  120. package/dist/admin/components/ui/dropdown-menu/index.d.ts +18 -0
  121. package/dist/admin/components/ui/dropdown-menu/index.js +18 -0
  122. package/dist/admin/components/ui/input-otp/index.d.ts +5 -0
  123. package/dist/admin/components/ui/input-otp/index.js +5 -0
  124. package/dist/admin/components/ui/input-otp/input-otp-group.svelte +23 -0
  125. package/dist/admin/components/ui/input-otp/input-otp-group.svelte.d.ts +5 -0
  126. package/dist/admin/components/ui/input-otp/input-otp-separator.svelte +27 -0
  127. package/dist/admin/components/ui/input-otp/input-otp-separator.svelte.d.ts +5 -0
  128. package/dist/admin/components/ui/input-otp/input-otp-slot.svelte +29 -0
  129. package/dist/admin/components/ui/input-otp/input-otp-slot.svelte.d.ts +4 -0
  130. package/dist/admin/components/ui/input-otp/input-otp.svelte +24 -0
  131. package/dist/admin/components/ui/input-otp/input-otp.svelte.d.ts +4 -0
  132. package/dist/admin/components/ui/popover/index.d.ts +9 -0
  133. package/dist/admin/components/ui/popover/index.js +11 -0
  134. package/dist/admin/components/ui/popover/popover-close.svelte +7 -0
  135. package/dist/admin/components/ui/popover/popover-close.svelte.d.ts +4 -0
  136. package/dist/admin/components/ui/popover/popover-content.svelte +31 -0
  137. package/dist/admin/components/ui/popover/popover-content.svelte.d.ts +10 -0
  138. package/dist/admin/components/ui/popover/popover-description.svelte +20 -0
  139. package/dist/admin/components/ui/popover/popover-description.svelte.d.ts +5 -0
  140. package/dist/admin/components/ui/popover/popover-header.svelte +20 -0
  141. package/dist/admin/components/ui/popover/popover-header.svelte.d.ts +5 -0
  142. package/dist/admin/components/ui/popover/popover-portal.svelte +7 -0
  143. package/dist/admin/components/ui/popover/popover-portal.svelte.d.ts +3 -0
  144. package/dist/admin/components/ui/popover/popover-title.svelte +20 -0
  145. package/dist/admin/components/ui/popover/popover-title.svelte.d.ts +5 -0
  146. package/dist/admin/components/ui/popover/popover-trigger.svelte +17 -0
  147. package/dist/admin/components/ui/popover/popover-trigger.svelte.d.ts +4 -0
  148. package/dist/admin/components/ui/popover/popover.svelte +7 -0
  149. package/dist/admin/components/ui/popover/popover.svelte.d.ts +3 -0
  150. package/dist/admin/components/ui/switch/switch.svelte +2 -2
  151. package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
  152. package/dist/admin/components/ui/tooltip/index.d.ts +6 -0
  153. package/dist/admin/components/ui/tooltip/index.js +8 -0
  154. package/dist/admin/components/ui/tooltip/tooltip-content.svelte +48 -0
  155. package/dist/admin/components/ui/tooltip/tooltip-content.svelte.d.ts +11 -0
  156. package/dist/admin/components/ui/tooltip/tooltip-portal.svelte +7 -0
  157. package/dist/admin/components/ui/tooltip/tooltip-portal.svelte.d.ts +4 -0
  158. package/dist/admin/components/ui/tooltip/tooltip-provider.svelte +7 -0
  159. package/dist/admin/components/ui/tooltip/tooltip-provider.svelte.d.ts +4 -0
  160. package/dist/admin/components/ui/tooltip/tooltip-trigger.svelte +7 -0
  161. package/dist/admin/components/ui/tooltip/tooltip-trigger.svelte.d.ts +25 -0
  162. package/dist/admin/components/ui/tooltip/tooltip.svelte +7 -0
  163. package/dist/admin/components/ui/tooltip/tooltip.svelte.d.ts +25 -0
  164. package/dist/admin/generated/admin.css +1298 -234
  165. package/dist/admin/slug.d.ts +1 -0
  166. package/dist/admin/slug.js +6 -0
  167. package/dist/admin/theme-context.d.ts +7 -0
  168. package/dist/admin/theme-context.js +3 -0
  169. package/dist/admin/theme.d.ts +7 -0
  170. package/dist/admin/theme.js +14 -0
  171. package/dist/admin/types.d.ts +2 -1
  172. package/dist/admin/uploads.d.ts +8 -1
  173. package/dist/admin/uploads.js +94 -16
  174. package/dist/blueprints/files.js +1 -0
  175. package/dist/blueprints/load.js +7 -2
  176. package/dist/blueprints/types.d.ts +4 -1
  177. package/dist/cli/doctor.d.ts +3 -1
  178. package/dist/cli/doctor.js +85 -30
  179. package/dist/cli/files.d.ts +2 -6
  180. package/dist/cli/files.js +11 -2
  181. package/dist/cli/index.js +99 -31
  182. package/dist/cli/scaffold.js +8 -8
  183. package/dist/cli/setup.js +16 -26
  184. package/dist/cli/upgrade.js +21 -2
  185. package/dist/env.d.ts +32 -0
  186. package/dist/env.js +53 -3
  187. package/dist/server/admin-load.d.ts +13 -5
  188. package/dist/server/admin-load.js +8 -3
  189. package/dist/server/api-access.d.ts +4 -0
  190. package/dist/server/api-access.js +15 -2
  191. package/dist/server/api-pagination.d.ts +3 -0
  192. package/dist/server/api.js +11 -3
  193. package/dist/server/auth.d.ts +11 -9
  194. package/dist/server/auth.js +23 -0
  195. package/dist/server/cms.d.ts +65 -18
  196. package/dist/server/cms.js +62 -6
  197. package/dist/server/db/migration-data.js +4 -0
  198. package/dist/server/db/migrations/0009_local_media.sql +9 -0
  199. package/dist/server/db/migrations/meta/0009_snapshot.json +1763 -0
  200. package/dist/server/db/migrations/meta/_journal.json +7 -0
  201. package/dist/server/db/schema.d.ts +119 -2
  202. package/dist/server/db/schema.js +15 -3
  203. package/dist/server/hooks.js +155 -81
  204. package/dist/server/media/contracts.d.ts +115 -0
  205. package/dist/server/media/contracts.js +12 -0
  206. package/dist/server/media/deletions.d.ts +2 -1
  207. package/dist/server/media/deletions.js +3 -3
  208. package/dist/server/media/delivery.js +7 -11
  209. package/dist/server/media/import-r2.d.ts +56 -0
  210. package/dist/server/media/import-r2.js +342 -0
  211. package/dist/server/media/processor-child.d.ts +2 -0
  212. package/dist/server/media/processor-child.js +236 -0
  213. package/dist/server/media/processor.d.ts +51 -0
  214. package/dist/server/media/processor.js +135 -0
  215. package/dist/server/media/render-math.d.ts +24 -0
  216. package/dist/server/media/render-math.js +50 -0
  217. package/dist/server/media/runner.d.ts +30 -1
  218. package/dist/server/media/runner.js +418 -165
  219. package/dist/server/media/service.d.ts +56 -10
  220. package/dist/server/media/service.js +309 -98
  221. package/dist/server/media/storage.d.ts +5 -0
  222. package/dist/server/media/storage.js +279 -0
  223. package/dist/server/media/svg.d.ts +5 -0
  224. package/dist/server/media/svg.js +142 -0
  225. package/dist/server/media/upload-ticket.d.ts +12 -0
  226. package/dist/server/media/upload-ticket.js +35 -0
  227. package/dist/server/media/verify.d.ts +36 -0
  228. package/dist/server/media/verify.js +109 -0
  229. package/dist/server/platform/http.d.ts +27 -0
  230. package/dist/server/platform/http.js +77 -0
  231. package/dist/server/platform/index.d.ts +52 -0
  232. package/dist/server/platform/index.js +98 -0
  233. package/dist/server/platform/snapshots.d.ts +18 -0
  234. package/dist/server/platform/snapshots.js +110 -0
  235. package/dist/server/platform/volume.d.ts +20 -0
  236. package/dist/server/platform/volume.js +60 -0
  237. package/dist/worker/svg.d.ts +1 -5
  238. package/dist/worker/svg.js +2 -142
  239. package/docs/acceptance.md +6 -4
  240. package/docs/api.md +42 -4
  241. package/docs/cloudflare.md +48 -142
  242. package/docs/content.md +2 -2
  243. package/docs/deployment.md +159 -57
  244. package/docs/forms.md +1 -1
  245. package/docs/media.md +85 -21
  246. package/docs/package.md +21 -18
  247. package/docs/plans/0.7-self-hosted.md +264 -0
  248. package/docs/releases.md +27 -1
  249. package/docs/upgrades.md +44 -6
  250. package/package.json +38 -37
  251. package/templates/Dockerfile +28 -0
  252. package/templates/integration.ts +18 -2
  253. package/templates/railpack.json +1 -1
  254. package/templates/sandcms/blueprints/files/image.yaml +1 -1
  255. package/templates/sandcms/config.yaml +0 -1
  256. package/dist/cli/cloudflare.d.ts +0 -8
  257. package/dist/cli/cloudflare.js +0 -135
  258. package/templates/sandcms/worker/index.ts +0 -1
  259. package/templates/sandcms/worker/local.ts +0 -1
  260. package/templates/sandcms/worker/wrangler.jsonc +0 -6
@@ -1,31 +1,131 @@
1
- import { and, eq, inArray, lte, lt, notExists, or } from 'drizzle-orm';
2
- import { media, mediaDeletions, jobs, uploads, uploadSessions } from '../db/schema.js';
3
- const uploadTimeout = 120_000, jobTimeout = 120_000,
4
- // Covers a typical preset set (sizes x formats plus the editor preview) in one request.
1
+ import { and, eq, gt, inArray, lte, lt, notExists, or } from 'drizzle-orm';
2
+ import { join } from 'node:path';
3
+ import { leases, media, mediaDeletions, jobs, uploads, uploadSessions } from '../db/schema.js';
4
+ import { MediaRequestError, PROCESSOR_LEASE } from './contracts.js';
5
+ import { sanitizeSvg, svgDimensions } from './svg.js';
6
+ const uploadTimeout = 120_000, jobTimeout = 120_000, processorLease = 120_000, heartbeat = 30_000,
7
+ // Covers a typical preset set (sizes x formats plus the editor preview) in one decode.
5
8
  batchSize = 16;
6
- export function createRunner(store, worker, enqueue, deletePending) {
7
- const { db } = store;
9
+ /**
10
+ * Upload sessions that can still write or validate files: they reserve disk space and block an R2 import.
11
+ * Expired, idle-past-expiry and permanently failed sessions are dead rows kept only for their error.
12
+ */
13
+ export const liveUploadSession = (now = Date.now()) => or(and(inArray(uploadSessions.status, ['uploading', 'receiving']), or(gt(uploadSessions.expiresAt, now), gt(uploadSessions.leaseUntil, now))), and(eq(uploadSessions.status, 'pending'), lt(uploadSessions.attempts, 4)));
14
+ /** Legacy BLOB uploads the runner will still try to validate. */
15
+ export const liveLegacyUpload = () => lt(uploads.attempts, 4);
16
+ /** Take or renew a named exclusive lease. Returns false while another owner holds it. */
17
+ export function takeLease(store, name, owner, ttl) {
18
+ const { db } = store, now = Date.now();
19
+ db.insert(leases)
20
+ .values({ name, owner, leaseUntil: now + ttl })
21
+ .onConflictDoUpdate({
22
+ target: leases.name,
23
+ set: { owner, leaseUntil: now + ttl },
24
+ setWhere: or(eq(leases.owner, owner), lte(leases.leaseUntil, now))
25
+ })
26
+ .run();
27
+ return db.select().from(leases).where(eq(leases.name, name)).get()?.owner === owner;
28
+ }
29
+ export function releaseLease(store, name, owner) {
30
+ store.db
31
+ .delete(leases)
32
+ .where(and(eq(leases.name, name), eq(leases.owner, owner)))
33
+ .run();
34
+ }
35
+ /** Serializes processor use within one process: one decode at a time, uploads and renders alike. */
36
+ export function processorQueue(load) {
37
+ let tail = Promise.resolve(), busy = false;
38
+ return {
39
+ get busy() {
40
+ return busy;
41
+ },
42
+ run(work) {
43
+ const result = tail.then(async () => {
44
+ busy = true;
45
+ try {
46
+ return await work(await load());
47
+ }
48
+ finally {
49
+ busy = false;
50
+ }
51
+ });
52
+ tail = result.catch(() => { });
53
+ return result;
54
+ }
55
+ };
56
+ }
57
+ export const variantKey = (id, version, spec) => `${id}/${version}/${spec.preset}-${spec.size}.${spec.format}`;
58
+ export function createRunner(store, deps) {
59
+ const { db } = store, { storage, processor, enqueue, deletePending } = deps, beat = deps.heartbeat ?? heartbeat;
8
60
  const notDeleting = (id) => notExists(db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, id)));
9
- // Every claim is a synchronous SQLite transaction with a lease, so ticks may run concurrently.
10
- async function tick() {
11
- if (await deletePending())
12
- return true;
13
- // Unfinished browser transfers expire without retaining file bytes in the database.
61
+ const deleting = (id) => !!db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, id)).get();
62
+ const message = (e, fallback) => (e instanceof Error ? e.message : fallback);
63
+ /**
64
+ * Validate a staged upload and make it the asset's original. An original left by an interrupted
65
+ * earlier attempt is measured again instead of staged twice (IDs are never reused).
66
+ */
67
+ async function storeOriginal(asset, stage) {
68
+ const existing = storage.originalPath(asset.id);
69
+ if (asset.mime === 'image/svg+xml') {
70
+ if (existing)
71
+ return svgDimensions(await Bun.file(existing).text());
72
+ const staged = Bun.file(await stage());
73
+ if (staged.size > 1_000_000)
74
+ throw new MediaRequestError(413, 'SVG limit is 1 MB');
75
+ let svg;
76
+ try {
77
+ svg = sanitizeSvg(await staged.text());
78
+ }
79
+ catch (e) {
80
+ throw new MediaRequestError(415, message(e, 'Invalid SVG'));
81
+ }
82
+ const sanitized = join(await storage.workDir(asset.id), 'original.svg');
83
+ await Bun.write(sanitized, svg);
84
+ await storage.promoteOriginal(asset.id, sanitized);
85
+ return svgDimensions(svg);
86
+ }
87
+ if (existing)
88
+ return processor.run((p) => p.inspect(existing, asset.mime, deps.maxPixels));
89
+ const staged = await stage();
90
+ const size = await processor.run((p) => p.inspect(staged, asset.mime, deps.maxPixels));
91
+ await storage.promoteOriginal(asset.id, staged);
92
+ return size;
93
+ }
94
+ /** After promotion: record dimensions and queue variants, unless the asset was deleted meanwhile. */
95
+ async function acceptOriginal(id, size, attempt, finish) {
96
+ const outcome = db.transaction(() => {
97
+ const asset = db.select().from(media).where(eq(media.id, id)).get();
98
+ if (!asset)
99
+ return 'missing';
100
+ if (asset.status === 'deleting')
101
+ return 'deleting';
102
+ db.update(media)
103
+ .set({ width: size.width, height: size.height, uploadAttempt: attempt })
104
+ .where(eq(media.id, id))
105
+ .run();
106
+ finish();
107
+ enqueue(id, asset.mime);
108
+ return 'accepted';
109
+ });
110
+ if (outcome === 'missing')
111
+ await storage.removeAsset(id);
112
+ await storage.removeWork(id);
113
+ return outcome;
114
+ }
115
+ async function expireUploads() {
116
+ // Unfinished browser transfers expire; an active chunk stream holds the session lease.
14
117
  const expired = db.transaction(() => {
118
+ const now = Date.now();
15
119
  const pending = db
16
120
  .select()
17
121
  .from(uploadSessions)
18
- .where(and(notDeleting(uploadSessions.mediaId), or(and(eq(uploadSessions.status, 'uploading'), lte(uploadSessions.expiresAt, Date.now())), eq(uploadSessions.status, 'expired')), lt(uploadSessions.attempts, 4), lte(uploadSessions.nextAttempt, Date.now()), lte(uploadSessions.leaseUntil, Date.now())))
122
+ .where(and(notDeleting(uploadSessions.mediaId), or(and(inArray(uploadSessions.status, ['uploading', 'receiving']), lte(uploadSessions.expiresAt, now)), eq(uploadSessions.status, 'expired')), lt(uploadSessions.attempts, 4), lte(uploadSessions.nextAttempt, now), lte(uploadSessions.leaseUntil, now)))
19
123
  .get();
20
124
  if (!pending)
21
125
  return null;
22
126
  // Claim expiry before awaiting storage cleanup so completion cannot race it.
23
127
  db.update(uploadSessions)
24
- .set({
25
- status: 'expired',
26
- attempts: pending.attempts + 1,
27
- leaseUntil: Date.now() + 90_000
28
- })
128
+ .set({ status: 'expired', attempts: pending.attempts + 1, leaseUntil: now + 90_000 })
29
129
  .where(eq(uploadSessions.mediaId, pending.mediaId))
30
130
  .run();
31
131
  db.update(media)
@@ -34,194 +134,342 @@ export function createRunner(store, worker, enqueue, deletePending) {
34
134
  .run();
35
135
  return pending;
36
136
  });
37
- if (expired) {
38
- try {
39
- await worker('assets/' + expired.mediaId, { method: 'DELETE' });
40
- db.update(uploadSessions)
41
- .set({ attempts: 4, leaseUntil: 0 })
42
- .where(eq(uploadSessions.mediaId, expired.mediaId))
43
- .run();
44
- }
45
- catch {
46
- db.update(uploadSessions)
47
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** expired.attempts * 2000 })
48
- .where(eq(uploadSessions.mediaId, expired.mediaId))
49
- .run();
50
- }
51
- return true;
137
+ if (!expired)
138
+ return false;
139
+ try {
140
+ await storage.removeUpload(expired.mediaId, expired.attempt);
141
+ db.update(uploadSessions)
142
+ .set({ attempts: 4, leaseUntil: 0 })
143
+ .where(eq(uploadSessions.mediaId, expired.mediaId))
144
+ .run();
52
145
  }
146
+ catch {
147
+ db.update(uploadSessions)
148
+ .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** expired.attempts * 2000 })
149
+ .where(eq(uploadSessions.mediaId, expired.mediaId))
150
+ .run();
151
+ }
152
+ return true;
153
+ }
154
+ async function finalizeUploads() {
53
155
  const session = db.transaction(() => {
156
+ const now = Date.now();
54
157
  const pending = db
55
158
  .select()
56
159
  .from(uploadSessions)
57
- .where(and(notDeleting(uploadSessions.mediaId), eq(uploadSessions.status, 'pending'), lte(uploadSessions.nextAttempt, Date.now()), lte(uploadSessions.leaseUntil, Date.now()), lt(uploadSessions.attempts, 4)))
160
+ .where(and(notDeleting(uploadSessions.mediaId), eq(uploadSessions.status, 'pending'), lte(uploadSessions.nextAttempt, now), lte(uploadSessions.leaseUntil, now), lt(uploadSessions.attempts, 4)))
58
161
  .get();
59
162
  if (!pending)
60
163
  return null;
61
164
  db.update(uploadSessions)
62
- .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
165
+ .set({ leaseUntil: now + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
63
166
  .where(eq(uploadSessions.mediaId, pending.mediaId))
64
167
  .run();
65
168
  return pending;
66
169
  });
67
- if (session) {
68
- const asset = db.select().from(media).where(eq(media.id, session.mediaId)).get();
69
- if (!asset)
70
- return true;
71
- try {
72
- await worker(`uploads/${asset.id}/complete`, {
73
- method: 'POST',
74
- signal: AbortSignal.timeout(uploadTimeout),
75
- headers: { 'content-type': 'application/json' },
76
- body: JSON.stringify({ attempt: session.attempt, mime: asset.mime, bytes: asset.bytes })
77
- });
78
- db.transaction(() => {
79
- db.delete(uploadSessions).where(eq(uploadSessions.mediaId, asset.id)).run();
80
- enqueue(asset.id, asset.mime);
81
- });
82
- }
83
- catch (e) {
84
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, asset.id)).get())
85
- return true;
170
+ if (!session)
171
+ return false;
172
+ const id = session.mediaId;
173
+ const asset = db.select().from(media).where(eq(media.id, id)).get();
174
+ if (!asset)
175
+ return true;
176
+ // Waiting for the processor (behind a render batch) can outlast the claim; keep it alive.
177
+ const keepAlive = setInterval(() => db
178
+ .update(uploadSessions)
179
+ .set({ leaseUntil: Date.now() + uploadTimeout + 30_000 })
180
+ .where(and(eq(uploadSessions.mediaId, id), eq(uploadSessions.status, 'pending')))
181
+ .run(), beat);
182
+ try {
183
+ const size = await storeOriginal(asset, () => storage.assemble(id, session.attempt, asset.bytes).catch((e) => {
184
+ // Completion assembles locally; missing chunks here mean a 0.6 upload whose bytes stayed in R2.
185
+ throw e instanceof MediaRequestError
186
+ ? new MediaRequestError(410, 'Upload was interrupted. Upload this file again.')
187
+ : e;
188
+ }));
189
+ const outcome = await acceptOriginal(id, size, session.attempt, () => db.delete(uploadSessions).where(eq(uploadSessions.mediaId, id)).run());
190
+ if (outcome === 'accepted')
191
+ await storage.removeUpload(id, session.attempt);
192
+ // Nothing is in flight any more: let the deletion runner proceed at once.
193
+ else
86
194
  db.update(uploadSessions)
87
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** session.attempts * 2000 })
88
- .where(eq(uploadSessions.mediaId, asset.id))
195
+ .set({ leaseUntil: 0 })
196
+ .where(eq(uploadSessions.mediaId, id))
197
+ .run();
198
+ }
199
+ catch (e) {
200
+ await storage.removeWork(id).catch(() => { });
201
+ // Invalid files fail at once; storage or processor errors retry with backoff.
202
+ const permanent = e instanceof MediaRequestError;
203
+ db.update(uploadSessions)
204
+ .set({
205
+ leaseUntil: 0,
206
+ nextAttempt: Date.now() + 2 ** session.attempts * 2000,
207
+ ...(permanent ? { attempts: 4 } : {})
208
+ })
209
+ .where(eq(uploadSessions.mediaId, id))
210
+ .run();
211
+ if (!deleting(id) && (permanent || session.attempts >= 3))
212
+ db.update(media)
213
+ .set({ status: 'failed', error: message(e, 'Upload failed') })
214
+ .where(and(eq(media.id, id), eq(media.status, 'processing')))
89
215
  .run();
90
- if (session.attempts >= 3)
91
- db.update(media)
92
- .set({ status: 'failed', error: e instanceof Error ? e.message : 'Upload failed' })
93
- .where(eq(media.id, asset.id))
94
- .run();
95
- }
96
- return true;
97
216
  }
217
+ finally {
218
+ clearInterval(keepAlive);
219
+ }
220
+ return true;
221
+ }
222
+ // Pre-0.6 originals were queued as database BLOBs; they take the same validation path.
223
+ async function finalizeLegacy() {
98
224
  const original = db.transaction(() => {
225
+ const now = Date.now();
99
226
  const pending = db
100
227
  .select()
101
228
  .from(uploads)
102
- .where(and(notDeleting(uploads.mediaId), lte(uploads.nextAttempt, Date.now()), lte(uploads.leaseUntil, Date.now()), lt(uploads.attempts, 4)))
229
+ .where(and(notDeleting(uploads.mediaId), lte(uploads.nextAttempt, now), lte(uploads.leaseUntil, now), lt(uploads.attempts, 4)))
103
230
  .get();
104
- if (!pending || pending.attempts >= 4)
231
+ if (!pending)
105
232
  return null;
106
233
  db.update(uploads)
107
- .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
234
+ .set({ leaseUntil: now + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
108
235
  .where(eq(uploads.mediaId, pending.mediaId))
109
236
  .run();
110
237
  return pending;
111
238
  });
112
- if (original) {
113
- const asset = db.select().from(media).where(eq(media.id, original.mediaId)).get();
114
- if (!asset)
115
- return true;
116
- try {
117
- await worker('assets/' + asset.id, {
118
- method: 'PUT',
119
- signal: AbortSignal.timeout(uploadTimeout),
120
- body: new Uint8Array(original.body),
121
- headers: {
122
- 'content-type': asset.mime,
123
- 'content-length': String(original.body.byteLength)
124
- }
125
- });
126
- db.transaction(() => {
127
- db.delete(uploads).where(eq(uploads.mediaId, asset.id)).run();
128
- enqueue(asset.id, asset.mime);
129
- });
130
- }
131
- catch (e) {
132
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, asset.id)).get())
133
- return true;
134
- const message = e instanceof Error ? e.message : 'Upload failed';
135
- db.update(uploads)
136
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** original.attempts * 2000 })
137
- .where(eq(uploads.mediaId, asset.id))
239
+ if (!original)
240
+ return false;
241
+ const id = original.mediaId;
242
+ const asset = db.select().from(media).where(eq(media.id, id)).get();
243
+ if (!asset)
244
+ return true;
245
+ const keepAlive = setInterval(() => db
246
+ .update(uploads)
247
+ .set({ leaseUntil: Date.now() + uploadTimeout + 30_000 })
248
+ .where(eq(uploads.mediaId, id))
249
+ .run(), beat);
250
+ try {
251
+ const size = await storeOriginal(asset, async () => {
252
+ const staged = join(await storage.workDir(id), 'legacy-upload');
253
+ await Bun.write(staged, original.body);
254
+ return staged;
255
+ });
256
+ const outcome = await acceptOriginal(id, size, null, () => db.delete(uploads).where(eq(uploads.mediaId, id)).run());
257
+ if (outcome !== 'accepted')
258
+ db.update(uploads).set({ leaseUntil: 0 }).where(eq(uploads.mediaId, id)).run();
259
+ }
260
+ catch (e) {
261
+ await storage.removeWork(id).catch(() => { });
262
+ const permanent = e instanceof MediaRequestError;
263
+ db.update(uploads)
264
+ .set({
265
+ leaseUntil: 0,
266
+ nextAttempt: Date.now() + 2 ** original.attempts * 2000,
267
+ ...(permanent ? { attempts: 4 } : {})
268
+ })
269
+ .where(eq(uploads.mediaId, id))
270
+ .run();
271
+ if (!deleting(id) && (permanent || original.attempts >= 3))
272
+ db.update(media)
273
+ .set({ status: 'failed', error: message(e, 'Upload failed') })
274
+ .where(eq(media.id, id))
138
275
  .run();
139
- if (original.attempts >= 3)
140
- db.update(media)
141
- .set({ status: 'failed', error: message })
142
- .where(eq(media.id, asset.id))
276
+ }
277
+ finally {
278
+ clearInterval(keepAlive);
279
+ }
280
+ return true;
281
+ }
282
+ /** Deletions, upload expiry and original validation. Never claims render work. */
283
+ async function maintain() {
284
+ if (await deletePending())
285
+ return true;
286
+ if (await expireUploads())
287
+ return true;
288
+ if (await finalizeUploads())
289
+ return true;
290
+ return finalizeLegacy();
291
+ }
292
+ /** Render one batch of one asset's due variants. Only runs while this process holds the processor lease. */
293
+ async function render() {
294
+ if (processor.busy || !takeLease(store, PROCESSOR_LEASE, deps.owner, processorLease))
295
+ return false;
296
+ let batch = [];
297
+ try {
298
+ batch = db.transaction(() => {
299
+ const now = Date.now();
300
+ const due = and(notDeleting(jobs.mediaId), or(and(eq(jobs.status, 'pending'), lte(jobs.nextAttempt, now)), and(eq(jobs.status, 'running'), lte(jobs.leaseUntil, now))));
301
+ const next = db.select().from(jobs).where(due).limit(1).get();
302
+ if (!next)
303
+ return [];
304
+ // Claim the asset's other due variants too so the original is decoded once.
305
+ const claimed = db
306
+ .select()
307
+ .from(jobs)
308
+ .where(and(due, eq(jobs.mediaId, next.mediaId), eq(jobs.version, next.version)))
309
+ .limit(batchSize)
310
+ .all();
311
+ for (const job of claimed)
312
+ db.update(jobs)
313
+ .set({
314
+ status: 'running',
315
+ leaseUntil: now + jobTimeout + 30_000,
316
+ attempts: job.attempts + 1
317
+ })
318
+ .where(eq(jobs.id, job.id))
143
319
  .run();
144
- }
320
+ return claimed;
321
+ });
322
+ if (!batch.length)
323
+ return false;
324
+ await renderBatch(batch);
145
325
  return true;
146
326
  }
147
- const now = Date.now();
148
- const batch = db.transaction(() => {
149
- const due = and(notDeleting(jobs.mediaId), or(and(eq(jobs.status, 'pending'), lte(jobs.nextAttempt, now)), and(eq(jobs.status, 'running'), lte(jobs.leaseUntil, now))));
150
- const next = db.select().from(jobs).where(due).limit(1).get();
151
- if (!next)
152
- return [];
153
- // Claim the asset's other due variants too so one Worker request reads the original once.
154
- const claimed = db
155
- .select()
156
- .from(jobs)
157
- .where(and(due, eq(jobs.mediaId, next.mediaId), eq(jobs.version, next.version)))
158
- .limit(batchSize)
159
- .all();
160
- for (const job of claimed)
327
+ finally {
328
+ if (batch.length)
329
+ await storage.removeWork(batch[0].mediaId).catch(() => { });
330
+ releaseLease(store, PROCESSOR_LEASE, deps.owner);
331
+ }
332
+ }
333
+ async function renderBatch(batch) {
334
+ const { mediaId, version } = batch[0];
335
+ const pending = new Set(batch.map((job) => job.id));
336
+ let failure;
337
+ const extend = () => {
338
+ const until = Date.now() + jobTimeout + 30_000;
339
+ if (pending.size)
340
+ db.update(jobs)
341
+ .set({ leaseUntil: until })
342
+ .where(and(inArray(jobs.id, [...pending]), eq(jobs.status, 'running')))
343
+ .run();
344
+ takeLease(store, PROCESSOR_LEASE, deps.owner, processorLease);
345
+ };
346
+ const fail = (job, error) => {
347
+ pending.delete(job.id);
348
+ const failed = job.attempts >= 3;
349
+ if (failed)
350
+ failure ??= error;
351
+ db.update(jobs)
352
+ .set({
353
+ status: failed ? 'failed' : 'pending',
354
+ error,
355
+ nextAttempt: Date.now() + 2 ** job.attempts * 2000,
356
+ leaseUntil: 0
357
+ })
358
+ .where(and(eq(jobs.id, job.id), eq(jobs.status, 'running')))
359
+ .run();
360
+ };
361
+ const commit = async (job, tmpPath, variant) => {
362
+ const key = variantKey(mediaId, version, job.spec);
363
+ const { etag } = await storage.writeVariant(key, tmpPath);
364
+ const state = db.transaction(() => {
365
+ const asset = db.select().from(media).where(eq(media.id, mediaId)).get();
366
+ if (!asset)
367
+ return 'missing';
368
+ if (asset.status === 'deleting')
369
+ return 'deleting';
161
370
  db.update(jobs)
162
371
  .set({
163
- status: 'running',
164
- leaseUntil: now + jobTimeout + 30_000,
165
- attempts: job.attempts + 1
372
+ status: 'ready',
373
+ result: { ...variant, key, etag },
374
+ error: null,
375
+ leaseUntil: 0
166
376
  })
167
377
  .where(eq(jobs.id, job.id))
168
378
  .run();
169
- return claimed;
170
- });
171
- if (!batch.length)
172
- return false;
173
- const { mediaId, version } = batch[0];
174
- let results, completed = true;
379
+ return 'ready';
380
+ });
381
+ pending.delete(job.id);
382
+ // A missing row means the deletion already finished; nothing else will remove this file.
383
+ if (state === 'missing')
384
+ await storage.removeAsset(mediaId);
385
+ extend();
386
+ };
387
+ const timer = setInterval(extend, beat);
175
388
  try {
176
- ({ results } = (await (await worker(`assets/${mediaId}/variants`, {
177
- method: 'POST',
178
- signal: AbortSignal.timeout(jobTimeout),
179
- body: JSON.stringify({ version, variants: batch.map((job) => job.spec) }),
180
- headers: { 'content-type': 'application/json' }
181
- })).json()));
182
- if (!Array.isArray(results) || results.length !== batch.length)
183
- throw new Error('Media Worker returned an incomplete variant batch');
389
+ const asset = db.select().from(media).where(eq(media.id, mediaId)).get();
390
+ if (!asset || asset.status === 'deleting')
391
+ return finishDeleted(batch);
392
+ const original = storage.originalPath(mediaId);
393
+ if (!original) {
394
+ for (const job of batch)
395
+ fail(job, 'Original missing; upload again');
396
+ }
397
+ else if (asset.mime === 'image/svg+xml') {
398
+ const svg = await Bun.file(original).text();
399
+ const size = svgDimensions(svg);
400
+ for (const job of batch) {
401
+ if (job.spec.format !== 'svg') {
402
+ fail(job, 'SVG requires a sanitized derivative');
403
+ continue;
404
+ }
405
+ const tmpPath = join(await storage.workDir(mediaId), `${job.id}.svg`);
406
+ await Bun.write(tmpPath, svg);
407
+ await commit(job, tmpPath, {
408
+ key: '',
409
+ preset: job.spec.preset,
410
+ size: job.spec.size,
411
+ format: 'svg',
412
+ ...size
413
+ });
414
+ }
415
+ }
416
+ else {
417
+ const raster = batch.filter((job) => {
418
+ if (job.spec.format !== 'svg')
419
+ return true;
420
+ fail(job, 'Raster input cannot become SVG');
421
+ return false;
422
+ });
423
+ if (raster.length) {
424
+ const workDir = await storage.workDir(mediaId);
425
+ try {
426
+ await processor.run((p) => p.render({
427
+ id: mediaId,
428
+ version,
429
+ sourcePath: original,
430
+ mime: asset.mime,
431
+ maxPixels: deps.maxPixels,
432
+ workDir,
433
+ specs: raster.map((job) => job.spec)
434
+ }, async (report) => {
435
+ const job = raster[report.index];
436
+ if (!job || !pending.has(job.id))
437
+ return;
438
+ if ('error' in report)
439
+ fail(job, report.error);
440
+ else
441
+ try {
442
+ await commit(job, report.tmpPath, report.variant);
443
+ }
444
+ catch (e) {
445
+ fail(job, message(e, 'Storing the variant failed'));
446
+ }
447
+ }));
448
+ }
449
+ catch (e) {
450
+ // The child died or timed out: nothing is writing any more, so fail the rest now.
451
+ for (const job of raster)
452
+ if (pending.has(job.id))
453
+ fail(job, message(e, 'Media processing failed'));
454
+ }
455
+ for (const job of raster)
456
+ if (pending.has(job.id))
457
+ fail(job, 'Media processor did not report this variant');
458
+ }
459
+ }
184
460
  }
185
461
  catch (e) {
186
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, mediaId)).get())
187
- return true;
188
- const message = e instanceof Error ? e.message : 'Processing failed';
189
- results = batch.map(() => ({ error: message }));
190
- completed = false;
462
+ for (const job of batch)
463
+ if (pending.has(job.id))
464
+ fail(job, message(e, 'Processing failed'));
465
+ }
466
+ finally {
467
+ clearInterval(timer);
191
468
  }
192
469
  db.transaction(() => {
193
470
  const asset = db.select().from(media).where(eq(media.id, mediaId)).get();
194
- if (!asset || asset.status === 'deleting') {
195
- if (completed)
196
- db.delete(jobs)
197
- .where(inArray(jobs.id, batch.map((job) => job.id)))
198
- .run();
199
- return;
200
- }
201
- let failure;
202
- batch.forEach((job, i) => {
203
- const result = results[i];
204
- if ('variant' in result) {
205
- db.update(jobs)
206
- .set({ status: 'ready', result: result.variant, error: null, leaseUntil: 0 })
207
- .where(eq(jobs.id, job.id))
208
- .run();
209
- return;
210
- }
211
- const failed = job.attempts >= 3;
212
- if (failed)
213
- failure ??= result.error;
214
- db.update(jobs)
215
- .set({
216
- status: failed ? 'failed' : 'pending',
217
- error: result.error,
218
- nextAttempt: Date.now() + 2 ** job.attempts * 2000,
219
- // An interrupted request may still be writing; keep its lease so deletion waits.
220
- ...(completed ? { leaseUntil: 0 } : {})
221
- })
222
- .where(eq(jobs.id, job.id))
223
- .run();
224
- });
471
+ if (!asset || asset.status === 'deleting')
472
+ return finishDeleted(batch);
225
473
  if (failure) {
226
474
  db.update(media)
227
475
  .set({ status: 'failed', error: failure })
@@ -245,7 +493,12 @@ export function createRunner(store, worker, enqueue, deletePending) {
245
493
  .where(and(eq(media.id, mediaId), eq(media.targetVersion, version)))
246
494
  .run();
247
495
  });
248
- return true;
249
496
  }
250
- return tick;
497
+ // Release the claim so the deletion runner can remove every file this batch wrote.
498
+ function finishDeleted(batch) {
499
+ db.delete(jobs)
500
+ .where(inArray(jobs.id, batch.map((job) => job.id)))
501
+ .run();
502
+ }
503
+ return { maintain, render };
251
504
  }