@bobfrankston/mailx-store 0.1.9 → 0.1.11

package/db.js

@@ -334,6 +334,25 @@ export class MailxDB {
         // this column landed. One UPDATE + an id roundtrip per row — cheap
         // at our row counts, runs once per DB upgrade.
         this.backfillUuids();
+        // One-shot cleanup: the retired insertOptimisticSentRow path wrote
+        // synthetic-negative-UID rows into Sent. Those rows are stale (the
+        // real server-synced row eventually appears with a positive UID),
+        // they pollute MAX(uid) (which broke Sent sync entirely), and the
+        // mechanism is gone. Drop them. Bodies on disk are orphaned; the
+        // body-store has no GC today but a one-time leak is fine.
+        try {
+            const purgedFlag = this.getKv("schema", "drop_synthetic_uids_v1");
+            if (!purgedFlag) {
+                const r = this.db.prepare("DELETE FROM messages WHERE uid < 0").run();
+                if (r.changes) {
+                    console.log(`  [migration] dropped ${r.changes} synthetic-UID rows from messages`);
+                }
+                this.setKv("schema", "drop_synthetic_uids_v1", "1");
+            }
+        }
+        catch (e) {
+            console.error(`  [migration] synthetic-UID cleanup failed: ${e?.message || e}`);
+        }
         // One-shot contacts table reset: the contacts schema's UNIQUE constraint
         // was widened from `(email)` to `(source, email, name)` so the same
         // address can carry multiple distinct (name, source) entries — Bob's
@@ -1029,15 +1048,14 @@ export class MailxDB {
         // LEFT JOIN sync_actions so each row carries a `pending` flag —
         // true when the user has a queued local action (move/flag/delete)
         // not yet acknowledged by the server. UI renders these in pink so
-        // local-only state is visible (Slice C of S1). Negative UIDs also
-        // count as pending: that's the convention for optimistic local
-        // inserts (e.g. Sent rows written the moment the user hits Send,
-        // before the real APPENDUID comes back from the server).
+        // local-only state is visible (Slice C of S1). The optimistic-Sent
+        // negative-UID convention was retired — Sent now reflects only what
+        // the server has; pending sends live in the Outbox view.
         const rows = this.db.prepare(`SELECT m.*, (
                 EXISTS(
                     SELECT 1 FROM sync_actions sa
                     WHERE sa.account_id = m.account_id AND sa.uid = m.uid
-                ) OR m.uid < 0
+                )
             ) AS pending
             FROM messages m WHERE ${where.replace(/\b(account_id|folder_id|uid|date|subject|from_name|from_address|flags_json)\b/g, "m.$1")}
             ORDER BY m.${sortCol} ${sortDir} LIMIT ? OFFSET ?`).all(...params, pageSize, offset);
@@ -1188,7 +1206,13 @@ export class MailxDB {
     }
     /** Get messages without cached bodies (for background prefetch) */
     getMessagesWithoutBody(accountId, limit = 50) {
-        return this.db.prepare("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '') ORDER BY date DESC LIMIT ?").all(accountId, limit);
+        // Prefetch order: smallest first, NULLs last, recent within tiebreak.
+        // Reasoning: on slow / metered Android networks, the user feels the
+        // cache "fill up" much faster when the queue is dominated by short
+        // notification mails (a handful of KB each) instead of a single
+        // multi-megabyte attachment that monopolizes bandwidth for minutes.
+        // Size 0 / NULL fall to the end so they don't masquerade as small.
+        return this.db.prepare("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '') ORDER BY (size IS NULL OR size = 0), size ASC, date DESC LIMIT ?").all(accountId, limit);
     }
     getHighestUid(accountId, folderId) {
         const r = this.db.prepare("SELECT MAX(uid) as maxUid FROM messages WHERE account_id = ? AND folder_id = ?").get(accountId, folderId);
@@ -1613,6 +1637,23 @@ export class MailxDB {
         const score = (r) => (r.match_rank || 0) * 10_000
             + (r.use_count || 0) * Math.pow(0.5, Math.max(0, now - (r.last_used || 0)) / HALF_LIFE_MS);
         rows.sort((a, b) => score(b) - score(a));
+        // Dedup by lowercased email — same address often appears as both
+        // source='google' (synced from Google Contacts) and source='discovered'
+        // (auto-collected from sent mail). The user only wants to see the
+        // best entry; we keep the higher-ranked source (which the sort above
+        // has already put first), and silently drop the duplicate. Without
+        // this, the autocomplete dropdown showed two identical Kevin Healy
+        // rows just labeled GOOGLE and DISCOVERED.
+        const seenEmails = new Set();
+        rows = rows.filter(r => {
+            const k = (r.email || "").toLowerCase();
+            if (!k)
+                return true;
+            if (seenEmails.has(k))
+                return false;
+            seenEmails.add(k);
+            return true;
+        });
         rows = rows.slice(0, limit);
         return rows.map(r => ({ name: r.name, email: r.email, source: r.source, useCount: r.use_count }));
     }

package/file-store.d.ts

@@ -28,6 +28,12 @@ export declare class FileMessageStore implements MessageStore {
      *  it in `body_path`. The (folderId, uid) args are kept for interface
      *  compatibility; they do NOT affect the filename. */
     putMessage(accountId: string, _folderId: number, _uid: number, raw: Buffer): Promise<string>;
+    /** Resolve a stored body_path (relative or absolute) to an absolute
+     *  filesystem path. Returns "" if the input doesn't resolve to a file
+     *  inside the store. UI / "Source" actions need the absolute path so
+     *  they can open / pass it to OS file pickers without re-introducing
+     *  the basePath context every time. */
+    absolutePath(stored: string): string;
     /** Read by stored path (relative or absolute). */
     readByPath(stored: string): Promise<Buffer>;
     hasByPath(stored: string): Promise<boolean>;

package/file-store.js

@@ -51,6 +51,14 @@ export class FileMessageStore {
         fs.writeFileSync(abs, raw);
         return rel;
     }
+    /** Resolve a stored body_path (relative or absolute) to an absolute
+     *  filesystem path. Returns "" if the input doesn't resolve to a file
+     *  inside the store. UI / "Source" actions need the absolute path so
+     *  they can open / pass it to OS file pickers without re-introducing
+     *  the basePath context every time. */
+    absolutePath(stored) {
+        return this.resolveStored(stored);
+    }
     /** Read by stored path (relative or absolute). */
     async readByPath(stored) {
         const abs = this.resolveStored(stored);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.10",
-    "@bobfrankston/mailx-settings": "^0.1.11"
+    "@bobfrankston/mailx-settings": "^0.1.13"
   },
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.10",
-      "@bobfrankston/mailx-settings": "^0.1.11"
+      "@bobfrankston/mailx-settings": "^0.1.13"
     }
   }
 }