Add new metadata values

lib/models/index.d.ts

@@ -119,6 +119,26 @@ export interface Metadata {
    * Message headers
    */
   headers?: MessageHeader[];
+  /**
+   * The fully-qualified domain name or IP address that was provided with the
+   * Extended HELLO (EHLO) or HELLO (HELO) command. This value is generally
+   * used to identify the SMTP client.
+   * https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.1
+   */
+  ehlo: string;
+  /**
+   * The source mailbox/email address, referred to as the 'reverse-path',
+   * provided via the MAIL command during the SMTP transaction.
+   * https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.2
+   */
+  mailFrom?: string;
+  /**
+   * The recipient email addresses, each referred to as a 'forward-path',
+   * provided via the RCPT command during the SMTP transaction.
+   * https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.3
+   */
+  rcptTo?: MessageAddress[];
+
 }
 
 /**
@@ -165,10 +185,6 @@ export interface Message {
    * An array of attachment metadata for any attached files.
    */
   attachments?: Attachment[];
-  /**
-   * The email recipient given to Mailosaur by the sending server.
-   */
-  rcpt?: MessageAddress[];
   /**
    * Further metadata related to the message, including email headers.
    */
@@ -221,10 +237,6 @@ export interface MessageSummary {
    * The number of attachments associated with the message.
    */
   attachments?: number;
-  /**
-   * The email recipient given to Mailosaur by the sending server.
-   */
-  rcpt?: MessageAddress[];
   /**
    * Identifier for the server in which the message is located.
    */

lib/models/metadata.js

@@ -1,8 +1,12 @@
+const MessageAddress = require('./messageAddress');
 const MessageHeader = require('./messageHeader');
 
 class Metadata {
   constructor(data = {}) {
     this.headers = (data.headers || []).map((i) => (new MessageHeader(i)));
+    this.ehlo = data.ehlo;
+    this.mailFrom = data.mailFrom;
+    this.rcptTo = (data.rcptTo || []).map((i) => (new MessageAddress(i)));
   }
 }
 

test/emails.js

@@ -89,6 +89,9 @@ const validateEmail = (email) => {
   validateAttachments(email);
   validateHtml(email);
   validateText(email);
+  assert.isOk(email.metadata.ehlo, 'ehlo is empty');
+  assert.isOk(email.metadata.mailFrom, 'mailFrom is empty');
+  assert.equal(email.metadata.rcptTo.length, 1);
 };
 
 const validateEmailSummary = (email) => {

test/servers.js

@@ -116,7 +116,7 @@ describe('servers', () => {
           assert.equal(err.message, 'Request had one or more invalid parameters.');
           assert.equal(err.errorType, 'invalid_request');
           assert.equal(err.httpStatusCode, 400);
-          assert.isTrue(err.httpResponseBody.indexOf('"type":') !== -1);
+          assert.isTrue(err.httpResponseBody.indexOf('{"type":') !== -1);
           done();
         });
     });