sandcms 0.5.3 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -3
- package/dist/admin/Account.svelte +4 -1
- package/dist/admin/ApiKeys.svelte +159 -0
- package/dist/admin/ApiKeys.svelte.d.ts +3 -0
- package/dist/admin/AssetAttachment.svelte +6 -4
- package/dist/admin/BlueprintFields.svelte +86 -0
- package/dist/admin/BlueprintFields.svelte.d.ts +15 -0
- package/dist/admin/Collection.svelte +40 -7
- package/dist/admin/Editor.svelte +57 -17
- package/dist/admin/Fields.svelte +217 -144
- package/dist/admin/Fields.svelte.d.ts +1 -0
- package/dist/admin/FocusPicker.svelte +136 -0
- package/dist/admin/FocusPicker.svelte.d.ts +11 -0
- package/dist/admin/Gallery.svelte +40 -34
- package/dist/admin/GlobalSearch.svelte +56 -0
- package/dist/admin/GlobalSearch.svelte.d.ts +3 -0
- package/dist/admin/Inbox.svelte +8 -5
- package/dist/admin/LinkField.svelte +116 -0
- package/dist/admin/LinkField.svelte.d.ts +17 -0
- package/dist/admin/MediaLibrary.svelte +41 -14
- package/dist/admin/MediaPicker.svelte +12 -2
- package/dist/admin/NotificationSettings.svelte +2 -2
- package/dist/admin/SearchList.svelte +55 -0
- package/dist/admin/SearchList.svelte.d.ts +42 -0
- package/dist/admin/SelectField.svelte +3 -1
- package/dist/admin/SelectField.svelte.d.ts +1 -0
- package/dist/admin/Shell.svelte +4 -2
- package/dist/admin/UnsavedChanges.svelte +1 -1
- package/dist/admin/Users.svelte +11 -5
- package/dist/admin/client.js +2 -1
- package/dist/admin/generated/admin.css +109 -0
- package/dist/admin/types.d.ts +5 -1
- package/dist/admin/uploads.js +27 -6
- package/dist/blueprints/conditions.d.ts +2 -0
- package/dist/blueprints/conditions.js +4 -0
- package/dist/blueprints/extends.d.ts +5 -0
- package/dist/blueprints/extends.js +76 -0
- package/dist/blueprints/files.d.ts +3 -1
- package/dist/blueprints/files.js +35 -2
- package/dist/blueprints/layout.d.ts +4 -0
- package/dist/blueprints/layout.js +12 -0
- package/dist/blueprints/load.d.ts +1 -1
- package/dist/blueprints/load.js +123 -12
- package/dist/blueprints/types.d.ts +35 -1
- package/dist/blueprints/validate.js +30 -6
- package/dist/cli/cloudflare.js +15 -3
- package/dist/cli/doctor.js +6 -3
- package/dist/cli/files.js +1 -1
- package/dist/cli/scaffold.js +8 -6
- package/dist/cli/setup.js +9 -2
- package/dist/cli/upgrade.js +2 -1
- package/dist/email-failure.d.ts +17 -0
- package/dist/email-failure.js +22 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.js +1 -0
- package/dist/link.d.ts +17 -0
- package/dist/link.js +44 -0
- package/dist/notification-fields.js +1 -1
- package/dist/search.d.ts +8 -0
- package/dist/search.js +1 -0
- package/dist/server/access.d.ts +2 -0
- package/dist/server/access.js +59 -23
- package/dist/server/admin-load.d.ts +11 -2
- package/dist/server/admin-load.js +4 -2
- package/dist/server/api-access.d.ts +31 -0
- package/dist/server/api-access.js +52 -0
- package/dist/server/api-pagination.d.ts +34 -0
- package/dist/server/api-pagination.js +87 -0
- package/dist/server/api.js +224 -32
- package/dist/server/auth.d.ts +1150 -0
- package/dist/server/auth.js +11 -1
- package/dist/server/cms.d.ts +1208 -4
- package/dist/server/cms.js +2 -0
- package/dist/server/content.d.ts +17 -2
- package/dist/server/content.js +89 -14
- package/dist/server/db/migration-data.js +24 -0
- package/dist/server/db/migrations/0001_independent_password_resets.sql +3 -0
- package/dist/server/db/migrations/0002_email_failure_reason.sql +1 -0
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +10 -0
- package/dist/server/db/migrations/0004_agent_api_keys.sql +38 -0
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +3 -0
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +7 -0
- package/dist/server/db/migrations/meta/0001_snapshot.json +1197 -0
- package/dist/server/db/migrations/meta/0002_snapshot.json +1204 -0
- package/dist/server/db/migrations/meta/0003_snapshot.json +1281 -0
- package/dist/server/db/migrations/meta/0004_snapshot.json +1546 -0
- package/dist/server/db/migrations/meta/0005_snapshot.json +1572 -0
- package/dist/server/db/migrations/meta/0006_snapshot.json +1627 -0
- package/dist/server/db/migrations/meta/_journal.json +42 -0
- package/dist/server/db/schema.d.ts +742 -2
- package/dist/server/db/schema.js +77 -5
- package/dist/server/email/index.d.ts +11 -1
- package/dist/server/email/index.js +69 -6
- package/dist/server/forms.js +12 -2
- package/dist/server/hooks.d.ts +1 -1
- package/dist/server/hooks.js +37 -14
- package/dist/server/index.d.ts +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/links.d.ts +5 -0
- package/dist/server/links.js +44 -0
- package/dist/server/media/deletions.d.ts +2 -0
- package/dist/server/media/deletions.js +58 -0
- package/dist/server/media/presets.d.ts +10 -2
- package/dist/server/media/presets.js +14 -2
- package/dist/server/media/runner.d.ts +1 -1
- package/dist/server/media/runner.js +105 -8
- package/dist/server/media/service.d.ts +41 -3
- package/dist/server/media/service.js +146 -33
- package/dist/server/notifications.d.ts +1 -0
- package/dist/server/notifications.js +4 -2
- package/dist/server/request.d.ts +2 -0
- package/dist/server/request.js +5 -0
- package/dist/server/search.d.ts +13 -0
- package/dist/server/search.js +97 -0
- package/dist/worker/index.d.ts +3 -3
- package/dist/worker/index.js +205 -64
- package/dist/worker/local.d.ts +5 -0
- package/dist/worker/local.js +57 -0
- package/dist/worker/source.d.ts +1 -1
- package/dist/worker/source.js +2 -2
- package/dist/worker/uploads.d.ts +22 -0
- package/dist/worker/uploads.js +46 -0
- package/docs/api.md +73 -0
- package/docs/cloudflare.md +35 -8
- package/docs/content.md +162 -4
- package/docs/deployment.md +29 -4
- package/docs/email.md +11 -7
- package/docs/forms.md +3 -1
- package/docs/media.md +33 -4
- package/docs/package.md +6 -4
- package/docs/releases.md +46 -1
- package/docs/upgrades.md +55 -3
- package/package.json +19 -10
- package/templates/hooks.server.ts +2 -2
- package/templates/integration.ts +1 -1
- package/templates/routes/admin/+page.server.ts +1 -1
- package/templates/routes/api/+server.ts +1 -1
- package/templates/sandcms/blueprints/collections/projects.yaml +16 -8
- package/templates/sandcms/blueprints/fields/seo.yaml +5 -0
- package/templates/sandcms/blueprints/files/image.yaml +1 -0
- package/templates/sandcms/blueprints/pages/home.yaml +1 -0
- package/templates/sandcms/config.yaml +1 -0
- package/templates/sandcms/worker/local.ts +1 -0
- package/templates/sandcms/worker/wrangler.jsonc +1 -2
package/dist/server/api.js
CHANGED
|
@@ -2,8 +2,24 @@ import { json, error } from '@sveltejs/kit';
|
|
|
2
2
|
import { createHash } from 'node:crypto';
|
|
3
3
|
import { rateLimit } from './forms.js';
|
|
4
4
|
import { createUser } from './auth.js';
|
|
5
|
-
import { boundedJson,
|
|
5
|
+
import { boundedJson, clientAddress } from './request.js';
|
|
6
|
+
import { apiPrincipal } from './api-access.js';
|
|
7
|
+
import { apiRequests, audit, apikey, user } from './db/schema.js';
|
|
8
|
+
import { eq, lt, desc } from 'drizzle-orm';
|
|
9
|
+
import { contentPage, mediaPage } from './api-pagination.js';
|
|
10
|
+
import { globalSearch } from './search.js';
|
|
6
11
|
import { ValidationError } from '../blueprints/validate.js';
|
|
12
|
+
const replayRetention = 48 * 60 * 60 * 1000;
|
|
13
|
+
const lastPruned = new WeakMap();
|
|
14
|
+
function orderedJson(value) {
|
|
15
|
+
if (Array.isArray(value))
|
|
16
|
+
return value.map(orderedJson);
|
|
17
|
+
if (value && typeof value === 'object')
|
|
18
|
+
return Object.fromEntries(Object.entries(value)
|
|
19
|
+
.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
|
|
20
|
+
.map(([key, child]) => [key, orderedJson(child)]));
|
|
21
|
+
return value;
|
|
22
|
+
}
|
|
7
23
|
export async function apiHandler(cms, event) {
|
|
8
24
|
const publicPath = event.params.path ?? '';
|
|
9
25
|
if (['access/request-reset', 'access/redeem'].includes(publicPath)) {
|
|
@@ -13,10 +29,7 @@ export async function apiHandler(cms, event) {
|
|
|
13
29
|
error(403, 'Invalid request origin');
|
|
14
30
|
if (!cms.email.enabled)
|
|
15
31
|
error(404, 'Email is not configured');
|
|
16
|
-
const
|
|
17
|
-
? event.request.headers.get(cms.options.trustedProxyHeader)
|
|
18
|
-
: null;
|
|
19
|
-
const client = proxyClient || event.getClientAddress();
|
|
32
|
+
const client = clientAddress(event, cms.options.trustedProxyHeader);
|
|
20
33
|
try {
|
|
21
34
|
rateLimit(cms.store, 'access-ip:' + createHash('sha256').update(client).digest('hex'), 10);
|
|
22
35
|
}
|
|
@@ -38,13 +51,62 @@ export async function apiHandler(cms, event) {
|
|
|
38
51
|
return json({ error: cause instanceof Error ? cause.message : 'Unable to use this link' }, { status: 400 });
|
|
39
52
|
}
|
|
40
53
|
}
|
|
41
|
-
const session = await cms.auth.api.getSession({ headers: event.request.headers });
|
|
42
|
-
if (!session)
|
|
43
|
-
error(401, 'Sign in required');
|
|
44
|
-
if (session.user.mustChangePassword)
|
|
45
|
-
error(403, 'Change your temporary password first');
|
|
46
54
|
const path = event.params.path ?? '';
|
|
55
|
+
const session = await apiPrincipal(cms, event.request, path);
|
|
47
56
|
try {
|
|
57
|
+
if (event.request.method === 'GET') {
|
|
58
|
+
switch (path) {
|
|
59
|
+
case 'search':
|
|
60
|
+
return json(globalSearch(cms, event.url.searchParams));
|
|
61
|
+
case 'schema':
|
|
62
|
+
return json({
|
|
63
|
+
blueprints: cms.definition.blueprints.filter((b) => b.kind !== 'form'),
|
|
64
|
+
fileBlueprints: cms.definition.fileBlueprints,
|
|
65
|
+
media: {
|
|
66
|
+
defaultFileBlueprint: cms.definition.config.media.defaultFileBlueprint,
|
|
67
|
+
uploadLimit: cms.definition.config.media.uploadLimit,
|
|
68
|
+
presets: cms.definition.config.media.presets
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
case 'content/list':
|
|
72
|
+
return json(contentPage(cms, event.url.searchParams));
|
|
73
|
+
case 'content/get': {
|
|
74
|
+
const entry = cms.content.get(event.url.searchParams.get('id') ?? '');
|
|
75
|
+
if (!entry ||
|
|
76
|
+
!cms.definition.blueprints.some((b) => b.id === entry.blueprint && b.kind !== 'form'))
|
|
77
|
+
error(404, 'Entry not found');
|
|
78
|
+
return json(entry);
|
|
79
|
+
}
|
|
80
|
+
case 'media/list':
|
|
81
|
+
return json(mediaPage(cms, event.url.searchParams));
|
|
82
|
+
case 'keys/list':
|
|
83
|
+
if (session.user.role !== 'admin')
|
|
84
|
+
error(403, 'Only admins can manage API keys');
|
|
85
|
+
return json({
|
|
86
|
+
apiKeys: cms.store.db
|
|
87
|
+
.select({
|
|
88
|
+
id: apikey.id,
|
|
89
|
+
name: apikey.name,
|
|
90
|
+
start: apikey.start,
|
|
91
|
+
prefix: apikey.prefix,
|
|
92
|
+
expiresAt: apikey.expiresAt,
|
|
93
|
+
lastRequest: apikey.lastRequest,
|
|
94
|
+
enabled: apikey.enabled,
|
|
95
|
+
referenceId: apikey.referenceId,
|
|
96
|
+
owner: user.email,
|
|
97
|
+
permissions: apikey.permissions
|
|
98
|
+
})
|
|
99
|
+
.from(apikey)
|
|
100
|
+
.innerJoin(user, eq(user.id, apikey.referenceId))
|
|
101
|
+
.orderBy(desc(apikey.createdAt), desc(apikey.id))
|
|
102
|
+
.all()
|
|
103
|
+
.map((key) => ({
|
|
104
|
+
...key,
|
|
105
|
+
permissions: key.permissions ? JSON.parse(key.permissions) : null
|
|
106
|
+
}))
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
}
|
|
48
110
|
if (event.request.method === 'GET' && path.startsWith('forms/') && path.endsWith('/export')) {
|
|
49
111
|
const formId = path.split('/')[1];
|
|
50
112
|
return new Response(cms.forms.csv(formId), {
|
|
@@ -56,30 +118,160 @@ export async function apiHandler(cms, event) {
|
|
|
56
118
|
}
|
|
57
119
|
if (event.request.method !== 'POST')
|
|
58
120
|
error(405, 'Method not allowed');
|
|
59
|
-
if (path === 'media/upload') {
|
|
60
|
-
const bytes = await boundedBytes(event.request, cms.definition.config.media.uploadLimit + 16384);
|
|
61
|
-
const data = await new Request(event.request.url, {
|
|
62
|
-
method: 'POST',
|
|
63
|
-
headers: event.request.headers,
|
|
64
|
-
body: bytes
|
|
65
|
-
}).formData();
|
|
66
|
-
const file = data.get('file');
|
|
67
|
-
if (!(file instanceof File))
|
|
68
|
-
throw new Error('Choose a file');
|
|
69
|
-
const blueprint = data.get('blueprint');
|
|
70
|
-
return json(await cms.media.upload(file, typeof blueprint === 'string' && blueprint ? blueprint : undefined));
|
|
71
|
-
}
|
|
72
121
|
const body = await boundedJson(event.request), id = typeof body.id === 'string' ? body.id : '', blueprint = typeof body.blueprint === 'string' ? body.blueprint : '';
|
|
122
|
+
if ([
|
|
123
|
+
'content/save',
|
|
124
|
+
'content/duplicate',
|
|
125
|
+
'content/publish',
|
|
126
|
+
'content/unpublish',
|
|
127
|
+
'content/delete'
|
|
128
|
+
].includes(path)) {
|
|
129
|
+
const retryKey = event.request.headers.get('idempotency-key');
|
|
130
|
+
if (session.keyId && !retryKey)
|
|
131
|
+
error(400, 'Idempotency-Key is required for content writes');
|
|
132
|
+
if (retryKey !== null && (!retryKey.trim() || retryKey.length > 128))
|
|
133
|
+
error(400, 'Idempotency-Key must contain 1–128 characters');
|
|
134
|
+
const requestId = retryKey
|
|
135
|
+
? createHash('sha256')
|
|
136
|
+
.update(JSON.stringify([session.keyId ?? session.user.id, retryKey]))
|
|
137
|
+
.digest('hex')
|
|
138
|
+
: null;
|
|
139
|
+
const fingerprint = createHash('sha256')
|
|
140
|
+
.update(JSON.stringify([path, orderedJson(body)]))
|
|
141
|
+
.digest('hex');
|
|
142
|
+
const now = Date.now(), cutoff = now - replayRetention;
|
|
143
|
+
const prune = now - (lastPruned.get(cms.store) ?? -Infinity) >= 60000;
|
|
144
|
+
const result = cms.store.db.transaction(() => {
|
|
145
|
+
if (prune)
|
|
146
|
+
cms.store.db.delete(apiRequests).where(lt(apiRequests.createdAt, cutoff)).run();
|
|
147
|
+
if (requestId) {
|
|
148
|
+
const previous = cms.store.db
|
|
149
|
+
.select()
|
|
150
|
+
.from(apiRequests)
|
|
151
|
+
.where(eq(apiRequests.id, requestId))
|
|
152
|
+
.get();
|
|
153
|
+
if (previous && previous.createdAt >= cutoff) {
|
|
154
|
+
if (previous.fingerprint !== fingerprint)
|
|
155
|
+
error(409, 'Idempotency-Key was already used for another request');
|
|
156
|
+
return previous.response;
|
|
157
|
+
}
|
|
158
|
+
if (previous)
|
|
159
|
+
cms.store.db.delete(apiRequests).where(eq(apiRequests.id, requestId)).run();
|
|
160
|
+
}
|
|
161
|
+
if (path === 'content/unpublish' || (session.keyId && path === 'content/delete')) {
|
|
162
|
+
if (!Number.isInteger(body.version) || Number(body.version) < 1)
|
|
163
|
+
error(400, 'The current document version is required');
|
|
164
|
+
const current = cms.content.get(id);
|
|
165
|
+
if (!current)
|
|
166
|
+
error(404, 'Entry not found');
|
|
167
|
+
if (current.version !== body.version)
|
|
168
|
+
error(409, 'Entry changed; read it again before writing');
|
|
169
|
+
}
|
|
170
|
+
let response;
|
|
171
|
+
switch (path) {
|
|
172
|
+
case 'content/duplicate':
|
|
173
|
+
response = cms.content.duplicate(id, Number(body.version));
|
|
174
|
+
break;
|
|
175
|
+
case 'content/save':
|
|
176
|
+
response = cms.content.save(blueprint, body.data, id || undefined, Number(body.version));
|
|
177
|
+
break;
|
|
178
|
+
case 'content/publish':
|
|
179
|
+
response = cms.content.publish(id, Number(body.version));
|
|
180
|
+
break;
|
|
181
|
+
case 'content/unpublish':
|
|
182
|
+
response = cms.content.unpublish(id, Number(body.version));
|
|
183
|
+
break;
|
|
184
|
+
default:
|
|
185
|
+
cms.content.remove(id);
|
|
186
|
+
response = { ok: true };
|
|
187
|
+
}
|
|
188
|
+
if (requestId)
|
|
189
|
+
cms.store.db
|
|
190
|
+
.insert(apiRequests)
|
|
191
|
+
.values({
|
|
192
|
+
id: requestId,
|
|
193
|
+
userId: session.user.id,
|
|
194
|
+
fingerprint,
|
|
195
|
+
response,
|
|
196
|
+
createdAt: now
|
|
197
|
+
})
|
|
198
|
+
.run();
|
|
199
|
+
if (session.keyId)
|
|
200
|
+
cms.store.db
|
|
201
|
+
.insert(audit)
|
|
202
|
+
.values({
|
|
203
|
+
id: crypto.randomUUID(),
|
|
204
|
+
actor: session.user.id,
|
|
205
|
+
action: path.replace('/', '.'),
|
|
206
|
+
detail: {
|
|
207
|
+
keyId: session.keyId,
|
|
208
|
+
id: typeof response === 'object' && response && 'id' in response ? response.id : id
|
|
209
|
+
},
|
|
210
|
+
createdAt: Date.now()
|
|
211
|
+
})
|
|
212
|
+
.run();
|
|
213
|
+
return response;
|
|
214
|
+
});
|
|
215
|
+
if (prune)
|
|
216
|
+
lastPruned.set(cms.store, now);
|
|
217
|
+
return json(result);
|
|
218
|
+
}
|
|
73
219
|
switch (path) {
|
|
74
|
-
case '
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
220
|
+
case 'keys/create': {
|
|
221
|
+
if (session.user.role !== 'admin')
|
|
222
|
+
error(403, 'Only admins can manage API keys');
|
|
223
|
+
if (body.scope !== 'read' && body.scope !== 'write')
|
|
224
|
+
error(400, 'Scope must be read or write');
|
|
225
|
+
if (typeof body.name !== 'string' || !body.name.trim() || body.name.length > 100)
|
|
226
|
+
error(400, 'Use a key name with 1–100 characters');
|
|
227
|
+
const expiresIn = body.expiresIn ?? 60 * 60 * 24 * (body.scope === 'write' ? 7 : 30);
|
|
228
|
+
if (typeof expiresIn !== 'number' ||
|
|
229
|
+
!Number.isInteger(expiresIn) ||
|
|
230
|
+
expiresIn < 86400 ||
|
|
231
|
+
expiresIn > 86400 * 365)
|
|
232
|
+
error(400, 'expiresIn must be between 1 and 365 days, in seconds');
|
|
233
|
+
return json(await cms.auth.api.createApiKey({
|
|
234
|
+
body: {
|
|
235
|
+
userId: session.user.id,
|
|
236
|
+
name: body.name.trim(),
|
|
237
|
+
expiresIn,
|
|
238
|
+
permissions: { cms: body.scope === 'write' ? ['read', 'write'] : ['read'] }
|
|
239
|
+
}
|
|
240
|
+
}));
|
|
241
|
+
}
|
|
242
|
+
case 'keys/delete': {
|
|
243
|
+
if (session.user.role !== 'admin')
|
|
244
|
+
error(403, 'Only admins can manage API keys');
|
|
245
|
+
cms.store.db.transaction((tx) => {
|
|
246
|
+
const revoked = tx
|
|
247
|
+
.delete(apikey)
|
|
248
|
+
.where(eq(apikey.id, id))
|
|
249
|
+
.returning({ referenceId: apikey.referenceId })
|
|
250
|
+
.get();
|
|
251
|
+
if (!revoked)
|
|
252
|
+
error(404, 'API key not found');
|
|
253
|
+
tx.insert(audit)
|
|
254
|
+
.values({
|
|
255
|
+
id: crypto.randomUUID(),
|
|
256
|
+
actor: session.user.id,
|
|
257
|
+
action: 'apikey.revoke',
|
|
258
|
+
detail: { keyId: id, ownerId: revoked.referenceId },
|
|
259
|
+
createdAt: Date.now()
|
|
260
|
+
})
|
|
261
|
+
.run();
|
|
262
|
+
});
|
|
263
|
+
return json({ success: true });
|
|
264
|
+
}
|
|
265
|
+
case 'media/upload':
|
|
266
|
+
if (event.request.headers.has('idempotency-key'))
|
|
267
|
+
error(400, 'Upload initiation is not retry-safe; inspect media/list before retrying');
|
|
268
|
+
return json(await cms.media.initiateUpload({
|
|
269
|
+
name: body.name,
|
|
270
|
+
type: body.type,
|
|
271
|
+
size: body.size
|
|
272
|
+
}, blueprint || undefined));
|
|
273
|
+
case 'media/upload/complete':
|
|
274
|
+
return json(cms.media.completeUpload(id));
|
|
83
275
|
case 'media/update':
|
|
84
276
|
cms.media.updateMetadata(id, body.metadata);
|
|
85
277
|
break;
|