imapflow 1.0.93 → 1.0.96

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+-   1.0.96 - 2022-05-18
+
+    -   Allow non-standard characters in ATOM if it's the string after NO/OK/BAD response
+
+-   1.0.95 - 2022-05-03
+
+    -   Do not use FETCH BINARY, unless `binary` option is `true`
+
+-   1.0.94 - 2022-05-03
+
+    -   Fixed source download
+
 -   1.0.93 - 2022-05-03
 
     -   Fixed missing unicode encoding for APPEND, COPY, MOVE

package/lib/commands/fetch.js

@@ -18,7 +18,7 @@ module.exports = async (connection, range, query, options) => {
         list: []
     };
 
-    const commandKey = connection.capabilities.has('BINARY') && !connection.disableBinary ? 'BINARY' : 'BODY';
+    const commandKey = connection.capabilities.has('BINARY') && options.binary && !connection.disableBinary ? 'BINARY' : 'BODY';
 
     let response;
     try {

package/lib/handler/token-parser.js

@@ -332,7 +332,12 @@ class TokenParser {
                     }
 
                     // if the char is not ATOM compatible, throw. Allow \* as an exception
-                    if (imapFormalSyntax['ATOM-CHAR']().indexOf(chr) < 0 && chr !== ']' && !(chr === '*' && this.currentNode.value === '\\')) {
+                    if (
+                        imapFormalSyntax['ATOM-CHAR']().indexOf(chr) < 0 &&
+                        chr !== ']' &&
+                        !(chr === '*' && this.currentNode.value === '\\') &&
+                        (!this.parent || !this.parent.command || !['NO', 'BAD', 'OK'].includes(this.parent.command))
+                    ) {
                         throw new Error('Unexpected char at position ' + (this.pos + i));
                     } else if (this.currentNode.value === '\\*') {
                         throw new Error('Unexpected char at position ' + (this.pos + i));

package/lib/imap-flow.js

@@ -623,7 +623,7 @@ class ImapFlow extends EventEmitter {
 
         // Make sure we have namespace set. This should also throw if Exchange actually failed authentication
         let nsResponse = await this.run('NAMESPACE');
-        if (nsResponse.error && nsResponse.status === 'BAD' && /User is authenticated but not connected/i.test(nsResponse.text)) {
+        if (nsResponse && nsResponse.error && nsResponse.status === 'BAD' && /User is authenticated but not connected/i.test(nsResponse.text)) {
             // Not a NAMESPACE failure but authentication failure, so report as
             this.authenticated = false;
             let err = new Error('Authentication failed');
@@ -2014,6 +2014,7 @@ class ImapFlow extends EventEmitter {
      * @param {Object} [options]
      * @param {Boolean} [options.uid] If `true` then uses UID numbers instead of sequence numbers for `range`
      * @param {BigInt} [options.changedSince] If set then only messages with a higher modseq value are returned. Ignored if server does not support `CONDSTORE` extension.
+     * @param {Boolean} [options.binary=false] If `true` then requests a binary response if the server supports this
      * @yields {Promise<FetchMessageObject>} Message data object
      *
      * @example
@@ -2065,6 +2066,7 @@ class ImapFlow extends EventEmitter {
 
             this.run('FETCH', range, query, {
                 uid: !!options.uid,
+                binary: options.binary,
                 changedSince: options.changedSince,
                 onUntaggedFetch: (untagged, next) => {
                     rowQueue.push({
@@ -2108,6 +2110,7 @@ class ImapFlow extends EventEmitter {
      * @param {FetchQueryObject} query Fetch query
      * @param {Object} [options]
      * @param {Boolean} [options.uid] If `true` then uses UID number instead of sequence number for `seq`
+     * @param {Boolean} [options.binary=false] If `true` then requests a binary response if the server supports this
      * @returns {Promise<FetchMessageObject>} Message data object
      *
      * @example

package/lib/tools.js

@@ -240,6 +240,7 @@ module.exports = {
 
             switch (key) {
                 case 'body[]':
+                case 'binary[]':
                     map.source = getBuffer(attribute);
                     break;
 

package/lib/types.d.ts

@@ -414,10 +414,12 @@ declare module "imapflow" {
          * @param query - Fetch query
          * @param [options.uid] - If `true` then uses UID numbers instead of sequence numbers for `range`
          * @param [options.changedSince] - If set then only messages with a higher modseq value are returned. Ignored if server does not support `CONDSTORE` extension.
+         * @param [options.binary = false] - If `true` then requests a binary response if the server supports this
          */
         fetch(range: SequenceString | Number[] | SearchObject, query: FetchQueryObject, options?: {
             uid?: boolean;
             changedSince?: bigint;
+            binary?: boolean;
         }): void;
         /**
          * Fetch a single message from currently opened mailbox
@@ -429,10 +431,12 @@ declare module "imapflow" {
          * @param seq - Single UID or sequence number of the message to fetch for
          * @param query - Fetch query
          * @param [options.uid] - If `true` then uses UID number instead of sequence number for `seq`
+         * @param [options.binary = false] - If `true` then requests a binary response if the server supports this
          * @returns Message data object
          */
         fetchOne(seq: SequenceString, query: FetchQueryObject, options?: {
             uid?: boolean;
+            binary?: boolean;
         }): Promise<FetchMessageObject>;
         /**
          * Download either full rfc822 formated message or a specific bodystructure part as a Stream.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.93",
+    "version": "1.0.96",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -30,13 +30,13 @@
         "@babel/eslint-parser": "7.17.0",
         "@babel/eslint-plugin": "7.17.7",
         "@babel/plugin-syntax-class-properties": "7.12.13",
-        "@babel/preset-env": "7.17.10",
-        "@types/node": "17.0.31",
+        "@babel/preset-env": "7.17.12",
+        "@types/node": "17.0.34",
         "braintree-jsdoc-template": "3.3.0",
-        "eslint": "8.14.0",
+        "eslint": "8.15.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
-        "grunt": "1.5.2",
+        "grunt": "1.5.3",
         "grunt-cli": "1.4.3",
         "grunt-contrib-nodeunit": "4.0.0",
         "grunt-eslint": "24.0.0",
@@ -51,7 +51,7 @@
         "libmime": "5.1.0",
         "libqp": "1.1.0",
         "mailsplit": "5.3.2",
-        "nodemailer": "6.7.4",
+        "nodemailer": "6.7.5",
         "pino": "7.11.0",
         "socks": "2.6.2"
     }

package/test/imap-parser-test.js

@@ -905,3 +905,19 @@ module.exports['IMAP Parser: escaped quotes'] = test =>
     );
 
 module.exports['IMAP Parser: mimetorture'] = test => asyncWrapper(test, async test => test.deepEqual(await parser(mimetorture.input), mimetorture.output));
+
+module.exports['IMAP Parser, unicode select'] = test =>
+    asyncWrapper(test, async test =>
+        test.deepEqual((await parser('F OK [READ-WRITE] [Gmail]/Visi laiškai selected. (Success) [THROTTLED]')).attributes, [
+            {
+                type: 'ATOM',
+                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]' }
+        ])
+    );