From fe042b64f0f7f536970e16451602219e22b43e11 Mon Sep 17 00:00:00 2001 From: Waozi Date: Tue, 3 Nov 2026 04:13:21 -0300 Subject: [PATCH] Preserve monotonic encrypted sync revisions and exercise real disconnects --- scripts/sync-server-test.mjs | 4 +++- src/storage/sync_record_crypto.zi | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/sync-server-test.mjs b/scripts/sync-server-test.mjs index 170941fee..d0b3cfab7 100644 --- a/scripts/sync-server-test.mjs +++ b/scripts/sync-server-test.mjs @@ -46,7 +46,9 @@ const proxy = http.createServer((request, response) => { if (!dropped && request.method === 'POST' && request.url === '/api/v1/sync') { dropped = true; result.resume(); - result.on('end', () => response.destroy()); + // Close the actual connection after commit. Bun's response.destroy() + // can otherwise synthesize an empty HTTP 200 for this async callback. + result.on('end', () => response.socket.destroy()); } else { response.writeHead(result.statusCode, result.headers); result.pipe(response); diff --git a/src/storage/sync_record_crypto.zi b/src/storage/sync_record_crypto.zi index 3d98f61b9..0dea1d07c 100644 --- a/src/storage/sync_record_crypto.zi +++ b/src/storage/sync_record_crypto.zi @@ -208,6 +208,25 @@ storage_sync_record_merge :: (plain: *StorageJsonBuilder, collection: string, re AppTextFromCString(plain.data, cast(s32)(plain.len + 1))) } +// The record's monotonic revision must also order its encrypted envelope. +// Queue wall time can precede rapid edits or a revision received from a peer. +storage_encrypted_record_updated_at :: (plain: string, queued_at: s64) -> s64 { + statement: *void = null + if SqlitePrepareText(storage_db_handle(), + "SELECT COALESCE(CAST(strftime('%s',json_extract(?1,'$.updated_at')) AS INTEGER),?2)", + -1, *statement, null) != SQLITE_OK { + return queued_at + } + defer { SqliteFinalize(statement) } + bind_text(statement, 1, plain) + SqliteBindInt64(statement, 2, queued_at) + if SqliteStep(statement) != SQLITE_ROW { + return queued_at + } + updated_at := SqliteColumnInt64(statement, 0) + return ifx updated_at > 0 then updated_at else queued_at +} + storage_append_encrypted_record_json :: (json: *StorageJsonBuilder, key: *u8, collection: string, key_id: string, record_id: string, entity_type: string, entity_id: string, local_date: s32, queued_at: s64, deleted: s32) -> s32 { plain: StorageJsonBuilder aad: StorageJsonBuilder @@ -230,6 +249,8 @@ storage_append_encrypted_record_json :: (json: *StorageJsonBuilder, key: *u8, co if plain.ok == 0 || plain.data == null { return storage_encrypted_record_cleanup(*plain, *aad, sealed, sealed_hex, ok) } + updated_at := storage_encrypted_record_updated_at( + AppTextFromCString(plain.data, cast(s32)(plain.len + 1)), queued_at) storage_sha256_hex(plain.data, plain.len, *content_hash[0]) sealed_len = plain.len + 16 sealed = cast(*u8)malloc(cast(usize)sealed_len) @@ -268,10 +289,10 @@ storage_append_encrypted_record_json :: (json: *StorageJsonBuilder, key: *u8, co storage_json_builder_append_text(json, ",") storage_json_builder_key_value_text(json, "ciphertext", AppTextFromCString(sealed_hex, cast(s32)(sealed_len * 2 + 1))) storage_json_builder_append_text(json, ",\"updated_at\":") - storage_json_builder_append_epoch(json, queued_at) + storage_json_builder_append_epoch(json, updated_at) if deleted != 0 { storage_json_append_int_field(json, "deleted_at", - ifx (queued_at > 0) then (queued_at) else (now_seconds())) + ifx (updated_at > 0) then (updated_at) else (now_seconds())) } storage_json_builder_append_text(json, ",") storage_json_builder_key_value_text(json, "content_hash", AppTextFromCString(*content_hash[0], ACCOUNT_PUBLIC_ID_HEX_SIZE))