imapflow 1.0.134 → 1.0.136

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+-   1.0.136 - 2023-08-15
+
+    -   Added missing destroySoon method for the PassThrough writable socket
+
+-   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

package/lib/imap-flow.js

@@ -725,6 +725,22 @@ class ImapFlow extends EventEmitter {
         // route outgoing socket via deflate stream
         this.writeSocket = new PassThrough();
 
+        this.writeSocket.destroySoon = () => {
+            try {
+                if (this.socket) {
+                    this.socket.destroySoon();
+                }
+                this.writeSocket.end();
+            } catch (err) {
+                this.log.error({ err, info: 'Failed to destroy PassThrough socket', cid: this.id });
+                throw err;
+            }
+        };
+
+        Object.defineProperty(this.writeSocket, 'destroyed', {
+            get: () => this.socket.destroyed
+        });
+
         // we need to force flush deflated data to socket so we can't
         // use normal pipes for this.writeSocket -> this._deflate -> this.socket
         let reading = false;
@@ -923,6 +939,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 +975,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 +1388,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 +1432,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 +1440,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.134",
+    "version": "1.0.136",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -27,15 +27,15 @@
     },
     "homepage": "https://imapflow.com/",
     "devDependencies": {
-        "@babel/eslint-parser": "7.22.9",
-        "@babel/eslint-plugin": "7.22.5",
+        "@babel/eslint-parser": "7.22.10",
+        "@babel/eslint-plugin": "7.22.10",
         "@babel/plugin-syntax-class-properties": "7.12.13",
-        "@babel/preset-env": "7.22.9",
-        "@types/node": "20.4.2",
+        "@babel/preset-env": "7.22.10",
+        "@types/node": "20.5.0",
         "braintree-jsdoc-template": "3.3.0",
-        "eslint": "8.45.0",
+        "eslint": "8.47.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.8.0",
+        "eslint-config-prettier": "9.0.0",
         "grunt": "1.6.1",
         "grunt-cli": "1.4.3",
         "grunt-contrib-nodeunit": "5.0.0",
@@ -52,7 +52,7 @@
         "libqp": "2.0.1",
         "mailsplit": "5.4.0",
         "nodemailer": "6.9.4",
-        "pino": "8.14.1",
+        "pino": "8.15.0",
         "socks": "2.7.1"
     }
 }