imapflow 1.2.13 → 1.2.14

package/lib/imap-flow.js

@@ -298,7 +298,6 @@ class ImapFlow extends EventEmitter {
         this.state = this.states.NOT_AUTHENTICATED;
 
         this.lockCounter = 0;
-        this.currentLock = false;
 
         this.tagCounter = 0;
         this.requestTagMap = new Map();
@@ -407,7 +406,8 @@ class ImapFlow extends EventEmitter {
         let rid = BigInt('0x' + crypto.randomBytes(13).toString('hex')).toString(36);
         if (rid.length < 20) {
             rid = '0'.repeat(20 - rid.length) + rid;
-        } else if (rid.length > 20) {
+        }
+        if (rid.length > 20) {
             rid = rid.substr(0, 20);
         }
         return rid;
@@ -1087,11 +1087,11 @@ class ImapFlow extends EventEmitter {
             let err = new Error('Server does not support STARTTLS');
             err.tlsFailed = true;
             throw err;
-        } else {
-            // Opportunistic STARTTLS. But it's not possible right now.
-            // Attention: Could be a downgrade attack.
-            return false;
         }
+
+        // Opportunistic STARTTLS. But it's not possible right now.
+        // Attention: Could be a downgrade attack.
+        return false;
     }
 
     /**
@@ -1510,7 +1510,7 @@ class ImapFlow extends EventEmitter {
             return false;
         }
 
-        if ((!this.mailbox && path) || (this.mailbox && path && !comparePaths(this, this.mailbox.path, path))) {
+        if (!this.mailbox || !comparePaths(this, this.mailbox.path, path)) {
             return await this.mailboxOpen(path);
         }
 
@@ -2515,13 +2515,7 @@ class ImapFlow extends EventEmitter {
      * await client.append('INBOX', rawMessageBuffer, ['\\Seen'], new Date(2000, 1, 1));
      */
     async append(path, content, flags, idate) {
-        let response = await this.run('APPEND', path, content, flags, idate);
-
-        if (!response) {
-            return false;
-        }
-
-        return response;
+        return (await this.run('APPEND', path, content, flags, idate)) || false;
     }
 
     /**
@@ -2608,13 +2602,7 @@ class ImapFlow extends EventEmitter {
             return;
         }
 
-        let response = await this.run('SEARCH', query, options);
-
-        if (!response) {
-            return false;
-        }
-
-        return response;
+        return (await this.run('SEARCH', query, options)) || false;
     }
 
     /**
@@ -2753,9 +2741,8 @@ class ImapFlow extends EventEmitter {
                         let entry = rowQueue.shift();
                         if (entry.err) {
                             return reject(entry.err);
-                        } else {
-                            return resolve(entry.value);
                         }
+                        return resolve(entry.value);
                     }
 
                     if (finished) {
@@ -3257,6 +3244,29 @@ class ImapFlow extends EventEmitter {
         // stream and then fetch remaining chunks via fetchAllParts().
         // setImmediate ensures the caller gets the {meta, content} return
         // value before streaming begins.
+        let runFetchAllParts = () => {
+            fetchAllParts()
+                .catch(err => {
+                    if (!fetchAborted && stream && !stream.destroyed) {
+                        stream.emit('error', err);
+                    } else {
+                        // Log when error cannot be emitted to stream
+                        this.log.warn({
+                            msg: 'Download error after stream closed',
+                            err,
+                            fetchAborted,
+                            streamDestroyed: stream?.destroyed,
+                            cid: this.id
+                        });
+                    }
+                })
+                .finally(() => {
+                    if (!fetchAborted && stream && !stream.destroyed) {
+                        stream.end();
+                    }
+                });
+        };
+
         setImmediate(() => {
             let writeResult;
             try {
@@ -3273,49 +3283,11 @@ class ImapFlow extends EventEmitter {
                 // Initial chunk filled the buffer, wait for drain
                 stream.once('drain', () => {
                     if (!fetchAborted) {
-                        fetchAllParts()
-                            .catch(err => {
-                                if (!fetchAborted && stream && !stream.destroyed) {
-                                    stream.emit('error', err);
-                                } else {
-                                    // Log when error cannot be emitted to stream
-                                    this.log.warn({
-                                        msg: 'Download error after stream closed',
-                                        err,
-                                        fetchAborted,
-                                        streamDestroyed: stream?.destroyed,
-                                        cid: this.id
-                                    });
-                                }
-                            })
-                            .finally(() => {
-                                if (!fetchAborted && stream && !stream.destroyed) {
-                                    stream.end();
-                                }
-                            });
+                        runFetchAllParts();
                     }
                 });
             } else {
-                fetchAllParts()
-                    .catch(err => {
-                        if (!fetchAborted && stream && !stream.destroyed) {
-                            stream.emit('error', err);
-                        } else {
-                            // Log when error cannot be emitted to stream
-                            this.log.warn({
-                                msg: 'Download error after stream closed',
-                                err,
-                                fetchAborted,
-                                streamDestroyed: stream?.destroyed,
-                                cid: this.id
-                            });
-                        }
-                    })
-                    .finally(() => {
-                        if (!fetchAborted && stream && !stream.destroyed) {
-                            stream.end();
-                        }
-                    });
+                runFetchAllParts();
             }
         });
 
@@ -3514,14 +3486,6 @@ class ImapFlow extends EventEmitter {
             // Process all locks in queue until empty
             let processedCount = 0;
             while (this.locks.length > 0) {
-                if (!this.locks.length) {
-                    this.log.trace({
-                        msg: 'Mailbox locking queue processed',
-                        idling: this.idling
-                    });
-                    return;
-                }
-
                 // Yield to event loop periodically to prevent CPU blocking
                 processedCount++;
                 if (processedCount % 5 === 0) {
@@ -3568,46 +3532,46 @@ class ImapFlow extends EventEmitter {
                     this.currentLock = lock;
                     resolve({ path, release });
                     break; // Stop processing; next lock waits for release()
-                } else {
-                    try {
-                        // Need to SELECT/EXAMINE a different mailbox
-                        await this.mailboxOpen(path, options);
-                        this.log.trace({
-                            msg: 'Mailbox lock acquired [selected]',
-                            path,
-                            lockId,
-                            idling: this.idling,
-                            ...(options.description && { description: options.description })
-                        });
-                        this.currentLock = lock;
-                        resolve({ path, release });
-                        break; // Wait for this lock to be released
-                    } catch (err) {
-                        if (err.responseStatus === 'NO') {
-                            // SELECT failed with NO -- verify whether the mailbox exists
-                            // at all by running LIST. This sets mailboxMissing on the error
-                            // so the caller can distinguish "doesn't exist" from other failures.
-                            try {
-                                let folders = await this.run('LIST', '', path, { listOnly: true });
-                                if (!folders || !folders.length) {
-                                    err.mailboxMissing = true;
-                                }
-                            } catch (E) {
-                                this.log.trace({ msg: 'Failed to verify failed mailbox', path, err: E });
+                }
+
+                try {
+                    // Need to SELECT/EXAMINE a different mailbox
+                    await this.mailboxOpen(path, options);
+                    this.log.trace({
+                        msg: 'Mailbox lock acquired [selected]',
+                        path,
+                        lockId,
+                        idling: this.idling,
+                        ...(options.description && { description: options.description })
+                    });
+                    this.currentLock = lock;
+                    resolve({ path, release });
+                    break; // Wait for this lock to be released
+                } catch (err) {
+                    if (err.responseStatus === 'NO') {
+                        // SELECT failed with NO -- verify whether the mailbox exists
+                        // at all by running LIST. This sets mailboxMissing on the error
+                        // so the caller can distinguish "doesn't exist" from other failures.
+                        try {
+                            let folders = await this.run('LIST', '', path, { listOnly: true });
+                            if (!folders || !folders.length) {
+                                err.mailboxMissing = true;
                             }
+                        } catch (E) {
+                            this.log.trace({ msg: 'Failed to verify failed mailbox', path, err: E });
                         }
-
-                        this.log.trace({
-                            msg: 'Failed to acquire mailbox lock',
-                            path,
-                            lockId,
-                            idling: this.idling,
-                            ...(options.description && { description: options.description }),
-                            err
-                        });
-                        reject(err);
-                        // Continue to next lock in queue
                     }
+
+                    this.log.trace({
+                        msg: 'Failed to acquire mailbox lock',
+                        path,
+                        lockId,
+                        idling: this.idling,
+                        ...(options.description && { description: options.description }),
+                        err
+                    });
+                    reject(err);
+                    // Continue to next lock in queue
                 }
             }
         } finally {
@@ -3691,16 +3655,15 @@ class ImapFlow extends EventEmitter {
             synteticLogger[level] = (...args) => {
                 // using {logger:false} disables logging
                 if (this.options.logger !== false) {
-                    if (logger)
-                        if (typeof mainLogger[level] !== 'function') {
-                            // we are checking to make sure the level is supported.
-                            // if it isn't supported but the level is error or fatal, log to console anyway.
-                            if (level === 'fatal' || level === 'error') {
-                                console.log(JSON.stringify(...args));
-                            }
-                        } else {
-                            mainLogger[level](...args);
+                    if (typeof mainLogger[level] !== 'function') {
+                        // we are checking to make sure the level is supported.
+                        // if it isn't supported but the level is error or fatal, log to console anyway.
+                        if (level === 'fatal' || level === 'error') {
+                            console.log(JSON.stringify(...args));
                         }
+                    } else {
+                        mainLogger[level](...args);
+                    }
                 }
 
                 if (this.emitLogs && args && args[0] && typeof args[0] === 'object') {

package/lib/search-compiler.js

@@ -316,16 +316,10 @@ module.exports.searchCompiler = (connection, query) => {
 
                 // NOT operator
                 case 'NOT':
-                    {
-                        if (!params[term]) {
-                            break;
-                        }
-
-                        if (typeof params[term] === 'object') {
-                            attributes.push({ type: 'ATOM', value: 'NOT' });
-                            // Recursively process NOT conditions
-                            walk(params[term]);
-                        }
+                    if (params[term] && typeof params[term] === 'object') {
+                        attributes.push({ type: 'ATOM', value: 'NOT' });
+                        // Recursively process NOT conditions
+                        walk(params[term]);
                     }
                     break;
 

package/lib/tools.js

@@ -77,7 +77,7 @@ const tools = {
         }
 
         // ensure namespace prefix if needed
-        if (!skipNamespace && connection.namespace && connection.namespace.prefix && path.indexOf(connection.namespace.prefix) !== 0) {
+        if (!skipNamespace && connection.namespace && connection.namespace.prefix && !path.startsWith(connection.namespace.prefix)) {
             path = connection.namespace.prefix + path;
         }
 
@@ -111,7 +111,7 @@ const tools = {
         if (list && Array.isArray(list)) {
             list.forEach(val => {
                 if (typeof val.value !== 'string') {
-                    return false;
+                    return;
                 }
                 let capability = val.value.toUpperCase().trim();
 
@@ -120,7 +120,7 @@ const tools = {
                     return;
                 }
 
-                if (capability.indexOf('APPENDLIMIT=') === 0) {
+                if (capability.startsWith('APPENDLIMIT=')) {
                     let splitPos = capability.indexOf('=');
                     let appendLimit = Number(capability.substr(splitPos + 1)) || 0;
                     map.set('APPENDLIMIT', appendLimit);
@@ -205,8 +205,6 @@ const tools = {
                 let cur = node.folders && node.folders.find(folder => folder.name === parent);
                 if (cur) {
                     node = cur;
-                } else {
-                    // not yet set, will be created by the caller
                 }
             }
 
@@ -294,7 +292,7 @@ const tools = {
 
         const color = bit0 | bit1 | bit2; // eslint-disable-line no-bitwise
 
-        return FLAG_COLORS[color] || 'red'; // default to red for the unused \b111
+        return FLAG_COLORS[color] ?? 'red'; // default to red for the unused \b111
     },
 
     /**
@@ -306,23 +304,20 @@ const tools = {
     getColorFlags(color) {
         // Reverse mapping from a color name to the Apple Mail $MailFlagBit0/1/2 flags.
         // Returns an object with 'add' and 'remove' arrays so the caller can STORE +FLAGS/-FLAGS.
-        const colorCode = color ? FLAG_COLORS.indexOf((color || '').toString().toLowerCase().trim()) : null;
-        if (colorCode < 0 && colorCode !== null) {
+        const colorCode = color ? FLAG_COLORS.indexOf(color.toString().toLowerCase().trim()) : null;
+        if (colorCode === null || colorCode < 0) {
+            if (colorCode === null) {
+                // Remove color: remove \Flagged and all MailFlagBit flags
+                return { add: [], remove: ['\\Flagged', '$MailFlagBit0', '$MailFlagBit1', '$MailFlagBit2'] };
+            }
             return null;
         }
 
         // Decompose color index back into its 3-bit representation
-        const bits = [];
-        bits[0] = colorCode & 1; // eslint-disable-line no-bitwise
-        bits[1] = colorCode & 2; // eslint-disable-line no-bitwise
-        bits[2] = colorCode & 4; // eslint-disable-line no-bitwise
-
-        // If colorCode is truthy (non-zero), add \Flagged; if zero/null, remove \Flagged
-        let result = { add: colorCode ? ['\\Flagged'] : [], remove: colorCode ? [] : ['\\Flagged'] };
-
-        // For each bit, add the corresponding $MailFlagBitN if set, remove it if unset
-        for (let i = 0; i < bits.length; i++) {
-            if (bits[i]) {
+        let result = { add: ['\\Flagged'], remove: [] };
+        for (let i = 0; i < 3; i++) {
+            // eslint-disable-next-line no-bitwise
+            if (colorCode & (1 << i)) {
                 result.add.push(`$MailFlagBit${i}`);
             } else {
                 result.remove.push(`$MailFlagBit${i}`);
@@ -529,7 +524,7 @@ const tools = {
     processName(name) {
         name = (name || '').toString();
         if (name.length > 2 && name.at(0) === '"' && name.at(-1) === '"') {
-            name = name.replace(/^"|"$/g, '');
+            name = name.slice(1, -1);
         }
         return name;
     },
@@ -679,7 +674,7 @@ const tools = {
             value = params[key];
 
             // The first segment (*0*) may contain charset and language: charset'language'value
-            if (nr === 0 && match[0].charAt(match[0].length - 1) === '*' && (match = value.match(/^([^']*)'[^']*'(.*)$/))) {
+            if (nr === 0 && match[0].at(-1) === '*' && (match = value.match(/^([^']*)'[^']*'(.*)$/))) {
                 params[actualKey].charset = match[1] || 'utf-8';
                 value = match[2];
             }
@@ -713,12 +708,11 @@ const tools = {
                             value
                                 // fix invalidly encoded chars
                                 .replace(/[=?_\s]/g, s => {
-                                    let c = s.charCodeAt(0).toString(16);
                                     if (s === ' ') {
                                         return '_';
-                                    } else {
-                                        return '%' + (c.length < 2 ? '0' : '') + c;
                                     }
+                                    let c = s.charCodeAt(0).toString(16);
+                                    return '%' + (c.length < 2 ? '0' : '') + c;
                                 })
                                 // change from urlencoding to percent encoding
                                 .replace(/%/g, '=') +
@@ -788,25 +782,25 @@ const tools = {
 
                 // id
                 if (node[i]) {
-                    curNode.id = ((node[i] || {}).value || '').toString();
+                    curNode.id = (node[i].value || '').toString();
                 }
                 i++;
 
                 // description
                 if (node[i]) {
-                    curNode.description = ((node[i] || {}).value || '').toString();
+                    curNode.description = (node[i].value || '').toString();
                 }
                 i++;
 
                 // encoding
                 if (node[i]) {
-                    curNode.encoding = ((node[i] || {}).value || '').toString().toLowerCase();
+                    curNode.encoding = (node[i].value || '').toString().toLowerCase();
                 }
                 i++;
 
                 // size
                 if (node[i]) {
-                    curNode.size = Number((node[i] || {}).value || 0) || 0;
+                    curNode.size = Number(node[i].value || 0) || 0;
                 }
                 i++;
 
@@ -834,7 +828,7 @@ const tools = {
 
                     // line count
                     if (node[i]) {
-                        curNode.lineCount = Number((node[i] || {}).value || 0) || 0;
+                        curNode.lineCount = Number(node[i].value || 0) || 0;
                     }
                     i++;
                 }
@@ -850,8 +844,7 @@ const tools = {
                     } else {
                         // correct structure, line count number is provided
                         if (node[i]) {
-                            // line count
-                            curNode.lineCount = Number((node[i] || {}).value || 0) || 0;
+                            curNode.lineCount = Number(node[i].value || 0) || 0;
                         }
                         i++;
                     }
@@ -862,7 +855,7 @@ const tools = {
                 // md5
                 if (i < node.length - 1) {
                     if (node[i]) {
-                        curNode.md5 = ((node[i] || {}).value || '').toString().toLowerCase();
+                        curNode.md5 = (node[i].value || '').toString().toLowerCase();
                     }
                     i++;
                 }
@@ -874,7 +867,7 @@ const tools = {
             // body disposition
             if (i < node.length - 1) {
                 if (Array.isArray(node[i]) && node[i].length) {
-                    curNode.disposition = ((node[i][0] || {}).value || '').toString().toLowerCase();
+                    curNode.disposition = ((node[i][0] && node[i][0].value) || '').toString().toLowerCase();
                     if (Array.isArray(node[i][1])) {
                         curNode.dispositionParameters = tools.getStructuredParams(node[i][1]);
                     }
@@ -895,7 +888,7 @@ const tools = {
             // Errata: http://www.rfc-editor.org/errata_search.php?rfc=3501
             if (i < node.length - 1) {
                 if (node[i]) {
-                    curNode.location = ((node[i] || {}).value || '').toString();
+                    curNode.location = (node[i].value || '').toString();
                 }
             }
 
@@ -990,7 +983,7 @@ const tools = {
             case '\\flagged':
             case '\\deleted':
             case '\\draft':
-                // can not set or remove
+                // normalize capitalization (e.g., "\\seen" -> "\\Seen")
                 return flag.toLowerCase().replace(/^\\./, c => c.toUpperCase());
         }
         return flag;
@@ -1048,7 +1041,7 @@ const tools = {
      */
     getDecoder(charset) {
         charset = (charset || 'ascii').toString().trim().toLowerCase();
-        if (/^jis|^iso-?2022-?jp|^EUCJP/i.test(charset)) {
+        if (/^jis|^iso-?2022-?jp|^euc-?jp/.test(charset)) {
             // special case not supported by iconv-lite
             return new JPDecoder(charset);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.2.13",
+    "version": "1.2.14",
     "description": "IMAP Client for Node",
     "main": "lib/imap-flow.js",
     "types": "lib/imap-flow.d.ts",
@@ -28,7 +28,7 @@
     "homepage": "https://imapflow.com/",
     "devDependencies": {
         "@eslint/js": "10.0.1",
-        "@types/node": "25.3.5",
+        "@types/node": "25.5.0",
         "c8": "11.0.0",
         "eslint": "10.0.3",
         "eslint-config-nodemailer": "1.2.0",