@bobfrankston/mailx 1.0.12 → 1.0.14

package/packages/mailx-store/db.js

@@ -241,8 +241,43 @@ export class MailxDB {
         }));
         return { items, total, page, pageSize };
     }
-    getMessageByUid(accountId, uid) {
-        const r = this.db.prepare("SELECT * FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
+    /** Unified inbox: all inbox folders across accounts, sorted by date, paginated in SQL */
+    getUnifiedInbox(page = 1, pageSize = 50) {
+        const offset = (page - 1) * pageSize;
+        // Find all inbox folder IDs
+        const inboxRows = this.db.prepare("SELECT id FROM folders WHERE special_use = 'inbox'").all();
+        if (inboxRows.length === 0)
+            return { items: [], total: 0, page, pageSize };
+        const placeholders = inboxRows.map(() => "?").join(",");
+        const folderIds = inboxRows.map((r) => r.id);
+        const total = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages WHERE folder_id IN (${placeholders})`).get(...folderIds).cnt;
+        const rows = this.db.prepare(`SELECT * FROM messages WHERE folder_id IN (${placeholders}) ORDER BY date DESC LIMIT ? OFFSET ?`).all(...folderIds, pageSize, offset);
+        const items = rows.map(r => ({
+            id: r.id,
+            accountId: r.account_id,
+            folderId: r.folder_id,
+            uid: r.uid,
+            messageId: r.message_id || "",
+            inReplyTo: r.in_reply_to || "",
+            references: JSON.parse(r.refs || "[]"),
+            date: r.date,
+            subject: r.subject,
+            from: { name: r.from_name, address: r.from_address },
+            to: JSON.parse(r.to_json),
+            cc: JSON.parse(r.cc_json),
+            flags: JSON.parse(r.flags_json),
+            size: r.size,
+            hasAttachments: !!r.has_attachments,
+            preview: r.preview
+        }));
+        return { items, total, page, pageSize };
+    }
+    getMessageByUid(accountId, uid, folderId) {
+        const sql = folderId != null
+            ? "SELECT * FROM messages WHERE account_id = ? AND uid = ? AND folder_id = ?"
+            : "SELECT * FROM messages WHERE account_id = ? AND uid = ?";
+        const params = folderId != null ? [accountId, uid, folderId] : [accountId, uid];
+        const r = this.db.prepare(sql).get(...params);
         if (!r)
             return null;
         return {
@@ -282,7 +317,19 @@ export class MailxDB {
     }
     /** Delete a message by account + UID */
     deleteMessage(accountId, uid) {
+        // Get folderId before deleting so we can update counts
+        const msg = this.db.prepare("SELECT folder_id FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
         this.db.prepare("DELETE FROM messages WHERE account_id = ? AND uid = ?").run(accountId, uid);
+        // Refresh folder counts
+        if (msg)
+            this.recalcFolderCounts(msg.folder_id);
+    }
+    /** Recalculate folder total/unread counts from actual messages */
+    recalcFolderCounts(folderId) {
+        const counts = this.db.prepare(`SELECT COUNT(*) as total,
+                    SUM(CASE WHEN flags_json NOT LIKE '%\\\\Seen%' THEN 1 ELSE 0 END) as unread
+             FROM messages WHERE folder_id = ?`).get(folderId);
+        this.updateFolderCounts(folderId, counts?.total || 0, counts?.unread || 0);
     }
     /** Bulk insert within a transaction for sync performance */
     beginTransaction() { this.db.exec("BEGIN"); }
@@ -328,7 +375,7 @@ export class MailxDB {
     }
     // ── Search ──
     /** Full-text search across all messages. Supports qualifiers: from:, to:, subject: */
-    searchMessages(query, page = 1, pageSize = 50) {
+    searchMessages(query, page = 1, pageSize = 50, accountId, folderId) {
         // Parse qualifiers
         let ftsQuery = "";
         const parts = query.match(/(?:[^\s"]+|"[^"]*")+/g) || [];
@@ -358,13 +405,23 @@ export class MailxDB {
             return { items: [], total: 0, page, pageSize };
         const offset = (page - 1) * pageSize;
         try {
-            const countRow = this.db.prepare("SELECT COUNT(*) as cnt FROM messages_fts WHERE messages_fts MATCH ?").get(ftsQuery);
+            let scopeWhere = "";
+            const scopeParams = [];
+            if (accountId && folderId) {
+                scopeWhere = " AND m.account_id = ? AND m.folder_id = ?";
+                scopeParams.push(accountId, folderId);
+            }
+            else if (accountId) {
+                scopeWhere = " AND m.account_id = ?";
+                scopeParams.push(accountId);
+            }
+            const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages m JOIN messages_fts fts ON m.id = fts.rowid WHERE messages_fts MATCH ?${scopeWhere}`).get(ftsQuery, ...scopeParams);
             const total = countRow?.cnt || 0;
             const rows = this.db.prepare(`SELECT m.* FROM messages m
                  JOIN messages_fts fts ON m.id = fts.rowid
-                 WHERE messages_fts MATCH ?
+                 WHERE messages_fts MATCH ?${scopeWhere}
                  ORDER BY m.date DESC
-                 LIMIT ? OFFSET ?`).all(ftsQuery, pageSize, offset);
+                 LIMIT ? OFFSET ?`).all(ftsQuery, ...scopeParams, pageSize, offset);
             const items = rows.map(r => ({
                 id: r.id,
                 accountId: r.account_id,
@@ -401,19 +458,24 @@ export class MailxDB {
             subject, from_name, from_address, to_text, cc_text, body_text,
             content=messages, content_rowid=id
         )`);
+        // Use a single transaction + prepared statement for speed (~50x faster than individual inserts)
+        const insert = this.db.prepare("INSERT INTO messages_fts (rowid, subject, from_name, from_address, to_text, cc_text, body_text) VALUES (?, ?, ?, ?, ?, ?, ?)");
         const rows = this.db.prepare("SELECT id, subject, from_name, from_address, to_json, cc_json, preview FROM messages").all();
         let count = 0;
-        for (const r of rows) {
-            const to = JSON.parse(r.to_json || "[]");
-            const cc = JSON.parse(r.cc_json || "[]");
-            const toText = to.map((a) => `${a.name} ${a.address}`).join(" ");
-            const ccText = cc.map((a) => `${a.name} ${a.address}`).join(" ");
-            try {
-                this.db.prepare("INSERT INTO messages_fts (rowid, subject, from_name, from_address, to_text, cc_text, body_text) VALUES (?, ?, ?, ?, ?, ?, ?)").run(r.id, r.subject, r.from_name, r.from_address, toText, ccText, r.preview);
-                count++;
+        const batchInsert = this.db.transaction(() => {
+            for (const r of rows) {
+                const to = JSON.parse(r.to_json || "[]");
+                const cc = JSON.parse(r.cc_json || "[]");
+                const toText = to.map((a) => `${a.name} ${a.address}`).join(" ");
+                const ccText = cc.map((a) => `${a.name} ${a.address}`).join(" ");
+                try {
+                    insert.run(r.id, r.subject, r.from_name, r.from_address, toText, ccText, r.preview);
+                    count++;
+                }
+                catch { /* skip duplicates */ }
             }
-            catch { /* skip duplicates */ }
-        }
+        });
+        batchInsert();
         return count;
     }
     // ── Sync Actions ──

package/packages/mailx-store/file-store.d.ts

@@ -1,19 +1,13 @@
 /**
  * File-per-message body storage backend.
- * Messages stored as: {basePath}/{accountId}/{folderName}/{uid}.eml
- * Legacy: also checks {basePath}/{accountId}/{folderId}/{uid}.eml
+ * Messages stored as: {basePath}/{accountId}/{folderId}/{uid}.eml
+ * Folder IDs are numeric (from SQLite), not names.
  */
 import type { MessageStore } from "@bobfrankston/mailx-types";
 export declare class FileMessageStore implements MessageStore {
     private basePath;
-    private folderNames;
     constructor(basePath: string);
-    /** Register folder ID → path mapping for human-readable directory names */
-    registerFolder(folderId: number, folderPath: string): void;
-    private folderDir;
     private messagePath;
-    /** Check legacy path (numeric folder ID) */
-    private legacyPath;
     putMessage(accountId: string, folderId: number, uid: number, raw: Buffer): Promise<string>;
     getMessage(accountId: string, folderId: number, uid: number): Promise<Buffer>;
     deleteMessage(accountId: string, folderId: number, uid: number): Promise<void>;

package/packages/mailx-store/file-store.js

@@ -1,34 +1,17 @@
 /**
  * File-per-message body storage backend.
- * Messages stored as: {basePath}/{accountId}/{folderName}/{uid}.eml
- * Legacy: also checks {basePath}/{accountId}/{folderId}/{uid}.eml
+ * Messages stored as: {basePath}/{accountId}/{folderId}/{uid}.eml
+ * Folder IDs are numeric (from SQLite), not names.
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-/** Sanitize folder path for use as directory name — replace delimiters with _ */
-function sanitizeFolderName(folderPath) {
-    return folderPath.replace(/[\/\\.:]/g, "_");
-}
 export class FileMessageStore {
     basePath;
-    folderNames = new Map();
     constructor(basePath) {
         this.basePath = basePath;
         fs.mkdirSync(basePath, { recursive: true });
     }
-    /** Register folder ID → path mapping for human-readable directory names */
-    registerFolder(folderId, folderPath) {
-        this.folderNames.set(folderId, sanitizeFolderName(folderPath));
-    }
-    folderDir(accountId, folderId) {
-        const name = this.folderNames.get(folderId) || String(folderId);
-        return path.join(this.basePath, accountId, name);
-    }
     messagePath(accountId, folderId, uid) {
-        return path.join(this.folderDir(accountId, folderId), `${uid}.eml`);
-    }
-    /** Check legacy path (numeric folder ID) */
-    legacyPath(accountId, folderId, uid) {
         return path.join(this.basePath, accountId, String(folderId), `${uid}.eml`);
     }
     async putMessage(accountId, folderId, uid, raw) {
@@ -38,22 +21,15 @@ export class FileMessageStore {
         return filePath;
     }
     async getMessage(accountId, folderId, uid) {
-        const filePath = this.messagePath(accountId, folderId, uid);
-        if (fs.existsSync(filePath))
-            return fs.readFileSync(filePath);
-        // Fallback to legacy path
-        const legacy = this.legacyPath(accountId, folderId, uid);
-        return fs.readFileSync(legacy);
+        return fs.readFileSync(this.messagePath(accountId, folderId, uid));
     }
     async deleteMessage(accountId, folderId, uid) {
-        for (const p of [this.messagePath(accountId, folderId, uid), this.legacyPath(accountId, folderId, uid)]) {
-            if (fs.existsSync(p))
-                fs.unlinkSync(p);
-        }
+        const filePath = this.messagePath(accountId, folderId, uid);
+        if (fs.existsSync(filePath))
+            fs.unlinkSync(filePath);
     }
     async hasMessage(accountId, folderId, uid) {
-        return fs.existsSync(this.messagePath(accountId, folderId, uid)) ||
-            fs.existsSync(this.legacyPath(accountId, folderId, uid));
+        return fs.existsSync(this.messagePath(accountId, folderId, uid));
     }
 }
 //# sourceMappingURL=file-store.js.map

package/packages/mailx-types/index.d.ts

@@ -8,7 +8,8 @@ export type AuthMethod = "password" | "oauth2";
 /** Mail account configuration */
 export interface AccountConfig {
     id: string; /** Unique account identifier (e.g., "iecc", "gmail-bob") */
-    name: string; /** Display name */
+    name: string; /** Sender name for From header (e.g., "Bob Frankston") */
+    label?: string; /** UI label for account list (e.g., "Gmail"). Falls back to name if not set */
     email: string; /** Email address */
     imap: {
         host: string;
@@ -28,6 +29,7 @@ export interface AccountConfig {
         password?: string;
     };
     enabled: boolean;
+    defaultSend?: boolean; /** Use this account's SMTP when From doesn't match any account */
 }
 /** Standard IMAP special-use folder types */
 export type SpecialUse = "inbox" | "sent" | "drafts" | "trash" | "junk" | "archive" | "all";