@bobfrankston/mailx 1.0.165 → 1.0.167

package/client/index.html

@@ -46,11 +46,11 @@
                 <span class="tb-icon">↻</span> Sync
             </button>
             <div class="tb-menu" id="restart-menu">
-                <button class="tb-btn" id="btn-restart" title="Restart server and reload page">
+                <button class="tb-btn" id="btn-restart" title="Reload">
                     <span class="tb-icon">⚡</span> Restart ▾
                 </button>
                 <div class="tb-menu-dropdown" id="restart-dropdown" hidden>
-                    <button class="tb-menu-item" id="btn-restart-quick" title="Restart the server process">Restart server</button>
+                    <button class="tb-menu-item" id="btn-restart-quick" title="Reload the page">Reload</button>
                     <button class="tb-menu-item" id="btn-rebuild" title="Wipe local DB and message cache, re-download everything. Accounts and settings are preserved. Safe and fast.">Rebuild local cache</button>
                     <hr class="tb-menu-sep">
                     <span class="tb-menu-hint">CLI: mailx --rebuild for full reset</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.165",
+  "version": "1.0.167",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.215",
+    "@bobfrankston/msger": "^0.1.217",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -4,6 +4,7 @@
  * Syncs messages to local store, emits events for new mail.
  */
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
+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";
@@ -314,13 +315,40 @@ 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"))) {
+            // Find Google OAuth credentials — check ~/.mailx first, then iflow-direct package
+            let credPath = path.join(getConfigDir(), "google-credentials.json");
+            if (!fs.existsSync(credPath)) {
+                try {
+                    const pkgDir = path.dirname(import.meta.resolve("@bobfrankston/iflow-direct").replace("file:///", "").replace("file://", ""));
+                    for (const name of ["credentials.json", "iflow-credentials.json"]) {
+                        const p = path.join(pkgDir, name);
+                        if (fs.existsSync(p)) {
+                            credPath = p;
+                            break;
+                        }
+                    }
+                }
+                catch { /* iflow-direct not resolvable */ }
+            }
+            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
@@ -388,6 +416,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 || "";
@@ -500,7 +533,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);