@timshel_npm/maildev 3.2.0 → 3.2.1

package/README.md

@@ -30,8 +30,8 @@ Or can be installed using [Github](https://docs.npmjs.com/cli/v10/configuring-np
 Ex:
 ```json
 "devDependencies": {
-    "maildev": "github:timshel/maildev#3.2.0",
-    "maildev": "npm:@timshel_npm/maildev@^3.2.0"
+    "maildev": "github:timshel/maildev#3.2.1",
+    "maildev": "npm:@timshel_npm/maildev@^3.2.1"
 }
 ```
 

package/dist/lib/mailserver.js

@@ -226,7 +226,7 @@ class MailServer {
                 return elt.id === id;
             });
             if (envelope) {
-                return getDiskEmail(this.mailDir, envelope.id, envelope).then((mail) => {
+                return getDiskEmail(this.mailDir, envelope.id).then((mail) => {
                     if (mail.html) {
                         // sanitize html
                         const window = new JSDOM("").window;
@@ -390,7 +390,7 @@ class MailServer {
             const saved = files.map(function (file) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const id = path.parse(file).name;
-                    const email = yield getDiskEmail(self.mailDir, id, undefined);
+                    const email = yield getDiskEmail(self.mailDir, id);
                     return saveEmailToStore(self, email);
                 });
             });
@@ -417,29 +417,27 @@ function createMailDir(mailDir) {
     fs.mkdirSync(mailDir, { recursive: true });
     logger.info("MailDev using directory %s", mailDir);
 }
-function getDiskEmail(mailDir, id, envelope) {
+function getDiskEmail(mailDir, id) {
     return __awaiter(this, void 0, void 0, function* () {
         const emlPath = path.join(mailDir, id + ".eml");
         const data = yield fs_1.promises.readFile(emlPath, "utf8");
         const parsedMail = yield (0, mailparser_1.parse)(data);
-        if (envelope === undefined) {
-            envelope = {
-                id: id,
-                from: parsedMail.from,
-                to: parsedMail.to,
-                date: parsedMail.date,
-                subject: parsedMail.subject,
-                hasAttachment: parsedMail.attachments.length > 0,
-                isRead: false,
-            };
-        }
-        return buildMail(mailDir, envelope, parsedMail);
+        return buildMail(mailDir, id, parsedMail);
     });
 }
-function buildMail(mailDir, envelope, parsedMail) {
+function buildMail(mailDir, id, parsedMail) {
     return __awaiter(this, void 0, void 0, function* () {
-        const emlPath = path.join(mailDir, envelope.id + ".eml");
+        const emlPath = path.join(mailDir, id + ".eml");
         const stat = yield fs_1.promises.stat(emlPath);
+        const envelope = {
+            id: id,
+            from: parsedMail.from,
+            to: parsedMail.to,
+            date: parsedMail.date,
+            subject: parsedMail.subject,
+            hasAttachment: parsedMail.attachments.length > 0,
+            isRead: false,
+        };
         return Object.assign({ id: envelope.id, envelope, calculatedBcc: (0, bcc_1.calculateBcc)(envelope.to, parsedMail.to, parsedMail.cc), size: stat.size, sizeHuman: utils.formatBytes(stat.size) }, parsedMail);
     });
 }
@@ -482,16 +480,7 @@ function handleDataStream(mailServer, stream, session, callback) {
         });
         stream.pipe(emlStream);
         const parsed = yield (0, mailparser_1.parse)(stream);
-        const envelope = {
-            id: id,
-            from: session.envelope.mailFrom,
-            to: session.envelope.rcptTo,
-            date: parsed.date,
-            subject: parsed.subject,
-            hasAttachment: parsed.attachments.length > 0,
-            isRead: false,
-        };
-        const mail = yield buildMail(mailServer.mailDir, envelope, parsed);
+        const mail = yield buildMail(mailServer.mailDir, id, parsed);
         return saveEmailToStore(mailServer, mail);
     });
 }

package/dist/lib/options.js

@@ -139,7 +139,7 @@ function cliOptions() {
         hide8BITMIME: ((_a = config === null || config === void 0 ? void 0 : config.hideExtensions) !== null && _a !== void 0 ? _a : []).includes("8BITMIME"),
         hidePIPELINING: ((_b = config === null || config === void 0 ? void 0 : config.hideExtensions) !== null && _b !== void 0 ? _b : []).includes("PIPELINING"),
         hideSMTPUTF8: ((_c = config === null || config === void 0 ? void 0 : config.hideExtensions) !== null && _c !== void 0 ? _c : []).includes("SMTPUTF8"),
-        outgoing: (config === null || config === void 0 ? void 0 : config.autoRelay) || (config === null || config === void 0 ? void 0 : config.autoRelayRules)
+        outgoing: (config === null || config === void 0 ? void 0 : config.autoRelay) || (config === null || config === void 0 ? void 0 : config.autoRelayRules) || (config === null || config === void 0 ? void 0 : config.outgoingHost)
             ? {
                 host: config === null || config === void 0 ? void 0 : config.outgoingHost,
                 port: config === null || config === void 0 ? void 0 : config.outgoingPort,

package/dist/lib/outgoing.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Outgoing = void 0;
-/**
- * MailDev - outgoing
- */
 const SMTPConnection = require("nodemailer/lib/smtp-connection");
 const async = require("async");
 const fs = require("fs");
@@ -98,17 +95,19 @@ function createClient(outgoing) {
 }
 function relayMail(outgoing, emailObject, emailStream, isAutoRelay, done) {
     if (isAutoRelay && outgoing.autoRelayAddress) {
-        emailObject.to = [{ address: outgoing.autoRelayAddress }];
-        emailObject.envelope.to = [{ address: outgoing.autoRelayAddress, args: false }];
+        emailObject.to = [{ address: outgoing.autoRelayAddress, name: "Auto-Relay" }];
+        emailObject.envelope.to = [{ address: outgoing.autoRelayAddress, name: "Auto-Relay" }];
     }
     let recipients = emailObject.envelope.to.map(getAddressFromAddressObject);
     if (isAutoRelay && outgoing.autoRelayRules) {
         recipients = getAutoRelayableRecipients(recipients, outgoing.autoRelayRules);
     }
-    // Fail silently with auth relay mode on
     if (recipients.length === 0) {
         return done("Email had no recipients");
     }
+    if (emailObject.envelope.from.length === 0) {
+        return done("Email had no sender");
+    }
     const mailSendCallback = function (err) {
         if (err) {
             logger.error("Outgoing client login error: ", err);
@@ -116,13 +115,13 @@ function relayMail(outgoing, emailObject, emailStream, isAutoRelay, done) {
         }
         const sender = getAddressFromAddressObject(emailObject.envelope.from);
         outgoing.client.send({
-            from: sender,
+            from: emailObject.envelope.from[0].address,
             to: recipients,
         }, emailStream, function (err) {
             outgoing.client.quit();
             createClient(outgoing);
             if (err) {
-                logger.error("Mail Delivery Error: ", err);
+                logger.error("Mail Delivery Error: ", err, { sender, recipients });
                 return done(err);
             }
             logger.log("Mail Delivered: ", emailObject.subject);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@timshel_npm/maildev",
   "description": "SMTP Server with async API and Web Interface for viewing and testing emails during development",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "keywords": [
     "email",
     "e-mail",
@@ -59,14 +59,14 @@
     "addressparser": "1.0.1",
     "async": "^3.2.6",
     "commander": "^13.1.0",
-    "compression": "^1.8.0",
+    "compression": "^1.8.1",
     "cors": "^2.8.5",
     "dompurify": "^3.2.6",
     "express": "^5.1.0",
     "jsdom": "^26.1.0",
-    "mailparser": "^3.7.3",
+    "mailparser": "^3.7.4",
     "mime": "^3.0.0",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.5",
     "smtp-server": "^3.14.0",
     "socket.io": "^4.8.1",
     "wildstring": "1.0.9"
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.23",
-    "@types/node": "^18.19.112",
+    "@types/node": "^18.19.122",
     "expect": "^30.0.3",
     "http-proxy-middleware": "^3.0.5",
-    "jest": "^30.0.3",
+    "jest": "^30.0.5",
     "jest-mock": "^30.0.2",
     "mocha": "^11.7.1",
     "nodemon": "^3.1.10",
     "nyc": "^17.1.0",
     "prettier": "^3.6.2",
-    "sass": "^1.89.2",
+    "sass": "^1.90.0",
     "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "engines": {
     "node": ">=18.0.0"