imapflow - npm Package Compare versions

Comparing version 1.0.72 to 1.0.73

lib/commands/append.js

@@ -89,3 +89,4 @@ 'use strict';
                         }
-                    }
+                    },
+                    comment: 'Sequence not found from APPEND output'
                 });
@@ -92,0 +93,0 @@ response.next();

lib/commands/idle.js

@@ -15,32 +15,22 @@ 'use strict';
 
-        let preCheckWaitQueue = [];
-
         try {
             connection.idling = true;
 
-            let preCheckProcessing = false;
-            connection.preCheck = () => {
-                let processor = new Promise((resolve, reject) => {
-                    preCheckWaitQueue.push({ resolve, reject });
-                });
+            let idleSent = false;
+            let doneRequested = false;
+            let doneSent = false;
 
-                if (!preCheckProcessing) {
-                    preCheckProcessing = true;
-                    // small delay to make sure we do not call preCheck before command is actually executed
-                    setImmediate(() => {
-                        if (connection.idling) {
-                            connection.log.debug({ src: 'c', msg: `DONE`, comment: `breaking IDLE` });
-                            connection.write('DONE');
-                            connection.idling = false;
-                        }
-                        connection.preCheck = false; // unset itself
-                        while (preCheckWaitQueue.length) {
-                            console.log('RESOLVING IDLE');
-                            let entry = preCheckWaitQueue.shift();
-                            entry.resolve();
-                        }
-                    });
+            let preCheck = async () => {
+                doneRequested = true;
+                if (connection.idling && idleSent && !doneSent) {
+                    connection.log.debug({ src: 'c', msg: `DONE`, comment: `breaking IDLE` });
+                    connection.write('DONE');
+                    doneSent = true;
                 }
+            };
 
-                return processor;
+            connection.preCheck = async () => {
+                await preCheck();
+                connection.idling = false;
+                connection.preCheck = false; // unset itself
             };
@@ -51,2 +41,10 @@
                     connection.log.debug({ msg: `Initiated IDLE, waiting for server input` });
+                },
+                onSend: () => {
+                    idleSent = true;
+                    if (doneRequested) {
+                        preCheck().catch(err => {
+                            connection.log.debug({ msg: `preCheck error`, err });
+                        });
+                    }
                 }
@@ -57,7 +55,2 @@ });
             connection.preCheck = false;
-            while (preCheckWaitQueue.length) {
-                let entry = preCheckWaitQueue.shift();
-                let err = new Error('Already processed');
-                entry.reject(err);
-            }
 
@@ -68,7 +61,2 @@ response.next();
             connection.preCheck = false;
-            while (preCheckWaitQueue.length) {
-                let entry = preCheckWaitQueue.shift();
-                entry.reject(err);
-            }
-
             connection.log.warn({ err, cid: connection.id });
@@ -92,3 +80,3 @@ return false;
         let idleCheck = async () => {
-            let response = await connection.exec('NOOP');
+            let response = await connection.exec('NOOP', false, { comment: 'IDLE not supported' });
             response.next();
@@ -95,0 +83,0 @@ };

lib/commands/noop.js

@@ -6,3 +6,3 @@ 'use strict';
     try {
-        let response = await connection.exec('NOOP');
+        let response = await connection.exec('NOOP', false, { comment: 'Requested by command' });
         response.next();
@@ -9,0 +9,0 @@ return true;

package.json

 {
     "name": "imapflow",
-    "version": "1.0.72",
+    "version": "1.0.73",
     "description": "IMAP Client for Node",
@@ -5,0 +5,0 @@ "main": "./lib/imap-flow.js",

No alert changes

Worsened metrics

Total package byte prevSize

489754

decreased by-0.05%

Lines of code

11050

decreased by-0.04%

No dependency changes