fix(websafe): Process web safe HTML before injecting base64 attachments to speed the process up

Author: andris9

Diff for: lib/account.js

@@ -1382,6 +1382,18 @@ class Account {
                 }
             }
 
+            if (options.preProcessHtml && messageData.text && (messageData.text.html || messageData.text.plain)) {
+                // If available, use the cached version
+                messageData.text.html =
+                    messageData.text._generatedHtml ||
+                    mimeHtml({
+                        html: messageData.text.html,
+                        text: messageData.text.plain
+                    });
+                messageData.text.webSafe = true;
+                messageData.text._cachedWebSafe = !!messageData.text._generatedHtml;
+            }
+
             if (options.embedAttachedImages && messageData.text && messageData.text.html && messageData.attachments && messageData.attachments.length) {
                 let attachmentsToDownload = [];
 
@@ -1417,18 +1429,6 @@ class Account {
                 });
             }
 
-            if (options.preProcessHtml && messageData.text && (messageData.text.html || messageData.text.plain)) {
-                // If available, use the cached version
-                messageData.text.html =
-                    messageData.text._generatedHtml ||
-                    mimeHtml({
-                        html: messageData.text.html,
-                        text: messageData.text.plain
-                    });
-                messageData.text.webSafe = true;
-                messageData.text._cachedWebSafe = !!messageData.text._generatedHtml;
-            }
-
             if (messageData.text && messageData.text._generatedHtml) {
                 // remove cached pre-processed HTML from output
                 delete messageData.text._generatedHtml;

Diff for: lib/email-client/base-client.js

@@ -2184,7 +2184,12 @@ class BaseClient {
         let notifyWebSafeHtml = await settings.get('notifyWebSafeHtml');
         if (notifyWebSafeHtml && messageData.text && (messageData.text.html || messageData.text.plain)) {
             // convert to web safe
+            messageData.text._generatedHtml = mimeHtml({
+                html: messageData.text.html,
+                text: messageData.text.plain
+            });
 
+            // embed images
             if (messageData.text.html && messageData.attachments) {
                 let attachmentList = new Map();
 
@@ -2218,11 +2223,6 @@ class BaseClient {
                 }
             }
 
-            messageData.text._generatedHtml = mimeHtml({
-                html: messageData.text.html,
-                text: messageData.text.plain
-            });
-
             messageData.text.webSafe = true;
         }
 

Diff for: lib/email-client/gmail-client.js

@@ -1043,6 +1043,14 @@ class GmailClient extends BaseClient {
 
         let formattedMessage = this.formatMessage(messageData, { extended: true, textType: options.textType });
 
+        if (options.preProcessHtml && formattedMessage.text && (formattedMessage.text.html || formattedMessage.text.plain)) {
+            formattedMessage.text.html = mimeHtml({
+                html: formattedMessage.text.html,
+                text: formattedMessage.text.plain
+            });
+            formattedMessage.text.webSafe = true;
+        }
+
         if (options.embedAttachedImages && formattedMessage.text?.html && formattedMessage.attachments) {
             let attachmentMap = new Map();
 
@@ -1070,14 +1078,6 @@ class GmailClient extends BaseClient {
             });
         }
 
-        if (options.preProcessHtml && formattedMessage.text && (formattedMessage.text.html || formattedMessage.text.plain)) {
-            formattedMessage.text.html = mimeHtml({
-                html: formattedMessage.text.html,
-                text: formattedMessage.text.plain
-            });
-            formattedMessage.text.webSafe = true;
-        }
-
         return formattedMessage;
     }
 

Diff for: lib/email-client/imap/mailbox.js

@@ -1164,7 +1164,13 @@ class Mailbox {
         let notifyWebSafeHtml = await settings.get('notifyWebSafeHtml');
         if (notifyWebSafeHtml && messageInfo.text && (messageInfo.text.html || messageInfo.text.plain)) {
             // convert to web safe
+            messageInfo.text._generatedHtml = mimeHtml({
+                html: messageInfo.text.html,
+                text: messageInfo.text.plain
+            });
+            messageInfo.text.webSafe = true;
 
+            // embed images
             if (messageInfo.text.html && messageInfo.attachments) {
                 let attachmentList = new Map();
                 let partList = [];
@@ -1227,12 +1233,6 @@ class Mailbox {
                     });
                 }
             }
-
-            messageInfo.text._generatedHtml = mimeHtml({
-                html: messageInfo.text.html,
-                text: messageInfo.text.plain
-            });
-            messageInfo.text.webSafe = true;
         }
 
         await this.connection.notify(this, MESSAGE_NEW_NOTIFY, messageInfo, {
@@ -2453,6 +2453,14 @@ class Mailbox {
                 }
             }
 
+            if (options.preProcessHtml && messageInfo.text && (messageInfo.text.html || messageInfo.text.plain)) {
+                messageInfo.text.html = mimeHtml({
+                    html: messageInfo.text.html,
+                    text: messageInfo.text.plain
+                });
+                messageInfo.text.webSafe = true;
+            }
+
             if (options.embedAttachedImages && messageInfo.text && messageInfo.text.html && messageInfo.attachments) {
                 let attachmentList = new Map();
                 let partList = [];
@@ -2508,14 +2516,6 @@ class Mailbox {
                 }
             }
 
-            if (options.preProcessHtml && messageInfo.text && (messageInfo.text.html || messageInfo.text.plain)) {
-                messageInfo.text.html = mimeHtml({
-                    html: messageInfo.text.html,
-                    text: messageInfo.text.plain
-                });
-                messageInfo.text.webSafe = true;
-            }
-
             if (this.listingEntry.specialUse) {
                 messageInfo.specialUse = this.listingEntry.specialUse;
             }

Diff for: lib/email-client/outlook-client.js

@@ -1184,6 +1184,15 @@ class OutlookClient extends BaseClient {
             showPath: options.showPath
         });
 
+        if (options.preProcessHtml && formattedMessage.text && (formattedMessage.text.html || formattedMessage.text.plain)) {
+            formattedMessage.text.html = mimeHtml({
+                html: formattedMessage.text.html,
+                text: formattedMessage.text.plain
+            });
+
+            formattedMessage.text.webSafe = true;
+        }
+
         if (options.embedAttachedImages && formattedMessage.text?.html && formattedMessage.attachments) {
             let attachmentMap = new Map();
 
@@ -1210,15 +1219,6 @@ class OutlookClient extends BaseClient {
             });
         }
 
-        if (options.preProcessHtml && formattedMessage.text && (formattedMessage.text.html || formattedMessage.text.plain)) {
-            formattedMessage.text.html = mimeHtml({
-                html: formattedMessage.text.html,
-                text: formattedMessage.text.plain
-            });
-
-            formattedMessage.text.webSafe = true;
-        }
-
         if (specialUse) {
             formattedMessage.messageSpecialUse = specialUse;
         }