Fix localisation, patterns and error handling when saving options

4 years ago · fd58b18a95
parent eb2dfc714a
commit fd58b18a95
8 changed files with 93 additions and 89 deletions
--- a/src/apps.json
+++ b/src/apps.json
@ -3957,7 +3957,7 @@
      "cats": [
        24
      ],
-      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:\\.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
+      "html": "<!-- \\* FreeTextBox v\\d \\((\\d+\\.\\d+\\.\\d+)\\;version:\\1",
      "icon": "FreeTextBox.png",
      "implies": "Microsoft ASP.NET",
      "js": {
@ -4250,7 +4250,7 @@
      ],
      "icon": "GitBook.png",
      "meta": {
-        "generator": "GitBook(?:\\.([\\d.]+))?\\;version:\\1"
+        "generator": "GitBook ([\\d.]+)?\\;version:\\1"
      },
      "url": "^https?://[^/]+\\.gitbook\\.com/",
      "website": "https://www.gitbook.com"
@ -5542,7 +5542,7 @@
        18
      ],
      "headers": {
-        "X-Powered-By": "Servlet(?:\\.([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "Servlet(?:\\/([\\d.]+))?\\;version:\\1"
      },
      "icon": "Java.png",
      "implies": "Java",
@ -12450,7 +12450,7 @@
      ],
      "headers": {
        "Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1",
-        "X-Powered-By": "Winstone(?:\\.([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "Winstone(?:\\/([\\d.]+))?\\;version:\\1"
      },
      "website": "http://winstone.sourceforge.net"
    },
@ -13076,7 +13076,6 @@
      "cookies": {
        "ZM_TEST": "true"
      },
-      "html": "<script>(?:\\.|\\n)*\"refresh\":\\{\"version\":\"([\\w\\.]+)\\s\\;version:\\1",
      "icon": "Zimbra.png",
      "implies": "Java",
      "website": "https://www.zimbra.com/"
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@ -13,7 +13,7 @@
    "software"
  ],
  "homepage": "https://www.wappalyzer.com",
-  "version": "6.0.13",
+  "version": "6.0.15",
  "author": "Wappalyzer",
  "license": "MIT",
  "repository": {
--- a/src/drivers/webextension/html/background.html
+++ b/src/drivers/webextension/html/background.html
@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <html>
 	<head>
 		<meta charset="utf-8">
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@ -515,14 +515,11 @@ const Driver = {
          ]

          if (
-            /((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(
+            !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(
              hostname
-            ) ||
-            hits < 3
+            ) &&
+            hits >= 3
          ) {
-            return
-          }
-
            hostnames[url] = hostnames[url] || {
              applications: resolve(detections).reduce(
                (technologies, { name, confidence, version }) => {
@ -531,9 +528,9 @@ const Driver = {
                      version,
                      hits
                    }
+                  }

                  return technologies
-                }
                },
                {}
              ),
@ -541,6 +538,7 @@ const Driver = {
                language
              }
            }
+          }

          return hostnames
        },
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@ -120,14 +120,15 @@ const Popup = {
      document.querySelector('.empty').remove()
    }

-    Popup.categorise(detections).forEach(
-      ({ id, name, slug: categorySlug, technologies }) => {
+    const categorised = Popup.categorise(detections)
+
+    categorised.forEach(({ id, name, slug: categorySlug, technologies }) => {
      const categoryNode = Popup.templates.category.cloneNode(true)

      const link = categoryNode.querySelector('.category__link')

      link.href = `https://www.wappalyzer.com/technologies/${categorySlug}`
-        link.textContent = name
+      link.dataset.i18n = `categoryName${id}`

      const pins = categoryNode.querySelectorAll('.category__pin')

@ -193,8 +194,13 @@ const Popup = {
        })

      document.querySelector('.detections').appendChild(categoryNode)
+    })
+
+    if (categorised.length === 1) {
+      document
+        .querySelector('.detections')
+        .appendChild(Popup.templates.category.cloneNode(true))
    }
-    )

    Array.from(document.querySelectorAll('a')).forEach((a) =>
      a.addEventListener('click', (event) => {
--- a/src/drivers/webextension/js/utils.js
+++ b/src/drivers/webextension/js/utils.js
@ -44,11 +44,12 @@ const Utils = {
      if (option[name] !== undefined) {
        return option[name]
      }
-
-      return defaultValue
    } catch (error) {
-      throw new Error(error.message || error.toString())
+      // eslint-disable-next-line no-console
+      console.error('wappalyzer | utils |', error)
    }
+
+    return defaultValue
  },

  /**
@ -62,7 +63,8 @@ const Utils = {
        [name]: value
      })
    } catch (error) {
-      throw new Error(error.message || error.toString())
+      // eslint-disable-next-line no-console
+      console.error('wappalyzer | utils |', error)
    }
  },

--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@ -4,7 +4,7 @@
  "author": "Wappalyzer",
  "homepage_url": "https://www.wappalyzer.com",
  "description": "Identify web technologies",
-  "version": "6.0.13",
+  "version": "6.0.15",
  "default_locale": "en",
  "manifest_version": 2,
  "icons": {
--- a/src/package.json
+++ b/src/package.json
@ -13,7 +13,7 @@
    "software"
  ],
  "homepage": "https://www.wappalyzer.com",
-  "version": "6.0.13",
+  "version": "6.0.15",
  "author": "Wappalyzer",
  "license": "MIT",
  "repository": {