@bobfrankston/mailx-imap 0.1.45 → 0.1.47

package/index.d.ts

@@ -4,7 +4,7 @@
  * Syncs messages to local store, emits events for new mail.
  */
 import type { TransportFactory } from "@bobfrankston/tcp-transport";
-import { MailxDB, FileMessageStore } from "@bobfrankston/mailx-store";
+import { FileMessageStore, Store } from "@bobfrankston/mailx-store";
 import type { AccountConfig, MessageEnvelope, Folder } from "@bobfrankston/mailx-types";
 import { EventEmitter } from "node:events";
 /** Events emitted by the IMAP manager */
@@ -60,8 +60,17 @@ export declare class ImapManager extends EventEmitter {
     private configs;
     private watchers;
     private fetchClients;
-    private db;
-    private bodyStore;
+    /** The Store is the architectural nexus — owner of MailxDB +
+     *  FileMessageStore + the event bus. This package (mailx-imap) is a
+     *  *consumer* of the Store. `this.db` and `this.bodyStore` are getters
+     *  onto Store-owned objects, kept as fields here for source-diff
+     *  compatibility during the inversion (so the ~120 existing
+     *  `this.db.X(...)` callsites don't all need touching at once). Future:
+     *  every mutation moves to `this.store.X(...)` with bus-emit baked in;
+     *  these fields shrink to read-only convenience refs. */
+    private store;
+    private get db();
+    private get bodyStore();
     private syncIntervals;
     /** Track which accounts have already shown an error banner — only emit once per session */
     private accountErrorShown;
@@ -88,7 +97,7 @@ export declare class ImapManager extends EventEmitter {
     /** Public read for the IPC surface: snapshot of all account diagnostics. */
     getDiagnosticsSnapshot(): AccountDiagnostics[];
     private transportFactory;
-    constructor(db: MailxDB, transportFactory: TransportFactory);
+    constructor(store: Store, transportFactory: TransportFactory);
     /** Get OAuth access token for an account (for SMTP auth) */
     getOAuthToken(accountId: string): Promise<string | null>;
     /** Accounts currently re-authenticating — all operations skip these */

package/index.js

@@ -5,8 +5,8 @@
  */
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
-import { FileMessageStore, parseSerial, storeBus } from "@bobfrankston/mailx-store";
-import { loadSettings, getStorePath, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
+import { parseSerial, storeBus } from "@bobfrankston/mailx-store";
+import { loadSettings, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -135,8 +135,17 @@ export class ImapManager extends EventEmitter {
     configs = new Map();
     watchers = new Map();
     fetchClients = new Map();
-    db;
-    bodyStore;
+    /** The Store is the architectural nexus — owner of MailxDB +
+     *  FileMessageStore + the event bus. This package (mailx-imap) is a
+     *  *consumer* of the Store. `this.db` and `this.bodyStore` are getters
+     *  onto Store-owned objects, kept as fields here for source-diff
+     *  compatibility during the inversion (so the ~120 existing
+     *  `this.db.X(...)` callsites don't all need touching at once). Future:
+     *  every mutation moves to `this.store.X(...)` with bus-emit baked in;
+     *  these fields shrink to read-only convenience refs. */
+    store;
+    get db() { return this.store.db; }
+    get bodyStore() { return this.store.bodyStore; }
     syncIntervals = new Map();
     /** Track which accounts have already shown an error banner — only emit once per session */
     accountErrorShown = new Set();
@@ -197,12 +206,11 @@ export class ImapManager extends EventEmitter {
         return Array.from(this.diagnostics.values()).map(d => ({ ...d }));
     }
     transportFactory;
-    constructor(db, transportFactory) {
+    constructor(store, transportFactory) {
         super();
-        this.db = db;
+        this.store = store;
         this.transportFactory = transportFactory;
-        const storePath = getStorePath();
-        this.bodyStore = new FileMessageStore(storePath);
+        // bodyStore is now owned by Store; getter above forwards to it.
         // Cancel pending deferred-delete when move-detect rebinds a row.
         // Without this, the source folder's reconcile-delete grace timer
         // would fire 30 minutes after detection for a row that's already
@@ -1205,10 +1213,18 @@ export class ImapManager extends EventEmitter {
                     // emits them only via state-change FETCH if their flags
                     // changed since modSeq, which is unreliable. Pull them
                     // explicitly via the existing incremental path.
+                    // INSTRUMENTATION (2026-05-15): phase timestamps so the
+                    // log pinpoints which operation eats wall-clock during a
+                    // slow sync. The 27 s INBOX block had a silent log hole;
+                    // these markers fill it.
+                    const __t1 = Date.now();
                     const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: false });
+                    console.log(`  [qr-phase] ${folder.path}: fetchMessagesSinceUid → ${fetched.length} msgs in ${Date.now() - __t1}ms`);
                     const newOnes = fetched.filter((m) => m.uid > highestUid);
                     if (newOnes.length > 0) {
+                        const __t2 = Date.now();
                         await this.storeMessages(accountId, folderId, folder, newOnes, highestUid);
+                        console.log(`  [qr-phase] ${folder.path}: storeMessages(${newOnes.length}) in ${Date.now() - __t2}ms`);
                     }
                     // Persist new watermark — next resync starts here.
                     if (qr.newHighestModSeq !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,13 +9,13 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.13",
-    "@bobfrankston/mailx-settings": "^0.1.16",
-    "@bobfrankston/mailx-store": "^0.1.24",
-    "@bobfrankston/iflow-direct": "^0.1.44",
+    "@bobfrankston/mailx-types": "^0.1.14",
+    "@bobfrankston/mailx-settings": "^0.1.17",
+    "@bobfrankston/mailx-store": "^0.1.26",
+    "@bobfrankston/iflow-direct": "^0.1.46",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.8",
-    "@bobfrankston/mailx-sync": "^0.1.16",
+    "@bobfrankston/mailx-sync": "^0.1.17",
     "@bobfrankston/oauthsupport": "^1.0.26"
   },
   "repository": {
@@ -37,13 +37,13 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.13",
-      "@bobfrankston/mailx-settings": "^0.1.16",
-      "@bobfrankston/mailx-store": "^0.1.24",
-      "@bobfrankston/iflow-direct": "^0.1.44",
+      "@bobfrankston/mailx-types": "^0.1.14",
+      "@bobfrankston/mailx-settings": "^0.1.17",
+      "@bobfrankston/mailx-store": "^0.1.26",
+      "@bobfrankston/iflow-direct": "^0.1.46",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.8",
-      "@bobfrankston/mailx-sync": "^0.1.16",
+      "@bobfrankston/mailx-sync": "^0.1.17",
       "@bobfrankston/oauthsupport": "^1.0.26"
     }
   }