tajniak81andClaude Opus 5
9bd5c523c4
The integration cascade stored its top layer differently from the two below it: org (L2) and user (L3) plugin config lived in PocketBase, in a pluginSettings field, while the global (L1) layer sat in a plugins.json next to the binary. That split was accretion rather than design - the file was the whole store in the v1 MVP, and the per-tenant layers were later built on PocketBase and layered on top of it instead of replacing it. It also cost something real. plugins.json was a second state store with different durability from pb_data: its own volume, its own ownership, its own backup. Losing pb_data is unmissable; losing api_data was silent, which is how "every plugin comes back disabled after a redeploy" happened. L1 now lives in the app_settings collection - one record keyed "global", holding its settings in a pluginSettings field, the same mechanism and the same field name the layers below use. The documents still differ in shape, because only L1 carries enable state and the registration of external plugins, but the storage is no longer a special case. The Manager grows a Store seam (PocketBase in production, file for the import, memory for tests) and, more importantly, a loaded gate. Settings in a database mean the store can be unreachable at boot - a cold stack, or a service account still to be set from the panel. That must not read as "no plugins configured", or the first save would write emptiness over real settings. So until a read succeeds the Manager stays unloaded, every mutation is refused, /api/admin/plugins* answers 503, and a background retry backs off to two minutes. The same gate covers a document that will not parse: it is never replaced by one built from an empty map, which is a stronger guarantee than the .corrupt backup it replaces. Writing to a store also revealed a hole in the previous fix. Classifying a save failure as errPersist was left to each Store, and a store that returned a plain error would fall through to the "saved, but the plugin failed to start" branch and be reported as a 200 - the same silent-success bug through a different door. The Manager now classifies, whatever the Store returns; a test pins it. Upgrades are automatic: on the first boot that finds no settings in the database, an existing plugins.json is imported and renamed to plugins.json.migrated. The import is refused if the store is merely unreachable, or if the file does not parse, so a stale or broken file can never overwrite live settings. /data is still needed - the panel rewrites .env there when it retargets PocketBase - but plugin settings no longer depend on it. 21 tests in internal/plugins cover both stores, including the production path against a fake PocketBase: create-then-update of the singleton, round-trip across a restart, an outage that leaves settings intact, a missing collection reading as not-ready rather than empty, and the import running exactly once. go build, go vet and go test ./... pass. Schema changes are mirrored into scripts/setup-pocketbase.mjs as that file requires. Not verified: no Docker CLI here, so no image was built and the bootstrap of app_settings against a real PocketBase is untested outside the fake. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
52 lines
2.4 KiB
YAML
52 lines
2.4 KiB
YAML
services:
|
|
api-server:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
image: drivervault-api
|
|
container_name: drivervault-api
|
|
restart: unless-stopped
|
|
ports:
|
|
- "${API_PORT:-8080}:8080"
|
|
environment:
|
|
# Container always listens on 8080; map the host port above.
|
|
API_ADDR: ":8080"
|
|
# External PocketBase instance (all DB access goes through this server).
|
|
POCKETBASE_URL: "${PB_URL:-http://10.2.1.10:8027}"
|
|
# Superuser service account. Leave unset and the server still starts — a
|
|
# superadmin can configure it from the panel; management endpoints 503 until then.
|
|
POCKETBASE_ADMIN_EMAIL: "${PB_ADMIN_EMAIL}"
|
|
POCKETBASE_ADMIN_PASSWORD: "${PB_ADMIN_PASSWORD}"
|
|
# Probed by the panel status page. Point it at wherever the Web App runs
|
|
# as seen from THIS container — the default (localhost:8090) is this
|
|
# container itself, so it must be set for the status page to be accurate.
|
|
WEBAPP_URL: "${WEBAPP_URL:-http://host.docker.internal:8090}"
|
|
# Browser origins allowed by CORS (native apps are exempt). Point this at
|
|
# the Web App origin; add http://localhost:5173 when running Vite in dev.
|
|
CORS_ALLOW_ORIGINS: "${CORS_ALLOW_ORIGINS:-http://localhost:8090}"
|
|
AUTH_USERS_COLLECTION: "${AUTH_USERS_COLLECTION:-users}"
|
|
# OCPP charger control (Anker Solix). Chargers are rejected unless they
|
|
# connect over TLS; set false only when terminating TLS elsewhere or for
|
|
# local dev on a trusted network. OCPP_PUBLIC_URL overrides the ws(s)://
|
|
# base derived from request headers (set it when behind a reverse proxy).
|
|
OCPP_REQUIRE_TLS: "${OCPP_REQUIRE_TLS:-true}"
|
|
OCPP_PUBLIC_URL: "${OCPP_PUBLIC_URL:-}"
|
|
extra_hosts:
|
|
# Makes host.docker.internal resolve on Linux too (Docker Desktop provides
|
|
# it already), so the WEBAPP_URL default above can reach a Web App running
|
|
# on the host rather than in this compose file.
|
|
- "host.docker.internal:host-gateway"
|
|
volumes:
|
|
# Holds the .env the panel writes back when a superadmin retargets
|
|
# PocketBase — see Dockerfile. Plugin settings live in the database.
|
|
- api_data:/data
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/healthz || exit 1"]
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 12
|
|
start_period: 20s
|
|
|
|
volumes:
|
|
api_data:
|