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.
38 lines
1.0 KiB
TOML
38 lines
1.0 KiB
TOML
[package]
|
|
name = "mtgc-server"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
description = "Sync server for the mtgc library catalog: one versioned library per user, OIDC and/or local sign-in."
|
|
|
|
[lib]
|
|
name = "mtgc_server"
|
|
path = "src/lib.rs"
|
|
|
|
[[bin]]
|
|
name = "mtgc-server"
|
|
path = "src/main.rs"
|
|
|
|
[dependencies]
|
|
mtgc-core = { path = "../mtgc-core" }
|
|
rusqlite = { workspace = true }
|
|
serde = { workspace = true }
|
|
serde_json = { workspace = true }
|
|
anyhow = { workspace = true }
|
|
axum = { version = "0.8", features = ["form", "json", "query", "tokio", "http1"] }
|
|
tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "signal", "sync"] }
|
|
openidconnect = { version = "4", default-features = false, features = ["reqwest", "rustls-tls"] }
|
|
argon2 = "0.5"
|
|
sha2 = "0.10"
|
|
base64 = "0.22"
|
|
getrandom = "0.3"
|
|
url = "2"
|
|
rpassword = "7"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
[dev-dependencies]
|
|
tower = { version = "0.5", features = ["util"] }
|
|
http-body-util = "0.1"
|
|
ureq = { workspace = true }
|