imapflow 1.0.161 → 1.0.163

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.0.163](https://github.com/postalsys/imapflow/compare/v1.0.162...v1.0.163) (2024-07-06)
+
+
+### Bug Fixes
+
+* **parser:** parse subfolders with square brackets ([0d0e8a6](https://github.com/postalsys/imapflow/commit/0d0e8a6ea379adf11594684d49a1ce5031339939))
+* **socket:** Use destroy() instead of destroySoon() ([830c2d1](https://github.com/postalsys/imapflow/commit/830c2d18f3d27eb12dc6babe4edd37fed5f65490))
+
+## [1.0.162](https://github.com/postalsys/imapflow/compare/v1.0.161...v1.0.162) (2024-05-07)
+
+
+### Bug Fixes
+
+* **idle:** Do not clear preCheck from other command ([cdf7643](https://github.com/postalsys/imapflow/commit/cdf7643952c975556e11a03ceca85f8a57fe1420))
+
 ## [1.0.161](https://github.com/postalsys/imapflow/compare/v1.0.160...v1.0.161) (2024-05-06)
 
 

package/lib/commands/idle.js

@@ -37,7 +37,7 @@ async function runIdle(connection) {
             }
         };
 
-        connection.preCheck = () => {
+        let connectionPreCheck = () => {
             let handler = new Promise((resolve, reject) => {
                 preCheckWaitQueue.push({ resolve, reject });
             });
@@ -57,9 +57,11 @@ async function runIdle(connection) {
             return handler;
         };
 
+        connection.preCheck = connectionPreCheck;
+
         response = await connection.exec('IDLE', false, {
             onPlusTag: async () => {
-                connection.log.debug({ msg: `Initiated IDLE, waiting for server input`, doneRequested });
+                connection.log.debug({ msg: `Initiated IDLE, waiting for server input`, lockId: connection.currentLock?.lockId, doneRequested });
                 canEnd = true;
                 if (doneRequested) {
                     preCheck();
@@ -70,8 +72,8 @@ async function runIdle(connection) {
             }
         });
 
-        // unset before response.next()
-        if (typeof connection.preCheck === 'function') {
+        // unset before response.next() if preCheck function is not already cleared (usually is)
+        if (typeof connection.preCheck === 'function' && connection.preCheck === connectionPreCheck) {
             connection.log.trace({
                 msg: 'Clearing pre-check function',
                 lockId: connection.currentLock?.lockId,

package/lib/handler/token-parser.js

@@ -355,10 +355,16 @@ class TokenParser {
                     if (chr === '[') {
                         // allowed only for selected elements
                         if (['BODY', 'BODY.PEEK', 'BINARY', 'BINARY.PEEK'].indexOf(this.currentNode.value.toUpperCase()) < 0) {
-                            let error = new Error(`Unexpected section start char [ at position ${this.pos + i} [E14]`);
-                            error.code = 'ParserError14';
-                            error.parserContext = { input: this.str, pos: this.pos + i, chr };
-                            throw error;
+                            if (/[./]/.test(this.currentNode.value)) {
+                                // could be a path
+                                this.currentNode.value += chr;
+                                break;
+                            } else {
+                                let error = new Error(`Unexpected section start char [ at position ${this.pos + i} [E14]`);
+                                error.code = 'ParserError14';
+                                error.parserContext = { input: this.str, pos: this.pos + i, chr };
+                                throw error;
+                            }
                         }
                         this.currentNode.endPos = this.pos + i;
                         this.currentNode = this.createNode(this.currentNode.parentNode, this.pos + i);

package/lib/imap-flow.js

@@ -768,11 +768,7 @@ class ImapFlow extends EventEmitter {
         this.writeSocket.destroySoon = () => {
             try {
                 if (this.socket) {
-                    if (typeof this.socket.destroySoon === 'function') {
-                        this.socket.destroySoon();
-                    } else {
-                        this.socket.destroy();
-                    }
+                    this.socket.destroy();
                 }
                 this.writeSocket.end();
             } catch (err) {
@@ -1484,11 +1480,7 @@ class ImapFlow extends EventEmitter {
 
         if (this.writeSocket && !this.writeSocket.destroyed) {
             try {
-                if (typeof this.writeSocket.destroySoon === 'function') {
-                    this.writeSocket.destroySoon();
-                } else {
-                    this.writeSocket.destroy();
-                }
+                this.writeSocket.destroy();
             } catch (err) {
                 this.log.error({ err, cid: this.id });
             }
@@ -1496,11 +1488,7 @@ class ImapFlow extends EventEmitter {
 
         if (this.socket && !this.socket.destroyed && this.writeSocket !== this.socket) {
             try {
-                if (typeof this.socket.destroySoon === 'function') {
-                    this.socket.destroySoon();
-                } else {
-                    this.socket.destroy();
-                }
+                this.socket.destroy();
             } catch (err) {
                 this.log.error({ err, cid: this.id });
             }

package/lib/tools.js

@@ -147,6 +147,8 @@ module.exports = {
                 existing.path = folder.path;
                 existing.subscribed = !!folder.subscribed;
                 existing.listed = !!folder.listed;
+                existing.status = !!folder.status;
+
                 if (folder.specialUse) {
                     existing.specialUse = folder.specialUse;
                 }
@@ -164,7 +166,8 @@ module.exports = {
                     flags: folder.flags,
                     path: folder.path,
                     subscribed: !!folder.subscribed,
-                    listed: !!folder.listed
+                    listed: !!folder.listed,
+                    status: !!folder.status
                 };
 
                 if (folder.delimiter) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.161",
+    "version": "1.0.163",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -28,11 +28,11 @@
     },
     "homepage": "https://imapflow.com/",
     "devDependencies": {
-        "@babel/eslint-parser": "7.24.5",
-        "@babel/eslint-plugin": "7.24.5",
+        "@babel/eslint-parser": "7.24.7",
+        "@babel/eslint-plugin": "7.24.7",
         "@babel/plugin-syntax-class-properties": "7.12.13",
-        "@babel/preset-env": "7.24.5",
-        "@types/node": "20.12.8",
+        "@babel/preset-env": "7.24.7",
+        "@types/node": "20.14.10",
         "eslint": "8.57.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "9.1.0",
@@ -46,14 +46,14 @@
         "tsd-jsdoc": "2.5.0"
     },
     "dependencies": {
-        "encoding-japanese": "2.1.0",
+        "encoding-japanese": "2.2.0",
         "iconv-lite": "0.6.3",
         "libbase64": "1.3.0",
         "libmime": "5.3.5",
         "libqp": "2.1.0",
         "mailsplit": "5.4.0",
-        "nodemailer": "6.9.13",
-        "pino": "9.0.0",
+        "nodemailer": "6.9.14",
+        "pino": "9.2.0",
         "socks": "2.8.3"
     }
 }

package/test/imap-parser-test.js

@@ -992,3 +992,13 @@ module.exports['IMAP Parser, BAD with throttling'] = test =>
         test.equal(parsed.command, 'BAD');
         test.deepEqual(parsed.attributes, [{ type: 'TEXT', value: 'Request is throttled. Suggested Backoff Time: 92415 milliseconds' }]);
     });
+
+module.exports['IMAP Parser, subfolder square bracket'] = test =>
+    asyncWrapper(test, async test => {
+        let parsed = await parser('* LIST (\\UnMarked) "." INBOX.[Airmail].Snooze');
+        test.deepEqual(parsed.attributes, [
+            [{ type: 'ATOM', value: '\\UnMarked' }],
+            { type: 'STRING', value: '.' },
+            { type: 'ATOM', value: 'INBOX.[Airmail].Snooze' }
+        ]);
+    });