fix: fixed "Request took longer than Xms" issue and dummy-proofing is…

…ErrorConstructorName logic
forwardemail · Dec 18, 2024 · 02f3170 · 02f3170
1 parent b222a84
commit 02f3170
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 40 deletions.
diff --git a/helpers/get-bounce-info.js b/helpers/get-bounce-info.js
@@ -60,10 +60,11 @@ function getBounceInfo(err) {
   ) {
     if (REGEX_VIRUS.test(response)) bounceInfo.category = 'virus';
     else if (REGEX_SPAM.test(response)) bounceInfo.category = 'spam';
-    else if (isRetryableError(err)) {
-      bounceInfo.category = 'network';
-      bounceInfo.action = 'defer';
-    }
+  }
+
+  if (isRetryableError(err)) {
+    bounceInfo.category = 'network';
+    bounceInfo.action = 'defer';
   }
 
   // <https://github.com/zone-eu/zone-mta/issues/434>

diff --git a/helpers/is-error-constructor-name.js b/helpers/is-error-constructor-name.js
@@ -9,33 +9,24 @@
 //       <https://github.com/ladjs/koa-better-error-handler/blob/261701158b5151f7df4020834e47249b09952aa8/index.js#L57-L85>
 //
 function isErrorConstructorName(err, name) {
-  const names = [];
+  const names = new Set();
 
   let e = err;
   while (e) {
-    if (!e || !e.name || names.includes(e.name)) break;
-    names.push(e.name);
-    if (
-      !err.constructor ||
-      !Object.getPrototypeOf(err.constructor).name ||
-      names.includes(Object.getPrototypeOf(err.constructor).name)
-    )
+    if (!e || !e.name) break;
+    names.add(e.name);
+    if (e.constructor && e.constructor.name) names.add(e.constructor.name);
+    if (!e.constructor || !Object.getPrototypeOf(e.constructor).name) break;
+    names.add(Object.getPrototypeOf(e.constructor).name);
+    if (!Object.getPrototypeOf(Object.getPrototypeOf(e.constructor)).name)
       break;
-    names.push(Object.getPrototypeOf(err.constructor).name);
-    if (
-      !Object.getPrototypeOf(Object.getPrototypeOf(err.constructor)).name ||
-      names.includes(
-        Object.getPrototypeOf(Object.getPrototypeOf(err.constructor)).name
-      )
-    )
-      break;
-    names.push(
-      Object.getPrototypeOf(Object.getPrototypeOf(err.constructor)).name
-    );
+    names.add(Object.getPrototypeOf(Object.getPrototypeOf(e.constructor)).name);
     e = Object.getPrototypeOf(e.constructor);
   }
 
-  return names.includes(name);
+  names.delete('Object');
+
+  return names.has(name);
 }
 
 module.exports = isErrorConstructorName;
diff --git a/helpers/is-timeout-error.js b/helpers/is-timeout-error.js
@@ -59,6 +59,7 @@ function isTimeoutError(err) {
     if (typeof err[key] !== 'string') continue;
     const str = err[key].toLowerCase();
     if (
+      str.includes('request took longer than') ||
       str.includes('request aborted') ||
       str.includes('timeout') ||
       str.includes('request time-out') ||

diff --git a/helpers/on-data-mx.js b/helpers/on-data-mx.js
@@ -109,6 +109,8 @@ const scanner = new SpamScanner({
 // TODO: if `err.truthSource` is `outlook.com` then link to this article
 //
 // TODO: we need to be careful here because of false positives for DMARC failures
+// TODO: disabled until we use MongoDB for this
+/*
 async function sendSysAdminEmail(template, err, session, headers) {
   // safeguard in case we add more of these kinds of alerts
   if (template !== 'dmarc-issue') throw new TypeError('Invalid template');
@@ -128,13 +130,6 @@ async function sendSysAdminEmail(template, err, session, headers) {
       session.resolvedRootClientHostname !==
         session.originalFromAddressRootDomain)
   ) {
-    const _err = new TypeError(
-      `Preventing sysadmin ${template} email to ${session.originalFromAddressRootDomain}`
-    );
-    _err.isCodeBug = true;
-    _err.session = session;
-    _err.original_error = parseErr(err);
-    logger.fatal(_err);
     return;
   }
 
@@ -169,6 +164,7 @@ async function sendSysAdminEmail(template, err, session, headers) {
     }
   });
 }
+*/
 
 async function sendBounce(bounce, headers, session, sealedMessage) {
   try {
@@ -1082,11 +1078,12 @@ async function forward(recipient, headers, session, raw, body) {
         // (the below logic is duplicated from elsewhere in this file)
         session.rewriteFriendlyFrom = true;
 
+        // TODO: disabled until we use MongoDB for this
         // notify common system administrator usernames of this issue
-        sendSysAdminEmail
-          .call(this, 'dmarc-issue', err, session, headers)
-          .then()
-          .catch((err) => logger.fatal(err));
+        // sendSysAdminEmail
+        //   .call(this, 'dmarc-issue', err, session, headers)
+        //   .then()
+        //   .catch((err) => logger.fatal(err));
 
         headers.update(
           'From',
@@ -1343,11 +1340,12 @@ async function updateMXHeaders(session, headers, body) {
     );
     err.truthSource = env.WEB_HOST;
 
+    // TODO: disabled until we use MongoDB for this
     // notify common system administrator usernames of this issue
-    sendSysAdminEmail
-      .call(this, 'dmarc-issue', err, session, headers)
-      .then()
-      .catch((err) => logger.fatal(err));
+    // sendSysAdminEmail
+    //   .call(this, 'dmarc-issue', err, session, headers)
+    //   .then()
+    //   .catch((err) => logger.fatal(err));
 
     headers.update(
       'From',

diff --git a/helpers/retry-client.js b/helpers/retry-client.js
@@ -35,7 +35,7 @@ class RetryClient extends undici.Client {
         const t = setTimeout(() => {
           if (!abortController?.signal?.aborted)
             abortController.abort(
-              new TimeoutError(`Request took longer than ${timeout}ms}`)
+              new TimeoutError(`Request took longer than ${timeout}ms`)
             );
         }, timeout);