fix: fixed SEARCH and storage quota (due to new sync setup with tmp f…

…ile)
forwardemail · Jun 27, 2024 · 377addc · 377addc
1 parent 48e0bf1
commit 377addc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/config/index.js b/config/index.js
@@ -168,7 +168,7 @@ const STRIPE_LOCALES = new Set([
 
 const config = {
   ...metaConfig,
-  INITIAL_DB_SIZE: 200704,
+  INITIAL_DB_SIZE: 196608, // 200704,
   STRIPE_LOCALES,
   openPGPKey: '/.well-known/openpgpkey/hu/mxqp8ogw4jfq83a58pn1wy1ccc1cx3f5.asc',
   returnPath: 'fe-bounces',

diff --git a/helpers/imap/on-search.js b/helpers/imap/on-search.js
@@ -160,10 +160,14 @@ async function onSearch(mailboxId, options, session, fn) {
             for (const id of ids) {
               set.add(id);
             }
+
             // old approach:
             // parent.push({
             //   _id: { $in: ids }
             // });
+            parent.push({
+              _id: { $ne: '' }
+            });
 
             // NOTE: this is the wildduck reference (which does not support NOT matches)
             // search over email body
@@ -322,8 +326,10 @@ async function onSearch(mailboxId, options, session, fn) {
                   for (const id of ids) {
                     set.add(id);
                   }
+
                   // old approach:
                   // entry._id = { $in: ids };
+                  entry._id = { $ne: '' };
                 } else {
                   const sql = {
                     // NOTE: for array lookups:
@@ -341,8 +347,10 @@ async function onSearch(mailboxId, options, session, fn) {
                   for (const id of ids) {
                     set.add(id);
                   }
+
                   // old approach:
                   // entry._id = { $in: ids };
+                  entry._id = { $ne: '' };
                 }
               } else if (ne) {
                 const sql = {
@@ -362,6 +370,7 @@ async function onSearch(mailboxId, options, session, fn) {
 
                 // old approach
                 // entry._id = { $in: ids };
+                entry._id = { $ne: '' };
               } else {
                 const sql = {
                   query: `select _id from Messages, json_each(Messages.headers) where key = $p1;`,
@@ -380,6 +389,7 @@ async function onSearch(mailboxId, options, session, fn) {
 
                 // old approach
                 // entry._id = { $in: ids };
+                entry._id = { $ne: '' };
               }
 
               // wildduck/mongodb version
@@ -623,15 +633,14 @@ async function onSearch(mailboxId, options, session, fn) {
       type: 'select',
       table: 'Messages',
       condition,
-      fields: ['uid', 'modseq']
+      fields: ['_id', 'uid', 'modseq']
     });
 
-    //
-    // NOTE: using `all()` currently for faster performance
-    //       (since we don't write to the socket here)
-    //
-
     try {
+      //
+      // NOTE: using `all()` currently for faster performance
+      //       (since we don't write to the socket here)
+      //
       // const messages = session.db.prepare(sql.query).all(sql.values);
       // for (const message of messages) {
       //   // SQLITE_MAX_VARIABLE_NUMBER which defaults to 999

diff --git a/test/imap/index.js b/test/imap/index.js
@@ -884,7 +884,7 @@ test('onGetQuotaRoot', async (t) => {
     t.is(quota.storage.status, '0%');
     t.log('quota', quota);
     t.log('quota.storage.usage', quota.storage.usage);
-    t.is(quota.storage.usage, 196608);
+    t.is(quota.storage.usage, 188416);
     // TODO: figure out why config.INITIAL_DB_SIZE is sometimes off here (e.g. its sometimes 200704)
     // t.deepEqual(quota, {
     //   path: 'INBOX',
@@ -1640,7 +1640,7 @@ ${randomString}`.trim()
   await imapFlow.append('INBOX', raw, [], new Date());
 
   const storageUsed = await Aliases.getStorageUsed(alias);
-  t.is(storageUsed, 101208064);
+  t.is(storageUsed, 101081088); // 101208064);
 
   mailbox = await Mailboxes.findById(
     t.context.imap,