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>
57 lines
2.8 KiB
Bash
57 lines
2.8 KiB
Bash
# API Server configuration
|
|
# Copy to .env and adjust. The server also reads plain environment variables.
|
|
# Never commit the real .env file.
|
|
|
|
# Address the API Server listens on. A bare port (8080) is accepted too.
|
|
API_ADDR=:8080
|
|
|
|
# PocketBase base URL (no trailing slash). The API Server is the only thing that
|
|
# talks to PocketBase; it proxies /api/auth/* to this address, which is never
|
|
# exposed to clients. Editable at runtime from the panel (PocketBase section),
|
|
# which writes the change back into this file.
|
|
POCKETBASE_URL=http://10.2.1.10:8027
|
|
|
|
# PocketBase superuser service account. Every privileged flow runs through it:
|
|
# user/organization management and all car-domain database access. Leave unset
|
|
# and the server still starts — a superadmin can log in to the panel and
|
|
# configure it there; management endpoints return 503 until then.
|
|
POCKETBASE_ADMIN_EMAIL=
|
|
POCKETBASE_ADMIN_PASSWORD=
|
|
|
|
# CORS allowed origins for browser clients (comma separated, or * for any).
|
|
# Native mobile apps are not subject to CORS. Editable at runtime from the panel
|
|
# (Web App section), which writes the change back into this file.
|
|
CORS_ALLOW_ORIGINS=http://localhost:8090
|
|
|
|
# Web App address, probed by GET /api/status and shown on the panel. Editable at
|
|
# runtime from the panel (Web App section).
|
|
WEBAPP_URL=http://localhost:8090
|
|
|
|
# PocketBase auth collection holding app users (default: users).
|
|
AUTH_USERS_COLLECTION=users
|
|
|
|
# Pre-PocketBase JSON store for the global plugin layer (default: plugins.json).
|
|
# Those settings now live in the database, in the app_settings singleton, next to
|
|
# the per-org and per-user layers. This path is only read once — to import an
|
|
# existing file on the first boot after the upgrade — and is renamed to
|
|
# plugins.json.migrated afterwards. A fresh install can leave it unset.
|
|
PLUGINS_FILE=plugins.json
|
|
|
|
# --- EV charging control (Anker Solix, OCPP) ---------------------------------
|
|
# Only relevant when a charger is set to own/proxy control mode. The charger
|
|
# dials in to /ocpp/{serial} on this server, authenticating with OCPP Basic auth
|
|
# (serial + per-charger control token). A plaintext ws:// would carry that token
|
|
# in the clear, so connections that did not arrive over TLS are rejected —
|
|
# disable only for local dev on a trusted network.
|
|
OCPP_REQUIRE_TLS=true
|
|
|
|
# The canonical ws(s):// base an operator points the charger at. Set this when
|
|
# the server sits behind a reverse proxy, where deriving the URL from request
|
|
# headers is unreliable. Empty = derive it.
|
|
OCPP_PUBLIC_URL=
|
|
|
|
# --- Legacy names -----------------------------------------------------------
|
|
# PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD, PORT and CORS_ORIGINS are still
|
|
# honoured for older deployments; the POCKETBASE_*/API_ADDR names above win when
|
|
# both are set. AUTH_SECRET is gone — the server no longer mints its own JWTs.
|