From f39a3300272894340c629121db17aeb13235a057 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Fri, 9 Oct 2026 08:55:50 +0000 Subject: [PATCH] fix(notes): serialise saves and keep unseen notes from being replaced The editor accepted typing before the stored notes had loaded, and a load reply then adopted the stored revision for text edited from nothing, so a save replaced notes the user never saw; the same happened when typing during a Discard reload. The editor is now read-only until it holds the stored text. Two Notes windows saving at once shared one staging file and could each pass the revision check, storing a mix of both texts. Each save now holds a lock file while it checks the revision and replaces the notes, writes its own staging file, syncs it before the rename, and removes only that file on failure; a lock left by an ended session expires after ten seconds. A save larger than the 64 KiB app message limit after JSON encoding was dropped on its way and left the page waiting forever with Save disabled. The page now refuses such saves before sending, gives up on a save after ten seconds without a reply, and the component answers every request, including malformed ones, so no request goes unanswered. check_notes.py now pauses weft-runtime with SIGSTOP to make text typed during a save and keys typed during a Discard reload deterministic; the previous package fails it by saving text typed before the reload. The building guide lists the application checks, the pinned toolchain for reproducing the demo binaries and the demo key path. --- docs/building.md | 18 +++- examples/org.weft.demo.notes/app.wasm | Bin 155339 -> 167645 bytes examples/org.weft.demo.notes/signature.sig | 2 +- examples/org.weft.demo.notes/src/main.rs | 111 ++++++++++++++++----- examples/org.weft.demo.notes/ui/index.html | 62 ++++++++---- tests/frame/check_notes.py | 56 +++++++++-- 6 files changed, 198 insertions(+), 51 deletions(-) diff --git a/docs/building.md b/docs/building.md index 27b96c0..e0cb837 100644 --- a/docs/building.md +++ b/docs/building.md @@ -77,9 +77,19 @@ page reacts to clicks on either side of a boundary and to the `a` and python3 tests/frame/check_input.py ``` +The application checks run `weft-appd` with `weft-runtime` (built with +`wasmtime-runtime`) and `weft-app-shell` (built with `servo-embed`) on the +same nested desktop and drive the demo apps with real keyboard input: + +```sh +python3 tests/frame/check_counter.py # Counter round trip through the session bridge +python3 tests/frame/check_notes.py # Notes stores exactly what is typed, refuses stale saves +python3 tests/frame/check_app_data.py # Notes data from the earlier layout is moved and kept +``` + ## Demo apps (wasm32-wasip2) -Each demo is a standalone crate in `examples/`. Pre-built `app.wasm` binaries are committed. To rebuild: +Each demo is a standalone crate in `examples/`. Pre-built `app.wasm` binaries are committed; they are reproducible with the toolchain pinned in `rust-toolchain.toml`. To rebuild: ```sh rustup target add wasm32-wasip2 @@ -90,7 +100,11 @@ cp target/wasm32-wasip2/release/app.wasm app.wasm rm -rf target ``` -The signature covers every file in the package directory, so remove the crate's `target` directory before signing it again (see *Signing packages*). The demo keys in `examples/keys` are test fixtures, not a signing authority. +The signature covers every file in the package directory, so remove the crate's `target` directory before signing it again. The demo packages are signed with the test key in `examples/keys`, which is a fixture, not a signing authority: + +```sh +weft-pack sign examples/org.weft.demo.notes --key examples/keys/weft-sign.key +``` ## weft-runtime with Wasmtime diff --git a/examples/org.weft.demo.notes/app.wasm b/examples/org.weft.demo.notes/app.wasm index 760286d96081c818b95c96a2e5541f14b7723bdf..19879b81f85da7c125e1e2287fe02e96ac1d7c9a 100644 GIT binary patch delta 49221 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�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 SJcQ~w=YG7TQs?!a4971E)QK4Y diff --git a/examples/org.weft.demo.notes/signature.sig b/examples/org.weft.demo.notes/signature.sig index b996332..b5f9c3a 100644 --- a/examples/org.weft.demo.notes/signature.sig +++ b/examples/org.weft.demo.notes/signature.sig @@ -1 +1 @@ -619aae11afd3f9cd6c6c094dff51e22922f185b8b49b15f77d136fcc74ea3354e6d908e576eae55c124c9d937725cd947593264e4c8e84409a927154522f120f \ No newline at end of file +f84d1c550b851837fd1ef7b90cd15cee29c9967facc871a117c1ea2b650a171136c1335f4ee24920a740867969a6f017e130e68e9767122d0f23e2320fcf2f0e \ No newline at end of file diff --git a/examples/org.weft.demo.notes/src/main.rs b/examples/org.weft.demo.notes/src/main.rs index 5c31516..7d49a44 100644 --- a/examples/org.weft.demo.notes/src/main.rs +++ b/examples/org.weft.demo.notes/src/main.rs @@ -11,8 +11,13 @@ use serde_json::{Value, json}; use weft::app::{ipc, notify}; const NOTES_PATH: &str = "/data/notes.txt"; -const STAGING_PATH: &str = "/data/.notes.txt.saving"; -/// Largest note accepted, in bytes; app messages are limited to 64 KiB. +/// Held while a save checks the revision and replaces the file, so saves +/// from two Notes windows cannot interleave. +const LOCK_PATH: &str = "/data/.notes.lock"; +/// A lock older than this was left by a session that ended mid-save. +const STALE_LOCK: std::time::Duration = std::time::Duration::from_secs(10); +/// Largest note accepted, in bytes; the page also keeps each request under +/// the 64 KiB app message limit. const MAX_NOTES: usize = 60 * 1024; /// A revision names the exact stored bytes. A save must name the revision @@ -45,6 +50,64 @@ fn load() -> Value { } } +/// Exclusive access to the notes file for one save. +struct SaveLock; + +impl SaveLock { + fn acquire() -> Result { + for _ in 0..50 { + match std::fs::OpenOptions::new().write(true).create_new(true).open(LOCK_PATH) { + Ok(_) => return Ok(SaveLock), + Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => { + let stale = std::fs::metadata(LOCK_PATH) + .and_then(|m| m.modified()) + .ok() + .and_then(|t| t.elapsed().ok()) + .is_some_and(|age| age > STALE_LOCK); + if stale { + let _ = std::fs::remove_file(LOCK_PATH); + } else { + std::thread::sleep(std::time::Duration::from_millis(20)); + } + } + Err(e) => return Err(format!("cannot lock notes: {e}")), + } + } + Err("notes are being saved by another window; try again".to_owned()) + } +} + +impl Drop for SaveLock { + fn drop(&mut self) { + let _ = std::fs::remove_file(LOCK_PATH); + } +} + +/// Writes `text` to a staging file unique to this save, syncs it and renames +/// it over the notes, so the stored notes are always either the previous or +/// the new text in full. +fn replace_notes(text: &str) -> std::io::Result<()> { + use std::io::Write; + let nanos = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .map(|d| d.as_nanos()) + .unwrap_or_default(); + let staging = format!("/data/.notes.txt.{nanos}.saving"); + let written = std::fs::OpenOptions::new() + .write(true) + .create_new(true) + .open(&staging) + .and_then(|mut file| { + file.write_all(text.as_bytes())?; + file.sync_all() + }) + .and_then(|()| std::fs::rename(&staging, NOTES_PATH)); + if written.is_err() { + let _ = std::fs::remove_file(&staging); + } + written +} + fn save(seq: &Value, base: &str, text: &str) -> Value { let error = |conflict: bool, message: String| { json!({ "op": "error", "seq": seq, "conflict": conflict, "message": message }) @@ -52,6 +115,10 @@ fn save(seq: &Value, base: &str, text: &str) -> Value { if text.len() > MAX_NOTES { return error(false, format!("notes are limited to {MAX_NOTES} bytes")); } + let _lock = match SaveLock::acquire() { + Ok(lock) => lock, + Err(message) => return error(false, message), + }; let current = match stored() { Ok(bytes) => revision(&bytes), Err(message) => return error(false, message), @@ -59,29 +126,27 @@ fn save(seq: &Value, base: &str, text: &str) -> Value { if current != base { return error(true, "the notes were changed elsewhere".to_owned()); } - // Written beside the file and renamed over it, so the stored notes are - // always either the previous or the new text in full. - let written = std::fs::write(STAGING_PATH, text.as_bytes()) - .and_then(|()| std::fs::rename(STAGING_PATH, NOTES_PATH)); - match written { + match replace_notes(text) { Ok(()) => json!({ "op": "saved", "seq": seq, "rev": revision(text.as_bytes()) }), - Err(e) => { - let _ = std::fs::remove_file(STAGING_PATH); - error(false, format!("cannot save notes: {e}")) - } + Err(e) => error(false, format!("cannot save notes: {e}")), } } -fn handle(raw: &str) -> Option { - let request: Value = serde_json::from_str(raw).ok()?; - match request.get("op")?.as_str()? { - "load" => Some(load()), - "save" => { - let base = request.get("base")?.as_str()?; - let text = request.get("text")?.as_str()?; - Some(save(request.get("seq").unwrap_or(&Value::Null), base, text)) - } - _ => None, +/// Every request gets a reply, so the page never waits on one that was not +/// understood. +fn handle(raw: &str) -> Value { + let Ok(request) = serde_json::from_str::(raw) else { + return json!({ "op": "error", "message": "request is not valid JSON" }); + }; + let seq = request.get("seq").cloned().unwrap_or(Value::Null); + let field = |name: &str| request.get(name).and_then(Value::as_str); + match field("op") { + Some("load") => load(), + Some("save") => match (field("base"), field("text")) { + (Some(base), Some(text)) => save(&seq, base, text), + _ => json!({ "op": "error", "seq": seq, "message": "malformed save request" }), + }, + _ => json!({ "op": "error", "seq": seq, "message": "unknown request" }), } } @@ -90,9 +155,7 @@ fn main() { loop { if let Some(raw) = ipc::recv() { - if let Some(reply) = handle(&raw) { - let _ = ipc::send(&reply.to_string()); - } + let _ = ipc::send(&handle(&raw).to_string()); } else { std::thread::sleep(std::time::Duration::from_millis(10)); } diff --git a/examples/org.weft.demo.notes/ui/index.html b/examples/org.weft.demo.notes/ui/index.html index 94f0099..40976d5 100644 --- a/examples/org.weft.demo.notes/ui/index.html +++ b/examples/org.weft.demo.notes/ui/index.html @@ -106,6 +106,10 @@ // The component stores the text exactly as typed. Messages are JSON; each // save names the revision it was edited from and is acknowledged by its // sequence number, so a reply never replaces text typed after it was sent. + // The editor is read-only until it holds the stored text, so nothing typed + // before a load completes can be saved over notes the user never saw. + var MAX_MESSAGE = 65536; // weft-appd's limit for one app message, in bytes + var REPLY_TIMEOUT = 10000; var editor = document.getElementById('editor'); var statusEl = document.getElementById('status'); var charEl = document.getElementById('charcount'); @@ -114,19 +118,46 @@ var rev = null; var seq = 0; var pending = null; + var encoder = new TextEncoder(); function setStatus(msg) { statusEl.textContent = msg; } function countChars() { charEl.textContent = editor.value.length + ' chars'; } function send(message) { window.weftIpc.send(JSON.stringify(message)); } + function setLoaded(loaded) { + editor.readOnly = !loaded; + saveButton.disabled = !loaded || pending !== null; + } editor.addEventListener('input', countChars); + function finishSave() { + if (pending) clearTimeout(pending.timer); + pending = null; + setLoaded(rev !== null); + } + saveButton.addEventListener('click', function () { - if (!window.weftIpc || rev === null || pending) return; + if (!window.weftIpc || pending) return; + if (rev === null) { + setStatus('the notes have not loaded; use Discard to reload them'); + return; + } + var request = { op: 'save', seq: seq + 1, base: rev, text: editor.value }; + if (encoder.encode(JSON.stringify(request)).length > MAX_MESSAGE) { + setStatus('not saved: the notes are too long'); + return; + } seq += 1; - pending = { seq: seq, text: editor.value }; - send({ op: 'save', seq: seq, base: rev, text: pending.text }); - saveButton.disabled = true; + pending = { + seq: seq, + text: request.text, + timer: setTimeout(function () { + finishSave(); + setStatus('not saved: no reply; try again'); + }, REPLY_TIMEOUT), + }; + setLoaded(true); + send(request); setStatus('saving…'); }); @@ -136,12 +167,13 @@ editor.value = saved; countChars(); rev = null; + setLoaded(false); send({ op: 'load' }); setStatus('reloading…'); }); document.addEventListener('keydown', function (e) { - if ((e.ctrlKey || e.metaKey) && e.key === 's') { + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 's') { e.preventDefault(); saveButton.click(); } @@ -151,26 +183,19 @@ var msg; try { msg = JSON.parse(raw); } catch (_) { return; } if (msg.op === 'loaded') { - // Edits made while the load was in flight are kept. - if (editor.value === saved) { - editor.value = msg.text; - countChars(); - } + editor.value = msg.text; + countChars(); saved = msg.text; rev = msg.rev; + setLoaded(true); setStatus(''); } else if (msg.op === 'saved' && pending && msg.seq === pending.seq) { saved = pending.text; rev = msg.rev; - pending = null; - saveButton.disabled = false; - setStatus('saved'); - setTimeout(function () { if (!pending) setStatus(''); }, 1500); + finishSave(); + setStatus(editor.value === saved ? 'saved' : 'saved; newer changes are not saved yet'); } else if (msg.op === 'error') { - if (pending && msg.seq === pending.seq) { - pending = null; - saveButton.disabled = false; - } + if (pending && msg.seq === pending.seq) finishSave(); setStatus(msg.conflict ? 'not saved: changed in another window. Copy your text, then Discard to reload.' : 'error: ' + msg.message); @@ -183,6 +208,7 @@ send({ op: 'load' }); } + setLoaded(false); setupIpc(); })(); diff --git a/tests/frame/check_notes.py b/tests/frame/check_notes.py index a5363e9..baad405 100644 --- a/tests/frame/check_notes.py +++ b/tests/frame/check_notes.py @@ -8,16 +8,22 @@ sequence, quotes, a tab and non-ASCII characters, launches 1. Typing at the end and pressing Ctrl+S must store the seeded text plus the typed text, byte for byte; a load or save that rewrote `\\n`, quotes or tabs fails. -2. Text typed right after Ctrl+S, while the save is in flight, must still be - in the editor afterwards: a second Ctrl+S stores it too. +2. Text typed while a save is in flight (the runtime is paused with SIGSTOP + between Ctrl+S and the reply) must still be in the editor afterwards: a + second Ctrl+S stores it too. 3. After the file is changed on disk (as by another Notes window), a save must be refused and the other window's text kept. +4. Discard reloads the stored text. Keys typed while that reload is in + flight (runtime paused again) must be ignored, so a following save stores + the reloaded text plus only what was typed afterwards. Requires Xvfb, xwd, ImageMagick's convert and xdotool. """ import argparse +import os import shutil +import signal import subprocess import sys import tempfile @@ -32,6 +38,19 @@ APP_ID = "org.weft.demo.notes" SEED = 'path C:\\new\\table "quoted"\tcaf\u00e9 \u2603' +# The Discard button in the 800x600 Notes window at the desktop's origin. +DISCARD = ("663", "68") + + +def runtime_pid(): + """The process ID of the Notes session's weft-runtime.""" + found = subprocess.run(["pgrep", "-n", "-f", f"weft-runtime {APP_ID}"], + capture_output=True, text=True) + if found.returncode != 0: + raise AssertionError("no weft-runtime process for Notes") + return int(found.stdout.split()[0]) + + def wait_for_file(path, expected, timeout=15): deadline = time.monotonic() + timeout while time.monotonic() < deadline: @@ -76,10 +95,17 @@ def run(args, desktop, home, xdotool): act("click", "1") act("key", "ctrl+End") + runtime = runtime_pid() + act("type", "--delay", "40", ' +\\t "x"') - act("key", "ctrl+s") expected = SEED + ' +\\t "x"' - act("type", "--delay", "40", " more") + os.kill(runtime, signal.SIGSTOP) + try: + act("key", "ctrl+s") + act("type", "--delay", "40", " more") + time.sleep(2) + finally: + os.kill(runtime, signal.SIGCONT) wait_for_file(notes, expected) time.sleep(1) act("key", "ctrl+s") @@ -93,8 +119,26 @@ def run(args, desktop, home, xdotool): time.sleep(3) if notes.read_text(encoding="utf-8") != other: raise AssertionError("a save replaced notes changed elsewhere") - if list(notes.parent.glob(".*saving")): - raise AssertionError("a staging file was left behind") + + os.kill(runtime, signal.SIGSTOP) + try: + act("mousemove", "--sync", *DISCARD) + act("click", "1") + act("mousemove", "--sync", "100", "300") + act("click", "1") + act("type", "--delay", "40", "zz") + # Let the page handle the keys while the reload is still unanswered. + time.sleep(2) + finally: + os.kill(runtime, signal.SIGCONT) + time.sleep(2) + act("key", "ctrl+End") + act("type", "--delay", "40", "!") + act("key", "ctrl+s") + wait_for_file(notes, other + "!") + leftovers = [p.name for p in notes.parent.iterdir() if p.name != "notes.txt"] + if leftovers: + raise AssertionError(f"files left beside the notes: {leftovers}") def main(argv=None):