in message handler add bulk_batch_size from settings

Author: NickOvt

lib/message-handler.js

@@ -1125,6 +1125,8 @@ class MessageHandler {
                 }
             }
 
+            const bulk_batch_size = await this.settingsHandler.get('const:max:bulk_batch_size', {});
+
             if (targetData.encryptMessages) {
                 // move target mailbox is encrypted
                 const parsedHeader = (message.mimeTree && message.mimeTree.parsedHeader) || {};
@@ -1146,7 +1148,8 @@ class MessageHandler {
                             unseen,
                             newModseq,
                             uidNext,
-                            junk
+                            junk,
+                            bulk_batch_size
                         },
                         cursor,
                         options
@@ -1179,7 +1182,8 @@ class MessageHandler {
                                 unseen,
                                 newModseq,
                                 uidNext,
-                                junk
+                                junk,
+                                bulk_batch_size
                             },
                             cursor,
                             options
@@ -1299,7 +1303,8 @@ class MessageHandler {
                                                                 unseen,
                                                                 newModseq,
                                                                 uidNext,
-                                                                junk
+                                                                junk,
+                                                                bulk_batch_size
                                                             },
                                                             cursor,
                                                             options
@@ -1327,7 +1332,8 @@ class MessageHandler {
                                                 unseen,
                                                 newModseq,
                                                 uidNext,
-                                                junk
+                                                junk,
+                                                bulk_batch_size
                                             },
                                             cursor,
                                             options
@@ -1354,7 +1360,8 @@ class MessageHandler {
                         unseen,
                         newModseq,
                         uidNext,
-                        junk
+                        junk,
+                        bulk_batch_size
                     },
                     cursor,
                     options
@@ -1827,6 +1834,8 @@ class MessageHandler {
                     next();
                 };
 
+                let bulk_batch_size = consts.BULK_BATCH_SIZE;
+
                 let processNext = () => {
                     cursor.next((err, messageData) => {
                         if (err) {
@@ -1875,7 +1884,7 @@ class MessageHandler {
                                     unseenChange: 'seen' in changes
                                 });
 
-                                if (notifyEntries.length >= consts.BULK_BATCH_SIZE) {
+                                if (notifyEntries.length >= bulk_batch_size) {
                                     return this.notifier.addEntries(mailboxData, notifyEntries, () => {
                                         notifyEntries = [];
                                         this.notifier.fire(mailboxData.user);
@@ -1888,7 +1897,15 @@ class MessageHandler {
                     });
                 };
 
-                processNext();
+                this.settingsHandler
+                    .get('const:max:bulk_batch_size', {})
+                    .then(set_bulk_batch_size => {
+                        bulk_batch_size = set_bulk_batch_size;
+                    })
+                    .finally(() => {
+                        // Regardless of response process next
+                        processNext();
+                    });
             }
         );
     }
@@ -2124,7 +2141,8 @@ class MessageHandler {
             unseen,
             newModseq,
             uidNext,
-            junk
+            junk,
+            bulk_batch_size
         } = data;
 
         try {
@@ -2196,7 +2214,7 @@ class MessageHandler {
         }
         existsEntries.push(entry);
 
-        if (existsEntries.length >= consts.BULK_BATCH_SIZE) {
+        if (existsEntries.length >= bulk_batch_size) {
             // mark messages as deleted from old mailbox
             return new Promise(resolve => {
                 this.notifier.addEntries(mailboxData, removeEntries, () => {