imapflow 1.0.103 → 1.0.106

package/lib/handler/parser-instance.js

@@ -22,8 +22,6 @@ class ParserInstance {
     }
 
     async getCommand() {
-        let responseCode;
-
         if (this.tag === '+') {
             // special case
             this.humanReadable = this.remainder.trim();
@@ -42,13 +40,28 @@ class ParserInstance {
             case 'BAD':
             case 'PREAUTH':
             case 'BYE':
-                responseCode = this.remainder.match(/^ \[(?:[^\]]*\])+/);
-                if (responseCode) {
-                    this.humanReadable = this.remainder.substr(responseCode[0].length).trim();
-                    this.remainder = responseCode[0];
-                } else {
-                    this.humanReadable = this.remainder.trim();
-                    this.remainder = '';
+                {
+                    let match = this.remainder.match(/^\s+\[/);
+                    if (match) {
+                        let nesting = 1;
+                        for (let i = match[0].length; i <= this.remainder.length; i++) {
+                            let c = this.remainder[i];
+
+                            if (c === '[') {
+                                nesting++;
+                            } else if (c === ']') {
+                                nesting--;
+                            }
+                            if (!nesting) {
+                                this.humanReadable = this.remainder.substring(i + 1).trim();
+                                this.remainder = this.remainder.substring(0, i + 1);
+                                break;
+                            }
+                        }
+                    } else {
+                        this.humanReadable = this.remainder.trim();
+                        this.remainder = '';
+                    }
                 }
                 break;
         }

package/lib/handler/token-parser.js

@@ -167,6 +167,7 @@ class TokenParser {
                             this.currentNode.isClosed = true;
                             this.currentNode.endPos = this.pos + i;
                             this.currentNode = this.currentNode.parentNode;
+
                             checkSP();
                             break;
 
@@ -222,7 +223,7 @@ class TokenParser {
                         // [ starts section
                         case '[':
                             // If it is the *first* element after response command, then process as a response argument list
-                            if (['OK', 'NO', 'BAD', 'BYE', 'PREAUTH'].indexOf(this.parent.command.toUpperCase()) >= 0 && this.currentNode === this.tree) {
+                            if (['OK', 'NO', 'BAD', 'BYE', 'PREAUTH'].includes(this.parent.command.toUpperCase()) && this.currentNode === this.tree) {
                                 this.currentNode.endPos = this.pos + i;
 
                                 this.currentNode = this.createNode(this.currentNode, this.pos + i);
@@ -258,6 +259,7 @@ class TokenParser {
                                     // close out the SECTION
                                     this.currentNode.isClosed = true;
                                     this.currentNode = this.currentNode.parentNode;
+
                                     checkSP();
                                 }
 
@@ -302,8 +304,8 @@ class TokenParser {
                         this.currentNode.endPos = this.pos + i;
                         this.currentNode = this.currentNode.parentNode;
                         this.state = 'NORMAL';
-
                         checkSP();
+
                         break;
                     }
 
@@ -541,6 +543,10 @@ class TokenParser {
 
                     this.currentNode.value += chr;
                     break;
+
+                case 'TEXT':
+                    this.currentNode.value += chr;
+                    break;
             }
         }
     }

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.103",
+    "version": "1.0.106",
     "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.11",
         "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"
     }
 }

package/test/imap-parser-test.js

@@ -914,11 +914,19 @@ module.exports['IMAP Parser, unicode select'] = test =>
                 value: '',
                 section: [{ type: 'ATOM', value: 'READ-WRITE' }]
             },
-            { type: 'ATOM', value: '[Gmail]/Visi' },
-            { type: 'ATOM', value: 'laiškai' },
-            { type: 'ATOM', value: 'selected.' },
-            [{ type: 'ATOM', value: 'Success' }],
-            { type: 'ATOM', value: '[THROTTLED]' }
+            { type: 'TEXT', value: '[Gmail]/Visi laiškai selected. (Success) [THROTTLED]' }
+        ])
+    );
+
+module.exports['IMAP Parser, unicode select 2'] = test =>
+    asyncWrapper(test, async test =>
+        test.deepEqual((await parser('E OK [READ-WRITE] [Gmail]/Вся почта selected. (Success) [THROTTLED]')).attributes, [
+            {
+                type: 'ATOM',
+                value: '',
+                section: [{ type: 'ATOM', value: 'READ-WRITE' }]
+            },
+            { type: 'TEXT', value: '[Gmail]/Вся почта selected. (Success) [THROTTLED]' }
         ])
     );