@bobfrankston/rmfmail 1.0.698 → 1.0.699
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/components/message-list.ts +15 -4
- package/package.json +5 -5
- package/packages/mailx-imap/index.d.ts.map +1 -1
- package/packages/mailx-imap/index.js +152 -14
- package/packages/mailx-imap/index.js.map +1 -1
- package/packages/mailx-imap/index.ts +156 -14
- package/packages/mailx-imap/package-lock.json +2 -2
- package/packages/mailx-imap/package.json +1 -1
- package/packages/mailx-service/index.d.ts.map +1 -1
- package/packages/mailx-service/index.js +26 -11
- package/packages/mailx-service/index.js.map +1 -1
- package/packages/mailx-service/index.ts +25 -9
- package/packages/mailx-store/db.d.ts +38 -7
- package/packages/mailx-store/db.d.ts.map +1 -1
- package/packages/mailx-store/db.js +96 -8
- package/packages/mailx-store/db.js.map +1 -1
- package/packages/mailx-store/db.ts +104 -8
- package/packages/mailx-store/package.json +1 -1
|
@@ -1355,7 +1355,14 @@ class MessageRow {
|
|
|
1355
1355
|
}
|
|
1356
1356
|
}
|
|
1357
1357
|
|
|
1358
|
-
|
|
1358
|
+
// Read state for the menu label tracks the VISUAL state, not the
|
|
1359
|
+
// flag array. On click we remove the `unread` class immediately
|
|
1360
|
+
// (optimistic) but `msg.flags` doesn't pick up `\Seen` until the
|
|
1361
|
+
// auto-mark-as-read timer fires (default 2 s). Bob 2026-05-13:
|
|
1362
|
+
// right-clicking a freshly-clicked row offered "Mark read" while
|
|
1363
|
+
// the row already looked read. Reading the class keeps the label
|
|
1364
|
+
// honest with what the user sees.
|
|
1365
|
+
const isSeen = !this.el.classList.contains("unread");
|
|
1359
1366
|
const isFlagged = this.msg.flags.includes("\\Flagged");
|
|
1360
1367
|
const accountId = this.accountId;
|
|
1361
1368
|
const msg = this.msg;
|
|
@@ -1365,9 +1372,13 @@ class MessageRow {
|
|
|
1365
1372
|
{
|
|
1366
1373
|
label: isSeen ? "Mark unread" : "Mark read",
|
|
1367
1374
|
action: async () => {
|
|
1368
|
-
|
|
1369
|
-
|
|
1370
|
-
|
|
1375
|
+
// Target state derived from the menu label the user
|
|
1376
|
+
// saw, not from `msg.flags` (which may lag the visual
|
|
1377
|
+
// state by the auto-mark-as-read delay). Computes via
|
|
1378
|
+
// a Set so toggling is idempotent + dedup-clean.
|
|
1379
|
+
const set = new Set<string>(msg.flags);
|
|
1380
|
+
if (isSeen) set.delete("\\Seen"); else set.add("\\Seen");
|
|
1381
|
+
const newFlags = Array.from(set);
|
|
1371
1382
|
try {
|
|
1372
1383
|
await updateFlags(accountId, msg.uid, newFlags);
|
|
1373
1384
|
msg.flags = newFlags;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bobfrankston/rmfmail",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.699",
|
|
4
4
|
"description": "Local-first email client with IMAP sync and standalone native app",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "bin/mailx.js",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"postinstall": "node bin/postinstall.js"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@bobfrankston/iflow-direct": "^0.1.
|
|
36
|
+
"@bobfrankston/iflow-direct": "^0.1.43",
|
|
37
37
|
"@bobfrankston/mailx-host": "^0.1.12",
|
|
38
|
-
"@bobfrankston/mailx-imap": "^0.1.
|
|
38
|
+
"@bobfrankston/mailx-imap": "^0.1.42",
|
|
39
39
|
"@bobfrankston/mailx-store-web": "^0.1.6",
|
|
40
40
|
"@bobfrankston/mailx-sync": "^0.1.16",
|
|
41
41
|
"@bobfrankston/miscinfo": "^1.0.10",
|
|
@@ -113,9 +113,9 @@
|
|
|
113
113
|
},
|
|
114
114
|
".transformedSnapshot": {
|
|
115
115
|
"dependencies": {
|
|
116
|
-
"@bobfrankston/iflow-direct": "^0.1.
|
|
116
|
+
"@bobfrankston/iflow-direct": "^0.1.43",
|
|
117
117
|
"@bobfrankston/mailx-host": "^0.1.12",
|
|
118
|
-
"@bobfrankston/mailx-imap": "^0.1.
|
|
118
|
+
"@bobfrankston/mailx-imap": "^0.1.42",
|
|
119
119
|
"@bobfrankston/mailx-store-web": "^0.1.6",
|
|
120
120
|
"@bobfrankston/mailx-sync": "^0.1.16",
|
|
121
121
|
"@bobfrankston/miscinfo": "^1.0.10",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -899,12 +899,15 @@ export class ImapManager extends EventEmitter {
|
|
|
899
899
|
// upsert turns into an UPDATE (cheap); if it doesn't, the
|
|
900
900
|
// insert proceeds. Trust the constraint — don't second-
|
|
901
901
|
// guess it on a stale highestUid snapshot.
|
|
902
|
-
// Tombstone check:
|
|
903
|
-
//
|
|
904
|
-
//
|
|
905
|
-
//
|
|
902
|
+
// Tombstone check: skip re-import while a local delete/move
|
|
903
|
+
// is in flight to the server. Cleared on action success
|
|
904
|
+
// (server EXPUNGED → next sync's set-diff drops the row
|
|
905
|
+
// anyway) or on permanent failure (clearTombstoneForUid in
|
|
906
|
+
// failSyncAction → row reappears, user sees the action
|
|
907
|
+
// didn't take). QRESYNC servers bypass this entirely
|
|
908
|
+
// because their VANISHED responses are authoritative.
|
|
906
909
|
if (msg.messageId && this.db.hasTombstone(accountId, msg.messageId)) {
|
|
907
|
-
console.log(` [tombstone] ${accountId}: skipping ${msg.messageId} (locally deleted)`);
|
|
910
|
+
console.log(` [tombstone] ${accountId}: skipping ${msg.messageId} (locally deleted, awaiting server confirm)`);
|
|
908
911
|
continue;
|
|
909
912
|
}
|
|
910
913
|
const source = msg.source || "";
|
|
@@ -1119,6 +1122,93 @@ export class ImapManager extends EventEmitter {
|
|
|
1119
1122
|
}
|
|
1120
1123
|
}
|
|
1121
1124
|
console.log(` [sync] ${accountId}/${folder.path}: highestUid=${highestUid}, fetching...`);
|
|
1125
|
+
// ── QRESYNC fast path (RFC 7162) ─────────────────────────────────
|
|
1126
|
+
// When the server supports QRESYNC AND we have a saved (uidValidity,
|
|
1127
|
+
// modSeq) watermark for this folder, ask the server "what changed
|
|
1128
|
+
// since modSeq?". The server replies with an authoritative VANISHED
|
|
1129
|
+
// list (no client-side diffing needed, no tombstones needed) plus
|
|
1130
|
+
// unsolicited FETCH for flag/state changes. New UIDs > our prior
|
|
1131
|
+
// highest still go through the normal fetchMessagesSinceUid path
|
|
1132
|
+
// afterwards. Skips the heavy UID SEARCH set-diff below entirely.
|
|
1133
|
+
const folderSyncState = this.db.getFolderSync(folderId);
|
|
1134
|
+
const prevModSeq = parseInt(folderSyncState.highestModseq || "0", 10);
|
|
1135
|
+
const prevUidValidity = folderSyncState.uidvalidity || 0;
|
|
1136
|
+
const caps = (typeof client.getCapabilities === "function")
|
|
1137
|
+
? client.getCapabilities()
|
|
1138
|
+
: new Set();
|
|
1139
|
+
const qresyncSupported = caps.has("QRESYNC");
|
|
1140
|
+
const haveWatermark = highestUid > 0 && prevModSeq > 0 && prevUidValidity > 0;
|
|
1141
|
+
if (qresyncSupported && haveWatermark && typeof client.resyncFolder === "function") {
|
|
1142
|
+
try {
|
|
1143
|
+
// Ensure ENABLE QRESYNC has been issued on this connection.
|
|
1144
|
+
// enableQresync is idempotent + capability-gated so this is a
|
|
1145
|
+
// no-op on the second-and-subsequent call per connection.
|
|
1146
|
+
if (typeof client.enableQresync === "function") {
|
|
1147
|
+
await client.enableQresync();
|
|
1148
|
+
}
|
|
1149
|
+
const __qrT0 = Date.now();
|
|
1150
|
+
const qr = await client.resyncFolder(folder.path, prevUidValidity, prevModSeq);
|
|
1151
|
+
console.log(` [qresync] ${accountId}/${folder.path}: vanished=${qr.vanishedUids.length} changed=${qr.changedMessages.length} newModSeq=${qr.newHighestModSeq} in ${Date.now() - __qrT0}ms`);
|
|
1152
|
+
if (qr.uidValidityChanged) {
|
|
1153
|
+
// UIDVALIDITY rolled — our local UIDs are stale. Fall through
|
|
1154
|
+
// to the full set-diff path; that'll discover the new state
|
|
1155
|
+
// and the deletion safeguards (50% threshold) will keep us
|
|
1156
|
+
// from wiping anything we shouldn't.
|
|
1157
|
+
console.log(` [qresync] ${accountId}/${folder.path}: UIDVALIDITY changed (was ${prevUidValidity}, now ${qr.exists}); falling back to full sync`);
|
|
1158
|
+
}
|
|
1159
|
+
else {
|
|
1160
|
+
// Apply VANISHED — server says these UIDs are gone. No
|
|
1161
|
+
// tombstone, no diff, just delete the local rows.
|
|
1162
|
+
let vanishedApplied = 0;
|
|
1163
|
+
for (const uid of qr.vanishedUids) {
|
|
1164
|
+
const env = this.db.getMessageByUid(accountId, uid, folderId);
|
|
1165
|
+
if (env) {
|
|
1166
|
+
this.db.deleteMessage(accountId, uid, "server VANISHED via QRESYNC", "mailx-imap syncFolder/qresync");
|
|
1167
|
+
vanishedApplied++;
|
|
1168
|
+
}
|
|
1169
|
+
}
|
|
1170
|
+
if (vanishedApplied > 0) {
|
|
1171
|
+
this.db.recalcFolderCounts(folderId);
|
|
1172
|
+
this.emit("folderCountsChanged", accountId, {});
|
|
1173
|
+
}
|
|
1174
|
+
// Apply changed-state FETCH — flag updates since prior modSeq.
|
|
1175
|
+
for (const m of qr.changedMessages) {
|
|
1176
|
+
try {
|
|
1177
|
+
const flagsArr = Array.from(m.flags || []).map(f => String(f));
|
|
1178
|
+
this.db.updateMessageFlags(accountId, m.uid, flagsArr);
|
|
1179
|
+
}
|
|
1180
|
+
catch { /* row may have just been VANISHED */ }
|
|
1181
|
+
}
|
|
1182
|
+
// Fetch genuinely new messages — UID > our prior highest.
|
|
1183
|
+
// resyncFolder doesn't return these directly; the server
|
|
1184
|
+
// emits them only via state-change FETCH if their flags
|
|
1185
|
+
// changed since modSeq, which is unreliable. Pull them
|
|
1186
|
+
// explicitly via the existing incremental path.
|
|
1187
|
+
const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: false });
|
|
1188
|
+
const newOnes = fetched.filter((m) => m.uid > highestUid);
|
|
1189
|
+
if (newOnes.length > 0) {
|
|
1190
|
+
await this.storeMessages(accountId, folderId, folder, newOnes, highestUid);
|
|
1191
|
+
}
|
|
1192
|
+
// Persist new watermark — next resync starts here.
|
|
1193
|
+
if (qr.newHighestModSeq !== undefined) {
|
|
1194
|
+
this.db.updateFolderSync(folderId, qr.exists ? prevUidValidity : prevUidValidity, String(qr.newHighestModSeq));
|
|
1195
|
+
}
|
|
1196
|
+
this.emit("syncProgress", accountId, `sync:${folder.path}`, 100);
|
|
1197
|
+
console.log(` [qresync] ${accountId}/${folder.path}: done in ${Date.now() - __sfStart}ms (path: QRESYNC)`);
|
|
1198
|
+
return newOnes.length;
|
|
1199
|
+
}
|
|
1200
|
+
}
|
|
1201
|
+
catch (qrErr) {
|
|
1202
|
+
// QRESYNC failed (server quirk, network glitch, etc.) — log
|
|
1203
|
+
// and fall through to the legacy set-diff path. We do NOT
|
|
1204
|
+
// clear the modSeq watermark here; the next attempt will
|
|
1205
|
+
// re-try QRESYNC, and if that also fails enough times the
|
|
1206
|
+
// operator can manually clear `highest_modseq` to force a
|
|
1207
|
+
// full resync.
|
|
1208
|
+
console.warn(` [qresync] ${accountId}/${folder.path}: failed (${qrErr?.message || qrErr}) — falling back to set-diff`);
|
|
1209
|
+
}
|
|
1210
|
+
}
|
|
1211
|
+
// ────────────────────────────────────────────────────────────────
|
|
1122
1212
|
let messages;
|
|
1123
1213
|
// Cache the server-UID list across set-diff and deletion-recon so we
|
|
1124
1214
|
// don't pay for two `UID SEARCH` round-trips (the second one was
|
|
@@ -1315,10 +1405,9 @@ export class ImapManager extends EventEmitter {
|
|
|
1315
1405
|
// UNIQUE constraint to dedupe — if mailx truly has the
|
|
1316
1406
|
// row, the upsert becomes an UPDATE that refreshes
|
|
1317
1407
|
// flags too, all in one path.
|
|
1318
|
-
// Tombstone
|
|
1319
|
-
//
|
|
1320
|
-
//
|
|
1321
|
-
// User-visible symptom: "I deleted it but it came back."
|
|
1408
|
+
// Tombstone-skip: in-flight local delete/move waiting
|
|
1409
|
+
// for server confirmation. Cleared on action success or
|
|
1410
|
+
// permanent failure (see clearTombstoneForUid).
|
|
1322
1411
|
if (msg.messageId && this.db.hasTombstone(accountId, msg.messageId)) {
|
|
1323
1412
|
console.log(` [tombstone] ${accountId}: skipping ${msg.messageId} in syncFolder (locally deleted)`);
|
|
1324
1413
|
continue;
|
|
@@ -1484,6 +1573,22 @@ export class ImapManager extends EventEmitter {
|
|
|
1484
1573
|
}
|
|
1485
1574
|
this.emit("folderSynced", accountId, folderId, syncedAt);
|
|
1486
1575
|
this.db.updateLastSync(accountId, syncedAt);
|
|
1576
|
+
// Seed the QRESYNC watermark from the SELECT response of whatever
|
|
1577
|
+
// legacy operation just ran (fetchMessagesSinceUid, getUids, etc.).
|
|
1578
|
+
// Without this, a CONDSTORE/QRESYNC-capable server's `HIGHESTMODSEQ`
|
|
1579
|
+
// is captured by the native layer but never persisted, and the
|
|
1580
|
+
// QRESYNC fast path above stays permanently disabled because
|
|
1581
|
+
// `prevModSeq` is 0. Captures on every sync (cheap) so the watermark
|
|
1582
|
+
// converges to the latest known modSeq.
|
|
1583
|
+
try {
|
|
1584
|
+
if (typeof client.getCurrentMailboxInfo === "function") {
|
|
1585
|
+
const info = client.getCurrentMailboxInfo();
|
|
1586
|
+
if (info && info.highestModSeq && info.uidValidity) {
|
|
1587
|
+
this.db.updateFolderSync(folderId, info.uidValidity, String(info.highestModSeq));
|
|
1588
|
+
}
|
|
1589
|
+
}
|
|
1590
|
+
}
|
|
1591
|
+
catch { /* non-fatal — QRESYNC just stays disabled */ }
|
|
1487
1592
|
return newCount;
|
|
1488
1593
|
}
|
|
1489
1594
|
/** Sync all folders for all accounts */
|
|
@@ -1892,10 +1997,9 @@ export class ImapManager extends EventEmitter {
|
|
|
1892
1997
|
// standalone — bad rows are logged and skipped.
|
|
1893
1998
|
for (const msg of msgs) {
|
|
1894
1999
|
try {
|
|
1895
|
-
// Tombstone
|
|
1896
|
-
//
|
|
1897
|
-
//
|
|
1898
|
-
// promoted the trash yet. Symmetric with the IMAP paths.
|
|
2000
|
+
// Tombstone-skip: in-flight local delete/move on Gmail.
|
|
2001
|
+
// Cleared by clearTombstoneForUid on failSyncAction so a
|
|
2002
|
+
// refused trash doesn't permanently hide the message.
|
|
1899
2003
|
if (msg.messageId && this.db.hasTombstone(accountId, msg.messageId)) {
|
|
1900
2004
|
continue;
|
|
1901
2005
|
}
|
|
@@ -2799,6 +2903,14 @@ export class ImapManager extends EventEmitter {
|
|
|
2799
2903
|
if (messages.length === 0)
|
|
2800
2904
|
return;
|
|
2801
2905
|
const trash = this.findFolder(accountId, "trash");
|
|
2906
|
+
// Tombstone each Message-ID so sync won't re-import the source-folder
|
|
2907
|
+
// row before the server-side MOVE completes. Cleared on permanent
|
|
2908
|
+
// failure (clearTombstoneForUid in processSyncActions).
|
|
2909
|
+
for (const msg of messages) {
|
|
2910
|
+
const env = this.db.getMessageByUid(accountId, msg.uid, msg.folderId);
|
|
2911
|
+
if (env?.messageId)
|
|
2912
|
+
this.db.addTombstone(accountId, env.messageId, env.subject || "");
|
|
2913
|
+
}
|
|
2802
2914
|
// Local first — move to trash folder locally so the row stays
|
|
2803
2915
|
// visible in Trash and Ctrl+Z can restore it. Body file stays in
|
|
2804
2916
|
// its original folder dir; the next sync rebinds path on
|
|
@@ -2865,6 +2977,14 @@ export class ImapManager extends EventEmitter {
|
|
|
2865
2977
|
/** Move a message to Trash (delete) — local-first, queues IMAP sync */
|
|
2866
2978
|
async trashMessage(accountId, folderId, uid) {
|
|
2867
2979
|
const trash = this.findFolder(accountId, "trash");
|
|
2980
|
+
// Tombstone the Message-ID so sync won't re-import the row in the
|
|
2981
|
+
// source folder before the server-side move completes. Cleared on
|
|
2982
|
+
// permanent failure of the queued sync_action (see processSyncActions
|
|
2983
|
+
// catch block, where clearTombstoneForUid runs after attempts >= 5)
|
|
2984
|
+
// so the user sees the row reappear when their action didn't take.
|
|
2985
|
+
const env = this.db.getMessageByUid(accountId, uid, folderId);
|
|
2986
|
+
if (env?.messageId)
|
|
2987
|
+
this.db.addTombstone(accountId, env.messageId, env.subject || "");
|
|
2868
2988
|
// Local first — move to trash folder so the row stays visible in
|
|
2869
2989
|
// Trash and Ctrl+Z can restore. Body file retained for undelete.
|
|
2870
2990
|
// If we're already in trash (or no trash configured), fall through
|
|
@@ -3034,8 +3154,15 @@ export class ImapManager extends EventEmitter {
|
|
|
3034
3154
|
catch (e) {
|
|
3035
3155
|
console.error(` [api] ${accountId}: flag sync failed UID ${action.uid}: ${e.message}`);
|
|
3036
3156
|
this.db.failSyncAction(action.id, e.message);
|
|
3037
|
-
if (action.attempts >= 5)
|
|
3157
|
+
if (action.attempts >= 5) {
|
|
3158
|
+
// Terminal failure on delete/move → clear tombstone
|
|
3159
|
+
// so the row reappears on next sync (server still
|
|
3160
|
+
// has it). Same rationale as the IMAP branch below.
|
|
3161
|
+
if (action.action === "delete" || action.action === "move") {
|
|
3162
|
+
this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
|
|
3163
|
+
}
|
|
3038
3164
|
this.db.completeSyncAction(action.id);
|
|
3165
|
+
}
|
|
3039
3166
|
}
|
|
3040
3167
|
}
|
|
3041
3168
|
}
|
|
@@ -3115,6 +3242,17 @@ export class ImapManager extends EventEmitter {
|
|
|
3115
3242
|
this.emit("syncActionFailed", accountId, action.action, action.uid, e.message);
|
|
3116
3243
|
if (action.attempts >= 5) {
|
|
3117
3244
|
console.error(` [sync] Giving up on action ${action.id} after 5 attempts`);
|
|
3245
|
+
// 2026-05-13: terminal failure on a delete/move
|
|
3246
|
+
// means the server still has the message — so any
|
|
3247
|
+
// tombstone we set for it would otherwise hide it
|
|
3248
|
+
// from the user forever. Clear the tombstone so
|
|
3249
|
+
// the next sync re-imports the row, accurately
|
|
3250
|
+
// reflecting "your action didn't take, here it is
|
|
3251
|
+
// again." Applies to delete + move; flags/append
|
|
3252
|
+
// never tombstone.
|
|
3253
|
+
if (action.action === "delete" || action.action === "move") {
|
|
3254
|
+
this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
|
|
3255
|
+
}
|
|
3118
3256
|
this.db.completeSyncAction(action.id);
|
|
3119
3257
|
this.emit("syncActionFailed", accountId, action.action, action.uid, `Gave up after 5 attempts: ${e.message}`);
|
|
3120
3258
|
}
|