sandcms 0.6.1 → 0.6.3

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 (193) hide show
  1. package/README.md +1 -1
  2. package/dist/admin/Account.svelte +284 -83
  3. package/dist/admin/ApiKeys.svelte +146 -79
  4. package/dist/admin/AssetAttachment.svelte +9 -9
  5. package/dist/admin/BlueprintFields.svelte +20 -2
  6. package/dist/admin/BlueprintFields.svelte.d.ts +2 -0
  7. package/dist/admin/Collection.svelte +111 -54
  8. package/dist/admin/Dashboard.svelte +3 -37
  9. package/dist/admin/DateField.svelte +75 -0
  10. package/dist/admin/DateField.svelte.d.ts +11 -0
  11. package/dist/admin/Editor.svelte +71 -65
  12. package/dist/admin/Fields.svelte +24 -16
  13. package/dist/admin/FocusPicker.svelte +1 -2
  14. package/dist/admin/Gallery.svelte +0 -1
  15. package/dist/admin/GlobalSearch.svelte +54 -26
  16. package/dist/admin/HoverHint.svelte +37 -0
  17. package/dist/admin/HoverHint.svelte.d.ts +8 -0
  18. package/dist/admin/Inbox.svelte +6 -11
  19. package/dist/admin/LinkField.svelte +129 -64
  20. package/dist/admin/Login.svelte +0 -1
  21. package/dist/admin/MediaLibrary.svelte +61 -50
  22. package/dist/admin/MediaPicker.svelte +57 -42
  23. package/dist/admin/NotificationSettings.svelte +35 -27
  24. package/dist/admin/RichText.svelte +2 -2
  25. package/dist/admin/RowMenu.svelte +28 -0
  26. package/dist/admin/RowMenu.svelte.d.ts +10 -0
  27. package/dist/admin/SearchList.svelte +51 -14
  28. package/dist/admin/Shell.svelte +64 -29
  29. package/dist/admin/Users.svelte +106 -50
  30. package/dist/admin/client.d.ts +2 -0
  31. package/dist/admin/client.js +18 -0
  32. package/dist/admin/components/ui/calendar/calendar-caption.svelte +76 -0
  33. package/dist/admin/components/ui/calendar/calendar-caption.svelte.d.ts +19 -0
  34. package/dist/admin/components/ui/calendar/calendar-cell.svelte +19 -0
  35. package/dist/admin/components/ui/calendar/calendar-cell.svelte.d.ts +4 -0
  36. package/dist/admin/components/ui/calendar/calendar-day.svelte +33 -0
  37. package/dist/admin/components/ui/calendar/calendar-day.svelte.d.ts +4 -0
  38. package/dist/admin/components/ui/calendar/calendar-grid-body.svelte +12 -0
  39. package/dist/admin/components/ui/calendar/calendar-grid-body.svelte.d.ts +4 -0
  40. package/dist/admin/components/ui/calendar/calendar-grid-head.svelte +12 -0
  41. package/dist/admin/components/ui/calendar/calendar-grid-head.svelte.d.ts +4 -0
  42. package/dist/admin/components/ui/calendar/calendar-grid-row.svelte +12 -0
  43. package/dist/admin/components/ui/calendar/calendar-grid-row.svelte.d.ts +4 -0
  44. package/dist/admin/components/ui/calendar/calendar-grid.svelte +16 -0
  45. package/dist/admin/components/ui/calendar/calendar-grid.svelte.d.ts +4 -0
  46. package/dist/admin/components/ui/calendar/calendar-head-cell.svelte +19 -0
  47. package/dist/admin/components/ui/calendar/calendar-head-cell.svelte.d.ts +4 -0
  48. package/dist/admin/components/ui/calendar/calendar-header.svelte +19 -0
  49. package/dist/admin/components/ui/calendar/calendar-header.svelte.d.ts +4 -0
  50. package/dist/admin/components/ui/calendar/calendar-heading.svelte +16 -0
  51. package/dist/admin/components/ui/calendar/calendar-heading.svelte.d.ts +4 -0
  52. package/dist/admin/components/ui/calendar/calendar-month-select.svelte +48 -0
  53. package/dist/admin/components/ui/calendar/calendar-month-select.svelte.d.ts +4 -0
  54. package/dist/admin/components/ui/calendar/calendar-month.svelte +15 -0
  55. package/dist/admin/components/ui/calendar/calendar-month.svelte.d.ts +5 -0
  56. package/dist/admin/components/ui/calendar/calendar-months.svelte +19 -0
  57. package/dist/admin/components/ui/calendar/calendar-months.svelte.d.ts +5 -0
  58. package/dist/admin/components/ui/calendar/calendar-nav.svelte +19 -0
  59. package/dist/admin/components/ui/calendar/calendar-nav.svelte.d.ts +5 -0
  60. package/dist/admin/components/ui/calendar/calendar-next-button.svelte +37 -0
  61. package/dist/admin/components/ui/calendar/calendar-next-button.svelte.d.ts +8 -0
  62. package/dist/admin/components/ui/calendar/calendar-prev-button.svelte +37 -0
  63. package/dist/admin/components/ui/calendar/calendar-prev-button.svelte.d.ts +8 -0
  64. package/dist/admin/components/ui/calendar/calendar-year-select.svelte +47 -0
  65. package/dist/admin/components/ui/calendar/calendar-year-select.svelte.d.ts +4 -0
  66. package/dist/admin/components/ui/calendar/calendar.svelte +115 -0
  67. package/dist/admin/components/ui/calendar/calendar.svelte.d.ts +21 -0
  68. package/dist/admin/components/ui/calendar/index.d.ts +19 -0
  69. package/dist/admin/components/ui/calendar/index.js +21 -0
  70. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-group.svelte +16 -0
  71. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-group.svelte.d.ts +4 -0
  72. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte +46 -0
  73. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte.d.ts +9 -0
  74. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-content.svelte +31 -0
  75. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-content.svelte.d.ts +10 -0
  76. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte +22 -0
  77. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte.d.ts +8 -0
  78. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group.svelte +7 -0
  79. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-group.svelte.d.ts +4 -0
  80. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-item.svelte +27 -0
  81. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-item.svelte.d.ts +8 -0
  82. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-label.svelte +24 -0
  83. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-label.svelte.d.ts +8 -0
  84. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-portal.svelte +7 -0
  85. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-portal.svelte.d.ts +3 -0
  86. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-group.svelte +16 -0
  87. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-group.svelte.d.ts +4 -0
  88. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte +36 -0
  89. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte.d.ts +4 -0
  90. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-separator.svelte +17 -0
  91. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-separator.svelte.d.ts +4 -0
  92. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte +23 -0
  93. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte.d.ts +5 -0
  94. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte +31 -0
  95. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte.d.ts +10 -0
  96. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte +29 -0
  97. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte.d.ts +7 -0
  98. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub.svelte +7 -0
  99. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-sub.svelte.d.ts +3 -0
  100. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-trigger.svelte +7 -0
  101. package/dist/admin/components/ui/dropdown-menu/dropdown-menu-trigger.svelte.d.ts +4 -0
  102. package/dist/admin/components/ui/dropdown-menu/dropdown-menu.svelte +7 -0
  103. package/dist/admin/components/ui/dropdown-menu/dropdown-menu.svelte.d.ts +3 -0
  104. package/dist/admin/components/ui/dropdown-menu/index.d.ts +18 -0
  105. package/dist/admin/components/ui/dropdown-menu/index.js +18 -0
  106. package/dist/admin/components/ui/input-otp/index.d.ts +5 -0
  107. package/dist/admin/components/ui/input-otp/index.js +5 -0
  108. package/dist/admin/components/ui/input-otp/input-otp-group.svelte +23 -0
  109. package/dist/admin/components/ui/input-otp/input-otp-group.svelte.d.ts +5 -0
  110. package/dist/admin/components/ui/input-otp/input-otp-separator.svelte +27 -0
  111. package/dist/admin/components/ui/input-otp/input-otp-separator.svelte.d.ts +5 -0
  112. package/dist/admin/components/ui/input-otp/input-otp-slot.svelte +29 -0
  113. package/dist/admin/components/ui/input-otp/input-otp-slot.svelte.d.ts +4 -0
  114. package/dist/admin/components/ui/input-otp/input-otp.svelte +24 -0
  115. package/dist/admin/components/ui/input-otp/input-otp.svelte.d.ts +4 -0
  116. package/dist/admin/components/ui/popover/index.d.ts +9 -0
  117. package/dist/admin/components/ui/popover/index.js +11 -0
  118. package/dist/admin/components/ui/popover/popover-close.svelte +7 -0
  119. package/dist/admin/components/ui/popover/popover-close.svelte.d.ts +4 -0
  120. package/dist/admin/components/ui/popover/popover-content.svelte +31 -0
  121. package/dist/admin/components/ui/popover/popover-content.svelte.d.ts +10 -0
  122. package/dist/admin/components/ui/popover/popover-description.svelte +20 -0
  123. package/dist/admin/components/ui/popover/popover-description.svelte.d.ts +5 -0
  124. package/dist/admin/components/ui/popover/popover-header.svelte +20 -0
  125. package/dist/admin/components/ui/popover/popover-header.svelte.d.ts +5 -0
  126. package/dist/admin/components/ui/popover/popover-portal.svelte +7 -0
  127. package/dist/admin/components/ui/popover/popover-portal.svelte.d.ts +3 -0
  128. package/dist/admin/components/ui/popover/popover-title.svelte +20 -0
  129. package/dist/admin/components/ui/popover/popover-title.svelte.d.ts +5 -0
  130. package/dist/admin/components/ui/popover/popover-trigger.svelte +17 -0
  131. package/dist/admin/components/ui/popover/popover-trigger.svelte.d.ts +4 -0
  132. package/dist/admin/components/ui/popover/popover.svelte +7 -0
  133. package/dist/admin/components/ui/popover/popover.svelte.d.ts +3 -0
  134. package/dist/admin/components/ui/switch/switch.svelte +2 -2
  135. package/dist/admin/components/ui/tooltip/index.d.ts +6 -0
  136. package/dist/admin/components/ui/tooltip/index.js +8 -0
  137. package/dist/admin/components/ui/tooltip/tooltip-content.svelte +48 -0
  138. package/dist/admin/components/ui/tooltip/tooltip-content.svelte.d.ts +11 -0
  139. package/dist/admin/components/ui/tooltip/tooltip-portal.svelte +7 -0
  140. package/dist/admin/components/ui/tooltip/tooltip-portal.svelte.d.ts +4 -0
  141. package/dist/admin/components/ui/tooltip/tooltip-provider.svelte +7 -0
  142. package/dist/admin/components/ui/tooltip/tooltip-provider.svelte.d.ts +4 -0
  143. package/dist/admin/components/ui/tooltip/tooltip-trigger.svelte +7 -0
  144. package/dist/admin/components/ui/tooltip/tooltip-trigger.svelte.d.ts +25 -0
  145. package/dist/admin/components/ui/tooltip/tooltip.svelte +7 -0
  146. package/dist/admin/components/ui/tooltip/tooltip.svelte.d.ts +25 -0
  147. package/dist/admin/generated/admin.css +774 -138
  148. package/dist/admin/slug.d.ts +1 -0
  149. package/dist/admin/slug.js +6 -0
  150. package/dist/cli/doctor.js +2 -2
  151. package/dist/cli/files.js +11 -6
  152. package/dist/cli/index.js +1 -1
  153. package/dist/cli/upgrade.js +2 -1
  154. package/dist/env.d.ts +80 -0
  155. package/dist/env.js +103 -0
  156. package/dist/server/admin-load.d.ts +46 -76
  157. package/dist/server/admin-load.js +98 -24
  158. package/dist/server/api-pagination.d.ts +2 -0
  159. package/dist/server/api-pagination.js +51 -7
  160. package/dist/server/api.js +6 -1
  161. package/dist/server/auth.d.ts +1 -0
  162. package/dist/server/auth.js +23 -0
  163. package/dist/server/cms.d.ts +17 -2
  164. package/dist/server/cms.js +3 -1
  165. package/dist/server/content.d.ts +15 -2
  166. package/dist/server/content.js +72 -30
  167. package/dist/server/db/migration-data.js +8 -0
  168. package/dist/server/db/migrations/0007_content_and_job_indexes.sql +2 -0
  169. package/dist/server/db/migrations/0008_search_text_cache.sql +45 -0
  170. package/dist/server/db/migrations/meta/0007_snapshot.json +1643 -0
  171. package/dist/server/db/migrations/meta/0008_snapshot.json +1711 -0
  172. package/dist/server/db/migrations/meta/_journal.json +14 -0
  173. package/dist/server/db/schema.d.ts +83 -0
  174. package/dist/server/db/schema.js +23 -5
  175. package/dist/server/email/index.d.ts +5 -1
  176. package/dist/server/email/index.js +12 -11
  177. package/dist/server/media/runner.js +217 -191
  178. package/dist/server/media/service.d.ts +6 -0
  179. package/dist/server/media/service.js +36 -3
  180. package/dist/server/search.d.ts +2 -0
  181. package/dist/server/search.js +7 -0
  182. package/dist/worker/index.js +129 -76
  183. package/docs/api.md +1 -1
  184. package/docs/cloudflare.md +1 -1
  185. package/docs/deployment.md +15 -1
  186. package/docs/email.md +5 -5
  187. package/docs/media.md +2 -2
  188. package/docs/package.md +4 -4
  189. package/docs/releases.md +20 -0
  190. package/docs/upgrades.md +40 -1
  191. package/package.json +9 -3
  192. package/templates/env.ts +8 -0
  193. package/templates/integration.ts +5 -5
@@ -1,225 +1,251 @@
1
- import { and, eq, lte, lt, ne, notExists, or } from 'drizzle-orm';
1
+ import { and, eq, inArray, lte, lt, notExists, or } from 'drizzle-orm';
2
2
  import { media, mediaDeletions, jobs, uploads, uploadSessions } from '../db/schema.js';
3
- const uploadTimeout = 120_000;
3
+ const uploadTimeout = 120_000, jobTimeout = 120_000,
4
+ // Covers a typical preset set (sizes x formats plus the editor preview) in one request.
5
+ batchSize = 16;
4
6
  export function createRunner(store, worker, enqueue, deletePending) {
5
7
  const { db } = store;
6
8
  const notDeleting = (id) => notExists(db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, id)));
7
- let running = false;
9
+ // Every claim is a synchronous SQLite transaction with a lease, so ticks may run concurrently.
8
10
  async function tick() {
9
- if (running)
10
- return false;
11
- running = true;
12
- try {
13
- if (await deletePending())
14
- return true;
15
- // Unfinished browser transfers expire without retaining file bytes in the database.
16
- const expired = db.transaction(() => {
17
- const pending = db
18
- .select()
19
- .from(uploadSessions)
20
- .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())))
21
- .get();
22
- if (!pending)
23
- return null;
24
- // Claim expiry before awaiting storage cleanup so completion cannot race it.
11
+ if (await deletePending())
12
+ return true;
13
+ // Unfinished browser transfers expire without retaining file bytes in the database.
14
+ const expired = db.transaction(() => {
15
+ const pending = db
16
+ .select()
17
+ .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())))
19
+ .get();
20
+ if (!pending)
21
+ return null;
22
+ // Claim expiry before awaiting storage cleanup so completion cannot race it.
23
+ db.update(uploadSessions)
24
+ .set({
25
+ status: 'expired',
26
+ attempts: pending.attempts + 1,
27
+ leaseUntil: Date.now() + 90_000
28
+ })
29
+ .where(eq(uploadSessions.mediaId, pending.mediaId))
30
+ .run();
31
+ db.update(media)
32
+ .set({ status: 'failed', error: 'Upload expired. Upload this file again.' })
33
+ .where(eq(media.id, pending.mediaId))
34
+ .run();
35
+ return pending;
36
+ });
37
+ if (expired) {
38
+ try {
39
+ await worker('assets/' + expired.mediaId, { method: 'DELETE' });
25
40
  db.update(uploadSessions)
26
- .set({
27
- status: 'expired',
28
- attempts: pending.attempts + 1,
29
- leaseUntil: Date.now() + 90_000
30
- })
31
- .where(eq(uploadSessions.mediaId, pending.mediaId))
41
+ .set({ attempts: 4, leaseUntil: 0 })
42
+ .where(eq(uploadSessions.mediaId, expired.mediaId))
32
43
  .run();
33
- db.update(media)
34
- .set({ status: 'failed', error: 'Upload expired. Upload this file again.' })
35
- .where(eq(media.id, pending.mediaId))
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))
36
49
  .run();
37
- return pending;
38
- });
39
- if (expired) {
40
- try {
41
- await worker('assets/' + expired.mediaId, { method: 'DELETE' });
42
- db.update(uploadSessions)
43
- .set({ attempts: 4, leaseUntil: 0 })
44
- .where(eq(uploadSessions.mediaId, expired.mediaId))
45
- .run();
46
- }
47
- catch {
48
- db.update(uploadSessions)
49
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** expired.attempts * 2000 })
50
- .where(eq(uploadSessions.mediaId, expired.mediaId))
51
- .run();
52
- }
50
+ }
51
+ return true;
52
+ }
53
+ const session = db.transaction(() => {
54
+ const pending = db
55
+ .select()
56
+ .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)))
58
+ .get();
59
+ if (!pending)
60
+ return null;
61
+ db.update(uploadSessions)
62
+ .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
63
+ .where(eq(uploadSessions.mediaId, pending.mediaId))
64
+ .run();
65
+ return pending;
66
+ });
67
+ if (session) {
68
+ const asset = db.select().from(media).where(eq(media.id, session.mediaId)).get();
69
+ if (!asset)
53
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
+ });
54
82
  }
55
- const session = db.transaction(() => {
56
- const pending = db
57
- .select()
58
- .from(uploadSessions)
59
- .where(and(notDeleting(uploadSessions.mediaId), eq(uploadSessions.status, 'pending'), lte(uploadSessions.nextAttempt, Date.now()), lte(uploadSessions.leaseUntil, Date.now()), lt(uploadSessions.attempts, 4)))
60
- .get();
61
- if (!pending)
62
- return null;
83
+ catch (e) {
84
+ if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, asset.id)).get())
85
+ return true;
63
86
  db.update(uploadSessions)
64
- .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
65
- .where(eq(uploadSessions.mediaId, pending.mediaId))
87
+ .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** session.attempts * 2000 })
88
+ .where(eq(uploadSessions.mediaId, asset.id))
66
89
  .run();
67
- return pending;
68
- });
69
- if (session) {
70
- const asset = db.select().from(media).where(eq(media.id, session.mediaId)).get();
71
- if (!asset)
72
- return true;
73
- try {
74
- await worker(`uploads/${asset.id}/complete`, {
75
- method: 'POST',
76
- signal: AbortSignal.timeout(uploadTimeout),
77
- headers: { 'content-type': 'application/json' },
78
- body: JSON.stringify({ attempt: session.attempt, mime: asset.mime, bytes: asset.bytes })
79
- });
80
- db.transaction(() => {
81
- db.delete(uploadSessions).where(eq(uploadSessions.mediaId, asset.id)).run();
82
- enqueue(asset.id, asset.mime);
83
- });
84
- }
85
- catch (e) {
86
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, asset.id)).get())
87
- return true;
88
- db.update(uploadSessions)
89
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** session.attempts * 2000 })
90
- .where(eq(uploadSessions.mediaId, asset.id))
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))
91
94
  .run();
92
- if (session.attempts >= 3)
93
- db.update(media)
94
- .set({ status: 'failed', error: e instanceof Error ? e.message : 'Upload failed' })
95
- .where(eq(media.id, asset.id))
96
- .run();
97
- }
95
+ }
96
+ return true;
97
+ }
98
+ const original = db.transaction(() => {
99
+ const pending = db
100
+ .select()
101
+ .from(uploads)
102
+ .where(and(notDeleting(uploads.mediaId), lte(uploads.nextAttempt, Date.now()), lte(uploads.leaseUntil, Date.now()), lt(uploads.attempts, 4)))
103
+ .get();
104
+ if (!pending || pending.attempts >= 4)
105
+ return null;
106
+ db.update(uploads)
107
+ .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
108
+ .where(eq(uploads.mediaId, pending.mediaId))
109
+ .run();
110
+ return pending;
111
+ });
112
+ if (original) {
113
+ const asset = db.select().from(media).where(eq(media.id, original.mediaId)).get();
114
+ if (!asset)
98
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
+ });
99
130
  }
100
- const original = db.transaction(() => {
101
- const pending = db
102
- .select()
103
- .from(uploads)
104
- .where(and(notDeleting(uploads.mediaId), lte(uploads.nextAttempt, Date.now()), lte(uploads.leaseUntil, Date.now()), lt(uploads.attempts, 4)))
105
- .get();
106
- if (!pending || pending.attempts >= 4)
107
- return null;
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';
108
135
  db.update(uploads)
109
- .set({ leaseUntil: Date.now() + uploadTimeout + 30_000, attempts: pending.attempts + 1 })
110
- .where(eq(uploads.mediaId, pending.mediaId))
136
+ .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** original.attempts * 2000 })
137
+ .where(eq(uploads.mediaId, asset.id))
111
138
  .run();
112
- return pending;
113
- });
114
- if (original) {
115
- const asset = db.select().from(media).where(eq(media.id, original.mediaId)).get();
116
- if (!asset)
117
- return true;
118
- try {
119
- await worker('assets/' + asset.id, {
120
- method: 'PUT',
121
- signal: AbortSignal.timeout(uploadTimeout),
122
- body: new Uint8Array(original.body),
123
- headers: {
124
- 'content-type': asset.mime,
125
- 'content-length': String(original.body.byteLength)
126
- }
127
- });
128
- db.transaction(() => {
129
- db.delete(uploads).where(eq(uploads.mediaId, asset.id)).run();
130
- enqueue(asset.id, asset.mime);
131
- });
132
- }
133
- catch (e) {
134
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, asset.id)).get())
135
- return true;
136
- const message = e instanceof Error ? e.message : 'Upload failed';
137
- db.update(uploads)
138
- .set({ leaseUntil: 0, nextAttempt: Date.now() + 2 ** original.attempts * 2000 })
139
- .where(eq(uploads.mediaId, asset.id))
139
+ if (original.attempts >= 3)
140
+ db.update(media)
141
+ .set({ status: 'failed', error: message })
142
+ .where(eq(media.id, asset.id))
140
143
  .run();
141
- if (original.attempts >= 3)
142
- db.update(media)
143
- .set({ status: 'failed', error: message })
144
- .where(eq(media.id, asset.id))
145
- .run();
146
- }
147
- return true;
148
144
  }
149
- const now = Date.now();
150
- const job = db.transaction(() => {
151
- const next = db
152
- .select()
153
- .from(jobs)
154
- .where(and(notDeleting(jobs.mediaId), or(and(eq(jobs.status, 'pending'), lte(jobs.nextAttempt, now)), and(eq(jobs.status, 'running'), lte(jobs.leaseUntil, now)))))
155
- .limit(1)
156
- .get();
157
- if (!next)
158
- return;
145
+ return true;
146
+ }
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)
159
161
  db.update(jobs)
160
- .set({ status: 'running', leaseUntil: now + 90_000, attempts: next.attempts + 1 })
161
- .where(eq(jobs.id, next.id))
162
+ .set({
163
+ status: 'running',
164
+ leaseUntil: now + jobTimeout + 30_000,
165
+ attempts: job.attempts + 1
166
+ })
167
+ .where(eq(jobs.id, job.id))
162
168
  .run();
163
- return next;
164
- });
165
- if (!job)
166
- return false;
167
- try {
168
- const result = (await (await worker(`assets/${job.mediaId}/variant`, {
169
- method: 'POST',
170
- body: JSON.stringify({ ...job.spec, version: job.version }),
171
- headers: { 'content-type': 'application/json' }
172
- })).json());
173
- db.transaction(() => {
174
- const asset = db.select().from(media).where(eq(media.id, job.mediaId)).get();
175
- if (!asset || asset.status === 'deleting') {
176
- db.delete(jobs).where(eq(jobs.id, job.id)).run();
177
- return;
178
- }
169
+ return claimed;
170
+ });
171
+ if (!batch.length)
172
+ return false;
173
+ const { mediaId, version } = batch[0];
174
+ let results, completed = true;
175
+ 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');
184
+ }
185
+ 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;
191
+ }
192
+ db.transaction(() => {
193
+ 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) {
179
205
  db.update(jobs)
180
- .set({ status: 'ready', result, error: null, leaseUntil: 0 })
206
+ .set({ status: 'ready', result: result.variant, error: null, leaseUntil: 0 })
181
207
  .where(eq(jobs.id, job.id))
182
208
  .run();
183
- const set = db
184
- .select()
185
- .from(jobs)
186
- .where(and(eq(jobs.mediaId, job.mediaId), eq(jobs.version, job.version)))
187
- .all();
188
- if (set.length && set.every((j) => j.status === 'ready'))
189
- db.update(media)
190
- .set({
191
- status: 'ready',
192
- activeVersion: job.version,
193
- variants: set.map((j) => j.result),
194
- error: null
195
- })
196
- .where(and(eq(media.id, job.mediaId), eq(media.targetVersion, job.version)))
197
- .run();
198
- });
199
- }
200
- catch (e) {
201
- if (db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, job.mediaId)).get())
202
- return true;
203
- const message = e instanceof Error ? e.message : 'Processing failed', failed = job.attempts >= 3;
209
+ return;
210
+ }
211
+ const failed = job.attempts >= 3;
212
+ if (failed)
213
+ failure ??= result.error;
204
214
  db.update(jobs)
205
215
  .set({
206
216
  status: failed ? 'failed' : 'pending',
207
- error: message,
208
- nextAttempt: Date.now() + 2 ** job.attempts * 2000
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 } : {})
209
221
  })
210
222
  .where(eq(jobs.id, job.id))
211
223
  .run();
212
- if (failed)
213
- db.update(media)
214
- .set({ status: 'failed', error: message })
215
- .where(and(eq(media.id, job.mediaId), eq(media.targetVersion, job.version), ne(media.status, 'deleting')))
216
- .run();
224
+ });
225
+ if (failure) {
226
+ db.update(media)
227
+ .set({ status: 'failed', error: failure })
228
+ .where(and(eq(media.id, mediaId), eq(media.targetVersion, version)))
229
+ .run();
230
+ return;
217
231
  }
218
- return true;
219
- }
220
- finally {
221
- running = false;
222
- }
232
+ const set = db
233
+ .select()
234
+ .from(jobs)
235
+ .where(and(eq(jobs.mediaId, mediaId), eq(jobs.version, version)))
236
+ .all();
237
+ if (set.length && set.every((j) => j.status === 'ready'))
238
+ db.update(media)
239
+ .set({
240
+ status: 'ready',
241
+ activeVersion: version,
242
+ variants: set.map((j) => j.result),
243
+ error: null
244
+ })
245
+ .where(and(eq(media.id, mediaId), eq(media.targetVersion, version)))
246
+ .run();
247
+ });
248
+ return true;
223
249
  }
224
250
  return tick;
225
251
  }
@@ -15,6 +15,7 @@ export declare function createMedia(store: Store, definition: SiteDefinition, co
15
15
  variants: import("../db/schema.js").Variant[];
16
16
  error: string | null;
17
17
  createdAt: number;
18
+ searchText: string | null;
18
19
  } | undefined;
19
20
  upload: (file: File, blueprintId?: string) => Promise<{
20
21
  blueprint: string;
@@ -29,6 +30,7 @@ export declare function createMedia(store: Store, definition: SiteDefinition, co
29
30
  variants: import("../db/schema.js").Variant[];
30
31
  error: string | null;
31
32
  createdAt: number;
33
+ searchText: string | null;
32
34
  }>;
33
35
  initiateUpload: (input: {
34
36
  name: string;
@@ -53,8 +55,10 @@ export declare function createMedia(store: Store, definition: SiteDefinition, co
53
55
  variants: import("../db/schema.js").Variant[];
54
56
  error: string | null;
55
57
  createdAt: number;
58
+ searchText: string | null;
56
59
  };
57
60
  tick: () => Promise<boolean>;
61
+ drain: () => Promise<void>;
58
62
  retry: (id: string) => void;
59
63
  version: string;
60
64
  versionForAsset: (asset: NonNullable<ReturnType<(id: string) => {
@@ -70,6 +74,7 @@ export declare function createMedia(store: Store, definition: SiteDefinition, co
70
74
  variants: import("../db/schema.js").Variant[];
71
75
  error: string | null;
72
76
  createdAt: number;
77
+ searchText: string | null;
73
78
  } | undefined>>) => string;
74
79
  workerUrl: string;
75
80
  list: () => {
@@ -85,6 +90,7 @@ export declare function createMedia(store: Store, definition: SiteDefinition, co
85
90
  variants: import("../db/schema.js").Variant[];
86
91
  error: string | null;
87
92
  createdAt: number;
93
+ searchText: string | null;
88
94
  }[];
89
95
  updateMetadata: (id: string, input: unknown) => void;
90
96
  health(): Promise<{
@@ -30,7 +30,7 @@ export function createMedia(store, definition, content, token, workerUrl = defin
30
30
  throw new Error('Configure SANDCMS_WORKER_TOKEN before uploading media');
31
31
  const response = await fetch(workerUrl.replace(/\/$/, '') + '/internal/' + path, {
32
32
  ...init,
33
- headers: { ...init.headers, authorization: `Bearer ${token}`, 'x-sandcms-protocol': '5' },
33
+ headers: { ...init.headers, authorization: `Bearer ${token}`, 'x-sandcms-protocol': '6' },
34
34
  signal: init.signal ?? AbortSignal.timeout(60_000)
35
35
  });
36
36
  if (!response.ok && !(path.startsWith('media/') && response.status === 304))
@@ -170,6 +170,14 @@ export function createMedia(store, definition, content, token, workerUrl = defin
170
170
  }
171
171
  const deletePending = createDeletionRunner(store, worker);
172
172
  const tick = createRunner(store, worker, enqueue, deletePending);
173
+ // Independent images process in parallel; each Worker request already fans out its variants.
174
+ const concurrency = 4;
175
+ async function drain() {
176
+ await Promise.all(Array.from({ length: concurrency }, async () => {
177
+ while (await tick())
178
+ ;
179
+ }));
180
+ }
173
181
  function retry(id) {
174
182
  const asset = get(id);
175
183
  if (!asset)
@@ -294,6 +302,7 @@ export function createMedia(store, definition, content, token, workerUrl = defin
294
302
  initiateUpload,
295
303
  completeUpload,
296
304
  tick,
305
+ drain,
297
306
  retry,
298
307
  version,
299
308
  versionForAsset: assetVersion,
@@ -385,9 +394,33 @@ export function createMedia(store, definition, content, token, workerUrl = defin
385
394
  publicGallery: (rows, field) => galleryData(rows, field),
386
395
  previewGallery: (rows, field) => galleryData(rows, field, true),
387
396
  start: () => {
388
- const timer = setInterval(() => void tick().catch((e) => console.error('SandCMS media job failed', e)), 1000);
397
+ let active = 0, stopped = false;
398
+ // Poll with one loop while idle; each loop that finds work adds another up to the limit.
399
+ async function loop() {
400
+ if (stopped)
401
+ return;
402
+ active++;
403
+ try {
404
+ while (!stopped && (await tick()))
405
+ if (!stopped && active < concurrency)
406
+ void loop();
407
+ }
408
+ catch (e) {
409
+ console.error('SandCMS media job failed', e);
410
+ }
411
+ finally {
412
+ active--;
413
+ }
414
+ }
415
+ const timer = setInterval(() => {
416
+ if (!stopped && active < concurrency)
417
+ void loop();
418
+ }, 1000);
389
419
  timer.unref();
390
- return () => clearInterval(timer);
420
+ return () => {
421
+ stopped = true;
422
+ clearInterval(timer);
423
+ };
391
424
  }
392
425
  };
393
426
  }
@@ -8,6 +8,8 @@ export declare function searchableText(fields: Record<string, Field>, payload: P
8
8
  export declare function matchScore(query: string, title: string, body: string): number;
9
9
  export declare function documentText(cms: CMS, row: typeof documents.$inferSelect): string;
10
10
  export declare function assetText(cms: CMS, row: typeof media.$inferSelect, labels?: Map<string, string>): string;
11
+ export declare function documentSearchText(cms: CMS, row: typeof documents.$inferSelect): string;
12
+ export declare function assetSearchText(cms: CMS, row: typeof media.$inferSelect, labels?: Map<string, string>): string;
11
13
  export declare function globalSearch(cms: CMS, params: URLSearchParams): {
12
14
  items: SearchResult[];
13
15
  };
@@ -56,6 +56,13 @@ export function assetText(cms, row, labels = new Map()) {
56
56
  return labels.get(key);
57
57
  });
58
58
  }
59
+ // Cached superset of what matchScore checks, so SQL can pre-filter without changing results.
60
+ export function documentSearchText(cms, row) {
61
+ return normalizeSearch(String(row.draft.title ?? '') + ' ' + documentText(cms, row));
62
+ }
63
+ export function assetSearchText(cms, row, labels = new Map()) {
64
+ return normalizeSearch(row.filename + ' ' + assetText(cms, row, labels));
65
+ }
59
66
  function excerpt(text, query) {
60
67
  const term = query.split(' ')[0].replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
61
68
  const position = Math.max(0, text.search(new RegExp(term, 'i')));