imapflow 1.0.104 → 1.0.107

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

@@ -2620,6 +2620,9 @@ class ImapFlow extends EventEmitter {
 
     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);
@@ -2628,7 +2631,8 @@ class ImapFlow extends EventEmitter {
         this.socket.removeListener('timeout', this._socketTimeout);
 
         return {
-            socket: this.socket
+            readSocket: this._inflate || this.socket,
+            writeSocket: this.writeSocket || this.socket
         };
     }
 }

package/lib/search-compiler.js

@@ -118,6 +118,7 @@ module.exports.searchCompiler = (connection, query) => {
                     }
                     break;
                 case 'GMRAW':
+                case 'GMAILRAW': // alias for GMRAW
                     if (connection.capabilities.has('X-GM-EXT-1')) {
                         setOpt(attributes, 'X-GM-RAW', params[term]);
                     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.104",
+    "version": "1.0.107",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -31,9 +31,9 @@
         "@babel/eslint-plugin": "7.18.10",
         "@babel/plugin-syntax-class-properties": "7.12.13",
         "@babel/preset-env": "7.18.10",
-        "@types/node": "18.7.9",
+        "@types/node": "18.7.14",
         "braintree-jsdoc-template": "3.3.0",
-        "eslint": "8.22.0",
+        "eslint": "8.23.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
         "grunt": "1.5.3",

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]' }
         ])
     );