🤖 Merge PR DefinitelyTyped#74704 feat(smtp-server): add hideDSN option and message param to onData cal… by @Mullayam

Author: Mullayam

types/smtp-server/index.d.ts

@@ -209,6 +209,10 @@ export interface SMTPServerOptions extends tls.TlsOptions {
      * Enhanced status codes are disabled by default.
      */
     hideENHANCEDSTATUSCODES?: boolean | undefined;
+    /**
+     * optional boolean, if set to true then does not show DSN in features list, by default DSN is disabled
+     */
+    hideDSN?: boolean;
     /**
      * optional boolean, if set to true allows authentication even if connection is not secured first
      */
@@ -295,7 +299,11 @@ export interface SMTPServerOptions extends tls.TlsOptions {
     /**
      * the callback to handle incoming messages ([see details](https://nodemailer.com/extras/smtp-server#processing-incoming-messages-ondata))
      */
-    onData?(stream: SMTPServerDataStream, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onData?(
+        stream: SMTPServerDataStream,
+        session: SMTPServerSession,
+        callback: (err?: Error | null, message?: string) => void,
+    ): void;
     /**
      * the callback that informs about closed client connection
      */
@@ -339,7 +347,11 @@ export class SMTPServer extends EventEmitter {
     /** Override this */
     onConnect(session: SMTPServerSession, callback: (err?: Error | null) => void): void;
     /** Override this */
-    onData(stream: SMTPServerDataStream, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
+    onData(
+        stream: SMTPServerDataStream,
+        session: SMTPServerSession,
+        callback: (err?: Error | null, message?: string) => void,
+    ): void;
     /** Override this */
     onMailFrom(address: SMTPServerAddress, session: SMTPServerSession, callback: (err?: Error | null) => void): void;
     /** Override this */

types/smtp-server/smtp-server-tests.ts

@@ -190,3 +190,17 @@ function test_newly_added_options() {
         },
     });
 }
+
+function test_hideDSN_option() {
+    const smtpServerInstance = new SMTPServer({
+        hideDSN: true,
+    });
+}
+
+function test_onData_with_message() {
+    const smtpServerInstance = new SMTPServer({
+        onData(stream, session, callback) {
+            callback(null, "Message queued");
+        },
+    });
+}