imapflow 2.2.9 → 2.2.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.2.10](https://github.com/postalsys/imapflow/compare/v2.2.9...v2.2.10) (2026-10-07)
+
+
+### Bug Fixes
+
+* log socket errors after a failed STARTTLS upgrade instead of throwing them on Bun ([74fad57](https://github.com/postalsys/imapflow/commit/74fad57386cde6a60211b9b1671228b72aa9f94a))
+* take the requested message in fetchOne() when a FETCH answer also carries unsolicited rows ([74fad57](https://github.com/postalsys/imapflow/commit/74fad57386cde6a60211b9b1671228b72aa9f94a)), closes [#426](https://github.com/postalsys/imapflow/issues/426)
+
 ## [2.2.9](https://github.com/postalsys/imapflow/compare/v2.2.8...v2.2.9) (2026-10-07)
 
 

package/dist/cjs/imap-flow.js

@@ -1512,6 +1512,13 @@ class ImapFlow extends node_events_1.EventEmitter {
             // socket event cannot re-enter an already settled upgrade or leave state behind.
             const settle = (err, result) => {
                 if (settled) {
+                    // A failed handshake can produce more than one error (Bun emits ECONNRESET on
+                    // the TLS socket after the one that settled the upgrade). settle() stays the
+                    // error listener of both sockets until they are torn down, so later errors
+                    // end up here instead of being thrown as unhandled 'error' events.
+                    if (err) {
+                        this.log.debug({ msg: 'Socket error after the TLS upgrade was settled', err, cid: this.id });
+                    }
                     return;
                 }
                 settled = true;
@@ -1519,9 +1526,12 @@ class ImapFlow extends node_events_1.EventEmitter {
                 this.upgradeTimeout = null;
                 this.upgrading = false;
                 this._upgradeReject = null;
-                socketPlain.removeListener('error', settle);
-                if (this.socket && this.socket !== socketPlain) {
-                    this.socket.removeListener('error', settle);
+                if (!err) {
+                    // the generic socket handlers took over in the success callback
+                    socketPlain.removeListener('error', settle);
+                    if (this.socket && this.socket !== socketPlain) {
+                        this.socket.removeListener('error', settle);
+                    }
                 }
                 if (err) {
                     (0, tools_js_1.clearTimer)(this.connectTimeout);
@@ -1539,7 +1549,7 @@ class ImapFlow extends node_events_1.EventEmitter {
             // one function, one settlement, and removeListener() in settle() needs no separate
             // handler references. A TLS handshake failure (bad certificate, protocol mismatch)
             // is emitted on the new TLS socket rather than on the plain one, so both are covered.
-            socketPlain.once('error', settle);
+            socketPlain.on('error', settle);
             /* c8 ignore start */ // UPGRADE_TIMEOUT is 10s; firing it deterministically would make the test suite hang
             this.upgradeTimeout = setTimeout(() => {
                 let err = new Error('Failed to upgrade connection in required time');
@@ -1617,7 +1627,7 @@ class ImapFlow extends node_events_1.EventEmitter {
             // error listener during the handshake window; the generic handlers are installed
             // by setSocketHandlers() inside the success callback above, so a handshake error
             // has a single error path.
-            tlsSocket.once('error', settle);
+            tlsSocket.on('error', settle);
             this.writeSocket = tlsSocket;
         });
         if (upgraded) {
@@ -3152,7 +3162,21 @@ class ImapFlow extends node_events_1.EventEmitter {
         if (!response || !response.list || !response.list.length) {
             return false;
         }
-        return response.list[0];
+        // Every FETCH row that arrived during the command is in the list, also unsolicited ones
+        // for other messages or with only a flag change, and a server may split the answer for
+        // one message over several rows. Taking the first row returned a flag update instead
+        // of the requested data, which ended a download after its first chunk (issue #426).
+        let rows = response.list;
+        let requested = (0, tools_js_1.parseUintValue)(String(seq), tools_js_1.MAX_UINT32_DIGITS);
+        // a range: the first message of the answer, as before
+        let target = requested === false ? rows[0] : rows.find(row => (options && options.uid ? row.uid : row.seq) === requested);
+        if (!target) {
+            return false;
+        }
+        // rows of the same message, without the ones a malformed answer gives no usable
+        // sequence number or another UID
+        let { seq: targetSeq, uid: targetUid } = target;
+        return targetSeq ? (0, tools_js_1.mergeFetchRows)(rows.filter(row => row.seq === targetSeq && (!row.uid || !targetUid || row.uid === targetUid))) : target;
     }
     /**
      * Download either full rfc822 formatted message or a specific bodystructure part as a Stream.

package/dist/cjs/package-info.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "imapflow";
-export declare const version = "2.2.9";
+export declare const version = "2.2.10";
 export declare const homepage = "https://imapflow.com/";

package/dist/cjs/package-info.js

@@ -3,5 +3,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.homepage = exports.version = exports.name = void 0;
 exports.name = "imapflow";
-exports.version = "2.2.9";
+exports.version = "2.2.10";
 exports.homepage = "https://imapflow.com/";

package/dist/cjs/tools.d.ts

@@ -287,6 +287,16 @@ export declare function getColorFlags(color: string | null | undefined): {
     add: string[];
     remove: string[];
 } | null;
+/**
+ * Merges the FETCH rows a server sent for one message into one message object. A server may
+ * split the data items of a message over several FETCH responses, and may put an unsolicited
+ * one (a flag change made by another session) in between (RFC 9051 sections 7.5.2 and 5.2).
+ * Later rows win for single values, bodyParts, binaryParts and partialOrigins are combined.
+ *
+ * @param rows - Formatted rows of the same message, in the order they arrived
+ * @returns One message object holding the data of every row
+ */
+export declare function mergeFetchRows(rows: FetchMessageObject[]): FetchMessageObject;
 /**
  * Formats a raw untagged FETCH response into a structured message object.
  *

package/dist/cjs/tools.js

@@ -32,6 +32,7 @@ exports.getSelectedMailbox = getSelectedMailbox;
 exports.getFolderTree = getFolderTree;
 exports.getFlagColor = getFlagColor;
 exports.getColorFlags = getColorFlags;
+exports.mergeFetchRows = mergeFetchRows;
 exports.formatMessageResponse = formatMessageResponse;
 exports.processName = processName;
 exports.decodeText = decodeText;
@@ -713,6 +714,34 @@ function getColorFlags(color) {
     }
     return result;
 }
+/**
+ * Merges the FETCH rows a server sent for one message into one message object. A server may
+ * split the data items of a message over several FETCH responses, and may put an unsolicited
+ * one (a flag change made by another session) in between (RFC 9051 sections 7.5.2 and 5.2).
+ * Later rows win for single values, bodyParts, binaryParts and partialOrigins are combined.
+ *
+ * @param rows - Formatted rows of the same message, in the order they arrived
+ * @returns One message object holding the data of every row
+ */
+function mergeFetchRows(rows) {
+    if (rows.length === 1) {
+        return rows[0];
+    }
+    let merged = {};
+    let partialOrigins;
+    for (let row of rows) {
+        let { bodyParts, binaryParts, ...rest } = row;
+        Object.assign(merged, rest);
+        // combined into collections of their own, so the rows stay untouched
+        bodyParts?.forEach((value, key) => (merged.bodyParts ??= new Map()).set(key, value));
+        binaryParts?.forEach(key => (merged.binaryParts ??= new Set()).add(key));
+        row.partialOrigins?.forEach((value, key) => (partialOrigins ??= new Map()).set(key, value));
+    }
+    if (partialOrigins) {
+        Object.defineProperty(merged, 'partialOrigins', { value: partialOrigins, writable: true, configurable: true });
+    }
+    return merged;
+}
 /**
  * Formats a raw untagged FETCH response into a structured message object.
  *

package/dist/esm/imap-flow.js

@@ -16,7 +16,7 @@ import { ConnectionDeadline } from './connection-deadline.js';
 import { downloadMessage, downloadMessageParts } from './download.js';
 import { AuthenticationFailure } from './errors.js';
 import imapCommands from './imap-commands.js';
-import { comparePaths, updateCapabilities, getFolderTree, formatMessageResponse, packMessageRange, normalizePath, expandRange, getColorFlags, hasCapability, isRev2Active, logConnectionError, unrefTimer, clearTimer, parseUintValue, getStringList, getTextValues, emitSafe, buildConnectionError, guardedPromise, guardedReject, MAX_UINT32_DIGITS } from './tools.js';
+import { comparePaths, updateCapabilities, getFolderTree, formatMessageResponse, mergeFetchRows, packMessageRange, normalizePath, expandRange, getColorFlags, hasCapability, isRev2Active, logConnectionError, unrefTimer, clearTimer, parseUintValue, getStringList, getTextValues, emitSafe, buildConnectionError, guardedPromise, guardedReject, MAX_UINT32_DIGITS } from './tools.js';
 export { AuthenticationFailure, ImapFlowErrorCode } from './errors.js';
 const GREETING_TIMEOUT = 16 * 1000;
 const UPGRADE_TIMEOUT = 10 * 1000;
@@ -1471,6 +1471,13 @@ export class ImapFlow extends EventEmitter {
             // socket event cannot re-enter an already settled upgrade or leave state behind.
             const settle = (err, result) => {
                 if (settled) {
+                    // A failed handshake can produce more than one error (Bun emits ECONNRESET on
+                    // the TLS socket after the one that settled the upgrade). settle() stays the
+                    // error listener of both sockets until they are torn down, so later errors
+                    // end up here instead of being thrown as unhandled 'error' events.
+                    if (err) {
+                        this.log.debug({ msg: 'Socket error after the TLS upgrade was settled', err, cid: this.id });
+                    }
                     return;
                 }
                 settled = true;
@@ -1478,9 +1485,12 @@ export class ImapFlow extends EventEmitter {
                 this.upgradeTimeout = null;
                 this.upgrading = false;
                 this._upgradeReject = null;
-                socketPlain.removeListener('error', settle);
-                if (this.socket && this.socket !== socketPlain) {
-                    this.socket.removeListener('error', settle);
+                if (!err) {
+                    // the generic socket handlers took over in the success callback
+                    socketPlain.removeListener('error', settle);
+                    if (this.socket && this.socket !== socketPlain) {
+                        this.socket.removeListener('error', settle);
+                    }
                 }
                 if (err) {
                     clearTimer(this.connectTimeout);
@@ -1498,7 +1508,7 @@ export class ImapFlow extends EventEmitter {
             // one function, one settlement, and removeListener() in settle() needs no separate
             // handler references. A TLS handshake failure (bad certificate, protocol mismatch)
             // is emitted on the new TLS socket rather than on the plain one, so both are covered.
-            socketPlain.once('error', settle);
+            socketPlain.on('error', settle);
             /* c8 ignore start */ // UPGRADE_TIMEOUT is 10s; firing it deterministically would make the test suite hang
             this.upgradeTimeout = setTimeout(() => {
                 let err = new Error('Failed to upgrade connection in required time');
@@ -1576,7 +1586,7 @@ export class ImapFlow extends EventEmitter {
             // error listener during the handshake window; the generic handlers are installed
             // by setSocketHandlers() inside the success callback above, so a handshake error
             // has a single error path.
-            tlsSocket.once('error', settle);
+            tlsSocket.on('error', settle);
             this.writeSocket = tlsSocket;
         });
         if (upgraded) {
@@ -3111,7 +3121,21 @@ export class ImapFlow extends EventEmitter {
         if (!response || !response.list || !response.list.length) {
             return false;
         }
-        return response.list[0];
+        // Every FETCH row that arrived during the command is in the list, also unsolicited ones
+        // for other messages or with only a flag change, and a server may split the answer for
+        // one message over several rows. Taking the first row returned a flag update instead
+        // of the requested data, which ended a download after its first chunk (issue #426).
+        let rows = response.list;
+        let requested = parseUintValue(String(seq), MAX_UINT32_DIGITS);
+        // a range: the first message of the answer, as before
+        let target = requested === false ? rows[0] : rows.find(row => (options && options.uid ? row.uid : row.seq) === requested);
+        if (!target) {
+            return false;
+        }
+        // rows of the same message, without the ones a malformed answer gives no usable
+        // sequence number or another UID
+        let { seq: targetSeq, uid: targetUid } = target;
+        return targetSeq ? mergeFetchRows(rows.filter(row => row.seq === targetSeq && (!row.uid || !targetUid || row.uid === targetUid))) : target;
     }
     /**
      * Download either full rfc822 formatted message or a specific bodystructure part as a Stream.

package/dist/esm/package-info.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "imapflow";
-export declare const version = "2.2.9";
+export declare const version = "2.2.10";
 export declare const homepage = "https://imapflow.com/";

package/dist/esm/package-info.js

@@ -1,4 +1,4 @@
 // Generated by scripts/build.js from package.json. Do not edit by hand.
 export const name = "imapflow";
-export const version = "2.2.9";
+export const version = "2.2.10";
 export const homepage = "https://imapflow.com/";

package/dist/esm/tools.d.ts

@@ -287,6 +287,16 @@ export declare function getColorFlags(color: string | null | undefined): {
     add: string[];
     remove: string[];
 } | null;
+/**
+ * Merges the FETCH rows a server sent for one message into one message object. A server may
+ * split the data items of a message over several FETCH responses, and may put an unsolicited
+ * one (a flag change made by another session) in between (RFC 9051 sections 7.5.2 and 5.2).
+ * Later rows win for single values, bodyParts, binaryParts and partialOrigins are combined.
+ *
+ * @param rows - Formatted rows of the same message, in the order they arrived
+ * @returns One message object holding the data of every row
+ */
+export declare function mergeFetchRows(rows: FetchMessageObject[]): FetchMessageObject;
 /**
  * Formats a raw untagged FETCH response into a structured message object.
  *

package/dist/esm/tools.js

@@ -657,6 +657,34 @@ export function getColorFlags(color) {
     }
     return result;
 }
+/**
+ * Merges the FETCH rows a server sent for one message into one message object. A server may
+ * split the data items of a message over several FETCH responses, and may put an unsolicited
+ * one (a flag change made by another session) in between (RFC 9051 sections 7.5.2 and 5.2).
+ * Later rows win for single values, bodyParts, binaryParts and partialOrigins are combined.
+ *
+ * @param rows - Formatted rows of the same message, in the order they arrived
+ * @returns One message object holding the data of every row
+ */
+export function mergeFetchRows(rows) {
+    if (rows.length === 1) {
+        return rows[0];
+    }
+    let merged = {};
+    let partialOrigins;
+    for (let row of rows) {
+        let { bodyParts, binaryParts, ...rest } = row;
+        Object.assign(merged, rest);
+        // combined into collections of their own, so the rows stay untouched
+        bodyParts?.forEach((value, key) => (merged.bodyParts ??= new Map()).set(key, value));
+        binaryParts?.forEach(key => (merged.binaryParts ??= new Set()).add(key));
+        row.partialOrigins?.forEach((value, key) => (partialOrigins ??= new Map()).set(key, value));
+    }
+    if (partialOrigins) {
+        Object.defineProperty(merged, 'partialOrigins', { value: partialOrigins, writable: true, configurable: true });
+    }
+    return merged;
+}
 /**
  * Formats a raw untagged FETCH response into a structured message object.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "2.2.9",
+    "version": "2.2.10",
     "description": "IMAP Client for Node",
     "type": "module",
     "main": "./dist/cjs/imap-flow.js",
@@ -75,7 +75,7 @@
         "eslint": "10.12.0",
         "eslint-config-prettier": "10.1.8",
         "globals": "17.13.0",
-        "imapkit": "4.1.0",
+        "imapkit": "4.1.1",
         "prettier": "3.9.9",
         "tsx": "4.23.15",
         "types-node-legacy": "npm:@types/node@20.0.0",