@bobfrankston/mailx 1.0.164 → 1.0.166

package/bin/mailx.js

@@ -645,7 +645,8 @@ async function main() {
         }
     }
     const db = new MailxDB(getConfigDir());
-    const imapManager = new ImapManager(db);
+    const { NodeTransport } = await import("@bobfrankston/iflow-node");
+    const imapManager = new ImapManager(db, () => new NodeTransport());
     // Native client is the only option (iflow-direct)
     const svc = new MailxService(db, imapManager);
     // Open msger in service mode — custom protocol serves files from client dir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.164",
+  "version": "1.0.166",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.0",
-    "@bobfrankston/iflow-node": "^0.1.0",
+    "@bobfrankston/iflow-direct": "^0.1.2",
+    "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.214",
+    "@bobfrankston/msger": "^0.1.216",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -9,7 +9,7 @@ import type { ComposeMessage } from "@bobfrankston/mailx-types";
 declare let db: MailxDB;
 declare let imapManager: ImapManager;
 export declare function onEvent(handler: (event: any) => void): void;
-export declare function initialize(): Promise<void>;
+export declare function initialize(transportFactory?: any): Promise<void>;
 export declare function shutdown(): Promise<void>;
 export declare function getAccounts(): {
     id: string;

package/packages/mailx-core/index.js

@@ -22,11 +22,11 @@ function emit(event) {
         catch { /* ignore handler errors */ }
     }
 }
-export async function initialize() {
+export async function initialize(transportFactory) {
     initLocalConfig();
     const dbDir = getConfigDir();
     db = new MailxDB(dbDir);
-    imapManager = new ImapManager(db);
+    imapManager = new ImapManager(db, transportFactory || (() => { throw new Error("No transport factory provided"); }));
     // Seed contacts
     const seeded = db.seedContactsFromMessages();
     if (seeded > 0)

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

@@ -3,6 +3,7 @@
  * Multi-account IMAP management wrapping iflow.
  * Syncs messages to local store, emits events for new mail.
  */
+import { type TransportFactory } from "@bobfrankston/iflow-direct";
 import { MailxDB, FileMessageStore } from "@bobfrankston/mailx-store";
 import type { AccountConfig, MessageEnvelope, Folder } from "@bobfrankston/mailx-types";
 import { EventEmitter } from "node:events";
@@ -33,7 +34,8 @@ export declare class ImapManager extends EventEmitter {
     useNativeClient: boolean;
     /** Accounts hitting connection limits — back off until this time */
     private connectionBackoff;
-    constructor(db: MailxDB);
+    private transportFactory;
+    constructor(db: MailxDB, 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/packages/mailx-imap/index.js

@@ -4,7 +4,7 @@
  * Syncs messages to local store, emits events for new mail.
  */
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
-import { NodeTransport } from "@bobfrankston/iflow-node";
+import { authenticateOAuth } from "@bobfrankston/oauthsupport";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
 import { loadSettings, getStorePath, getConfigDir, getHistoryDays } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
@@ -108,9 +108,11 @@ export class ImapManager extends EventEmitter {
     /** Accounts hitting connection limits — back off until this time */
     connectionBackoff = new Map();
     // Connection management: see withConnection() below — no semaphore needed
-    constructor(db) {
+    transportFactory;
+    constructor(db, transportFactory) {
         super();
         this.db = db;
+        this.transportFactory = transportFactory;
         const storePath = getStorePath();
         this.bodyStore = new FileMessageStore(storePath);
     }
@@ -281,7 +283,7 @@ export class ImapManager extends EventEmitter {
         const config = this.configs.get(accountId);
         if (!config)
             throw new Error(`No config for account ${accountId}`);
-        return new CompatImapClient(config, () => new NodeTransport({ rejectUnauthorized: config.rejectUnauthorized !== false }));
+        return new CompatImapClient(config, this.transportFactory);
     }
     /** Disconnect the persistent operational connection for an account */
     async disconnectOps(accountId) {
@@ -313,13 +315,26 @@ export class ImapManager extends EventEmitter {
         if (this.configs.has(account.id))
             return;
         // createAutoImapConfig auto-detects Gmail from server/username and sets up OAuth
-        // Token directory in ~/.mailx/ so tokens persist across npm reinstalls
+        // For OAuth accounts, provide a tokenProvider using oauthsupport
+        let tokenProvider;
+        if (account.imap.auth === "oauth2" || (!account.imap.password && account.imap.host?.includes("gmail"))) {
+            const credPath = path.join(getConfigDir(), "google-credentials.json");
+            const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
+            tokenProvider = async () => {
+                const result = await authenticateOAuth(credPath, {
+                    scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly",
+                    tokenDirectory: tokenDir,
+                    loginHint: account.imap.user,
+                });
+                return result?.access_token || "";
+            };
+        }
         const config = createAutoImapConfig({
             server: account.imap.host,
             port: account.imap.port,
             username: account.imap.user,
             password: account.imap.password,
-            // tokenDirectory is handled by oauthsupport, not iflow-direct
+            tokenProvider,
         });
         this.configs.set(account.id, config);
         // Register account in DB
@@ -387,6 +402,11 @@ export class ImapManager extends EventEmitter {
         this.db.beginTransaction();
         try {
             for (const msg of msgs) {
+                // Debug: log subjects with non-ASCII to trace encoding issues
+                if (msg.subject && /[^\x00-\x7F]/.test(msg.subject)) {
+                    const hex = Buffer.from(msg.subject, "utf-8").subarray(0, 40).toString("hex");
+                    console.log(`  [encoding] subject: "${msg.subject.substring(0, 60)}" hex: ${hex}`);
+                }
                 if (msg.uid <= highestUid)
                     continue; // already have it
                 const source = msg.source || "";
@@ -499,7 +519,8 @@ export class ImapManager extends EventEmitter {
                     this.emit("folderCountsChanged", accountId, {});
                 }
             };
-            messages = await client.fetchMessageByDate(folder.path, startDate, new Date(), { source: false }, onChunk);
+            const tomorrow = new Date(Date.now() + 86400000); // IMAP BEFORE is exclusive
+            messages = await client.fetchMessageByDate(folder.path, startDate, tomorrow, { source: false }, onChunk);
             if (totalStored > 0) {
                 console.log(`  ${folder.path}: ${totalStored} messages (streamed)`);
                 this.db.recalcFolderCounts(folderId);

package/packages/mailx-server/index.js

@@ -61,15 +61,8 @@ if (settings.accounts.length === 0) {
 }
 const dbDir = getConfigDir();
 const db = new MailxDB(dbDir);
-const imapManager = new ImapManager(db);
-// Native IMAP client is default. Use --legacy-imap to fall back to imapflow.
-if (process.argv.includes("--legacy-imap") || process.argv.includes("-legacy-imap") || process.env.MAILX_LEGACY_IMAP) {
-    console.log("  Using legacy IMAP client (imapflow)");
-}
-else {
-    imapManager.useNativeClient = true;
-    console.log("  Using native IMAP client (transport-agnostic)");
-}
+import { NodeTransport } from "@bobfrankston/iflow-node";
+const imapManager = new ImapManager(db, () => new NodeTransport());
 // ── Express App ──
 const app = express();
 app.use(express.json({ limit: "Infinity" }));