54fa77f2eb
Per-user sessions UI (Settings -> Active sessions) - listMySessions returns the current user's still-valid sessions with last-8-char token suffix (UX hint) and an isCurrent flag (the authoritative "this device" marker). - revokeSession refuses if the target is the actor's current token — use Sign out for that flow. Per-row Revoke button on every other. - revokeAllOtherSessions = the previously-internal `deleteOtherSessions` helper exposed as a single button "Sign out other devices". - All gated to the actor's own userId (never lets a user touch another user's sessions). CSV parser refactor + tests - Extracted parseCSV, NAME_MAP, parseFloatMaybe, parseIntMaybe, getVariationNote, resolveExerciseName, parseDate from app/api/import/parse/route.ts to lib/csvParser.ts. Behavior byte-identical; route is now a thin wrapper that imports from the lib. - 18 tests covering: empty input, simple rows, lowercased headers, quoted-field commas, escaped double quotes, CRLF normalization, empty-line handling; numeric maybe-parsers; getVariationNote known patterns + null pass-through; ALL 27 NAME_MAP entries map to their canonical target; named CSV-shorthand examples; M/D/YYYY + ISO date parsing with noon-UTC anchoring (so US negative-offset zones still see the same calendar day). Workout + exercise CRUD route tests - New tests/routes-crud.test.ts: GET/POST /api/exercises, GET/POST /api/workouts. 401 on unauthenticated, per-user data isolation, query filtering, soft-delete exclusion, isCustom stamping, duplicate detection, type-driven inputFields defaults (cardio gets duration+calories), Zod validation rejection, set creation with weight/reps/rpe persisted, negative-reps rejected. - Helper builds NextRequest objects so the routes' nextUrl.searchParams access works. Composite indexes for hot query paths (schema.prisma + entrypoint) - Session: (userId, expiresAt) for "list my still-valid sessions" and per-user cleanup. - Workout: (userId, deletedAt, date) for the workout list query (filter by user + alive + date order). - SetLog: (workoutId, setNumber) for the always-ordered set fetch under each workout. - Existing single-column indexes kept; composites are additive. - Entrypoint runs CREATE INDEX IF NOT EXISTS so live snapshots pick up the new indexes on first boot after upgrade. verify-database StartOS action (start9/0.4/startos/actions/verifyDatabase.ts) - Read-only. Runs PRAGMA integrity_check + quick_check + row-count queries against /data/app.db, reports as a structured result. - allowedStatuses: only-running. Mounts the volume read-only. - Use after a StartOS Backup, after a host crash, or after a fresh sideload to confirm the data is sound before relying on it. Test suite now 67 tests across 7 files in ~2.4s.
170 lines
8.1 KiB
Bash
Executable File
170 lines
8.1 KiB
Bash
Executable File
#!/bin/sh
|
|
# Proof of Work (proof-of-work) — StartOS 0.4 container entrypoint.
|
|
#
|
|
# Responsibilities (in order):
|
|
# 1. Ensure the persistent /data directory exists.
|
|
# 2. Seed /data on truly-fresh first boot:
|
|
# a. If /app/seed/data/app.db is present (v1.0.0:1 cutover image),
|
|
# copy it into /data. This is how an operator migrating from
|
|
# the legacy `workout-log` package preserves their full history.
|
|
# b. Otherwise fall back to the empty-schema fallback DB at
|
|
# /app/prisma/data/app.db (already seeded with the curated
|
|
# exercise library at build time).
|
|
# Both branches are gated on /data/app.db being absent AND
|
|
# /data/.seeded being absent — never overwrites live data.
|
|
# 3. Run idempotent compat ALTERs for columns added after older snapshots.
|
|
# No-ops on hosts whose schema is already current.
|
|
# 4. Ensure the curated exercise library is present for every user. New
|
|
# maintainer-shipped exercises appear on every boot (INSERT OR IGNORE
|
|
# keyed on (userId, name); never overwrites a user's own exercises).
|
|
# 5. Exec the Next.js standalone server as PID 1 (under dumb-init).
|
|
#
|
|
# Every branch logs to stderr so it is visible in StartOS -> Logs.
|
|
|
|
set -eu
|
|
|
|
DATA_DIR="${WORKOUT_DATA_DIR:-/data}"
|
|
DB_PATH="${WORKOUT_DB_PATH:-$DATA_DIR/app.db}"
|
|
FALLBACK_SEED_DB_PATH="${WORKOUT_FALLBACK_SEED_DB_PATH:-/app/prisma/data/app.db}"
|
|
BAKED_SEED_DB_PATH="${WORKOUT_BAKED_SEED_DB_PATH:-/app/seed/data/app.db}"
|
|
LIBRARY_JSON_PATH="${WORKOUT_LIBRARY_JSON_PATH:-/app/prisma/exercises.seed.json}"
|
|
|
|
log() {
|
|
# write to stderr so StartOS log viewer surfaces it immediately
|
|
printf '[entrypoint] %s\n' "$*" 1>&2
|
|
}
|
|
|
|
mkdir -p "$DATA_DIR"
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Step 1 — first-boot seeding. NEVER overwrites an existing app.db.
|
|
# Both branches are skipped on every restart of an installed host because
|
|
# /data/app.db already exists.
|
|
# -----------------------------------------------------------------------------
|
|
if [ ! -f "$DB_PATH" ] && [ ! -f "$DATA_DIR/.seeded" ]; then
|
|
if [ -f "$BAKED_SEED_DB_PATH" ]; then
|
|
log "no $DB_PATH and no .seeded marker; copying baked cutover seed from $BAKED_SEED_DB_PATH"
|
|
cp "$BAKED_SEED_DB_PATH" "$DB_PATH"
|
|
date -u +"seeded from baked cutover snapshot at %Y-%m-%dT%H:%M:%SZ" > "$DATA_DIR/.seeded"
|
|
elif [ -f "$FALLBACK_SEED_DB_PATH" ]; then
|
|
log "no $DB_PATH and no baked seed; copying empty-schema fallback from $FALLBACK_SEED_DB_PATH"
|
|
cp "$FALLBACK_SEED_DB_PATH" "$DB_PATH"
|
|
date -u +"seeded from empty-schema fallback at %Y-%m-%dT%H:%M:%SZ" > "$DATA_DIR/.seeded"
|
|
else
|
|
log "no $DB_PATH, no baked seed, no fallback DB; creating empty $DB_PATH"
|
|
touch "$DB_PATH"
|
|
fi
|
|
else
|
|
log "$DB_PATH already present; live data is the source of truth"
|
|
if [ -f "$DATA_DIR/.seeded" ]; then
|
|
log "found .seeded: $(cat "$DATA_DIR/.seeded")"
|
|
fi
|
|
fi
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Step 2 — idempotent compat ALTERs (safety net for older snapshots).
|
|
# No-ops on hosts whose schema is already current.
|
|
# -----------------------------------------------------------------------------
|
|
if command -v sqlite3 >/dev/null 2>&1 && [ -f "$DB_PATH" ]; then
|
|
if ! sqlite3 "$DB_PATH" "PRAGMA table_info('SetLog');" 2>/dev/null | grep -q "|customMetrics|"; then
|
|
log "adding missing column SetLog.customMetrics"
|
|
sqlite3 "$DB_PATH" "ALTER TABLE SetLog ADD COLUMN customMetrics TEXT;"
|
|
fi
|
|
|
|
if ! sqlite3 "$DB_PATH" "PRAGMA table_info('Workout');" 2>/dev/null | grep -q "|deletedAt|"; then
|
|
log "adding missing column Workout.deletedAt"
|
|
sqlite3 "$DB_PATH" "ALTER TABLE Workout ADD COLUMN deletedAt DATETIME;"
|
|
fi
|
|
|
|
# Multi-user support shipped in v1.0.0:1: User.isAdmin column +
|
|
# InstanceSettings singleton. New install: seed.ts creates both. Upgrade
|
|
# from a snapshot pulled off the legacy `workout-log` package: this block
|
|
# adds them in place, then promotes the oldest user to admin so the
|
|
# in-app admin Settings panel + change-credentials action keep working.
|
|
if ! sqlite3 "$DB_PATH" "PRAGMA table_info('User');" 2>/dev/null | grep -q "|isAdmin|"; then
|
|
log "adding missing column User.isAdmin (default 0)"
|
|
sqlite3 "$DB_PATH" "ALTER TABLE User ADD COLUMN isAdmin INTEGER NOT NULL DEFAULT 0;"
|
|
log "promoting oldest user to admin (one-shot, only if no admin exists)"
|
|
sqlite3 "$DB_PATH" \
|
|
"UPDATE User SET isAdmin = 1 \
|
|
WHERE id = (SELECT id FROM User ORDER BY createdAt ASC LIMIT 1) \
|
|
AND NOT EXISTS (SELECT 1 FROM User WHERE isAdmin = 1);"
|
|
fi
|
|
|
|
if ! sqlite3 "$DB_PATH" "PRAGMA table_info('User');" 2>/dev/null | grep -q "|lastLoginAt|"; then
|
|
log "adding missing column User.lastLoginAt (nullable)"
|
|
sqlite3 "$DB_PATH" "ALTER TABLE User ADD COLUMN lastLoginAt DATETIME;"
|
|
fi
|
|
|
|
if ! sqlite3 "$DB_PATH" \
|
|
"SELECT name FROM sqlite_master WHERE type='table' AND name='InstanceSettings';" \
|
|
2>/dev/null | grep -q InstanceSettings; then
|
|
log "creating InstanceSettings table + singleton row (signupsOpen=0)"
|
|
sqlite3 "$DB_PATH" \
|
|
"CREATE TABLE InstanceSettings ( \
|
|
id INTEGER PRIMARY KEY DEFAULT 1, \
|
|
signupsOpen INTEGER NOT NULL DEFAULT 0, \
|
|
updatedAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP \
|
|
);"
|
|
sqlite3 "$DB_PATH" \
|
|
"INSERT OR IGNORE INTO InstanceSettings (id, signupsOpen) VALUES (1, 0);"
|
|
fi
|
|
|
|
# SQLite tuning. Enabling WAL means readers don't block on a concurrent
|
|
# writer (and vice versa) — crucial for the "background StartOS Backup
|
|
# while users are using the app" case, which under the default rollback
|
|
# journal can produce a torn snapshot. journal_mode persists in the DB
|
|
# header once set, so this is effectively a one-shot. synchronous=NORMAL
|
|
# is the safe-with-WAL balance: no fsync after every commit but still
|
|
# crash-consistent at every checkpoint, ~10x faster than FULL.
|
|
current_mode=$(sqlite3 "$DB_PATH" "PRAGMA journal_mode;" 2>/dev/null || echo "")
|
|
if [ "$current_mode" != "wal" ]; then
|
|
log "switching SQLite journal_mode from '${current_mode:-unknown}' to WAL"
|
|
sqlite3 "$DB_PATH" "PRAGMA journal_mode=WAL;" >/dev/null
|
|
fi
|
|
sqlite3 "$DB_PATH" "PRAGMA synchronous=NORMAL;" >/dev/null
|
|
|
|
# Composite indexes for hot query paths. CREATE INDEX IF NOT EXISTS is
|
|
# idempotent — no-op if Prisma already created them via db push on a
|
|
# fresh install. These are also declared in schema.prisma so any future
|
|
# `prisma db push` keeps them in sync.
|
|
log "ensuring composite indexes are present"
|
|
sqlite3 "$DB_PATH" "
|
|
CREATE INDEX IF NOT EXISTS Session_userId_expiresAt_idx
|
|
ON Session(userId, expiresAt);
|
|
CREATE INDEX IF NOT EXISTS Workout_userId_deletedAt_date_idx
|
|
ON Workout(userId, deletedAt, date);
|
|
CREATE INDEX IF NOT EXISTS SetLog_workoutId_setNumber_idx
|
|
ON SetLog(workoutId, setNumber);
|
|
" >/dev/null
|
|
fi
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Step 3 — ensure curated exercise library for every user (multi-user-aware).
|
|
# New entries shipped in /app/prisma/exercises.seed.json appear on every boot.
|
|
# `INSERT OR IGNORE` keyed on (userId, name) so we never overwrite a user's
|
|
# own custom exercises. Designed to be additive only — exercises removed from
|
|
# the curated JSON are not deleted from existing installs (users may have
|
|
# logged sets against them).
|
|
# -----------------------------------------------------------------------------
|
|
if [ -f "$LIBRARY_JSON_PATH" ] && [ -f "$DB_PATH" ]; then
|
|
log "ensuring curated exercise library is present for every user"
|
|
node /app/prisma/ensureExerciseLibrary.cjs \
|
|
--db "$DB_PATH" \
|
|
--json "$LIBRARY_JSON_PATH" \
|
|
|| log "WARNING: ensureExerciseLibrary failed; continuing boot"
|
|
else
|
|
log "skipping library ensure (json or db not found)"
|
|
fi
|
|
|
|
# -----------------------------------------------------------------------------
|
|
# Step 4 — launch the app.
|
|
# -----------------------------------------------------------------------------
|
|
export DATABASE_URL="file:$DB_PATH"
|
|
export NODE_ENV="${NODE_ENV:-production}"
|
|
export HOSTNAME="${HOSTNAME:-0.0.0.0}"
|
|
export PORT="${PORT:-3000}"
|
|
|
|
log "launching Next.js on :${PORT} with DATABASE_URL=file:${DB_PATH}"
|
|
exec node /app/server.js
|