@timshel_npm/maildev 3.1.4 → 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.1.4",
-    "maildev": "npm:@timshel_npm/maildev@^3.1.4"
+    "maildev": "github:timshel/maildev#3.2.1",
+    "maildev": "npm:@timshel_npm/maildev@^3.2.1"
 }
 ```
 

package/dist/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailDev = void 0;
 const mailserver_1 = require("./lib/mailserver");
 const web_1 = require("./lib/web");
-const async = require("async");
 const logger = require("./lib/logger");
 class MailDev extends mailserver_1.MailServer {
     constructor(config, mailEventSubjectMapper) {

package/dist/lib/mailparser.js

@@ -160,7 +160,7 @@ function generateFileNames(fileNames, fileName, contentType) {
     let ext;
     let defaultExt = "";
     if (contentType) {
-        const ext = mime.extension(contentType); // renamed as getExtension in > 2.0
+        const ext = mime.getExtension(contentType);
         defaultExt = ext ? "." + ext : "";
     }
     fileName = fileName || "attachment" + defaultExt;

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

@@ -58,7 +58,11 @@ const options = [
     ],
     ["--web-user <user>", "MAILDEV_WEB_USER", "HTTP user for GUI"],
     ["--web-pass <password>", "MAILDEV_WEB_PASS", "HTTP password for GUI"],
-    ["--web-domain <path>", "MAILDEV_WEB_DOMAIN", "External domain name (used for socket CORS, \"*\" otherwise)"],
+    [
+        "--web-domain <path>",
+        "MAILDEV_WEB_DOMAIN",
+        'External domain name (used for socket CORS, "*" otherwise)',
+    ],
     ["--base-pathname <path>", "MAILDEV_BASE_PATHNAME", "Base path for URLs"],
     ["--https", "MAILDEV_HTTPS", "Switch from http to https protocol", false],
     ["--https-key <file>", "MAILDEV_HTTPS_KEY", "The file path to the ssl private key"],
@@ -135,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/dist/lib/routes.js

@@ -13,13 +13,13 @@ function routes(app, mailserver, basePathname) {
     const router = express.Router();
     // Get all emails Enveloppe
     router.get("/envelope", compression(), function (req, res) {
-        res.json(mailserver.getAllEnvelope());
+        res.status(200).json(mailserver.getAllEnvelope());
     });
     // Get all emails
     router.get("/email", compression(), function (req, res) {
         mailserver
             .getAllEmail()
-            .then((mails) => res.json(req.query ? filterEmails(mails, req.query) : mails))
+            .then((mails) => res.status(200).json(req.query ? filterEmails(mails, req.query) : mails))
             .catch((err) => res.status(500).json({ error: err.message }));
     });
     // Get single email
@@ -28,7 +28,7 @@ function routes(app, mailserver, basePathname) {
             .getEmail(req.params.id)
             .then((mail) => {
             mail.envelope.isRead = true; // Mark the email as 'read'
-            res.json(mail);
+            res.status(200).json(mail);
         })
             .catch((err) => res.status(404).json({ error: err.message }));
     });
@@ -42,20 +42,20 @@ function routes(app, mailserver, basePathname) {
     // Read all emails
     router.patch("/email/read-all", function (req, res) {
         const count = mailserver.readAllEmail();
-        res.json(count);
+        res.status(200).json(count);
     });
     // Delete all emails
     router.delete("/email/all", function (req, res) {
         mailserver
             .deleteAllEmail()
-            .then((count) => res.json(count))
+            .then((count) => res.status(200).json(count))
             .catch((err) => res.status(500).json({ error: err.message }));
     });
     // Delete email by id
     router.delete("/email/:id", function (req, res) {
         mailserver
             .deleteEmail(req.params.id)
-            .then((deleted) => res.json(deleted))
+            .then((deleted) => res.status(200).json(deleted))
             .catch((err) => res.status(500).json({ error: err.message }));
     });
     // Get Email HTML
@@ -64,7 +64,7 @@ function routes(app, mailserver, basePathname) {
         const baseUrl = req.headers.host + (req.baseUrl || "");
         mailserver
             .getEmailHTML(req.params.id, baseUrl)
-            .then((html) => res.send(html))
+            .then((html) => res.status(200).send(html))
             .catch((err) => res.status(404).json({ error: err.message }));
     });
     // Serve Attachments
@@ -73,7 +73,7 @@ function routes(app, mailserver, basePathname) {
             .getEmailAttachment(req.params.id, req.params.filename)
             .then((attachement) => {
             res.contentType(attachement.contentType);
-            res.send(attachement.content);
+            res.status(200).send(attachement.content);
         })
             .catch((err) => res.status(404).json({ error: err.message }));
     });
@@ -97,7 +97,7 @@ function routes(app, mailserver, basePathname) {
     });
     // Get any config settings for display
     router.get("/config", function (req, res) {
-        res.json({
+        res.status(200).json({
             version: pkg.version,
             smtpPort: mailserver.port,
             isOutgoingEnabled: mailserver.isOutgoingEnabled(),
@@ -105,7 +105,7 @@ function routes(app, mailserver, basePathname) {
         });
     });
     // Relay the email
-    router.post("/email/:id/relay/:relayTo?", function (req, res) {
+    router.post("/email/:id/relay{/:relayTo}", function (req, res) {
         mailserver
             .getEmail(req.params.id)
             .then((mail) => {
@@ -122,18 +122,18 @@ function routes(app, mailserver, basePathname) {
             }
             return mailserver
                 .relayMail(mail, false)
-                .then(() => res.json(true))
+                .then(() => res.status(200).json(true))
                 .catch((err) => res.status(500).json({ error: err.message }));
         })
             .catch((err) => res.status(404).json({ error: err.message }));
     });
     // Health check
     router.get("/healthz", function (req, res) {
-        res.json(true);
+        res.status(200).json(true);
     });
     router.get("/reloadMailsFromDirectory", function (req, res) {
         mailserver.loadMailsFromDirectory();
-        res.json(true);
+        res.status(200).json(true);
     });
     app.use(basePathname, router);
 }

package/dist/lib/web.js

@@ -33,11 +33,11 @@ class Web {
             app.use(auth((_d = options === null || options === void 0 ? void 0 : options.auth) === null || _d === void 0 ? void 0 : _d.user, (_e = options === null || options === void 0 ? void 0 : options.auth) === null || _e === void 0 ? void 0 : _e.pass));
         }
         this.io = socketio({
-            path: path.posix.join(this.basePathname, '/socket.io'),
+            path: path.posix.join(this.basePathname, "/socket.io"),
             cors: {
-                origin: (_f = options === null || options === void 0 ? void 0 : options.domain) !== null && _f !== void 0 ? _f : '*',
-                methods: ["GET", "POST"]
-            }
+                origin: (_f = options === null || options === void 0 ? void 0 : options.domain) !== null && _f !== void 0 ? _f : "*",
+                methods: ["GET", "POST"],
+            },
         });
         app.use(this.basePathname, express.static(path.join(__dirname, "../app")));
         app.use(cors());

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.1.4",
+  "version": "3.2.1",
   "keywords": [
     "email",
     "e-mail",
@@ -15,7 +15,7 @@
     "playwright"
   ],
   "author": "Timshel",
-  "homepage": "https://github.com/timshel/maildev",
+  "homepage": "https://github.com/Timshel/maildev",
   "maintainers": [
     {
       "name": "Timshel",
@@ -24,7 +24,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/timshel/maildev.git"
+    "url": "https://github.com/Timshel/maildev"
   },
   "scripts": {
     "clean": "rm -rf dist coverage tsconfig.tsbuildinfo",
@@ -58,16 +58,16 @@
     "@types/mailparser": "^3.4.6",
     "addressparser": "1.0.1",
     "async": "^3.2.6",
-    "commander": "^12.1.0",
-    "compression": "^1.8.0",
+    "commander": "^13.1.0",
+    "compression": "^1.8.1",
     "cors": "^2.8.5",
     "dompurify": "^3.2.6",
-    "express": "^4.21.2",
-    "jsdom": "^24.1.3",
-    "mailparser": "^3.7.3",
-    "mime": "1.6.0",
-    "nodemailer": "^6.10.1",
-    "smtp-server": "^3.13.8",
+    "express": "^5.1.0",
+    "jsdom": "^26.1.0",
+    "mailparser": "^3.7.4",
+    "mime": "^3.0.0",
+    "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",
-    "expect": "^29.7.0",
+    "@types/node": "^18.19.122",
+    "expect": "^30.0.3",
     "http-proxy-middleware": "^3.0.5",
-    "jest": "^29.7.0",
-    "jest-mock": "^29.7.0",
-    "mocha": "^10.8.2",
+    "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"