@timshel_npm/maildev 3.2.7 → 3.2.9

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.7",
-    "maildev": "npm:@timshel_npm/maildev@^3.2.7"
+    "maildev": "github:timshel/maildev#3.2.9",
+    "maildev": "npm:@timshel_npm/maildev@^3.2.9"
 }
 ```
 
@@ -148,9 +148,9 @@ Usage: maildev [options]
 | `--disable-web`                  | `MAILDEV_DISABLE_WEB`      | Disable the use of the web interface. Useful for unit testing                             |
 | `--hide-extensions <extensions>` | `MAILDEV_HIDE_EXTENSIONS`  | Comma separated list of SMTP extensions to NOT advertise (SMTPUTF8, PIPELINING, 8BITMIME) |
 | `-o, --open`                     |                            | Open the Web GUI after startup                                                            |
-| `-v, --verbose`                  |                            |                                                                                           |
-| `--silent`                       |                            |                                                                                           |
-| `--log-mail-contents`            |                            | Log a JSON representation of each incoming mail                                           |
+| `-v, --verbose`                  | `MAILDEV_VERBOSE`          | Display log level message                                                                 |
+| `--silent`                       | `MAILDEV_SILENT`           | Display only error level message (ignored if `verbose` is active)                         |
+| `--log-mail-contents`            | `MAILDEV_LOG_CONTENT`      | Log a JSON representation of each incoming mail                                           |
 
 
 ## Outgoing email

package/dist/lib/helpers/strtotime.d.ts

@@ -1,2 +1 @@
-declare function _exports(str: any, now: any): number | false;
-export = _exports;
+export function strtotime(str: any, now: any): number | false;

package/dist/lib/helpers/strtotime.js

@@ -1,5 +1,7 @@
 "use strict";
 // From: https://raw.githubusercontent.com/locutusjs/locutus/main/src/php/datetime/strtotime.js
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.strtotime = strtotime;
 const reSpace = "[ \\t]+";
 const reSpaceOpt = "[ \\t]*";
 const reMeridian = "(?:([ap])\\.?m\\.?([\\t ]|$))";
@@ -1178,7 +1180,7 @@ const resultProto = {
         return result;
     },
 };
-module.exports = function strtotime(str, now) {
+function strtotime(str, now) {
     //       discuss at: https://locutus.io/php/strtotime/
     //      original by: Caio Ariede (https://caioariede.com)
     //      improved by: Kevin van Zonneveld (https://kvz.io)
@@ -1298,4 +1300,4 @@ module.exports = function strtotime(str, now) {
         longestMatch = null;
     }
     return Math.floor(result.toDate(new Date(now * 1000)) / 1000);
-};
+}

package/dist/lib/logger.d.ts

@@ -1,2 +1,11 @@
 export function setLevel(level: any): void;
+/**
+ * The error method will always log to the console
+ */
+export function error(...args: any[]): void;
+/**
+ * Log only when set to verbose (2)
+ */
+export function log(...args: any[]): void;
 export function info(...args: any[]): void;
+export function warn(...args: any[]): void;

package/dist/lib/logger.js

@@ -1,30 +1,38 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setLevel = setLevel;
+exports.error = error;
+exports.log = log;
+exports.info = info;
+exports.warn = warn;
 /**
  * MailDev - logger.js
  */
 let logLevel = 1;
-module.exports = {};
+function setLevel(level) {
+    logLevel = level;
+}
 /**
- * Initialize the logger
+ * The error method will always log to the console
  */
-module.exports.setLevel = function (level) {
-    logLevel = level;
-};
+function error() {
+    console.error.apply(console, arguments);
+}
 /**
- * The info method will always log to the console
+ * Log only when set to verbose (2)
  */
-module.exports.info = function () {
+function log() {
+    if (logLevel > 1) {
+        console.log.apply(console, arguments);
+    }
+}
+function info() {
     if (logLevel > 0) {
         console.info.apply(console, arguments);
     }
-};
-/**
- * Extend the basic console.x functions, checking if the logging is on
- */
-["log", "dir", "warn", "error"].forEach(function (fn) {
-    module.exports[fn] = function () {
-        if (logLevel > 1) {
-            console[fn].apply(console, arguments);
-        }
-    };
-});
+}
+function warn() {
+    if (logLevel > 0) {
+        console.warn.apply(console, arguments);
+    }
+}

package/dist/lib/mailparser.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
 const mime_1 = require("mime");
-const simpleParser = require("mailparser").simpleParser;
-const strtotime = require("./helpers/strtotime");
+const strtotime_1 = require("./helpers/strtotime");
 const logger = require("./logger");
+const simpleParser = require("mailparser").simpleParser;
 function parse(input) {
     return __awaiter(this, void 0, void 0, function* () {
         return simpleParser(input, {}).then((parsed) => {
@@ -237,7 +237,7 @@ function parseDateString(value) {
     if (Object.prototype.toString.call(date) !== "[object Date]" ||
         date.toString() === "Invalid Date") {
         try {
-            date = strtotime(value);
+            date = (0, strtotime_1.strtotime)(value);
         }
         catch (E) {
             return false;

package/dist/lib/mailserver.d.ts

@@ -35,6 +35,7 @@ export declare class MailServer {
     mailEventSubjectMapper: (Mail: any) => string | undefined;
     smtp: typeof SMTPServer;
     outgoing: Outgoing | undefined;
+    private _reloadInProgress;
     /**
      * Extend Event Emitter methods
      * events:
@@ -111,5 +112,6 @@ export declare class MailServer {
      * Download a given email
      */
     getEmailEml(id: any): Promise<[string, string, ReadStream]>;
-    loadMailsFromDirectory(): Promise<void[]>;
+    loadMailsFromDirectory(): Promise<void>;
+    private _loadMailsFromDirectory;
 }

package/dist/lib/mailserver.js

@@ -28,14 +28,14 @@ const smtp_1 = require("./helpers/smtp");
 const mailbuffer_1 = require("./mailbuffer");
 const mailparser_1 = require("./mailparser");
 const outgoing_1 = require("./outgoing");
+const logger = require("./logger");
+const utils = require("./utils");
 const smtp_server_1 = require("smtp-server");
 const fs_1 = require("fs");
 const events = require("events");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const utils = require("./utils");
-const logger = require("./logger");
 const createDOMPurify = require("dompurify");
 const { JSDOM } = require("jsdom");
 const defaultPort = 1025;
@@ -107,6 +107,7 @@ class MailServer {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         this.store = [];
         this.eventEmitter = new events.EventEmitter();
+        this._reloadInProgress = undefined;
         /**
          * Extend Event Emitter methods
          * events:
@@ -379,6 +380,19 @@ class MailServer {
         });
     }
     loadMailsFromDirectory() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._reloadInProgress == undefined) {
+                this._reloadInProgress = this._loadMailsFromDirectory().finally(() => {
+                    this._reloadInProgress = undefined;
+                });
+                return this._reloadInProgress;
+            }
+            else {
+                return this._reloadInProgress;
+            }
+        });
+    }
+    _loadMailsFromDirectory() {
         return __awaiter(this, void 0, void 0, function* () {
             const self = this;
             const persistencePath = yield fs_1.promises.realpath(this.mailDir);
@@ -387,14 +401,19 @@ class MailServer {
                 throw new Error(`Error during reading of the mailDir ${persistencePath}`);
             });
             this.store.length = 0;
-            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);
-                    return saveEmailToStore(self, email);
+            this.eventEmitter.emit("delete", { id: "all" });
+            const concurrency = 20;
+            for (let i = 0; i < files.length; i += concurrency) {
+                const chunk = files.slice(i, i + concurrency);
+                let saved = chunk.map(function (file) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        const id = path.parse(file).name;
+                        const email = yield getDiskEmail(self.mailDir, id);
+                        return saveEmailToStore(self, email);
+                    });
                 });
-            });
-            return Promise.all(saved);
+                yield Promise.all(saved);
+            }
         });
     }
 }

package/dist/lib/options.js

@@ -5,18 +5,40 @@ exports.cliOptions = cliOptions;
 const program = require("commander").program;
 const pkg = require("../../package.json");
 const fs = require("fs");
+/*
+ * Converts a string to a bool.
+ *  - match 'true', 'on', or '1' as true.
+ *  - ignore all white-space padding
+ *  - ignore capitalization (case).
+ */
+function parseBoolean(s) {
+    let regex = /^\s*(true|1|on)\s*$/i;
+    return regex.test(s);
+}
 const options = [
     // General config
-    ["-v, --verbose"],
-    ["--silent"],
-    ["--log-mail-contents", "Log a JSON representation of each incoming email"],
+    ["-v, --verbose", "MAILDEV_VERBOSE", "Display log level message", false, parseBoolean],
+    ["--silent", "MAILDEV_SILENT", "Display only error level message", false, parseBoolean],
+    [
+        "--log-mail-contents",
+        "MAILDEV_LOG_CONTENT",
+        "Log a JSON representation of each incoming email",
+        false,
+        parseBoolean,
+    ],
     // SMTP server parameters
-    ["-s, --smtp <port>", "MAILDEV_SMTP_PORT", "SMTP port to catch emails", 1025, (x) => parseInt(x)],
+    ["-s, --smtp <port>", "MAILDEV_SMTP_PORT", "SMTP port to catch emails", 1025, parseInt],
     ["--ip <ip address>", "MAILDEV_IP", "IP Address to bind SMTP service to", "0.0.0.0"],
     ["--mail-directory <path>", "MAILDEV_MAIL_DIRECTORY", "Directory for persisting mails"],
     ["--incoming-user <user>", "MAILDEV_INCOMING_USER", "SMTP user for incoming emails"],
     ["--incoming-pass <pass>", "MAILDEV_INCOMING_PASS", "SMTP password for incoming emails"],
-    ["--incoming-secure", "MAILDEV_INCOMING_SECURE", "Use SMTP SSL for incoming emails", false],
+    [
+        "--incoming-secure",
+        "MAILDEV_INCOMING_SECURE",
+        "Use SMTP SSL for incoming emails",
+        false,
+        parseBoolean,
+    ],
     ["--incoming-cert <path>", "MAILDEV_INCOMING_CERT", "Cert file location for incoming SSL"],
     ["--incoming-key <path>", "MAILDEV_INCOMING_KEY", "Key file location for incoming SSL"],
     [
@@ -33,15 +55,16 @@ const options = [
         "Use auto-relay mode. Optional relay email address",
     ],
     ["--outgoing-host <host>", "MAILDEV_OUTGOING_HOST", "SMTP host for outgoing emails"],
-    [
-        "--outgoing-port <port>",
-        "MAILDEV_OUTGOING_PORT",
-        "SMTP port for outgoing emails",
-        (x) => parseInt(x),
-    ],
+    ["--outgoing-port <port>", "MAILDEV_OUTGOING_PORT", "SMTP port for outgoing emails", parseInt],
     ["--outgoing-user <user>", "MAILDEV_OUTGOING_USER", "SMTP user for outgoing emails"],
     ["--outgoing-pass <password>", "MAILDEV_OUTGOING_PASS", "SMTP password for outgoing emails"],
-    ["--outgoing-secure", "MAILDEV_OUTGOING_SECURE", "Use SMTP SSL for outgoing emails", false],
+    [
+        "--outgoing-secure",
+        "MAILDEV_OUTGOING_SECURE",
+        "Use SMTP SSL for outgoing emails",
+        false,
+        parseBoolean,
+    ],
     ["--auto-relay-rules <file>", "MAILDEV_AUTO_RELAY_RULES", "Filter rules for auto relay mode"],
     // Web app config
     [
@@ -49,8 +72,9 @@ const options = [
         "MAILDEV_DISABLE_WEB",
         "Disable the use of the web interface. Useful for unit testing",
         false,
+        parseBoolean,
     ],
-    ["-w, --web <port>", "MAILDEV_WEB_PORT", "Port to run the Web GUI", 1080, (x) => parseInt(x)],
+    ["-w, --web <port>", "MAILDEV_WEB_PORT", "Port to run the Web GUI", 1080, parseInt],
     [
         "--web-ip <ip address>",
         "MAILDEV_WEB_IP",
@@ -64,19 +88,24 @@ const options = [
         '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", "MAILDEV_HTTPS", "Switch from http to https protocol", false, parseBoolean],
     ["--https-key <file>", "MAILDEV_HTTPS_KEY", "The file path to the ssl private key"],
     ["--https-cert <file>", "MAILDEV_HTTPS_CERT", "The file path to the ssl cert file"],
 ];
 function appendOptions(program, options) {
     return options.reduce(function (chain, option) {
-        var _a;
         const flag = option[0];
-        const envVariable = typeof option[1] === "string" ? option[1] : undefined;
-        const description = typeof option[2] === "string" ? option[2] : undefined;
-        const defaultValue = envVariable ? ((_a = process.env[envVariable]) !== null && _a !== void 0 ? _a : option[3]) : option[3];
+        const envVariable = option[1];
+        const description = option[2];
         const fn = option[4];
-        return fn
+        const defaultValue = envVariable
+            ? process.env[envVariable]
+                ? fn
+                    ? fn(process.env[envVariable])
+                    : process.env[envVariable]
+                : option[3]
+            : option[3];
+        return fn && fn != parseBoolean
             ? chain.option(flag, description, fn, defaultValue)
             : chain.option(flag, description, defaultValue);
     }, program);

package/dist/lib/outgoing.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Outgoing = void 0;
+const logger = require("./logger");
 const SMTPConnection = require("nodemailer/lib/smtp-connection");
 const async = require("async");
 const fs = require("fs");
-const logger = require("./logger");
 const wildstring = require("wildstring");
 class Outgoing {
     constructor(options) {

package/dist/lib/routes.js

@@ -1,13 +1,22 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.routes = routes;
+const utils_1 = require("./utils");
 /**
  * MailDev - routes
  */
 const express = require("express");
 const compression = require("compression");
 const pkg = require("../../package.json");
-const { filterEmails } = require("./utils");
 const emailRegexp = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 function routes(app, mailserver, basePathname) {
     const router = express.Router();
@@ -19,7 +28,7 @@ function routes(app, mailserver, basePathname) {
     router.get("/email", compression(), function (req, res) {
         mailserver
             .getAllEmail()
-            .then((mails) => res.status(200).json(req.query ? filterEmails(mails, req.query) : mails))
+            .then((mails) => res.status(200).json(req.query ? (0, utils_1.filterEmails)(mails, req.query) : mails))
             .catch((err) => res.status(500).json({ error: err.message }));
     });
     // Get single email
@@ -132,8 +141,10 @@ function routes(app, mailserver, basePathname) {
         res.status(200).json(true);
     });
     router.get("/reloadMailsFromDirectory", function (req, res) {
-        mailserver.loadMailsFromDirectory();
-        res.status(200).json(true);
+        return __awaiter(this, void 0, void 0, function* () {
+            yield mailserver.loadMailsFromDirectory();
+            res.status(200).json(true);
+        });
     });
     app.use(basePathname, router);
 }

package/dist/lib/utils.d.ts

@@ -1,4 +1,5 @@
+import type { Mail } from "./type";
 export declare function makeId(): string;
 export declare function formatBytes(bytes: number, decimals?: number): string;
-export declare function filterEmails(emails: string[], query: any): string[];
+export declare function filterEmails(emails: Mail[], query: any): Mail[];
 export declare function delay(ms: any): Promise<void>;

package/dist/lib/web.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Web = void 0;
 const routes_1 = require("./routes");
+const auth_1 = require("./auth");
+const logger = require("./logger");
 const express = require("express");
 const cors = require("cors");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
 const socketio = require("socket.io");
-const auth = require("./auth");
-const logger = require("./logger");
 const path = require("path");
 class Web {
     constructor(mailserver, options) {
@@ -30,7 +30,7 @@ class Web {
             }, app)
             : http.createServer(app);
         if (options === null || options === void 0 ? void 0 : options.auth) {
-            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));
+            app.use((0, auth_1.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"),

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.7",
+  "version": "3.2.9",
   "keywords": [
     "email",
     "e-mail",
@@ -60,18 +60,19 @@
     "async": "3.2.6",
     "commander": "14.0.2",
     "compression": "1.8.1",
-    "cors": "2.8.5",
+    "cors": "2.8.6",
     "dompurify": "3.3.1",
     "express": "5.2.1",
     "jsdom": "27.4.0",
     "mailparser": "3.9.1",
     "mime": "4.1.0",
-    "nodemailer": "7.0.12",
+    "nodemailer": "7.0.13",
     "smtp-server": "3.18.0",
     "socket.io": "4.8.3",
     "wildstring": "1.0.9"
   },
   "overrides": {
+    "diff": "8.0.3",
     "socket.io-adapter": "2.5.5",
     "qs": "6.14.1"
   },
@@ -85,8 +86,8 @@
     "mocha": "11.7.5",
     "nodemon": "3.1.11",
     "nyc": "17.1.0",
-    "prettier": "3.7.4",
-    "sass": "1.97.2",
+    "prettier": "3.8.1",
+    "sass": "1.97.3",
     "ts-node": "10.9.2",
     "ts-node-dev": "2.0.0",
     "typescript": "5.9.3"