mailauth 4.7.0 → 4.7.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.7.1](https://github.com/postalsys/mailauth/compare/v4.7.0...v4.7.1) (2024-10-02)
+
+
+### Bug Fixes
+
+* **dkim:** New class BodyHashStream ([88d2fad](https://github.com/postalsys/mailauth/commit/88d2fad329a9a6fc8ebc1da4efc1c4844ae49507))
+
 ## [4.7.0](https://github.com/postalsys/mailauth/compare/v4.6.9...v4.7.0) (2024-10-02)
 
 

package/lib/dkim/body/index.js

@@ -1,7 +1,9 @@
 'use strict';
 
-let { SimpleHash } = require('./simple');
-let { RelaxedHash } = require('./relaxed');
+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();
@@ -18,4 +20,72 @@ const dkimBody = (canonicalization, ...options) => {
     }
 };
 
-module.exports = { dkimBody };
+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.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);
+
+        done();
+    }
+
+    _transform(chunk, encoding, done) {
+        if (!chunk || !chunk.length) {
+            return done();
+        }
+
+        if (typeof chunk === 'string') {
+            chunk = Buffer.from(chunk, encoding);
+        }
+
+        if (this.messageHasher.write(chunk) === false) {
+            // wait for drain
+            return this.messageHasher.once('drain', done);
+        }
+
+        this.push(chunk);
+        done();
+    }
+
+    _flush(done) {
+        this.finishCb = done;
+        this.messageHasher.end();
+    }
+}
+
+module.exports = { dkimBody, BodyHashStream };

package/man/mailauth.1

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.7.0",
+    "version": "4.7.1",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {