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.
- package/README.md +15 -11
- package/dist/admin/Account.svelte +2 -0
- package/dist/admin/Admin.svelte +21 -6
- package/dist/admin/AssetAttachment.svelte +9 -6
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -1
- package/dist/admin/BlueprintFields.svelte +0 -3
- package/dist/admin/BlueprintFields.svelte.d.ts +0 -1
- package/dist/admin/Editor.svelte +5 -10
- package/dist/admin/Fields.svelte +2 -8
- package/dist/admin/Fields.svelte.d.ts +0 -1
- package/dist/admin/Gallery.svelte +221 -80
- package/dist/admin/Gallery.svelte.d.ts +0 -1
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/LinkField.svelte +0 -3
- package/dist/admin/LinkField.svelte.d.ts +0 -1
- package/dist/admin/MediaLibrary.svelte +10 -7
- package/dist/admin/MediaPicker.svelte +43 -35
- package/dist/admin/MediaPicker.svelte.d.ts +0 -1
- 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/ThemePicker.svelte +72 -0
- package/dist/admin/ThemePicker.svelte.d.ts +18 -0
- package/dist/admin/UploadButton.svelte +2 -1
- package/dist/admin/UploadProgress.svelte +24 -0
- package/dist/admin/UploadProgress.svelte.d.ts +7 -0
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/client.d.ts +3 -670
- package/dist/admin/client.js +2 -1
- package/dist/admin/components/ui/alert/alert.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment-media.svelte.d.ts +3 -13
- package/dist/admin/components/ui/attachment/attachment.svelte.d.ts +6 -26
- package/dist/admin/components/ui/badge/badge.svelte.d.ts +7 -25
- package/dist/admin/components/ui/button/button.svelte.d.ts +15 -53
- package/dist/admin/components/ui/toggle/toggle.svelte.d.ts +6 -26
- package/dist/admin/generated/admin.css +823 -115
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/theme-context.d.ts +7 -0
- package/dist/admin/theme-context.js +3 -0
- package/dist/admin/theme.d.ts +7 -0
- package/dist/admin/theme.js +14 -0
- package/dist/admin/types.d.ts +3 -1
- package/dist/admin/uploads.d.ts +8 -1
- package/dist/admin/uploads.js +94 -16
- package/dist/blueprints/files.js +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +16 -2
- package/dist/blueprints/types.d.ts +4 -1
- 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 +10 -1
- package/dist/cli/doctor.js +98 -33
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.d.ts +2 -6
- package/dist/cli/files.js +12 -2
- package/dist/cli/index.js +401 -95
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/scaffold.js +8 -8
- package/dist/cli/setup.js +16 -26
- package/dist/cli/upgrade.js +34 -7
- package/dist/env.d.ts +26 -2
- package/dist/env.js +48 -6
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +85 -5
- package/dist/server/admin-load.js +26 -1
- package/dist/server/api-access.d.ts +4 -0
- package/dist/server/api-access.js +15 -2
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api-pagination.d.ts +3 -0
- package/dist/server/api.js +21 -63
- package/dist/server/auth.d.ts +10 -9
- package/dist/server/cms.d.ts +63 -21
- package/dist/server/cms.js +64 -7
- 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 -34
- 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 -58
- package/dist/server/db/schema.d.ts +119 -2
- package/dist/server/db/schema.js +23 -9
- 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/hooks.js +155 -81
- package/dist/server/media/contracts.d.ts +115 -0
- package/dist/server/media/contracts.js +12 -0
- package/dist/server/media/deletions.d.ts +2 -1
- package/dist/server/media/deletions.js +3 -3
- package/dist/server/media/delivery.js +7 -11
- package/dist/server/media/processor-child.d.ts +2 -0
- package/dist/server/media/processor-child.js +236 -0
- package/dist/server/media/processor.d.ts +51 -0
- package/dist/server/media/processor.js +135 -0
- package/dist/server/media/render-math.d.ts +24 -0
- package/dist/server/media/render-math.js +50 -0
- package/dist/server/media/runner.d.ts +30 -1
- package/dist/server/media/runner.js +418 -165
- package/dist/server/media/service.d.ts +53 -11
- package/dist/server/media/service.js +307 -98
- package/dist/server/media/storage.d.ts +5 -0
- package/dist/server/media/storage.js +279 -0
- package/dist/server/media/upload-ticket.d.ts +12 -0
- package/dist/server/media/upload-ticket.js +35 -0
- package/dist/server/media/verify.d.ts +64 -0
- package/dist/server/media/verify.js +201 -0
- package/dist/server/platform/http.d.ts +27 -0
- package/dist/server/platform/http.js +77 -0
- package/dist/server/platform/index.d.ts +52 -0
- package/dist/server/platform/index.js +98 -0
- package/dist/server/platform/snapshots.d.ts +18 -0
- package/dist/server/platform/snapshots.js +110 -0
- package/dist/server/platform/volume.d.ts +20 -0
- package/dist/server/platform/volume.js +60 -0
- package/docs/acceptance.md +7 -5
- package/docs/api.md +56 -4
- package/docs/cloudflare.md +26 -152
- package/docs/content.md +20 -5
- package/docs/deployment.md +222 -57
- package/docs/email.md +6 -0
- package/docs/forms.md +2 -2
- package/docs/media.md +94 -21
- package/docs/package.md +21 -18
- package/docs/plans/0.7-self-hosted.md +264 -0
- package/docs/releases.md +37 -1
- package/docs/upgrades.md +72 -9
- package/package.json +37 -44
- package/templates/Dockerfile +32 -0
- package/templates/integration.ts +26 -5
- package/templates/openship.json +9 -0
- package/templates/railpack.json +1 -1
- package/templates/sandcms/blueprints/files/image.yaml +1 -1
- package/templates/sandcms/config.yaml +1 -1
- package/dist/cli/cloudflare.d.ts +0 -8
- package/dist/cli/cloudflare.js +0 -135
- 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/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/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/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
- package/templates/sandcms/worker/index.ts +0 -1
- package/templates/sandcms/worker/local.ts +0 -1
- package/templates/sandcms/worker/wrangler.jsonc +0 -6
- /package/dist/{worker → server/media}/svg.d.ts +0 -0
- /package/dist/{worker → server/media}/svg.js +0 -0
package/dist/cli/index.js
CHANGED
|
@@ -1,65 +1,209 @@
|
|
|
1
1
|
#!/usr/bin/env bun
|
|
2
2
|
import { config as loadEnv } from 'dotenv';
|
|
3
3
|
import { parseArgs } from 'node:util';
|
|
4
|
-
import { resolve, join } from 'node:path';
|
|
4
|
+
import { resolve, join, dirname } from 'node:path';
|
|
5
|
+
import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
|
|
5
6
|
import { setup } from './setup.js';
|
|
6
7
|
import { upgrade } from './upgrade.js';
|
|
7
8
|
import { backup, restore } from './backup.js';
|
|
9
|
+
import { rebaseline } from './rebaseline.js';
|
|
8
10
|
import { openStore, applyMigrations, pendingMigrations, inspectMigrations } from '../server/db/store.js';
|
|
9
11
|
import { createCMS } from '../server/cms.js';
|
|
10
|
-
import { createUser, recoverUser } from '../server/auth.js';
|
|
12
|
+
import { createAuth, createUser, recoverUser } from '../server/auth.js';
|
|
13
|
+
import { createOperatorKey, listApiKeys, revokeApiKey } from '../server/api-keys.js';
|
|
14
|
+
import { createForms } from '../server/forms.js';
|
|
11
15
|
import { user } from '../server/db/schema.js';
|
|
12
16
|
import { loadDefinition } from '../blueprints/load.js';
|
|
13
17
|
import { text, password, confirm } from './prompts.js';
|
|
14
|
-
import { updateWorker } from './cloudflare.js';
|
|
15
18
|
import { doctor } from './doctor.js';
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
19
|
+
import { PACKAGE_VERSION } from './files.js';
|
|
20
|
+
import { listUsers, removeUser, setRole, signOut, revokeOwnerKeys } from './admin.js';
|
|
21
|
+
import { sendTestEmail } from './email-test.js';
|
|
22
|
+
import { forceRebuild, verifyMedia, pruneMedia } from '../server/media/verify.js';
|
|
23
|
+
const HELP = {
|
|
24
|
+
setup: `sandcms setup [--name NAME] [--dry-run] [--yes] [--skip-install] [--package SPEC] [--email EMAIL]
|
|
25
|
+
Create a new site or add SandCMS to an existing SvelteKit app. Runs interactively without a command.`,
|
|
26
|
+
validate: `sandcms validate
|
|
27
|
+
Check the YAML blueprints and media presets in sandcms/.`,
|
|
28
|
+
doctor: `sandcms doctor [--json]
|
|
29
|
+
Check configuration, environment, database, data volume and media storage. Exits 1 on any FAIL.`,
|
|
30
|
+
upgrade: `sandcms upgrade [--check]
|
|
31
|
+
Update generated integration files; --check only prints the report.`,
|
|
32
|
+
migrate: `sandcms migrate [--check] [--json]
|
|
33
|
+
Apply pending database migrations; --check only lists them.`,
|
|
34
|
+
backup: `sandcms backup --output PATH
|
|
35
|
+
Write a verified snapshot of the database. Media files are not included.`,
|
|
36
|
+
restore: `sandcms restore --from PATH [--yes]
|
|
37
|
+
Replace the database with a verified backup, keeping a safety copy. Stop the website first.`,
|
|
38
|
+
rebaseline: `sandcms rebaseline [--yes]
|
|
39
|
+
Convert a SandCMS 0.7.x database to the 0.8.0 migration baseline once, copying every row and keeping
|
|
40
|
+
a safety copy. Stop the website first. Media files are not touched.`,
|
|
41
|
+
user: `sandcms user list [--json]
|
|
42
|
+
sandcms user bootstrap --email EMAIL [--name NAME]
|
|
43
|
+
sandcms user add --email EMAIL [--name NAME] [--role admin|editor] [--password-stdin]
|
|
44
|
+
sandcms user set-role --email EMAIL --role admin|editor
|
|
45
|
+
sandcms user remove --email EMAIL [--yes]
|
|
46
|
+
sandcms user reset-password --email EMAIL [--password-stdin]
|
|
47
|
+
sandcms user reset-2fa --email EMAIL
|
|
48
|
+
sandcms user sign-out (--email EMAIL | --all [--yes])
|
|
49
|
+
Manage admin accounts. Removing a user also removes their sessions and API keys; the last admin is kept.`,
|
|
50
|
+
key: `sandcms key create --email EMAIL --name NAME --scope read|write [--days N]
|
|
51
|
+
sandcms key list [--json]
|
|
52
|
+
sandcms key revoke (--id ID | --email EMAIL)
|
|
53
|
+
Manage agent API keys. create prints only the secret on stdout; --email revokes every key of that user.`,
|
|
54
|
+
email: `sandcms email test --to ADDRESS
|
|
55
|
+
Send a test message with the SANDCMS_EMAIL_* and SANDCMS_SMTP_* settings.`,
|
|
56
|
+
forms: `sandcms forms export FORM --output PATH [--force]
|
|
57
|
+
Write a form's submissions as CSV, the same file the admin exports.`,
|
|
58
|
+
media: `sandcms media rebuild [--force]
|
|
59
|
+
sandcms media verify [--repair]
|
|
60
|
+
sandcms media prune [--delete] [--yes] [--json]
|
|
61
|
+
rebuild renders missing or outdated variants (--force re-renders all); verify finds missing files;
|
|
62
|
+
prune lists files no asset uses (deleted assets, old variant versions) and --delete removes them.`
|
|
63
|
+
};
|
|
64
|
+
const USAGE = `SandCMS ${PACKAGE_VERSION}
|
|
65
|
+
|
|
66
|
+
Usage: sandcms <command> [options]
|
|
67
|
+
|
|
68
|
+
Commands:
|
|
69
|
+
setup Create or integrate a site
|
|
70
|
+
validate Check blueprints and presets
|
|
71
|
+
doctor Check configuration and deployment
|
|
72
|
+
upgrade Update generated integration files
|
|
73
|
+
migrate Apply database migrations
|
|
74
|
+
backup Write a verified database snapshot
|
|
75
|
+
restore Restore a database snapshot
|
|
76
|
+
rebaseline Convert a 0.7.x database to the 0.8.0 baseline
|
|
77
|
+
user Manage users and sessions
|
|
78
|
+
key Create, list or revoke agent API keys
|
|
79
|
+
email Send a test email
|
|
80
|
+
forms Export form submissions
|
|
81
|
+
media Rebuild, verify, prune or import media
|
|
82
|
+
|
|
83
|
+
Global options:
|
|
84
|
+
--cwd PATH Project directory (default: current directory)
|
|
85
|
+
--database PATH Database (default: SANDCMS_DATABASE or ./data/sandcms.sqlite)
|
|
86
|
+
--version Print the version
|
|
87
|
+
--help Show help; sandcms <command> --help shows a command
|
|
88
|
+
|
|
89
|
+
Secrets are never accepted as arguments.`;
|
|
90
|
+
function parse(args) {
|
|
91
|
+
try {
|
|
92
|
+
return parseArgs({
|
|
93
|
+
args,
|
|
94
|
+
allowPositionals: true,
|
|
95
|
+
options: {
|
|
96
|
+
cwd: { type: 'string' },
|
|
97
|
+
name: { type: 'string' },
|
|
98
|
+
email: { type: 'string' },
|
|
99
|
+
role: { type: 'string' },
|
|
100
|
+
scope: { type: 'string' },
|
|
101
|
+
days: { type: 'string' },
|
|
102
|
+
id: { type: 'string' },
|
|
103
|
+
to: { type: 'string' },
|
|
104
|
+
database: { type: 'string' },
|
|
105
|
+
output: { type: 'string' },
|
|
106
|
+
from: { type: 'string' },
|
|
107
|
+
package: { type: 'string' },
|
|
108
|
+
check: { type: 'boolean' },
|
|
109
|
+
json: { type: 'boolean' },
|
|
110
|
+
all: { type: 'boolean' },
|
|
111
|
+
delete: { type: 'boolean' },
|
|
112
|
+
'dry-run': { type: 'boolean' },
|
|
113
|
+
'skip-install': { type: 'boolean' },
|
|
114
|
+
'password-stdin': { type: 'boolean' },
|
|
115
|
+
force: { type: 'boolean' },
|
|
116
|
+
repair: { type: 'boolean' },
|
|
117
|
+
yes: { type: 'boolean' },
|
|
118
|
+
version: { type: 'boolean' },
|
|
119
|
+
help: { type: 'boolean' }
|
|
120
|
+
}
|
|
121
|
+
});
|
|
34
122
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
123
|
+
catch (error) {
|
|
124
|
+
// Node's messages explain `--` positionals at length; the first sentence is the useful part.
|
|
125
|
+
const message = error instanceof Error ? error.message.split('. ')[0] : String(error);
|
|
126
|
+
throw new Error(`${message}. Run sandcms --help`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const SUBCOMMANDS = {
|
|
130
|
+
user: [
|
|
131
|
+
'list',
|
|
132
|
+
'bootstrap',
|
|
133
|
+
'add',
|
|
134
|
+
'set-role',
|
|
135
|
+
'remove',
|
|
136
|
+
'reset-password',
|
|
137
|
+
'reset-2fa',
|
|
138
|
+
'sign-out'
|
|
139
|
+
],
|
|
140
|
+
key: ['create', 'list', 'revoke'],
|
|
141
|
+
email: ['test'],
|
|
142
|
+
forms: ['export'],
|
|
143
|
+
media: ['rebuild', 'verify', 'prune']
|
|
144
|
+
};
|
|
145
|
+
const date = (value) => (value ? value.slice(0, 10) : '-');
|
|
146
|
+
function table(rows) {
|
|
147
|
+
const widths = rows[0].map((_, i) => Math.max(...rows.map((row) => row[i].length)));
|
|
148
|
+
for (const row of rows)
|
|
149
|
+
console.log(row.map((cell, i) => cell.padEnd(widths[i])).join(' '));
|
|
43
150
|
}
|
|
151
|
+
const mb = (bytes) => `${(bytes / 1024 ** 2).toFixed(1)} MB`;
|
|
44
152
|
async function main() {
|
|
153
|
+
const { values, positionals } = parse(process.argv.slice(2));
|
|
45
154
|
const [command, subcommand] = positionals;
|
|
46
|
-
if (values.
|
|
47
|
-
console.log(
|
|
155
|
+
if (values.version)
|
|
156
|
+
return console.log(PACKAGE_VERSION);
|
|
157
|
+
if (command === 'help' || values.help) {
|
|
158
|
+
const topic = command === 'help' ? subcommand : command;
|
|
159
|
+
console.log(topic && HELP[topic] ? HELP[topic] : USAGE);
|
|
48
160
|
return;
|
|
49
161
|
}
|
|
162
|
+
const root = resolve(values.cwd ?? '.');
|
|
163
|
+
loadEnv({ path: [join(root, '.env.local'), join(root, '.env')], override: false, quiet: true });
|
|
164
|
+
const database = resolve(root, values.database ?? process.env.SANDCMS_DATABASE ?? './data/sandcms.sqlite');
|
|
50
165
|
if (!command) {
|
|
51
166
|
if (!process.stdin.isTTY)
|
|
52
167
|
throw new Error('Choose a command; use --help');
|
|
53
168
|
return setup({ root });
|
|
54
169
|
}
|
|
55
|
-
|
|
170
|
+
if (!HELP[command])
|
|
171
|
+
throw new Error(`Unknown command ${command}. Run sandcms --help`);
|
|
172
|
+
if (SUBCOMMANDS[command] && !SUBCOMMANDS[command].includes(subcommand))
|
|
173
|
+
throw new Error(`${subcommand ? `Unknown command ${command} ${subcommand}` : `Choose a ${command} command`}. Use one of: ${SUBCOMMANDS[command].join(', ')}. Run sandcms ${command} --help`);
|
|
174
|
+
// Machine-readable output stays alone on stdout: `key create` prints only the secret there.
|
|
175
|
+
if (!values.json)
|
|
176
|
+
(command === 'key' ? console.error : console.log)(`Project: ${root}\nDatabase: ${database}\nRuntime: Bun ${Bun.version}`);
|
|
177
|
+
const suppliedPassword = async () => values['password-stdin'] ? (await Bun.stdin.text()).replace(/\r?\n$/, '') : await password();
|
|
178
|
+
// Destructive commands ask first; scripts and non-interactive shells pass --yes.
|
|
179
|
+
const approve = async (message) => {
|
|
180
|
+
if (values.yes)
|
|
181
|
+
return;
|
|
182
|
+
if (!process.stdin.isTTY)
|
|
183
|
+
throw new Error('Pass --yes to confirm in a non-interactive shell');
|
|
184
|
+
if (!(await confirm(message)))
|
|
185
|
+
throw new Error('Cancelled');
|
|
186
|
+
};
|
|
187
|
+
const emailOption = async () => values.email ?? (await text('Email address'));
|
|
188
|
+
// CLI media commands never call media.start(): no background tasks, schedulers or snapshots.
|
|
189
|
+
const openCMS = () => {
|
|
190
|
+
const mediaDir = process.env.SANDCMS_MEDIA_DIR;
|
|
191
|
+
return createCMS({
|
|
192
|
+
database,
|
|
193
|
+
root: join(root, 'sandcms'),
|
|
194
|
+
origin: process.env.SANDCMS_ORIGIN ?? 'http://localhost:5410',
|
|
195
|
+
secret: process.env.SANDCMS_SECRET ?? '',
|
|
196
|
+
...(mediaDir ? { mediaDir: resolve(root, mediaDir) } : {})
|
|
197
|
+
});
|
|
198
|
+
};
|
|
56
199
|
if (command === 'validate') {
|
|
57
200
|
const definition = loadDefinition(join(root, 'sandcms'));
|
|
58
201
|
console.log(`Validated ${definition.blueprints.length} blueprints and media presets.`);
|
|
59
202
|
return;
|
|
60
203
|
}
|
|
61
204
|
if (command === 'migrate' && values.check) {
|
|
62
|
-
|
|
205
|
+
const pending = inspectMigrations(database).map((m) => m.name);
|
|
206
|
+
console.log(values.json ? JSON.stringify({ pending }) : pending);
|
|
63
207
|
return;
|
|
64
208
|
}
|
|
65
209
|
if (command === 'setup')
|
|
@@ -74,9 +218,7 @@ async function main() {
|
|
|
74
218
|
database: values.database
|
|
75
219
|
});
|
|
76
220
|
if (command === 'upgrade')
|
|
77
|
-
return upgrade(root, values.check, database);
|
|
78
|
-
if (command === 'worker' && subcommand === 'update')
|
|
79
|
-
return updateWorker(root);
|
|
221
|
+
return void (await upgrade(root, values.check, database));
|
|
80
222
|
if (command === 'backup') {
|
|
81
223
|
if (!values.output)
|
|
82
224
|
throw new Error('Use --output PATH');
|
|
@@ -91,90 +233,254 @@ async function main() {
|
|
|
91
233
|
console.log(restore(database, values.from, approved));
|
|
92
234
|
return;
|
|
93
235
|
}
|
|
236
|
+
if (command === 'rebaseline') {
|
|
237
|
+
const approved = values.yes ||
|
|
238
|
+
(await confirm(`Convert ${database} to the SandCMS 0.8.0 migration baseline? Stop all website processes first. A safety copy will be retained.`));
|
|
239
|
+
const result = rebaseline(database, approved);
|
|
240
|
+
console.log(`Rebaselined ${result.target}. Safety copy: ${result.safety}\nRows: ${Object.entries(result.copied)
|
|
241
|
+
.map(([table, n]) => `${table} ${n}`)
|
|
242
|
+
.join(', ')}`);
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
94
245
|
if (command === 'doctor')
|
|
95
|
-
return doctor(root, database);
|
|
96
|
-
if (command === '
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
});
|
|
246
|
+
return void (await doctor(root, database, process.env, values));
|
|
247
|
+
if (command === 'email') {
|
|
248
|
+
const to = values.to ?? (await text('Send the test to'));
|
|
249
|
+
const result = await sendTestEmail(to);
|
|
250
|
+
console.log(`Accepted by the mail server (message ID ${result.messageId}). Check the inbox and spam folder of ${to}.`);
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
if (command === 'media') {
|
|
254
|
+
const cms = openCMS();
|
|
105
255
|
try {
|
|
106
|
-
cms
|
|
107
|
-
while (cms.media.list().some((a) => a.status === 'processing')) {
|
|
108
|
-
await cms.media.drain();
|
|
109
|
-
await Bun.sleep(1000);
|
|
110
|
-
console.log(cms.media
|
|
111
|
-
.list()
|
|
112
|
-
.map((a) => `${a.filename}: ${a.status}`)
|
|
113
|
-
.join('\n'));
|
|
114
|
-
}
|
|
115
|
-
if (cms.media.list().some((a) => a.status === 'failed'))
|
|
116
|
-
throw new Error('Some images failed; retry with media rebuild');
|
|
256
|
+
return await mediaCommand(cms, subcommand);
|
|
117
257
|
}
|
|
118
258
|
finally {
|
|
119
259
|
cms.close();
|
|
120
260
|
}
|
|
121
|
-
return;
|
|
122
261
|
}
|
|
262
|
+
// migrate initializes a new database; the other commands need an existing one.
|
|
263
|
+
if (command !== 'migrate' && !existsSync(database))
|
|
264
|
+
throw new Error(`Database ${database} does not exist. Check --database or SANDCMS_DATABASE.`);
|
|
123
265
|
const store = openStore(database);
|
|
124
266
|
try {
|
|
125
267
|
if (command === 'migrate') {
|
|
126
|
-
|
|
127
|
-
console.log(pendingMigrations(store).map((m) => m.name));
|
|
128
|
-
else
|
|
129
|
-
console.log('Applied:', applyMigrations(store));
|
|
268
|
+
console.log('Applied:', applyMigrations(store));
|
|
130
269
|
return;
|
|
131
270
|
}
|
|
132
|
-
if (
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
const
|
|
136
|
-
if (
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
271
|
+
if (pendingMigrations(store).length)
|
|
272
|
+
throw new Error('Run sandcms migrate first');
|
|
273
|
+
if (command === 'forms') {
|
|
274
|
+
const formId = positionals[2];
|
|
275
|
+
if (!formId)
|
|
276
|
+
throw new Error('Name the form: sandcms forms export FORM --output PATH');
|
|
277
|
+
if (!values.output)
|
|
278
|
+
throw new Error('Use --output PATH');
|
|
279
|
+
const definition = loadDefinition(join(root, 'sandcms'));
|
|
280
|
+
const forms = definition.blueprints.filter((b) => b.kind === 'form').map((b) => b.id);
|
|
281
|
+
if (!forms.includes(formId))
|
|
282
|
+
throw new Error(`No form blueprint ${formId}. Forms: ${forms.join(', ') || 'none'}`);
|
|
283
|
+
const output = resolve(values.output);
|
|
284
|
+
if (existsSync(output) && !values.force)
|
|
285
|
+
throw new Error(`${output} exists; choose a new path or pass --force`);
|
|
286
|
+
mkdirSync(dirname(output), { recursive: true });
|
|
287
|
+
writeFileSync(output, createForms(store, definition).csv(formId), { mode: 0o600 });
|
|
288
|
+
console.log(`Wrote ${formId} submissions to ${output}. It contains personal data.`);
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
if (command === 'key') {
|
|
292
|
+
if (subcommand === 'create') {
|
|
293
|
+
const auth = createAuth(store, {
|
|
294
|
+
origin: process.env.SANDCMS_ORIGIN ?? 'http://localhost:5410',
|
|
295
|
+
secret: process.env.SANDCMS_SECRET ?? ''
|
|
145
296
|
});
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
if (role !== 'admin' && role !== 'editor')
|
|
152
|
-
throw new Error('Role must be admin or editor');
|
|
153
|
-
await createUser(store, {
|
|
154
|
-
email,
|
|
155
|
-
name: values.name ?? (await text('Display name')),
|
|
156
|
-
role,
|
|
157
|
-
password: await suppliedPassword()
|
|
297
|
+
const key = await createOperatorKey(auth, store, {
|
|
298
|
+
email: values.email ?? (await text('Owner email address')),
|
|
299
|
+
name: values.name ?? (await text('Key name')),
|
|
300
|
+
scope: values.scope ?? (await text('Scope (read or write)')),
|
|
301
|
+
days: values.days
|
|
158
302
|
});
|
|
159
|
-
console.
|
|
303
|
+
console.error(`Created ${key.scope} key ${key.id} for ${key.owner}, expires ${key.expiresAt?.toISOString()}.\nThe secret below is shown once; send it as the x-api-key header. Revoke with: sandcms key revoke --id ${key.id}`);
|
|
304
|
+
console.log(key.key);
|
|
160
305
|
return;
|
|
161
306
|
}
|
|
162
|
-
if (subcommand === '
|
|
163
|
-
|
|
164
|
-
|
|
307
|
+
if (subcommand === 'list') {
|
|
308
|
+
const keys = listApiKeys(store).map((k) => ({
|
|
309
|
+
id: k.id,
|
|
310
|
+
name: k.name,
|
|
311
|
+
start: k.start,
|
|
312
|
+
owner: k.owner,
|
|
313
|
+
scope: k.permissions?.cms?.includes('write') ? 'write' : 'read',
|
|
314
|
+
enabled: k.enabled !== false,
|
|
315
|
+
expiresAt: k.expiresAt?.toISOString() ?? null,
|
|
316
|
+
expired: Boolean(k.expiresAt && k.expiresAt.getTime() <= Date.now()),
|
|
317
|
+
lastRequest: k.lastRequest?.toISOString() ?? null
|
|
318
|
+
}));
|
|
319
|
+
if (values.json)
|
|
320
|
+
return console.log(JSON.stringify(keys, null, 2));
|
|
321
|
+
if (!keys.length)
|
|
322
|
+
return console.log('No API keys.');
|
|
323
|
+
table([
|
|
324
|
+
['ID', 'Name', 'Owner', 'Scope', 'Expires', 'Last used'],
|
|
325
|
+
...keys.map((k) => [
|
|
326
|
+
k.id,
|
|
327
|
+
`${k.name ?? ''} (${k.start ?? ''}…)`,
|
|
328
|
+
k.owner,
|
|
329
|
+
k.scope,
|
|
330
|
+
k.expired ? 'expired' : date(k.expiresAt),
|
|
331
|
+
date(k.lastRequest)
|
|
332
|
+
])
|
|
333
|
+
]);
|
|
165
334
|
return;
|
|
166
335
|
}
|
|
167
|
-
if (
|
|
168
|
-
|
|
169
|
-
|
|
336
|
+
if (values.id && values.email)
|
|
337
|
+
throw new Error('Use either --id ID or --email EMAIL');
|
|
338
|
+
if (values.email) {
|
|
339
|
+
const revoked = revokeOwnerKeys(store, values.email);
|
|
340
|
+
console.log(`Revoked ${revoked} API key${revoked === 1 ? '' : 's'} of ${values.email}; revocations audited.`);
|
|
170
341
|
return;
|
|
171
342
|
}
|
|
343
|
+
const id = values.id ?? (await text('Key ID'));
|
|
344
|
+
if (!revokeApiKey(store, id, 'operator'))
|
|
345
|
+
throw new Error('API key not found');
|
|
346
|
+
console.log('Key revoked; revocation audited.');
|
|
347
|
+
return;
|
|
172
348
|
}
|
|
173
|
-
|
|
349
|
+
// command === 'user'
|
|
350
|
+
if (subcommand === 'list') {
|
|
351
|
+
const users = listUsers(store);
|
|
352
|
+
if (values.json)
|
|
353
|
+
return console.log(JSON.stringify(users, null, 2));
|
|
354
|
+
if (!users.length)
|
|
355
|
+
return console.log('No users. Run sandcms user bootstrap.');
|
|
356
|
+
table([
|
|
357
|
+
['Email', 'Name', 'Role', '2FA', 'Sessions', 'Created'],
|
|
358
|
+
...users.map((u) => [
|
|
359
|
+
u.email + (u.mustChangePassword ? ' (temporary password)' : ''),
|
|
360
|
+
u.name,
|
|
361
|
+
u.role,
|
|
362
|
+
u.twoFactor ? 'yes' : 'no',
|
|
363
|
+
String(u.activeSessions),
|
|
364
|
+
date(u.createdAt)
|
|
365
|
+
])
|
|
366
|
+
]);
|
|
367
|
+
return;
|
|
368
|
+
}
|
|
369
|
+
if (subcommand === 'sign-out') {
|
|
370
|
+
if (!!values.all === !!values.email)
|
|
371
|
+
throw new Error('Use either --email EMAIL or --all');
|
|
372
|
+
if (values.all)
|
|
373
|
+
await approve('Sign out every user, including you? Content and API keys are kept.');
|
|
374
|
+
const ended = signOut(store, values.email);
|
|
375
|
+
console.log(`Ended ${ended} session${ended === 1 ? '' : 's'}; recorded in the audit log.`);
|
|
376
|
+
return;
|
|
377
|
+
}
|
|
378
|
+
const email = await emailOption();
|
|
379
|
+
if (subcommand === 'bootstrap') {
|
|
380
|
+
if (store.db.select().from(user).limit(1).get())
|
|
381
|
+
throw new Error('Bootstrap is only available on an empty user database');
|
|
382
|
+
const generated = crypto.randomUUID() + 'A!';
|
|
383
|
+
await createUser(store, {
|
|
384
|
+
email,
|
|
385
|
+
name: values.name ?? 'Administrator',
|
|
386
|
+
role: 'admin',
|
|
387
|
+
password: generated
|
|
388
|
+
});
|
|
389
|
+
console.log(`One-time bootstrap password: ${generated}\nChange it at first sign-in. This account exists only in ${database}.`);
|
|
390
|
+
return;
|
|
391
|
+
}
|
|
392
|
+
if (subcommand === 'add') {
|
|
393
|
+
const role = values.role ?? 'editor';
|
|
394
|
+
if (role !== 'admin' && role !== 'editor')
|
|
395
|
+
throw new Error('Role must be admin or editor');
|
|
396
|
+
await createUser(store, {
|
|
397
|
+
email,
|
|
398
|
+
name: values.name ?? (await text('Display name')),
|
|
399
|
+
role,
|
|
400
|
+
password: await suppliedPassword()
|
|
401
|
+
});
|
|
402
|
+
console.log('User created; deliver the supplied password privately.');
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
if (subcommand === 'set-role') {
|
|
406
|
+
if (!values.role)
|
|
407
|
+
throw new Error('Use --role admin or --role editor');
|
|
408
|
+
console.log(setRole(store, email, values.role)
|
|
409
|
+
? `${email} is now ${values.role === 'admin' ? 'an admin' : 'an editor'}.`
|
|
410
|
+
: `${email} already has the ${values.role} role.`);
|
|
411
|
+
return;
|
|
412
|
+
}
|
|
413
|
+
if (subcommand === 'remove') {
|
|
414
|
+
await approve(`Remove ${email}? Their sessions and API keys are deleted. Content is kept.`);
|
|
415
|
+
removeUser(store, email);
|
|
416
|
+
console.log('User removed; recorded in the audit log.');
|
|
417
|
+
return;
|
|
418
|
+
}
|
|
419
|
+
if (subcommand === 'reset-password') {
|
|
420
|
+
await recoverUser(store, email, 'password', await suppliedPassword());
|
|
421
|
+
console.log('Password reset; sessions invalidated; recovery audited.');
|
|
422
|
+
return;
|
|
423
|
+
}
|
|
424
|
+
await recoverUser(store, email, '2fa');
|
|
425
|
+
console.log('Two-factor reset; sessions invalidated; recovery audited.');
|
|
174
426
|
}
|
|
175
427
|
finally {
|
|
176
428
|
store.close();
|
|
177
429
|
}
|
|
430
|
+
async function mediaCommand(cms, subcommand) {
|
|
431
|
+
if (subcommand === 'verify') {
|
|
432
|
+
const report = verifyMedia(cms, { repair: values.repair });
|
|
433
|
+
for (const id of report.missingOriginals)
|
|
434
|
+
console.error(`Original missing: ${id}`);
|
|
435
|
+
for (const v of report.missingVariants)
|
|
436
|
+
console.error(`Variant missing: ${v.key}`);
|
|
437
|
+
for (const v of report.unrepairable)
|
|
438
|
+
console.error(`No job to re-render ${v.key}; run media rebuild --force or upload again`);
|
|
439
|
+
console.log(`Checked ${report.checked} assets: ${report.missingOriginals.length} missing originals, ${report.missingVariants.length} missing variants.` +
|
|
440
|
+
(values.repair
|
|
441
|
+
? ` Re-rendering ${report.requeued.length} assets; marked ${report.failed.length} failed. The website renders them, or run media rebuild.`
|
|
442
|
+
: ''));
|
|
443
|
+
if (!values.repair && (report.missingOriginals.length || report.missingVariants.length))
|
|
444
|
+
throw new Error('Media files are missing; run media verify --repair');
|
|
445
|
+
return;
|
|
446
|
+
}
|
|
447
|
+
if (subcommand === 'prune') {
|
|
448
|
+
const found = pruneMedia(cms);
|
|
449
|
+
let report = found;
|
|
450
|
+
if (values.delete && found.items.length) {
|
|
451
|
+
await approve(`Permanently delete ${found.items.length} unused media folders and files (${mb(found.bytes)})? ` +
|
|
452
|
+
'An older database backup that still uses them would need media verify --repair after a restore.');
|
|
453
|
+
report = pruneMedia(cms, { remove: true });
|
|
454
|
+
}
|
|
455
|
+
if (values.json)
|
|
456
|
+
return console.log(JSON.stringify(report, null, 2));
|
|
457
|
+
for (const item of report.items)
|
|
458
|
+
console.log(`${report.removed ? 'Removed' : 'Unused'}: ${item.path} (${mb(item.bytes)}, ${item.reason === 'old-version' ? 'old variant version' : 'no asset'})`);
|
|
459
|
+
console.log(report.removed
|
|
460
|
+
? `Removed ${report.items.length} entries, freeing ${mb(report.bytes)}.`
|
|
461
|
+
: `${report.items.length} unused entries use ${mb(report.bytes)}.` +
|
|
462
|
+
(report.items.length ? ' Run media prune --delete to remove them.' : ''));
|
|
463
|
+
return;
|
|
464
|
+
}
|
|
465
|
+
if (values.force)
|
|
466
|
+
console.log(`Re-rendering ${forceRebuild(cms)} assets with the local processor.`);
|
|
467
|
+
cms.media.rebuild();
|
|
468
|
+
const counts = () => {
|
|
469
|
+
const assets = cms.media.list();
|
|
470
|
+
return {
|
|
471
|
+
processing: assets.filter((a) => a.status === 'processing').length,
|
|
472
|
+
failed: assets.filter((a) => a.status === 'failed').length
|
|
473
|
+
};
|
|
474
|
+
};
|
|
475
|
+
while (counts().processing) {
|
|
476
|
+
await cms.media.drain();
|
|
477
|
+
await Bun.sleep(1000);
|
|
478
|
+
const { processing, failed } = counts();
|
|
479
|
+
console.log(`Processing: ${processing}. Failed: ${failed}.`);
|
|
480
|
+
}
|
|
481
|
+
if (counts().failed)
|
|
482
|
+
throw new Error('Some images failed; retry with media rebuild');
|
|
483
|
+
}
|
|
178
484
|
}
|
|
179
485
|
main().catch((e) => {
|
|
180
486
|
console.error(e instanceof Error ? e.message : e);
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Convert a SandCMS 0.7.x database (the retired 0000–0009 migration history) into a fresh database built
|
|
3
|
+
* from the 0.8.0 baseline, copying every row. Media files are untouched. The website must be stopped; a
|
|
4
|
+
* verified safety copy of the old database is kept next to it.
|
|
5
|
+
*/
|
|
6
|
+
export declare function rebaseline(database: string, confirmed?: boolean): {
|
|
7
|
+
target: string;
|
|
8
|
+
safety: string;
|
|
9
|
+
copied: Record<string, number>;
|
|
10
|
+
};
|