@bobfrankston/rmfmail 1.2.4 → 1.2.5

package/packages/mailx-service/index.ts

@@ -17,6 +17,7 @@ import { Store } from "@bobfrankston/mailx-store";
 import { SyncQueue } from "./sync-queue.js";
 import { Reconciler } from "./reconciler.js";
 import { spawnDbWorker, type SpawnedDbWorker } from "./db-worker-client.js";
+export { spawnSyncWorker, type SpawnedSyncWorker } from "./sync-worker-client.js";
 import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, loadKeys, saveKeys, ensureKeysSectionExists, getStorePath, getStorageInfo, getConfigDir, loadUserDict, saveUserDict } from "@bobfrankston/mailx-settings";
 import type { AccountConfig, Folder, AutocompleteRequest, AutocompleteResponse, AutocompleteSettings, AiTransformRequest, AiTransformResponse, ExtractedEvent, MailxApi } from "@bobfrankston/mailx-types";
 import { sanitizeHtml, encodeQuotedPrintable, htmlToPlainText } from "@bobfrankston/mailx-types";
@@ -2485,25 +2486,14 @@ export class MailxService implements MailxApi {
         const delimiter = parent?.delimiter || allFolders[0]?.delimiter || ".";
         const fullPath = parentPath ? `${parentPath}${delimiter}${name}` : name;
 
-        const client = await this.imapManager.createPublicClient(accountId);
-        try {
-            await client.createmailbox(fullPath);
-            // Local-first: insert the new folder into the DB immediately so
-            // the UI shows it on the next tree refresh.
-            this.db.upsertFolder(accountId, fullPath, name, null, delimiter);
-            this.imapManager.emit("folderCountsChanged", accountId, {});
-            // VERIFY the server actually created it, and AWAIT it. createmailbox
-            // on a wedged/congested connection has returned without error while
-            // the CREATE never reached the server — so the IPC reported success,
-            // the optimistic row got dropped by the next reconcile, and the
-            // folder silently never appeared (Bob 2026-06-12, Archive/dbgtrash).
-            // A folder create is infrequent; correctness beats the fast return.
-            await this.imapManager.syncFolders(accountId, client);
-            const created = this.db.getFolders(accountId).some(f => f.path === fullPath);
-            if (!created) {
-                throw new Error(`Folder "${name}" was not created on the server — please try again (the connection may have been busy).`);
-            }
-        } finally { try { await client.logout(); } catch { /* */ } }
+        // Server CREATE + local folder-row write + verify, all on the sync
+        // worker (the verify catches the wedged-connection "returned OK but
+        // never reached the server" case — Bob 2026-06-12 Archive/dbgtrash).
+        const created = await this.imapManager.createFolderViaServer(accountId, fullPath, name, delimiter);
+        this.imapManager.emit("folderCountsChanged", accountId, {});
+        if (!created) {
+            throw new Error(`Folder "${name}" was not created on the server — please try again (the connection may have been busy).`);
+        }
     }
 
     async renameFolder(accountId: string, folderId: number, newName: string): Promise<void> {
@@ -2512,47 +2502,16 @@ export class MailxService implements MailxApi {
         const parts = folder.path.split(folder.delimiter || ".");
         parts[parts.length - 1] = newName;
         const newPath = parts.join(folder.delimiter || ".");
-        const client = await this.imapManager.createPublicClient(accountId);
-        try {
-            if (client.renameMailbox) {
-                await client.renameMailbox(folder.path, newPath);
-            } else {
-                await (client as any).withConnection(async () => {
-                    await (client as any).client.mailboxRename(folder.path, newPath);
-                });
-            }
-            await this.imapManager.syncFolders(accountId, client);
-            await client.logout();
-        } finally { try { await client.logout(); } catch { /* */ } }
+        await this.imapManager.renameFolderViaServer(accountId, folder.path, newPath);
     }
 
     async deleteFolder(accountId: string, folderId: number): Promise<void> {
         const folder = this.db.getFolders(accountId).find(f => f.id === folderId);
         if (!folder) throw new Error("Folder not found");
-        const client = await this.imapManager.createPublicClient(accountId);
-        try {
-            try {
-                if (client.deleteMailbox) {
-                    await client.deleteMailbox(folder.path);
-                } else {
-                    await (client as any).withConnection(async () => {
-                        await (client as any).client.mailboxDelete(folder.path);
-                    });
-                }
-            } catch (e: any) {
-                // Server already doesn't have this folder — common case when
-                // the user deleted / renamed it from another client and mailx
-                // is still showing the stale local row. Silently treat as
-                // success and proceed with local cleanup; the user's intent
-                // ("make this go away") is met either way.
-                const msg = String(e?.message || e || "").toLowerCase();
-                const alreadyGone = /nonexistent|does not exist|no such|not found|NO \[.*\] Mailbox|404/i.test(msg);
-                if (!alreadyGone) throw e;
-                console.log(`  [folder] ${accountId} delete "${folder.path}": server says already gone — cleaning local DB`);
-            }
-            this.db.deleteFolder(folderId);
-            try { await client.logout(); } catch { /* ignore */ }
-        } finally { try { await client.logout(); } catch { /* */ } }
+        // Server delete (tolerant of already-gone) on the worker, then drop the
+        // local folder row here.
+        await this.imapManager.deleteFolderViaServer(accountId, folder.path);
+        this.db.deleteFolder(folderId);
     }
 
     /** Move a folder into the account's Trash. Default delete action; user
@@ -2600,73 +2559,10 @@ export class MailxService implements MailxApi {
         }
         if (!targetPath) throw new Error(`Too many "${baseName}" copies in Trash — empty Trash or use Delete permanently.`);
 
-        const client = await this.imapManager.createPublicClient(accountId);
-        try {
-            try {
-                if (client.renameMailbox) {
-                    await client.renameMailbox(folder.path, targetPath);
-                } else {
-                    await (client as any).withConnection(async () => {
-                        await (client as any).client.mailboxRename(folder.path, targetPath);
-                    });
-                }
-                console.log(`  [folder] ${accountId} moved "${folder.path}" → "${targetPath}"`);
-            } catch (e: any) {
-                // Some Dovecot / Cyrus setups mark Trash \Noinferiors. Fall
-                // back to messages-only move + folder delete. We do this
-                // recursively for any child folders so the user's intent
-                // ("get rid of this subtree") is met.
-                const msg = String(e?.message || e || "").toLowerCase();
-                const cantNest = /noinferiors|hierarchy|invalid (mailbox )?name|cannot rename|inferiors/i.test(msg);
-                if (!cantNest) throw e;
-                console.log(`  [folder] ${accountId} cannot RENAME under Trash (${msg.split("\n")[0]}); falling back to message-move`);
-                await this.spillFolderContentsToTrash(accountId, folder, trash, client);
-            }
-            await this.imapManager.syncFolders(accountId, client);
-            try { await client.logout(); } catch { /* */ }
-        } finally { try { await client.logout(); } catch { /* */ } }
-    }
-
-    /** Fallback for `moveFolderToTrash` when the server rejects nesting
-     *  under Trash. Moves every message in `folder` (and recursively in
-     *  its children) into Trash root, then deletes the empty folders. */
-    private async spillFolderContentsToTrash(
-        accountId: string,
-        folder: { id: number; path: string; delimiter?: string | null },
-        trash: { id: number; path: string },
-        client: any,
-    ): Promise<void> {
-        const delim = folder.delimiter || "/";
-        // Process children first so the parent ends up empty.
-        const childPrefix = folder.path + delim;
-        const allFolders = this.db.getFolders(accountId);
-        const children = allFolders.filter(f => f.path.startsWith(childPrefix));
-        for (const child of children) {
-            await this.spillFolderContentsToTrash(accountId, child as any, trash, client);
-        }
-        // Move messages to Trash root via the Store + queue. withBatch
-        // coalesces folder-count events into one re-render per topic.
-        const uids = await client.getUids(folder.path).catch(() => [] as number[]);
-        if (uids.length > 0) {
-            this.localStore.bus.withBatch(() => {
-                for (const uid of uids) {
-                    const result = this.localStore.trashMessage(accountId, uid, folder.id, trash.id);
-                    if (result === "moved-to-trash") this.syncQueue.enqueueMove(accountId, uid, folder.id, trash.id);
-                    else this.syncQueue.enqueueDelete(accountId, uid, folder.id, "delete");
-                }
-            });
-        }
-        // Folder should now be empty; delete it on the server.
-        try {
-            if (client.deleteMailbox) await client.deleteMailbox(folder.path);
-            else await client.withConnection(async () => {
-                await client.client.mailboxDelete(folder.path);
-            });
-        } catch (e: any) {
-            const m = String(e?.message || e || "").toLowerCase();
-            if (!/nonexistent|does not exist|no such/.test(m)) throw e;
-        }
-        this.db.deleteFolder(folder.id);
+        // RENAME-into-Trash (or message-spill fallback) + folder-row cleanup,
+        // all on the sync worker.
+        await this.imapManager.moveFolderToTrashViaServer(accountId, folder.id, folder.path, targetPath, trash.id, trash.path, delim);
+        this.imapManager.emit("folderCountsChanged", accountId, {});
     }
 
     markFolderRead(folderId: number): void {
@@ -2684,12 +2580,7 @@ export class MailxService implements MailxApi {
         try {
             (this.imapManager as any).emit?.("folderCountsChanged", accountId, {});
         } catch { /* non-fatal */ }
-        const client = await this.imapManager.createPublicClient(accountId);
-        try {
-            const uids = await client.getUids(folder.path);
-            for (const uid of uids) await client.deleteMessageByUid(folder.path, uid);
-            await client.logout();
-        } finally { try { await client.logout(); } catch { /* */ } }
+        await this.imapManager.emptyFolderViaServer(accountId, folder.path);
     }
 
     // ── Attachments ──

package/packages/mailx-service/package.json

@@ -13,6 +13,7 @@
     "@bobfrankston/mailx-imap": "file:../mailx-imap",
     "@bobfrankston/mailx-settings": "file:../mailx-settings",
     "@bobfrankston/mailx-store": "file:../mailx-store",
+    "@bobfrankston/node-tcp-transport": "file:../../../../MailApps/node-tcp-transport",
     "@bobfrankston/mailx-types": "file:../mailx-types",
     "html-to-docx": "^1.8.0",
     "mailparser": "^3.7.2",

package/packages/mailx-service/sync-worker-client.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Main-thread client for the sync factor worker.
+ *
+ * Spawns `sync-worker.js`, performs the init handshake, and returns a
+ * `SyncProxy` that is a DROP-IN for `ImapManager` from the main thread's point
+ * of view: it's an EventEmitter (so `bin`'s `.on(...)` forwarders and the
+ * service's `.emit(...)` keep working locally), and any *other* method call is
+ * forwarded to the worker over the bus as `{method, args}` and returns the
+ * worker's result as a Promise.
+ *
+ * Two method names are handled locally instead of being forwarded:
+ *   - the EventEmitter surface (on/once/off/emit/…) — local event routing.
+ *   - getBodyStore() — returns a local FileMessageStore (a path wrapper; the
+ *     bytes live on disk, so main can read them without crossing the bus).
+ *
+ * Worker → main events arrive on the bus topic `sync:event` and are re-emitted
+ * on the local EventEmitter, so a `syncProgress` raised inside the worker fires
+ * bin's listener exactly as before.
+ */
+import { Worker } from "node:worker_threads";
+import type { ImapManager } from "@bobfrankston/mailx-imap";
+export interface SpawnedSyncWorker {
+    /** Drop-in for ImapManager. Method calls return Promises (forwarded to the
+     *  worker); event methods are local. */
+    proxy: ImapManager;
+    worker: Worker;
+    close(): Promise<void>;
+}
+export declare function spawnSyncWorker(opts: {
+    configDir: string;
+    storePath: string;
+}): Promise<SpawnedSyncWorker>;
+//# sourceMappingURL=sync-worker-client.d.ts.map

package/packages/mailx-service/sync-worker-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-worker-client.d.ts","sourceRoot":"","sources":["sync-worker-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,WAAW,iBAAiB;IAC9B;4CACwC;IACxC,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAQD,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAiDhH"}

package/packages/mailx-service/sync-worker-client.js

@@ -0,0 +1,89 @@
+/**
+ * Main-thread client for the sync factor worker.
+ *
+ * Spawns `sync-worker.js`, performs the init handshake, and returns a
+ * `SyncProxy` that is a DROP-IN for `ImapManager` from the main thread's point
+ * of view: it's an EventEmitter (so `bin`'s `.on(...)` forwarders and the
+ * service's `.emit(...)` keep working locally), and any *other* method call is
+ * forwarded to the worker over the bus as `{method, args}` and returns the
+ * worker's result as a Promise.
+ *
+ * Two method names are handled locally instead of being forwarded:
+ *   - the EventEmitter surface (on/once/off/emit/…) — local event routing.
+ *   - getBodyStore() — returns a local FileMessageStore (a path wrapper; the
+ *     bytes live on disk, so main can read them without crossing the bus).
+ *
+ * Worker → main events arrive on the bus topic `sync:event` and are re-emitted
+ * on the local EventEmitter, so a `syncProgress` raised inside the worker fires
+ * bin's listener exactly as before.
+ */
+import { Worker } from "node:worker_threads";
+import { EventEmitter } from "node:events";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+import { WorkerBus } from "@bobfrankston/mailx-bus";
+import { FileMessageStore } from "@bobfrankston/mailx-store";
+const EMITTER_METHODS = new Set([
+    "on", "once", "off", "addListener", "removeListener", "removeAllListeners",
+    "emit", "listeners", "rawListeners", "listenerCount", "eventNames",
+    "prependListener", "prependOnceListener", "setMaxListeners", "getMaxListeners",
+]);
+export async function spawnSyncWorker(opts) {
+    const here = dirname(fileURLToPath(import.meta.url));
+    const workerPath = join(here, "sync-worker.js");
+    const worker = new Worker(workerPath);
+    worker.unref();
+    await new Promise((resolve, reject) => {
+        const onMessage = (msg) => {
+            if (!msg || typeof msg !== "object")
+                return;
+            if (msg.kind === "init-ok") {
+                worker.off("message", onMessage);
+                resolve();
+            }
+            else if (msg.kind === "init-error") {
+                worker.off("message", onMessage);
+                reject(new Error(`sync-worker init: ${msg.error}`));
+            }
+        };
+        worker.on("message", onMessage);
+        worker.on("error", (e) => { worker.off("message", onMessage); reject(e); });
+        worker.postMessage({ kind: "init", configDir: opts.configDir, storePath: opts.storePath });
+    });
+    const bus = new WorkerBus(worker);
+    const emitter = new EventEmitter();
+    emitter.setMaxListeners(0);
+    const localBodyStore = new FileMessageStore(opts.storePath);
+    // Worker events → local re-emit (drives bin's WebView forwarders).
+    bus.subscribe("sync:event", ({ event, args }) => {
+        try {
+            emitter.emit(event, ...(args || []));
+        }
+        catch (e) {
+            console.error(`  [sync-worker] event '${event}' handler threw: ${e?.message || e}`);
+        }
+    });
+    const proxy = new Proxy(emitter, {
+        get(target, prop) {
+            if (typeof prop === "string" && EMITTER_METHODS.has(prop)) {
+                const v = target[prop];
+                return typeof v === "function" ? v.bind(target) : v;
+            }
+            if (prop === "getBodyStore")
+                return () => localBodyStore;
+            if (prop === "then")
+                return undefined; // not a thenable
+            // Everything else is an ImapManager method → forward to the worker.
+            // structured-clone turns a returned Node Buffer into a plain
+            // Uint8Array; re-wrap so callers that test Buffer.isBuffer / hand
+            // the bytes to simpleParser (fetchMessageBody) still work.
+            return (...args) => bus.request("sync:call", { method: prop, args }).then((r) => (r instanceof Uint8Array && !Buffer.isBuffer(r)) ? Buffer.from(r.buffer, r.byteOffset, r.byteLength) : r);
+        },
+    });
+    return {
+        proxy,
+        worker,
+        async close() { await worker.terminate(); },
+    };
+}
+//# sourceMappingURL=sync-worker-client.js.map

package/packages/mailx-service/sync-worker-client.js.map

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

package/packages/mailx-service/sync-worker-client.ts

@@ -0,0 +1,92 @@
+/**
+ * Main-thread client for the sync factor worker.
+ *
+ * Spawns `sync-worker.js`, performs the init handshake, and returns a
+ * `SyncProxy` that is a DROP-IN for `ImapManager` from the main thread's point
+ * of view: it's an EventEmitter (so `bin`'s `.on(...)` forwarders and the
+ * service's `.emit(...)` keep working locally), and any *other* method call is
+ * forwarded to the worker over the bus as `{method, args}` and returns the
+ * worker's result as a Promise.
+ *
+ * Two method names are handled locally instead of being forwarded:
+ *   - the EventEmitter surface (on/once/off/emit/…) — local event routing.
+ *   - getBodyStore() — returns a local FileMessageStore (a path wrapper; the
+ *     bytes live on disk, so main can read them without crossing the bus).
+ *
+ * Worker → main events arrive on the bus topic `sync:event` and are re-emitted
+ * on the local EventEmitter, so a `syncProgress` raised inside the worker fires
+ * bin's listener exactly as before.
+ */
+
+import { Worker } from "node:worker_threads";
+import { EventEmitter } from "node:events";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+import { WorkerBus, type MessagePortLike } from "@bobfrankston/mailx-bus";
+import { FileMessageStore } from "@bobfrankston/mailx-store";
+import type { ImapManager } from "@bobfrankston/mailx-imap";
+
+export interface SpawnedSyncWorker {
+    /** Drop-in for ImapManager. Method calls return Promises (forwarded to the
+     *  worker); event methods are local. */
+    proxy: ImapManager;
+    worker: Worker;
+    close(): Promise<void>;
+}
+
+const EMITTER_METHODS = new Set([
+    "on", "once", "off", "addListener", "removeListener", "removeAllListeners",
+    "emit", "listeners", "rawListeners", "listenerCount", "eventNames",
+    "prependListener", "prependOnceListener", "setMaxListeners", "getMaxListeners",
+]);
+
+export async function spawnSyncWorker(opts: { configDir: string; storePath: string }): Promise<SpawnedSyncWorker> {
+    const here = dirname(fileURLToPath(import.meta.url));
+    const workerPath = join(here, "sync-worker.js");
+    const worker = new Worker(workerPath);
+    worker.unref();
+
+    await new Promise<void>((resolve, reject) => {
+        const onMessage = (msg: any): void => {
+            if (!msg || typeof msg !== "object") return;
+            if (msg.kind === "init-ok") { worker.off("message", onMessage); resolve(); }
+            else if (msg.kind === "init-error") { worker.off("message", onMessage); reject(new Error(`sync-worker init: ${msg.error}`)); }
+        };
+        worker.on("message", onMessage);
+        worker.on("error", (e: Error) => { worker.off("message", onMessage); reject(e); });
+        worker.postMessage({ kind: "init", configDir: opts.configDir, storePath: opts.storePath });
+    });
+
+    const bus = new WorkerBus(worker as unknown as MessagePortLike);
+    const emitter = new EventEmitter();
+    emitter.setMaxListeners(0);
+    const localBodyStore = new FileMessageStore(opts.storePath);
+
+    // Worker events → local re-emit (drives bin's WebView forwarders).
+    bus.subscribe<{ event: string; args: any[] }>("sync:event", ({ event, args }) => {
+        try { emitter.emit(event, ...(args || [])); } catch (e: any) { console.error(`  [sync-worker] event '${event}' handler threw: ${e?.message || e}`); }
+    });
+
+    const proxy = new Proxy(emitter, {
+        get(target, prop: string) {
+            if (typeof prop === "string" && EMITTER_METHODS.has(prop)) {
+                const v = (target as any)[prop];
+                return typeof v === "function" ? v.bind(target) : v;
+            }
+            if (prop === "getBodyStore") return () => localBodyStore;
+            if (prop === "then") return undefined; // not a thenable
+            // Everything else is an ImapManager method → forward to the worker.
+            // structured-clone turns a returned Node Buffer into a plain
+            // Uint8Array; re-wrap so callers that test Buffer.isBuffer / hand
+            // the bytes to simpleParser (fetchMessageBody) still work.
+            return (...args: any[]) => bus.request("sync:call", { method: prop, args }).then((r: any) =>
+                (r instanceof Uint8Array && !Buffer.isBuffer(r)) ? Buffer.from(r.buffer, r.byteOffset, r.byteLength) : r);
+        },
+    }) as unknown as ImapManager;
+
+    return {
+        proxy,
+        worker,
+        async close(): Promise<void> { await worker.terminate(); },
+    };
+}

package/packages/mailx-service/sync-worker.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Sync factor — Node worker thread.
+ *
+ * Hosts the entire network/sync backend (`ImapManager`: IMAP + Gmail sync,
+ * body prefetch, the outbox SMTP/IMAP-append drain, IDLE) on its OWN thread,
+ * with its OWN write connection to the SQLite file. The main thread keeps the
+ * IPC pump and fast local reads (read-worker); it drives this worker through
+ * a proxy (`sync-worker-client.ts`) and receives ImapManager's events back
+ * over the bus.
+ *
+ * **Why.** Until now sync ran on the main event loop. A hung Dovecot FETCH, a
+ * 30 MB body pull, a dead-network reconnect storm, a 5-minute outbox hang —
+ * any of them froze the main loop, which starved the IPC relay, so clicks and
+ * the message list timed out even though the read-worker had the answer ready.
+ * On its own thread, sync can stall or thrash forever and the UI never feels
+ * it (Bob 2026-06-13: "shouldn't it be a worker for any such operation").
+ *
+ * **DB.** Opens with `{skipMigrations:true}` — main built the schema before we
+ * spawned. WAL + busy_timeout let this writer and the main thread's
+ * local-first writer coexist; the read-worker reads concurrently.
+ *
+ * **RPC.** One generic handler: the proxy sends `{method, args}` and we invoke
+ * `imapManager[method](...args)`. Return values must be structured-clone-safe
+ * (they are — JSON-ish status objects, tokens, bodies-as-strings). Methods
+ * that hand back live objects (createPublicClient) are NOT called this way;
+ * the service uses dedicated server-side folder-op methods instead.
+ *
+ * **Events.** We wrap `imapManager.emit` to also `bus.publish("sync:event")`,
+ * so every event ImapManager/Reconciler raise on this thread reaches the main
+ * proxy, which re-emits them locally for bin's WebView forwarders.
+ */
+export {};
+//# sourceMappingURL=sync-worker.d.ts.map

package/packages/mailx-service/sync-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-worker.d.ts","sourceRoot":"","sources":["sync-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG"}

package/packages/mailx-service/sync-worker.js

@@ -0,0 +1,92 @@
+/**
+ * Sync factor — Node worker thread.
+ *
+ * Hosts the entire network/sync backend (`ImapManager`: IMAP + Gmail sync,
+ * body prefetch, the outbox SMTP/IMAP-append drain, IDLE) on its OWN thread,
+ * with its OWN write connection to the SQLite file. The main thread keeps the
+ * IPC pump and fast local reads (read-worker); it drives this worker through
+ * a proxy (`sync-worker-client.ts`) and receives ImapManager's events back
+ * over the bus.
+ *
+ * **Why.** Until now sync ran on the main event loop. A hung Dovecot FETCH, a
+ * 30 MB body pull, a dead-network reconnect storm, a 5-minute outbox hang —
+ * any of them froze the main loop, which starved the IPC relay, so clicks and
+ * the message list timed out even though the read-worker had the answer ready.
+ * On its own thread, sync can stall or thrash forever and the UI never feels
+ * it (Bob 2026-06-13: "shouldn't it be a worker for any such operation").
+ *
+ * **DB.** Opens with `{skipMigrations:true}` — main built the schema before we
+ * spawned. WAL + busy_timeout let this writer and the main thread's
+ * local-first writer coexist; the read-worker reads concurrently.
+ *
+ * **RPC.** One generic handler: the proxy sends `{method, args}` and we invoke
+ * `imapManager[method](...args)`. Return values must be structured-clone-safe
+ * (they are — JSON-ish status objects, tokens, bodies-as-strings). Methods
+ * that hand back live objects (createPublicClient) are NOT called this way;
+ * the service uses dedicated server-side folder-op methods instead.
+ *
+ * **Events.** We wrap `imapManager.emit` to also `bus.publish("sync:event")`,
+ * so every event ImapManager/Reconciler raise on this thread reaches the main
+ * proxy, which re-emits them locally for bin's WebView forwarders.
+ */
+import { parentPort } from "node:worker_threads";
+import { WorkerBus } from "@bobfrankston/mailx-bus";
+import { MailxDB, FileMessageStore, Store } from "@bobfrankston/mailx-store";
+import { ImapManager } from "@bobfrankston/mailx-imap";
+import { NodeTcpTransport } from "@bobfrankston/node-tcp-transport";
+if (!parentPort) {
+    throw new Error("sync-worker: must be spawned as a worker, parentPort is null");
+}
+let imapManager = null;
+let initialized = false;
+parentPort.once("message", async (msg) => {
+    if (msg?.kind !== "init") {
+        parentPort.postMessage({ kind: "init-error", error: `expected "init", got ${JSON.stringify(msg)}` });
+        return;
+    }
+    try {
+        const db = new MailxDB(msg.configDir, { skipMigrations: true });
+        const store = new Store(db, new FileMessageStore(msg.storePath));
+        imapManager = new ImapManager(store, () => new NodeTcpTransport());
+        registerHandlers(imapManager);
+        initialized = true;
+        parentPort.postMessage({ kind: "init-ok" });
+    }
+    catch (e) {
+        parentPort.postMessage({ kind: "init-error", error: e?.message || String(e) });
+    }
+});
+function registerHandlers(mgr) {
+    const bus = new WorkerBus(parentPort);
+    // Forward every ImapManager/Reconciler event to the main proxy. Wrap emit
+    // so we don't have to enumerate the event list (it drifts); the proxy
+    // re-emits locally and bin's forwarders push to the WebView.
+    const origEmit = mgr.emit.bind(mgr);
+    mgr.emit = (event, ...args) => {
+        try {
+            bus.publish("sync:event", { event, args });
+        }
+        catch { /* bus down — local listeners still fire */ }
+        return origEmit(event, ...args);
+    };
+    // Generic method dispatch. Anything the main thread used to call on
+    // `imapManager` now arrives here.
+    bus.register("sync:call", async ({ method, args }) => {
+        const fn = mgr[method];
+        if (typeof fn !== "function") {
+            throw new Error(`sync-worker: ImapManager has no method '${method}'`);
+        }
+        return await fn.apply(mgr, args || []);
+    });
+}
+// Pre-init guard: a request that races construction gets a clear error, not a hang.
+parentPort.on("message", (msg) => {
+    if (!initialized && msg && typeof msg === "object" && msg.kind === "request") {
+        parentPort.postMessage({
+            kind: "reply",
+            id: msg.id,
+            error: "sync-worker: not initialized — send {kind:'init'} first",
+        });
+    }
+});
+//# sourceMappingURL=sync-worker.js.map

package/packages/mailx-service/sync-worker.js.map

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