imapflow 1.0.111 → 1.0.113

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+-   1.0.113 - 2022-10-21
+
+    -   Added `stats()` method to get the count of bytes sent and received
+
+-   1.0.112 - 2022-10-16
+
+    -   Improved ID compatiblity with servers that allow ID only after login
+
 -   1.0.111 - 2022-10-13
 
     -   Added new connection options

package/lib/handler/imap-stream.js

@@ -32,6 +32,8 @@ class ImapStream extends Transform {
                       cid: this.cid
                   });
 
+        this.readBytesCounter = 0;
+
         this.state = LINE;
         this.literalWaiting = 0;
         this.inputBuffer = []; // lines
@@ -197,6 +199,12 @@ class ImapStream extends Transform {
             chunk = Buffer.from(chunk, encoding);
         }
 
+        if (!chunk || !chunk.length) {
+            return next();
+        }
+
+        this.readBytesCounter += chunk.length;
+
         if (this.options.logRaw) {
             this.log.trace({
                 src: 's',

package/lib/imap-flow.js

@@ -207,6 +207,8 @@ class ImapFlow extends EventEmitter {
         this.requestQueue = [];
         this.currentRequest = false;
 
+        this.writeBytesCounter = 0;
+
         this.commandParts = [];
 
         /**
@@ -268,6 +270,8 @@ class ImapFlow extends EventEmitter {
         this.currentLock = false;
         this.locks = [];
 
+        this.idRequested = false;
+
         this.maxIdleTime = this.options.maxIdleTime || false;
 
         this.disableBinary = !!this.options.disableBinary;
@@ -329,9 +333,27 @@ class ImapFlow extends EventEmitter {
             });
         }
 
+        this.writeBytesCounter += chunk.length;
+
         this.writeSocket.write(chunk);
     }
 
+    stats(reset) {
+        let result = {
+            sent: this.writeBytesCounter || 0,
+            received: (this.streamer && this.streamer.readBytesCounter) || 0
+        };
+
+        if (reset) {
+            this.writeBytesCounter = 0;
+            if (this.streamer) {
+                this.streamer.readBytesCounter = 0;
+            }
+        }
+
+        return result;
+    }
+
     async send(data) {
         if (this.state === this.states.LOGOUT) {
             // already logged out
@@ -613,7 +635,10 @@ class ImapFlow extends EventEmitter {
 
     async startSession() {
         await this.run('CAPABILITY');
-        await this.run('ID', this.clientInfo);
+
+        if (this.capabilities.has('ID')) {
+            this.idRequested = await this.run('ID', this.clientInfo);
+        }
 
         // try to use STARTTLS is possible
         if (!this.secureConnection) {
@@ -626,6 +651,11 @@ class ImapFlow extends EventEmitter {
             return await this.logout();
         }
 
+        if (!this.idRequested && this.capabilities.has('ID')) {
+            // re-request ID after LOGIN
+            this.idRequested = await this.run('ID', this.clientInfo);
+        }
+
         // Make sure we have namespace set. This should also throw if Exchange actually failed authentication
         let nsResponse = await this.run('NAMESPACE');
         if (nsResponse && nsResponse.error && nsResponse.status === 'BAD' && /User is authenticated but not connected/i.test(nsResponse.text)) {
@@ -793,6 +823,7 @@ class ImapFlow extends EventEmitter {
 
                 return resolve(true);
             });
+
             this.writeSocket = this.socket;
 
             this.setSocketHandlers();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.111",
+    "version": "1.0.113",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -31,7 +31,7 @@
         "@babel/eslint-plugin": "7.19.1",
         "@babel/plugin-syntax-class-properties": "7.12.13",
         "@babel/preset-env": "7.19.4",
-        "@types/node": "18.8.5",
+        "@types/node": "18.11.3",
         "braintree-jsdoc-template": "3.3.0",
         "eslint": "8.25.0",
         "eslint-config-nodemailer": "1.2.0",
@@ -52,7 +52,7 @@
         "libqp": "1.1.0",
         "mailsplit": "5.3.2",
         "nodemailer": "6.8.0",
-        "pino": "8.6.1",
+        "pino": "8.7.0",
         "socks": "2.7.1"
     }
 }