sandcms 0.7.0 → 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.
- package/README.md +4 -4
- package/dist/admin/Admin.svelte +7 -5
- package/dist/admin/AssetAttachment.svelte +8 -3
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -0
- package/dist/admin/Editor.svelte +5 -9
- package/dist/admin/Fields.svelte +2 -1
- package/dist/admin/Gallery.svelte +221 -76
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/MediaPicker.svelte +36 -20
- package/dist/admin/Navigation.svelte +13 -2
- package/dist/admin/Pages.svelte +195 -0
- package/dist/admin/Pages.svelte.d.ts +7 -0
- package/dist/admin/Shell.svelte +27 -5
- package/dist/admin/SortableList.svelte +82 -61
- package/dist/admin/SortableList.svelte.d.ts +3 -1
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/generated/admin.css +300 -20
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/types.d.ts +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +11 -2
- package/dist/blueprints/types.d.ts +2 -2
- package/dist/cli/admin.d.ts +39 -0
- package/dist/cli/admin.js +95 -0
- package/dist/cli/backup.js +4 -4
- package/dist/cli/doctor.d.ts +8 -1
- package/dist/cli/doctor.js +19 -9
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.js +2 -1
- package/dist/cli/index.js +373 -135
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/upgrade.js +17 -9
- package/dist/env.d.ts +0 -8
- package/dist/env.js +0 -8
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +72 -0
- package/dist/server/admin-load.js +20 -0
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api.js +16 -61
- package/dist/server/cms.d.ts +0 -5
- package/dist/server/cms.js +4 -3
- package/dist/server/db/auto-migrate.d.ts +0 -4
- package/dist/server/db/auto-migrate.js +12 -3
- package/dist/server/db/legacy.d.ts +13 -0
- package/dist/server/db/legacy.js +60 -0
- package/dist/server/db/migration-data.js +2 -38
- package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
- package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
- package/dist/server/db/migrations/meta/_journal.json +2 -65
- package/dist/server/db/schema.js +8 -6
- package/dist/server/db/store.d.ts +25 -2
- package/dist/server/db/store.js +90 -26
- package/dist/server/forms.js +2 -1
- package/dist/server/media/runner.d.ts +1 -1
- package/dist/server/media/runner.js +1 -1
- package/dist/server/media/service.d.ts +0 -4
- package/dist/server/media/service.js +0 -2
- package/dist/server/media/verify.d.ts +28 -0
- package/dist/server/media/verify.js +94 -2
- package/dist/server/platform/snapshots.js +3 -3
- package/docs/acceptance.md +2 -2
- package/docs/api.md +15 -1
- package/docs/cloudflare.md +9 -41
- package/docs/content.md +18 -3
- package/docs/deployment.md +97 -34
- package/docs/email.md +6 -0
- package/docs/forms.md +1 -1
- package/docs/media.md +10 -1
- package/docs/package.md +4 -4
- package/docs/releases.md +21 -1
- package/docs/upgrades.md +41 -7
- package/package.json +4 -10
- package/templates/Dockerfile +6 -2
- package/templates/integration.ts +10 -5
- package/templates/openship.json +9 -0
- package/templates/sandcms/config.yaml +1 -0
- package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
- package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
- package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
- package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
- package/dist/server/db/migrations/0009_local_media.sql +0 -9
- package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
- package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
- package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
- package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
- package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
- package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
- package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
- package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
- package/dist/server/db/migrations/meta/0009_snapshot.json +0 -1763
- package/dist/server/media/import-r2.d.ts +0 -56
- package/dist/server/media/import-r2.js +0 -342
- package/dist/worker/index.d.ts +0 -10
- package/dist/worker/index.js +0 -460
- package/dist/worker/local.d.ts +0 -5
- package/dist/worker/local.js +0 -57
- package/dist/worker/source.d.ts +0 -2
- package/dist/worker/source.js +0 -31
- package/dist/worker/svg.d.ts +0 -1
- package/dist/worker/svg.js +0 -2
- package/dist/worker/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
import type { Store } from '../db/store.js';
|
|
2
|
-
import { type MediaProcessor, type MediaStorage } from './contracts.js';
|
|
3
|
-
export interface MediaTarget {
|
|
4
|
-
store: Store;
|
|
5
|
-
media: {
|
|
6
|
-
storage: MediaStorage;
|
|
7
|
-
};
|
|
8
|
-
}
|
|
9
|
-
export interface ImportOptions {
|
|
10
|
-
workerUrl: string;
|
|
11
|
-
workerToken: string;
|
|
12
|
-
log?: (line: string) => void;
|
|
13
|
-
/** Assets imported at once. */
|
|
14
|
-
concurrency?: number;
|
|
15
|
-
/** Attempts per request for network errors and 5xx/429 responses. */
|
|
16
|
-
attempts?: number;
|
|
17
|
-
/** Base backoff in ms, doubled per attempt. */
|
|
18
|
-
retryDelay?: number;
|
|
19
|
-
/** How long to wait for a running processor to release its lease. */
|
|
20
|
-
leaseWait?: number;
|
|
21
|
-
/** Measures originals without stored dimensions; defaults to the sandboxed sharp child. */
|
|
22
|
-
processor?: MediaProcessor;
|
|
23
|
-
}
|
|
24
|
-
export interface ImportFailure {
|
|
25
|
-
id: string;
|
|
26
|
-
key?: string;
|
|
27
|
-
error: string;
|
|
28
|
-
}
|
|
29
|
-
export interface ImportSummary {
|
|
30
|
-
assets: number;
|
|
31
|
-
originals: {
|
|
32
|
-
imported: number;
|
|
33
|
-
present: number;
|
|
34
|
-
};
|
|
35
|
-
variants: {
|
|
36
|
-
imported: number;
|
|
37
|
-
present: number;
|
|
38
|
-
};
|
|
39
|
-
dimensions: number;
|
|
40
|
-
skipped: {
|
|
41
|
-
id: string;
|
|
42
|
-
reason: string;
|
|
43
|
-
}[];
|
|
44
|
-
failures: ImportFailure[];
|
|
45
|
-
verified: {
|
|
46
|
-
originals: number;
|
|
47
|
-
variants: number;
|
|
48
|
-
};
|
|
49
|
-
ok: boolean;
|
|
50
|
-
}
|
|
51
|
-
/** Waits for and holds a named lease, renewing it until `release()`. `check()` throws once it is lost. */
|
|
52
|
-
export declare function holdLease(store: Store, name: string, owner: string, wait: number, log?: (line: string) => void): Promise<{
|
|
53
|
-
check(): void;
|
|
54
|
-
release(): void;
|
|
55
|
-
}>;
|
|
56
|
-
export declare function importFromR2(cms: MediaTarget, options: ImportOptions): Promise<ImportSummary>;
|
|
@@ -1,342 +0,0 @@
|
|
|
1
|
-
// One-time import of R2 media into local storage (docs/plans/0.7-self-hosted.md §4.6).
|
|
2
|
-
// Talks to the deprecated protocol-6 Worker; keeps asset IDs, variant keys and preset versions.
|
|
3
|
-
import { copyFile } from 'node:fs/promises';
|
|
4
|
-
import { basename, join } from 'node:path';
|
|
5
|
-
import { and, eq, notExists } from 'drizzle-orm';
|
|
6
|
-
import { jobs, media, mediaDeletions, uploads, uploadSessions } from '../db/schema.js';
|
|
7
|
-
import { sourceURL } from '../../worker/source.js';
|
|
8
|
-
import { PROCESSOR_LEASE } from './contracts.js';
|
|
9
|
-
import { liveLegacyUpload, liveUploadSession, releaseLease, takeLease } from './runner.js';
|
|
10
|
-
/** Not worth retrying: missing objects, rejected credentials, inconsistent data. */
|
|
11
|
-
class Permanent extends Error {
|
|
12
|
-
}
|
|
13
|
-
class Missing extends Permanent {
|
|
14
|
-
}
|
|
15
|
-
const leaseTtl = 60_000;
|
|
16
|
-
/** Waits for and holds a named lease, renewing it until `release()`. `check()` throws once it is lost. */
|
|
17
|
-
export async function holdLease(store, name, owner, wait, log = console.log) {
|
|
18
|
-
const deadline = Date.now() + wait;
|
|
19
|
-
for (let i = 0; !takeLease(store, name, owner, leaseTtl); i++) {
|
|
20
|
-
if (Date.now() > deadline)
|
|
21
|
-
throw new Error('The media processor is busy. Stop the website or try again later.');
|
|
22
|
-
if (!i)
|
|
23
|
-
log('Waiting for the media processor to become idle…');
|
|
24
|
-
await Bun.sleep(1000);
|
|
25
|
-
}
|
|
26
|
-
let lost = false;
|
|
27
|
-
const timer = setInterval(() => {
|
|
28
|
-
if (!takeLease(store, name, owner, leaseTtl))
|
|
29
|
-
lost = true;
|
|
30
|
-
}, leaseTtl / 4);
|
|
31
|
-
return {
|
|
32
|
-
check() {
|
|
33
|
-
if (lost)
|
|
34
|
-
throw new Error('Another process took the media processor lease');
|
|
35
|
-
},
|
|
36
|
-
release() {
|
|
37
|
-
clearInterval(timer);
|
|
38
|
-
releaseLease(store, name, owner);
|
|
39
|
-
}
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
export async function importFromR2(cms, options) {
|
|
43
|
-
const { db } = cms.store, storage = cms.media.storage;
|
|
44
|
-
const log = options.log ?? console.log, attempts = options.attempts ?? 5, retryDelay = options.retryDelay ?? 1000;
|
|
45
|
-
if (!options.workerUrl)
|
|
46
|
-
throw new Error('Set SANDCMS_WORKER_URL or --worker-url to the old Worker');
|
|
47
|
-
if (!options.workerToken || options.workerToken.length < 32)
|
|
48
|
-
throw new Error('Set SANDCMS_WORKER_TOKEN to the old Worker token (32+ characters)');
|
|
49
|
-
const base = new URL(options.workerUrl).toString().replace(/\/$/, '');
|
|
50
|
-
const origin = new URL(options.workerUrl).origin;
|
|
51
|
-
const auth = {
|
|
52
|
-
authorization: `Bearer ${options.workerToken}`,
|
|
53
|
-
'x-sandcms-protocol': '6'
|
|
54
|
-
};
|
|
55
|
-
// Expired or permanently failed rows stay behind for their error message; only live ones block.
|
|
56
|
-
if (db
|
|
57
|
-
.select({ id: uploadSessions.mediaId })
|
|
58
|
-
.from(uploadSessions)
|
|
59
|
-
.where(liveUploadSession())
|
|
60
|
-
.limit(1)
|
|
61
|
-
.get())
|
|
62
|
-
throw new Error('Uploads are in progress (upload_sessions). Let them finish or expire, then run the import again.');
|
|
63
|
-
if (db.select({ id: uploads.mediaId }).from(uploads).where(liveLegacyUpload()).limit(1).get())
|
|
64
|
-
throw new Error('Legacy uploads are still queued (uploads). Finish them with the 0.6 release before importing.');
|
|
65
|
-
async function retry(label, run) {
|
|
66
|
-
for (let i = 1;; i++) {
|
|
67
|
-
try {
|
|
68
|
-
return await run();
|
|
69
|
-
}
|
|
70
|
-
catch (e) {
|
|
71
|
-
if (e instanceof Permanent || i >= attempts)
|
|
72
|
-
throw e;
|
|
73
|
-
log(` ${label}: ${message(e)}; retrying`);
|
|
74
|
-
await Bun.sleep(retryDelay * 2 ** (i - 1));
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
// Streams a Worker response to `dest`; returns the byte count after checking Content-Length.
|
|
79
|
-
async function download(url, headers, dest, timeout) {
|
|
80
|
-
let response;
|
|
81
|
-
try {
|
|
82
|
-
response = await fetch(await url(), {
|
|
83
|
-
headers,
|
|
84
|
-
redirect: 'error',
|
|
85
|
-
signal: AbortSignal.timeout(timeout)
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
catch (e) {
|
|
89
|
-
// Fetch errors can include signed source URLs; keep them out of logs.
|
|
90
|
-
throw new Error(e?.name === 'TimeoutError' ? 'Worker request timed out' : 'Worker request failed');
|
|
91
|
-
}
|
|
92
|
-
if (!response.ok) {
|
|
93
|
-
await response.body?.cancel();
|
|
94
|
-
const error = `Worker returned ${response.status}`;
|
|
95
|
-
if (response.status === 404)
|
|
96
|
-
throw new Missing(error);
|
|
97
|
-
if (response.status >= 500 || response.status === 429 || response.status === 408)
|
|
98
|
-
throw new Error(error);
|
|
99
|
-
throw new Permanent(error);
|
|
100
|
-
}
|
|
101
|
-
const expected = response.headers.get('content-length');
|
|
102
|
-
let bytes;
|
|
103
|
-
try {
|
|
104
|
-
bytes = await Bun.write(dest, response);
|
|
105
|
-
}
|
|
106
|
-
catch {
|
|
107
|
-
throw new Error('Worker response was interrupted');
|
|
108
|
-
}
|
|
109
|
-
if (expected !== null && Number(expected) !== bytes)
|
|
110
|
-
throw new Error(`Received ${bytes} of ${expected} bytes`);
|
|
111
|
-
return bytes;
|
|
112
|
-
}
|
|
113
|
-
const fetchVariant = (key, dest) => retry(key, () => download(async () => `${base}/internal/media/${key}`, auth, dest, 120_000));
|
|
114
|
-
// Sign per attempt: source URLs expire after five minutes.
|
|
115
|
-
const fetchOriginal = (id, dest) => retry(`original ${id}`, () => download(() => sourceURL(origin, id, options.workerToken), {}, dest, 600_000));
|
|
116
|
-
await retry('health', async () => {
|
|
117
|
-
let response;
|
|
118
|
-
try {
|
|
119
|
-
response = await fetch(`${base}/internal/health`, {
|
|
120
|
-
headers: auth,
|
|
121
|
-
signal: AbortSignal.timeout(30_000)
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
catch {
|
|
125
|
-
throw new Error(`Cannot reach the Worker at ${base}`);
|
|
126
|
-
}
|
|
127
|
-
if (response.status === 404)
|
|
128
|
-
throw new Permanent('The Worker rejected SANDCMS_WORKER_TOKEN, or the URL is not a SandCMS Worker');
|
|
129
|
-
if (!response.ok)
|
|
130
|
-
throw new Error(`Worker health check returned ${response.status}`);
|
|
131
|
-
const { protocol } = (await response.json());
|
|
132
|
-
if (!protocol || protocol < 6)
|
|
133
|
-
throw new Permanent(`The Worker speaks protocol ${protocol}; deploy the 0.6.2+ Worker first`);
|
|
134
|
-
});
|
|
135
|
-
const lease = await holdLease(cms.store, PROCESSOR_LEASE, `import-r2:${process.pid}:${crypto.randomUUID()}`, options.leaseWait ?? 120_000, log);
|
|
136
|
-
let processor = options.processor;
|
|
137
|
-
const ownProcessor = !processor;
|
|
138
|
-
// Same loader allowlist and format check as uploads; only the header is trusted for dimensions.
|
|
139
|
-
async function measure(path, mime) {
|
|
140
|
-
processor ??= (await import('./processor.js')).createProcessor();
|
|
141
|
-
return processor.inspect(path, mime, 1_000_000_000).catch(() => null);
|
|
142
|
-
}
|
|
143
|
-
const summary = {
|
|
144
|
-
assets: 0,
|
|
145
|
-
originals: { imported: 0, present: 0 },
|
|
146
|
-
variants: { imported: 0, present: 0 },
|
|
147
|
-
dimensions: 0,
|
|
148
|
-
skipped: [],
|
|
149
|
-
failures: [],
|
|
150
|
-
verified: { originals: 0, variants: 0 },
|
|
151
|
-
ok: false
|
|
152
|
-
};
|
|
153
|
-
// Content-Length seen during this run, for the verification pass.
|
|
154
|
-
const sizes = new Map();
|
|
155
|
-
const get = (id) => db.select().from(media).where(eq(media.id, id)).get();
|
|
156
|
-
const readyJobs = (id) => db
|
|
157
|
-
.select()
|
|
158
|
-
.from(jobs)
|
|
159
|
-
.where(and(eq(jobs.mediaId, id), eq(jobs.status, 'ready')))
|
|
160
|
-
.all();
|
|
161
|
-
// Every ready result, not only the active set: older versions may still be referenced by caches.
|
|
162
|
-
function variantKeys(asset) {
|
|
163
|
-
const keys = new Set(asset.variants.map((v) => v.key));
|
|
164
|
-
for (const job of readyJobs(asset.id))
|
|
165
|
-
if (job.result)
|
|
166
|
-
keys.add(job.result.key);
|
|
167
|
-
return [...keys];
|
|
168
|
-
}
|
|
169
|
-
function etagged(asset, key) {
|
|
170
|
-
const current = get(asset.id);
|
|
171
|
-
return (!!current?.variants.every((v) => v.key !== key || v.etag) &&
|
|
172
|
-
readyJobs(asset.id).every((j) => j.result?.key !== key || j.result.etag));
|
|
173
|
-
}
|
|
174
|
-
function recordEtag(id, key, etag) {
|
|
175
|
-
db.transaction(() => {
|
|
176
|
-
for (const job of readyJobs(id))
|
|
177
|
-
if (job.result?.key === key)
|
|
178
|
-
db.update(jobs)
|
|
179
|
-
.set({ result: { ...job.result, etag } })
|
|
180
|
-
.where(eq(jobs.id, job.id))
|
|
181
|
-
.run();
|
|
182
|
-
const row = get(id);
|
|
183
|
-
if (row?.variants.some((v) => v.key === key))
|
|
184
|
-
db.update(media)
|
|
185
|
-
.set({ variants: row.variants.map((v) => (v.key === key ? { ...v, etag } : v)) })
|
|
186
|
-
.where(eq(media.id, id))
|
|
187
|
-
.run();
|
|
188
|
-
});
|
|
189
|
-
}
|
|
190
|
-
const assets = () => db
|
|
191
|
-
.select()
|
|
192
|
-
.from(media)
|
|
193
|
-
.where(notExists(db.select().from(mediaDeletions).where(eq(mediaDeletions.mediaId, media.id))))
|
|
194
|
-
.all()
|
|
195
|
-
.filter((a) => a.status !== 'deleting');
|
|
196
|
-
async function importAsset(asset) {
|
|
197
|
-
const svg = asset.mime === 'image/svg+xml';
|
|
198
|
-
const keys = variantKeys(asset);
|
|
199
|
-
const svgKey = svg
|
|
200
|
-
? (keys.find((k) => asset.activeVersion &&
|
|
201
|
-
k.startsWith(`${asset.id}/${asset.activeVersion}/`) &&
|
|
202
|
-
k.endsWith('.svg')) ?? keys.find((k) => k.endsWith('.svg')))
|
|
203
|
-
: undefined;
|
|
204
|
-
const fail = (error, key) => summary.failures.push({ id: asset.id, ...(key ? { key } : {}), error: message(error) });
|
|
205
|
-
const work = await storage.workDir(asset.id);
|
|
206
|
-
let imported = 0;
|
|
207
|
-
try {
|
|
208
|
-
try {
|
|
209
|
-
const existing = storage.originalPath(asset.id);
|
|
210
|
-
if (existing) {
|
|
211
|
-
const size = Bun.file(existing).size;
|
|
212
|
-
if (!svg && size !== asset.bytes)
|
|
213
|
-
throw new Permanent(`Local original is ${size} bytes; the database expects ${asset.bytes}`);
|
|
214
|
-
summary.originals.present++;
|
|
215
|
-
}
|
|
216
|
-
else {
|
|
217
|
-
const staged = join(work, 'import-original');
|
|
218
|
-
if (svg) {
|
|
219
|
-
if (!svgKey)
|
|
220
|
-
throw new Missing('No sanitized SVG variant to import; upload this file again');
|
|
221
|
-
sizes.set(svgKey, await fetchVariant(svgKey, staged));
|
|
222
|
-
}
|
|
223
|
-
else {
|
|
224
|
-
const bytes = await fetchOriginal(asset.id, staged);
|
|
225
|
-
if (bytes !== asset.bytes)
|
|
226
|
-
throw new Permanent(`R2 original is ${bytes} bytes; the database expects ${asset.bytes}`);
|
|
227
|
-
}
|
|
228
|
-
await storage.promoteOriginal(asset.id, staged);
|
|
229
|
-
summary.originals.imported++;
|
|
230
|
-
imported++;
|
|
231
|
-
}
|
|
232
|
-
const path = storage.originalPath(asset.id);
|
|
233
|
-
if (!svg && path && (asset.width === null || asset.height === null)) {
|
|
234
|
-
const { width, height } = (await measure(path, asset.mime)) ?? {};
|
|
235
|
-
if (width && height) {
|
|
236
|
-
db.update(media).set({ width, height }).where(eq(media.id, asset.id)).run();
|
|
237
|
-
summary.dimensions++;
|
|
238
|
-
}
|
|
239
|
-
else
|
|
240
|
-
log(` ${asset.id}: could not read the original's dimensions`);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
catch (e) {
|
|
244
|
-
if (e instanceof Missing && !keys.length) {
|
|
245
|
-
summary.skipped.push({ id: asset.id, reason: 'No original in R2 and no ready variants' });
|
|
246
|
-
return;
|
|
247
|
-
}
|
|
248
|
-
fail(e);
|
|
249
|
-
}
|
|
250
|
-
for (const key of keys) {
|
|
251
|
-
lease.check();
|
|
252
|
-
try {
|
|
253
|
-
const existing = storage.variantPath(key);
|
|
254
|
-
if (existing && etagged(asset, key)) {
|
|
255
|
-
summary.variants.present++;
|
|
256
|
-
continue;
|
|
257
|
-
}
|
|
258
|
-
const tmp = join(work, 'import-' + basename(key));
|
|
259
|
-
const original = storage.originalPath(asset.id);
|
|
260
|
-
// Re-commit a file written before a crash so its ETag is recorded; no download needed.
|
|
261
|
-
if (existing)
|
|
262
|
-
await copyFile(existing, tmp);
|
|
263
|
-
else if (key === svgKey && original)
|
|
264
|
-
await copyFile(original, tmp);
|
|
265
|
-
else
|
|
266
|
-
sizes.set(key, await fetchVariant(key, tmp));
|
|
267
|
-
const { etag } = await storage.writeVariant(key, tmp);
|
|
268
|
-
recordEtag(asset.id, key, etag);
|
|
269
|
-
if (existing)
|
|
270
|
-
summary.variants.present++;
|
|
271
|
-
else {
|
|
272
|
-
summary.variants.imported++;
|
|
273
|
-
imported++;
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
|
-
catch (e) {
|
|
277
|
-
fail(e, key);
|
|
278
|
-
}
|
|
279
|
-
}
|
|
280
|
-
}
|
|
281
|
-
finally {
|
|
282
|
-
await storage.removeWork(asset.id);
|
|
283
|
-
const current = get(asset.id);
|
|
284
|
-
// Deleted while importing: the deletion runner may already have cleaned storage.
|
|
285
|
-
if (!current || current.status === 'deleting')
|
|
286
|
-
await storage.removeAsset(asset.id);
|
|
287
|
-
}
|
|
288
|
-
log(`${asset.filename} (${asset.id}): ${imported ? `${imported} files imported` : 'up to date'}`);
|
|
289
|
-
}
|
|
290
|
-
try {
|
|
291
|
-
const list = assets();
|
|
292
|
-
summary.assets = list.length;
|
|
293
|
-
log(`Importing ${list.length} assets from ${base}`);
|
|
294
|
-
let next = 0;
|
|
295
|
-
await Promise.all(Array.from({ length: Math.min(options.concurrency ?? 4, list.length) }, async () => {
|
|
296
|
-
while (next < list.length)
|
|
297
|
-
await importAsset(list[next++]);
|
|
298
|
-
}));
|
|
299
|
-
// Verification: every original and every ready variant exists, with the expected size.
|
|
300
|
-
const skipped = new Set(summary.skipped.map((s) => s.id));
|
|
301
|
-
const failed = new Set(summary.failures.map((f) => `${f.id}/${f.key ?? ''}`));
|
|
302
|
-
for (const asset of assets()) {
|
|
303
|
-
if (skipped.has(asset.id))
|
|
304
|
-
continue;
|
|
305
|
-
const svg = asset.mime === 'image/svg+xml';
|
|
306
|
-
const path = storage.originalPath(asset.id);
|
|
307
|
-
if (path && (svg || Bun.file(path).size === asset.bytes))
|
|
308
|
-
summary.verified.originals++;
|
|
309
|
-
else if (!failed.has(`${asset.id}/`))
|
|
310
|
-
summary.failures.push({
|
|
311
|
-
id: asset.id,
|
|
312
|
-
error: path
|
|
313
|
-
? 'Original size does not match the database'
|
|
314
|
-
: 'Original missing after import'
|
|
315
|
-
});
|
|
316
|
-
for (const key of variantKeys(asset)) {
|
|
317
|
-
const file = storage.variantPath(key);
|
|
318
|
-
let error;
|
|
319
|
-
if (!file)
|
|
320
|
-
error = 'Variant missing after import';
|
|
321
|
-
else if (sizes.has(key) && Bun.file(file).size !== sizes.get(key))
|
|
322
|
-
error = 'Variant size does not match the Worker';
|
|
323
|
-
else if (!etagged(asset, key))
|
|
324
|
-
error = 'Variant ETag not recorded';
|
|
325
|
-
if (!error)
|
|
326
|
-
summary.verified.variants++;
|
|
327
|
-
else if (!failed.has(`${asset.id}/${key}`))
|
|
328
|
-
summary.failures.push({ id: asset.id, key, error });
|
|
329
|
-
}
|
|
330
|
-
}
|
|
331
|
-
}
|
|
332
|
-
finally {
|
|
333
|
-
lease.release();
|
|
334
|
-
if (ownProcessor)
|
|
335
|
-
processor?.close();
|
|
336
|
-
}
|
|
337
|
-
summary.ok = summary.failures.length === 0;
|
|
338
|
-
return summary;
|
|
339
|
-
}
|
|
340
|
-
function message(e) {
|
|
341
|
-
return e instanceof Error ? e.message : String(e);
|
|
342
|
-
}
|
package/dist/worker/index.d.ts
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import type { R2Bucket } from '@cloudflare/workers-types/index.ts';
|
|
2
|
-
import { type UploadSigningEnv } from './uploads.js';
|
|
3
|
-
export interface WorkerEnv extends UploadSigningEnv {
|
|
4
|
-
MEDIA: R2Bucket;
|
|
5
|
-
SANDCMS_WORKER_TOKEN: string;
|
|
6
|
-
}
|
|
7
|
-
declare const _default: {
|
|
8
|
-
fetch(request: Request, env: WorkerEnv): Promise<Response>;
|
|
9
|
-
};
|
|
10
|
-
export default _default;
|