@twilio/conversations 2.0.1 → 2.1.0-rc.6

package/dist/message-builder.js

@@ -154,6 +154,8 @@ class MessageBuilder {
     constructor(limits, messagesEntity) {
         this.limits = limits;
         this.message = new unsentMessage.UnsentMessage(messagesEntity);
+        this.emailBodies = new Map();
+        this.emailHistories = new Map();
     }
     /**
      * Sets the message body.
@@ -179,27 +181,78 @@ class MessageBuilder {
         this.message.attributes = attributes;
         return this;
     }
+    /**
+     * Set email body with given MIME-type.
+     * @param mimeType Format of the body to set (text/plain or text/html).
+     * @param body Body payload in selected format.
+     */
+    setEmailBody(mimeType, body) {
+        this.emailBodies.set(mimeType, body);
+        return this;
+    }
+    /**
+     * Set email history with given MIME-type.
+     * @param mimeType Format of the history to set (text/plain or text/html).
+     * @param history History payload in selected format.
+     */
+    setEmailHistory(mimeType, history) {
+        this.emailHistories.set(mimeType, history);
+        return this;
+    }
     /**
      * Adds media to the message.
      * @param payload Media to add.
      */
     addMedia(payload) {
-        this.message.mediaContent.push(['media', payload]);
+        if (typeof FormData === "undefined" && payload instanceof FormData) {
+            throw new Error("Could not add FormData content whilst not in a browser");
+        }
+        if (!(payload instanceof FormData)) {
+            const mediaOptions = payload;
+            if (!mediaOptions.contentType || !mediaOptions.media) {
+                throw new Error("Media content in SendMediaOptions must contain non-empty contentType and media");
+            }
+        }
+        this.message.mediaContent.push(["media", payload]);
         return this;
     }
     /**
      * Builds the message, making it ready to be sent.
      */
     build() {
+        this.emailBodies.forEach((_, key) => {
+            if (!this.limits.emailBodiesAllowedMimeTypes.includes(key)) {
+                throw new Error(`Unsupported email body MIME type ${key}`);
+            }
+        });
+        this.emailHistories.forEach((_, key) => {
+            if (!this.limits.emailHistoriesAllowedMimeTypes.includes(key)) {
+                throw new Error(`Unsupported email history MIME type ${key}`);
+            }
+        });
+        if (this.emailBodies.size > this.limits.emailBodiesAllowedMimeTypes.length) {
+            throw new Error(`Too many email bodies attached to the message (${this.emailBodies.size} > ${this.limits.emailBodiesAllowedMimeTypes.length})`);
+        }
+        if (this.emailHistories.size >
+            this.limits.emailHistoriesAllowedMimeTypes.length) {
+            throw new Error(`Too many email histories attached to the message (${this.emailHistories.size} > ${this.limits.emailHistoriesAllowedMimeTypes.length})`);
+        }
         if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {
             throw new Error(`Too many media attachments in the message (${this.message.mediaContent.length} > ${this.limits.mediaAttachmentsCountLimit})`);
         }
         // @todo we don't know the sizes of the attachments in FormData
+        // @todo insertion below makes build() method non-repeatable - probably move to UnsentMessage.send() or even sendV2()?
+        this.emailBodies.forEach((body) => {
+            this.message.mediaContent.push(["body", body]);
+        });
+        this.emailHistories.forEach((history) => {
+            this.message.mediaContent.push(["history", history]);
+        });
         return this.message;
     }
     getPayloadContentType(payload) {
-        if (typeof FormData !== 'undefined' && (payload instanceof FormData)) {
-            return payload.get('Content-Type');
+        if (typeof FormData !== "undefined" && payload instanceof FormData) {
+            return payload.get("Content-Type");
         }
         return payload.contentType;
     }

package/dist/message-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-builder.js","sources":["../src/message-builder.ts"],"sourcesContent":["import { Limits } from './interfaces/limits';\nimport { SendMediaOptions } from './conversation';\nimport { UnsentMessage } from './unsent-message';\n\n/**\n * Message builder. Allows the message to be built and sent via method chaining.\n *\n * Example:\n *\n * ```ts\n * await testConversation.prepareMessage()\n *   .setBody('Hello!')\n *   .setAttributes({foo: 'bar'})\n *   .addMedia(media1)\n *   .addMedia(media2)\n *   .build()\n *   .send();\n * ```\n */\nclass MessageBuilder {\n  private readonly message: UnsentMessage;\n\n  /**\n   * @internal\n   */\n  constructor(private readonly limits: Limits, messagesEntity: any) {\n    this.message = new UnsentMessage(messagesEntity);\n  }\n\n  /**\n   * Sets the message body.\n   * @param text Contents of the body.\n   */\n  setBody(text: string): MessageBuilder {\n    this.message.text = text;\n    return this;\n  }\n\n  /**\n   * Sets the message subject.\n   * @param subject Contents of the subject.\n   */\n  setSubject(subject: string): MessageBuilder {\n    this.message.emailOptions.subject = subject;\n    return this;\n  }\n\n  /**\n   * Sets the message attributes.\n   * @param attributes Message attributes.\n   */\n  setAttributes(attributes: any): MessageBuilder {\n    this.message.attributes = attributes;\n    return this;\n  }\n\n  /**\n   * Adds media to the message.\n   * @param payload Media to add.\n   */\n  addMedia(payload: FormData | SendMediaOptions): MessageBuilder {\n    this.message.mediaContent.push(['media', payload]);\n    return this;\n  }\n\n  /**\n   * Builds the message, making it ready to be sent.\n   */\n  build(): UnsentMessage {\n    if (this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit) {\n      throw new Error(`Too many media attachments in the message (${this.message.mediaContent.length} > ${this.limits.mediaAttachmentsCountLimit})`);\n    }\n\n    // @todo we don't know the sizes of the attachments in FormData\n\n    return this.message;\n  }\n\n  private getPayloadContentType(payload: FormData | SendMediaOptions): string {\n    if (typeof FormData !== 'undefined' && (payload instanceof FormData)) {\n      return payload.get('Content-Type') as string;\n    }\n    return (payload as SendMediaOptions).contentType;\n  }\n}\n\nexport { MessageBuilder };\n"],"names":["UnsentMessage"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA;;;;;;;;;;;;;;;AAeA,MAAM,cAAc;;;;IAMlB,YAA6B,MAAc,EAAE,cAAmB;QAAnC,WAAM,GAAN,MAAM,CAAQ;QACzC,IAAI,CAAC,OAAO,GAAG,IAAIA,2BAAa,CAAC,cAAc,CAAC,CAAC;KAClD;;;;;IAMD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;KACb;;;;;IAMD,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC;QAC5C,OAAO,IAAI,CAAC;KACb;;;;;IAMD,aAAa,CAAC,UAAe;QAC3B,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;QACrC,OAAO,IAAI,CAAC;KACb;;;;;IAMD,QAAQ,CAAC,OAAoC;QAC3C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;KACb;;;;IAKD,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE;YAC7E,MAAM,IAAI,KAAK,CAAC,8CAA8C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,MAAM,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,CAAC,CAAC;SAChJ;;QAID,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IAEO,qBAAqB,CAAC,OAAoC;QAChE,IAAI,OAAO,QAAQ,KAAK,WAAW,KAAK,OAAO,YAAY,QAAQ,CAAC,EAAE;YACpE,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAW,CAAC;SAC9C;QACD,OAAQ,OAA4B,CAAC,WAAW,CAAC;KAClD;;;;;"}
+{"version":3,"file":"message-builder.js","sources":["../src/message-builder.ts"],"sourcesContent":["import { ConversationLimits } from \"./interfaces/conversation-limits\";\nimport { SendMediaOptions } from \"./conversation\";\nimport { UnsentMessage } from \"./unsent-message\";\nimport { JSONValue } from \"./types\";\nimport { Messages } from \"./data/messages\";\n\n/**\n * Message builder. Allows the message to be built and sent via method chaining.\n *\n * Example:\n *\n * ```ts\n * await testConversation.prepareMessage()\n *   .setBody('Hello!')\n *   .setAttributes({foo: 'bar'})\n *   .addMedia(media1)\n *   .addMedia(media2)\n *   .build()\n *   .send();\n * ```\n */\nclass MessageBuilder {\n  private readonly message: UnsentMessage;\n  private emailBodies: Map<string, FormData | SendMediaOptions>;\n  private emailHistories: Map<string, FormData | SendMediaOptions>;\n\n  /**\n   * @internal\n   */\n  constructor(\n    private readonly limits: ConversationLimits,\n    messagesEntity: Messages\n  ) {\n    this.message = new UnsentMessage(messagesEntity);\n    this.emailBodies = new Map<string, FormData | SendMediaOptions>();\n    this.emailHistories = new Map<string, FormData | SendMediaOptions>();\n  }\n\n  /**\n   * Sets the message body.\n   * @param text Contents of the body.\n   */\n  setBody(text: string): MessageBuilder {\n    this.message.text = text;\n    return this;\n  }\n\n  /**\n   * Sets the message subject.\n   * @param subject Contents of the subject.\n   */\n  setSubject(subject: string): MessageBuilder {\n    this.message.emailOptions.subject = subject;\n    return this;\n  }\n\n  /**\n   * Sets the message attributes.\n   * @param attributes Message attributes.\n   */\n  setAttributes(attributes: JSONValue): MessageBuilder {\n    this.message.attributes = attributes;\n    return this;\n  }\n\n  /**\n   * Set email body with given MIME-type.\n   * @param mimeType Format of the body to set (text/plain or text/html).\n   * @param body Body payload in selected format.\n   */\n  setEmailBody(\n    mimeType: string,\n    body: FormData | SendMediaOptions\n  ): MessageBuilder {\n    this.emailBodies.set(mimeType, body);\n    return this;\n  }\n\n  /**\n   * Set email history with given MIME-type.\n   * @param mimeType Format of the history to set (text/plain or text/html).\n   * @param history History payload in selected format.\n   */\n  setEmailHistory(\n    mimeType: string,\n    history: FormData | SendMediaOptions\n  ): MessageBuilder {\n    this.emailHistories.set(mimeType, history);\n    return this;\n  }\n\n  /**\n   * Adds media to the message.\n   * @param payload Media to add.\n   */\n  addMedia(payload: FormData | SendMediaOptions): MessageBuilder {\n    if (typeof FormData === \"undefined\" && payload instanceof FormData) {\n      throw new Error(\"Could not add FormData content whilst not in a browser\");\n    }\n    if (!(payload instanceof FormData)) {\n      const mediaOptions = payload as SendMediaOptions;\n      if (!mediaOptions.contentType || !mediaOptions.media) {\n        throw new Error(\n          \"Media content in SendMediaOptions must contain non-empty contentType and media\"\n        );\n      }\n    }\n    this.message.mediaContent.push([\"media\", payload]);\n    return this;\n  }\n\n  /**\n   * Builds the message, making it ready to be sent.\n   */\n  build(): UnsentMessage {\n    this.emailBodies.forEach((_, key) => {\n      if (!this.limits.emailBodiesAllowedMimeTypes.includes(key)) {\n        throw new Error(`Unsupported email body MIME type ${key}`);\n      }\n    });\n    this.emailHistories.forEach((_, key) => {\n      if (!this.limits.emailHistoriesAllowedMimeTypes.includes(key)) {\n        throw new Error(`Unsupported email history MIME type ${key}`);\n      }\n    });\n    if (\n      this.emailBodies.size > this.limits.emailBodiesAllowedMimeTypes.length\n    ) {\n      throw new Error(\n        `Too many email bodies attached to the message (${this.emailBodies.size} > ${this.limits.emailBodiesAllowedMimeTypes.length})`\n      );\n    }\n    if (\n      this.emailHistories.size >\n      this.limits.emailHistoriesAllowedMimeTypes.length\n    ) {\n      throw new Error(\n        `Too many email histories attached to the message (${this.emailHistories.size} > ${this.limits.emailHistoriesAllowedMimeTypes.length})`\n      );\n    }\n\n    if (\n      this.message.mediaContent.length > this.limits.mediaAttachmentsCountLimit\n    ) {\n      throw new Error(\n        `Too many media attachments in the message (${this.message.mediaContent.length} > ${this.limits.mediaAttachmentsCountLimit})`\n      );\n    }\n\n    // @todo we don't know the sizes of the attachments in FormData\n    // @todo insertion below makes build() method non-repeatable - probably move to UnsentMessage.send() or even sendV2()?\n\n    this.emailBodies.forEach((body) => {\n      this.message.mediaContent.push([\"body\", body]);\n    });\n\n    this.emailHistories.forEach((history) => {\n      this.message.mediaContent.push([\"history\", history]);\n    });\n\n    return this.message;\n  }\n\n  private getPayloadContentType(\n    payload: FormData | SendMediaOptions\n  ): string | null {\n    if (typeof FormData !== \"undefined\" && payload instanceof FormData) {\n      return payload.get(\"Content-Type\") as string;\n    }\n    return (payload as SendMediaOptions).contentType;\n  }\n}\n\nexport { MessageBuilder };\n"],"names":["UnsentMessage"],"mappings":"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"}

package/dist/message.js

@@ -136,6 +136,7 @@ var logger = require('./logger.js');
 var media = require('./media.js');
 var aggregatedDeliveryReceipt = require('./aggregated-delivery-receipt.js');
 var declarativeTypeValidator = require('@twilio/declarative-type-validator');
+var attributes = require('./interfaces/attributes.js');
 var restPaginator = require('./rest-paginator.js');
 var detailedDeliveryReceipt = require('./detailed-delivery-receipt.js');
 var replayEventEmitter = require('@twilio/replay-event-emitter');
@@ -145,7 +146,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
-const log = logger.Logger.scope('Message');
+const log = logger.Logger.scope("Message");
 /**
  * A message in a conversation.
  */
@@ -154,7 +155,7 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      * @internal
      */
     constructor(index$1, data, conversation, links, configuration, services) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         super();
         this.conversation = conversation;
         this.links = links;
@@ -163,42 +164,56 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
         this.state = {
             sid: data.sid,
             index: index$1,
-            author: (_a = data.author) !== null && _a !== void 0 ? _a : null,
-            subject: (_b = data.subject) !== null && _b !== void 0 ? _b : null,
-            body: data.text,
+            author: data.author,
+            subject: data.subject,
+            body: (_a = data.text) !== null && _a !== void 0 ? _a : null,
             timestamp: data.timestamp ? new Date(data.timestamp) : null,
             dateUpdated: data.dateUpdated ? new Date(data.dateUpdated) : null,
-            lastUpdatedBy: (_c = data.lastUpdatedBy) !== null && _c !== void 0 ? _c : null,
+            lastUpdatedBy: (_b = data.lastUpdatedBy) !== null && _b !== void 0 ? _b : null,
             attributes: index.parseAttributes(data.attributes, `Got malformed attributes for the message ${data.sid}`, log),
-            type: (_d = data.type) !== null && _d !== void 0 ? _d : 'text',
-            media: (data.type && data.type === 'media' && data.media)
-                ? new media.Media(data.media, this.services) : null,
-            medias: (data.type && data.type === 'media' && data.medias)
-                ? data.medias.map((m) => new media.Media(m, this.services)) : null,
-            participantSid: (_e = data.memberSid) !== null && _e !== void 0 ? _e : null,
-            aggregatedDeliveryReceipt: data.delivery ? new aggregatedDeliveryReceipt.AggregatedDeliveryReceipt(data.delivery) : null
+            type: (_c = data.type) !== null && _c !== void 0 ? _c : "text",
+            media: data.type && data.type === "media" && data.media
+                ? new media.Media(data.media, this.services)
+                : null,
+            medias: data.type && data.type === "media" && data.medias
+                ? data.medias.map((m) => new media.Media(m, this.services))
+                : null,
+            participantSid: (_d = data.memberSid) !== null && _d !== void 0 ? _d : null,
+            aggregatedDeliveryReceipt: data.delivery
+                ? new aggregatedDeliveryReceipt.AggregatedDeliveryReceipt(data.delivery)
+                : null,
         };
     }
     /**
      * The server-assigned unique identifier for the message.
      */
-    get sid() { return this.state.sid; }
+    get sid() {
+        return this.state.sid;
+    }
     /**
      * Name of the user that sent the message.
      */
-    get author() { return this.state.author; }
+    get author() {
+        return this.state.author;
+    }
     /**
      * Message subject. Used only in email conversations.
      */
-    get subject() { return this.state.subject; }
+    get subject() {
+        return this.state.subject;
+    }
     /**
      * Body of the message.
      */
-    get body() { return this.state.body; }
+    get body() {
+        return this.state.body;
+    }
     /**
      * Date this message was last updated on.
      */
-    get dateUpdated() { return this.state.dateUpdated; }
+    get dateUpdated() {
+        return this.state.dateUpdated;
+    }
     /**
      * Index of the message in the conversation's messages list.
      * By design of the Conversations system, the message indices may have arbitrary gaps between them,
@@ -210,36 +225,52 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      * To calculate the number of unread messages it is better to use the read horizon API.
      * See {@link Conversation.getUnreadMessagesCount} for details.
      */
-    get index() { return this.state.index; }
+    get index() {
+        return this.state.index;
+    }
     /**
      * Identity of the last user that updated the message.
      */
-    get lastUpdatedBy() { return this.state.lastUpdatedBy; }
+    get lastUpdatedBy() {
+        return this.state.lastUpdatedBy;
+    }
     /**
      * Date this message was created on.
      */
-    get dateCreated() { return this.state.timestamp; }
+    get dateCreated() {
+        return this.state.timestamp;
+    }
     /**
      * Custom attributes of the message.
      */
-    get attributes() { return this.state.attributes; }
+    get attributes() {
+        return this.state.attributes;
+    }
     /**
-     * Push notification type of the message.
+     * Type of the message.
      */
-    get type() { return this.state.type; }
+    get type() {
+        return this.state.type;
+    }
     /**
-     * One of the attached media.
+     * One of the attached media (if present).
      * @deprecated Use attachedMedia instead. Note that the latter is now an array.
      */
-    get media() { return this.state.media; }
+    get media() {
+        return this.state.media;
+    }
     /**
      * Return all media attachments, except email body/history attachments, without temporary urls.
      */
-    get attachedMedia() { return this.getMediaByCategory(['media']); }
+    get attachedMedia() {
+        return this.getMediaByCategory(["media"]);
+    }
     /**
      * The server-assigned unique identifier of the authoring participant.
      */
-    get participantSid() { return this.state.participantSid; }
+    get participantSid() {
+        return this.state.participantSid;
+    }
     /**
      * Aggregated information about the message delivery statuses across all participants of a conversation..
      */
@@ -254,58 +285,83 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      */
     getMediaByCategory(categories) {
         var _a;
-        return (_a = this.state.medias) === null || _a === void 0 ? void 0 : _a.filter((m) => categories.includes(m.category));
+        return ((_a = this.state.medias) !== null && _a !== void 0 ? _a : []).filter((m) => categories.includes(m.category));
+    }
+    /**
+     * Get a media descriptor for an email body attachment of a provided type.
+     * Allowed body types are returned in the Conversation.limits().emailBodiesAllowedMimeTypes array.
+     * @param type Type of email body to request, defaults to `text/plain`.
+     */
+    getEmailBody(type = "text/plain") {
+        var _a, _b;
+        return ((_b = (_a = this.getMediaByCategory(["body"])) === null || _a === void 0 ? void 0 : _a.filter((m) => m.contentType == type).shift()) !== null && _b !== void 0 ? _b : null);
+    }
+    /**
+     * Get a media descriptor for an email history attachment of a provided type.
+     * Allowed body types are returned in the Conversation.limits().emailHistoriesAllowedMimeTypes array.
+     * @param type Type of email history to request, defaults to `text/plain`.
+     */
+    getEmailHistory(type = "text/plain") {
+        var _a, _b;
+        return ((_b = (_a = this.getMediaByCategory(["history"])) === null || _a === void 0 ? void 0 : _a.filter((m) => m.contentType == type).shift()) !== null && _b !== void 0 ? _b : null);
     }
     _update(data) {
-        let updateReasons = [];
-        if ((data.text || ((typeof data.text) === 'string')) && data.text !== this.state.body) {
+        const updateReasons = [];
+        if ((data.text || typeof data.text === "string") &&
+            data.text !== this.state.body) {
             this.state.body = data.text;
-            updateReasons.push('body');
+            updateReasons.push("body");
         }
         if (data.subject && data.subject !== this.state.subject) {
             this.state.subject = data.subject;
-            updateReasons.push('subject');
+            updateReasons.push("subject");
         }
         if (data.lastUpdatedBy && data.lastUpdatedBy !== this.state.lastUpdatedBy) {
             this.state.lastUpdatedBy = data.lastUpdatedBy;
-            updateReasons.push('lastUpdatedBy');
+            updateReasons.push("lastUpdatedBy");
         }
         if (data.author && data.author !== this.state.author) {
             this.state.author = data.author;
-            updateReasons.push('author');
+            updateReasons.push("author");
         }
         if (data.dateUpdated &&
-            new Date(data.dateUpdated).getTime() !== (this.state.dateUpdated && this.state.dateUpdated.getTime())) {
+            new Date(data.dateUpdated).getTime() !==
+                (this.state.dateUpdated && this.state.dateUpdated.getTime())) {
             this.state.dateUpdated = new Date(data.dateUpdated);
-            updateReasons.push('dateUpdated');
+            updateReasons.push("dateUpdated");
         }
         if (data.timestamp &&
-            new Date(data.timestamp).getTime() !== (this.state.timestamp && this.state.timestamp.getTime())) {
+            new Date(data.timestamp).getTime() !==
+                (this.state.timestamp && this.state.timestamp.getTime())) {
             this.state.timestamp = new Date(data.timestamp);
-            updateReasons.push('dateCreated');
+            updateReasons.push("dateCreated");
         }
-        let updatedAttributes = index.parseAttributes(data.attributes, `Got malformed attributes for the message ${this.sid}`, log);
+        const updatedAttributes = index.parseAttributes(data.attributes, `Got malformed attributes for the message ${this.sid}`, log);
         if (!isEqual__default['default'](this.state.attributes, updatedAttributes)) {
             this.state.attributes = updatedAttributes;
-            updateReasons.push('attributes');
+            updateReasons.push("attributes");
         }
-        let updatedAggregatedDelivery = data.delivery;
-        let currentAggregatedDelivery = this.state.aggregatedDeliveryReceipt;
-        let isUpdatedAggregateDeliveryValid = !!updatedAggregatedDelivery && !!updatedAggregatedDelivery.total &&
-            !!updatedAggregatedDelivery.delivered && !!updatedAggregatedDelivery.failed && !!updatedAggregatedDelivery.read &&
-            !!updatedAggregatedDelivery.sent && !!updatedAggregatedDelivery.undelivered;
+        const updatedAggregatedDelivery = data.delivery;
+        const currentAggregatedDelivery = this.state.aggregatedDeliveryReceipt;
+        const isUpdatedAggregateDeliveryValid = !!updatedAggregatedDelivery &&
+            !!updatedAggregatedDelivery.total &&
+            !!updatedAggregatedDelivery.delivered &&
+            !!updatedAggregatedDelivery.failed &&
+            !!updatedAggregatedDelivery.read &&
+            !!updatedAggregatedDelivery.sent &&
+            !!updatedAggregatedDelivery.undelivered;
         if (isUpdatedAggregateDeliveryValid) {
             if (!currentAggregatedDelivery) {
                 this.state.aggregatedDeliveryReceipt = new aggregatedDeliveryReceipt.AggregatedDeliveryReceipt(updatedAggregatedDelivery);
-                updateReasons.push('deliveryReceipt');
+                updateReasons.push("deliveryReceipt");
             }
             else if (!currentAggregatedDelivery._isEquals(updatedAggregatedDelivery)) {
                 currentAggregatedDelivery._update(updatedAggregatedDelivery);
-                updateReasons.push('deliveryReceipt');
+                updateReasons.push("deliveryReceipt");
             }
         }
         if (updateReasons.length > 0) {
-            this.emit('updated', { message: this, updateReasons: updateReasons });
+            this.emit("updated", { message: this, updateReasons: updateReasons });
         }
     }
     /**
@@ -314,14 +370,16 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
     async getParticipant() {
         let participant = null;
         if (this.state.participantSid) {
-            participant = await this.conversation.getParticipantBySid(this.participantSid)
+            participant = await this.conversation
+                .getParticipantBySid(this.state.participantSid)
                 .catch(() => {
                 log.debug(`Participant with sid "${this.participantSid}" not found for message ${this.sid}`);
                 return null;
             });
         }
         if (!participant && this.state.author) {
-            participant = await this.conversation.getParticipantByIdentity(this.state.author)
+            participant = await this.conversation
+                .getParticipantByIdentity(this.state.author)
                 .catch(() => {
                 log.debug(`Participant with identity "${this.author}" not found for message ${this.sid}`);
                 return null;
@@ -330,20 +388,20 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
         if (participant) {
             return participant;
         }
-        let errorMesage = 'Participant with ';
+        let errorMesage = "Participant with ";
         if (this.state.participantSid) {
-            errorMesage += 'SID \'' + this.state.participantSid + '\' ';
+            errorMesage += "SID '" + this.state.participantSid + "' ";
         }
         if (this.state.author) {
             if (this.state.participantSid) {
-                errorMesage += 'or ';
+                errorMesage += "or ";
             }
-            errorMesage += 'identity \'' + this.state.author + '\' ';
+            errorMesage += "identity '" + this.state.author + "' ";
         }
-        if (errorMesage === 'Participant with ') {
-            errorMesage = 'Participant ';
+        if (errorMesage === "Participant with ") {
+            errorMesage = "Participant ";
         }
-        errorMesage += 'was not found';
+        errorMesage += "was not found";
         throw new Error(errorMesage);
     }
     /**
@@ -353,7 +411,10 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
         let paginator = await this._getDetailedDeliveryReceiptsPaginator();
         let detailedDeliveryReceipts = [];
         while (true) {
-            detailedDeliveryReceipts = [...detailedDeliveryReceipts, ...paginator.items];
+            detailedDeliveryReceipts = [
+                ...detailedDeliveryReceipts,
+                ...paginator.items,
+            ];
             if (!paginator.hasNextPage) {
                 break;
             }
@@ -365,7 +426,7 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      * Remove the message.
      */
     async remove() {
-        await this.services.commandExecutor.mutateResource('delete', this.links.self);
+        await this.services.commandExecutor.mutateResource("delete", this.links.self);
         return this;
     }
     /**
@@ -373,8 +434,8 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      * @param body New body of the message.
      */
     async updateBody(body) {
-        await this.services.commandExecutor.mutateResource('post', this.links.self, {
-            body
+        await this.services.commandExecutor.mutateResource("post", this.links.self, {
+            body,
         });
         return this;
     }
@@ -383,8 +444,10 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
      * @param attributes New attributes.
      */
     async updateAttributes(attributes) {
-        await this.services.commandExecutor.mutateResource('post', this.links.self, {
-            attributes: typeof attributes !== 'undefined' ? JSON.stringify(attributes) : undefined
+        await this.services.commandExecutor.mutateResource("post", this.links.self, {
+            attributes: typeof attributes !== "undefined"
+                ? JSON.stringify(attributes)
+                : undefined,
         });
         return this;
     }
@@ -395,21 +458,23 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
     async attachTemporaryUrlsFor(contentSet) {
         // We ignore existing mcsMedia members of each of the media entries.
         // Instead we just collect their sids and pull new descriptors from a mediaSet GET endpoint.
-        const sids = contentSet.map((m) => m.sid);
-        if (this.services.mcsClient) {
-            return (await this.services.mcsClient.mediaSetGet(sids)).map((item) => { return new media.Media(item, this.services); });
+        const sids = contentSet === null || contentSet === void 0 ? void 0 : contentSet.map((m) => m.sid);
+        if (this.services.mcsClient && sids) {
+            return (await this.services.mcsClient.mediaSetGet(sids)).map((item) => {
+                return new media.Media(item, this.services);
+            });
         }
         else {
-            throw new Error('Media Content Service is unavailable');
+            throw new Error("Media Content Service is unavailable");
         }
     }
     async _getDetailedDeliveryReceiptsPaginator(options) {
         const messagesReceiptsUrl = this.configuration.links.messagesReceipts
-            .replace('%s', this.conversation.sid)
-            .replace('%s', this.sid);
+            .replace("%s", this.conversation.sid)
+            .replace("%s", this.sid);
         const url = new index.UriBuilder(messagesReceiptsUrl)
-            .arg('PageToken', options === null || options === void 0 ? void 0 : options.pageToken)
-            .arg('PageSize', options === null || options === void 0 ? void 0 : options.pageSize)
+            .arg("PageToken", options === null || options === void 0 ? void 0 : options.pageToken)
+            .arg("PageSize", options === null || options === void 0 ? void 0 : options.pageSize)
             .build();
         const response = await this.services.network.get(url);
         return new restPaginator.RestPaginator(response.body.delivery_receipts.map((x) => new detailedDeliveryReceipt.DetailedDeliveryReceipt(x)), (pageToken, pageSize) => this._getDetailedDeliveryReceiptsPaginator({ pageToken, pageSize }), response.body.meta.previous_token, response.body.meta.next_token);
@@ -423,23 +488,37 @@ class Message extends replayEventEmitter.ReplayEventEmitter {
  *     * {@link Message} message - the message in question
  *     * {@link MessageUpdateReason}[] updateReasons - array of reasons for the update
  */
-Message.updated = 'updated';
+Message.updated = "updated";
+tslib_es6.__decorate([
+    declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString),
+    tslib_es6.__metadata("design:type", Function),
+    tslib_es6.__metadata("design:paramtypes", [Object]),
+    tslib_es6.__metadata("design:returntype", media.Media)
+], Message.prototype, "getEmailBody", null);
+tslib_es6.__decorate([
+    declarativeTypeValidator.validateTypes(declarativeTypeValidator.nonEmptyString),
+    tslib_es6.__metadata("design:type", Function),
+    tslib_es6.__metadata("design:paramtypes", [Object]),
+    tslib_es6.__metadata("design:returntype", media.Media)
+], Message.prototype, "getEmailHistory", null);
 tslib_es6.__decorate([
-    declarativeTypeValidator.validateTypesAsync('string'),
+    declarativeTypeValidator.validateTypesAsync("string"),
     tslib_es6.__metadata("design:type", Function),
     tslib_es6.__metadata("design:paramtypes", [String]),
     tslib_es6.__metadata("design:returntype", Promise)
 ], Message.prototype, "updateBody", null);
 tslib_es6.__decorate([
-    declarativeTypeValidator.validateTypesAsync(['string', 'number', 'boolean', 'object', declarativeTypeValidator.literal(null)]),
+    declarativeTypeValidator.validateTypesAsync(attributes.attributesValidator),
     tslib_es6.__metadata("design:type", Function),
     tslib_es6.__metadata("design:paramtypes", [Object]),
     tslib_es6.__metadata("design:returntype", Promise)
 ], Message.prototype, "updateAttributes", null);
 tslib_es6.__decorate([
-    declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.custom(value => [
-        value instanceof Array && value.length > 0 && value.reduce((a, c) => a && c instanceof media.Media),
-        'a non-empty array of Media'
+    declarativeTypeValidator.validateTypesAsync(declarativeTypeValidator.custom((value) => [
+        value instanceof Array &&
+            value.length > 0 &&
+            value.reduce((a, c) => a && c instanceof media.Media, true),
+        "a non-empty array of Media",
     ])),
     tslib_es6.__metadata("design:type", Function),
     tslib_es6.__metadata("design:paramtypes", [Array]),