@bobfrankston/iflow 1.0.31 → 1.0.33

package/imaplib/ImapClient.js

@@ -3,6 +3,19 @@
 import { ImapFlow } from 'imapflow';
 import { FetchedMessage } from './types.js';
 import { styleText } from 'util';
+// Removed dependencies on parent project - these should be passed in or handled differently
+// TODO: Create our own range object and allow a nosource flag
+/** Extract full error detail from imapflow errors (which hide response text in err.responseText) */
+function imapError(err) {
+    const parts = [err.message || "Unknown error"];
+    if (err.responseText)
+        parts.push(err.responseText);
+    if (err.responseStatus)
+        parts.push(`[${err.responseStatus}]`);
+    if (err.executedCommand)
+        parts.push(`cmd: ${err.executedCommand.substring(0, 80)}`);
+    return parts.join(" — ");
+}
 const defaultFetchOptions = {
     source: true
 };
@@ -34,7 +47,7 @@ export class ImapClient {
         });
         // Set up error handlers
         this.client.on('error', (err) => {
-            console.error(`${new Date().toISOString()} ImapFlow socket error: ${err.message}`);
+            console.error(`${new Date().toISOString()} ImapFlow socket error: ${imapError(err)}`);
             if (!this.isDestroying) {
                 this.handleReconnection();
             }
@@ -79,12 +92,12 @@ export class ImapClient {
                     this.reconnectAttempts = 0; // Reset on success
                 }
                 catch (err) {
-                    console.error(`${new Date().toISOString()} Reconnection failed: ${err.message}`);
+                    console.error(`${new Date().toISOString()} Reconnection failed: ${imapError(err)}`);
                     // Will trigger another reconnection attempt via error handler
                 }
             }
             catch (err) {
-                console.error(`${new Date().toISOString()} Error during reconnection process: ${err.message}`);
+                console.error(`${new Date().toISOString()} Error during reconnection process: ${imapError(err)}`);
             }
             finally {
                 this.connectionPromise = null;
@@ -106,7 +119,7 @@ export class ImapClient {
             return await operation();
         }
         catch (err) {
-            console.error(`${new Date().toISOString()} Operation failed: ${err.message}`);
+            console.error(`${new Date().toISOString()} Operation failed: ${imapError(err)}`);
             // Check if it's a connection-related error
             if (err.code === 'ECONNRESET' || err.code === 'ENOTFOUND' ||
                 err.code === 'ETIMEDOUT' || err.code === 'ECONNREFUSED' ||
@@ -147,7 +160,7 @@ export class ImapClient {
             return uids;
         }
         catch (error) {
-            console.error(`Error getting UIDs: ${error.message}`);
+            console.error(`Error getting UIDs: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -180,7 +193,7 @@ export class ImapClient {
             return uids;
         }
         catch (error) {
-            console.error(`Search error in ${mailbox}: ${error.message}`);
+            console.error(`Search error in ${mailbox}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -248,7 +261,7 @@ export class ImapClient {
             return messages;
         }
         catch (error) {
-            console.error(`Error fetching messages: ${error.message}`);
+            console.error(`Error fetching messages: ${imapError(error)}`);
             debugger;
             throw error; // rethrow to handle it outside
         }
@@ -279,7 +292,7 @@ export class ImapClient {
             // "Nothing to fetch" just means no new messages
             if (error.responseText?.includes("Nothing to fetch"))
                 return [];
-            console.error(`Error fetching messages since UID ${sinceUid}: ${error.message}`);
+            console.error(`Error fetching messages since UID ${sinceUid}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -305,7 +318,7 @@ export class ImapClient {
             return new FetchedMessage(msg);
         }
         catch (error) {
-            console.error(`Error fetching message UID ${uid}: ${error.message}`);
+            console.error(`Error fetching message UID ${uid}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -351,7 +364,7 @@ export class ImapClient {
             return result;
         }
         catch (error) {
-            console.error(`Error appending message to ${mailbox}: ${error.message}`);
+            console.error(`Error appending message to ${mailbox}: ${imapError(error)}`);
             throw error;
         }
     }
@@ -384,7 +397,7 @@ export class ImapClient {
             await targetClient.appendMessage(targetMailbox, msg.source, flags, date);
         }
         catch (error) {
-            console.error(`Error copying message to another server: ${error.message}`);
+            console.error(`Error copying message to another server: ${imapError(error)}`);
             throw error;
         }
     }
@@ -406,7 +419,7 @@ export class ImapClient {
             await this.client.messageDelete([msg.uid], { uid: true });
         }
         catch (error) {
-            console.error(`Error moving message to another server: ${error.message}`);
+            console.error(`Error moving message to another server: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -470,7 +483,7 @@ export class ImapClient {
             return specialFolders;
         }
         catch (error) {
-            console.error(`Error getting special folders: ${error.message}`);
+            console.error(`Error getting special folders: ${imapError(error)}`);
             debugger;
             throw error;
         }
@@ -493,7 +506,7 @@ export class ImapClient {
             return await this.client.messageFlagsAdd([uid], flags, { uid: true });
         }
         catch (error) {
-            console.error(`Error adding flags to UID ${uid}: ${error.message}`);
+            console.error(`Error adding flags to UID ${uid}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -508,7 +521,7 @@ export class ImapClient {
             return await this.client.messageFlagsRemove([uid], flags, { uid: true });
         }
         catch (error) {
-            console.error(`Error removing flags from UID ${uid}: ${error.message}`);
+            console.error(`Error removing flags from UID ${uid}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -526,7 +539,7 @@ export class ImapClient {
             return [...msg.flags];
         }
         catch (error) {
-            console.error(`Error getting flags for UID ${uid}: ${error.message}`);
+            console.error(`Error getting flags for UID ${uid}: ${imapError(error)}`);
             throw error;
         }
         finally {
@@ -541,7 +554,7 @@ export class ImapClient {
             await this.client.messageDelete([uid], { uid: true });
         }
         catch (error) {
-            console.error(`Error deleting UID ${uid} from ${mailbox}: ${error.message}`);
+            console.error(`Error deleting UID ${uid} from ${mailbox}: ${imapError(error)}`);
             throw error;
         }
         finally {

package/imaplib/gmail.js

@@ -48,10 +48,11 @@ export function createImapConfig(config) {
     const tokenDir = path.join(tokenDirectory, 'tokens', accountDir);
     const getToken = async () => {
         // Serialize concurrent OAuth attempts — only one flow at a time per user
-        const existing = pendingAuth.get(username);
-        if (existing)
-            return existing;
-        const attempt = (async () => {
+        // Check-and-set must be synchronous to avoid TOCTOU race
+        let pending = pendingAuth.get(username);
+        if (pending)
+            return pending;
+        pending = (async () => {
             const token = await authenticateOAuth(credentialsPath, {
                 scope: GMAIL_SCOPE,
                 tokenDirectory: tokenDir,
@@ -64,9 +65,10 @@ export function createImapConfig(config) {
                 throw new Error('Failed to get Gmail access token');
             return token.access_token;
         })();
-        pendingAuth.set(username, attempt);
+        // Set immediately (synchronously) before any await
+        pendingAuth.set(username, pending);
         try {
-            return await attempt;
+            return await pending;
         }
         finally {
             pendingAuth.delete(username);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/iflow",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "IMAP client wrapper library",
   "main": "index.js",
   "types": "index.ts",
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/oauthsupport": "^1.0.14",
+    "@bobfrankston/oauthsupport": "^1.0.17",
     "imapflow": "^1.0.187"
   },
   "exports": {