Local -> server, then push-then-pull as the only ordering the UI can invoke.
LOCAL TOMBSTONES (schema v2). Found while writing push: delete_forever and
remove_label just DROPPED the row, leaving no record it existed. Offline that
means the delete can never be pushed — and the next pull faithfully
resurrects the note from the server. A deletion that undoes itself is about
the worst thing sync can do, so deletes now record into pending_deletes until
the server acknowledges them. merge_labels had the same hole.
merge_labels also moved memberships without marking the affected notes dirty.
A note's label set only reaches the server via the note itself, so a merge
looked done locally and never synced. Now marked before the delete cascades
the rows away.
Result handling, per status:
created/applied -> clear dirty, store the returned sync_revision
noop -> clear dirty, drop the tombstone (a row the server never
saw, created and deleted entirely offline)
kept -> clear dirty WITHOUT touching content. Re-pushing would
lose the same last-write-wins comparison forever; the
following pull adopts the server's version.
rejected -> stay dirty and surface the reason. A duplicate label name
is the realistic case and only a human can resolve it.
The subtle one is `kept` plus a skewed clock. Normally the server's kept
revision sits above our cursor, so the next pull fetches it anyway. If the
clock makes a genuinely later local edit look older, that revision can be
BELOW the cursor — the pull skips it and the stale local copy stays on screen
with nothing marking it wrong. So a kept result at or below the cursor
rewinds the cursor to re-fetch that note. Both directions tested.
label_ids carries MANUAL memberships only. Tag-sourced ones are re-derived
server-side from the body; sending them would convert them into manual
assignments that no longer disappear when the #tag is deleted from the text.
engine::run_cycle is push-then-pull, and a failed push ABORTS before the
pull — pulling anyway would overwrite the exact rows we just failed to save,
turning a recoverable network error into lost work. sync_pull is removed from
the command surface accordingly: offering a bare pull would hand the UI a way
to discard unsent edits. sync_now and sync_has_pending replace it.
Both loops have anti-spin guards: push stops when a batch clears nothing,
pull stops when the cursor doesn't advance.
15 push tests against an in-memory database.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SreJkbxB4gx8pPsu8QbLPi
157 lines
6.2 KiB
Rust
157 lines
6.2 KiB
Rust
//! Tauri commands for pairing with a server (M10.7a).
|
|
//!
|
|
//! Linking is opt-in and reversible; the app is fully usable having never touched
|
|
//! any of this. The Settings UI (M10.7e) drives these.
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
use tauri::State;
|
|
|
|
use crate::local::Db;
|
|
use crate::sync::client::{self, Identity, ProbeResult};
|
|
use crate::sync::compat::Compatibility;
|
|
use crate::sync::engine;
|
|
use crate::sync::push;
|
|
use crate::sync::state;
|
|
|
|
/// Ask a server who it is, without committing to anything. The UI calls this as the
|
|
/// user finishes typing an address, so they see what answered before handing over
|
|
/// credentials.
|
|
#[tauri::command]
|
|
pub async fn sync_probe(url: String) -> Result<ProbeResult, String> {
|
|
client::probe(&url).await
|
|
}
|
|
|
|
/// Either a password login or a token pasted from the web app. Both are offered
|
|
/// because neither covers everyone: a fresh install has no session to mint a token
|
|
/// from, while someone using a password manager or SSO may prefer not to type a
|
|
/// password into a desktop app at all.
|
|
#[derive(Deserialize)]
|
|
pub struct LinkInput {
|
|
pub url: String,
|
|
#[serde(default)]
|
|
pub email: Option<String>,
|
|
#[serde(default)]
|
|
pub password: Option<String>,
|
|
#[serde(default)]
|
|
pub token: Option<String>,
|
|
/// How this device is labelled in the server's device list.
|
|
#[serde(default)]
|
|
pub name: Option<String>,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LinkResult {
|
|
pub status: state::Status,
|
|
pub identity: Identity,
|
|
/// Carried through so the UI can warn about a `degraded` server right after
|
|
/// linking, instead of staying silent until a feature quietly does nothing.
|
|
pub compatibility: Compatibility,
|
|
}
|
|
|
|
/// A recognizable default, so a server's device list doesn't fill up with "Device".
|
|
fn default_device_name() -> String {
|
|
format!("ThoughtSync desktop ({})", std::env::consts::OS)
|
|
}
|
|
|
|
fn trimmed(value: &Option<String>) -> Option<&str> {
|
|
value.as_deref().map(str::trim).filter(|s| !s.is_empty())
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn sync_link(input: LinkInput, db: State<'_, Db>) -> Result<LinkResult, String> {
|
|
// 1. Handshake FIRST. Never hand credentials to a server we've established we
|
|
// can't sync with — and an incompatible server is exactly the case where a
|
|
// later failure would be hardest to attribute.
|
|
let probe = client::probe(&input.url).await?;
|
|
if let Compatibility::Incompatible { reason, .. } = &probe.compatibility {
|
|
return Err(reason.clone());
|
|
}
|
|
let base_url = probe.base_url;
|
|
|
|
// 2. Obtain a credential.
|
|
let (token, identity) = match trimmed(&input.token) {
|
|
Some(token) => {
|
|
// Verify before storing: an unverified paste turns a copy/paste slip
|
|
// into a failure that only surfaces at the next sync.
|
|
let identity = client::fetch_identity(&base_url, token).await?;
|
|
(token.to_string(), identity)
|
|
}
|
|
None => {
|
|
let (Some(email), Some(password)) = (trimmed(&input.email), trimmed(&input.password))
|
|
else {
|
|
return Err("Enter your email and password, or paste a device token.".to_string());
|
|
};
|
|
let name = trimmed(&input.name)
|
|
.map(str::to_string)
|
|
.unwrap_or_else(default_device_name);
|
|
client::device_login(&base_url, email, password, &name).await?
|
|
}
|
|
};
|
|
|
|
// 3. Persist. The lock is taken only now, for two reasons: a std MutexGuard
|
|
// isn't Send so it cannot be held across an await, and holding the store
|
|
// locked for a network round-trip would freeze every note operation in the UI.
|
|
let status = {
|
|
let conn = db.0.lock().map_err(|e| e.to_string())?;
|
|
state::set_link(&conn, &base_url, &token).map_err(|e| e.to_string())?;
|
|
state::status(&conn).map_err(|e| e.to_string())?
|
|
};
|
|
|
|
log::info!("linked to {} as {}", base_url, identity.email);
|
|
Ok(LinkResult {
|
|
status,
|
|
identity,
|
|
compatibility: probe.compatibility,
|
|
})
|
|
}
|
|
|
|
/// Stop syncing and forget the server.
|
|
///
|
|
/// Local only: the device token remains valid on the SERVER until revoked there
|
|
/// (Account → Linked devices). We can't reliably revoke it from here — a pasted
|
|
/// token arrives without its device id — so the UI must say so rather than imply a
|
|
/// remote revoke that didn't happen. Tracked for follow-up.
|
|
#[tauri::command]
|
|
pub fn sync_unlink(db: State<'_, Db>) -> Result<state::Status, String> {
|
|
let conn = db.0.lock().map_err(|e| e.to_string())?;
|
|
state::clear_link(&conn).map_err(|e| e.to_string())?;
|
|
log::info!("unlinked from server");
|
|
state::status(&conn).map_err(|e| e.to_string())
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub fn sync_status(db: State<'_, Db>) -> Result<state::Status, String> {
|
|
let conn = db.0.lock().map_err(|e| e.to_string())?;
|
|
state::status(&conn).map_err(|e| e.to_string())
|
|
}
|
|
|
|
/// The server URL + token, or a plain "not linked" error. Every networked sync
|
|
/// command needs exactly this, and none of them may hold the lock past it.
|
|
fn credentials(db: &State<'_, Db>) -> Result<(String, String), String> {
|
|
let conn = db.0.lock().map_err(|e| e.to_string())?;
|
|
let current = state::read(&conn).map_err(|e| e.to_string())?;
|
|
match (current.server_url, current.device_token) {
|
|
(Some(url), Some(token)) => Ok((url, token)),
|
|
_ => Err("This app isn't linked to a server yet.".to_string()),
|
|
}
|
|
}
|
|
|
|
/// Run one full sync: push local changes, then pull the server's.
|
|
///
|
|
/// The only sync entry point exposed to the UI, on purpose. Push and pull exist
|
|
/// separately inside the crate, but offering a bare "pull" would let the UI overwrite
|
|
/// unsent local edits — the ordering isn't a suggestion, it's what keeps them.
|
|
#[tauri::command]
|
|
pub async fn sync_now(db: State<'_, Db>) -> Result<engine::SyncOutcome, String> {
|
|
let (base_url, token) = credentials(&db)?;
|
|
engine::run_cycle(db.inner(), &base_url, &token).await
|
|
}
|
|
|
|
/// Whether anything is waiting to be sent. Lets the UI show an honest "unsynced
|
|
/// changes" state without running a sync to find out.
|
|
#[tauri::command]
|
|
pub fn sync_has_pending(db: State<'_, Db>) -> Result<bool, String> {
|
|
let conn = db.0.lock().map_err(|e| e.to_string())?;
|
|
push::has_pending(&conn).map_err(|e| e.to_string())
|
|
}
|