8edad54b10
Add optional user_id field to the progress collection. When a user is authenticated, progress is keyed by user_id instead of session_id, making it portable across devices and browsers. Anonymous reading still works via session_id as before. On login or registration, any progress accumulated under the anonymous session is merged into the user's account (most-recent timestamp wins), so chapters read before logging in are not lost. - scripts/pb-init.sh: add user_id field to progress collection schema - scraper/internal/storage/pocketbase.go: add user_id to EnsureCollections - ui/src/lib/server/pocketbase.ts: Progress interface gains user_id; getProgress/allProgress/setProgress accept optional userId and query/write by user_id when present; add mergeSessionProgress() helper - ui/src/routes/login/+page.server.ts: call mergeSessionProgress after successful login and registration (fire-and-forget, non-fatal) - ui/src/routes/api/progress/+server.ts: pass locals.user?.id to setProgress - ui/src/routes/books/+page.server.ts: pass locals.user?.id to allProgress - ui/src/routes/books/[slug]/+page.server.ts: pass locals.user?.id to getProgress
138 lines
4.7 KiB
Bash
Executable File
138 lines
4.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# pb-init.sh — idempotent PocketBase collection bootstrap
|
|
#
|
|
# Creates all collections required by libnovel. Safe to re-run: POST returns
|
|
# 400/422 when a collection already exists; both are treated as success.
|
|
#
|
|
# Required env vars (with defaults):
|
|
# POCKETBASE_URL http://pocketbase:8090
|
|
# POCKETBASE_ADMIN_EMAIL admin@libnovel.local
|
|
# POCKETBASE_ADMIN_PASSWORD changeme123
|
|
|
|
set -e
|
|
|
|
PB_URL="${POCKETBASE_URL:-http://pocketbase:8090}"
|
|
PB_EMAIL="${POCKETBASE_ADMIN_EMAIL:-admin@libnovel.local}"
|
|
PB_PASSWORD="${POCKETBASE_ADMIN_PASSWORD:-changeme123}"
|
|
|
|
log() { echo "[pb-init] $*"; }
|
|
|
|
# ─── 1. Wait for PocketBase to be ready ──────────────────────────────────────
|
|
log "waiting for PocketBase at $PB_URL ..."
|
|
until wget -qO- "$PB_URL/api/health" > /dev/null 2>&1; do
|
|
sleep 2
|
|
done
|
|
log "PocketBase is up"
|
|
|
|
# ─── 2. Authenticate and obtain a superuser token ────────────────────────────
|
|
log "authenticating as $PB_EMAIL ..."
|
|
AUTH_RESPONSE=$(wget -qO- \
|
|
--header="Content-Type: application/json" \
|
|
--post-data="{\"identity\":\"$PB_EMAIL\",\"password\":\"$PB_PASSWORD\"}" \
|
|
"$PB_URL/api/collections/_superusers/auth-with-password")
|
|
|
|
TOKEN=$(echo "$AUTH_RESPONSE" | sed 's/.*"token":"\([^"]*\)".*/\1/')
|
|
if [ -z "$TOKEN" ] || [ "$TOKEN" = "$AUTH_RESPONSE" ]; then
|
|
log "ERROR: failed to obtain auth token. Response: $AUTH_RESPONSE"
|
|
exit 1
|
|
fi
|
|
log "auth token obtained"
|
|
|
|
# ─── 3. Helper: create a collection (ignores 400/422 already-exists) ─────────
|
|
create_collection() {
|
|
NAME="$1"
|
|
BODY="$2"
|
|
STATUS=$(wget -qSO- \
|
|
--header="Content-Type: application/json" \
|
|
--header="Authorization: Bearer $TOKEN" \
|
|
--post-data="$BODY" \
|
|
"$PB_URL/api/collections" 2>&1 | grep "HTTP/" | tail -1 | awk '{print $2}')
|
|
case "$STATUS" in
|
|
200|201) log "created collection: $NAME" ;;
|
|
400|422) log "collection already exists (skipped): $NAME" ;;
|
|
*) log "WARNING: unexpected status $STATUS for collection: $NAME" ;;
|
|
esac
|
|
}
|
|
|
|
# ─── 4. Create collections ────────────────────────────────────────────────────
|
|
|
|
create_collection "books" '{
|
|
"name": "books",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "slug", "type": "text", "required": true},
|
|
{"name": "title", "type": "text", "required": true},
|
|
{"name": "author", "type": "text"},
|
|
{"name": "cover", "type": "text"},
|
|
{"name": "status", "type": "text"},
|
|
{"name": "genres", "type": "json"},
|
|
{"name": "summary", "type": "text"},
|
|
{"name": "total_chapters", "type": "number"},
|
|
{"name": "source_url", "type": "text"},
|
|
{"name": "ranking", "type": "number"},
|
|
{"name": "meta_updated", "type": "date"}
|
|
]
|
|
}'
|
|
|
|
create_collection "chapters_idx" '{
|
|
"name": "chapters_idx",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "slug", "type": "text", "required": true},
|
|
{"name": "number", "type": "number", "required": true},
|
|
{"name": "title", "type": "text"},
|
|
{"name": "date_label", "type": "text"}
|
|
]
|
|
}'
|
|
|
|
create_collection "ranking" '{
|
|
"name": "ranking",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "rank", "type": "number", "required": true},
|
|
{"name": "slug", "type": "text", "required": true},
|
|
{"name": "title", "type": "text"},
|
|
{"name": "author", "type": "text"},
|
|
{"name": "cover", "type": "text"},
|
|
{"name": "status", "type": "text"},
|
|
{"name": "genres", "type": "json"},
|
|
{"name": "source_url", "type": "text"},
|
|
{"name": "updated", "type": "date"}
|
|
]
|
|
}'
|
|
|
|
create_collection "progress" '{
|
|
"name": "progress",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "session_id", "type": "text", "required": true},
|
|
{"name": "user_id", "type": "text"},
|
|
{"name": "slug", "type": "text", "required": true},
|
|
{"name": "chapter", "type": "number"},
|
|
{"name": "updated", "type": "date"}
|
|
]
|
|
}'
|
|
|
|
create_collection "audio_cache" '{
|
|
"name": "audio_cache",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "cache_key", "type": "text", "required": true},
|
|
{"name": "filename", "type": "text"},
|
|
{"name": "updated", "type": "date"}
|
|
]
|
|
}'
|
|
|
|
create_collection "app_users" '{
|
|
"name": "app_users",
|
|
"type": "base",
|
|
"fields": [
|
|
{"name": "username", "type": "text", "required": true},
|
|
{"name": "password_hash", "type": "text", "required": true},
|
|
{"name": "role", "type": "text"},
|
|
{"name": "created", "type": "date"}
|
|
]
|
|
}'
|
|
|
|
log "all collections ready"
|