imapflow 1.2.17 → 1.3.0

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.2.17"
+    ".": "1.3.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [1.3.0](https://github.com/postalsys/imapflow/compare/v1.2.18...v1.3.0) (2026-04-08)
+
+
+### Features
+
+* add ESEARCH (RFC 4731) and PARTIAL (RFC 9394) support ([#347](https://github.com/postalsys/imapflow/issues/347)) ([c9b608b](https://github.com/postalsys/imapflow/commit/c9b608bb049b5b17f274f97f0f8dbbc3b18a80f7))
+
+
+### Bug Fixes
+
+* Bumped deps ([b584d2b](https://github.com/postalsys/imapflow/commit/b584d2b336e1229a676277209c1942176186ce94))
+* correct ESEARCH search() return type and prevent async test hangs ([f2e6e92](https://github.com/postalsys/imapflow/commit/f2e6e922acafffc125f16a4eb128a52c01313a45))
+* handle plain Array form for PARTIAL in ESEARCH parser ([8b74c25](https://github.com/postalsys/imapflow/commit/8b74c2569675ea7d3f2cea6a3fcd717a8c6b025e))
+
+## [1.2.18](https://github.com/postalsys/imapflow/compare/v1.2.17...v1.2.18) (2026-03-25)
+
+
+### Bug Fixes
+
+* use consistent keys for requestTagMap deletion during connection close ([92e1885](https://github.com/postalsys/imapflow/commit/92e188507c0376577f1680f42df747e2cc4b677a))
+
 ## [1.2.17](https://github.com/postalsys/imapflow/compare/v1.2.16...v1.2.17) (2026-03-25)
 
 

package/CLAUDE.md

@@ -0,0 +1,5 @@
+# ImapFlow
+
+## Release Process
+
+Changelog and version numbers are managed automatically by the release-please GitHub Action. Do not check for or suggest CHANGELOG entries or version bumps during code reviews.

package/lib/commands/search.js

@@ -3,6 +3,79 @@
 const { enhanceCommandError } = require('../tools.js');
 const { searchCompiler } = require('../search-compiler.js');
 
+/**
+ * Parses the key-value attributes from an ESEARCH untagged response.
+ *
+ * Receives the attribute list AFTER stripping the leading (TAG "X") list
+ * and the UID atom — i.e. only the result keyword/value pairs remain.
+ *
+ * ALL and PARTIAL.messages are kept as compact sequence-set strings.
+ * Use expandRange() from tools.js if you need to expand them.
+ *
+ * @param {Array} attrs - Attribute array from the IMAP parser
+ * @returns {Object} ESearchResult object
+ */
+function parseEsearchResponse(attrs) {
+    const result = {};
+    let i = 0;
+    while (i < attrs.length) {
+        const token = attrs[i];
+        if (!token || token.type !== 'ATOM') {
+            i++;
+            continue;
+        }
+        const key = token.value.toUpperCase();
+        if (i + 1 >= attrs.length) {
+            i++;
+            continue;
+        }
+        switch (key) {
+            case 'COUNT': {
+                const n = Number(attrs[++i]?.value);
+                if (!isNaN(n)) result.count = n;
+                break;
+            }
+            case 'MIN': {
+                const n = Number(attrs[++i]?.value);
+                if (!isNaN(n)) result.min = n;
+                break;
+            }
+            case 'MAX': {
+                const n = Number(attrs[++i]?.value);
+                if (!isNaN(n)) result.max = n;
+                break;
+            }
+            case 'ALL': {
+                const allToken = attrs[++i];
+                if (allToken && typeof allToken.value === 'string') {
+                    result.all = allToken.value;
+                }
+                break;
+            }
+            case 'PARTIAL': {
+                const listToken = attrs[++i];
+                // Parser represents parenthesized groups as plain Arrays,
+                // but check both forms for robustness.
+                const items = Array.isArray(listToken) ? listToken : listToken && Array.isArray(listToken.attributes) ? listToken.attributes : null;
+                if (!items || items.length < 2) break;
+                result.partial = {
+                    range: items[0].value,
+                    messages: items[1].value
+                };
+                break;
+            }
+            default:
+                // Skip the value token for unknown keys to keep the stream aligned.
+                // The loop's unconditional i++ at the bottom advances past the key;
+                // this extra i++ advances past the value token.
+                i++;
+                break;
+        }
+        i++;
+    }
+    return result;
+}
+
 /**
  * Searches for messages matching the specified criteria.
  *
@@ -10,7 +83,11 @@ const { searchCompiler } = require('../search-compiler.js');
  * @param {Object|boolean} query - Search query object, or true/empty object to match all messages
  * @param {Object} [options] - Search options
  * @param {boolean} [options.uid] - If true, use UID SEARCH instead of SEARCH
- * @returns {Promise<number[]|boolean>} Sorted array of matching sequence numbers or UIDs, or false on failure
+ * @param {Array} [options.returnOptions] - ESEARCH RETURN options. When present AND the
+ *   server advertises ESEARCH capability, triggers ESEARCH and returns an ESearchResult.
+ *   Items are strings ('MIN','MAX','COUNT','ALL') or objects ({ partial: '1:100' }).
+ *   When server lacks ESEARCH, falls back to plain SEARCH and returns number[].
+ * @returns {Promise<number[]|Object|boolean>}
  */
 module.exports = async (connection, query, options) => {
     if (connection.state !== connection.states.SELECTED) {
@@ -36,6 +113,58 @@ module.exports = async (connection, query, options) => {
         return false;
     }
 
+    const useEsearch = options.returnOptions && options.returnOptions.length > 0 && connection.capabilities.has('ESEARCH');
+
+    if (useEsearch) {
+        // Build RETURN (...) item list
+        const returnItems = [];
+        for (const opt of options.returnOptions) {
+            if (typeof opt === 'string') {
+                returnItems.push({ type: 'ATOM', value: opt.toUpperCase() });
+            } else if (opt && typeof opt.partial === 'string') {
+                // RFC 9394: PARTIAL is an atom followed by the range atom, both inside RETURN (...)
+                returnItems.push({ type: 'ATOM', value: 'PARTIAL' });
+                returnItems.push({ type: 'ATOM', value: opt.partial });
+            }
+        }
+
+        // If all returnOptions entries were invalid (e.g. objects lacking a string
+        // `partial` field), returnItems would be empty. Emitting "RETURN ()" is
+        // technically valid per RFC 4731 but returns nothing useful. Fall through
+        // to the legacy SEARCH path instead so the caller gets a usable result.
+        if (returnItems.length > 0) {
+            const returnClause = [{ type: 'ATOM', value: 'RETURN' }, returnItems];
+
+            let esearchResult = {};
+            let response;
+            try {
+                response = await connection.exec(options.uid ? 'UID SEARCH' : 'SEARCH', [...returnClause, ...attributes], {
+                    untagged: {
+                        ESEARCH: async untagged => {
+                            if (!untagged || !untagged.attributes) return;
+                            // Strip leading (TAG "X") list and optional UID atom.
+                            // The IMAP parser represents parenthesized groups as
+                            // plain Arrays, not objects with type: 'LIST'.
+                            let attrs = untagged.attributes;
+                            let start = 0;
+                            if (attrs[start] && (Array.isArray(attrs[start]) || attrs[start].type === 'LIST')) start++;
+                            if (attrs[start] && typeof attrs[start].value === 'string' && attrs[start].value.toUpperCase() === 'UID') start++;
+                            esearchResult = parseEsearchResponse(attrs.slice(start));
+                        }
+                    }
+                });
+                response.next();
+                return esearchResult;
+            } catch (err) {
+                await enhanceCommandError(err);
+                connection.log.warn({ err, cid: connection.id });
+                return false;
+            }
+        }
+        // returnItems was empty — fall through to legacy SEARCH path below
+    }
+
+    // ── Legacy SEARCH path (no returnOptions, or server lacks ESEARCH) ────
     // Use a Set to deduplicate sequence numbers/UIDs -- servers may return
     // duplicates across multiple untagged SEARCH responses.
     let results = new Set();
@@ -63,3 +192,6 @@ module.exports = async (connection, query, options) => {
         return false;
     }
 };
+
+// Exported for unit testing — not intended as public library API
+module.exports.parseEsearchResponse = parseEsearchResponse;

package/lib/imap-flow.d.ts

@@ -606,6 +606,25 @@ export interface ResponseEvent {
     code?: string;
 }
 
+/** Result object returned by ESEARCH (RFC 4731) when returnOptions is specified */
+export interface ESearchResult {
+    /** Total number of matching messages */
+    count?: number;
+    /** Lowest matching UID */
+    min?: number;
+    /** Highest matching UID */
+    max?: number;
+    /** All matching UIDs as compact sequence-set string (e.g. "1,5:10,20") */
+    all?: string;
+    /** Paged subset (RFC 9394 PARTIAL) */
+    partial?: {
+        /** The requested range, e.g. "1:100" */
+        range: string;
+        /** Matching UIDs in that range as compact sequence-set */
+        messages: string;
+    };
+}
+
 export class AuthenticationFailure extends Error {
     authenticationFailed: true;
     serverResponseCode?: string;
@@ -725,8 +744,13 @@ export class ImapFlow extends EventEmitter {
     /** Moves messages from current mailbox to destination mailbox */
     messageMove(range: SequenceString | number[] | SearchObject, destination: string, options?: { uid?: boolean }): Promise<CopyResponseObject | false>;
 
-    /** Search messages from the currently opened mailbox */
+    /** Search messages from the currently opened mailbox — returns number[] (backward-compatible) */
     search(query: SearchObject, options?: { uid?: boolean }): Promise<number[] | false>;
+    /** Search messages with ESEARCH RETURN options — returns ESearchResult */
+    search(query: SearchObject, options: {
+        uid?: boolean;
+        returnOptions: Array<'MIN' | 'MAX' | 'COUNT' | 'ALL' | { partial: string }>;
+    }): Promise<ESearchResult | number[] | false>;
 
     /** Fetch messages from the currently opened mailbox */
     fetch(range: SequenceString | number[] | SearchObject, query: FetchQueryObject, options?: FetchOptions): AsyncIterableIterator<FetchMessageObject>;

package/lib/imap-flow.js

@@ -1799,9 +1799,10 @@ class ImapFlow extends EventEmitter {
 
             // reject command that is currently processed
             if (this.currentRequest && this.requestTagMap.has(this.currentRequest.tag)) {
-                let request = this.requestTagMap.get(this.currentRequest.tag);
+                let tag = this.currentRequest.tag;
+                let request = this.requestTagMap.get(tag);
                 if (request) {
-                    this.requestTagMap.delete(request.tag);
+                    this.requestTagMap.delete(tag);
                     pendingRequests.push(request);
                 }
                 this.currentRequest = false;
@@ -1813,7 +1814,7 @@ class ImapFlow extends EventEmitter {
                 if (req && this.requestTagMap.has(req.tag)) {
                     let request = this.requestTagMap.get(req.tag);
                     if (request) {
-                        this.requestTagMap.delete(request.tag);
+                        this.requestTagMap.delete(req.tag);
                         pendingRequests.push(request);
                     }
                 }
@@ -2598,7 +2599,40 @@ class ImapFlow extends EventEmitter {
             return;
         }
 
-        return (await this.run('SEARCH', query, options)) || false;
+        const result = (await this.run('SEARCH', query, options)) || false;
+
+        // When returnOptions was requested but server lacked ESEARCH capability,
+        // search.js returns a plain number[]. Derive ESearchResult client-side.
+        if (options && options.returnOptions && Array.isArray(result)) {
+            const arr = result;
+            // Normalize to uppercase so callers can use mixed-case strings like 'count'
+            const normalizedOptions = options.returnOptions.map(o => (typeof o === 'string' ? o.toUpperCase() : o));
+            const esearch = {};
+            if (normalizedOptions.includes('COUNT')) {
+                esearch.count = arr.length;
+            }
+            if (normalizedOptions.includes('MIN') && arr.length) {
+                esearch.min = arr[0]; // already sorted ascending by search.js
+            }
+            if (normalizedOptions.includes('MAX') && arr.length) {
+                esearch.max = arr[arr.length - 1];
+            }
+            if (normalizedOptions.includes('ALL') && arr.length) {
+                esearch.all = packMessageRange(arr);
+            }
+            // PARTIAL cannot be derived client-side — omit it.
+            // When returnOptions contains only { partial: ... } items and the server
+            // lacks ESEARCH, PARTIAL cannot be derived client-side. Return the raw
+            // number[] so the caller has actionable data. Note: this is an edge case
+            // — callers targeting no-ESEARCH servers should avoid requesting PARTIAL
+            // without COUNT or ALL.
+            if (Object.keys(esearch).length === 0) {
+                return result;
+            }
+            return esearch;
+        }
+
+        return result;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.2.17",
+    "version": "1.3.0",
     "description": "IMAP Client for Node",
     "main": "lib/imap-flow.js",
     "types": "lib/imap-flow.d.ts",
@@ -28,9 +28,9 @@
     "homepage": "https://imapflow.com/",
     "devDependencies": {
         "@eslint/js": "10.0.1",
-        "@types/node": "25.5.0",
+        "@types/node": "25.5.2",
         "c8": "11.0.0",
-        "eslint": "10.1.0",
+        "eslint": "10.2.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "10.1.8",
         "grunt": "1.6.1",
@@ -48,7 +48,7 @@
         "libbase64": "1.3.0",
         "libmime": "5.3.7",
         "libqp": "2.1.1",
-        "nodemailer": "8.0.4",
+        "nodemailer": "8.0.5",
         "pino": "10.3.1",
         "socks": "2.8.7"
     }

package/test/search-test.js

@@ -0,0 +1,241 @@
+'use strict';
+
+const searchCmd = require('../lib/commands/search');
+const { parseEsearchResponse } = searchCmd;
+const { ImapFlow } = require('../lib/imap-flow');
+
+// Mock connection — capabilities is Map (matches real ImapFlow)
+function makeConnection({ hasEsearch = true } = {}) {
+    const caps = new Map();
+    if (hasEsearch) {
+        caps.set('ESEARCH', true);
+    }
+    return {
+        state: 'SELECTED',
+        states: { SELECTED: 'SELECTED' },
+        capabilities: caps,
+        exec: async () => ({ next: () => {} }),
+        log: { warn: () => {} }
+    };
+}
+
+// ── Parser tests ───────────────────────────────────────────────────────────
+
+module.exports['ESEARCH: parseEsearchResponse COUNT only'] = test => {
+    const attrs = [
+        { type: 'ATOM', value: 'COUNT' },
+        { type: 'ATOM', value: '42' }
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.equal(result.count, 42);
+    test.equal(result.min, undefined);
+    test.equal(result.max, undefined);
+    test.done();
+};
+
+module.exports['ESEARCH: parseEsearchResponse MIN MAX'] = test => {
+    const attrs = [
+        { type: 'ATOM', value: 'MIN' },
+        { type: 'ATOM', value: '1001' },
+        { type: 'ATOM', value: 'MAX' },
+        { type: 'ATOM', value: '9876' }
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.equal(result.min, 1001);
+    test.equal(result.max, 9876);
+    test.done();
+};
+
+module.exports['ESEARCH: parseEsearchResponse ALL keeps compact string'] = test => {
+    const attrs = [
+        { type: 'ATOM', value: 'ALL' },
+        { type: 'ATOM', value: '1001,1005:1010,1020' }
+    ];
+    const result = parseEsearchResponse(attrs);
+    // Must be preserved as compact string — NOT an array
+    test.equal(typeof result.all, 'string');
+    test.equal(result.all, '1001,1005:1010,1020');
+    test.done();
+};
+
+module.exports['ESEARCH: parseEsearchResponse PARTIAL (Array form)'] = test => {
+    // Parser represents parenthesized groups as plain Arrays
+    const attrs = [
+        { type: 'ATOM', value: 'PARTIAL' },
+        [
+            { type: 'ATOM', value: '1:100' },
+            { type: 'ATOM', value: '1001,1003:1010,1015' }
+        ]
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.deepEqual(result.partial, { range: '1:100', messages: '1001,1003:1010,1015' });
+    test.done();
+};
+
+module.exports['ESEARCH: parseEsearchResponse PARTIAL (LIST object form)'] = test => {
+    // Also handle {type: 'LIST', attributes: [...]} form for robustness
+    const attrs = [
+        { type: 'ATOM', value: 'PARTIAL' },
+        {
+            type: 'LIST',
+            attributes: [
+                { type: 'ATOM', value: '1:100' },
+                { type: 'ATOM', value: '1001,1003:1010,1015' }
+            ]
+        }
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.deepEqual(result.partial, { range: '1:100', messages: '1001,1003:1010,1015' });
+    test.done();
+};
+
+module.exports['ESEARCH: parseEsearchResponse COUNT + PARTIAL combined'] = test => {
+    const attrs = [
+        { type: 'ATOM', value: 'COUNT' },
+        { type: 'ATOM', value: '34201' },
+        { type: 'ATOM', value: 'PARTIAL' },
+        [
+            { type: 'ATOM', value: '1:100' },
+            { type: 'ATOM', value: '2001,2003:2020' }
+        ]
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.equal(result.count, 34201);
+    test.deepEqual(result.partial, { range: '1:100', messages: '2001,2003:2020' });
+    test.done();
+};
+
+// ── Command-building tests ─────────────────────────────────────────────────
+
+module.exports['ESEARCH: emits RETURN clause when returnOptions present and server has ESEARCH'] = test => {
+    const conn = makeConnection({ hasEsearch: true });
+    let capturedCommand = null;
+    let capturedAttributes = null;
+    conn.exec = async (command, attributes) => {
+        capturedCommand = command;
+        capturedAttributes = JSON.stringify(attributes);
+        return { next: () => {} };
+    };
+    searchCmd(conn, { seen: false }, { uid: true, returnOptions: ['COUNT'] }).then(() => {
+        test.equal(capturedCommand, 'UID SEARCH');
+        test.ok(capturedAttributes.includes('"RETURN"'), 'should include RETURN atom');
+        test.ok(capturedAttributes.includes('"COUNT"'), 'should include COUNT in return list');
+        test.done();
+    }).catch(err => test.done(err));
+};
+
+module.exports['ESEARCH: RETURN clause includes PARTIAL range atom'] = test => {
+    const conn = makeConnection({ hasEsearch: true });
+    let capturedAttributes = null;
+    conn.exec = async (command, attributes) => {
+        capturedAttributes = JSON.stringify(attributes);
+        return { next: () => {} };
+    };
+    searchCmd(conn, { seen: false }, { uid: true, returnOptions: [{ partial: '1:100' }] }).then(() => {
+        test.ok(capturedAttributes.includes('"PARTIAL"'), 'should include PARTIAL atom');
+        test.ok(capturedAttributes.includes('"1:100"'), 'should include range string');
+        test.done();
+    }).catch(err => test.done(err));
+};
+
+module.exports['ESEARCH: no RETURN clause when server lacks ESEARCH capability'] = test => {
+    const conn = makeConnection({ hasEsearch: false });
+    let capturedAttributes = null;
+    conn.exec = async (command, attributes, handlers) => {
+        capturedAttributes = JSON.stringify(attributes);
+        // Simulate plain SEARCH response
+        const searchHandler = handlers && handlers.untagged && handlers.untagged.SEARCH;
+        if (searchHandler) {
+            await searchHandler({
+                attributes: [{ value: '1' }, { value: '2' }, { value: '3' }]
+            });
+        }
+        return { next: () => {} };
+    };
+    searchCmd(conn, { seen: false }, { uid: true, returnOptions: ['COUNT', 'ALL'] }).then(result => {
+        test.ok(!capturedAttributes.includes('"RETURN"'), 'should NOT include RETURN when no ESEARCH');
+        test.ok(Array.isArray(result), 'should return number[] when ESEARCH unavailable');
+        test.deepEqual(result, [1, 2, 3]);
+        test.done();
+    }).catch(err => test.done(err));
+};
+
+module.exports['ESEARCH: parseEsearchResponse ignores unknown keywords'] = test => {
+    // Dovecot with CONDSTORE may append MODSEQ to ESEARCH responses
+    const attrs = [
+        { type: 'ATOM', value: 'COUNT' },
+        { type: 'ATOM', value: '5' },
+        { type: 'ATOM', value: 'MODSEQ' },
+        { type: 'ATOM', value: '12345' }
+    ];
+    const result = parseEsearchResponse(attrs);
+    test.equal(result.count, 5);
+    test.equal(result.modseq, undefined, 'unknown keys should not appear in result');
+    test.done();
+};
+
+module.exports['ESEARCH: backward compat — no returnOptions returns number[]'] = test => {
+    const conn = makeConnection({ hasEsearch: true });
+    conn.exec = async (command, attributes, handlers) => {
+        const searchHandler = handlers && handlers.untagged && handlers.untagged.SEARCH;
+        if (searchHandler) {
+            await searchHandler({
+                attributes: [{ value: '10' }, { value: '20' }]
+            });
+        }
+        return { next: () => {} };
+    };
+    // No returnOptions — must return number[] even if server has ESEARCH
+    searchCmd(conn, { seen: true }, { uid: true }).then(result => {
+        test.ok(Array.isArray(result));
+        test.deepEqual(result, [10, 20]);
+        test.done();
+    }).catch(err => test.done(err));
+};
+
+// ── imap-flow.js public API fallback test ─────────────────────────────────
+module.exports['imap-flow: search() derives ESearchResult when server has no ESEARCH'] = test => {
+    const client = new ImapFlow({
+        host: 'imap.example.com',
+        port: 993,
+        auth: { user: 'test', pass: 'test' },
+        logger: false
+    });
+
+    // Simulate a selected mailbox and no ESEARCH capability
+    client.mailbox = { path: 'INBOX' };
+    client.state = client.states.SELECTED;
+    client.capabilities = new Map(); // no ESEARCH
+
+    // Stub run() to return a sorted number[]
+    client.run = async () => [10, 20, 30, 40, 50];
+
+    client.search({ seen: false }, { uid: true, returnOptions: ['COUNT', 'MIN', 'MAX', 'ALL'] }).then(result => {
+        test.equal(typeof result, 'object', 'should return object, not array');
+        test.ok(!Array.isArray(result), 'should not be an array');
+        test.equal(result.count, 5);
+        test.equal(result.min, 10);
+        test.equal(result.max, 50);
+        // packMessageRange([10,20,30,40,50]) → "10,20,30,40,50" (non-contiguous)
+        test.ok(typeof result.all === 'string' && result.all.length > 0, 'all should be non-empty compact string');
+        test.done();
+    }).catch(err => test.done(err));
+};
+
+module.exports['imap-flow: search() fallback with empty result set'] = test => {
+    const client = new ImapFlow({
+        host: 'imap.example.com',
+        port: 993,
+        auth: { user: 'test', pass: 'test' },
+        logger: false
+    });
+    client.mailbox = { path: 'INBOX' };
+    client.state = client.states.SELECTED;
+    client.capabilities = new Map();
+    client.run = async () => [];
+    client.search({}, { uid: true, returnOptions: ['COUNT', 'ALL'] }).then(result => {
+        test.equal(result.count, 0);
+        test.equal(result.all, undefined, 'all should be absent for empty result');
+        test.done();
+    }).catch(err => test.done(err));
+};