mailauth 4.7.2 → 4.7.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.7.3](https://github.com/postalsys/mailauth/compare/v4.7.2...v4.7.3) (2024-10-21)
+
+
+### Bug Fixes
+
+* **BodyHashStream:** Skip header ([3da03d2](https://github.com/postalsys/mailauth/commit/3da03d23baa90acb119c7946c2cd740a72ba069d))
+
 ## [4.7.2](https://github.com/postalsys/mailauth/compare/v4.7.1...v4.7.2) (2024-10-02)
 
 

package/lib/dkim/body/index.js

@@ -3,7 +3,6 @@
 const { SimpleHash } = require('./simple');
 const { RelaxedHash } = require('./relaxed');
 const { Transform } = require('node:stream');
-const { MessageParser } = require('../message-parser');
 
 const dkimBody = (canonicalization, ...options) => {
     canonicalization = (canonicalization || 'simple/simple').toString().split('/').pop().toLowerCase().trim();
@@ -20,50 +19,15 @@ const dkimBody = (canonicalization, ...options) => {
     }
 };
 
-class MessageHasher extends MessageParser {
-    constructor(canonicalization, ...options) {
-        super();
-        this.hasher = dkimBody(canonicalization, ...options);
-        this.bodyHash = null;
-    }
-
-    async nextChunk(chunk) {
-        this.hasher.update(chunk);
-    }
-
-    async finalChunk() {
-        this.bodyHash = this.hasher.digest('base64');
-    }
-}
-
 class BodyHashStream extends Transform {
     constructor(canonicalization, ...options) {
         super();
 
-        this.finished = false;
-        this.finishCb = null;
-
         this.byteLength = 0;
 
-        this.messageHasher = new MessageHasher(canonicalization, ...options);
-        this.bodyHash = null;
-        this.messageHasher.once('finish', () => this.finishHashing());
-        this.messageHasher.once('end', () => this.finishHashing());
-        this.messageHasher.once('error', err => this.destroy(err));
-    }
-
-    finishHashing() {
-        if (this.finished || !this.finishCb) {
-            return;
-        }
-        this.finished = true;
-        let done = this.finishCb;
-        this.finishCb = null;
-
-        this.bodyHash = this.messageHasher.bodyHash;
-        this.emit('hash', this.bodyHash);
+        this.hasher = dkimBody(canonicalization, ...options);
 
-        done();
+        this.bodyHash = null;
     }
 
     _transform(chunk, encoding, done) {
@@ -77,19 +41,16 @@ class BodyHashStream extends Transform {
 
         this.byteLength += chunk.length;
 
+        this.hasher.update(chunk);
         this.push(chunk);
 
-        if (this.messageHasher.write(chunk) === false) {
-            // wait for drain
-            return this.messageHasher.once('drain', done);
-        }
-
         done();
     }
 
     _flush(done) {
-        this.finishCb = done;
-        this.messageHasher.end();
+        this.bodyHash = this.hasher.digest('base64');
+        this.emit('hash', this.bodyHash);
+        done();
     }
 }
 

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "October 2024" "v4.7.2" "Mailauth Help"
+.TH "MAILAUTH" "1" "October 2024" "v4.7.3" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.7.2",
+    "version": "4.7.3",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -52,7 +52,7 @@
         "libmime": "5.3.5",
         "nodemailer": "6.9.15",
         "punycode.js": "2.3.1",
-        "tldts": "6.1.49",
+        "tldts": "6.1.52",
         "undici": "5.28.4",
         "yargs": "17.7.2"
     },