@bobfrankston/mailx-imap 0.1.112 → 0.1.114

package/index.d.ts

@@ -701,7 +701,10 @@ export declare class ImapManager extends EventEmitter {
      *  contacts added or removed in this run. */
     syncGoogleContacts(accountId: string): Promise<number>;
     private syncGoogleContactsImpl;
-    /** Sync contacts for all OAuth accounts */
+    /** Sync contacts for all GOOGLE OAuth accounts. The People API only
+     *  accepts Google tokens — feeding it an Outlook/AOL OAuth token just
+     *  logged `API error for outlook: 401` on every periodic tick. Outlook
+     *  contacts belong to the Graph provider (blocked on Azure app reg). */
     syncAllContacts(): Promise<void>;
     /** Shut down all watchers and timers */
     shutdown(): Promise<void>;

package/index.js

@@ -906,7 +906,54 @@ export class ImapManager extends EventEmitter {
             // to re-enable for a debugging session. Default is quiet.
             const imapTrace = process.env.RMFMAIL_IMAP_TRACE === "1";
             const cfgWithVerbose = (imapTrace && (purpose === "ops" || purpose === "fast")) ? { ...config, verbose: true } : config;
-            client = new CompatImapClient(cfgWithVerbose, this.transportFactory);
+            // C121: connect-phase progress. Wrap the injected transport so the
+            // socket phase (DNS+TCP+TLS inside transport.connect) is visibly
+            // distinct from the IMAP handshake (greeting + LOGIN, which run
+            // inside client.connect after the socket is up). The client shows
+            // "Connecting to <host> (<phase>, N.Ns)" from these events, so
+            // "DNS/TCP/TLS hung" vs "greeting missing" vs "LOGIN slow" are
+            // distinguishable at a glance instead of one opaque long wait.
+            let connT0 = Date.now();
+            const phaseT = {};
+            const emitPhase = (phase, detail) => {
+                phaseT[phase] = Date.now();
+                this.emit("connectProgress", accountId, {
+                    host, purpose, phase, detail,
+                    elapsedMs: Date.now() - connT0,
+                });
+            };
+            const phaseTimings = () => Object.entries(phaseT).map(([p, t]) => `${p}@${t - connT0}ms`).join(" ");
+            const wrappedFactory = () => {
+                const t = this.transportFactory();
+                const origTransportConnect = t.connect.bind(t);
+                t.connect = async (h, p, tls, sni) => {
+                    emitPhase("socket");
+                    await origTransportConnect(h, p, tls, sni);
+                    emitPhase("handshake");
+                };
+                return t;
+            };
+            client = new CompatImapClient(cfgWithVerbose, wrappedFactory);
+            const origClientConnect = client.connect?.bind(client);
+            if (origClientConnect) {
+                client.connect = async (...a) => {
+                    // Clock starts when the connect actually begins — clients
+                    // are constructed eagerly but connect lazily on first use.
+                    connT0 = Date.now();
+                    try {
+                        const r = await origClientConnect(...a);
+                        emitPhase("done");
+                        const total = Date.now() - connT0;
+                        if (total > 3000)
+                            console.log(`  [conn-slow] ${accountId} (${purpose}): connect took ${total}ms — ${phaseTimings()}`);
+                        return r;
+                    }
+                    catch (e) {
+                        emitPhase("failed", e?.message || String(e));
+                        throw e;
+                    }
+                };
+            }
         }
         catch (e) {
             releaseHostSlot();
@@ -5728,10 +5775,11 @@ export class ImapManager extends EventEmitter {
         // Compare after the debounce window and only emit on a real change.
         const normalize = (s) => s.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n").replace(/[ \t\r\n]+$/, "");
         const lastContent = new Map();
-        for (const filename of files) {
+        const watched = new Set();
+        const watchOne = (filename) => {
             const full = path.join(configDir, filename);
             if (!fs.existsSync(full))
-                continue;
+                return false;
             try {
                 lastContent.set(filename, normalize(fs.readFileSync(full, "utf-8")));
             }
@@ -5773,11 +5821,16 @@ export class ImapManager extends EventEmitter {
                     }, 500));
                 });
                 this.configWatchers.push(watcher);
+                watched.add(filename);
+                return true;
             }
             catch (e) {
                 console.error(`  [watch] Failed to watch ${filename}: ${e.message}`);
+                return false;
             }
-        }
+        };
+        for (const filename of files)
+            watchOne(filename);
         // GDrive has no push/watch for arbitrary Drive files, so edits on
         // another device (or via Drive web) never fire fs.watch locally.
         // Poll the cloud copies of the replicated-to-cloud config files
@@ -5828,6 +5881,14 @@ export class ImapManager extends EventEmitter {
                     }
                     fs.writeFileSync(localPath, cloudContent);
                     console.log(`  [cloud-poll] ${filename} updated from cloud copy`);
+                    // A file that didn't exist at startup never got an
+                    // fs.watch (watchOne skipped it), so the write above
+                    // fires nothing and the cloud edit would be applied to
+                    // disk but never loaded. Register the watcher now and
+                    // emit configChanged directly for this first change.
+                    if (!watched.has(filename) && watchOne(filename)) {
+                        this.emit("configChanged", filename);
+                    }
                 }
                 catch (e) {
                     console.log(`  [cloud-poll] ${filename} check skipped: ${e?.message || e}`);
@@ -5982,13 +6043,20 @@ export class ImapManager extends EventEmitter {
         }
         return changed;
     }
-    /** Sync contacts for all OAuth accounts */
+    /** Sync contacts for all GOOGLE OAuth accounts. The People API only
+     *  accepts Google tokens — feeding it an Outlook/AOL OAuth token just
+     *  logged `API error for outlook: 401` on every periodic tick. Outlook
+     *  contacts belong to the Graph provider (blocked on Azure app reg). */
     async syncAllContacts() {
         const settings = loadSettings();
         for (const account of settings.accounts) {
-            if (account.imap.auth === "oauth2" && (account.enabled || account.syncContacts)) {
-                await this.syncGoogleContacts(account.id);
-            }
+            if (account.imap.auth !== "oauth2")
+                continue;
+            if (!(account.enabled || account.syncContacts))
+                continue;
+            if (!this.isGmailAccount(account.id))
+                continue;
+            await this.syncGoogleContacts(account.id);
         }
     }
     /** Shut down all watchers and timers */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.112",
+  "version": "0.1.114",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,8 +10,8 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.22",
-    "@bobfrankston/mailx-settings": "^0.1.33",
-    "@bobfrankston/mailx-store": "^0.1.57",
+    "@bobfrankston/mailx-settings": "^0.1.34",
+    "@bobfrankston/mailx-store": "^0.1.58",
     "@bobfrankston/iflow-direct": "^0.1.56",
     "@bobfrankston/tcp-transport": "^0.1.7",
     "@bobfrankston/smtp-direct": "^0.1.9",
@@ -38,8 +38,8 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.22",
-      "@bobfrankston/mailx-settings": "^0.1.33",
-      "@bobfrankston/mailx-store": "^0.1.57",
+      "@bobfrankston/mailx-settings": "^0.1.34",
+      "@bobfrankston/mailx-store": "^0.1.58",
       "@bobfrankston/iflow-direct": "^0.1.56",
       "@bobfrankston/tcp-transport": "^0.1.7",
       "@bobfrankston/smtp-direct": "^0.1.9",