@bobfrankston/mailx 1.0.162 → 1.0.164

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
@@ -646,7 +646,7 @@ async function main() {
     }
     const db = new MailxDB(getConfigDir());
     const imapManager = new ImapManager(db);
-    imapManager.useNativeClient = true;
+    // 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.162",
+  "version": "1.0.164",
   "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.55",
+    "@bobfrankston/iflow-direct": "^0.1.0",
+    "@bobfrankston/iflow-node": "^0.1.0",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.212",
+    "@bobfrankston/msger": "^0.1.214",
     "@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-imap/index.d.ts

@@ -3,7 +3,6 @@
  * Multi-account IMAP management wrapping iflow.
  * Syncs messages to local store, emits events for new mail.
  */
-import { ImapClient } from "@bobfrankston/iflow";
 import { MailxDB, FileMessageStore } from "@bobfrankston/mailx-store";
 import type { AccountConfig, MessageEnvelope, Folder } from "@bobfrankston/mailx-types";
 import { EventEmitter } from "node:events";
@@ -73,11 +72,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,8 @@
  * 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 { NodeTransport } from "@bobfrankston/iflow-node";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
 import { loadSettings, getStorePath, getConfigDir, getHistoryDays } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
@@ -280,10 +281,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, () => new NodeTransport({ rejectUnauthorized: config.rejectUnauthorized !== false }));
     }
     /** Disconnect the persistent operational connection for an account */
     async disconnectOps(accountId) {
@@ -321,7 +319,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 +445,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 +481,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-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)

package/tsconfig.base.json

@@ -21,6 +21,7 @@
   "exclude": [
     "node_modules",
     "cruft",
+    "dev",
     ".git",
     "tests",
     "prev"

package/again.cmd

@@ -1,3 +0,0 @@
-call rebuild
-ager.ts
-mailx -email BobFrankston@Gmail.com

package/bin/ager.js

@@ -1,57 +0,0 @@
-/**
- * ager — archive .mailx to c:\temp\.mailx## and preserve OAuth tokens
- *
- * Moves ~/.mailx to c:\temp\.mailx01 (or next available number),
- * then copies the tokens directory back so OAuth doesn't need re-consent.
- *
- * Usage: node ager.js
- */
-import fs from "node:fs";
-import path from "node:path";
-const home = process.env.USERPROFILE || process.env.HOME || ".";
-const source = path.join(home, ".mailx");
-const tempDir = "C:\\temp";
-if (!fs.existsSync(source)) {
-    console.error(`No .mailx directory at ${source}`);
-    process.exit(1);
-}
-// Find next available number
-fs.mkdirSync(tempDir, { recursive: true });
-let num = 1;
-while (fs.existsSync(path.join(tempDir, `.mailx${String(num).padStart(2, "0")}`))) {
-    num++;
-}
-const dest = path.join(tempDir, `.mailx${String(num).padStart(2, "0")}`);
-// Save tokens before moving
-const tokensDir = path.join(source, "tokens");
-const hasTokens = fs.existsSync(tokensDir);
-const tokenFiles = [];
-if (hasTokens) {
-    const walk = (dir, base) => {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            const full = path.join(dir, entry.name);
-            const rel = path.join(base, entry.name);
-            if (entry.isDirectory())
-                walk(full, rel);
-            else
-                tokenFiles.push({ rel, data: fs.readFileSync(full) });
-        }
-    };
-    walk(tokensDir, "");
-    console.log(`  Saved ${tokenFiles.length} token file(s)`);
-}
-// Move .mailx to temp
-fs.renameSync(source, dest);
-console.log(`Moved ${source} → ${dest}`);
-// Restore tokens to fresh .mailx
-if (tokenFiles.length > 0) {
-    const newTokens = path.join(source, "tokens");
-    for (const { rel, data } of tokenFiles) {
-        const target = path.join(newTokens, rel);
-        fs.mkdirSync(path.dirname(target), { recursive: true });
-        fs.writeFileSync(target, data);
-    }
-    console.log(`  Restored tokens to ${newTokens}`);
-}
-console.log("Ready for fresh start.");
-//# sourceMappingURL=ager.js.map

package/blowaway.cmd

@@ -1,3 +0,0 @@
-del C:\Users\Bob\.mailx\mailx.db C:\Users\Bob\.mailx\mailx.db-shm C:\Users\Bob\.mailx\mailx.db-wal
-if .%1==.all rmdir /s /q C:\Users\Bob\.mailx\mailxstore
-

package/killmail.cmd

@@ -1,13 +0,0 @@
-@echo off
-REM Kill mailx server (port 9333), launcher, and clean up stale DB locks
-REM Safe: only kills mailx processes, never all node.exe
-
-REM Try graceful exit first, then force kill
-curl -s -m 2 http://localhost:9333/api/exit >nul 2>&1
-timeout /t 1 /nobreak >nul 2>&1
-taskkill /F /IM mailx-app.exe >nul 2>&1 && echo Killed mailx-app.exe || echo mailx-app.exe not running
-killport 9333
-
-REM Clean up stale SQLite WAL/SHM files (left by zombie processes)
-if exist "%USERPROFILE%\.mailx\mailx.db-shm" del "%USERPROFILE%\.mailx\mailx.db-shm" && echo Cleaned mailx.db-shm
-if exist "%USERPROFILE%\.mailx\mailx.db-wal" del "%USERPROFILE%\.mailx\mailx.db-wal" && echo Cleaned mailx.db-wal

package/launch.psx

@@ -1,65 +0,0 @@
-# Launch mailx email client
-#
-# Usage: launch.ps1 [-dev] [-prod] [-restart] [-clear]
-#   -dev      (default) Start server with --watch for auto-restart on file changes
-#   -prod     Start server without --watch
-#   -restart  Kill existing server on port 9333 before starting
-#   -clear    Clear WebView2 cache before launching (fixes blank window issues)
-#
-# The launcher starts the Node server (if not running) and opens a WebView2 window.
-# Server: http://localhost:9333
-# Log: mailx.log
-# Data: ~/.mailx/ (DB, store, settings pointer)
-
-# Clear WebView2 cache if requested
-if ("-clear" -in $args) {
-    $wv2dir = "$PSScriptRoot\launcher\bin\mailx-app.exe.WebView2"
-    if (Test-Path $wv2dir) {
-        Write-Host "Clearing WebView2 cache..."
-        Remove-Item -Recurse -Force $wv2dir
-    }
-    # Remove -clear from args passed to exe
-    $args = $args | Where-Object { $_ -ne "-clear" }
-}
-
-# Check if mailx-app is already running
-$existing = Get-Process -Name "mailx-app" -ErrorAction SilentlyContinue
-if ($existing -and ("-restart" -notin $args)) {
-    Write-Host "mailx is already running (PID $($existing.Id)). Use -restart to force."
-    # Try to bring the existing window to front
-    Add-Type @"
-    using System;
-    using System.Runtime.InteropServices;
-    public class Win32 {
-        [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr hWnd);
-        [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-    }
-"@
-    $hwnd = $existing.MainWindowHandle
-    if ($hwnd -ne [IntPtr]::Zero) {
-        [Win32]::ShowWindow($hwnd, 9) | Out-Null  # SW_RESTORE
-        [Win32]::SetForegroundWindow($hwnd) | Out-Null
-    }
-    exit 0
-}
-
-# Copy latest release build to bin/ if newer
-$release = "$PSScriptRoot\launcher\target\release\mailx-app.exe"
-$bin = "$PSScriptRoot\launcher\bin\mailx-app.exe"
-if ((Test-Path $release) -and (Test-Path $bin)) {
-    if ((Get-Item $release).LastWriteTime -gt (Get-Item $bin).LastWriteTime) {
-        Write-Host "Updating launcher binary..."
-        Copy-Item $release $bin -Force -ErrorAction SilentlyContinue
-    }
-}
-
-# Try pre-built binary first, then release, then debug
-$exe = $bin
-if (-not (Test-Path $exe)) { $exe = $release }
-if (-not (Test-Path $exe)) { $exe = "$PSScriptRoot\launcher\target\debug\mailx-app.exe" }
-if (-not (Test-Path $exe)) {
-    Write-Host "Launcher not found. Run: launcher\build.cmd"
-    exit 1
-}
-
-Start-Process $exe -ArgumentList $args

package/rebuild.cmd

@@ -1,6 +0,0 @@
-  setlocal
-: set MAILX_NATIVE_IMAP=1
-  call npmglobalize
-:  call killmail.cmd
-:  launch.ps1
-  endlocal

package/showports.cmd

@@ -1 +0,0 @@
-netstat -ano | findstr :9333