fix(frontend,backend): optimization - batch process results from async message load when more than one ajax request finishes but the previous UI thread is still working - dramatically decreases processing time for 5+ mailboxes in combined views; also skip getting imap folder status when it is already present for combined views

Author: kroky

modules/core/hm-mailbox.php

@@ -277,7 +277,7 @@ public function get_special_use_mailboxes($folder = false) {
             return $this->connection->get_special_use_folders($folder);
         }
     }
-    
+
     /**
      * Get messages in a folder applying filters, sorting and pagination
      * @return array - [total results found, results for a single page]
@@ -307,7 +307,7 @@ public function get_message_headers($folder, $msg_id) {
         } else {
             return $this->connection->get_message_headers($msg_id);
         }
-        
+
     }
 
     public function get_message_content($folder, $msg_id, $part = 0) {

modules/core/js_modules/Hm_MessagesStore.js

@@ -70,30 +70,42 @@ class Hm_MessagesStore {
         const sourcesToRemove = Object.keys(this.sources).filter(key => !this.currentlyAvailableSources().includes(key));
         sourcesToRemove.forEach(key => delete this.sources[key]);
 
-        this.fetch(hideLoadingState).forEach(async (req) => {
-            const { formatted_message_list: updatedMessages, pages, folder_status, do_not_flag_as_read_on_open, sourceId } = await req;
-            // count and pages only available in non-combined pages where there is only one ajax call, so it is safe to overwrite
-            this.count = folder_status && Object.values(folder_status)[0]?.messages;
-            this.pages = parseInt(pages);
-            this.newMessages = this.getNewMessages(updatedMessages);
-
-            if (typeof do_not_flag_as_read_on_open == 'booelan') {
-                this.flagAsReadOnOpen = !do_not_flag_as_read_on_open;
-            }
+        // Batch processing for multiple requests
+        const pendingResponses = new Map();
+        let processingTimeout = null;
 
-            if (this.sources[sourceId]) {
-                this.rows = this.rows.filter(row => !this.sources[sourceId].includes(row['1']));
-            }
-            this.sources[sourceId] = Object.keys(updatedMessages);
-            for (const id in updatedMessages) {
-                if (this.rows.map(row => row['1']).indexOf(id) === -1) {
-                    this.rows.push(updatedMessages[id]);
-                } else {
-                    const index = this.rows.map(row => row['1']).indexOf(id);
-                    this.rows[index] = updatedMessages[id];
+        const processPendingResponses = () => {
+            if (pendingResponses.size === 0) return;
+
+            // Process all pending responses at once
+            const responses = Array.from(pendingResponses.values());
+            pendingResponses.clear();
+
+            responses.forEach(({ formatted_message_list: updatedMessages, pages, folder_status, do_not_flag_as_read_on_open, sourceId }) => {
+                // count and pages only available in non-combined pages where there is only one ajax call, so it is safe to overwrite
+                this.count = folder_status && Object.values(folder_status)[0]?.messages;
+                this.pages = parseInt(pages);
+                this.newMessages = this.getNewMessages(updatedMessages);
+
+                if (typeof do_not_flag_as_read_on_open == 'booelan') {
+                    this.flagAsReadOnOpen = !do_not_flag_as_read_on_open;
                 }
-            }
 
+                if (this.sources[sourceId]) {
+                    this.rows = this.rows.filter(row => !this.sources[sourceId].includes(row['1']));
+                }
+                this.sources[sourceId] = Object.keys(updatedMessages);
+                for (const id in updatedMessages) {
+                    if (this.rows.map(row => row['1']).indexOf(id) === -1) {
+                        this.rows.push(updatedMessages[id]);
+                    } else {
+                        const index = this.rows.map(row => row['1']).indexOf(id);
+                        this.rows[index] = updatedMessages[id];
+                    }
+                }
+            });
+
+            // Do expensive operations only once for all responses
             if (this.path == 'unread') {
                 $('.total_unread_count').html(' '+this.rows.length+' ');
             }
@@ -104,6 +116,21 @@ class Hm_MessagesStore {
             if (messagesReadyCB) {
                 messagesReadyCB(this);
             }
+        };
+
+        this.fetch(hideLoadingState).forEach((req) => {
+            req.then((response) => {
+                pendingResponses.set(response.sourceId, response);
+
+                if (processingTimeout) {
+                    clearTimeout(processingTimeout);
+                }
+
+                // Process after a short delay to allow batching
+                processingTimeout = setTimeout(processPendingResponses, 10);
+            }).catch((error) => {
+                console.error('Error loading messages from source:', error);
+            });
         });
 
         return this;

modules/imap/handler_modules.php

@@ -1360,7 +1360,7 @@ public function process() {
                 $messages[] = $msg;
             }
 
-            $status['imap_'.$id.'_'.$folders[$key]] = $mailbox->get_folder_status(hex2bin($folders[$key]));
+            $status['imap_'.$id.'_'.$folders[$key]] = $mailbox->get_folder_state(); // this is faster than get_folder_status as search call above already gets this folder's state
         }
 
         $this->out('folder_status', $status);