fix: fixed error code check (closes #423), improved speed of frozen queue check job with cursor

Author: titanism

helpers/get-error-code.js

@@ -36,9 +36,24 @@ function getErrorCode(err) {
   // hard-coded denylist errors have 550 while others have 421
   if (err.name === 'DenylistError') return err.responseCode;
   if (
-    (typeof err.responseCode !== 'number' || err.responseCode > 500) &&
+    err.bounceInfo.category === 'block' &&
+    err.responseCode >= 500 &&
+    err.bounceInfo.action === 'reject' &&
+    [
+      'Using dynamic IP range',
+      'Sender is open relay',
+      'Sender IP blocked'
+    ].includes(err.bounceInfo.message)
+  ) {
+    return 421;
+  }
+
+  if (
+    (typeof err.responseCode !== 'number' || err.responseCode >= 500) &&
+    err.bounceInfo.action !== 'reject' &&
+    err.bounceInfo.category !== 'protocol' &&
     (['defer', 'slowdown'].includes(err.bounceInfo.action) ||
-      ['block', 'blocklist', 'network', 'protocol', 'policy'].includes(
+      ['blocklist', 'network', 'protocol', 'policy'].includes(
         err.bounceInfo.category
       ))
   )

jobs/check-smtp-frozen-queue.js

@@ -45,35 +45,41 @@ graceful.listen();
     // get list of all suspended domains
     // and recently blocked emails to exclude
     const now = new Date();
-    let [suspendedDomainIds, recentlyBlockedIds] = await Promise.all([
-      Domains.aggregate([
-        { $match: { is_smtp_suspended: true } },
-        { $group: { _id: '$_id' } }
-      ])
-        .allowDiskUse(true)
-        .exec(),
-      Emails.aggregate([
-        {
-          $match: {
-            updated_at: {
-              $gte: dayjs().subtract(1, 'hour').toDate(),
-              $lte: now
-            },
-            has_blocked_hashes: true,
-            blocked_hashes: {
-              $in: getBlockedHashes(env.SMTP_HOST)
-            }
+    const suspendedDomainIds = [];
+    const recentlyBlockedIds = [];
+
+    await Promise.all([
+      (async () => {
+        for await (const domain of Domains.find({
+          is_smtp_suspended: true
+        })
+          .select('_id')
+          .lean()
+          .cursor()
+          .addCursorFlag('noCursorTimeout', true)) {
+          suspendedDomainIds.push(domain._id);
+        }
+      })(),
+      (async () => {
+        for await (const email of Emails.find({
+          updated_at: {
+            $gte: dayjs().subtract(1, 'hour').toDate(),
+            $lte: now
+          },
+          has_blocked_hashes: true,
+          blocked_hashes: {
+            $in: getBlockedHashes(env.SMTP_HOST)
           }
-        },
-        { $group: { _id: '$_id' } }
-      ])
-        .allowDiskUse(true)
-        .exec()
+        })
+          .select('_id')
+          .lean()
+          .cursor()
+          .addCursorFlag('noCursorTimeout', true)) {
+          recentlyBlockedIds.push(email._id);
+        }
+      })()
     ]);
 
-    suspendedDomainIds = suspendedDomainIds.map((v) => v._id);
-    recentlyBlockedIds = recentlyBlockedIds.map((v) => v._id);
-
     logger.info('%d suspended domain ids', suspendedDomainIds.length);
 
     logger.info('%d recently blocked ids', recentlyBlockedIds.length);