From f2a5df029a0f80b5ca37e7c3c07a65de572340b3 Mon Sep 17 00:00:00 2001 From: Joshua Oosthuizen Date: Thu, 19 Nov 2026 10:37:16 +0200 Subject: [PATCH 1/3] Demo data from the Hub: crosscode demo, the seed-demo job, set-demo fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - scripts: `crosscode demo --profile … [--admin-email …]`: backup, set-demo.js as the site's user, reload, wait for /health. - Contracts 1.7.0: the seed-demo job, DEMO_PROFILES, SEED_DEMO_MIN_AGENT. - Agent 1.2.0: seed-demo → crosscode demo. - Events 2.4.1: set-demo.js stops with a clear message when it can't read .env (was "client password must be a string", then a hang); keeps the oldest admin when the default one isn't on the site; --admin-email=. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 16 +++ apps/agent/package.json | 10 +- apps/agent/src/command.ts | 2 + apps/agent/src/stats.ts | 2 +- apps/agent/tests/command.test.ts | 6 + apps/events/CHANGELOG.md | 12 ++ apps/events/WHATS-NEW.md | 4 + apps/events/backend/package.json | 2 +- apps/events/backend/scripts/set-demo.js | 32 +++++- apps/events/frontend/package.json | 2 +- apps/events/package.json | 2 +- docs/AGENT-1.0-PLAN.md | 1 + package-lock.json | 8 +- packages/contracts/package.json | 2 +- packages/contracts/schemas/agent-job.json | 111 +++++++++++++++++++ packages/contracts/schemas/agent-report.json | 1 + packages/contracts/src/agent.ts | 18 ++- packages/contracts/tests/agent.test.ts | 13 +++ scripts/crosscode | 4 +- scripts/lib/manage.sh | 50 +++++++++ scripts/tests/demo.bats | 83 ++++++++++++++ 21 files changed, 360 insertions(+), 21 deletions(-) create mode 100644 scripts/tests/demo.bats diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b7b7ab..9bfdc85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ Each package and app has its own section and its own tags (`contracts@1.0.0`, `accounts@1.0.0`, …). +## events@2.4.1, contracts@1.7.0, agent@1.2.0, crosscode script - 2026-11-19 + +Demo data from the Hub, for installs marked as demo sites (Hub 2.4.0). + +- **Scripts: `crosscode demo --profile + [--admin-email ]`.** Takes a backup, loads the demo set as the site's user (who alone + can read its `.env`), then reloads Events and waits for `/health`. Stops before the data if the + backup fails, and doesn't reload after a failed seed. +- **Contracts 1.7.0:** the `seed-demo` job (`church`, `profile`, optional `adminEmail`; 15 + minutes), `DEMO_PROFILES`, `SEED_DEMO_MIN_AGENT`. +- **Agent 1.2.0:** runs `seed-demo` jobs as `crosscode demo`. Older agents refuse them, so the + Hub checks the agent's version first. +- **Events 2.4.1:** `set-demo.js` says to run as the site's user instead of failing with "client + password must be a string" and hanging; keeps the site's oldest admin when the default isn't + there. Details in `apps/events/CHANGELOG.md`. + ## accounts@1.0.1, contracts@1.6.0, crosscode script - 2026-11-19 A server configuration with `TRUST_PROXY=TRUE` made an Events install build for minutes, then diff --git a/apps/agent/package.json b/apps/agent/package.json index 3bdaaf3..5d33b6a 100644 --- a/apps/agent/package.json +++ b/apps/agent/package.json @@ -1,10 +1,12 @@ { "name": "@crosscode/agent", - "version": "1.1.1", + "version": "1.2.0", "private": true, "description": "The server agent: runs the crosscode script for signed jobs from Cross Code Hub, reports stats (docs/AGENT-1.0-PLAN.md)", "license": "UNLICENSED", - "bin": { "crosscode-agent": "./dist/cli.js" }, + "bin": { + "crosscode-agent": "./dist/cli.js" + }, "scripts": { "build": "tsup", "typecheck": "tsc -p tsconfig.json --noEmit", @@ -14,5 +16,7 @@ "@crosscode/contracts": "*", "zod": "^4.6.7" }, - "engines": { "node": ">=24" } + "engines": { + "node": ">=24" + } } diff --git a/apps/agent/src/command.ts b/apps/agent/src/command.ts index f8ca2d6..1bf9ab0 100644 --- a/apps/agent/src/command.ts +++ b/apps/agent/src/command.ts @@ -48,6 +48,8 @@ export function crosscodeArgs(job: agent.AgentJob, opts: { exportFile?: string } return ["adopt", job.args.church, "--undo"]; case "restart": return ["restart", job.args.church, ...(job.args.product ? [job.args.product] : [])]; + case "seed-demo": + return ["demo", job.args.church, "--profile", job.args.profile, ...(job.args.adminEmail ? ["--admin-email", job.args.adminEmail] : [])]; case "export": if (!opts.exportFile) throw new Error("export needs a file to write"); return ["export", job.args.church, "--out", opts.exportFile]; diff --git a/apps/agent/src/stats.ts b/apps/agent/src/stats.ts index 36b8d53..62c138c 100644 --- a/apps/agent/src/stats.ts +++ b/apps/agent/src/stats.ts @@ -12,7 +12,7 @@ import { paths } from "./paths"; * the tools that are there; anything missing is null rather than an error. */ -export const AGENT_VERSION = "1.1.1"; +export const AGENT_VERSION = "1.2.0"; function run(cmd: string, args: string[], timeoutMs = 10_000): Promise { return new Promise((resolve) => { diff --git a/apps/agent/tests/command.test.ts b/apps/agent/tests/command.test.ts index 40f6779..bf7904b 100644 --- a/apps/agent/tests/command.test.ts +++ b/apps/agent/tests/command.test.ts @@ -39,6 +39,12 @@ describe("crosscode arguments for each job", () => { expect(crosscodeArgs(parsed({ type: "status", args: {} }))).toEqual(["status", "--no-fetch"]); }); + it("seed-demo: crosscode demo with the profile, and the admin kept when the Hub names one", () => { + expect(crosscodeArgs(parsed({ type: "seed-demo", args: { church: "hope", profile: "ministry" } }))).toEqual(["demo", "hope", "--profile", "ministry"]); + expect(crosscodeArgs(parsed({ type: "seed-demo", args: { church: "hope", profile: "events", adminEmail: "jane@hope.test" } }))) + .toEqual(["demo", "hope", "--profile", "events", "--admin-email", "jane@hope.test"]); + }); + it("export writes to the file the agent gives", () => { const j = parsed({ type: "export", args: { church: "hope", exportId: "exp_abcdefgh" } }); expect(crosscodeArgs(j, { exportFile: "/var/lib/crosscode-agent/exports/exp_abcdefgh.zip" })).toEqual(["export", "hope", "--out", "/var/lib/crosscode-agent/exports/exp_abcdefgh.zip"]); diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md index 09c7ab4..97a7526 100644 --- a/apps/events/CHANGELOG.md +++ b/apps/events/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project are documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project follows [Semantic Versioning](https://semver.org/). +## [2.4.1] - 2026-11-19 + +### Fixed + +- **Demo data on a server** (`scripts/set-demo.js`): run as anyone but the site's user, `.env` + (mode 600) couldn't be read, so `DATABASE_URL` was missing and pg failed with "client password + must be a string", then hung. It now stops at once and says to run it as the site's user (or + `crosscode demo`, which the Hub uses). +- The admin account kept can be named with `--admin-email=` (or `DEMO_ADMIN_EMAIL`, as before). + When none is named and joshua@crosscode.co.za isn't on the site, the oldest admin is kept, so a + site installed from the Hub (with the church's own admin) can be seeded. + ## [2.4.0] - 2026-11-18 Protocol v2, Linked products, the event feed and `packages/seo` (ROADMAP-v3 phase 2, diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md index 6230187..6b444e9 100644 --- a/apps/events/WHATS-NEW.md +++ b/apps/events/WHATS-NEW.md @@ -12,6 +12,10 @@ Write for church admins, not developers: no environment variables, endpoints or developer log is CHANGELOG.md. A tagged version without a section here shows "No details given". --> +## 2.4.1 + +- Nothing changes for your church: this fixes setting up demonstration sites for Cross Code. + ## 2.4.0 - **Ready for the Church Website and App.** When your church has them, your events can show on diff --git a/apps/events/backend/package.json b/apps/events/backend/package.json index 10b890a..939801d 100644 --- a/apps/events/backend/package.json +++ b/apps/events/backend/package.json @@ -1,6 +1,6 @@ { "name": "@crosscode/events-backend", - "version": "2.4.0", + "version": "2.4.1", "description": "Event Management System Backend", "main": "src/index.js", "scripts": { diff --git a/apps/events/backend/scripts/set-demo.js b/apps/events/backend/scripts/set-demo.js index 600d6b6..beb1957 100644 --- a/apps/events/backend/scripts/set-demo.js +++ b/apps/events/backend/scripts/set-demo.js @@ -16,8 +16,9 @@ * campus-limited staff, a series across campuses, kids check-in and rosters at two * campuses. * - * Everything is removed first EXCEPT the site settings (AppSetting) and the admin - * account (DEMO_ADMIN_EMAIL, default joshua@crosscode.co.za). Dates are relative to + * Everything is removed first EXCEPT the site settings (AppSetting) and one admin + * account (--admin-email= or DEMO_ADMIN_EMAIL; else joshua@crosscode.co.za, else the oldest admin). + * Dates are relative to * today, so the upcoming events are always in the future whenever this is run. * * No emails or WhatsApp messages are sent. Demo people use @example.com addresses and @@ -40,7 +41,18 @@ const fs = require('fs'); const crypto = require('crypto'); const readline = require('readline'); -require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); +const ENV_FILE = path.resolve(__dirname, '../.env'); +const loaded = require('dotenv').config({ path: ENV_FILE, quiet: true }); + +// Without DATABASE_URL the pg driver fails with "client password must be a string" and hangs. The +// usual reason on a server: .env is readable only by the site's own user (mode 600). +if (!process.env.DATABASE_URL && !process.argv.includes('--list')) { + const denied = loaded.error && loaded.error.code === 'EACCES'; + console.error(denied + ? `Can't read ${ENV_FILE}: it belongs to the site's user. Run this as that user, e.g.\n sudo -u npm run demo:ministry\nor, as root: crosscode demo --profile ministry` + : `DATABASE_URL isn't set (${loaded.error ? `${ENV_FILE}: ${loaded.error.code || loaded.error.message}` : `not in ${ENV_FILE}`}). Nothing was changed.`); + process.exit(1); +} const { hashPassword } = require('../src/config/auth'); const { v4: uuidv4 } = require('uuid'); @@ -49,7 +61,11 @@ const { applyBundles } = require('../src/utils/bundles'); const prisma = createPrismaClient(); -const ADMIN_EMAIL = (process.env.DEMO_ADMIN_EMAIL || 'joshua@crosscode.co.za').trim().toLowerCase(); +// The account kept: --admin-email= or DEMO_ADMIN_EMAIL (must exist), else joshua@crosscode.co.za +// if it's there, else the oldest admin (a site installed from the Hub has its own admin). +const ADMIN_ARG = (process.argv.find(a => a.startsWith('--admin-email=')) || '').slice('--admin-email='.length); +const ADMIN_NAMED = (ADMIN_ARG || process.env.DEMO_ADMIN_EMAIL || '').trim().toLowerCase(); +const ADMIN_EMAIL = ADMIN_NAMED || 'joshua@crosscode.co.za'; const DEMO_PASSWORD = 'Demo@1234'; const SKIP_PROMPT = process.argv.includes('--yes') || process.argv.includes('-y'); const PROFILE_NAME = (process.argv.find(a => a.startsWith('--profile=')) || '--profile=events').split('=')[1].trim().toLowerCase(); @@ -1846,9 +1862,13 @@ async function main() { return; } admin = await prisma.user.findFirst({ where: { email: { equals: ADMIN_EMAIL, mode: 'insensitive' } } }); + if (!admin && !ADMIN_NAMED) { + admin = await prisma.user.findFirst({ where: { role: 'admin' }, orderBy: { createdAt: 'asc' } }); + if (admin) console.log(`Keeping the site's first admin, ${admin.email} (${ADMIN_EMAIL} isn't here).`); + } if (!admin) { - console.error(`Admin account ${ADMIN_EMAIL} was not found — nothing was changed.`); - console.error('Set DEMO_ADMIN_EMAIL to the account you want to keep.'); + console.error(`Admin account ${ADMIN_NAMED || 'to keep'} was not found — nothing was changed.`); + console.error('Name the account to keep with --admin-email= or DEMO_ADMIN_EMAIL (or finish /setup first).'); process.exitCode = 1; return; } diff --git a/apps/events/frontend/package.json b/apps/events/frontend/package.json index 009c95c..53d0084 100644 --- a/apps/events/frontend/package.json +++ b/apps/events/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@crosscode/events-frontend", - "version": "2.4.0", + "version": "2.4.1", "private": true, "scripts": { "dev": "next dev", diff --git a/apps/events/package.json b/apps/events/package.json index 406563c..e9e7254 100644 --- a/apps/events/package.json +++ b/apps/events/package.json @@ -1,6 +1,6 @@ { "name": "@crosscode/events", - "version": "2.4.0", + "version": "2.4.1", "main": "index.js", "scripts": { "dev:backend": "cd backend && npm run dev", diff --git a/docs/AGENT-1.0-PLAN.md b/docs/AGENT-1.0-PLAN.md index 9aa758a..830d9a7 100644 --- a/docs/AGENT-1.0-PLAN.md +++ b/docs/AGENT-1.0-PLAN.md @@ -101,6 +101,7 @@ build differs from this plan, see [Changes while building](#changes-while-buildi | `deploy` | `crosscode deploy [products] [--version …] --json` | emergency only | | `adopt` / `adopt-undo` | `crosscode adopt …` | no | | `restart` | `crosscode restart [product]` (PM2 reload) | no | +| `seed-demo` | `crosscode demo --profile [--admin-email …]` (backup, demo data, reload; agent 1.2.0+) | no, but only for installs marked as demo sites in the Hub, and typing the short name | | `export` | `crosscode export --json` (§9) | no | | `uninstall` | `crosscode uninstall --json` | **yes**, and typing the short name | | `purge` | `crosscode purge ` (deletes the 30-day keep, §9) | no (scheduled at uninstall) | diff --git a/package-lock.json b/package-lock.json index 2f469c1..eb19213 100644 --- a/package-lock.json +++ b/package-lock.json @@ -108,7 +108,7 @@ }, "apps/agent": { "name": "@crosscode/agent", - "version": "1.1.1", + "version": "1.2.0", "license": "UNLICENSED", "dependencies": { "@crosscode/contracts": "*", @@ -127,7 +127,7 @@ }, "apps/events/backend": { "name": "@crosscode/events-backend", - "version": "2.4.0", + "version": "2.4.1", "hasInstallScript": true, "dependencies": { "@cj-tech-master/excelts": "^10.2.0", @@ -176,7 +176,7 @@ }, "apps/events/frontend": { "name": "@crosscode/events-frontend", - "version": "2.4.0", + "version": "2.4.1", "dependencies": { "@crosscode/contracts": "*", "@crosscode/seo": "*", @@ -21274,7 +21274,7 @@ }, "packages/contracts": { "name": "@crosscode/contracts", - "version": "1.6.0", + "version": "1.7.0", "license": "UNLICENSED", "dependencies": { "zod": "^4.6.7" diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 688a039..69f728f 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@crosscode/contracts", - "version": "1.6.0", + "version": "1.7.0", "description": "The shared JSON formats used by every Cross Code product: zod schemas, JSON Schema, TypeScript types and sample payloads", "license": "UNLICENSED", "type": "commonjs", diff --git a/packages/contracts/schemas/agent-job.json b/packages/contracts/schemas/agent-job.json index 24a3d2d..ead9d38 100644 --- a/packages/contracts/schemas/agent-job.json +++ b/packages/contracts/schemas/agent-job.json @@ -743,6 +743,117 @@ ], "additionalProperties": false }, + { + "type": "object", + "properties": { + "schema": { + "type": "string", + "const": "crosscode.agent-job/1" + }, + "id": { + "type": "string", + "pattern": "^job_[A-Za-z0-9_-]{8,64}$" + }, + "serverId": { + "type": "string", + "pattern": "^srv_[A-Za-z0-9_-]{8,64}$" + }, + "config": { + "anyOf": [ + { + "type": "object", + "properties": { + "alg": { + "type": "string", + "const": "x25519-hkdf-sha256-aes-256-gcm" + }, + "epk": { + "type": "string", + "pattern": "^[A-Za-z0-9_-]{43}$" + }, + "iv": { + "type": "string", + "pattern": "^[A-Za-z0-9_-]{16}$" + }, + "ciphertext": { + "type": "string", + "maxLength": 200000, + "pattern": "^[A-Za-z0-9_-]+$" + } + }, + "required": [ + "alg", + "epk", + "iv", + "ciphertext" + ], + "additionalProperties": false + }, + { + "type": "null" + } + ] + }, + "notBefore": { + "type": "string", + "format": "date-time", + "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d(?:\\.\\d+)?(?:Z))$" + }, + "expiresAt": { + "type": "string", + "format": "date-time", + "pattern": "^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d(?:\\.\\d+)?(?:Z))$" + }, + "signature": { + "type": "string", + "pattern": "^[A-Za-z0-9_-]{86}$" + }, + "type": { + "type": "string", + "const": "seed-demo" + }, + "args": { + "type": "object", + "properties": { + "church": { + "type": "string", + "pattern": "^[a-z][a-z0-9-]{1,30}$" + }, + "profile": { + "type": "string", + "enum": [ + "small", + "events", + "ministry", + "multicampus" + ] + }, + "adminEmail": { + "type": "string", + "maxLength": 254, + "format": "email", + "pattern": "^(?:[A-Za-z0-9_'+\\-]+\\.)*[A-Za-z0-9_'+\\-]*[A-Za-z0-9_+-]@(?:[A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$" + } + }, + "required": [ + "church", + "profile" + ], + "additionalProperties": false + } + }, + "required": [ + "schema", + "id", + "serverId", + "notBefore", + "expiresAt", + "signature", + "type", + "args" + ], + "additionalProperties": false + }, { "type": "object", "properties": { diff --git a/packages/contracts/schemas/agent-report.json b/packages/contracts/schemas/agent-report.json index d4d320d..656e5d8 100644 --- a/packages/contracts/schemas/agent-report.json +++ b/packages/contracts/schemas/agent-report.json @@ -24,6 +24,7 @@ "adopt", "adopt-undo", "restart", + "seed-demo", "export", "uninstall", "purge", diff --git a/packages/contracts/src/agent.ts b/packages/contracts/src/agent.ts index 4fcae97..033781b 100644 --- a/packages/contracts/src/agent.ts +++ b/packages/contracts/src/agent.ts @@ -54,6 +54,14 @@ export type AgentMode = z.infer; // Jobs (crosscode.agent-job/1) // --------------------------------------------------------------------------------------------- +/** Cross Events' demo data sets (`apps/events/backend/scripts/set-demo.js`). */ +export const DEMO_PROFILES = ["small", "events", "ministry", "multicampus"] as const; +export const demoProfileSchema = z.enum(DEMO_PROFILES); +export type DemoProfile = z.infer; + +/** The first agent that runs `seed-demo` jobs (an older one refuses the unknown type). */ +export const SEED_DEMO_MIN_AGENT = "1.2.0"; + /** Each job type and the arguments it takes. Unknown keys are refused, not stripped. */ export const jobArgsSchemas = { /** `crosscode install --products … --frp --json` */ @@ -81,6 +89,12 @@ export const jobArgsSchemas = { "adopt-undo": z.strictObject({ church: shortNameSchema }), /** `crosscode restart [product] --json` (PM2 reload) */ restart: z.strictObject({ church: shortNameSchema, product: productSchema.optional() }), + /** + * `crosscode demo --profile [--admin-email ] --json`: replaces Cross + * Events' data with a demo set (a backup is taken first). The Hub only makes it for installs + * marked as demo sites. `adminEmail`: the account kept (default: the release's own choice). + */ + "seed-demo": z.strictObject({ church: shortNameSchema, profile: demoProfileSchema, adminEmail: z.email().max(254).optional() }), /** `crosscode export --out --json`; the agent encrypts the ZIP and uploads it under `exportId`. */ export: z.strictObject({ church: shortNameSchema, exportId: z.string().regex(/^exp_[A-Za-z0-9_-]{8,64}$/) }), /** `crosscode uninstall --json` */ @@ -105,7 +119,7 @@ export const CENTRAL_JOB_TYPES: readonly JobType[] = ["check-ports", "status", " /** Time limits per job type, in minutes (§3). A job past it is stopped and reported as failed. */ export const JOB_TIME_LIMIT_MINUTES: Record = { - install: 30, "add-product": 30, deploy: 20, adopt: 30, "adopt-undo": 15, restart: 5, export: 20, + install: 30, "add-product": 30, deploy: 20, adopt: 30, "adopt-undo": 15, restart: 5, "seed-demo": 15, export: 20, uninstall: 20, purge: 10, "update-agent": 15, "check-ports": 2, status: 3, }; @@ -149,7 +163,7 @@ function jobOf(type: T) { } export const agentJobSchema = z.discriminatedUnion("type", [ - jobOf("install"), jobOf("add-product"), jobOf("deploy"), jobOf("adopt"), jobOf("adopt-undo"), jobOf("restart"), + jobOf("install"), jobOf("add-product"), jobOf("deploy"), jobOf("adopt"), jobOf("adopt-undo"), jobOf("restart"), jobOf("seed-demo"), jobOf("export"), jobOf("uninstall"), jobOf("purge"), jobOf("update-agent"), jobOf("check-ports"), jobOf("status"), ]); export type AgentJob = z.infer; diff --git a/packages/contracts/tests/agent.test.ts b/packages/contracts/tests/agent.test.ts index b7fb4e2..c64fa41 100644 --- a/packages/contracts/tests/agent.test.ts +++ b/packages/contracts/tests/agent.test.ts @@ -154,6 +154,19 @@ describe("exports", () => { }); }); +describe("seed-demo jobs", () => { + const args = (a: Record) => agent.jobArgsSchemas["seed-demo"].safeParse(a).success; + it("take a known profile, and an admin email only when it is one", () => { + expect(args({ church: "hope", profile: "ministry" })).toBe(true); + expect(args({ church: "hope", profile: "events", adminEmail: "jane@hope.test" })).toBe(true); + expect(args({ church: "hope", profile: "everything" })).toBe(false); + expect(args({ church: "hope", profile: "small", adminEmail: "not an email; rm -rf /" })).toBe(false); + expect(args({ church: "hope", profile: "small", extra: 1 })).toBe(false); + expect(agent.JOB_TYPES).toContain("seed-demo"); + expect(agent.CENTRAL_JOB_TYPES).not.toContain("seed-demo"); + }); +}); + describe("env templates", () => { it("lists the required server and defaults values that are missing", () => { const template = agent.envTemplateSchema.parse({ diff --git a/scripts/crosscode b/scripts/crosscode index 27fb239..858ee85 100755 --- a/scripts/crosscode +++ b/scripts/crosscode @@ -96,6 +96,7 @@ crosscode: Cross Code installs on this server ($(git -C "${CROSSCODE_FROM:-.}" r crosscode adopt --events-dir move an existing Cross Events install here crosscode adopt --undo go back to the old folder (within 14 days) crosscode restart [events] reload the PM2 processes + crosscode demo --profile replace Events' data with a demo set crosscode export --out the church's data and uploads crosscode uninstall --confirm remove it (a final backup is kept 30 days) crosscode purge --confirm delete what uninstall kept @@ -112,6 +113,7 @@ case "$command" in install) cmd_install "$@" ;; adopt) cmd_adopt "$@" ;; restart) cmd_restart "$@" ;; + demo) cmd_demo "$@" ;; export) cmd_export "$@" ;; uninstall) cmd_uninstall "$@" ;; purge) cmd_purge "$@" ;; @@ -123,7 +125,7 @@ case "$command" in install) install_usage ;; add) add_usage ;; adopt) adopt_usage ;; - restart|export|uninstall|purge) manage_usage ;; + restart|demo|export|uninstall|purge) manage_usage ;; *) usage ;; esac ;; *) usage; die "Unknown command \"$command\"." ;; diff --git a/scripts/lib/manage.sh b/scripts/lib/manage.sh index 479ccb9..1e5906c 100644 --- a/scripts/lib/manage.sh +++ b/scripts/lib/manage.sh @@ -6,6 +6,10 @@ CROSSCODE_REMOVED="${CROSSCODE_REMOVED:-$CROSSCODE_SITES/.removed}" manage_usage() { cat <<'EOF' crosscode restart [events] reload the products' PM2 processes +crosscode demo --profile [--admin-email ] + replace Cross Events' data with a demo set + (small, events, ministry, multicampus); a backup + is taken first, one admin account is kept crosscode export --out the church's data (crosscode.church-export/1) and uploads crosscode uninstall --confirm final backup and uploads kept in @@ -52,6 +56,52 @@ cmd_restart() { done } +DEMO_PROFILES="small events ministry multicampus" + +# Replaces Events' data with a demo set (apps/events/backend/scripts/set-demo.js), as the site's +# user (its .env is readable only by that user). The Hub sends it only for installs marked as demo +# sites. Afterwards Events is reloaded: the demo switches campuses on or off. +cmd_demo() { + local church="" profile="" email="" dir user app + while [ $# -gt 0 ]; do + case "$1" in + --profile) [ $# -ge 2 ] || die "--profile needs a value."; profile="$2"; shift 2 ;; + --admin-email) [ $# -ge 2 ] || die "--admin-email needs a value."; email="$2"; shift 2 ;; + -h|--help) manage_usage; return 0 ;; + -*) die "Unknown option $1 (crosscode help demo)." ;; + *) [ -z "$church" ] || die "One church at a time."; church="$1"; shift ;; + esac + done + [ -n "$church" ] || die "Name the church." + [[ " $DEMO_PROFILES " == *" $profile "* ]] || die "--profile: one of $DEMO_PROFILES." + [ -z "$email" ] || [[ "$email" =~ ^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$ ]] || die "--admin-email: not an email address." + require_root + load_church "$church" + church_has_product events || die "$church has no Cross Events." + # shellcheck source=/dev/null + source "$CROSSCODE_HOME/products/events.sh" + dir="$(pvar events DIR)" + user="$(pvar events USER)" + app="$(events_app "$dir")" + [ -f "$app/backend/scripts/set-demo.js" ] || die "This release of Events ($(checkout_ref "$dir" events)) has no demo data." + + step "Events: backup first" + events_backup "$dir" "$user" || die "The backup failed, so the demo data wasn't loaded." + + step "Events: demo data ($profile)" + local -a env_args=() + # DEMO_ADMIN_EMAIL rather than --admin-email=: releases before 2.4.1 only read the variable. + [ -z "$email" ] || env_args=("DEMO_ADMIN_EMAIL=$email") + run_as "$user" "$app/backend" env "${env_args[@]+"${env_args[@]}"}" node scripts/set-demo.js "--profile=$profile" --yes || + die "The demo data wasn't loaded (see above). If it got as far as changing anything, the backup from just now has the data from before." + + step "Events: reloading PM2" + events_reload "$dir" "$user" + step "Events: waiting for it to answer" + wait_for_version "$(events_health_url)" "$(events_expected_version "$dir")" 60 || + die "Events didn't answer after the reload (sudo -u $user pm2 logs)." +} + cmd_export() { local church="" out="" p tmp dir user bytes while [ $# -gt 0 ]; do diff --git a/scripts/tests/demo.bats b/scripts/tests/demo.bats new file mode 100644 index 0000000..2430ac0 --- /dev/null +++ b/scripts/tests/demo.bats @@ -0,0 +1,83 @@ +#!/usr/bin/env bats +# crosscode demo (lib/manage.sh): argument checks, then backup → demo data as the site's user → +# reload, in that order, and nothing after a step that fails. + +setup() { + export CROSSCODE_NO_UPDATE=1 + CC="$BATS_TEST_DIRNAME/../crosscode" + TMP="$BATS_TEST_TMPDIR" + CALLS="$TMP/calls" + : > "$CALLS" + # shellcheck source=../lib/common.sh + source "$BATS_TEST_DIRNAME/../lib/common.sh" + # shellcheck source=../lib/manage.sh + source "$BATS_TEST_DIRNAME/../lib/manage.sh" + + # A church with Events, and Events' hooks recording what they'd do. + export CROSSCODE_HOME="$TMP/home" + mkdir -p "$CROSSCODE_HOME/products" "$TMP/sites/hope/events/apps/events/backend/scripts" + touch "$TMP/sites/hope/events/apps/events/backend/scripts/set-demo.js" + cat > "$CROSSCODE_HOME/products/events.sh" <> "$CALLS"; [ -z "\${FAIL_BACKUP:-}" ]; } +events_reload() { echo "reload \$2" >> "$CALLS"; } +events_health_url() { echo http://127.0.0.1:20001/health; } +events_expected_version() { echo 2.4.1; } +EOF + require_root() { :; } + load_church() { [ "$1" = hope ] || die "There's no church $1 here."; } + church_has_product() { [ "$1" = events ]; } + pvar() { case "$2" in DIR) echo "$TMP/sites/hope/events" ;; USER) echo cc-hope ;; esac; } + checkout_ref() { echo events@2.4.1; } + wait_for_version() { echo "wait $2" >> "$CALLS"; } + run_as() { local user="$1" dir="$2"; shift 2; echo "run $user ${dir#"$TMP"/} $*" >> "$CALLS"; [ -z "${FAIL_SEED:-}" ]; } +} + +@test "the profile and admin email are checked before anything else" { + CROSSCODE_HOME= run bash "$CC" demo hope + [ "$status" -eq 1 ] + [[ "$output" == *"--profile: one of small events ministry multicampus"* ]] + CROSSCODE_HOME= run bash "$CC" demo hope --profile everything + [ "$status" -eq 1 ] + CROSSCODE_HOME= run bash "$CC" demo hope --profile small --admin-email 'x; rm -rf /' + [ "$status" -eq 1 ] + [[ "$output" == *"not an email address"* ]] + CROSSCODE_HOME= run bash "$CC" help demo + [[ "$output" == *"crosscode demo --profile"* ]] +} + +@test "backup, then the demo as the site's user (no prompt), then a reload" { + run cmd_demo hope --profile ministry + [ "$status" -eq 0 ] + [ "$(cat "$CALLS")" = "backup cc-hope +run cc-hope sites/hope/events/apps/events/backend env node scripts/set-demo.js --profile=ministry --yes +reload cc-hope +wait 2.4.1" ] +} + +@test "the admin to keep goes in DEMO_ADMIN_EMAIL (older releases only read that)" { + run cmd_demo hope --profile small --admin-email jane@hope.test + [ "$status" -eq 0 ] + grep -qx 'run cc-hope sites/hope/events/apps/events/backend env DEMO_ADMIN_EMAIL=jane@hope.test node scripts/set-demo.js --profile=small --yes' "$CALLS" +} + +@test "a failed backup stops it before the data is touched" { + FAIL_BACKUP=1 run cmd_demo hope --profile small + [ "$status" -eq 1 ] + [[ "$output" == *"The backup failed"* ]] + [ "$(cat "$CALLS")" = "backup cc-hope" ] +} + +@test "a failed demo isn't followed by a reload" { + FAIL_SEED=1 run cmd_demo hope --profile small + [ "$status" -eq 1 ] + ! grep -q reload "$CALLS" +} + +@test "a release without the demo script is refused" { + rm "$TMP/sites/hope/events/apps/events/backend/scripts/set-demo.js" + run cmd_demo hope --profile small + [ "$status" -eq 1 ] + [[ "$output" == *"has no demo data"* ]] + [ ! -s "$CALLS" ] +} From 6ac17a6a628ed553c3529a2d858e376bd3a8bee7 Mon Sep 17 00:00:00 2001 From: Joshua Oosthuizen Date: Thu, 19 Nov 2026 10:38:35 +0200 Subject: [PATCH 2/3] Events 2.4.1: the default logo is the Cross Code logo, not Hope Family Church's Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 3 ++- apps/events/CHANGELOG.md | 2 ++ apps/events/SETTINGS.md | 2 +- apps/events/WHATS-NEW.md | 4 +++- apps/events/frontend/src/app/church_logo.jpg | Bin 43011 -> 0 bytes apps/events/frontend/src/app/default_logo.png | Bin 0 -> 20417 bytes .../frontend/src/components/layout/Navbar.tsx | 6 +++--- 7 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 apps/events/frontend/src/app/church_logo.jpg create mode 100644 apps/events/frontend/src/app/default_logo.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bfdc85..14c339a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,8 @@ Demo data from the Hub, for installs marked as demo sites (Hub 2.4.0). Hub checks the agent's version first. - **Events 2.4.1:** `set-demo.js` says to run as the site's user instead of failing with "client password must be a string" and hanging; keeps the site's oldest admin when the default isn't - there. Details in `apps/events/CHANGELOG.md`. + there. The default logo (before a church uploads one) is the Cross Code logo, not Hope Family + Church's. Details in `apps/events/CHANGELOG.md`. ## accounts@1.0.1, contracts@1.6.0, crosscode script - 2026-11-19 diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md index 97a7526..dd5aae2 100644 --- a/apps/events/CHANGELOG.md +++ b/apps/events/CHANGELOG.md @@ -13,6 +13,8 @@ and this project follows [Semantic Versioning](https://semver.org/). (mode 600) couldn't be read, so `DATABASE_URL` was missing and pg failed with "client password must be a string", then hung. It now stops at once and says to run it as the site's user (or `crosscode demo`, which the Hub uses). +- **The default logo** (before a church uploads its own) was still Hope Family Church's artwork; it's + now the Cross Code logo (`frontend/src/app/default_logo.png`). - The admin account kept can be named with `--admin-email=` (or `DEMO_ADMIN_EMAIL`, as before). When none is named and joshua@crosscode.co.za isn't on the site, the oldest admin is kept, so a site installed from the Hub (with the church's own admin) can be seeded. diff --git a/apps/events/SETTINGS.md b/apps/events/SETTINGS.md index a1b33cd..0ffde81 100644 --- a/apps/events/SETTINGS.md +++ b/apps/events/SETTINGS.md @@ -26,7 +26,7 @@ in-process settings cache TTL) without a server restart. | `primary_color` | Legacy `accent_color` value if present, else `#4F46E5` (indigo) on the website / `#1e3a5f` (navy) in emails | See [Two different fallbacks](#two-different-fallbacks-for-primary_color) below — this is the one setting with a genuine inconsistency worth knowing about. Drives buttons, links, nav highlights, and the email header/CTA. The Branding tab warns when it is under 4.5:1 against white (too light for white text and links) and offers a darker shade (1.50.0). | | `secondary_color` | `210 40% 96.1%` background / near-black text (light gray "wash", shadcn's stock theme) | The Branding tab's color picker *pre-fills* `#8B5CF6` as a suggested starting point, but that's only a UI default — if you never hit Save, the actual site uses the light-gray fallback, not violet. | | `accent_color` | `210 40% 96.1%` background / near-black text (same light gray as Secondary) | Same story as Secondary — the picker pre-fills `#EC4899` (pink) as a suggestion only. | -| `logo_url` | Bundled logo (`frontend/src/app/church_logo.jpg`) | Shown in the navbar. This is still the original Hope Family Church artwork checked into the repo — swap the file (or upload a real logo via the Branding tab) before deploying for a different organisation. | +| `logo_url` | Bundled Cross Code logo (`frontend/src/app/default_logo.png`) | Shown in the navbar until the church uploads its own (Site settings → Branding, or `/setup`). | | `favicon_url` | `frontend/public/favicon.ico` (the site's original generic favicon) | Shown in the browser tab. | ### Two different fallbacks for `primary_color` diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md index 6b444e9..67b6ba1 100644 --- a/apps/events/WHATS-NEW.md +++ b/apps/events/WHATS-NEW.md @@ -14,7 +14,9 @@ developer log is CHANGELOG.md. A tagged version without a section here shows "No ## 2.4.1 -- Nothing changes for your church: this fixes setting up demonstration sites for Cross Code. +- Until you upload your own logo (Site settings → Branding), the site now shows the Cross Code + logo. +- A fix for setting up demonstration sites. ## 2.4.0 diff --git a/apps/events/frontend/src/app/church_logo.jpg b/apps/events/frontend/src/app/church_logo.jpg deleted file mode 100644 index 5bfb94da14feb5f17331c9a0fabc387492b0b262..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43011 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 L+XkrqnfgBf(H|P3 diff --git a/apps/events/frontend/src/app/default_logo.png b/apps/events/frontend/src/app/default_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4b1daf56afa7153e1ec5e78e4e39b516ff77bc GIT binary patch literal 20417 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 literal 0 HcmV?d00001 diff --git a/apps/events/frontend/src/components/layout/Navbar.tsx b/apps/events/frontend/src/components/layout/Navbar.tsx index c924a91..d544fee 100644 --- a/apps/events/frontend/src/components/layout/Navbar.tsx +++ b/apps/events/frontend/src/components/layout/Navbar.tsx @@ -6,7 +6,7 @@ import { usePathname } from "next/navigation"; import { useAuth } from "@/hooks/useAuth"; import { useSiteSettings } from "@/contexts/SiteSettingsContext"; import { BottomNav } from "./BottomNav"; -import churchLogo from "@/app/church_logo.jpg"; +import defaultLogo from "@/app/default_logo.png"; import { appName } from "@/lib/siteConfig"; import { resolveToApiOrigin } from "@/lib/api"; import { hardNavigate } from "@/lib/navigation"; @@ -67,8 +67,8 @@ export const Navbar = () => { Logo ) : ( Church logo Date: Thu, 19 Nov 2026 10:43:21 +0200 Subject: [PATCH 3/3] docs: VERSIONS.md and HANDOVER for events@2.4.1, contracts@1.7.0, agent@1.2.0, Hub 2.4.0 Co-Authored-By: Claude Opus 5.5 --- docs/HANDOVER.md | 3 +++ docs/VERSIONS.md | 29 +++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/docs/HANDOVER.md b/docs/HANDOVER.md index a8fdacc..214a8fa 100644 --- a/docs/HANDOVER.md +++ b/docs/HANDOVER.md @@ -84,6 +84,9 @@ rollout. the app refuses some values at startup (as Events does a `TRUST_PROXY` it can't parse), add a rule to both `checkEnvValue` in `packages/contracts/src/agent.ts` (the Hub) and `VALUE_RULES` in `scripts/lib/envtpl.cjs` (the server), so a bad value stops before an install's build. +- **Demo data:** Hub → the install's page → Mark as a demo site → Load demo data (Hub 2.4.0, agent + 1.2.0; `crosscode demo --profile …` on the server). By hand, run `npm run demo:*` as the + site's user (`sudo -u cc- …`): only that user can read the `.env`. - **A new Events install never takes over an existing database**: moving an existing site is `adopt`, not a New install pointed at the old database. - **Prisma in the monorepo:** each app other than Events sets its own generator `output`, so diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 3e623e3..85157b6 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -10,11 +10,11 @@ separately below; the two often differ. | What | Repo | Latest | Tag | Released | |------|------|--------|-----|----------| -| Cross Events | `crosscode-platform` (`apps/events`) | **2.4.0** | `events@2.4.0` | 2026-11-18 | +| Cross Events | `crosscode-platform` (`apps/events`) | **2.4.1** | `events@2.4.1` | 2026-11-19 | | Accounts | `crosscode-platform` (`apps/accounts`) | **1.0.1** | `accounts@1.0.1` | 2026-11-19 | -| Server agent | `crosscode-platform` (`apps/agent`) | **1.1.1** | `agent@1.1.1` | 2026-11-18 | -| Contracts | `crosscode-platform` (`packages/contracts`) | **1.6.0** | `contracts@1.6.0` | 2026-11-19 | -| Cross Code Hub | `events-hub` | **2.3.3** | `v2.3.3` | 2026-11-19 | +| Server agent | `crosscode-platform` (`apps/agent`) | **1.2.0** | `agent@1.2.0` | 2026-11-19 | +| Contracts | `crosscode-platform` (`packages/contracts`) | **1.7.0** | `contracts@1.7.0` | 2026-11-19 | +| Cross Code Hub | `events-hub` | **2.4.0** | `v2.4.0` | 2026-11-19 | | crosscode.co.za | `crosscode-site` | **1.5.0** | `v1.5.0` | 2026-11-18 | | `crosscode` script | `crosscode-platform` (`scripts/`) | `main` | none | 2026-11-19 (last change) | @@ -37,21 +37,26 @@ need their own tags until something outside this repo depends on them. ## What each latest release was for -- **Events 2.4.0:** protocol v2, Linked products, the event feed, `packages/seo` - ([EVENTS-2.4-PLAN.md](./EVENTS-2.4-PLAN.md)). 2.3.1 is the version for churches until 2.4.0's +- **Events 2.4.1:** the default logo is the Cross Code logo; the demo script says to run as the + site's user (instead of "client password must be a string") and keeps the site's oldest admin. + 2.4.0: protocol v2, Linked products, the event feed, `packages/seo` + ([EVENTS-2.4-PLAN.md](./EVENTS-2.4-PLAN.md)). 2.3.1 is the version for churches until 2.4.x's e2e run on Postgres and VM test are done. - **Accounts 1.0.1:** `TRUST_PROXY=loopback` (the value behind frp) now turns proxy trust on; it used to turn it off. 1.0.0 was the church's sign-in (OpenID Connect provider) ([ACCOUNTS-1.0-PLAN.md](./ACCOUNTS-1.0-PLAN.md)). Needs the VM test and a run on real Postgres before a church gets it. -- **Agent 1.1.1:** stats keep going while a job runs; reports its real version. -- **Contracts 1.6.0:** `agent.checkEnvValue` / `invalidValues`, settings the apps can't start with - (1.5.0: the Accounts contracts). -- **Hub 2.3.3:** refuses a server setting the apps can't start with (`TRUST_PROXY=TRUE`) when it's +- **Agent 1.2.0:** runs `seed-demo` jobs (`crosscode demo`). 1.1.1: stats keep going while a job + runs. +- **Contracts 1.7.0:** the `seed-demo` job. 1.6.0: `agent.checkEnvValue` / `invalidValues`, + settings the apps can't start with. +- **Hub 2.4.0:** demo sites: mark an Events install as a demo site and load demo data from its + page (needs agent 1.2.0 on that server). 2.3.3: refuses a server setting the apps can't start with (`TRUST_PROXY=TRUE`) when it's saved and before a job. 2.3.2: installs no longer get stuck "Uninstalling" when the export fails; a failed install's record can be removed (and uninstall is refused for it). - **crosscode.co.za 1.5.0:** lists Accounts. -- **`crosscode` script (2026-11-19):** a value the app can't start with stops an install before the +- **`crosscode` script (2026-11-19):** `crosscode demo --profile …` (backup, demo data, + restart); a value the app can't start with stops an install before the build (`VALUE_RULES` in `lib/envtpl.cjs`); a failed install prints each PM2 app's last log lines before removing it, so the Hub's job log shows why the backend didn't start. @@ -62,7 +67,7 @@ you deploy one. | What | Running | Since | Notes | |------|---------|-------|-------| -| Hub | 2.x (exact version not recorded) | | It runs agent jobs (installs on church-server1, 2026-11-18), so it's past 2.1. **2.3.3 not deployed yet** | +| Hub | 2.x (exact version not recorded) | | It runs agent jobs (installs on church-server1, 2026-11-18), so it's past 2.1. **2.4.0 not deployed yet** (it has a migration) | | Agent on church-server1 | not recorded | | | | Agent on the central server | not recorded | | | | Cross Events (churches) | not recorded | | `hope-events` and `cross-events-demo` heartbeat as 2.1.1 and 2.3.1 |