postal-mime 2.2.9 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.3.0](https://github.com/postalsys/postal-mime/compare/v2.2.9...v2.3.0) (2024-09-23)
+
+
+### Features
+
+* Treat message/rfc822 as an attachment for delivery-status and feedback-report ([21e6224](https://github.com/postalsys/postal-mime/commit/21e62245aeb416b921ba683dd8628f5948831c56))
+
 ## [2.2.9](https://github.com/postalsys/postal-mime/compare/v2.2.8...v2.2.9) (2024-09-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "postal-mime",
-    "version": "2.2.9",
+    "version": "2.3.0",
     "description": "Email parser for browser environments",
     "main": "./src/postal-mime.js",
     "exports": {
@@ -28,7 +28,7 @@
     "author": "Andris Reinman",
     "license": "MIT-0",
     "devDependencies": {
-        "@types/node": "22.5.5",
+        "@types/node": "22.6.0",
         "cross-blob": "3.0.2",
         "cross-env": "7.0.3",
         "eslint": "8.57.0",

package/src/postal-mime.js

@@ -123,15 +123,15 @@ export default class PostalMime {
         let textTypes = new Set();
         let textMap = (this.textMap = new Map());
 
+        let forceRfc822Attachments = this.forceRfc822Attachments();
+
         let walk = async (node, alternative, related) => {
             alternative = alternative || false;
             related = related || false;
 
             if (!node.contentType.multipart) {
-                // regular node
-
                 // is it inline message/rfc822
-                if (this.isInlineMessageRfc822(node)) {
+                if (this.isInlineMessageRfc822(node) && !forceRfc822Attachments) {
                     const subParser = new PostalMime();
                     node.subMessage = await subParser.parse(node.content);
 
@@ -168,9 +168,6 @@ export default class PostalMime {
                 // is it text?
                 else if (this.isInlineTextNode(node)) {
                     let textType = node.contentType.parsed.value.substr(node.contentType.parsed.value.indexOf('/') + 1);
-                    if (node.contentType.parsed.value === 'message/delivery-status') {
-                        textType = 'plain';
-                    }
 
                     let selectorNode = alternative || node;
                     if (!textMap.has(selectorNode)) {
@@ -218,13 +215,6 @@ export default class PostalMime {
                             break;
                         }
 
-                        case 'message/delivery-status': {
-                            // Enforce into unicode
-                            const decodedText = node.getTextContent().replace(/\r?\n/g, '\n').replace(/\n*$/, '\n');
-                            attachment.content = textEncoder.encode(decodedText);
-                            break;
-                        }
-
                         // Regular attachments
                         default:
                             attachment.content = node.content;
@@ -330,8 +320,6 @@ export default class PostalMime {
         switch (node.contentType.parsed.value) {
             case 'text/html':
             case 'text/plain':
-            // message/delivery-status is cast into regular plaintext content
-            case 'message/delivery-status':
                 return true;
 
             case 'text/calendar':
@@ -349,6 +337,24 @@ export default class PostalMime {
         return disposition === 'inline';
     }
 
+    // Check if this is a specially crafted report email where message/rfc822 content should not be inlined
+    forceRfc822Attachments() {
+        let forceRfc822Attachments = false;
+        let walk = node => {
+            if (!node.contentType.multipart) {
+                if (['message/delivery-status', 'message/feedback-report'].includes(node.contentType.parsed.value)) {
+                    forceRfc822Attachments = true;
+                }
+            }
+
+            for (let childNode of node.childNodes) {
+                walk(childNode);
+            }
+        };
+        walk(this.root);
+        return forceRfc822Attachments;
+    }
+
     async resolveStream(stream) {
         let chunkLen = 0;
         let chunks = [];