imapflow 1.0.112 → 1.0.114

package/.ncurc.js

@@ -0,0 +1,4 @@
+module.exports = {
+    upgrade: true,
+    reject: ['jsdoc']
+};

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 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

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 = [];
 
         /**
@@ -331,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
@@ -803,6 +823,7 @@ class ImapFlow extends EventEmitter {
 
                 return resolve(true);
             });
+
             this.writeSocket = this.socket;
 
             this.setSocketHandlers();
@@ -1105,9 +1126,9 @@ class ImapFlow extends EventEmitter {
         }
 
         if (range && typeof range === 'object' && !Array.isArray(range)) {
-            if (range.all && Object.keys(range) === 1) {
+            if (range.all && Object.keys(range).length === 1) {
                 range = '1:*';
-            } else if (range.uid && Object.keys(range) === 1) {
+            } else if (range.uid && Object.keys(range).length === 1) {
                 range = range.uid;
                 options.uid = true;
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.112",
+    "version": "1.0.114",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {
@@ -30,10 +30,10 @@
         "@babel/eslint-parser": "7.19.1",
         "@babel/eslint-plugin": "7.19.1",
         "@babel/plugin-syntax-class-properties": "7.12.13",
-        "@babel/preset-env": "7.19.4",
-        "@types/node": "18.11.0",
+        "@babel/preset-env": "7.20.2",
+        "@types/node": "18.11.9",
         "braintree-jsdoc-template": "3.3.0",
-        "eslint": "8.25.0",
+        "eslint": "8.27.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
         "grunt": "1.5.3",
@@ -49,10 +49,10 @@
         "iconv-lite": "0.6.3",
         "libbase64": "1.2.1",
         "libmime": "5.1.0",
-        "libqp": "1.1.0",
+        "libqp": "2.0.1",
         "mailsplit": "5.3.2",
         "nodemailer": "6.8.0",
-        "pino": "8.6.1",
+        "pino": "8.7.0",
         "socks": "2.7.1"
     }
 }