Reload indexer when a IMAP connection is created

Author: andris9

lib/email-client/imap-client.js

@@ -115,7 +115,7 @@ class IMAPClient extends BaseClient {
         this.connectionCount = 0;
         this.connections = new Set();
 
-        this.imapIndexer = options?.imapIndexer;
+        this.imapIndexer = null;
 
         this.state = 'connecting';
     }
@@ -658,6 +658,9 @@ class IMAPClient extends BaseClient {
         this._connecting = true;
         this.isClosed = false;
 
+        let accountData = await this.accountObject.loadAccountData();
+        this.imapIndexer = typeof accountData.imapIndexer === 'string' && accountData.imapIndexer ? accountData.imapIndexer : 'full';
+
         try {
             this.logger.debug({ msg: 'Initiating connection to IMAP' });
             await backOff(() => this.start(), {

lib/tools.js

@@ -1839,23 +1839,28 @@ t0xCngRgaIZRuD3T
 dBb0Tc1IggSKY8dD
 exRqrporGRl2rjBf
 r+p1xHpDF4Ct0jfn
+QeunHH85jTFcsR7e
 kBFI6x6tfC8K1C8E
 uMDwyq9Y+GFLdSZF
 Qmt72SAp9U458OaT
 PlpLZjr4BL0pohCK
-aj9NNZwr9Q4xzJvU
-fS/JLszz84j1ag5o
-8Me3v4Gs+ToXrx7m
-X8CeIMqigilchDt6
-8eBpFKOmpq2kLEQF
-NxQ1lmMn6iPIStjg
-o2I9/Op/fQs4bsif
-yl8bUlV5Ru9PlpNW
-sak1JCNvKyYLfYyj
 WO98DhF4vrdYWoNN
 0GY3Y69nPMhxmQ0z
+foWqwQhkSjNxz6BY
+HS10uombwvGO3bcH
+FggtAxsbKJR6/7hz
+IGqFkLCSQ59XKUo9
+Xx83pt1aVChehbsj
+TvbKEp22ZZ0T31Lj
 G8IkXqjVdLZwBK/I
 +AZoia19FAsARLE/
+dmHXmtUSriMvBTCJ
+FKQbQ1hVZXra8Wcq
+4fe7zF1Wd8UdaWu4
+8RCLotSALncqTCtE
+z2nO73rl3nRMvf6r
+Ws0yTT8UnJNTFWY7
+QYZcQD2niO2kGJ9N
 Wp6z04Yho9uWIObC
 aPkKbjEuTbUCplG7
 TYJ9FfWyzUlZbQaB
@@ -1878,6 +1883,9 @@ qurB4y++jCni0Bpf
 x/shDcuK2iB4gef2
 ONdADmVw/ZXhNBl8
 pjB2LZf7wdpcwA6O
+/fev2uWbhZQrBTRU
+sE/AvEajiziKRRuo
+WAIVvOY3vf+Mie6w
 `
         .split(/\r?\n/)
         .map(l => l.trim())

package-lock.json

@@ -41,8 +41,8 @@
     "homepage": "https://emailengine.app/",
     "dependencies": {
         "@bugsnag/js": "8.0.0",
-        "@bull-board/api": "6.1.0",
-        "@bull-board/hapi": "6.1.0",
+        "@bull-board/api": "6.2.0",
+        "@bull-board/hapi": "6.2.0",
         "@elastic/elasticsearch": "8.15.0",
         "@hapi/bell": "13.0.2",
         "@hapi/boom": "10.0.1",

package.json

@@ -116,7 +116,7 @@ <h1>EmailEngine v2.47.0</h1><p>EmailEngine includes code from the following soft
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/api">@bull-board/api</a></td>
-<td>6.1.0</td>
+<td>6.2.0</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>
@@ -126,7 +126,7 @@ <h1>EmailEngine v2.47.0</h1><p>EmailEngine includes code from the following soft
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/hapi">@bull-board/hapi</a></td>
-<td>6.1.0</td>
+<td>6.2.0</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>
@@ -136,7 +136,7 @@ <h1>EmailEngine v2.47.0</h1><p>EmailEngine includes code from the following soft
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/ui">@bull-board/ui</a></td>
-<td>6.1.0</td>
+<td>6.2.0</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>

sbom.json

@@ -1,14 +1,18 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ascii\n"
-"POT-Creation-Date: 2024-10-13 15:55+0000\n"
+"POT-Creation-Date: 2024-10-14 09:53+0000\n"
 
 #: views/config/license.hbs:49
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
+#: views/redirect.hbs:1
+msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
+msgstr ""
+
 #: views/unsubscribe.hbs:1
 #: views/unsubscribe.hbs:79
 msgid "Unsubscribe"
@@ -53,10 +57,6 @@ msgstr ""
 msgid "Enter your email address"
 msgstr ""
 
-#: views/redirect.hbs:1
-msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
-msgstr ""
-
 #: views/accounts/register/index.hbs:2
 msgid "Choose your email account provider"
 msgstr ""

static/licenses.html

@@ -203,8 +203,6 @@ class ConnectionHandler {
         }
 
         if (!accountObject.connection) {
-            let imapIndexer = typeof accountData.imapIndexer === 'string' && accountData.imapIndexer ? accountData.imapIndexer : 'full';
-
             accountObject.connection = new IMAPClient(account, {
                 runIndex,
 
@@ -213,8 +211,6 @@ class ConnectionHandler {
                 accountLogger,
                 secret,
 
-                imapIndexer,
-
                 notifyQueue,
                 submitQueue,
                 documentsQueue,