imapflow 2.2.6 → 2.2.8

package/dist/cjs/proxy-connection.js

@@ -241,11 +241,11 @@ const httpConnect = async ({ logger, proxyUrl, secureProxy, proxyHost, proxyPort
  * @returns An IPv4 address.
  */
 const resolveIPv4 = async (hostname, deadline) => {
-    let addresses = await deadline.race(node_dns_1.default.promises.resolve4(hostname));
-    if (!addresses || !addresses.length) {
-        throw proxyError(`Could not resolve an IPv4 address for ${hostname}`, 'EPROXY');
-    }
-    return addresses[0];
+    // lookup() goes through the system resolver (getaddrinfo), so hosts files and mDNS names
+    // resolve the same way they would for a direct connection. It rejects (ENOTFOUND) rather
+    // than returning nothing when the name has no IPv4 address
+    let { address } = await deadline.race(node_dns_1.default.promises.lookup(hostname, { family: 4 }));
+    return address;
 };
 /**
  * Establishes a tunnel through a SOCKS proxy.
@@ -289,8 +289,8 @@ const socksConnect = async ({ logger, proxyUrl, protocol, proxyHost, proxyPort,
             set_tcp_nodelay: true
         };
         if (proxyUrl.username || proxyUrl.password) {
-            connectionOpts.proxy.userId = proxyUrl.username;
-            connectionOpts.proxy.password = proxyUrl.password;
+            connectionOpts.proxy.userId = decodeUserInfo(proxyUrl.username);
+            connectionOpts.proxy.password = decodeUserInfo(proxyUrl.password);
         }
         // The dependency treats a zero timeout as its own 30 second default, so only a strictly
         // positive remaining budget may be passed.

package/dist/cjs/search-compiler.js

@@ -53,17 +53,12 @@ let toSequenceValue = (value) => [].concat(value).join(',');
 let toSearchValue = (value) => UNICODE_PATTERN.test(value) && !value.includes('\0') ? { type: 'LITERAL', value: Buffer.from(value) } : { type: 'ATOM', value };
 /**
  * Adds a search option with its value(s) to the attributes array.
- * Handles NOT operations and array values.
  *
  * @param attributes - Array to append the attribute to
  * @param term - The search term (e.g., 'FROM', 'SUBJECT')
- * @param value - The value for the search term (string, array, or falsy for NOT)
+ * @param value - The value for the search term (string or array)
  */
 let setOpt = (attributes, term, value) => {
-    // Handle NOT operations for false or null values
-    if (value === false || value === null) {
-        attributes.push({ type: 'ATOM', value: 'NOT' });
-    }
     attributes.push({ type: 'ATOM', value: term.toUpperCase() });
     // Handle array values (e.g. HEADER name/value pairs)
     if (Array.isArray(value)) {
@@ -253,6 +248,11 @@ const searchCompiler = (connection, query) => {
                     break;
                 // Email ID support (OBJECTID or Gmail extension)
                 case 'EMAILID':
+                    // A falsy value means no criterion, as for the text fields. It used to
+                    // compile into NOT EMAILID "false", which matched every message
+                    if (!params[term]) {
+                        break;
+                    }
                     if (connection.capabilities.has('OBJECTID')) {
                         setOpt(attributes, 'EMAILID', params[term]);
                     }
@@ -260,7 +260,7 @@ const searchCompiler = (connection, query) => {
                         // Fallback to Gmail message ID
                         setOpt(attributes, 'X-GM-MSGID', params[term]);
                     }
-                    else if (params[term]) {
+                    else {
                         // Dropping the criterion would widen the search to every message
                         // matching the rest of the query, which a delete or move acts on
                         fail('MissingServerExtension', 'Server does not support OBJECTID or X-GM-EXT-1 extension required for EMAILID');
@@ -268,6 +268,11 @@ const searchCompiler = (connection, query) => {
                     break;
                 // Thread ID support (OBJECTID or Gmail extension)
                 case 'THREADID':
+                    // A falsy value means no criterion, as for the text fields. It used to
+                    // compile into NOT THREADID "false", which matched every message
+                    if (!params[term]) {
+                        break;
+                    }
                     if (connection.capabilities.has('OBJECTID')) {
                         setOpt(attributes, 'THREADID', params[term]);
                     }
@@ -275,7 +280,7 @@ const searchCompiler = (connection, query) => {
                         // Fallback to Gmail thread ID
                         setOpt(attributes, 'X-GM-THRID', params[term]);
                     }
-                    else if (params[term]) {
+                    else {
                         // Dropping the criterion would widen the search to every message
                         // matching the rest of the query, which a delete or move acts on
                         fail('MissingServerExtension', 'Server does not support OBJECTID or X-GM-EXT-1 extension required for THREADID');
@@ -338,11 +343,11 @@ const searchCompiler = (connection, query) => {
                         if (!value) {
                             break;
                         }
-                        // Use WITHIN extension for better timezone handling if available
-                        if (connection.capabilities.has('WITHIN')) {
-                            // Convert to seconds ago from now
-                            const now = Date.now();
-                            const withinSeconds = Math.round(Math.max(0, now - value.getTime()) / 1000);
+                        // Use WITHIN extension for better timezone handling if available.
+                        // The interval is an nz-number (RFC 5032), so a date that is not in the
+                        // past (OLDER 0 would be answered with BAD) takes the date path instead
+                        const withinSeconds = Math.round((Date.now() - value.getTime()) / 1000);
+                        if (connection.capabilities.has('WITHIN') && withinSeconds >= 1) {
                             const withinKeyword = term.toUpperCase() === 'BEFORE' ? 'OLDER' : 'YOUNGER';
                             setOpt(attributes, withinKeyword, withinSeconds.toString());
                             break;
@@ -362,7 +367,18 @@ const searchCompiler = (connection, query) => {
                 case 'KEYWORD':
                 case 'UNKEYWORD':
                     {
+                        if (typeof params[term] !== 'string') {
+                            fail('InvalidSearchQuery', `Search value for ${term.toLowerCase()} must be a string`);
+                        }
                         let flag = (0, tools_js_1.formatFlag)(params[term]);
+                        // formatFlag() refuses \Recent, which is not a keyword, and values that are
+                        // not atoms. Dropping the criterion would widen the search, so the query is
+                        // refused instead
+                        if (flag === false) {
+                            fail('InvalidSearchQuery', /^\\recent$/i.test(params[term])
+                                ? `${params[term]} can not be searched as a keyword, use the "recent" search key instead`
+                                : `${params[term]} is not a valid keyword`);
+                        }
                         // Compiled even when the mailbox does not allow the keyword: the
                         // correct answer is then the empty set, which dropping the
                         // criterion would turn into every message matching the rest
@@ -460,6 +476,10 @@ const searchCompiler = (connection, query) => {
                         walkOrTree(genOrTree(params[term]));
                     }
                     break;
+                default:
+                    // An unknown key is refused: dropping it silently widened the search (a
+                    // query of only unknown keys matched every message)
+                    fail('InvalidSearchQuery', `Unknown search key "${term}"`);
             }
         });
     };

package/dist/cjs/special-use.js

@@ -77,6 +77,7 @@ const TOKEN_SPLIT = /[\s\-_/.,()[\]]+/;
 // we fall back to matching folder names against these lists of known
 // translations in various languages (including non-Latin scripts).
 exports.flags = ['\\All', '\\Archive', '\\Drafts', '\\Flagged', '\\Junk', '\\Sent', '\\Trash'];
+const LOWERCASE_FLAGS = exports.flags.map(flag => flag.toLowerCase());
 exports.names = {
     '\\Sent': [
         'aika',
@@ -863,9 +864,10 @@ for (let flag of Object.keys(exports.names)) {
     }
 }
 // Fold a folder name into the form the name tables are stored in.
-// Remove U+200E (LEFT-TO-RIGHT MARK) which some mail clients (especially for
-// RTL languages like Arabic, Hebrew) insert into folder names for display purposes.
-// These invisible marks would otherwise prevent exact string matching.
+// Remove U+200E and U+200F (LEFT-TO-RIGHT and RIGHT-TO-LEFT MARK) which some mail clients
+// (especially for RTL languages like Arabic, Hebrew) insert into folder names for display
+// purposes. These invisible marks would otherwise prevent exact string matching. U+200B
+// (ZERO WIDTH SPACE) is kept, Khmer names in the tables use it as their word separator.
 // Normalize with NFKC last: the same folder name can arrive in different but
 // equivalent forms depending on the client that created it, and matching is exact.
 // NFKC rather than NFC because the compatibility folding is what maps halfwidth
@@ -874,7 +876,7 @@ for (let flag of Object.keys(exports.names)) {
 function normalizeName(name) {
     return name
         .toLowerCase()
-        .replace(/\u200e/g, '')
+        .replace(/[\u200e\u200f]/g, '')
         .trim()
         .normalize('NFKC');
 }
@@ -883,7 +885,10 @@ const specialUse = (hasSpecialUseExtension, folder) => {
     // Extension-provided flags take precedence over name-based detection because they
     // are authoritative - the server explicitly marks the folder's role.
     if (hasSpecialUseExtension) {
-        const flag = exports.flags.find(flag => folder.flags.has(flag));
+        // Flags are atoms and compare case-insensitively (RFC 9051 section 9)
+        const listed = new Set();
+        folder.flags.forEach(flag => listed.add(flag.toLowerCase()));
+        const flag = exports.flags.find((flag, i) => listed.has(LOWERCASE_FLAGS[i]));
         if (flag) {
             return { flag, source: 'extension' };
         }

package/dist/cjs/tools.d.ts

@@ -119,6 +119,14 @@ export declare function unrefTimer<T extends NodeJS.Timeout | null | undefined>(
  * @param err - The error to log
  */
 export declare function logConnectionError(connection: ImapFlow, msg: string, err: ImapFlowError | null | undefined): void;
+/**
+ * Whether a command failed because the server answered it with a tagged NO or BAD, as opposed
+ * to a lost connection, a timeout or a local failure that says nothing about the server's answer.
+ *
+ * @param err - The error the command failed with
+ * @returns True for a tagged NO or BAD
+ */
+export declare function isServerRefusal(err: ImapFlowError | null | undefined): boolean;
 /**
  * Checks whether IMAP4rev2 semantics are active for the connection: either the
  * client enabled IMAP4rev2 explicitly, or the server is rev2-only (advertises
@@ -285,9 +293,10 @@ export declare function getColorFlags(color: string | null | undefined): {
  * @param untagged - Parsed untagged IMAP response
  * @param mailbox - Current mailbox state object
  * @param idHashAlgorithm - Hash for the fallback message id, `md5` unless the client was told otherwise
+ * @param connection - Connection the response arrived on, decodes Gmail labels like mailbox names
  * @returns Formatted message object with properties like seq, uid, flags, envelope, etc.
  */
-export declare function formatMessageResponse(untagged: ImapResponse, mailbox: MailboxObject, idHashAlgorithm?: string): Promise<FetchMessageObject>;
+export declare function formatMessageResponse(untagged: ImapResponse, mailbox: MailboxObject, idHashAlgorithm?: string, connection?: ImapFlow): Promise<FetchMessageObject>;
 /**
  * Strips surrounding double quotes from a name string.
  *
@@ -356,8 +365,8 @@ export declare function formatDate(value: unknown): string | undefined;
  */
 export declare function formatDateTime(value: unknown): string | undefined;
 /**
- * Normalizes a flag string. Returns false for non-settable flags (e.g. \Recent),
- * and capitalizes system flags properly.
+ * Normalizes a flag string. Returns false for non-settable flags (e.g. \Recent) and for
+ * values that are not valid flags (keywords must be atoms), and capitalizes system flags properly.
  *
  * @param flag - Flag string to normalize
  * @returns Normalized flag string, or false if the flag cannot be set
@@ -407,7 +416,8 @@ export declare function isUnsafeKey(key: unknown): boolean;
 /**
  * Reads a parsed attribute list of atoms or strings (a flag list, a capability list) into
  * an array of strings. Any element can be a parsed NIL, and the list itself can be NIL,
- * so both levels are guarded here rather than at each call site.
+ * so both levels are guarded here rather than at each call site. A literal (a Gmail label
+ * the server could not send quoted) arrives as a Buffer and is decoded as UTF-8.
  *
  * @param list - Parsed attribute list from a response.
  * @returns The string values, in order, with unusable entries dropped.

package/dist/cjs/tools.js

@@ -12,6 +12,7 @@ exports.guardedReject = guardedReject;
 exports.clearTimer = clearTimer;
 exports.unrefTimer = unrefTimer;
 exports.logConnectionError = logConnectionError;
+exports.isServerRefusal = isServerRefusal;
 exports.isRev2Active = isRev2Active;
 exports.hasCapability = hasCapability;
 exports.buildStatusQueryAttributes = buildStatusQueryAttributes;
@@ -55,6 +56,7 @@ exports.packMessageRange = packMessageRange;
 const libmime_1 = __importDefault(require("libmime"));
 const charsets_js_1 = require("./charsets.js");
 const imap_handler_js_1 = require("./handler/imap-handler.js");
+const imap_formal_syntax_js_1 = __importDefault(require("./handler/imap-formal-syntax.js"));
 const node_crypto_1 = require("node:crypto");
 const jp_decoder_js_1 = require("./jp-decoder.js");
 const iconv_lite_1 = __importDefault(require("iconv-lite"));
@@ -266,6 +268,16 @@ function logConnectionError(connection, msg, err) {
     let routine = !!err && CONNECTION_GONE_CODES.has(err.code) && !err.reason;
     connection.log[routine ? 'debug' : 'warn']({ msg, err, cid: connection.id });
 }
+/**
+ * Whether a command failed because the server answered it with a tagged NO or BAD, as opposed
+ * to a lost connection, a timeout or a local failure that says nothing about the server's answer.
+ *
+ * @param err - The error the command failed with
+ * @returns True for a tagged NO or BAD
+ */
+function isServerRefusal(err) {
+    return !!err && (err.responseStatus === 'NO' || err.responseStatus === 'BAD');
+}
 /**
  * Checks whether IMAP4rev2 semantics are active for the connection: either the
  * client enabled IMAP4rev2 explicitly, or the server is rev2-only (advertises
@@ -325,7 +337,8 @@ function buildStatusQueryAttributes(connection, statusQuery) {
                 }
                 break;
             case 'HIGHESTMODSEQ':
-                if (connection.capabilities.has('CONDSTORE')) {
+                // QRESYNC implies CONDSTORE (RFC 7162 3.2.3)
+                if (connection.capabilities.has('CONDSTORE') || connection.capabilities.has('QRESYNC')) {
                     attributes.push({ type: 'ATOM', value: key.toUpperCase() });
                 }
                 break;
@@ -593,7 +606,12 @@ function getFolderTree(folders) {
         }
         return node;
     };
-    for (let folder of folders) {
+    // Parents are inserted before their children, as getTreeNode() can only descend into nodes
+    // that already exist. LIST gives no ordering guarantee, and the LIST command sorts special-use
+    // mailboxes first, which put a child such as "[Gmail]/Sent Mail" ahead of "[Gmail]" and left
+    // it at the root. The sort is stable, so siblings keep their listing order
+    let byDepth = [...folders].sort((a, b) => (a.parent ? a.parent.length : 0) - (b.parent ? b.parent.length : 0));
+    for (let folder of byDepth) {
         let parent = getTreeNode(folder.parent);
         // see if entry already exists
         let existing = parent.folders && parent.folders.find(existing => existing.name === folder.name);
@@ -701,24 +719,40 @@ function getColorFlags(color) {
  * @param untagged - Parsed untagged IMAP response
  * @param mailbox - Current mailbox state object
  * @param idHashAlgorithm - Hash for the fallback message id, `md5` unless the client was told otherwise
+ * @param connection - Connection the response arrived on, decodes Gmail labels like mailbox names
  * @returns Formatted message object with properties like seq, uid, flags, envelope, etc.
  */
-async function formatMessageResponse(untagged, mailbox, idHashAlgorithm) {
+async function formatMessageResponse(untagged, mailbox, idHashAlgorithm, connection) {
     let map = {};
     // The sequence number indexes into mailbox state, so an unusable one is dropped rather
     // than coerced to NaN or Infinity
     map.seq = parseUintValue(untagged.command, exports.MAX_UINT32_DIGITS) || undefined;
     let key;
+    // the <origin> of a partial section ("BODY[2]<1024>"), kept for the value that follows
+    let origin = false;
+    let partialOrigins;
+    let recordOrigin = (sectionKey) => {
+        if (origin !== false) {
+            if (!partialOrigins) {
+                partialOrigins = new Map();
+            }
+            partialOrigins.set(sectionKey, origin);
+        }
+    };
     let attributes = ((untagged.attributes && untagged.attributes[1]) || []);
     for (let i = 0, len = attributes.length; i < len; i++) {
         let attribute = attributes[i];
         if (i % 2 === 0) {
+            origin = false;
             key = (await (0, imap_handler_js_1.compiler)({
                 attributes: [attribute]
             }))
                 .toString()
                 .toLowerCase()
-                .replace(/<\d+(\.\d+)?>$/, '');
+                .replace(/<(\d+)(\.\d+)?>$/, (match, start) => {
+                origin = parseUintValue(start, exports.MAX_UINT32_DIGITS);
+                return '';
+            });
             continue;
         }
         /* c8 ignore start */ // defensive: key is always a string produced by the compiler above
@@ -763,6 +797,7 @@ async function formatMessageResponse(untagged, mailbox, idHashAlgorithm) {
             case 'body[]':
             case 'binary[]':
                 map.source = getBuffer(attribute);
+                recordOrigin('');
                 break;
             case 'uid':
                 // A UID feeds mailbox.uidNext one line below, and from there every range
@@ -809,7 +844,8 @@ async function formatMessageResponse(untagged, mailbox, idHashAlgorithm) {
                 map.threadId = getString(attribute);
                 break;
             case 'x-gm-labels':
-                map.labels = new Set(getArray(attribute));
+                // labels are mailbox names, modified UTF-7 unless UTF-8 is enabled
+                map.labels = new Set(getArray(attribute).map(label => (connection ? decodePath(connection, label) : label)));
                 break;
             case 'rfc822.size':
                 map.size = getUint(attribute) || 0;
@@ -855,6 +891,7 @@ async function formatMessageResponse(untagged, mailbox, idHashAlgorithm) {
                         map.bodyParts = new Map();
                     }
                     map.bodyParts.set(partKey, value);
+                    recordOrigin(partKey);
                     if (match[1].toLowerCase() === 'binary') {
                         // The part arrived via FETCH BINARY (RFC 3516, FETCH side folded
                         // into IMAP4rev2), so the server has already removed the
@@ -896,6 +933,10 @@ async function formatMessageResponse(untagged, mailbox, idHashAlgorithm) {
                     .update([path, mailbox.uidValidity?.toString() || '', map.uid.toString()].join(':'))
                     .digest('hex');
     }
+    if (partialOrigins) {
+        // non-enumerable, so it stays out of logged and serialized fetch results
+        Object.defineProperty(map, 'partialOrigins', { value: partialOrigins, writable: true, configurable: true });
+    }
     if (map.flags) {
         let flagColor = getFlagColor(map.flags);
         if (flagColor) {
@@ -1338,14 +1379,22 @@ function formatDateTime(value) {
     let timeStr = date.toISOString().substring(11, 19);
     return `${dateStr} ${timeStr} +0000`;
 }
+// the memoized ATOM-CHAR set of RFC 9051 section 9
+const atomChars = imap_formal_syntax_js_1.default['ATOM-CHAR'];
 /**
- * Normalizes a flag string. Returns false for non-settable flags (e.g. \Recent),
- * and capitalizes system flags properly.
+ * Normalizes a flag string. Returns false for non-settable flags (e.g. \Recent) and for
+ * values that are not valid flags (keywords must be atoms), and capitalizes system flags properly.
  *
  * @param flag - Flag string to normalize
  * @returns Normalized flag string, or false if the flag cannot be set
  */
 function formatFlag(flag) {
+    // RFC 9051 section 9: flag-keyword is an atom and flag-extension is "\\" atom, the same check
+    // the compiler uses to decide what it can send unquoted
+    let atom = flag.charAt(0) === '\\' ? flag.slice(1) : flag;
+    if (!atom || imap_formal_syntax_js_1.default.verify(atom, atomChars()) >= 0) {
+        return false;
+    }
     switch (flag.toLowerCase()) {
         case '\\recent':
             // can not set or remove
@@ -1412,7 +1461,8 @@ function isUnsafeKey(key) {
 /**
  * Reads a parsed attribute list of atoms or strings (a flag list, a capability list) into
  * an array of strings. Any element can be a parsed NIL, and the list itself can be NIL,
- * so both levels are guarded here rather than at each call site.
+ * so both levels are guarded here rather than at each call site. A literal (a Gmail label
+ * the server could not send quoted) arrives as a Buffer and is decoded as UTF-8.
  *
  * @param list - Parsed attribute list from a response.
  * @returns The string values, in order, with unusable entries dropped.
@@ -1421,7 +1471,17 @@ function getStringList(list) {
     if (!Array.isArray(list)) {
         return [];
     }
-    return list.map(entry => (entry && typeof entry.value === 'string' ? entry.value : false)).filter(entry => entry);
+    let strings = [];
+    for (let entry of list) {
+        let value = entry && entry.value;
+        if (Buffer.isBuffer(value)) {
+            value = value.toString();
+        }
+        if (value && typeof value === 'string') {
+            strings.push(value);
+        }
+    }
+    return strings;
 }
 /**
  * Parses an untrusted decimal value from a server response into a BigInt.

package/dist/cjs/types.d.ts

@@ -155,7 +155,15 @@ export interface ImapFlowOptions {
      * 30 minutes. Set to 0 or false to disable.
      */
     maxLockHoldTime?: number | false | undefined;
-    /** If true, uses TLS. If false, uses cleartext. If not set, upgrades to TLS if available */
+    /**
+     * STARTTLS policy for a connection that was not opened with `secure: true`. If true, the
+     * connection must upgrade to TLS, and connecting fails when the server does not offer
+     * STARTTLS. If false, the connection stays in cleartext. If not set, the connection upgrades
+     * when the server offers STARTTLS and otherwise continues in cleartext with a warning logged:
+     * the capability list that decides this was itself received in cleartext, so an attacker on
+     * the path can strip it. Set `doSTARTTLS: true` whenever the credentials must never cross the
+     * wire unencrypted.
+     */
     doSTARTTLS?: boolean | undefined;
     /** Custom instance ID string for logs */
     id?: string | undefined;
@@ -646,8 +654,8 @@ export interface DownloadOptions {
     /** How large content parts to ask from the server. Defaults to 65536 */
     chunkSize?: number | undefined;
 }
-/** Options for downloadMany(), the same shape as the download() options */
-export type DownloadManyOptions = DownloadOptions;
+/** Options for downloadMany(): the download() options without `chunkSize`, as the parts come in one FETCH */
+export type DownloadManyOptions = Pick<DownloadOptions, 'uid' | 'maxBytes'>;
 export interface DownloadManyPart {
     meta: DownloadMeta;
     content?: Buffer | null | undefined;
@@ -769,6 +777,13 @@ export type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
  */
 export type InternalLogger = {
     [level in LogLevel]: (obj: any) => void;
+} & {
+    /**
+     * Whether an entry logged at this level reaches anyone (the logger, or a 'log' event
+     * listener). Set on the logger the connection builds; a logger assigned from outside may
+     * lack it, and every level then counts as enabled
+     */
+    isLevelEnabled?: ((level: LogLevel) => boolean) | undefined;
 };
 export interface LogEvent {
     /** Log level */
@@ -802,7 +817,7 @@ export interface ESearchResult {
     partial?: {
         /** The requested range, e.g. "1:100" */
         range: string;
-        /** Matching UIDs in that range as compact sequence-set */
+        /** Matching UIDs in that range as compact sequence-set, an empty string when the range lies past the end of the results */
         messages: string;
     } | undefined;
     /** Highest mod-sequence of the matching messages (RFC 7162, present when the search used a modseq criterion on a CONDSTORE session) */

package/dist/esm/commands/append.js

@@ -1,4 +1,4 @@
-import { formatFlag, canUseFlag, formatDateTime, normalizePath, encodePath, comparePaths, parseBigIntValue, parseUintValue, MAX_UINT32_DIGITS, getSelectedMailbox, emitSafe, isAuthenticatedState, reportCommandError } from '../tools.js';
+import { formatFlag, canUseFlag, formatDateTime, normalizePath, encodePath, comparePaths, parseBigIntValue, parseUintValue, MAX_UINT32_DIGITS, getSelectedMailbox, emitSafe, isAuthenticatedState, reportCommandError, logConnectionError } from '../tools.js';
 /**
  * Appends a message to a mailbox.
  *
@@ -155,10 +155,17 @@ export default async function append(connection, destination, content, flags, id
         }
         // If we have a sequence number but no UID (server doesn't support UIDPLUS),
         // look up the UID via SEARCH to provide a consistent result to the caller.
+        // The message is already stored, so a failed lookup only leaves the UID out:
+        // rejecting here would make a retrying caller append it twice.
         if (map.seq && !map.uid) {
-            let list = await connection.search({ seq: map.seq }, { uid: true });
-            if (Array.isArray(list) && list.length) {
-                map.uid = list[0];
+            try {
+                let list = await connection.search({ seq: map.seq }, { uid: true });
+                if (Array.isArray(list) && list.length) {
+                    map.uid = list[0];
+                }
+            }
+            catch (err) {
+                logConnectionError(connection, 'Failed to look up the UID of the appended message', err);
             }
         }
         return map;

package/dist/esm/commands/authenticate.js

@@ -1,4 +1,4 @@
-import { getStatusCode, getErrorText } from '../tools.js';
+import { getStatusCode, getErrorText, isServerRefusal } from '../tools.js';
 /**
  * Handles authentication errors by enriching the error object with server response details.
  *
@@ -11,7 +11,10 @@ async function handleAuthError(err, errorResponse) {
     if (errorCode) {
         err.serverResponseCode = errorCode;
     }
-    err.authenticationFailed = true;
+    // Only a tagged NO/BAD is the server refusing the credentials, see login.ts
+    if (isServerRefusal(err)) {
+        err.authenticationFailed = true;
+    }
     err.response = await getErrorText(err.response);
     if (errorResponse) {
         err.oauthError = errorResponse;
@@ -60,15 +63,26 @@ async function authOauth(connection, username, accessToken) {
         // Empty breaker: XOAUTH2 expects an empty response to abort the SASL exchange
         breaker = '';
     }
+    let encoded = Buffer.from(oauthbearer).toString('base64');
+    // Without SASL-IR the payload may not ride on the command line (RFC 4959 section 3): it is
+    // sent as the answer to the first, empty continuation request instead
+    let payloadPending = !connection.capabilities.has('SASL-IR');
     let errorResponse = false;
     try {
-        let response = await connection.exec('AUTHENTICATE', [
-            { type: 'ATOM', value: command },
-            { type: 'ATOM', value: Buffer.from(oauthbearer).toString('base64'), sensitive: true }
-        ], {
+        let attributes = [{ type: 'ATOM', value: command }];
+        if (!payloadPending) {
+            attributes.push({ type: 'ATOM', value: encoded, sensitive: true });
+        }
+        let response = await connection.exec('AUTHENTICATE', attributes, {
             // Server sends a "+" continuation if auth fails, with a base64 JSON error payload.
             // We decode it for diagnostics, then send the breaker to terminate the exchange.
             onPlusTag: async (resp) => {
+                if (payloadPending) {
+                    payloadPending = false;
+                    connection.log.debug({ src: 'c', msg: '(* value hidden *)', comment: `Encoded response for AUTH=${command}`, cid: connection.id });
+                    connection.write(encoded);
+                    return;
+                }
                 if (resp.attributes && resp.attributes[0] && resp.attributes[0].type === 'TEXT') {
                     try {
                         errorResponse = JSON.parse(Buffer.from(resp.attributes[0].value, 'base64').toString());
@@ -108,27 +122,33 @@ async function authLogin(connection, username, password) {
     try {
         // SASL LOGIN is a challenge-response mechanism: the server sends base64-encoded
         // prompts ("Username:" and "Password:") and the client responds with base64-encoded values.
+        let usernameSent = false;
         let response = await connection.exec('AUTHENTICATE', [{ type: 'ATOM', value: 'LOGIN' }], {
             onPlusTag: async (resp) => {
-                if (resp.attributes && resp.attributes[0] && resp.attributes[0].type === 'TEXT') {
-                    // Decode the server's base64 challenge to determine what it's asking for.
-                    // Strip trailing colons and null bytes (\x00) that some servers append to the prompt.
-                    let question = Buffer.from(resp.attributes[0].value, 'base64')
+                // Decode the server's base64 challenge to determine what it's asking for.
+                // Strip trailing colons and null bytes (\x00) that some servers append to the prompt.
+                let question = resp.attributes && resp.attributes[0] && resp.attributes[0].type === 'TEXT'
+                    ? Buffer.from(resp.attributes[0].value, 'base64')
                         .toString()
                         .toLowerCase()
-                        .replace(/[:\x00]*$/, '');
-                    if (question === 'username' || question === 'user name') {
-                        let encodedUsername = Buffer.from(username).toString('base64');
-                        connection.log.debug({ src: 'c', msg: encodedUsername, comment: `Encoded username for AUTH=LOGIN`, cid: connection.id });
-                        connection.write(encodedUsername);
-                    }
-                    else if (question === 'password') {
-                        connection.log.debug({ src: 'c', msg: '(* value hidden *)', comment: `Encoded password for AUTH=LOGIN`, cid: connection.id });
-                        connection.write(Buffer.from(password).toString('base64'));
-                    }
-                    else {
-                        throw new Error(`Unknown LOGIN question "${question}"`);
-                    }
+                        .replace(/[:\x00]*$/, '')
+                    : '';
+                // Some servers send an empty first challenge, which by SASL LOGIN convention asks for the username
+                if (question === 'username' || question === 'user name' || (!question && !usernameSent)) {
+                    let encodedUsername = Buffer.from(username).toString('base64');
+                    connection.log.debug({ src: 'c', msg: encodedUsername, comment: `Encoded username for AUTH=LOGIN`, cid: connection.id });
+                    connection.write(encodedUsername);
+                    usernameSent = true;
+                }
+                else if (question === 'password') {
+                    connection.log.debug({ src: 'c', msg: '(* value hidden *)', comment: `Encoded password for AUTH=LOGIN`, cid: connection.id });
+                    connection.write(Buffer.from(password).toString('base64'));
+                }
+                else {
+                    // Cancel the exchange (RFC 9051 section 6.2.2), so the server fails the command
+                    // with a tagged BAD instead of waiting for an answer that never comes
+                    connection.log.warn({ msg: 'Unknown AUTH=LOGIN challenge, cancelling', question, cid: connection.id });
+                    connection.write('*');
                 }
             }
         });

package/dist/esm/commands/close.d.ts

@@ -1,8 +1,19 @@
 import type { ImapFlow } from '../imap-flow.js';
+/**
+ * Options for the CLOSE command
+ */
+export interface CloseCommandOptions {
+    /**
+     * Only deselect the mailbox: use UNSELECT (RFC 3691, folded into IMAP4rev2) when the server
+     * supports it, so messages flagged \Deleted are not expunged as a side effect. Falls back to CLOSE
+     */
+    unselect?: boolean | undefined;
+}
 /**
  * Closes the currently selected mailbox.
  *
  * @param connection - IMAP connection instance
+ * @param options - Close options
  * @returns True on success, false on failure, or undefined if not in SELECTED state
  */
-export default function close(connection: ImapFlow): Promise<boolean | undefined>;
+export default function close(connection: ImapFlow, options?: CloseCommandOptions | undefined): Promise<boolean | undefined>;

package/dist/esm/commands/close.js

@@ -1,11 +1,12 @@
-import { emitSafe } from '../tools.js';
+import { emitSafe, hasCapability } from '../tools.js';
 /**
  * Closes the currently selected mailbox.
  *
  * @param connection - IMAP connection instance
+ * @param options - Close options
  * @returns True on success, false on failure, or undefined if not in SELECTED state
  */
-export default async function close(connection) {
+export default async function close(connection, options) {
     if (connection.state !== connection.states.SELECTED) {
         // nothing to do here
         return;
@@ -15,7 +16,8 @@ export default async function close(connection) {
         // IMAP CLOSE (RFC 3501 6.4.2): permanently removes all messages flagged \Deleted
         // from the currently selected mailbox (implicit expunge) and deselects it.
         // Unlike EXPUNGE, CLOSE does not send individual untagged EXPUNGE responses.
-        response = await connection.exec('CLOSE');
+        // UNSELECT deselects the same way without removing anything.
+        response = await connection.exec(options?.unselect && hasCapability(connection, 'UNSELECT') ? 'UNSELECT' : 'CLOSE');
         response.next();
         // Transition from SELECTED back to AUTHENTICATED state.
         // Clear mailbox metadata so subsequent operations know no mailbox is selected.