[Workaround] no longer reject promises while enqueueCommand.

emailjs · Sep 27, 2018 · 2e19e9c · 2e19e9c
1 parent 32e768c
commit 2e19e9c
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -677,6 +677,7 @@ The IMAP client has several events you can attach to by setting a listener
 ### Handling fatal error event
 
 The invocation of `onerror` indicates an irrecoverable error. When `onerror` is fired, the connection is already closed, hence there's no need for further cleanup.
+if no `onerror` callback is set, it will throw the error.
 
 ## Get your hands dirty
 

diff --git a/dist/client.js b/dist/client.js
diff --git a/dist/command-parser.js b/dist/command-parser.js
diff --git a/dist/compression.js b/dist/compression.js
diff --git a/dist/imap.js b/dist/imap.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/logger.js b/dist/logger.js
diff --git a/res/compression.worker.blob b/res/compression.worker.blob
diff --git a/src/client.js b/src/client.js
@@ -105,7 +105,10 @@ export default class Client {
     clearTimeout(this._idleTimeout)
 
     // propagate the error upwards
-    this.onerror && this.onerror(err)
+    if (!this.onerror) {
+      throw err
+    }
+    this.onerror(err)
   }
 
   //

diff --git a/src/imap.js b/src/imap.js
@@ -162,6 +162,10 @@ export default class Imap {
    * @returns {Promise} Resolves when the socket is closed
    */
   close (error) {
+    if (this._enteredClosingState) {
+      return Promise.resolve()
+    }
+    this._enteredClosingState = true
     return new Promise((resolve) => {
       var tearDown = () => {
         // fulfill pending promises
@@ -257,7 +261,10 @@ export default class Imap {
     var tag = 'W' + (++this._tagCounter)
     request.tag = tag
 
-    return new Promise((resolve, reject) => {
+    return new Promise(resolve => {
+      var reject = error => {
+        return resolve(this.close(error))
+      }
       var data = {
         tag: tag,
         request: request,