From 110765041aff66382cb4cad54ae0f6a5f22dbff1 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 3 Feb 2021 09:56:23 +1100
Subject: [PATCH] Add Uscreen SVG icon

---
 src/drivers/npm/driver.js                         | 9 ---------
 src/drivers/npm/package.json                      | 4 ++--
 src/drivers/webextension/images/icons/Uscreen.svg | 5 +++++
 src/drivers/webextension/js/driver.js             | 7 +------
 src/package.json                                  | 4 ++--
 5 files changed, 10 insertions(+), 19 deletions(-)
 create mode 100644 src/drivers/webextension/images/icons/Uscreen.svg

diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 52f40d865..c94c2c626 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -175,7 +175,6 @@ class Driver {
         }
       })
     } catch (error) {
-      console.log('a', error)
       throw new Error(error.toString())
     }
   }
@@ -191,7 +190,6 @@ class Driver {
 
         this.log('Browser closed')
       } catch (error) {
-        console.log('b', error)
         throw new Error(error.toString())
       }
     }
@@ -227,7 +225,6 @@ class Site {
     try {
       this.originalUrl = new URL(url)
     } catch (error) {
-      console.log('c', error)
       throw new Error(error.toString())
     }
 
@@ -348,7 +345,6 @@ class Site {
           request.continue({ headers })
         }
       } catch (error) {
-        console.log('d', error)
         this.error(error)
       }
     })
@@ -372,8 +368,6 @@ class Site {
             ]
           })
 
-          this.contentType = headers['content-type'] || null
-
           if (response.status() >= 300 && response.status() < 400) {
             if (headers.location) {
               url = new URL(headers.location.slice(-1), url)
@@ -391,7 +385,6 @@ class Site {
           }
         }
       } catch (error) {
-        console.log('e', error)
         this.error(error)
       }
     })
@@ -760,7 +753,6 @@ class Site {
 
       return reducedLinks
     } catch (error) {
-      console.log('f', error)
       if (error.constructor.name === 'TimeoutError') {
         throw new Error('The website took too long to respond')
       }
@@ -789,7 +781,6 @@ class Site {
         await this.batch(links.slice(0, this.options.maxUrls), depth + 1)
       }
     } catch (error) {
-      console.log('g', error)
       this.analyzedUrls[url.href] = {
         status: 0,
         error: error.message || error.toString(),
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index b80ce1a4b..5c8e4e165 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.5.22",
+  "version": "6.5.24",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
@@ -42,4 +42,4 @@
   "dependencies": {
     "puppeteer": "^5.3.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/webextension/images/icons/Uscreen.svg b/src/drivers/webextension/images/icons/Uscreen.svg
new file mode 100644
index 000000000..5d6af2b2a
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Uscreen.svg
@@ -0,0 +1,5 @@
+<svg width="37" height="36" viewBox="0 0 37 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.476 5.40799C23.228 5.40799 22.978 5.42499 22.726 5.46099L5.64 7.88099C2.695 8.29899 0.639998 11.061 1.051 14.053L2.574 25.141C2.95 27.876 5.257 29.855 7.9 29.855C8.148 29.855 8.399 29.838 8.651 29.802L25.735 27.382C28.68 26.964 30.735 24.201 30.325 21.209L28.801 10.122C28.427 7.38699 26.12 5.40799 23.476 5.40799ZM23.476 7.86099C24.946 7.86099 26.206 8.97899 26.41 10.461L27.933 21.549C28.159 23.195 27.023 24.722 25.403 24.952L8.318 27.372C8.18 27.392 8.039 27.402 7.901 27.402C6.432 27.402 5.171 26.284 4.968 24.802L3.444 13.714C3.33292 12.9234 3.53849 12.1208 4.016 11.481C4.2482 11.1651 4.54121 10.8989 4.87781 10.698C5.21441 10.4971 5.5878 10.3655 5.976 10.311L23.059 7.89099C23.197 7.87099 23.337 7.86099 23.476 7.86099V7.86099Z" fill="#252525"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.5 33.054C26.2457 33.054 24.0837 32.1585 22.4896 30.5644C20.8955 28.9703 20 26.8083 20 24.554C20 22.2996 20.8955 20.1376 22.4896 18.5436C24.0837 16.9495 26.2457 16.054 28.5 16.054C30.7543 16.054 32.9163 16.9495 34.5104 18.5436C36.1045 20.1376 37 22.2996 37 24.554C37 26.8083 36.1045 28.9703 34.5104 30.5644C32.9163 32.1585 30.7543 33.054 28.5 33.054Z" fill="#006AFF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.51 28.006L31.837 24.839C31.8868 24.8099 31.9281 24.7683 31.9568 24.7183C31.9855 24.6683 32.0006 24.6117 32.0006 24.554C32.0006 24.4963 31.9855 24.4397 31.9568 24.3897C31.9281 24.3397 31.8868 24.2981 31.837 24.269L26.51 21.102C26.4592 21.0716 26.4012 21.0551 26.342 21.0542C26.2827 21.0534 26.2243 21.0681 26.1726 21.097C26.1209 21.1259 26.0777 21.1679 26.0474 21.2189C26.0171 21.2698 26.0007 21.3278 26 21.387V27.72C26 27.98 26.286 28.14 26.51 28.006V28.006Z" fill="white"/>
+</svg>
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 99fe88b10..2ece03254 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -267,12 +267,7 @@ const Driver = {
             )
           })
 
-          if (
-            headers['content-type'] &&
-            /\/x?html/.test(headers['content-type'][0])
-          ) {
-            await Driver.onDetect(request.url, analyze({ headers }))
-          }
+          await Driver.onDetect(request.url, analyze({ headers }))
         }
       } catch (error) {
         Driver.error(error)
diff --git a/src/package.json b/src/package.json
index 28f3e35de..3da826a7f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.5.22",
+  "version": "6.5.24",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
@@ -32,4 +32,4 @@
   "files": [
     "wappalyzer.js"
   ]
-}
\ No newline at end of file
+}