Merge branch 'master' into add-grandnode

src/apps.json

@@ -111,6 +111,15 @@
       "script": "xiti\\.com/hit\\.xiti",
       "website": "http://atinternet.com/en"
     },
+    "Irroba": {
+      "cats": [
+        6
+      ],
+      "html": "<a[^>]*href=\"https://www.irroba.com.br"
+        ,
+      "icon": "irroba_logo.svg",
+      "website": "https://www.irroba.com.br/"
+    },
     "AWStats": {
       "cats": [
         10
@@ -1853,6 +1862,14 @@
       },
       "website": "http://catberry.org"
     },
+    "CCV Shop": {
+      "cats": [
+        6
+      ],
+      "script": "/website/JavaScript/Vertoshop\\.js",
+      "icon": "ccvshop.png",
+      "website": "https://www.ccvshop.nl"
+    },
     "CentOS": {
       "cats": [
         28
@@ -3037,6 +3054,7 @@
         "SystemID": "^.*DIRECT.*$\\;confidence:100",
         "version": "^(.*)$\\;version:\\1\\;confidence:0"
       },
+      "html": "<div[^>]*id=\"P6iryBW0Wu\"",
       "icon": "duda.png",
       "website": "https://www.duda.co/website-builder"
     },
@@ -3112,6 +3130,19 @@
       "implies": "WordPress",
       "website": "https://elementor.com"
     },
+    "EKM": {
+      "cats": [
+        6
+      ],
+      "cookies": {
+        "ekmpowershop":  ""
+      },
+      "js": {
+        "_ekmpinpoint": ""
+      },
+      "icon": "EKM.png",
+      "website": "https://www.ekm.com"
+    },
     "ELOG": {
       "cats": [
         19
@@ -3492,6 +3523,17 @@
       },
       "website": "https://www.fastcommerce.com.br"
     },
+    "Fastspring": {
+      "cats": [
+        6
+      ],
+      "html": [
+        "<a [^>]*href=\"(http|https)://sites.fastspring.com",
+        "<form [^>]*action=\"(http|https)://sites.fastspring.com"
+      ],
+      "icon": "fastspring.png",
+      "website": "https://fastspring.com"
+    },
     "Fastly": {
       "cats": [
         31
@@ -5133,7 +5175,7 @@
       "cats": [
         10
       ],
-      "icon": "Intercom.png",
+      "icon": "Intercom.svg",
       "js": {
         "Intercom": ""
       },
@@ -5165,7 +5207,6 @@
         18
       ],
       "icon": "ionic.png",
-      "implies": "Angular",
       "js": {
         "Ionic.config": "",
         "Ionic.version": "^(.+)$\\;version:\\1"
@@ -6124,6 +6165,19 @@
       "icon": "Logitech Media Server.png",
       "website": "http://www.mysqueezebox.com"
     },
+    "Loja Integrada": {
+			"cats": [
+        6
+      ],
+			"headers": {
+				"X-Powered-By": "vtex-integrated-store"
+			},
+			"icon": "Loja Integrada.png",
+			"js": {
+				"window.LOJA_ID": ""
+			},
+			"website": "https://lojaintegrada.com.br/"
+		},
     "Lotus Domino": {
       "cats": [
         22
@@ -7230,14 +7284,14 @@
       "script": "jquery\\.neto.*\\.js",
       "website": "https://www.neto.com.au"
     },
-    "Netsuite": {
+    "NetSuite": {
       "cats": [
         6
       ],
       "cookies": {
         "NS_VER": ""
       },
-      "icon": "Netsuite.png",
+      "icon": "NetSuite.png",
       "website": "http://netsuite.com"
     },
     "Nette Framework": {
@@ -10497,6 +10551,14 @@
       },
       "website": "http://taiga.io"
     },
+    "Tamago": {
+      "cats": [
+        5
+      ],
+      "html": "<link [^>]*href=\"http://tamago.temonalab.com",
+      "icon": "Tamago.png",
+      "website": "http://tamago.temonalab.com"
+    },
     "Tawk.to": {
       "cats": [
         52
@@ -11182,16 +11244,6 @@
       "icon": "VTEX.svg",
       "website": "https://vtex.com/"
     },
-    "VTEX Integrated Store": {
-      "cats": [
-        6
-      ],
-      "headers": {
-        "X-Powered-By": "vtex-integrated-store"
-      },
-      "icon": "VTEX Integrated Store.png",
-      "website": "http://lojaintegrada.com.br"
-    },
     "Vaadin": {
       "cats": [
         18
@@ -11394,7 +11446,7 @@
       "script": [
         "/_nuxt/"
       ],
-      "implies": "Vue.js",
+      "implies": ["Vue.js", "Node.js"],
       "website": "https://nuxtjs.org"
     },
     "W3 Total Cache": {
@@ -11843,7 +11895,7 @@
         "generator": "WooCommerce ([\\d.]+)\\;version:\\1"
       },
       "script": "/woocommerce(?:\\.min)?\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
-      "website": "http://www.woothemes.com/woocommerce"
+      "website": "https://woocommerce.com"
     },
     "Woopra": {
       "cats": [
@@ -12496,6 +12548,7 @@
       "cats": [
         25
       ],
+      "html": "<svg[^>]*><desc>JavaScript chart by amCharts ([\\d.]*)\\;version:\\1",
       "icon": "amCharts.png",
       "js": {
         "AmCharts": ""
@@ -13237,7 +13290,6 @@
       },
       "website": "https://phpbb.com"
     },
-    "phpDocumentor": {
     "phpCMS": {
       "cats": [
         1
@@ -13249,6 +13301,7 @@
       },
       "website": "http://phpcms.de"
     },
+    "phpDocumentor": {
       "cats": [
         4
       ],
@@ -13838,6 +13891,30 @@
         "generator": "grandnode"
       },
       "website": "https://grandnode.com"
+    },
+    "Cafe24": {
+      "cats": [
+        6
+      ],
+      "js": {
+        "EC_ROOT_DOMAIN": "",
+        "EC_GLOBAL_INFO": "",
+        "EC_GLOBAL_DATETIME": ""
+      },
+      "icon": "Cafe24.png",
+      "website": "https://www.cafe24.com"
+    },
+    "Live Story": {
+      "cats": [
+        1
+      ],
+      "icon": "LiveStory.png",
+      "website": "https://www.livestory.nyc/",
+      "js": {
+        "LiveStory": "",
+        "LSHelpers": ""
+      }
+
     }
   },
   "categories": {

src/drivers/bookmarklet/driver.js

@@ -85,7 +85,7 @@
    * Display apps
    */
   wappalyzer.driver.displayApps = (detected) => {
-    wappalyzer.log('func: diplayApps', 'driver');
+    wappalyzer.log('func: displayApps', 'driver');
 
     let first = true;
     let app;

src/drivers/npm/browsers/puppeteer.js

@@ -91,6 +91,7 @@ class PuppeteerBrowser extends Browser {
           let responseReceived = false;
 
           page.on('request', (request) => {
+            try {
               if (
                 responseReceived
                 && request.isNavigationRequest()
@@ -103,6 +104,9 @@ class PuppeteerBrowser extends Browser {
               } else {
                 request.continue();
               }
+            } catch (error) {
+              reject(new Error(`page error: ${error.message || error}`));
+            }
           });
 
           page.on('response', (response) => {

src/drivers/webextension/_locales/en/messages.json

@@ -16,69 +16,67 @@
   "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "privacyPolicy":            { "message": "Privacy policy" },
 	"categoryName1":            { "message": "CMS" },
-	"categoryName2":            { "message": "Message Board" },
+	"categoryName2":            { "message": "Message boards" },
-	"categoryName3":            { "message": "Database Manager" },
+	"categoryName3":            { "message": "Database managers" },
-	"categoryName4":            { "message": "Documentation Tool" },
+	"categoryName4":            { "message": "Documentation tools" },
-	"categoryName5":            { "message": "Widget" },
+	"categoryName5":            { "message": "Widgets" },
 	"categoryName6":            { "message": "Ecommerce" },
-	"categoryName7":            { "message": "Photo Galleries" },
+	"categoryName7":            { "message": "Photo galleries" },
 	"categoryName8":            { "message": "Wikis" },
-	"categoryName9":            { "message": "Hosting Panels" },
+	"categoryName9":            { "message": "Hosting panels" },
 	"categoryName10":           { "message": "Analytics" },
-	"categoryName11":           { "message": "Blog" },
+	"categoryName11":           { "message": "Blogs" },
-	"categoryName12":           { "message": "JavaScript Framework" },
+	"categoryName12":           { "message": "JavaScript frameworks" },
-	"categoryName13":           { "message": "Issue Tracker" },
+	"categoryName13":           { "message": "Issue trackers" },
-	"categoryName14":           { "message": "Video Player" },
+	"categoryName14":           { "message": "Video players" },
-	"categoryName15":           { "message": "Comment System" },
+	"categoryName15":           { "message": "Comment systems" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Captchas" },
-	"categoryName17":           { "message": "Font Script" },
+	"categoryName17":           { "message": "Font scripts" },
-	"categoryName18":           { "message": "Web Framework" },
+	"categoryName18":           { "message": "Web frameworks" },
 	"categoryName19":           { "message": "Miscellaneous" },
 	"categoryName20":           { "message": "Editor" },
 	"categoryName21":           { "message": "LMS" },
-	"categoryName22":           { "message": "Web Server" },
+	"categoryName22":           { "message": "Web servers" },
-	"categoryName23":           { "message": "Cache Tool" },
+	"categoryName23":           { "message": "Caching" },
-	"categoryName24":           { "message": "Rich Text Editor" },
+	"categoryName24":           { "message": "Rich text editors" },
-	"categoryName25":           { "message": "JavaScript Graphics" },
+	"categoryName25":           { "message": "JavaScript graphics" },
-	"categoryName26":           { "message": "Mobile Framework" },
+	"categoryName26":           { "message": "Mobile frameworks" },
-	"categoryName27":           { "message": "Programming Language" },
+	"categoryName27":           { "message": "Programming languages" },
-	"categoryName28":           { "message": "Operating System" },
+	"categoryName28":           { "message": "Operating systems" },
-	"categoryName29":           { "message": "Search Engine" },
+	"categoryName29":           { "message": "Search engines" },
-	"categoryName30":           { "message": "Web Mail" },
+	"categoryName30":           { "message": "Webmail" },
 	"categoryName31":           { "message": "CDN" },
-	"categoryName32":           { "message": "Marketing Automation" },
+	"categoryName32":           { "message": "Marketing automation" },
-	"categoryName33":           { "message": "Web Server Extension" },
+	"categoryName33":           { "message": "Web server extensions" },
-	"categoryName34":           { "message": "Database" },
+	"categoryName34":           { "message": "Databases" },
-	"categoryName35":           { "message": "Map" },
+	"categoryName35":           { "message": "Maps" },
-	"categoryName36":           { "message": "Advertising Network" },
+	"categoryName36":           { "message": "Advertising" },
-	"categoryName37":           { "message": "Network Service" },
+	"categoryName37":           { "message": "Network services" },
-	"categoryName38":           { "message": "Media Server" },
+	"categoryName38":           { "message": "Media servers" },
-	"categoryName39":           { "message": "Webcam" },
+	"categoryName39":           { "message": "Webcams" },
-	"categoryName40":           { "message": "Printer" },
+	"categoryName40":           { "message": "Printers" },
-	"categoryName41":           { "message": "Payment Processor" },
+	"categoryName41":           { "message": "Payment processors" },
-	"categoryName42":           { "message": "Tag Manager" },
+	"categoryName42":           { "message": "Tag managers" },
-	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "CI" },
-	"categoryName44":           { "message": "Build/CI System" },
-	"categoryName45":           { "message": "SCADA System" },
 	"categoryName46":           { "message": "Remote Access" },
-	"categoryName47":           { "message": "Development Tool" },
+	"categoryName47":           { "message": "Developmentl" },
-	"categoryName48":           { "message": "Network Storage" },
+	"categoryName48":           { "message": "Network storage" },
-	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName49":           { "message": "Feed readers" },
-	"categoryName50":           { "message": "Document Management Systems" },
+	"categoryName50":           { "message": "DMS" },
-	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName51":           { "message": "Page builder" },
-	"categoryName52":           { "message": "Live Chat" },
+	"categoryName52":           { "message": "Live chat" },
 	"categoryName53":           { "message": "CRM" },
   "categoryName54":           { "message": "SEO" },
 	"categoryName55":           { "message": "Accounting" },
-	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName56":           { "message": "Cryptominers" },
-	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName57":           { "message": "Static site generators" },
-	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName58":           { "message": "User onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName59":           { "message": "JavaScript libraries" },
 	"categoryName60":           { "message": "Containers" },
 	"categoryName61":           { "message": "SaaS" },
 	"categoryName62":           { "message": "PaaS" },
 	"categoryName63":           { "message": "IaaS" },
-	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName64":           { "message": "Reverse proxies" },
-	"categoryName65":           { "message": "Load Balancer" },
+	"categoryName65":           { "message": "Load balancers" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI frameworks" }
 }

src/drivers/webextension/_locales/fa/messages.json

@@ -5,7 +5,7 @@
 	"options":                  { "message": "گزینه‌ها" },
 	"optionsSave":              { "message": "ذخیره گزینه‌ها" },
 	"optionsSaved":             { "message": "ذخیره شد" },
-	"optionUpgradeMessage":     { "message": "درباره ارتقا به من بگویید" },
+	"optionUpgradeMessage":     { "message": "من را از بروزرسانی‌ها با خبر کن" },
 	"optionDynamicIcon":        { "message": "از نماد فن آوری به جای علامت Wappalyzer استفاده شود" },
 	"optionTracking":           { "message": "ارسال فن آوری های شناسایی شده به صورت ناشناس به wappalyzer.com" },
   "optionThemeMode":          { "message": "فعال کردن حالت سازگاری تاریک." },
@@ -16,7 +16,7 @@
 	"termsContent":             { "message": "این افزونه اطلاعات وب‌سایت‌های بازدید شده توسط شما را به صورت ناشناس ارسال می‌کند، مانند آدرس سایت و تکنولوژی‌های استفاده شده در آن سایت را ارسال می‌کند. اطلاعات بیشتر در <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. شما می‌توانید این افزونه را غیرفعال کنید." },
 	"categoryName1":            { "message": "سیستم مدیریت محتوا" },
 	"categoryName2":            { "message": "انجمن پیام" },
-	"categoryName3":            { "message": "مدیر پایگاه‌داده" },
+	"categoryName3":            { "message": "مدیریت پایگاه داده" },
 	"categoryName4":            { "message": "ابزار مستند سازی" },
 	"categoryName5":            { "message": "ابزارک" },
 	"categoryName6":            { "message": "تجارت الکترونیک" },
@@ -25,7 +25,7 @@
 	"categoryName9":            { "message": "پنل‌های میزبانی" },
 	"categoryName10":           { "message": "تجزیه و تحلیل‌ها" },
 	"categoryName11":           { "message": "بلاگ" },
-	"categoryName12":           { "message": "چارچوب جاوا اسکریپت" },
+	"categoryName12":           { "message": "فریم ورک جاوا اسکریپت" },
 	"categoryName13":           { "message": "ردیاب مشکل" },
 	"categoryName14":           { "message": "پخش کننده ویدیویی" },
 	"categoryName15":           { "message": "سیستم نظرسنجی" },
@@ -44,9 +44,9 @@
 	"categoryName28":           { "message": "سیستم عامل" },
 	"categoryName29":           { "message": "موتور جستجو" },
 	"categoryName30":           { "message": "پست الکترونیکی تحت وب" },
-	"categoryName31":           { "message": "شبکه تحویل محتوا" },
+	"categoryName31":           { "message": "شبکه توزیع محتوا" },
 	"categoryName32":           { "message": "اتوماسیون بازاریابی" },
-	"categoryName33":           { "message": "افزودنی وب‌سرور" },
+	"categoryName33":           { "message": "افزونه وب سرور" },
 	"categoryName34":           { "message": "پایگاه‌داده" },
 	"categoryName35":           { "message": "نقشه" },
 	"categoryName36":           { "message": "شبکه تبلیغاتی" },
@@ -67,7 +67,7 @@
 	"categoryName51":           { "message": "سازنده صفحات Landing" },
 	"categoryName52":           { "message": "گفتگوی زنده" },
 	"categoryName53":           { "message": "مدیریت ارتباط با مشتری" },
-	"categoryName54":           { "message": "بهینه سازی موتور جستجو" },
+	"categoryName54":           { "message": "سئو" },
 	"categoryName55":           { "message": "حسابداری" },
 	"categoryName56":           { "message": "کریپتوماینر" },
 	"categoryName57":           { "message": "تولید کننده سایت ایستا" },
@@ -77,7 +77,7 @@
 	"categoryName61":           { "message": "SaaS" },
 	"categoryName62":           { "message": "PaaS" },
 	"categoryName63":           { "message": "IaaS" },
-	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName64":           { "message": "پروکسی معکوس" },
 	"categoryName65":           { "message": "Load Balancer" },
 	"categoryName66":           { "message": "UI Frameworks" }
 }

src/icons/Intercom.svg

@@ -0,0 +1 @@
+<svg width="2500" height="2500" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M221.867 140.748a8.534 8.534 0 0 1-17.067 0V64a8.534 8.534 0 0 1 17.067 0v76.748zm-2.978 53.413c-1.319 1.129-32.93 27.655-90.889 27.655-57.958 0-89.568-26.527-90.887-27.656a8.535 8.535 0 0 1-.925-12.033 8.53 8.53 0 0 1 12.013-.942c.501.42 28.729 23.563 79.8 23.563 51.712 0 79.503-23.31 79.778-23.545 3.571-3.067 8.968-2.655 12.033.925a8.534 8.534 0 0 1-.923 12.033zM34.133 64A8.534 8.534 0 0 1 51.2 64v76.748a8.534 8.534 0 0 1-17.067 0V64zm42.668-17.067a8.534 8.534 0 0 1 17.066 0v114.001a8.534 8.534 0 0 1-17.066 0v-114zm42.666-4.318A8.532 8.532 0 0 1 128 34.082a8.532 8.532 0 0 1 8.534 8.533v123.733a8.534 8.534 0 0 1-17.067 0V42.615zm42.667 4.318a8.534 8.534 0 0 1 17.066 0v114.001a8.534 8.534 0 0 1-17.066 0v-114zM224 0H32C14.327 0 0 14.327 0 32v192c0 17.672 14.327 32 32 32h192c17.673 0 32-14.328 32-32V32c0-17.673-14.327-32-32-32z" fill="#1F8DED"/></svg>