fix: only purge cache on Cloudflare for verification attempts (with 3…

…s timeout and 1 retry)

app/controllers/web/my-account/verify-records.js

@@ -88,7 +88,8 @@ async function verifyRecords(ctx) {
 
     const { ns, txt, mx, errors } = await Domains.getVerificationResults(
       domain,
-      ctx.resolver
+      ctx.resolver,
+      true
     );
 
     //

app/models/domains.js

@@ -1028,41 +1028,44 @@ async function verifySMTP(domain, resolver) {
 
 Domains.statics.verifySMTP = verifySMTP;
 
-async function getVerificationResults(domain, resolver) {
+async function getVerificationResults(domain, resolver, purgeCache = false) {
   const verificationRecord = `${config.recordPrefix}-site-verification=${domain.verification_record}`;
   const verificationMarkdown = `<span class="markdown-body ml-0 mr-0"><code>${verificationRecord}</code></span>`;
   const isPaidPlan = _.isString(domain.plan) && domain.plan !== 'free';
 
   //
   // attempt to purge Cloudflare cache programmatically
   //
-  try {
-    await pMap(
-      CACHE_TYPES,
-      (type) => {
-        const url = new URL(CLOUDFLARE_PURGE_CACHE_URL);
-        url.searchParams.append('domain', domain.name);
-        url.searchParams.append('type', type);
-        return retryRequest(url, {
-          method: 'POST',
-          headers: {
-            Accept: 'application/json',
-            'User-Agent': USER_AGENT
-          },
-          timeout: ms('5s'),
-          retries: 2
-        });
-      },
-      { concurrency }
-    );
-    logger.debug('cleared DNS cache for cloudflare', {
-      domain,
-      types: CACHE_TYPES
-    });
-    // wait one second for DNS changes to propagate
-    await delay(ms('1s'));
-  } catch (err) {
-    logger.error(err);
+  if (purgeCache) {
+    try {
+      await pMap(
+        CACHE_TYPES,
+        (type) => {
+          const url = new URL(CLOUDFLARE_PURGE_CACHE_URL);
+          url.searchParams.append('domain', domain.name);
+          url.searchParams.append('type', type);
+          return retryRequest(url, {
+            method: 'POST',
+            headers: {
+              Accept: 'application/json',
+              'User-Agent': USER_AGENT
+            },
+            timeout: ms('3s'),
+            retries: 1
+          });
+        },
+        { concurrency }
+      );
+      logger.debug('cleared DNS cache for cloudflare', {
+        domain,
+        types: CACHE_TYPES
+      });
+      // wait one second for DNS changes to propagate
+      await delay(ms('1s'));
+    } catch (err) {
+      err.domain = domain;
+      logger.error(err);
+    }
   }
 
   const errors = [];

helpers/retry-client.js

@@ -31,12 +31,15 @@ class RetryClient extends undici.Client {
         if (response.statusCode !== 200) {
           // still need to consume body even if an error occurs
           const body = await response.body.text();
-          throw new undici.errors.ResponseStatusCodeError(
+          const err = new undici.errors.ResponseStatusCodeError(
             `Response status code ${response.statusCode}`,
             response.statusCode,
             response.headers,
             body
           );
+          err.options = options;
+          err.count = count;
+          throw err;
         }
 
         return response;

helpers/retry-request.js

@@ -22,12 +22,16 @@ async function retryRequest(url, opts = {}, count = 1) {
     if (response.statusCode !== 200) {
       // still need to consume body even if an error occurs
       const body = await response.body.text();
-      throw new undici.errors.ResponseStatusCodeError(
+      const err = new undici.errors.ResponseStatusCodeError(
         `Response status code ${response.statusCode}`,
         response.statusCode,
         response.headers,
         body
       );
+      err.url = url;
+      err.options = opts;
+      err.count = count;
+      throw err;
     }
 
     return response;