Garrett Mills
de55fc634a
Folder sync left too much to the user's sync tool: platform file access
(the Android SAF plugin), choosing the document, merging conflict copies —
and its merge base could fall out of step with the document (absorbing
conflict copies, "forget", picking a new Android folder), reading every
difference as a deletion.
The new mtgc-server crate stores one versioned library per user and accepts
a write only when it names the version it replaces. It never merges: devices
still do that with merge3, through a new sync cycle over a `Remote` trait in
mtgc-core. The base advances only on knowledge — to what was read, or to a
write the server confirmed — and is stored with the server and account it
belongs to, so a different account starts from an empty ancestor instead of
deleting. The working copy is only rewritten under the app-state lock, and
sync commands now run off the main thread.
Sign-in happens in the browser on the server's pages, via the owner's OIDC
provider and/or local username/password accounts (Argon2id, managed with
`mtgc-server user ...`), and returns a per-device revocable token to the app
by PKCE-protected code: a loopback port on desktop, the mtgc:// scheme on
Android.
The Info tab gains sign-in, the first-sync combine/replace choice, the
account's devices, and JSON export/import; the top bar shows sync state.
Includes a Dockerfile, Compose/Caddy example, and scripts to build and push
${DOCKER_REGISTRY}/mtgc/sync-server.
30 lines
622 B
YAML
30 lines
622 B
YAML
# Example deployment: mtgc-server behind Caddy, which provides HTTPS.
|
|
#
|
|
# cp .env.example .env # then fill it in
|
|
# docker compose up -d
|
|
# docker compose exec mtgc-server mtgc-server user add yourname
|
|
|
|
services:
|
|
mtgc-server:
|
|
build:
|
|
context: ../../..
|
|
dockerfile: crates/mtgc-server/Dockerfile
|
|
restart: unless-stopped
|
|
env_file: .env
|
|
volumes:
|
|
- mtgc-data:/data
|
|
|
|
caddy:
|
|
image: caddy:2
|
|
restart: unless-stopped
|
|
ports:
|
|
- "80:80"
|
|
- "443:443"
|
|
volumes:
|
|
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
|
- caddy-data:/data
|
|
|
|
volumes:
|
|
mtgc-data:
|
|
caddy-data:
|