@bobfrankston/mailx 1.0.163 → 1.0.165

package/bin/mailx.js

@@ -231,7 +231,7 @@ if (hasFlag("v") || hasFlag("version")) {
         console.log("mailx (version unknown)");
     }
     console.log(`  node      ${process.version}`);
-    console.log(`  iflow     ${ver("@bobfrankston/iflow")}`);
+    console.log(`  iflow-direct  ${ver("@bobfrankston/iflow-direct")}`);
     console.log(`  miscinfo  ${ver("@bobfrankston/miscinfo")}`);
     console.log(`  oauth     ${ver("@bobfrankston/oauthsupport")}`);
     console.log(`  store     ${ver("@bobfrankston/mailx-store")}`);
@@ -500,14 +500,15 @@ async function runTest() {
         console.log(`Testing ${account.label || account.id} (${account.email}):`);
         // Test IMAP
         try {
-            const { ImapClient, createAutoImapConfig } = await import("@bobfrankston/iflow");
+            const { createAutoImapConfig, CompatImapClient } = await import("@bobfrankston/iflow-direct");
+            const { NodeTransport } = await import("@bobfrankston/iflow-node");
             const config = createAutoImapConfig({
                 server: account.imap.host,
                 port: account.imap.port,
                 username: account.imap.user,
                 password: account.imap.password
             });
-            const client = new ImapClient(config);
+            const client = new CompatImapClient(config, () => new NodeTransport());
             const folders = await client.getFolderList();
             await client.logout();
             console.log(`  IMAP: OK (${folders.length} folders)`);
@@ -524,7 +525,7 @@ async function runTest() {
             }
             else if (account.smtp.auth === "oauth2") {
                 // Try to get OAuth token
-                const { createAutoImapConfig } = await import("@bobfrankston/iflow");
+                const { createAutoImapConfig } = await import("@bobfrankston/iflow-direct");
                 const config = createAutoImapConfig({
                     server: account.imap.host,
                     port: account.imap.port,
@@ -599,11 +600,10 @@ async function main() {
     if (setupMode || !hasConfig()) {
         if (!setupMode)
             console.log("No mailx configuration found.");
-        // --email (or -mail) flag skips the interactive prompt
-        const emailArg = args.find(a => a.startsWith("--email="))?.split("=")[1]
-            || args.find(a => a.startsWith("-mail="))?.split("=")[1]
-            || (hasFlag("email") ? args[args.indexOf("--email") + 1] || args[args.indexOf("-email") + 1] : undefined)
-            || (hasFlag("mail") ? args[args.indexOf("--mail") + 1] || args[args.indexOf("-mail") + 1] : undefined);
+        // -email or -mail flag skips the interactive prompt
+        const emailFlag = args.findIndex(a => a === "-email" || a === "--email" || a === "-mail" || a === "--mail");
+        const emailArg = args.find(a => a.startsWith("-email=") || a.startsWith("--email=") || a.startsWith("-mail=") || a.startsWith("--mail="))?.split("=")[1]
+            || (emailFlag >= 0 ? args[emailFlag + 1] : undefined);
         await runSetup(emailArg);
     }
     // Redirect console to log file — keep terminal clean
@@ -645,8 +645,9 @@ async function main() {
         }
     }
     const db = new MailxDB(getConfigDir());
-    const imapManager = new ImapManager(db);
-    imapManager.useNativeClient = true;
+    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
     const clientDir = path.join(import.meta.dirname, "..", "client");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.163",
+  "version": "1.0.165",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,10 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.56",
+    "@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.213",
+    "@bobfrankston/msger": "^0.1.215",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -54,7 +55,8 @@
     "url": "https://github.com/BobFrankston/mailx.git"
   },
   ".dependencies": {
-    "@bobfrankston/iflow": "file:../MailApps/iflow",
+    "@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",

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,7 +3,7 @@
  * Multi-account IMAP management wrapping iflow.
  * Syncs messages to local store, emits events for new mail.
  */
-import { ImapClient } from "@bobfrankston/iflow";
+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";
@@ -34,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 */
@@ -73,11 +74,11 @@ export declare class ImapManager extends EventEmitter {
     /** Register an account */
     addAccount(account: AccountConfig): Promise<void>;
     /** Sync folder list for an account */
-    syncFolders(accountId: string, client?: ImapClient): Promise<Folder[]>;
+    syncFolders(accountId: string, client?: any): Promise<Folder[]>;
     /** Store a batch of messages to DB immediately — used by onChunk for incremental sync */
     private storeMessages;
     /** Sync messages for a specific folder */
-    syncFolder(accountId: string, folderId: number, client?: ImapClient): Promise<number>;
+    syncFolder(accountId: string, folderId: number, client?: any): Promise<number>;
     /** Sync all folders for all accounts */
     syncAll(): Promise<void>;
     private _syncAll;

package/packages/mailx-imap/index.js

@@ -3,7 +3,7 @@
  * Multi-account IMAP management wrapping iflow.
  * Syncs messages to local store, emits events for new mail.
  */
-import { ImapClient, createAutoImapConfig, CompatImapClient, NodeTransport } from "@bobfrankston/iflow";
+import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
 import { loadSettings, getStorePath, getConfigDir, getHistoryDays } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
@@ -107,9 +107,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);
     }
@@ -280,10 +282,7 @@ export class ImapManager extends EventEmitter {
         const config = this.configs.get(accountId);
         if (!config)
             throw new Error(`No config for account ${accountId}`);
-        if (this.useNativeClient) {
-            return new CompatImapClient(config, () => new NodeTransport({ rejectUnauthorized: config.rejectUnauthorized !== false }));
-        }
-        return new ImapClient(config);
+        return new CompatImapClient(config, this.transportFactory);
     }
     /** Disconnect the persistent operational connection for an account */
     async disconnectOps(accountId) {
@@ -321,7 +320,7 @@ export class ImapManager extends EventEmitter {
             port: account.imap.port,
             username: account.imap.user,
             password: account.imap.password,
-            tokenDirectory: getConfigDir()
+            // tokenDirectory is handled by oauthsupport, not iflow-direct
         });
         this.configs.set(account.id, config);
         // Register account in DB
@@ -447,7 +446,7 @@ export class ImapManager extends EventEmitter {
             // Incremental: fetch new messages — metadata only for speed, bodies on demand
             const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: false });
             // Filter out the last known message (IMAP * always returns at least one)
-            messages = fetched.filter(m => m.uid > highestUid);
+            messages = fetched.filter((m) => m.uid > highestUid);
             // Gap detection: check for missing UIDs within the range we've already synced
             // Only reconcile between our lowest and highest UID — don't try to fetch the entire folder history
             const existingUids = this.db.getUidsForFolder(accountId, folderId);
@@ -483,7 +482,7 @@ export class ImapManager extends EventEmitter {
             if (oldestDate > 0 && startDate.getTime() < oldestDate) {
                 const existingUids = new Set(this.db.getUidsForFolder(accountId, folderId));
                 const backfill = await client.fetchMessageByDate(folder.path, startDate, new Date(oldestDate), { source: false });
-                const newBackfill = backfill.filter(m => !existingUids.has(m.uid));
+                const newBackfill = backfill.filter((m) => !existingUids.has(m.uid));
                 if (newBackfill.length > 0) {
                     console.log(`  ${folder.path}: backfilling ${newBackfill.length} older messages`);
                     messages.push(...newBackfill);

package/packages/mailx-imap/package.json

@@ -12,7 +12,7 @@
     "@bobfrankston/mailx-types": "file:../mailx-types",
     "@bobfrankston/mailx-settings": "file:../mailx-settings",
     "@bobfrankston/mailx-store": "file:../mailx-store",
-    "@bobfrankston/iflow": "file:../../../MailApps/iflow",
+    "@bobfrankston/iflow-direct": "file:../../../MailApps/iflow-direct",
     "@bobfrankston/oauthsupport": "file:../../../../projects/oauth/oauthsupport",
     "nodemailer": "^7.0.0"
   },

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" }));

package/packages/mailx-settings/cloud.js

@@ -30,10 +30,12 @@ function findGoogleCredentials() {
     try {
         let dir = import.meta.dirname;
         for (let i = 0; i < 5; i++) {
-            for (const name of ["iflow-credentials.json", "credentials.json"]) {
-                const p = path.join(dir, "node_modules", "@bobfrankston", "iflow", name);
-                if (fs.existsSync(p))
-                    return p;
+            for (const pkg of ["iflow-direct", "iflow"]) {
+                for (const name of ["iflow-credentials.json", "credentials.json"]) {
+                    const p = path.join(dir, "node_modules", "@bobfrankston", pkg, name);
+                    if (fs.existsSync(p))
+                        return p;
+                }
             }
             const parent = path.dirname(dir);
             if (parent === dir)