Merge pull request #3057 from nirlya/AppD-Support

Add AppDynamics detection

src/apps.json

@@ -981,6 +981,14 @@
       "icon": "apostrophecms.svg",
       "implies": "Node.js",
       "website": "http://apostrophecms.org"
+    },
+	"AppDynamics": {
+      "cats": [
+        10
+      ],
+      "icon": "AppDynamics.png",
+      "script": "adrum\\.js|adrum.([0-9].*)\\.js\\;version:\\1",
+      "website": "https://appdynamics.com"
     },
     "AppNexus": {
       "cats": [

src/drivers/bookmarklet/driver.js

@@ -1,7 +1,9 @@
-/* eslint-env browser */
-/* eslint-disable func-names, no-unused-expressions, no-restricted-globals */
-/* eslint-disable no-restricted-syntax, no-continue */
-/* global wappalyzer */
+/**
+ * Bookmarklet driver
+ */
+
+/** global: wappalyzer */
+/** global: XMLHttpRequest */
 
 (function () {
   wappalyzer.driver.document = document;
@@ -14,7 +16,6 @@
    * Log messages to console
    */
   wappalyzer.driver.log = (message, source, type) => {
-    // eslint-disable-next-line no-console
     console.log(`[wappalyzer ${type}]`, `[${source}]`, message);
   };
 
@@ -50,14 +51,14 @@
       if (xhr.readyState === 4 && xhr.status) {
         const headers = xhr.getAllResponseHeaders().split('\n');
 
-        if (headers.length > 0 && headers[0]) {
+        if (headers.length > 0 && headers[0] != '') {
           wappalyzer.log(`responseHeaders: ${xhr.getAllResponseHeaders()}`, 'driver');
 
           const responseHeaders = {};
 
           headers.forEach((line) => {
-            let name;
-            let value;
+            let name,
+              value;
 
             if (line) {
               name = line.substring(0, line.indexOf(': '));
@@ -80,10 +81,6 @@
     xhr.send();
   }
 
-  function slugify(string) {
-    return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
-  }
-
   /**
    * Display apps
    */
@@ -106,13 +103,12 @@
           continue;
         }
 
-        const { version, confidence } = detected[app];
-
-        category = wappalyzer.categories[wappalyzer.apps[app].cats[0]].name;
+        let version = detected[app].version,
+          confidence = detected[app].confidence;
 
         html
           += `<div class="wappalyzer-app${first ? ' wappalyzer-first' : ''}">`
-            + `<a target="_blank" class="wappalyzer-application" href="${wappalyzer.config.websiteURL}technologies/${slugify(category)}/${slugify(app)}">`
+            + `<a target="_blank" class="wappalyzer-application" href="${wappalyzer.config.websiteURL}applications/${app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '')}">`
               + '<strong>'
                 + `<img src="${wappalyzer.config.websiteURL}images/icons/${wappalyzer.apps[app].icon || 'default.svg'}" width="16" height="16"/> ${app
                 }</strong>${
@@ -126,7 +122,7 @@
 
           category = wappalyzer.categories[wappalyzer.apps[app].cats[i]].name;
 
-          html += `<a target="_blank" class="wappalyzer-category" href="${wappalyzer.config.websiteURL}technologies/${slugify(category)}">${category}</a>`;
+          html += `<a target="_blank" class="wappalyzer-category" href="${wappalyzer.config.websiteURL}categories/${slugify(category)}">${category}</a>`;
         }
 
         html += '</div>';
@@ -134,14 +130,25 @@
         first = false;
       }
     } else {
-      html += '<div id="wappalyzer-empty">No technologies detected</div>';
+      html += '<div id="wappalyzer-empty">No applications detected</div>';
     }
 
     html += '</div>';
 
     container.innerHTML = html;
+  },
+
+  /**
+   * Open a tab
+   */
+  function openTab(args) {
+    open(args.url);
   };
 
+  function slugify(string) {
+    return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+  }
+
   getPageContent();
   getResponseHeaders();
 }());

src/drivers/npm/package.json

@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Identify technology on websites",
   "homepage": "https://www.wappalyzer.com",
-  "version": "5.9.34",
+  "version": "5.9.33",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {