From 44f7a3eae18e3c2e4b7cf028686b2114b8e60b53 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Mon, 6 Sep 2021 10:07:17 +1000
Subject: [PATCH] Speed up probe option

---
 src/drivers/npm/driver.js | 139 ++++++++++++++++++++++----------------
 1 file changed, 81 insertions(+), 58 deletions(-)

diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 8c9fd296e..db7f540f6 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -460,7 +460,8 @@ class Site {
   promiseTimeout(
     promise,
     fallback,
-    errorMessage = 'Operation took too long to respond'
+    errorMessage = 'Operation took too long to respond',
+    maxWait = this.options.maxWait
   ) {
     let timeout = null
 
@@ -478,7 +479,7 @@ class Site {
           error.code = 'PROMISE_TIMEOUT_ERROR'
 
           fallback !== undefined ? resolve(fallback) : reject(error)
-        }, this.options.maxWait)
+        }, maxWait)
       }),
       promise.then((value) => {
         clearTimeout(timeout)
@@ -890,17 +891,26 @@ class Site {
         await sleep(this.options.delay * index)
       }
 
-      const links = await this.goto(url)
-
-      if (links && this.options.recursive && depth < this.options.maxDepth) {
-        await this.batch(links.slice(0, this.options.maxUrls), depth + 1)
-      }
+      await Promise.all([
+        (async () => {
+          const links = await this.goto(url)
 
-      if (this.options.probe && !this.probed) {
-        this.probed = true
+          if (
+            links &&
+            this.options.recursive &&
+            depth < this.options.maxDepth
+          ) {
+            await this.batch(links.slice(0, this.options.maxUrls), depth + 1)
+          }
+        })(),
+        (async () => {
+          if (this.options.probe && !this.probed) {
+            this.probed = true
 
-        await this.probe(url)
-      }
+            await this.probe(url)
+          }
+        })(),
+      ])
     } catch (error) {
       this.analyzedUrls[url.href] = {
         status: 0,
@@ -950,31 +960,9 @@ class Site {
       magento: '/magento_version',
     }
 
-    for (const file of Object.keys(files)) {
-      const path = files[file]
-
-      try {
-        await sleep(this.options.delay)
-
-        const body = await get(new URL(path, url.href), {
-          userAgent: this.options.userAgent,
-          timeout: Math.min(this.options.maxWait, 3000),
-        })
-
-        this.log(`get ${path}: ok`)
-
-        await this.onDetect(
-          url,
-          await analyze({ [file]: body.slice(0, 100000) })
-        )
-      } catch (error) {
-        this.error(`get ${path}: ${error.message || error}`)
-      }
-    }
-
     // DNS
     const records = {}
-    const resolve = (func, hostname) => {
+    const resolveDns = (func, hostname) => {
       return this.promiseTimeout(
         func(hostname).catch((error) => {
           if (error.code !== 'ENODATA') {
@@ -984,39 +972,74 @@ class Site {
           return []
         }),
         [],
-        'Timeout (dns)'
+        'Timeout (dns)',
+        Math.min(this.options.maxWait, 15000)
       )
     }
 
     const domain = url.hostname.replace(/^www\./, '')
 
-    ;[records.cname, records.ns, records.mx, records.txt, records.soa] =
-      await Promise.all([
-        resolve(dns.resolveCname, url.hostname),
-        resolve(dns.resolveNs, domain),
-        resolve(dns.resolveMx, domain),
-        resolve(dns.resolveTxt, domain),
-        resolve(dns.resolveSoa, domain),
-      ])
+    await Promise.all([
+      // Static files
+      ...Object.keys(files).map(async (file, index) => {
+        const path = files[file]
 
-    const dnsRecords = Object.keys(records).reduce((dns, type) => {
-      dns[type] = dns[type] || []
+        try {
+          await sleep(this.options.delay * index)
 
-      Array.prototype.push.apply(
-        dns[type],
-        Array.isArray(records[type])
-          ? records[type].map((value) => {
-              return typeof value === 'object'
-                ? Object.values(value).join(' ')
-                : value
-            })
-          : [Object.values(records[type]).join(' ')]
-      )
+          const body = await get(new URL(path, url.href), {
+            userAgent: this.options.userAgent,
+            timeout: Math.min(this.options.maxWait, 3000),
+          })
+
+          this.log(`Probe ok (${path})`)
+
+          await this.onDetect(
+            url,
+            await analyze({ [file]: body.slice(0, 100000) })
+          )
+        } catch (error) {
+          this.error(`Probe failed (${path}): ${error.message || error}`)
+        }
+      }),
+      // DNS
+      // eslint-disable-next-line no-async-promise-executor
+      new Promise(async (resolve, reject) => {
+        ;[records.cname, records.ns, records.mx, records.txt, records.soa] =
+          await Promise.all([
+            resolveDns(dns.resolveCname, url.hostname),
+            resolveDns(dns.resolveNs, domain),
+            resolveDns(dns.resolveMx, domain),
+            resolveDns(dns.resolveTxt, domain),
+            resolveDns(dns.resolveSoa, domain),
+          ])
+
+        const dnsRecords = Object.keys(records).reduce((dns, type) => {
+          dns[type] = dns[type] || []
+
+          Array.prototype.push.apply(
+            dns[type],
+            Array.isArray(records[type])
+              ? records[type].map((value) => {
+                  return typeof value === 'object'
+                    ? Object.values(value).join(' ')
+                    : value
+                })
+              : [Object.values(records[type]).join(' ')]
+          )
 
-      return dns
-    }, {})
+          return dns
+        }, {})
 
-    await this.onDetect(url, await analyze({ dns: dnsRecords }))
+        this.log(
+          `Probe DNS ok: (${Object.values(dnsRecords).flat().length} records)`
+        )
+
+        await this.onDetect(url, await analyze({ dns: dnsRecords }))
+
+        resolve()
+      }),
+    ])
   }
 
   async batch(links, depth, batch = 0) {