From 55682469134bae5b22eaab7a09dff6bc85ba7bb9 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:21:36 +1100
Subject: [PATCH] Fix for showing non-cached results

---
 src/drivers/webextension/js/driver.js | 73 ++++++++++++++++-----------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 5c43b6844..902f1f2a7 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -37,6 +37,12 @@ function getRequiredTechnologies(name, categoryId) {
     : undefined
 }
 
+function isSimilarUrl(a, b) {
+  const normalise = (url) => String(url || '').replace(/(\/|\/?#.+)$/, '')
+
+  return normalise(a) === normalise(b)
+}
+
 const Driver = {
   lastPing: Date.now(),
 
@@ -198,11 +204,13 @@ const Driver = {
       url,
       js
         .map(({ name, chain, value }) => {
-          return analyzeManyToMany(
-            technologies.find(({ name: _name }) => name === _name),
-            'js',
-            { [chain]: [value] }
+          const technology = technologies.find(
+            ({ name: _name }) => name === _name
           )
+
+          return technology
+            ? analyzeManyToMany(technology, 'js', { [chain]: [value] })
+            : []
         })
         .flat()
     )
@@ -230,6 +238,10 @@ const Driver = {
               ({ name: _name }) => name === _name
             )
 
+            if (!technology) {
+              return []
+            }
+
             if (typeof exists !== 'undefined') {
               return analyzeManyToMany(technology, 'dom.exists', {
                 [selector]: [''],
@@ -625,13 +637,7 @@ const Driver = {
       )
     )
 
-    const resolved = resolve(cache.detections).map((detection) => {
-      detection.cached = detection.lastUrl !== url
-
-      delete detection.lastUrl
-
-      return detection
-    })
+    const resolved = resolve(cache.detections).map((detection) => detection)
 
     const requires = [
       ...Wappalyzer.requires.filter(({ name }) =>
@@ -652,22 +658,6 @@ const Driver = {
 
     await Driver.setIcon(url, resolved)
 
-    /*
-    if (url) {
-      let tabs = []
-
-      try {
-        tabs = await promisify(chrome.tabs, 'query', {
-          url: globEscape(url),
-        })
-      } catch (error) {
-        // Continue
-      }
-
-      tabs.forEach(({ id }) => (Driver.cache.tabs[id] = resolved))
-    }
-    */
-
     Driver.log({ hostname, technologies: resolved })
 
     await Driver.ping()
@@ -698,8 +688,9 @@ const Driver = {
     let icon = 'default.svg'
 
     const _technologies = technologies.filter(
-      ({ slug, cached }) =>
-        slug !== 'cart-functionality' && (showCached || cached === false)
+      ({ slug, lastUrl }) =>
+        slug !== 'cart-functionality' &&
+        (showCached || isSimilarUrl(url, lastUrl))
     )
 
     if (dynamicIcon) {
@@ -784,7 +775,7 @@ const Driver = {
     const cache = Driver.cache.hostnames[hostname]
 
     const resolved = (cache ? resolve(cache.detections) : []).filter(
-      ({ cached }) => showCached || cached === false
+      ({ lastUrl }) => showCached || isSimilarUrl(url, lastUrl)
     )
 
     await Driver.setIcon(url, resolved)
@@ -980,6 +971,28 @@ chrome.webRequest.onCompleted.addListener(Driver.onXhrRequestComplete, {
   types: ['xmlhttprequest'],
 })
 
+chrome.tabs.onUpdated.addListener(async (id, { status, url }) => {
+  console.log({ id, status, url })
+
+  if (status === 'complete') {
+    ;({ url } = await promisify(chrome.tabs, 'get', id))
+  }
+
+  if (url) {
+    const { hostname } = new URL(url)
+
+    const showCached = await getOption('showCached', true)
+
+    const cache = Driver.cache.hostnames[hostname]
+
+    const resolved = (cache ? resolve(cache.detections) : []).filter(
+      ({ lastUrl }) => showCached || isSimilarUrl(url, lastUrl)
+    )
+
+    await Driver.setIcon(url, resolved)
+  }
+})
+
 // Enable messaging between scripts
 chrome.runtime.onMessage.addListener(Driver.onMessage)