imapflow 1.0.102 → 1.0.105

package/lib/commands/list.js

@@ -42,13 +42,13 @@ module.exports = async (connection, reference, mailbox, options) => {
             });
         }
 
+        if (listCommand === 'LIST' && connection.capabilities.has('LIST-STATUS') && statusQueryAttributes.length) {
+            returnArgs.push({ type: 'ATOM', value: 'STATUS' }, statusQueryAttributes);
+        }
+
         let runList = async (reference, mailbox) => {
             const cmdArgs = [encodePath(connection, reference), encodePath(connection, mailbox)];
 
-            if (listCommand === 'LIST' && connection.capabilities.has('LIST-STATUS') && statusQueryAttributes.length) {
-                returnArgs.push({ type: 'ATOM', value: 'STATUS' }, statusQueryAttributes);
-            }
-
             if (returnArgs.length) {
                 cmdArgs.push({ type: 'ATOM', value: 'RETURN' }, returnArgs);
             }
@@ -165,6 +165,15 @@ module.exports = async (connection, reference, mailbox, options) => {
         let normalizedReference = normalizePath(connection, reference || '');
         await runList(normalizedReference, normalizePath(connection, mailbox || '', true));
 
+        if (options.listOnly) {
+            return entries;
+        }
+
+        if (normalizedReference && !entries.find(entry => entry.specialUse === '\\Inbox')) {
+            // INBOX was most probably not included in the listing if namespace was used
+            await runList('', 'INBOX');
+        }
+
         if (options.statusQuery) {
             for (let entry of entries) {
                 if (!entry.flags.has('\\Noselect') && !entry.flags.has('\\NonExistent')) {
@@ -182,15 +191,6 @@ module.exports = async (connection, reference, mailbox, options) => {
             }
         }
 
-        if (options.listOnly) {
-            return entries;
-        }
-
-        if (normalizedReference && !entries.find(entry => entry.specialUse === '\\Inbox')) {
-            // INBOX was most probably not included in the listing if namespace was used
-            await runList('', 'INBOX');
-        }
-
         response = await connection.exec(
             'LSUB',
             [encodePath(connection, normalizePath(connection, reference || '')), encodePath(connection, normalizePath(connection, mailbox || '', true))],

package/lib/imap-flow.js

@@ -127,10 +127,11 @@ class ImapFlow extends EventEmitter {
      * @param {Boolean} [options.logRaw=false] If true then log data read from and written to socket encoded in base64
      * @param {Boolean} [options.emitLogs=false] If `true` then in addition of sending data to logger, ImapFlow emits 'log' events with the same data
      * @param {Boolean} [options.verifyOnly=false] If `true` then logs out automatically after successful authentication
-     * @param {Boolean} [options.proxy] Optional proxy URL. Supports HTTP CONNECT (`http://`, `https://`) and SOCKS (`socks://`, `socks4://`, `socks5://`) proxies
+     * @param {String} [options.proxy] Optional proxy URL. Supports HTTP CONNECT (`http://`, `https://`) and SOCKS (`socks://`, `socks4://`, `socks5://`) proxies
      * @param {Boolean} [options.qresync=false] If true, then enables QRESYNC support. EXPUNGE notifications will include `uid` property instead of `seq`
      * @param {Number} [options.maxIdleTime] If set, then breaks and restarts IDLE every maxIdleTime ms
      * @param {Boolean} [options.disableBinary=false] If true, then ignores the BINARY extension when making FETCH and APPEND calls
+     * @param {Boolean} [options.disableAutoEnable] Do not enable supported extensions by default
      */
     constructor(options) {
         super({ captureRejections: true });
@@ -211,6 +212,7 @@ class ImapFlow extends EventEmitter {
          * @type {Map<string, boolean|number>}
          */
         this.capabilities = new Map();
+        this.rawCapabilities = null;
 
         this.expectCapabilityUpdate = false; // force CAPABILITY after LOGIN
 
@@ -645,8 +647,10 @@ class ImapFlow extends EventEmitter {
             await this.compress();
         }
 
-        // enable extensions if possible
-        await this.run('ENABLE', ['CONDSTORE', 'UTF8=ACCEPT'].concat(this.options.qresync ? 'QRESYNC' : []));
+        if (!this.options.disableAutoEnable) {
+            // enable extensions if possible
+            await this.run('ENABLE', ['CONDSTORE', 'UTF8=ACCEPT'].concat(this.options.qresync ? 'QRESYNC' : []));
+        }
 
         this.usable = true;
     }
@@ -920,6 +924,7 @@ class ImapFlow extends EventEmitter {
     }
 
     async sectionCapability(section) {
+        this.rawCapabilities = section;
         this.capabilities = updateCapabilities(section);
         if (this.expectCapabilityUpdate) {
             this.expectCapabilityUpdate = false;
@@ -927,6 +932,7 @@ class ImapFlow extends EventEmitter {
     }
 
     async untaggedCapability(untagged) {
+        this.rawCapabilities = untagged.attributes;
         this.capabilities = updateCapabilities(untagged.attributes);
         if (this.expectCapabilityUpdate) {
             this.expectCapabilityUpdate = false;
@@ -2611,6 +2617,24 @@ class ImapFlow extends EventEmitter {
 
         return synteticLogger;
     }
+
+    unbind() {
+        this.socket.unpipe(this.streamer);
+        if (this._inflate) {
+            this._inflate.unpipe(this.streamer);
+        }
+
+        this.socket.removeListener('error', this._socketError);
+        this.socket.removeListener('close', this._socketClose);
+        this.socket.removeListener('end', this._socketEnd);
+        this.socket.removeListener('tlsClientError', this._socketError);
+        this.socket.removeListener('timeout', this._socketTimeout);
+
+        return {
+            readSocket: this._inflate || this.socket,
+            writeSocket: this.writeSocket || this.socket
+        };
+    }
 }
 
 /**

package/lib/types.d.ts

@@ -30,6 +30,7 @@ declare module "imapflow" {
      * @param [options.qresync = false] - If true, then enables QRESYNC support. EXPUNGE notifications will include `uid` property instead of `seq`
      * @param [options.maxIdleTime] - If set, then breaks and restarts IDLE every maxIdleTime ms
      * @param [options.disableBinary = false] - If true, then ignores the BINARY extension when making FETCH and APPEND calls
+     * @param [options.disableAutoEnable] - Do not enable supported extensions by default
      */
     class ImapFlow extends EventEmitter {
         constructor(options: {
@@ -54,10 +55,11 @@ declare module "imapflow" {
             logRaw?: boolean;
             emitLogs?: boolean;
             verifyOnly?: boolean;
-            proxy?: boolean;
+            proxy?: string;
             qresync?: boolean;
             maxIdleTime?: number;
             disableBinary?: boolean;
+            disableAutoEnable?: boolean;
         });
         /**
          * Current module version as a static class property

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.102",
+    "version": "1.0.105",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -31,7 +31,7 @@
         "@babel/eslint-plugin": "7.18.10",
         "@babel/plugin-syntax-class-properties": "7.12.13",
         "@babel/preset-env": "7.18.10",
-        "@types/node": "18.7.6",
+        "@types/node": "18.7.9",
         "braintree-jsdoc-template": "3.3.0",
         "eslint": "8.22.0",
         "eslint-config-nodemailer": "1.2.0",
@@ -52,7 +52,7 @@
         "libqp": "1.1.0",
         "mailsplit": "5.3.2",
         "nodemailer": "6.7.8",
-        "pino": "8.4.1",
+        "pino": "8.4.2",
         "socks": "2.7.0"
     }
 }