@bobfrankston/mailx-settings 0.1.23 → 0.1.25

package/cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["cloud.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAoKH;;;;;;;;;oDASoD;AACpD,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BnF;AAcD;;;;;;;;;;;;;;;;;6CAiB6C;AAC7C,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBvE;AA6FD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE1D,MAAM,WAAW,SAAS;IACtB,kFAAkF;IAClF,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,uGAAuG;IACvG,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,8BAA8B;IAC9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAuBtF;AAED;;;;2DAI2D;AAC3D,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBvG"}
+{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["cloud.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA+RH;;;;;;;;;oDASoD;AACpD,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BnF;AAcD;;;;;;;;;;;;;;;;;6CAiB6C;AAC7C,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBvE;AA6FD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE1D,MAAM,WAAW,SAAS;IACtB,kFAAkF;IAClF,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,uGAAuG;IACvG,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,8BAA8B;IAC9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAuBtF;AAED;;;;2DAI2D;AAC3D,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBvG"}

package/cloud.js

@@ -19,6 +19,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
+import { loadAccounts, tokenDirName } from "./index.js";
 const SETTINGS_DIR = path.join(process.env.USERPROFILE || process.env.HOME || ".", ".rmfmail");
 // ── Credentials ──
 // Google Drive: reuse iflow's OAuth credentials (same Google Cloud project)
@@ -55,19 +56,157 @@ const GDRIVE_TOKEN_DIR = path.join(SETTINGS_DIR, "tokens", "gdrive");
 // bigger privacy ask. Token cache at tokens/gdrive/ will re-auth on scope change.
 const GDRIVE_SCOPES = "https://www.googleapis.com/auth/drive";
 // ── Token helpers ──
+/** One-time-per-process archive pass: move every token directory that
+ *  doesn't correspond to a currently-configured account into
+ *  `tokens/.archive/<original-name>/`. Without this, `cloud.ts` would
+ *  walk all token dirs in `~/.rmfmail/tokens/` — including leftovers from
+ *  past setups (a Gmail address typed with a dot creates one dir, the
+ *  same mailbox without the dot creates another) — and trigger a fresh
+ *  OAuth flow on a stale dir that can't refresh, looping the user through
+ *  consent forever (Bob 2026-05-25). Archived dirs are recoverable: move
+ *  them back if I guessed wrong about which is stale. */
+let _staleArchiveRun = false;
+function archiveStaleTokenDirs(activeDirs) {
+    if (_staleArchiveRun)
+        return;
+    _staleArchiveRun = true;
+    const tokensDir = path.join(SETTINGS_DIR, "tokens");
+    if (!fs.existsSync(tokensDir))
+        return;
+    const archiveRoot = path.join(tokensDir, ".archive");
+    let archived = 0;
+    let migrated = 0;
+    try {
+        for (const entry of fs.readdirSync(tokensDir)) {
+            // Preserve: special sub-dirs, the archive itself, all active entries.
+            if (entry === "gdrive" || entry === ".archive")
+                continue;
+            if (entry.startsWith("."))
+                continue;
+            if (activeDirs.has(entry))
+                continue;
+            const src = path.join(tokensDir, entry);
+            try {
+                if (!fs.statSync(src).isDirectory())
+                    continue;
+            }
+            catch {
+                continue;
+            }
+            // MIGRATE before archive: older builds wrote the token dir with
+            // different casing (Pascal vs. lowercase) or different dot handling.
+            // If this dir's lowercased name matches an active dir, it's the
+            // same account's tokens under an obsolete naming convention —
+            // moving the token file to the canonical dir lets the user keep
+            // signing in instead of being thrown back to Google's consent
+            // screen for the third time (Bob 2026-05-26 "why authenticating
+            // again"). The migration preserves the oauth-token.json file; the
+            // now-empty source dir falls through to archive below.
+            const entryLc = entry.toLowerCase();
+            if (activeDirs.has(entryLc) && entryLc !== entry) {
+                const tokenFile = path.join(src, "oauth-token.json");
+                if (fs.existsSync(tokenFile)) {
+                    const dstDir = path.join(tokensDir, entryLc);
+                    const dstTokenFile = path.join(dstDir, "oauth-token.json");
+                    try {
+                        if (fs.existsSync(dstTokenFile)) {
+                            // Target dir already has a token — pick the newer one.
+                            const srcMtime = fs.statSync(tokenFile).mtimeMs;
+                            const dstMtime = fs.statSync(dstTokenFile).mtimeMs;
+                            if (srcMtime > dstMtime) {
+                                fs.copyFileSync(tokenFile, dstTokenFile);
+                                console.log(`  [cloud] Migrated newer token from ${entry} → ${entryLc} (replacing older)`);
+                                migrated++;
+                            }
+                            else {
+                                console.log(`  [cloud] Skipped migrating ${entry} → ${entryLc} (target token is newer)`);
+                            }
+                        }
+                        else {
+                            fs.mkdirSync(dstDir, { recursive: true });
+                            fs.copyFileSync(tokenFile, dstTokenFile);
+                            console.log(`  [cloud] Migrated token from ${entry} → ${entryLc}`);
+                            migrated++;
+                        }
+                    }
+                    catch (e) {
+                        console.error(`  [cloud] Token migration ${entry} → ${entryLc} failed: ${e?.message || e}`);
+                    }
+                }
+                // Fall through to archive — the source dir is now an artifact.
+            }
+            const stamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+            const dst = path.join(archiveRoot, `${stamp}-${entry}`);
+            try {
+                fs.mkdirSync(archiveRoot, { recursive: true });
+                fs.renameSync(src, dst);
+                console.log(`  [cloud] Archived stale token dir: ${entry} → .archive/${path.basename(dst)}`);
+                archived++;
+            }
+            catch (e) {
+                console.error(`  [cloud] Failed to archive ${entry}: ${e?.message || e}`);
+            }
+        }
+    }
+    catch (e) {
+        console.error(`  [cloud] tokens dir scan failed: ${e?.message || e}`);
+    }
+    if (migrated > 0) {
+        console.log(`  [cloud] Stale token cleanup: ${migrated} token(s) migrated to canonical dirs`);
+    }
+    if (archived > 0) {
+        console.log(`  [cloud] Stale token cleanup: ${archived} dir(s) archived to tokens/.archive/`);
+    }
+}
+/** Compute the set of token dir names corresponding to currently-configured
+ *  accounts. Used to decide which token dirs are "active" vs orphans. */
+function activeTokenDirs() {
+    const active = new Set();
+    try {
+        const accts = loadAccounts();
+        for (const a of accts) {
+            const u = a.imap?.user || a.email;
+            if (u)
+                active.add(tokenDirName(u));
+            // Also the email address itself — covers accounts where imap.user
+            // differs (e.g. iecc.com uses "bobf2" as user but the email is
+            // bob@bob.ma; tokens are keyed by the auth identity).
+            if (a.email)
+                active.add(tokenDirName(a.email));
+        }
+    }
+    catch { /* accounts.jsonc unreadable — treat all as active (safe default) */ }
+    return active;
+}
 /** Get a GDrive-capable token. Prefers the Gmail token (which now includes
  *  drive scope) — avoids a second OAuth consent prompt. Falls back to the
  *  dedicated GDrive token dir for non-Gmail setups or when Gmail token
  *  doesn't have drive scope yet. */
 async function getGoogleDriveToken() {
+    // Archive stale token dirs once per process before iteration. Cheap and
+    // self-healing — any future stray dir gets stashed out of the loop.
+    const active = activeTokenDirs();
+    if (active.size > 0)
+        archiveStaleTokenDirs(active);
     // Strategy 1: reuse a Gmail token that already has drive scope.
     // Scan the tokens/ dir for any account token with drive in its scope.
     const tokensDir = path.join(SETTINGS_DIR, "tokens");
     if (fs.existsSync(tokensDir)) {
         try {
             for (const entry of fs.readdirSync(tokensDir)) {
-                if (entry === "gdrive")
+                if (entry === "gdrive" || entry === ".archive")
                     continue;
+                if (entry.startsWith("."))
+                    continue;
+                // Only consider dirs that match a currently-configured account.
+                // Loads the gating logic before the iteration above (`active`)
+                // already excluded orphans by moving them — this is belt-and-
+                // braces for the case where loadAccounts() returned empty
+                // (e.g. accounts.jsonc unreadable) and we skipped archiving.
+                if (active.size > 0 && !active.has(entry)) {
+                    console.log(`  [cloud] Skipping non-configured token dir: ${entry}`);
+                    continue;
+                }
                 const tokenPath = path.join(tokensDir, entry, "oauth-token.json");
                 if (!fs.existsSync(tokenPath))
                     continue;

package/index.d.ts

@@ -43,6 +43,25 @@ export declare function getStorageInfo(): {
     configDir?: string;
     cloudError?: string;
 };
+/** Canonical form of an email address — applies provider-specific
+ *  equivalences so two superficially-different strings that resolve to the
+ *  SAME mailbox produce the same canonical key. Today: Gmail (and
+ *  googlemail.com) ignores dots in the local-part and treats everything
+ *  from `+` onward as a tag — `Bob.Frankston+work@Gmail.com`,
+ *  `bobfrankston@gmail.com`, and `BOBFRANKSTON@GOOGLEMAIL.COM` all collapse
+ *  to `bobfrankston@gmail.com`. Other domains: lowercase only. Used by the
+ *  OAuth token cache so a Gmail account doesn't end up with two parallel
+ *  token directories (one with dots, one without) racing each other and
+ *  triggering full reauth (Bob 2026-05-25).
+ *
+ *  Output is suitable for direct comparison; for filesystem dir names use
+ *  `tokenDirName(email)` which applies the `[@.]/_` sanitization on top. */
+export declare function canonicalEmail(email: string): string;
+/** Compute the OAuth token-cache directory name for an email address.
+ *  Canonicalizes first (so Gmail dot/`+tag`/case variants share one dir),
+ *  then sanitizes `@`/`.` to `_`. Use everywhere a token cache path is
+ *  derived from an email so all code paths land on the same directory. */
+export declare function tokenDirName(email: string): string;
 /** Fill in provider defaults for an account based on email domain.
  *  Exported so mailx-service's leanAccountsJsonc helper can reuse the same
  *  canonicalization rules that loadAccounts uses. */

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/index.js

@@ -489,6 +489,43 @@ const PROVIDERS = {
         smtp: { host: "smtp.mail.me.com", port: 587, tls: true, auth: "password" },
     },
 };
+/** Canonical form of an email address — applies provider-specific
+ *  equivalences so two superficially-different strings that resolve to the
+ *  SAME mailbox produce the same canonical key. Today: Gmail (and
+ *  googlemail.com) ignores dots in the local-part and treats everything
+ *  from `+` onward as a tag — `Bob.Frankston+work@Gmail.com`,
+ *  `bobfrankston@gmail.com`, and `BOBFRANKSTON@GOOGLEMAIL.COM` all collapse
+ *  to `bobfrankston@gmail.com`. Other domains: lowercase only. Used by the
+ *  OAuth token cache so a Gmail account doesn't end up with two parallel
+ *  token directories (one with dots, one without) racing each other and
+ *  triggering full reauth (Bob 2026-05-25).
+ *
+ *  Output is suitable for direct comparison; for filesystem dir names use
+ *  `tokenDirName(email)` which applies the `[@.]/_` sanitization on top. */
+export function canonicalEmail(email) {
+    const s = (email || "").trim().toLowerCase();
+    const at = s.indexOf("@");
+    if (at < 0)
+        return s;
+    let local = s.slice(0, at);
+    const domain = s.slice(at + 1);
+    const isGmail = domain === "gmail.com" || domain === "googlemail.com";
+    if (isGmail) {
+        const plus = local.indexOf("+");
+        if (plus >= 0)
+            local = local.slice(0, plus);
+        local = local.replace(/\./g, "");
+        return `${local}@gmail.com`;
+    }
+    return `${local}@${domain}`;
+}
+/** Compute the OAuth token-cache directory name for an email address.
+ *  Canonicalizes first (so Gmail dot/`+tag`/case variants share one dir),
+ *  then sanitizes `@`/`.` to `_`. Use everywhere a token cache path is
+ *  derived from an email so all code paths land on the same directory. */
+export function tokenDirName(email) {
+    return canonicalEmail(email).replace(/[@.]/g, "_");
+}
 /** Fill in provider defaults for an account based on email domain.
  *  Exported so mailx-service's leanAccountsJsonc helper can reuse the same
  *  canonicalization rules that loadAccounts uses. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-settings",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",