imapflow 1.0.133 → 1.0.135

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+-   1.0.135 - 2023-07-29
+
+    -   Improved handling of unexpected close
+
+-   1.0.134 - 2023-07-20
+
+    -   Fixed unicode search if UTF8=ACCEPT extension was enabled
+
 -   1.0.131 - 2023-06-29
 
     -   Fixed issue with labels that start with tilde

package/lib/commands/idle.js

@@ -158,6 +158,7 @@ module.exports = async (connection, maxIdleTime) => {
             let response;
             switch (connection.missingIdleCommand) {
                 case 'SELECT':
+                    // FIXME: somehow a loop occurs after some time of idling with SELECT
                     connection.log.debug({ src: 'c', msg: `Running SELECT to detect changes in folder` });
                     response = await connection.exec(selectCommand.command, selectCommand.arguments);
                     break;

package/lib/imap-flow.js

@@ -923,6 +923,7 @@ class ImapFlow extends EventEmitter {
                 this.log.error({ err, cid: this.id });
 
                 if (typeof this.initialReject === 'function') {
+                    clearTimeout(this.greetingTimeout);
                     let reject = this.initialReject;
                     this.initialResolve = false;
                     this.initialReject = false;
@@ -958,6 +959,7 @@ class ImapFlow extends EventEmitter {
                 this.log.error({ err, cid: this.id });
 
                 if (typeof this.initialReject === 'function') {
+                    clearTimeout(this.greetingTimeout);
                     let reject = this.initialReject;
                     this.initialResolve = false;
                     this.initialReject = false;
@@ -1370,12 +1372,14 @@ class ImapFlow extends EventEmitter {
         this.idling = false;
 
         if (typeof this.initialReject === 'function' && !this.options.verifyOnly) {
+            clearTimeout(this.greetingTimeout);
             let reject = this.initialReject;
             this.initialResolve = false;
             this.initialReject = false;
             let err = new Error('Unexpected close');
             err.code = `ClosedAfterConnect${this.secureConnection ? 'TLS' : 'Text'}`;
-            reject(err);
+            // still has to go through the logic below
+            setImmediate(() => reject(err));
         }
 
         if (typeof this.preCheck === 'function') {
@@ -1412,7 +1416,7 @@ class ImapFlow extends EventEmitter {
 
         if (this.writeSocket && !this.writeSocket.destroyed) {
             try {
-                this.writeSocket.end();
+                this.writeSocket.destroySoon();
             } catch (err) {
                 this.log.error({ err, cid: this.id });
             }
@@ -1420,7 +1424,7 @@ class ImapFlow extends EventEmitter {
 
         if (this.socket && !this.socket.destroyed && this.writeSocket !== this.socket) {
             try {
-                this.socket.end();
+                this.socket.destroySoon();
             } catch (err) {
                 this.log.error({ err, cid: this.id });
             }

package/lib/search-compiler.js

@@ -259,7 +259,8 @@ module.exports.searchCompiler = (connection, query) => {
 
     walk(query);
 
-    if (hasUnicode) {
+    if (hasUnicode && !connection.enabled.has('UTF8=ACCEPT')) {
+        // Prepend search query with `CHARSET UTF-8`
         attributes.unshift({ type: 'ATOM', value: 'UTF-8' });
         attributes.unshift({ type: 'ATOM', value: 'CHARSET' });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.133",
+    "version": "1.0.135",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -27,19 +27,19 @@
     },
     "homepage": "https://imapflow.com/",
     "devDependencies": {
-        "@babel/eslint-parser": "7.22.5",
+        "@babel/eslint-parser": "7.22.9",
         "@babel/eslint-plugin": "7.22.5",
         "@babel/plugin-syntax-class-properties": "7.12.13",
-        "@babel/preset-env": "7.22.5",
-        "@types/node": "20.3.2",
+        "@babel/preset-env": "7.22.9",
+        "@types/node": "20.4.5",
         "braintree-jsdoc-template": "3.3.0",
-        "eslint": "8.43.0",
+        "eslint": "8.46.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.8.0",
+        "eslint-config-prettier": "8.9.0",
         "grunt": "1.6.1",
         "grunt-cli": "1.4.3",
         "grunt-contrib-nodeunit": "5.0.0",
-        "grunt-eslint": "24.2.0",
+        "grunt-eslint": "24.3.0",
         "jsdoc": "3.6.11",
         "st": "3.0.0",
         "tsd-jsdoc": "2.5.0"
@@ -51,8 +51,8 @@
         "libmime": "5.2.1",
         "libqp": "2.0.1",
         "mailsplit": "5.4.0",
-        "nodemailer": "6.9.3",
-        "pino": "8.14.1",
+        "nodemailer": "6.9.4",
+        "pino": "8.14.2",
         "socks": "2.7.1"
     }
 }