imapflow 2.0.7 → 2.0.8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.0.8](https://github.com/postalsys/imapflow/compare/v2.0.7...v2.0.8) (2026-09-27)
+
+
+### Bug Fixes
+
+* do not expunge the source when the MOVE fallback's COPY fails ([11bbf84](https://github.com/postalsys/imapflow/commit/11bbf84fb0501f7392a5ced9787562cfcdcf7c9f)), closes [#406](https://github.com/postalsys/imapflow/issues/406)
+* surface throttle, truncation and listener failures instead of hiding them ([03a0624](https://github.com/postalsys/imapflow/commit/03a0624d0f381e935bbc3b4e12002272426abbae))
+* **types:** describe the quota response the way getQuota() returns it ([a2363b6](https://github.com/postalsys/imapflow/commit/a2363b6658d25d1a05a177a8dec556faf3df597b))
+
 ## [2.0.7](https://github.com/postalsys/imapflow/compare/v2.0.6...v2.0.7) (2026-09-25)
 
 

package/dist/cjs/commands/append.js

@@ -14,7 +14,7 @@ const tools_js_1 = require("../tools.js");
  * @throws {Error} If the APPEND command fails or message exceeds APPENDLIMIT
  */
 async function append(connection, destination, content, flags, idate) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state) || !destination) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection) || !destination) {
         // nothing to do here
         return;
     }
@@ -34,7 +34,9 @@ async function append(connection, destination, content, flags, idate) {
     destination = (0, tools_js_1.normalizePath)(connection, destination);
     // If appending to the currently selected mailbox, we can listen for the
     // untagged EXISTS response to capture the new message's sequence number.
-    let expectExists = (0, tools_js_1.comparePaths)(connection, connection.mailbox.path, destination);
+    let selected = (0, tools_js_1.getSelectedMailbox)(connection);
+    // The selected mailbox when appending to it, false otherwise
+    const targetMailbox = selected && (0, tools_js_1.comparePaths)(connection, selected.path, destination) ? selected : false;
     // Validate and format flags. Only flags allowed by the mailbox's permanentFlags are included.
     flags = (Array.isArray(flags) ? flags : [].concat(flags || []))
         .map(flag => flag && (0, tools_js_1.formatFlag)(flag.toString()))
@@ -77,13 +79,12 @@ async function append(connection, destination, content, flags, idate) {
         map.seq = seq;
         // Update the connection's mailbox state and emit 'exists' event if the
         // count changed (notifies listeners about the new message).
-        if (expectExists) {
-            let mailbox = connection.mailbox;
-            let prevCount = mailbox.exists;
+        if (targetMailbox) {
+            let prevCount = targetMailbox.exists;
             if (map.seq !== prevCount) {
-                mailbox.exists = map.seq;
-                connection.emit('exists', {
-                    path: mailbox.path,
+                targetMailbox.exists = map.seq;
+                (0, tools_js_1.emitSafe)(connection, 'exists', {
+                    path: targetMailbox.path,
                     count: map.seq,
                     prevCount
                 });
@@ -94,7 +95,7 @@ async function append(connection, destination, content, flags, idate) {
     try {
         response = await connection.exec('APPEND', attributes, {
             // Only listen for EXISTS if we're appending to the currently selected mailbox
-            untagged: expectExists ? { EXISTS: handleExistsUpdate } : false
+            untagged: targetMailbox ? { EXISTS: handleExistsUpdate } : false
         });
         // UIDPLUS (RFC 4315): the server may include APPENDUID response code in
         // the tagged OK. Format: [APPENDUID <uidValidity> <uid>]
@@ -119,7 +120,7 @@ async function append(connection, destination, content, flags, idate) {
         response.next();
         // If we didn't get an EXISTS during APPEND (some servers don't send it
         // until the next command), issue a NOOP to flush pending notifications.
-        if (expectExists && !map.seq) {
+        if (targetMailbox && !map.seq) {
             try {
                 response = await connection.exec('NOOP', false, {
                     untagged: { EXISTS: handleExistsUpdate },
@@ -142,8 +143,7 @@ async function append(connection, destination, content, flags, idate) {
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         throw err;
     }
 }

package/dist/cjs/commands/authenticate.d.ts

@@ -1,16 +1,11 @@
 import type { ImapFlow } from '../imap-flow.js';
+import type { AuthOptions } from '../types.js';
 /**
- * Credentials for the AUTHENTICATE command
+ * Credentials for the AUTHENTICATE command: the auth options, with the password passed as `password`
  */
-export interface AuthenticateCredentials {
-    /** OAuth2 access token for OAUTHBEARER/XOAUTH2 authentication */
-    accessToken?: string | undefined;
+export interface AuthenticateCredentials extends Omit<AuthOptions, 'user' | 'pass'> {
     /** Password for PLAIN or LOGIN authentication */
     password?: string | undefined;
-    /** Force a specific login method (e.g., 'AUTH=PLAIN', 'AUTH=LOGIN') */
-    loginMethod?: string | undefined;
-    /** Authorization identity for PLAIN authentication */
-    authzid?: string | undefined;
 }
 /**
  * Authenticates user using the best available method.

package/dist/cjs/commands/close.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = close;
+const tools_js_1 = require("../tools.js");
 /**
  * Closes the currently selected mailbox.
  *
@@ -26,7 +27,7 @@ async function close(connection) {
         connection.currentSelectCommand = false;
         connection.state = connection.states.AUTHENTICATED;
         if (currentMailbox) {
-            connection.emit('mailboxClose', currentMailbox);
+            (0, tools_js_1.emitSafe)(connection, 'mailboxClose', currentMailbox);
         }
         return true;
     }

package/dist/cjs/commands/copy.js

@@ -14,7 +14,8 @@ const copyuid_parser_js_1 = require("./copyuid-parser.js");
  * @returns Copy result with UID mapping if available, false on failure, or undefined if preconditions not met
  */
 async function copy(connection, range, destination, options) {
-    if (connection.state !== connection.states.SELECTED || !range || !destination) {
+    let mailbox = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (!mailbox || !range || !destination) {
         // nothing to do here
         return;
     }
@@ -28,15 +29,14 @@ async function copy(connection, range, destination, options) {
     try {
         response = await connection.exec(options.uid ? 'UID COPY' : 'COPY', attributes);
         response.next();
-        let map = { path: connection.mailbox.path, destination };
+        let map = { path: mailbox.path, destination };
         // UIDPLUS (RFC 4315): the server may include a COPYUID response code in the
         // tagged OK response, providing a mapping from source UIDs to destination UIDs.
         (0, copyuid_parser_js_1.parseCopyUid)(response.response, map);
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         return false;
     }
 }

package/dist/cjs/commands/create.js

@@ -11,7 +11,7 @@ const tools_js_1 = require("../tools.js");
  * @throws If the CREATE command fails (except when mailbox already exists)
  */
 async function create(connection, path) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state)) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection)) {
         // nothing to do here
         return;
     }
@@ -71,8 +71,7 @@ async function create(connection, path) {
                 created: false
             };
         }
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         throw err;
     }
 }

package/dist/cjs/commands/delete.js

@@ -11,14 +11,15 @@ const tools_js_1 = require("../tools.js");
  * @throws If the DELETE command fails
  */
 async function deleteMailbox(connection, path) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state)) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection)) {
         // nothing to do here
         return;
     }
     path = (0, tools_js_1.normalizePath)(connection, path);
     // If the mailbox to delete is currently selected, we must close/deselect it first.
     // IMAP servers reject DELETE on the currently selected mailbox (RFC 3501 6.3.4).
-    if (connection.state === connection.states.SELECTED && connection.mailbox.path === path) {
+    let selected = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (selected && selected.path === path) {
         await connection.run('CLOSE');
     }
     let response;
@@ -31,8 +32,7 @@ async function deleteMailbox(connection, path) {
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         throw err;
     }
 }

package/dist/cjs/commands/expunge.js

@@ -12,14 +12,19 @@ const tools_js_1 = require("../tools.js");
  * @returns True on success, false on failure, or undefined if preconditions not met
  */
 async function expunge(connection, range, options) {
-    if (connection.state !== connection.states.SELECTED || !range) {
+    let mailbox = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (!mailbox || !range) {
         // nothing to do here
         return;
     }
     options = options || {};
     // Two-step deletion process per IMAP protocol:
     // Step 1: Mark the target messages with the \Deleted flag.
-    await connection.messageFlagsAdd(range, ['\\Deleted'], options);
+    // If that failed, EXPUNGE would not remove the target messages (and without
+    // UIDPLUS it would remove unrelated \Deleted messages), so report the failure instead.
+    if (!(await connection.messageFlagsAdd(range, ['\\Deleted'], options))) {
+        return false;
+    }
     // Step 2: Issue EXPUNGE to permanently remove \Deleted messages.
     // With UIDPLUS (RFC 4315): "UID EXPUNGE <uids>" removes only the specified UIDs,
     // leaving other \Deleted messages untouched, important for concurrent access.
@@ -38,7 +43,6 @@ async function expunge(connection, range, options) {
         if (responseCode.toUpperCase() === 'HIGHESTMODSEQ') {
             // A response code always comes with its section, see responseCode above
             let codeSection = section;
-            let mailbox = connection.mailbox;
             // Bounded digit runs only: isNaN() also passes '1e5', which BigInt() rejects with
             // a throw that the catch below would swallow, making messageDelete() report false
             // even though the server expunged the messages.
@@ -51,8 +55,7 @@ async function expunge(connection, range, options) {
         return true;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         return false;
     }
 }

package/dist/cjs/commands/fetch.js

@@ -12,23 +12,23 @@ const tools_js_1 = require("../tools.js");
  * @returns Object with message count and list, or undefined if not in SELECTED state
  */
 async function fetch(connection, range, query, options) {
-    if (connection.state !== connection.states.SELECTED || !range) {
+    let mailbox = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (!mailbox || !range) {
         // nothing to do here
         return;
     }
     options = options || {};
-    let mailbox = connection.mailbox;
     // Use BINARY extension for fetching if supported and requested, otherwise fall back to BODY.
     // RFC 9051 folds the FETCH side of the BINARY extension into base IMAP4rev2, so an active
     // rev2 session can use it even without the BINARY capability token (the APPEND side is NOT
     // folded in and stays gated on the token in append.ts)
     const canUseBinary = connection.capabilities.has('BINARY') || (0, tools_js_1.isRev2Active)(connection);
     const commandKey = canUseBinary && options.binary && !connection.disableBinary ? 'BINARY' : 'BODY';
-    // Retry logic for ETHROTTLE errors (server rate limiting) with exponential backoff
-    let retryCount = 0;
+    // Retry logic for ETHROTTLE errors (server rate limiting) with exponential backoff.
+    // Every pass returns or throws: the last throttled attempt throws instead of retrying.
     const maxRetries = 4;
     const baseDelay = 1000; // Start with 1 second delay
-    while (retryCount < maxRetries) {
+    for (let retryCount = 0;; retryCount++) {
         let messages = {
             count: 0,
             list: []
@@ -205,15 +205,18 @@ async function fetch(connection, range, query, options) {
             return messages;
         }
         catch (err) {
-            if (err.code === 'ETHROTTLE') {
+            // The last throttled attempt falls through and throws, so running out of retries
+            // is never mistaken for an empty result
+            if (err.code === 'ETHROTTLE' && retryCount < maxRetries - 1) {
                 // Server returned a throttle error (rate limiting). Retry with exponential backoff.
-                // Delay doubles each retry: 1s, 2s, 4s, 8s (capped at 30s).
+                // Delay doubles each retry: 1s, 2s, 4s.
                 // If server provides a throttleReset hint, use that if longer.
                 const backoffDelay = Math.min(baseDelay * Math.pow(2, retryCount), 30000); // Cap at 30 seconds
                 // Use throttle reset time if provided and longer than backoff. The hint is
                 // server-controlled, so the wait goes through connection.throttleWait(), which caps
-                // it and keeps the timer tracked and abortable.
-                const delay = err.throttleReset && err.throttleReset > backoffDelay ? err.throttleReset : backoffDelay;
+                // it and keeps the timer tracked and abortable. The connection already waited
+                // part of the back-off before rejecting (throttleWaited), so only the rest is left.
+                const delay = Math.max(err.throttleReset || 0, backoffDelay) - (err.throttleWaited || 0);
                 connection.log.warn({
                     msg: 'Retrying throttled request with exponential backoff',
                     cid: connection.id,
@@ -229,7 +232,6 @@ async function fetch(connection, range, query, options) {
                 if (aborted) {
                     throw connection.createNoConnectionError(connection.byeReason, { rejectedFrom: 'throttleAbort', command: 'FETCH' });
                 }
-                retryCount++;
                 continue;
             }
             connection.log.warn({ err, cid: connection.id });

package/dist/cjs/commands/idle.js

@@ -124,7 +124,11 @@ async function runIdle(connection) {
     }
     catch (err) {
         (0, tools_js_1.logConnectionError)(connection, 'IDLE session failed', err);
-        if (preCheckWaitQueue.length) {
+        // A tagged NO or BAD only means the server refused IDLE; the connection is still usable,
+        // so the waiters are released by the finally block below and their own commands run.
+        // Anything else (close, lost socket, parser failure) fails the waiters too.
+        let refusedByServer = ['NO', 'BAD'].includes(err.responseStatus);
+        if (preCheckWaitQueue.length && !refusedByServer) {
             // One error for the whole queue: every waiter failed at the same site, for the same
             // reason. Built inside the guard so a teardown with nothing queued - the common case -
             // does not pay for an Error and its stack capture.
@@ -240,7 +244,7 @@ async function runPollingFallback(connection, maxIdleTime) {
                     return;
                 }
                 // The transport or the mailbox may be gone by the time the timer fires
-                if (!connection.socket || connection.socket.destroyed || connection.state !== connection.states.SELECTED || !connection.mailbox) {
+                if (!connection.socket || connection.socket.destroyed || !(0, tools_js_1.getSelectedMailbox)(connection)) {
                     return cancel();
                 }
                 pollOnce(connection, session)

package/dist/cjs/commands/list.js

@@ -184,7 +184,7 @@ async function list(connection, reference, mailbox, options) {
                             entry.path = entry.path.slice(1);
                         }
                         // Build parent path hierarchy for tree construction and sorting
-                        entry.parentPath = entry.delimiter && entry.path ? entry.path.substr(0, entry.path.lastIndexOf(entry.delimiter)) : '';
+                        entry.parentPath = entry.delimiter && entry.path ? entry.path.substring(0, entry.path.lastIndexOf(entry.delimiter)) : '';
                         entry.parent = entry.delimiter ? entry.path.split(entry.delimiter) : [entry.path];
                         entry.name = entry.parent.pop();
                         // Try to detect special-use from server flags or well-known names
@@ -395,7 +395,7 @@ async function list(connection, reference, mailbox, options) {
                         if (entry.delimiter && entry.path.charAt(0) === entry.delimiter) {
                             entry.path = entry.path.slice(1);
                         }
-                        entry.parentPath = entry.delimiter && entry.path ? entry.path.substr(0, entry.path.lastIndexOf(entry.delimiter)) : '';
+                        entry.parentPath = entry.delimiter && entry.path ? entry.path.substring(0, entry.path.lastIndexOf(entry.delimiter)) : '';
                         entry.parent = entry.delimiter ? entry.path.split(entry.delimiter) : [entry.path];
                         entry.name = entry.parent.pop();
                         // Merge LSUB data into existing LIST entry if found

package/dist/cjs/commands/move.js

@@ -14,7 +14,8 @@ const copyuid_parser_js_1 = require("./copyuid-parser.js");
  * @returns Move result with UID mapping if available, false on failure, or undefined if preconditions not met
  */
 async function move(connection, range, destination, options) {
-    if (connection.state !== connection.states.SELECTED || !range || !destination) {
+    let mailbox = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (!mailbox || !range || !destination) {
         // nothing to do here
         return;
     }
@@ -24,13 +25,18 @@ async function move(connection, range, destination, options) {
         { type: 'SEQUENCE', value: range },
         { type: 'ATOM', value: (0, tools_js_1.encodePath)(connection, destination) }
     ];
-    let map = { path: connection.mailbox.path, destination };
+    let map = { path: mailbox.path, destination };
     // Fallback for servers without the MOVE extension (RFC 6851):
     // emulate MOVE using COPY + flag as \Deleted + EXPUNGE.
     if (!(0, tools_js_1.hasCapability)(connection, 'MOVE')) {
         let result = await connection.messageCopy(range, destination, options);
-        await connection.messageDelete(range, Object.assign({ silent: true }, options));
-        return result;
+        if (!result) {
+            // The source must stay untouched when the copy failed, otherwise the messages are lost
+            return result;
+        }
+        let deleted = await connection.messageDelete(range, Object.assign({ silent: true }, options));
+        // Messages that were copied but not removed from the source mean the move did not complete
+        return deleted ? result : false;
     }
     let response;
     try {
@@ -48,8 +54,7 @@ async function move(connection, range, destination, options) {
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         return false;
     }
 }

package/dist/cjs/commands/namespace.js

@@ -9,7 +9,7 @@ const tools_js_1 = require("../tools.js");
  * @returns The primary personal namespace, or an error object on failure
  */
 async function namespace(connection) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state)) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection)) {
         // nothing to do here
         return;
     }

package/dist/cjs/commands/quota.js

@@ -10,7 +10,7 @@ const tools_js_1 = require("../tools.js");
  * @returns Quota information object, false if QUOTA not supported or on failure, or undefined if preconditions not met
  */
 async function quota(connection, path) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state) || !path) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection) || !path) {
         // nothing to do here
         return;
     }
@@ -50,19 +50,21 @@ async function quota(connection, path) {
             if ((0, tools_js_1.isUnsafeKey)(key) || key === 'path' || key === 'quotaroot') {
                 return;
             }
-            if (!map[key]) {
-                map[key] = {};
+            let resource = map[key];
+            if (typeof resource !== 'object') {
+                resource = {};
+                map[key] = resource;
             }
             // Storage quota is reported in KB by IMAP; convert to bytes for consistency
             const multiplier = key === 'storage' ? 1024 : 1;
             if (position === 1) {
-                map[key].usage = value * multiplier;
+                resource.usage = value * multiplier;
             }
             else if (position === 2) {
-                map[key].limit = value * multiplier;
+                resource.limit = value * multiplier;
                 // Calculate usage percentage for convenient display
-                if (map[key].limit) {
-                    map[key].status = Math.round(((map[key].usage || 0) / map[key].limit) * 100) + '%';
+                if (resource.limit) {
+                    resource.status = Math.round(((resource.usage || 0) / resource.limit) * 100) + '%';
                 }
             }
         });
@@ -110,8 +112,7 @@ async function quota(connection, path) {
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         return false;
     }
 }

package/dist/cjs/commands/rename.js

@@ -12,7 +12,7 @@ const tools_js_1 = require("../tools.js");
  * @throws If the RENAME command fails
  */
 async function rename(connection, path, newPath) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state)) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection)) {
         // nothing to do here
         return;
     }
@@ -22,7 +22,8 @@ async function rename(connection, path, newPath) {
     newPath = (0, tools_js_1.normalizePath)(connection, newPath);
     // Must close/deselect the mailbox before renaming if it's currently selected,
     // as IMAP servers will not rename an active mailbox.
-    if (connection.state === connection.states.SELECTED && connection.mailbox.path === path) {
+    let selected = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (selected && selected.path === path) {
         await connection.run('CLOSE');
     }
     let response;
@@ -39,8 +40,7 @@ async function rename(connection, path, newPath) {
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         throw err;
     }
 }

package/dist/cjs/commands/search.js

@@ -34,7 +34,8 @@ const stripEsearchPrefix = (attrs) => {
  *   When server lacks ESEARCH, falls back to plain SEARCH and returns number[].
  */
 async function search(connection, query, options) {
-    if (connection.state !== connection.states.SELECTED) {
+    const mailbox = (0, tools_js_1.getSelectedMailbox)(connection);
+    if (!mailbox) {
         // nothing to do here
         return false;
     }
@@ -92,8 +93,7 @@ async function search(connection, query, options) {
                 return esearchResult;
             }
             catch (err) {
-                await (0, tools_js_1.enhanceCommandError)(err);
-                connection.log.warn({ err, cid: connection.id });
+                await (0, tools_js_1.reportCommandError)(connection, err);
                 return false;
             }
         }
@@ -163,7 +163,7 @@ async function search(connection, query, options) {
                         // for message sequence numbers, while server-sent UID sets may
                         // not contain '*' at all (RFC 9051 section 4.1.1), so UID
                         // parts with '*' are dropped
-                        let existsCount = () => (connection.mailbox && connection.mailbox.exists) || 0;
+                        let existsCount = () => mailbox.exists || 0;
                         // The mailbox EXISTS count is itself server-supplied and can be
                         // absurdly large, so the budget is additionally capped at the same
                         // absolute ceiling expandRange() uses - a hostile server cannot
@@ -188,8 +188,8 @@ async function search(connection, query, options) {
                                 results.add(value);
                                 continue;
                             }
-                            let first = resolveId(part.substr(0, colon));
-                            let second = resolveId(part.substr(colon + 1));
+                            let first = resolveId(part.substring(0, colon));
+                            let second = resolveId(part.slice(colon + 1));
                             if (!(0, tools_js_1.isValidSequenceValue)(first) || !(0, tools_js_1.isValidSequenceValue)(second)) {
                                 discarded = true;
                                 continue;
@@ -219,8 +219,7 @@ async function search(connection, query, options) {
         return Array.from(results).sort((a, b) => a - b);
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
-        connection.log.warn({ err, cid: connection.id });
+        await (0, tools_js_1.reportCommandError)(connection, err);
         return false;
     }
 }

package/dist/cjs/commands/select.js

@@ -59,7 +59,7 @@ const VALUED_RESPONSE_CODES = Object.assign(Object.create(null), {
  * @throws If the SELECT/EXAMINE command fails
  */
 async function select(connection, pathInput, options) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state)) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection)) {
         // nothing to do here
         return;
     }
@@ -215,7 +215,7 @@ async function select(connection, pathInput, options) {
         // Emit mailboxClose if we're switching from a different mailbox.
         // Re-selecting the same mailbox (e.g., for resync) does not trigger close/open.
         if (currentMailbox && currentMailbox.path !== path) {
-            connection.emit('mailboxClose', currentMailbox);
+            (0, tools_js_1.emitSafe)(connection, 'mailboxClose', currentMailbox);
         }
         connection.mailbox = map;
         // Save the SELECT command for potential re-use (e.g., NOOP fallback polling
@@ -223,13 +223,13 @@ async function select(connection, pathInput, options) {
         connection.currentSelectCommand = selectCommand;
         connection.state = connection.states.SELECTED;
         if (!currentMailbox || currentMailbox.path !== path) {
-            connection.emit('mailboxOpen', connection.mailbox);
+            (0, tools_js_1.emitSafe)(connection, 'mailboxOpen', connection.mailbox);
         }
         response.next();
         return map;
     }
     catch (err) {
-        await (0, tools_js_1.enhanceCommandError)(err);
+        await (0, tools_js_1.reportCommandError)(connection, err);
         // If SELECT/EXAMINE fails while a mailbox was already selected, we must
         // reset to AUTHENTICATED state since the server has implicitly deselected
         // the previous mailbox on failure (RFC 3501 Section 6.3.1).
@@ -239,10 +239,9 @@ async function select(connection, pathInput, options) {
             connection.currentSelectCommand = false;
             connection.state = connection.states.AUTHENTICATED;
             if (currentMailbox) {
-                connection.emit('mailboxClose', currentMailbox);
+                (0, tools_js_1.emitSafe)(connection, 'mailboxClose', currentMailbox);
             }
         }
-        connection.log.warn({ err, cid: connection.id });
         throw err;
     }
 }

package/dist/cjs/commands/status.js

@@ -6,19 +6,18 @@ const status_fields_js_1 = require("./status-fields.js");
 // STATUS fields that also refresh the live mailbox state when the queried mailbox is the
 // currently selected one. Keyed by the output property name parseStatusList() reports.
 const MAILBOX_UPDATERS = {
-    messages: (value, connection, path) => {
-        let mailbox = connection.mailbox;
+    messages: (value, mailbox, connection, path) => {
         let prevCount = mailbox.exists;
         if (prevCount !== value) {
             mailbox.exists = value;
-            connection.emit('exists', { path, count: value, prevCount });
+            (0, tools_js_1.emitSafe)(connection, 'exists', { path, count: value, prevCount });
         }
     },
-    uidNext: (value, connection) => {
-        connection.mailbox.uidNext = value;
+    uidNext: (value, mailbox) => {
+        mailbox.uidNext = value;
     },
-    highestModseq: (value, connection) => {
-        connection.mailbox.highestModseq = value;
+    highestModseq: (value, mailbox) => {
+        mailbox.highestModseq = value;
     }
 };
 /**
@@ -31,7 +30,7 @@ const MAILBOX_UPDATERS = {
  * @throws {Error} If the mailbox does not exist
  */
 async function status(connection, path, query) {
-    if (![connection.states.AUTHENTICATED, connection.states.SELECTED].includes(connection.state) || !path) {
+    if (!(0, tools_js_1.isAuthenticatedState)(connection) || !path) {
         // nothing to do here
         return false;
     }
@@ -62,7 +61,8 @@ async function status(connection, path, query) {
                 STATUS: async (untagged) => {
                     // If querying the currently selected mailbox, also update the
                     // connection's live mailbox state and emit events for changes.
-                    let updateCurrent = connection.state === connection.states.SELECTED && path === connection.mailbox.path;
+                    let selected = (0, tools_js_1.getSelectedMailbox)(connection);
+                    let currentMailbox = selected && selected.path === path ? selected : false;
                     let list = untagged.attributes && Array.isArray(untagged.attributes[1]) ? untagged.attributes[1] : false;
                     if (!list) {
                         return;
@@ -70,8 +70,8 @@ async function status(connection, path, query) {
                     (0, status_fields_js_1.parseStatusList)(list, (key, value) => {
                         map[key] = value;
                         let updater = MAILBOX_UPDATERS[key];
-                        if (updateCurrent && updater) {
-                            updater(value, connection, path);
+                        if (currentMailbox && updater) {
+                            updater(value, currentMailbox, connection, path);
                         }
                     });
                 }