sandcms 0.6.3 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (175) hide show
  1. package/README.md +15 -11
  2. package/dist/admin/Account.svelte +2 -0
  3. package/dist/admin/Admin.svelte +21 -6
  4. package/dist/admin/AssetAttachment.svelte +9 -6
  5. package/dist/admin/AssetAttachment.svelte.d.ts +3 -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 +5 -10
  9. package/dist/admin/Fields.svelte +2 -8
  10. package/dist/admin/Fields.svelte.d.ts +0 -1
  11. package/dist/admin/Gallery.svelte +221 -80
  12. package/dist/admin/Gallery.svelte.d.ts +0 -1
  13. package/dist/admin/Inbox.svelte +3 -2
  14. package/dist/admin/LinkField.svelte +0 -3
  15. package/dist/admin/LinkField.svelte.d.ts +0 -1
  16. package/dist/admin/MediaLibrary.svelte +10 -7
  17. package/dist/admin/MediaPicker.svelte +43 -35
  18. package/dist/admin/MediaPicker.svelte.d.ts +0 -1
  19. package/dist/admin/Navigation.svelte +13 -2
  20. package/dist/admin/Pages.svelte +195 -0
  21. package/dist/admin/Pages.svelte.d.ts +7 -0
  22. package/dist/admin/Shell.svelte +27 -5
  23. package/dist/admin/SortableList.svelte +82 -61
  24. package/dist/admin/SortableList.svelte.d.ts +3 -1
  25. package/dist/admin/ThemePicker.svelte +72 -0
  26. package/dist/admin/ThemePicker.svelte.d.ts +18 -0
  27. package/dist/admin/UploadButton.svelte +2 -1
  28. package/dist/admin/UploadProgress.svelte +24 -0
  29. package/dist/admin/UploadProgress.svelte.d.ts +7 -0
  30. package/dist/admin/Users.svelte +8 -3
  31. package/dist/admin/client.d.ts +3 -670
  32. package/dist/admin/client.js +2 -1
  33. package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
  34. package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
  35. package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
  36. package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
  37. package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
  38. package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
  39. package/dist/admin/generated/admin.css +823 -115
  40. package/dist/admin/navigation.d.ts +9 -0
  41. package/dist/admin/navigation.js +20 -1
  42. package/dist/admin/theme-context.d.ts +7 -0
  43. package/dist/admin/theme-context.js +3 -0
  44. package/dist/admin/theme.d.ts +7 -0
  45. package/dist/admin/theme.js +14 -0
  46. package/dist/admin/types.d.ts +3 -1
  47. package/dist/admin/uploads.d.ts +8 -1
  48. package/dist/admin/uploads.js +94 -16
  49. package/dist/blueprints/files.js +1 -0
  50. package/dist/blueprints/labels.d.ts +6 -0
  51. package/dist/blueprints/labels.js +14 -0
  52. package/dist/blueprints/load.js +16 -2
  53. package/dist/blueprints/types.d.ts +4 -1
  54. package/dist/cli/admin.d.ts +39 -0
  55. package/dist/cli/admin.js +95 -0
  56. package/dist/cli/backup.js +4 -4
  57. package/dist/cli/doctor.d.ts +10 -1
  58. package/dist/cli/doctor.js +98 -33
  59. package/dist/cli/email-test.d.ts +3 -0
  60. package/dist/cli/email-test.js +20 -0
  61. package/dist/cli/files.d.ts +2 -6
  62. package/dist/cli/files.js +12 -2
  63. package/dist/cli/index.js +401 -95
  64. package/dist/cli/rebaseline.d.ts +10 -0
  65. package/dist/cli/rebaseline.js +117 -0
  66. package/dist/cli/scaffold.js +8 -8
  67. package/dist/cli/setup.js +16 -26
  68. package/dist/cli/upgrade.js +34 -7
  69. package/dist/env.d.ts +26 -2
  70. package/dist/env.js +48 -6
  71. package/dist/notification-fields.js +2 -1
  72. package/dist/server/admin-load.d.ts +85 -5
  73. package/dist/server/admin-load.js +26 -1
  74. package/dist/server/api-access.d.ts +4 -0
  75. package/dist/server/api-access.js +15 -2
  76. package/dist/server/api-keys.d.ts +96 -0
  77. package/dist/server/api-keys.js +115 -0
  78. package/dist/server/api-pagination.d.ts +3 -0
  79. package/dist/server/api.js +21 -63
  80. package/dist/server/auth.d.ts +10 -9
  81. package/dist/server/cms.d.ts +63 -21
  82. package/dist/server/cms.js +64 -7
  83. package/dist/server/db/auto-migrate.d.ts +0 -4
  84. package/dist/server/db/auto-migrate.js +12 -3
  85. package/dist/server/db/legacy.d.ts +13 -0
  86. package/dist/server/db/legacy.js +60 -0
  87. package/dist/server/db/migration-data.js +2 -34
  88. package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
  89. package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
  90. package/dist/server/db/migrations/meta/_journal.json +2 -58
  91. package/dist/server/db/schema.d.ts +119 -2
  92. package/dist/server/db/schema.js +23 -9
  93. package/dist/server/db/store.d.ts +25 -2
  94. package/dist/server/db/store.js +90 -26
  95. package/dist/server/forms.js +2 -1
  96. package/dist/server/hooks.js +155 -81
  97. package/dist/server/media/contracts.d.ts +115 -0
  98. package/dist/server/media/contracts.js +12 -0
  99. package/dist/server/media/deletions.d.ts +2 -1
  100. package/dist/server/media/deletions.js +3 -3
  101. package/dist/server/media/delivery.js +7 -11
  102. package/dist/server/media/processor-child.d.ts +2 -0
  103. package/dist/server/media/processor-child.js +236 -0
  104. package/dist/server/media/processor.d.ts +51 -0
  105. package/dist/server/media/processor.js +135 -0
  106. package/dist/server/media/render-math.d.ts +24 -0
  107. package/dist/server/media/render-math.js +50 -0
  108. package/dist/server/media/runner.d.ts +30 -1
  109. package/dist/server/media/runner.js +418 -165
  110. package/dist/server/media/service.d.ts +53 -11
  111. package/dist/server/media/service.js +307 -98
  112. package/dist/server/media/storage.d.ts +5 -0
  113. package/dist/server/media/storage.js +279 -0
  114. package/dist/server/media/upload-ticket.d.ts +12 -0
  115. package/dist/server/media/upload-ticket.js +35 -0
  116. package/dist/server/media/verify.d.ts +64 -0
  117. package/dist/server/media/verify.js +201 -0
  118. package/dist/server/platform/http.d.ts +27 -0
  119. package/dist/server/platform/http.js +77 -0
  120. package/dist/server/platform/index.d.ts +52 -0
  121. package/dist/server/platform/index.js +98 -0
  122. package/dist/server/platform/snapshots.d.ts +18 -0
  123. package/dist/server/platform/snapshots.js +110 -0
  124. package/dist/server/platform/volume.d.ts +20 -0
  125. package/dist/server/platform/volume.js +60 -0
  126. package/docs/acceptance.md +7 -5
  127. package/docs/api.md +56 -4
  128. package/docs/cloudflare.md +26 -152
  129. package/docs/content.md +20 -5
  130. package/docs/deployment.md +222 -57
  131. package/docs/email.md +6 -0
  132. package/docs/forms.md +2 -2
  133. package/docs/media.md +94 -21
  134. package/docs/package.md +21 -18
  135. package/docs/plans/0.7-self-hosted.md +264 -0
  136. package/docs/releases.md +37 -1
  137. package/docs/upgrades.md +72 -9
  138. package/package.json +37 -44
  139. package/templates/Dockerfile +32 -0
  140. package/templates/integration.ts +26 -5
  141. package/templates/openship.json +9 -0
  142. package/templates/railpack.json +1 -1
  143. package/templates/sandcms/blueprints/files/image.yaml +1 -1
  144. package/templates/sandcms/config.yaml +1 -1
  145. package/dist/cli/cloudflare.d.ts +0 -8
  146. package/dist/cli/cloudflare.js +0 -135
  147. package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
  148. package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
  149. package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
  150. package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
  151. package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
  152. package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
  153. package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
  154. package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
  155. package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
  156. package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
  157. package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
  158. package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
  159. package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
  160. package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
  161. package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
  162. package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
  163. package/dist/worker/index.d.ts +0 -10
  164. package/dist/worker/index.js +0 -460
  165. package/dist/worker/local.d.ts +0 -5
  166. package/dist/worker/local.js +0 -57
  167. package/dist/worker/source.d.ts +0 -2
  168. package/dist/worker/source.js +0 -31
  169. package/dist/worker/uploads.d.ts +0 -22
  170. package/dist/worker/uploads.js +0 -48
  171. package/templates/sandcms/worker/index.ts +0 -1
  172. package/templates/sandcms/worker/local.ts +0 -1
  173. package/templates/sandcms/worker/wrangler.jsonc +0 -6
  174. /package/dist/{worker → server/media}/svg.d.ts +0 -0
  175. /package/dist/{worker → server/media}/svg.js +0 -0
@@ -1,7 +1,16 @@
1
1
  import type { Blueprint } from '../blueprints/types.js';
2
+ export declare const pagesHref = "/admin/pages";
3
+ /** Pages in the default Pages group are listed on the Pages screen instead of the sidebar. */
4
+ export declare const inPagesIndex: (blueprint: Blueprint) => boolean;
2
5
  export declare function navigationGroups<T extends Blueprint>(blueprints: T[]): {
3
6
  group: string | false;
4
7
  blueprints: T[];
8
+ href?: string;
5
9
  }[];
6
10
  export declare const blueprintHref: (blueprint: Blueprint) => string;
7
11
  export declare const navigationSelected: (pathname: string, href: string) => boolean;
12
+ /** The public path of an entry from its blueprint's `preview` template, if any. */
13
+ export declare const previewPath: (blueprint: Pick<Blueprint, "preview"> | undefined, entry: {
14
+ id: string;
15
+ draft: Record<string, unknown>;
16
+ } | null | undefined) => string | null;
@@ -1,10 +1,23 @@
1
+ export const pagesHref = '/admin/pages';
2
+ /** Pages in the default Pages group are listed on the Pages screen instead of the sidebar. */
3
+ export const inPagesIndex = (blueprint) => blueprint.kind === 'page' && (blueprint.navigation?.group ?? 'Pages') === 'Pages';
1
4
  export function navigationGroups(blueprints) {
2
5
  const items = [];
3
6
  const groups = new Map();
4
7
  // Preserve the existing kind order, then blueprint order within each kind.
5
8
  for (const kind of ['page', 'collection', 'form', 'site']) {
6
9
  for (const blueprint of blueprints.filter((b) => b.kind === kind)) {
7
- const group = blueprint.navigation?.group ?? (kind === 'page' ? 'Pages' : false);
10
+ if (inPagesIndex(blueprint)) {
11
+ let item = groups.get(pagesHref);
12
+ if (!item) {
13
+ item = { group: 'Pages', blueprints: [], href: pagesHref };
14
+ groups.set(pagesHref, item);
15
+ items.push(item);
16
+ }
17
+ item.blueprints.push(blueprint);
18
+ continue;
19
+ }
20
+ const group = blueprint.navigation?.group ?? false;
8
21
  if (group === false) {
9
22
  items.push({ group, blueprints: [blueprint] });
10
23
  }
@@ -23,3 +36,9 @@ export function navigationGroups(blueprints) {
23
36
  }
24
37
  export const blueprintHref = (blueprint) => `/admin/${blueprint.kind === 'form' ? 'forms' : 'content'}/${blueprint.id}`;
25
38
  export const navigationSelected = (pathname, href) => pathname === href || pathname.startsWith(href + '/');
39
+ /** The public path of an entry from its blueprint's `preview` template, if any. */
40
+ export const previewPath = (blueprint, entry) => entry && blueprint?.preview
41
+ ? blueprint.preview
42
+ .replace('{slug}', encodeURIComponent(String(entry.draft.slug ?? entry.id)))
43
+ .replace('{id}', entry.id)
44
+ : null;
@@ -0,0 +1,7 @@
1
+ import type { Theme } from './theme.js';
2
+ export declare const themeContext: unique symbol;
3
+ export interface ThemeState {
4
+ readonly current: Theme;
5
+ set(theme: Theme): void;
6
+ }
7
+ export declare const useTheme: () => ThemeState;
@@ -0,0 +1,3 @@
1
+ import { getContext } from 'svelte';
2
+ export const themeContext = Symbol('sandcms-theme');
3
+ export const useTheme = () => getContext(themeContext);
@@ -0,0 +1,7 @@
1
+ /** Admin colour themes. `system` follows the operating system's light/dark preference. */
2
+ export declare const themes: readonly ["system", "light", "dark"];
3
+ export type Theme = (typeof themes)[number];
4
+ export declare const themeCookie = "sandcms-theme";
5
+ export declare function parseTheme(value: unknown): Theme;
6
+ /** Remember the choice for this browser; `system` clears the cookie. */
7
+ export declare function persistTheme(theme: Theme): void;
@@ -0,0 +1,14 @@
1
+ /** Admin colour themes. `system` follows the operating system's light/dark preference. */
2
+ export const themes = ['system', 'light', 'dark'];
3
+ export const themeCookie = 'sandcms-theme';
4
+ export function parseTheme(value) {
5
+ return themes.includes(value) ? value : 'system';
6
+ }
7
+ /** Remember the choice for this browser; `system` clears the cookie. */
8
+ export function persistTheme(theme) {
9
+ const secure = location.protocol === 'https:' ? '; Secure' : '';
10
+ document.cookie =
11
+ theme === 'system'
12
+ ? `${themeCookie}=; Path=/admin; Max-Age=0; SameSite=Lax${secure}`
13
+ : `${themeCookie}=${theme}; Path=/admin; Max-Age=31536000; SameSite=Lax${secure}`;
14
+ }
@@ -3,6 +3,7 @@ import type { Blueprint, FileBlueprint } from '../blueprints/types.js';
3
3
  import type { LucideIconData } from '@lucide/svelte';
4
4
  import type { documents, media, submissions, NotificationSettings } from '../server/db/schema.js';
5
5
  import type { CmsUser } from '../server/auth.js';
6
+ import type { Theme } from './theme.js';
6
7
  export type Entry = typeof documents.$inferSelect;
7
8
  export type Asset = typeof media.$inferSelect & {
8
9
  expectedVersion?: string;
@@ -14,6 +15,7 @@ export type Relations = Record<string, {
14
15
  }[]>;
15
16
  export interface AdminData {
16
17
  screen: string;
18
+ theme?: Theme;
17
19
  emailEnabled?: boolean;
18
20
  next?: string;
19
21
  invitations?: {
@@ -34,10 +36,10 @@ export interface AdminData {
34
36
  selectedSubmission?: string | null;
35
37
  user: CmsUser | null;
36
38
  site?: string;
39
+ logo?: string | false;
37
40
  blueprints?: (Blueprint & {
38
41
  navigationIcon: LucideIconData;
39
42
  })[];
40
- workerUrl?: string;
41
43
  fileBlueprints?: FileBlueprint[];
42
44
  defaultFileBlueprint?: string;
43
45
  mediaVersion?: string;
@@ -2,6 +2,8 @@ import type { Asset } from './types.js';
2
2
  export type UploadItem = {
3
3
  name: string;
4
4
  bytes: number;
5
+ /** Bytes the server has confirmed so far. */
6
+ sent?: number;
5
7
  state: 'idle' | 'uploading' | 'error' | 'done';
6
8
  error?: string;
7
9
  };
@@ -9,4 +11,9 @@ export type UploadFailure = {
9
11
  file: File;
10
12
  message: string;
11
13
  };
12
- export declare function uploadImages(files: File[], onAsset: (asset: Asset) => void, onProgress: (completed: number, total: number, failed: number) => void, blueprint?: string, onState?: (index: number, state: UploadItem['state'], error?: string) => void): Promise<UploadFailure[]>;
14
+ /** Attempts per chunk and the base backoff delay in milliseconds (doubled per retry). */
15
+ export declare const chunkRetry: {
16
+ attempts: number;
17
+ delay: number;
18
+ };
19
+ export declare function uploadImages(files: File[], onAsset: (asset: Asset) => void, onProgress: (completed: number, total: number, failed: number) => void, blueprint?: string, onState?: (index: number, state: UploadItem['state'], error?: string) => void, onBytes?: (index: number, sent: number, total: number) => void): Promise<UploadFailure[]>;
@@ -1,29 +1,106 @@
1
1
  import { api, message } from './client.js';
2
- export async function uploadImages(files, onAsset, onProgress, blueprint, onState) {
2
+ /** Attempts per chunk and the base backoff delay in milliseconds (doubled per retry). */
3
+ export const chunkRetry = { attempts: 3, delay: 500 };
4
+ /** Unfinished uploads, so retrying the same file resumes instead of starting over. */
5
+ const pending = new WeakMap();
6
+ const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
7
+ /**
8
+ * What the server holds for this upload, or null when it can't be read (expired, unknown or unreachable).
9
+ * `complete` means the chunks were already assembled, e.g. after a lost completion response.
10
+ */
11
+ async function stored(ticket) {
12
+ try {
13
+ const response = await fetch(ticket.url, { headers: ticket.headers });
14
+ if (response.ok) {
15
+ const data = (await response.json());
16
+ return { received: new Set(data.received), complete: !!data.complete };
17
+ }
18
+ }
19
+ catch {
20
+ // Unreachable; callers keep their own view.
21
+ }
22
+ return null;
23
+ }
24
+ /** PUT one chunk. Resolves to the stored indexes, or a failure marked transient when a retry may help. */
25
+ async function put(ticket, index, body) {
26
+ try {
27
+ const response = await fetch(`${ticket.url}?index=${index}`, {
28
+ method: 'PUT',
29
+ headers: ticket.headers,
30
+ body
31
+ });
32
+ if (response.ok)
33
+ return (await response.json()).received;
34
+ const data = await response.json().catch(() => ({}));
35
+ return {
36
+ error: new Error(data.error ?? data.message ?? 'Upload failed. Please try again.'),
37
+ transient: response.status >= 500 || [408, 429].includes(response.status)
38
+ };
39
+ }
40
+ catch {
41
+ return {
42
+ error: new Error('Upload interrupted. Check your connection and try again.'),
43
+ transient: true
44
+ };
45
+ }
46
+ }
47
+ /** Send the chunks the server lacks, in order, retrying transient failures with backoff. */
48
+ async function transfer(file, ticket, received, onBytes) {
49
+ const count = Math.max(1, Math.ceil(file.size / ticket.chunkSize));
50
+ const chunk = (index) => file.slice(index * ticket.chunkSize, (index + 1) * ticket.chunkSize);
51
+ const sent = () => [...received].reduce((total, index) => total + chunk(index).size, 0);
52
+ onBytes(sent());
53
+ for (let index = 0; index < count; index++) {
54
+ if (received.has(index))
55
+ continue;
56
+ for (let attempt = 1;; attempt++) {
57
+ const result = await put(ticket, index, chunk(index));
58
+ if (Array.isArray(result)) {
59
+ received = new Set([...received, ...result, index]);
60
+ break;
61
+ }
62
+ if (!result.transient || attempt >= chunkRetry.attempts)
63
+ throw result.error;
64
+ await wait(chunkRetry.delay * 2 ** (attempt - 1));
65
+ const status = await stored(ticket);
66
+ if (status?.complete)
67
+ return;
68
+ received = status?.received ?? received;
69
+ if (received.has(index))
70
+ break;
71
+ }
72
+ onBytes(sent());
73
+ }
74
+ }
75
+ export async function uploadImages(files, onAsset, onProgress, blueprint, onState, onBytes) {
3
76
  const failures = [];
4
77
  onProgress(0, files.length, 0);
5
- // Transfer one file at a time directly to private R2 staging.
78
+ // Upload one file at a time, in chunks the site stores until completion.
6
79
  for (const [index, file] of files.entries()) {
7
80
  onState?.(index, 'uploading');
8
81
  try {
9
- const signed = await api('media/upload', {
10
- name: file.name,
11
- type: file.type,
12
- size: file.size,
13
- blueprint
14
- });
15
- const response = await fetch(signed.url, {
16
- method: 'PUT',
17
- headers: signed.headers,
18
- body: file
19
- });
20
- if (!response.ok)
21
- throw new Error('Upload failed. Please try again.');
82
+ // Resume when the server still knows this upload; an expired or unknown one (404/410) starts over.
83
+ let ticket = pending.get(file);
84
+ let status = ticket ? await stored(ticket) : null;
85
+ if (!ticket || !status) {
86
+ ticket = await api('media/upload', {
87
+ name: file.name,
88
+ type: file.type,
89
+ size: file.size,
90
+ blueprint
91
+ });
92
+ pending.set(file, ticket);
93
+ status = { received: new Set(), complete: false };
94
+ }
95
+ if (status.complete)
96
+ onBytes?.(index, file.size, file.size);
97
+ else
98
+ await transfer(file, ticket, status.received, (sent) => onBytes?.(index, sent, file.size));
22
99
  // Completion is idempotent; retry a lost response without transferring the file again.
23
100
  let asset;
24
101
  for (let attempt = 0; attempt < 3; attempt++) {
25
102
  try {
26
- asset = await api('media/upload/complete', { id: signed.id });
103
+ asset = await api('media/upload/complete', { id: ticket.id });
27
104
  break;
28
105
  }
29
106
  catch (error) {
@@ -31,6 +108,7 @@ export async function uploadImages(files, onAsset, onProgress, blueprint, onStat
31
108
  throw error;
32
109
  }
33
110
  }
111
+ pending.delete(file);
34
112
  onAsset(asset);
35
113
  onState?.(index, 'done');
36
114
  }
@@ -4,6 +4,7 @@ export const imageMimeTypes = [
4
4
  'image/webp',
5
5
  'image/avif',
6
6
  'image/gif',
7
+ 'image/tiff',
7
8
  'image/svg+xml'
8
9
  ];
9
10
  export function fileBlueprints(definition) {
@@ -0,0 +1,6 @@
1
+ /** Turns a machine key such as `meta_title` or `ctaLabel` into a readable label. */
2
+ export declare function humanizeKey(key: string): string;
3
+ /** Explicit blueprint labels win; otherwise the key is humanized. */
4
+ export declare function fieldLabel(key: string, field?: {
5
+ label?: string;
6
+ }): string;
@@ -0,0 +1,14 @@
1
+ /** Turns a machine key such as `meta_title` or `ctaLabel` into a readable label. */
2
+ export function humanizeKey(key) {
3
+ const words = key
4
+ .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
5
+ .replace(/[_-]+/g, ' ')
6
+ .trim()
7
+ .replace(/\s+/g, ' ')
8
+ .toLowerCase();
9
+ return words ? words.charAt(0).toUpperCase() + words.slice(1) : key;
10
+ }
11
+ /** Explicit blueprint labels win; otherwise the key is humanized. */
12
+ export function fieldLabel(key, field) {
13
+ return field?.label ?? humanizeKey(key);
14
+ }
@@ -204,12 +204,26 @@ const anyBlueprint = z.discriminatedUnion('kind', [blueprint, fileBlueprint]);
204
204
  const config = z
205
205
  .object({
206
206
  name: z.string().min(1),
207
+ /** Admin sidebar logo: a root-relative path or http(s) URL, or false for the site initial. */
208
+ logo: z
209
+ .union([
210
+ z.literal(false),
211
+ z
212
+ .string()
213
+ .regex(/^(\/(?!\/)|https?:\/\/)\S+$/, 'Use a path starting with / (for example /logo.svg), an http(s) URL, or false')
214
+ ])
215
+ .optional(),
207
216
  media: z
208
217
  .object({
209
- workerUrl: z.url(),
218
+ /** Removed in 0.8.0. Still accepted and ignored so existing config.yaml files keep loading. */
219
+ workerUrl: z.string().optional(),
210
220
  photographerCollection: key.optional(),
211
221
  defaultFileBlueprint: key.optional(),
212
- uploadLimit: z.number().int().min(1).max(100_000_000).default(100_000_000),
222
+ uploadLimit: z.number().int().min(1).max(500_000_000).default(100_000_000),
223
+ /** Largest accepted source image area in pixels. */
224
+ maxPixels: z.number().int().min(1_000_000).max(1_000_000_000).default(100_000_000),
225
+ /** Optional per-site quota for originals and variants, in bytes. */
226
+ maxStorage: z.number().int().min(1).optional(),
213
227
  presets: z
214
228
  .record(z.string().regex(/^[a-z][a-z0-9_-]*$/, 'Use a lowercase media preset key'), z
215
229
  .object({
@@ -80,11 +80,14 @@ export interface ImagePreset {
80
80
  }
81
81
  export interface SiteConfig {
82
82
  name: string;
83
+ /** Admin sidebar logo; omitted uses the page favicon, false shows the site initial. */
84
+ logo?: string | false;
83
85
  media: {
84
- workerUrl: string;
85
86
  photographerCollection?: string;
86
87
  defaultFileBlueprint?: string;
87
88
  uploadLimit: number;
89
+ maxPixels: number;
90
+ maxStorage?: number;
88
91
  presets: Record<string, ImagePreset>;
89
92
  };
90
93
  }
@@ -0,0 +1,39 @@
1
+ import type { Store } from '../server/db/store.js';
2
+ export declare function findUser(store: Store, email: string): {
3
+ id: string;
4
+ name: string;
5
+ email: string;
6
+ emailVerified: boolean;
7
+ image: string | null;
8
+ createdAt: Date;
9
+ updatedAt: Date;
10
+ role: "admin" | "editor";
11
+ mustChangePassword: boolean;
12
+ twoFactorEnabled: boolean | null;
13
+ };
14
+ export declare function listUsers(store: Store): {
15
+ email: string;
16
+ name: string;
17
+ role: "admin" | "editor";
18
+ twoFactor: boolean;
19
+ mustChangePassword: boolean;
20
+ activeSessions: number;
21
+ createdAt: string;
22
+ }[];
23
+ export declare function removeUser(store: Store, email: string): {
24
+ id: string;
25
+ name: string;
26
+ email: string;
27
+ emailVerified: boolean;
28
+ image: string | null;
29
+ createdAt: Date;
30
+ updatedAt: Date;
31
+ role: "admin" | "editor";
32
+ mustChangePassword: boolean;
33
+ twoFactorEnabled: boolean | null;
34
+ };
35
+ export declare function setRole(store: Store, email: string, role: string): boolean;
36
+ /** End the sessions of one user, or of every user when `email` is undefined. Returns the number ended. */
37
+ export declare function signOut(store: Store, email?: string): number;
38
+ /** Revoke every API key of the user with this email, auditing each. Returns the number revoked. */
39
+ export declare function revokeOwnerKeys(store: Store, email: string): number;
@@ -0,0 +1,95 @@
1
+ // Operator commands for users and their API keys. They act as `operator` in the audit log.
2
+ import { count, eq, gt } from 'drizzle-orm';
3
+ import { apikey, audit, session, user } from '../server/db/schema.js';
4
+ import { deleteUser } from '../server/auth.js';
5
+ import { revokeApiKey } from '../server/api-keys.js';
6
+ const ACTOR = 'operator';
7
+ function auditEntry(db, action, detail) {
8
+ db.insert(audit)
9
+ .values({ id: crypto.randomUUID(), action, actor: ACTOR, detail, createdAt: Date.now() })
10
+ .run();
11
+ }
12
+ export function findUser(store, email) {
13
+ const found = store.db
14
+ .select()
15
+ .from(user)
16
+ .where(eq(user.email, email.trim().toLowerCase()))
17
+ .get();
18
+ if (!found)
19
+ throw new Error(`No user with email ${email}`);
20
+ return found;
21
+ }
22
+ export function listUsers(store) {
23
+ const now = new Date();
24
+ const sessions = new Map(store.db
25
+ .select({ userId: session.userId, count: count() })
26
+ .from(session)
27
+ .where(gt(session.expiresAt, now))
28
+ .groupBy(session.userId)
29
+ .all()
30
+ .map((row) => [row.userId, row.count]));
31
+ return store.db
32
+ .select()
33
+ .from(user)
34
+ .orderBy(user.email)
35
+ .all()
36
+ .map((u) => ({
37
+ email: u.email,
38
+ name: u.name,
39
+ role: u.role,
40
+ twoFactor: Boolean(u.twoFactorEnabled),
41
+ mustChangePassword: u.mustChangePassword,
42
+ activeSessions: sessions.get(u.id) ?? 0,
43
+ createdAt: u.createdAt.toISOString()
44
+ }));
45
+ }
46
+ export function removeUser(store, email) {
47
+ const target = findUser(store, email);
48
+ deleteUser(store, target.id, ACTOR);
49
+ return target;
50
+ }
51
+ export function setRole(store, email, role) {
52
+ if (role !== 'admin' && role !== 'editor')
53
+ throw new Error('Role must be admin or editor');
54
+ return store.db.transaction((tx) => {
55
+ const target = tx.select().from(user).where(eq(user.email, email.trim().toLowerCase())).get();
56
+ if (!target)
57
+ throw new Error(`No user with email ${email}`);
58
+ if (target.role === role)
59
+ return false;
60
+ if (target.role === 'admin' &&
61
+ tx.select({ id: user.id }).from(user).where(eq(user.role, 'admin')).all().length <= 1)
62
+ throw new Error('Keep at least one admin');
63
+ tx.update(user).set({ role, updatedAt: new Date() }).where(eq(user.id, target.id)).run();
64
+ auditEntry(tx, 'user.role', { id: target.id, from: target.role, to: role });
65
+ return true;
66
+ });
67
+ }
68
+ /** End the sessions of one user, or of every user when `email` is undefined. Returns the number ended. */
69
+ export function signOut(store, email) {
70
+ return store.db.transaction((tx) => {
71
+ let ended;
72
+ if (email) {
73
+ const target = tx.select().from(user).where(eq(user.email, email.trim().toLowerCase())).get();
74
+ if (!target)
75
+ throw new Error(`No user with email ${email}`);
76
+ ended = tx.delete(session).where(eq(session.userId, target.id)).returning().all().length;
77
+ auditEntry(tx, 'user.sign-out', { id: target.id, sessions: ended });
78
+ }
79
+ else {
80
+ ended = tx.delete(session).returning().all().length;
81
+ auditEntry(tx, 'user.sign-out-all', { sessions: ended });
82
+ }
83
+ return ended;
84
+ });
85
+ }
86
+ /** Revoke every API key of the user with this email, auditing each. Returns the number revoked. */
87
+ export function revokeOwnerKeys(store, email) {
88
+ const owner = findUser(store, email);
89
+ const ids = store.db
90
+ .select({ id: apikey.id })
91
+ .from(apikey)
92
+ .where(eq(apikey.referenceId, owner.id))
93
+ .all();
94
+ return ids.filter((key) => revokeApiKey(store, key.id, ACTOR)).length;
95
+ }
@@ -1,7 +1,7 @@
1
1
  import { Database } from 'bun:sqlite';
2
2
  import { existsSync, mkdirSync, renameSync, unlinkSync, chmodSync, realpathSync } from 'node:fs';
3
3
  import { resolve, dirname } from 'node:path';
4
- import { openStore, volumeGuard, pendingMigrations, SCHEMA_VERSION, databasePath } from '../server/db/store.js';
4
+ import { openStore, volumeGuard, schemaHistory, databasePath } from '../server/db/store.js';
5
5
  export function verifyBackup(path) {
6
6
  const db = new Database(path, { readonly: true });
7
7
  try {
@@ -9,12 +9,12 @@ export function verifyBackup(path) {
9
9
  if (integrity.integrity_check !== 'ok')
10
10
  throw new Error('Backup failed integrity check');
11
11
  const version = db.query('PRAGMA user_version').get();
12
- if (version.user_version > SCHEMA_VERSION || version.user_version < 1)
12
+ if (version.user_version < 1)
13
13
  throw new Error('Incompatible backup schema');
14
14
  if (db.query('PRAGMA foreign_key_check').all().length)
15
15
  throw new Error('Backup contains invalid references');
16
- // Verify numbered migration hashes as well as user_version.
17
- pendingMigrations({ sqlite: db });
16
+ // Names and hashes: a newer release's non-breaking migrations are accepted, like at start-up.
17
+ schemaHistory(db);
18
18
  }
19
19
  finally {
20
20
  db.close();
@@ -1 +1,10 @@
1
- export declare function doctor(root: string, database: string): Promise<void>;
1
+ /** The Bun adapter's BODY_SIZE_LIMIT format: bytes with an optional K/M/G suffix (default 512K). */
2
+ export declare function parseBodySizeLimit(value?: string): number;
3
+ export interface DoctorCheck {
4
+ status: 'ok' | 'fail' | 'warn' | 'info';
5
+ message: string;
6
+ }
7
+ /** With `json`, prints one `{ ok, checks }` object instead of lines. Throws when any check fails. */
8
+ export declare function doctor(root: string, database: string, env?: NodeJS.ProcessEnv, { json }?: {
9
+ json?: boolean | undefined;
10
+ }): Promise<DoctorCheck[]>;