@bobfrankston/mailx 1.0.451 → 1.0.453

package/client/lib/local-store.ts

@@ -0,0 +1,283 @@
+/**
+ * Local storage layer for Android/WebView — uses IndexedDB instead of SQLite.
+ * Implements the subset of MailxDB that the client needs.
+ */
+
+const DB_NAME = "mailx";
+const DB_VERSION = 1;
+
+interface StoredAccount {
+    id: string;
+    name: string;
+    email: string;
+    config: string;
+    lastSync: number;
+}
+
+interface StoredFolder {
+    id: number;
+    accountId: string;
+    path: string;
+    delimiter: string;
+    specialUse: string;
+    totalCount: number;
+    unreadCount: number;
+}
+
+interface StoredMessage {
+    key: string; // accountId:folderId:uid
+    accountId: string;
+    folderId: number;
+    uid: number;
+    messageId: string;
+    date: number;
+    subject: string;
+    fromName: string;
+    fromAddress: string;
+    toJson: string;
+    ccJson: string;
+    flags: string;
+    size: number;
+    hasAttachments: boolean;
+    preview: string;
+    bodyPath: string;
+}
+
+interface StoredBody {
+    key: string; // accountId:folderId:uid
+    body: string; // raw .eml source
+}
+
+interface StoredContact {
+    email: string;
+    name: string;
+    source: string;
+    useCount: number;
+    lastUsed: number;
+}
+
+let db: IDBDatabase | null = null;
+
+async function openDB(): Promise<IDBDatabase> {
+    if (db) return db;
+    return new Promise((resolve, reject) => {
+        const req = indexedDB.open(DB_NAME, DB_VERSION);
+        req.onupgradeneeded = () => {
+            const d = req.result;
+            if (!d.objectStoreNames.contains("accounts")) {
+                d.createObjectStore("accounts", { keyPath: "id" });
+            }
+            if (!d.objectStoreNames.contains("folders")) {
+                const fs = d.createObjectStore("folders", { keyPath: "id", autoIncrement: true });
+                fs.createIndex("accountId", "accountId");
+            }
+            if (!d.objectStoreNames.contains("messages")) {
+                const ms = d.createObjectStore("messages", { keyPath: "key" });
+                ms.createIndex("accountId", "accountId");
+                ms.createIndex("folderId", "folderId");
+                ms.createIndex("folder", ["accountId", "folderId"]);
+                ms.createIndex("date", "date");
+            }
+            if (!d.objectStoreNames.contains("bodies")) {
+                d.createObjectStore("bodies", { keyPath: "key" });
+            }
+            if (!d.objectStoreNames.contains("contacts")) {
+                const cs = d.createObjectStore("contacts", { keyPath: "email" });
+                cs.createIndex("name", "name");
+            }
+            if (!d.objectStoreNames.contains("meta")) {
+                d.createObjectStore("meta", { keyPath: "key" });
+            }
+        };
+        req.onsuccess = () => { db = req.result; resolve(db); };
+        req.onerror = () => reject(req.error);
+    });
+}
+
+function tx(stores: string | string[], mode: IDBTransactionMode = "readonly"): IDBTransaction {
+    const names = Array.isArray(stores) ? stores : [stores];
+    return db!.transaction(names, mode);
+}
+
+function getAll<T>(store: string, index?: string, key?: IDBValidKey | IDBKeyRange): Promise<T[]> {
+    return new Promise((resolve, reject) => {
+        const t = tx(store);
+        const s = t.objectStore(store);
+        const target = index ? s.index(index) : s;
+        const req = key ? target.getAll(key) : target.getAll();
+        req.onsuccess = () => resolve(req.result);
+        req.onerror = () => reject(req.error);
+    });
+}
+
+function put(store: string, value: any): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const t = tx(store, "readwrite");
+        t.objectStore(store).put(value);
+        t.oncomplete = () => resolve();
+        t.onerror = () => reject(t.error);
+    });
+}
+
+function del(store: string, key: IDBValidKey): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const t = tx(store, "readwrite");
+        t.objectStore(store).delete(key);
+        t.oncomplete = () => resolve();
+        t.onerror = () => reject(t.error);
+    });
+}
+
+// ── Public API (mirrors MailxDB methods used by the client service) ──
+
+export async function init(): Promise<void> {
+    await openDB();
+}
+
+export async function getAccounts(): Promise<StoredAccount[]> {
+    return getAll("accounts");
+}
+
+export async function upsertAccount(id: string, name: string, email: string, config: string): Promise<void> {
+    await put("accounts", { id, name, email, config, lastSync: 0 });
+}
+
+export async function getFolders(accountId: string): Promise<StoredFolder[]> {
+    return getAll("folders", "accountId", accountId);
+}
+
+export async function upsertFolder(folder: StoredFolder): Promise<void> {
+    await put("folders", folder);
+}
+
+export async function getMessages(accountId: string, folderId: number, page = 1, pageSize = 50): Promise<{ items: any[]; total: number; page: number; pageSize: number }> {
+    const all = await getAll<StoredMessage>("messages", "folder", [accountId, folderId]);
+    // Sort by date descending
+    all.sort((a, b) => b.date - a.date);
+    const total = all.length;
+    const start = (page - 1) * pageSize;
+    const items = all.slice(start, start + pageSize).map(toEnvelope);
+    return { items, total, page, pageSize };
+}
+
+export async function getUnifiedInbox(page = 1, pageSize = 50): Promise<{ items: any[]; total: number; page: number; pageSize: number }> {
+    const folders = await getAll<StoredFolder>("folders");
+    const inboxFolders = folders.filter(f => f.specialUse === "inbox");
+    const allMsgs: StoredMessage[] = [];
+    for (const f of inboxFolders) {
+        const msgs = await getAll<StoredMessage>("messages", "folder", [f.accountId, f.id]);
+        allMsgs.push(...msgs);
+    }
+    allMsgs.sort((a, b) => b.date - a.date);
+    const total = allMsgs.length;
+    const start = (page - 1) * pageSize;
+    const items = allMsgs.slice(start, start + pageSize).map(toEnvelope);
+    return { items, total, page, pageSize };
+}
+
+export async function getMessageByUid(accountId: string, uid: number, folderId?: number): Promise<any | null> {
+    if (folderId != null) {
+        const key = `${accountId}:${folderId}:${uid}`;
+        return new Promise((resolve, reject) => {
+            const t = tx("messages");
+            const req = t.objectStore("messages").get(key);
+            req.onsuccess = () => resolve(req.result ? toEnvelope(req.result) : null);
+            req.onerror = () => reject(req.error);
+        });
+    }
+    // Search all folders
+    const all = await getAll<StoredMessage>("messages", "accountId", accountId);
+    const msg = all.find(m => m.uid === uid);
+    return msg ? toEnvelope(msg) : null;
+}
+
+export async function upsertMessage(msg: StoredMessage): Promise<void> {
+    await put("messages", msg);
+}
+
+export async function deleteMessage(accountId: string, uid: number): Promise<void> {
+    const all = await getAll<StoredMessage>("messages", "accountId", accountId);
+    const msg = all.find(m => m.uid === uid);
+    if (msg) await del("messages", msg.key);
+}
+
+export async function getHighestUid(accountId: string, folderId: number): Promise<number> {
+    const msgs = await getAll<StoredMessage>("messages", "folder", [accountId, folderId]);
+    return msgs.reduce((max, m) => Math.max(max, m.uid), 0);
+}
+
+export async function storeBody(accountId: string, folderId: number, uid: number, body: string): Promise<void> {
+    await put("bodies", { key: `${accountId}:${folderId}:${uid}`, body });
+}
+
+export async function getBody(accountId: string, folderId: number, uid: number): Promise<string | null> {
+    return new Promise((resolve, reject) => {
+        const t = tx("bodies");
+        const req = t.objectStore("bodies").get(`${accountId}:${folderId}:${uid}`);
+        req.onsuccess = () => resolve(req.result?.body || null);
+        req.onerror = () => reject(req.error);
+    });
+}
+
+export async function updateFolderCounts(folderId: number, total: number, unread: number): Promise<void> {
+    const folders = await getAll<StoredFolder>("folders");
+    const f = folders.find(f => f.id === folderId);
+    if (f) { f.totalCount = total; f.unreadCount = unread; await put("folders", f); }
+}
+
+export async function searchContacts(query: string): Promise<StoredContact[]> {
+    const q = query.toLowerCase();
+    const all = await getAll<StoredContact>("contacts");
+    return all.filter(c => c.name.toLowerCase().includes(q) || c.email.toLowerCase().includes(q)).slice(0, 10);
+}
+
+export async function upsertContact(email: string, name: string, source: string): Promise<void> {
+    const existing = await new Promise<StoredContact | undefined>((resolve, reject) => {
+        const t = tx("contacts");
+        const req = t.objectStore("contacts").get(email);
+        req.onsuccess = () => resolve(req.result);
+        req.onerror = () => reject(req.error);
+    });
+    if (existing) {
+        existing.useCount++;
+        existing.lastUsed = Date.now();
+        if (name && !existing.name) existing.name = name;
+        await put("contacts", existing);
+    } else {
+        await put("contacts", { email, name, source, useCount: 1, lastUsed: Date.now() });
+    }
+}
+
+export async function getMeta(key: string): Promise<any> {
+    return new Promise((resolve, reject) => {
+        const t = tx("meta");
+        const req = t.objectStore("meta").get(key);
+        req.onsuccess = () => resolve(req.result?.value);
+        req.onerror = () => reject(req.error);
+    });
+}
+
+export async function setMeta(key: string, value: any): Promise<void> {
+    await put("meta", { key, value });
+}
+
+// ── Helpers ──
+
+function toEnvelope(m: StoredMessage): any {
+    return {
+        accountId: m.accountId,
+        folderId: m.folderId,
+        uid: m.uid,
+        messageId: m.messageId,
+        date: m.date,
+        subject: m.subject,
+        from: { name: m.fromName, address: m.fromAddress },
+        to: JSON.parse(m.toJson || "[]"),
+        cc: JSON.parse(m.ccJson || "[]"),
+        flags: m.flags ? m.flags.split(",").filter(Boolean) : [],
+        size: m.size,
+        hasAttachments: m.hasAttachments,
+        preview: m.preview,
+        bodyPath: m.bodyPath,
+    };
+}

package/client/lib/message-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-state.js","sourceRoot":"","sources":["message-state.ts"],"names":[],"mappings":"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"}

package/client/lib/message-state.ts

@@ -0,0 +1,140 @@
+/**
+ * Shared message state — single source of truth for the message list and viewer.
+ *
+ * The message list and viewer both reference message objects from this store.
+ * Operations (move, delete, sync) mutate the store; UI components subscribe
+ * and update themselves. No manual DOM cleanup, no custom events.
+ */
+
+export interface ListMessage {
+    accountId: string;
+    uid: number;
+    folderId: number;
+    subject: string;
+    from: { name: string; address: string };
+    to: { name: string; address: string }[];
+    cc: { name: string; address: string }[];
+    date: number;
+    flags: string[];
+    size: number;
+    preview: string;
+    hasAttachments: boolean;
+    [key: string]: any;
+}
+
+type ChangeType = "messages" | "selected" | "removed";
+type Listener = (change: ChangeType) => void;
+
+/** The currently loaded messages (what the list shows) */
+let messages: ListMessage[] = [];
+
+/** The currently selected/viewed message (same ref as an entry in messages[]) */
+let selected: ListMessage | null = null;
+
+const listeners: Listener[] = [];
+
+/** Subscribe to state changes. Returns unsubscribe function. */
+export function subscribe(fn: Listener): () => void {
+    listeners.push(fn);
+    return () => {
+        const i = listeners.indexOf(fn);
+        if (i >= 0) listeners.splice(i, 1);
+    };
+}
+
+function notify(change: ChangeType): void {
+    for (const fn of listeners) {
+        try { fn(change); } catch { /* don't let one subscriber break others */ }
+    }
+}
+
+/** Replace the entire message list (folder load, search, unified inbox).
+ *  Selection stays even when the previously-selected message isn't in
+ *  the new list — that case happens whenever a periodic sync re-fetches
+ *  page 1 of the unified inbox and a row the user opened earlier has
+ *  scrolled off, or when the same row's accountId/uid pair changes
+ *  shape after dedup. Yanking the viewer mid-read was a user-reported
+ *  surprise (2026-04-30: "I was reading a message but now it just
+ *  jumped to Select a message to read"). The viewer keeps the message
+ *  it has; it'll only clear when the user explicitly clicks elsewhere
+ *  or the message is removed via removeMessages (real delete/move). */
+export function setMessages(msgs: ListMessage[]): void {
+    messages = msgs;
+    notify("messages");
+}
+
+/** Get current messages */
+export function getMessages(): ListMessage[] {
+    return messages;
+}
+
+/** Select a message (by reference or null to deselect) */
+export function select(msg: ListMessage | null): void {
+    selected = msg;
+    notify("selected");
+}
+
+/** Get the selected message */
+export function getSelected(): ListMessage | null {
+    return selected;
+}
+
+/**
+ * Remove messages from the list (after move or delete).
+ * If the selected message is removed, auto-selects the next message or null.
+ * Decrements dupeCount on any remaining messages that shared a Message-ID
+ * with one of the removed rows — so the unified-inbox ⇆ marker disappears
+ * when one half of a duplicate pair is deleted, instead of pointing at a
+ * sibling that no longer exists.
+ */
+export function removeMessages(uids: { accountId: string; uid: number }[]): void {
+    const removeSet = new Set(uids.map(u => `${u.accountId}:${u.uid}`));
+    let selectedIdx = -1;
+    if (selected) {
+        selectedIdx = messages.findIndex(m => m.uid === selected!.uid && m.accountId === selected!.accountId);
+    }
+    const wasSelectedRemoved = selected && removeSet.has(`${selected.accountId}:${selected.uid}`);
+
+    // Capture Message-IDs of the rows about to leave, so we can fix up the
+    // dupeCount on any remaining siblings. Only IDs that were in the list
+    // and had a non-empty messageId count — empty IDs would match every
+    // headerless row and falsely "merge" them.
+    const removedIds = new Set<string>();
+    for (const m of messages) {
+        if (removeSet.has(`${m.accountId}:${m.uid}`) && m.messageId) {
+            removedIds.add(m.messageId);
+        }
+    }
+
+    messages = messages.filter(m => !removeSet.has(`${m.accountId}:${m.uid}`));
+
+    // Sibling dupeCount adjustment. dupeCount is server-recomputed on the
+    // next getUnifiedInbox fetch, but we don't want to wait for that —
+    // user just deleted, the marker should drop now. Decrement once per
+    // remaining message whose messageId matches a removed one.
+    if (removedIds.size > 0) {
+        for (const m of messages) {
+            if (m.messageId && removedIds.has(m.messageId) && typeof (m as any).dupeCount === "number") {
+                (m as any).dupeCount = Math.max(0, (m as any).dupeCount - 1);
+            }
+        }
+    }
+
+    if (wasSelectedRemoved) {
+        // Auto-select next message (same index, or last, or null)
+        if (messages.length > 0) {
+            const nextIdx = Math.min(selectedIdx, messages.length - 1);
+            selected = messages[nextIdx];
+        } else {
+            selected = null;
+        }
+    }
+    notify("removed");
+}
+
+/** Update flags on a message in the list */
+export function updateMessageFlags(accountId: string, uid: number, flags: string[]): void {
+    const msg = messages.find(m => m.uid === uid && m.accountId === accountId);
+    if (msg) msg.flags = flags;
+    // No notify — flag changes are cosmetic, handled inline by the list
+}

package/client/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "lib": ["ES2024", "DOM", "DOM.Iterable"],
+    "strict": true,
+    "strictNullChecks": false,
+    "noImplicitAny": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "declaration": false,
+    "outDir": ".",
+    "rootDir": ".",
+    "newLine": "lf"
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "prev", "cruft"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.451",
+  "version": "1.0.453",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -16,7 +16,6 @@
     "packages/mailx-settings",
     "packages/mailx-store",
     "packages/mailx-store-web",
-    "packages/mailx-imap",
     "packages/mailx-service",
     "packages/mailx-api",
     "packages/mailx-core",
@@ -24,7 +23,7 @@
     "client"
   ],
   "scripts": {
-    "build": "npm run build --workspaces --if-present && tsc -p bin && node bin/build-icon-ico.js",
+    "build": "tsc -p bin && node bin/build-icon-ico.js",
     "watch": "tsc -w",
     "start": "node --watch packages/mailx-server/index.js",
     "start:prod": "node packages/mailx-server/index.js",
@@ -37,7 +36,7 @@
     "@bobfrankston/miscinfo": "^1.0.10",
     "@bobfrankston/oauthsupport": "^1.0.25",
     "@bobfrankston/msger": "^0.1.367",
-    "@bobfrankston/mailx-host": "^0.1.8",
+    "@bobfrankston/mailx-host": "^0.1.9",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -51,7 +50,8 @@
     "@bobfrankston/tcp-transport": "^0.1.5",
     "@bobfrankston/node-tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.5",
-    "@bobfrankston/mailx-sync": "^0.1.10"
+    "@bobfrankston/mailx-sync": "^0.1.10",
+    "@bobfrankston/mailx-imap": "^0.1.12"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6"
@@ -73,11 +73,11 @@
     "url": "https://github.com/BobFrankston/mailx.git"
   },
   ".dependencies": {
-    "@bobfrankston/iflow-direct": "file:../MailApps/iflow-direct",
-    "@bobfrankston/iflow-node": "file:../MailApps/iflow-node",
-    "@bobfrankston/miscinfo": "file:../../projects/npm/miscinfo",
-    "@bobfrankston/oauthsupport": "file:../../projects/oauth/oauthsupport",
-    "@bobfrankston/msger": "file:../../utils/msgx/msger",
+    "@bobfrankston/iflow-direct": "file:../../MailApps/iflow-direct",
+    "@bobfrankston/iflow-node": "file:../../MailApps/iflow-node",
+    "@bobfrankston/miscinfo": "file:../../../projects/npm/miscinfo",
+    "@bobfrankston/oauthsupport": "file:../../../projects/oauth/oauthsupport",
+    "@bobfrankston/msger": "file:../../../utils/msgx/msger",
     "@bobfrankston/mailx-host": "file:packages/mailx-host",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
@@ -89,10 +89,11 @@
     "quill": "^2.0.3",
     "ws": "^8.18.0",
     "sql.js": "^1.14.1",
-    "@bobfrankston/tcp-transport": "file:../MailApps/tcp-transport",
-    "@bobfrankston/node-tcp-transport": "file:../MailApps/node-tcp-transport",
-    "@bobfrankston/smtp-direct": "file:../MailApps/smtp-direct",
-    "@bobfrankston/mailx-sync": "file:../MailApps/mailx-sync"
+    "@bobfrankston/tcp-transport": "file:../../MailApps/tcp-transport",
+    "@bobfrankston/node-tcp-transport": "file:../../MailApps/node-tcp-transport",
+    "@bobfrankston/smtp-direct": "file:../../MailApps/smtp-direct",
+    "@bobfrankston/mailx-sync": "file:../../MailApps/mailx-sync",
+    "@bobfrankston/mailx-imap": "file:../packages/mailx-imap"
   },
   ".transformedSnapshot": {
     "dependencies": {
@@ -101,7 +102,7 @@
       "@bobfrankston/miscinfo": "^1.0.10",
       "@bobfrankston/oauthsupport": "^1.0.25",
       "@bobfrankston/msger": "^0.1.367",
-      "@bobfrankston/mailx-host": "^0.1.8",
+      "@bobfrankston/mailx-host": "^0.1.9",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",
@@ -115,7 +116,8 @@
       "@bobfrankston/tcp-transport": "^0.1.5",
       "@bobfrankston/node-tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.5",
-      "@bobfrankston/mailx-sync": "^0.1.10"
+      "@bobfrankston/mailx-sync": "^0.1.10",
+      "@bobfrankston/mailx-imap": "^0.1.12"
     }
   }
 }

package/packages/mailx-api/.gitattributes

@@ -0,0 +1,10 @@
+# Force LF line endings for all text files
+* text=auto eol=lf
+
+# Ensure these are always LF
+*.ts text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf

package/packages/mailx-api/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,wBAAgB,eAAe,CAAC,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CA4Q7E;AAGD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC"}

package/packages/mailx-api/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}