Merge branch 'master' into Activello

3 years ago · 2029e2b4b3
parent 860a6589cd b65510788a
commit 2029e2b4b3
16 changed files with 195 additions and 8 deletions
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@ -13,8 +13,12 @@ function next() {
  return new Promise((resolve) => setImmediate(resolve))
 }

-const { AWS_LAMBDA_FUNCTION_NAME, CHROMIUM_BIN, CHROMIUM_DATA_DIR } =
-  process.env
+const {
+  AWS_LAMBDA_FUNCTION_NAME,
+  CHROMIUM_BIN,
+  CHROMIUM_DATA_DIR,
+  CHROMIUM_WEBSOCKET,
+} = process.env

 let puppeteer
 let chromiumArgs = [
@ -342,12 +346,20 @@ class Driver {
    this.log('Launching browser...')

    try {
-      this.browser = await puppeteer.launch({
-        ignoreHTTPSErrors: true,
-        acceptInsecureCerts: true,
-        args: chromiumArgs,
-        executablePath: await chromiumBin,
-      })
+      if (CHROMIUM_WEBSOCKET) {
+        this.browser = await puppeteer.connect({
+          ignoreHTTPSErrors: true,
+          acceptInsecureCerts: true,
+          browserWSEndpoint: CHROMIUM_WEBSOCKET,
+        })
+      } else {
+        this.browser = await puppeteer.launch({
+          ignoreHTTPSErrors: true,
+          acceptInsecureCerts: true,
+          args: chromiumArgs,
+          executablePath: await chromiumBin,
+        })
+      }

      this.browser.on('disconnected', async () => {
        this.log('Browser disconnected')
--- a/src/drivers/webextension/images/icons/Colibri
+++ b/src/drivers/webextension/images/icons/Colibri
--- a/src/drivers/webextension/images/icons/HashThemes.png
+++ b/src/drivers/webextension/images/icons/HashThemes.png
--- a/src/drivers/webextension/images/icons/Lightning.png
+++ b/src/drivers/webextension/images/icons/Lightning.png
--- a/src/drivers/webextension/images/icons/PressMaximum.png
+++ b/src/drivers/webextension/images/icons/PressMaximum.png
--- a/src/drivers/webextension/images/icons/Site
+++ b/src/drivers/webextension/images/icons/Site
@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.8902 11.1769C26.3989 10.4252 25.7631 9.82557 24.9815 9.37867C24.2002 8.93195 23.2514 8.7085 22.1356 8.7085C21.0193 8.7085 20.0668 8.93195 19.2782 9.37867C18.5514 9.79019 17.9495 10.3334 17.4695 11.0038L14.9396 14.5224L14.8726 14.6341C15.0213 14.5748 15.1996 14.5301 15.4074 14.4999C15.6152 14.4705 15.8084 14.4553 15.9866 14.4553C16.6697 14.4553 17.3275 14.5783 17.9588 14.8242C18.59 15.0699 19.1393 15.4198 19.6074 15.8739C19.6742 15.9385 19.7385 16.0056 19.8013 16.074C19.8155 15.846 19.834 15.6113 19.8586 15.3654C19.9177 14.7701 20.0331 14.2149 20.2046 13.7011C20.3753 13.1874 20.6175 12.7556 20.9301 12.4055C21.2423 12.0558 21.6444 11.8804 22.1356 11.8804C22.6268 11.8804 23.0243 12.0558 23.3297 12.4055C23.6345 12.7556 23.869 13.1874 24.0327 13.7011C24.1962 14.2149 24.3081 14.7701 24.3677 15.3654C24.427 15.9613 24.4569 16.5047 24.4569 16.9963C24.4569 17.5026 24.427 18.0573 24.3677 18.6603C24.3081 19.2634 24.1962 19.8221 24.0327 20.3358C23.869 20.8496 23.6345 21.2818 23.3297 21.6312C23.0243 21.9816 22.6268 22.1562 22.1356 22.1562C21.6444 22.1562 21.2423 21.9816 20.9301 21.6312C20.9047 21.603 20.8807 21.5734 20.8563 21.5439C20.8002 21.7093 20.7377 21.8714 20.6661 22.0283C20.3394 22.7431 19.8935 23.3462 19.3292 23.8377C19.1314 24.0098 18.921 24.167 18.6997 24.3109C18.8832 24.448 19.0758 24.5752 19.2782 24.6917C20.0668 25.1459 21.0193 25.3731 22.1356 25.3731C23.2514 25.3731 24.2002 25.1459 24.9815 24.6917C25.7631 24.2378 26.3989 23.6272 26.8902 22.86C27.3814 22.0934 27.7385 21.2035 27.9618 20.1906C28.1849 19.1781 28.2968 18.1131 28.2968 16.9963C28.2968 15.8792 28.1849 14.8179 27.9618 13.8129C27.7385 12.8077 27.3814 11.9291 26.8902 11.1769Z" fill="#1862DA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4838 10.0452C13.4838 10.0452 12.0165 10.8127 10.7711 9.90114C10.7148 9.86008 10.6605 9.81656 10.6032 9.77647C10.0871 9.41327 9.5013 9.14434 8.84567 8.96989C8.18976 8.79572 7.51511 8.7085 6.82267 8.7085C6.17371 8.7085 5.54002 8.79206 4.92091 8.95874C4.30207 9.12564 3.73061 9.37199 3.20752 9.69853C2.68419 10.0248 2.23097 10.4312 1.84761 10.9169C1.46449 11.4033 1.17691 11.9725 0.985352 12.6253L4.43463 13.4086C4.55238 12.8862 4.8069 12.4696 5.19767 12.1574C5.58793 11.8457 6.04882 11.6897 6.57929 11.6897C7.09522 11.6897 7.55213 11.8357 7.95008 12.1275C8.34802 12.4193 8.5472 12.8428 8.5472 13.3974C8.5472 13.7769 8.46971 14.0835 8.31515 14.317C8.16041 14.5507 7.95378 14.7368 7.69604 14.8753C7.43785 15.0142 7.14656 15.109 6.82267 15.16C6.4981 15.211 6.15913 15.2365 5.80567 15.2365H4.72224V17.8912H5.71703C6.10016 17.8912 6.48352 17.9238 6.86665 17.9891C7.24973 18.0545 7.59264 18.1633 7.89476 18.3156C8.17915 18.459 8.40946 18.6524 8.58967 18.8924C8.64201 18.1905 8.79556 17.5409 9.05398 16.9447C9.3781 16.1979 9.79776 15.4399 10.3132 14.6707" fill="#1862DA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.9849 22.0823C8.84264 21.7735 8.73393 21.4476 8.65461 21.1067C8.64433 21.1276 8.63651 21.1504 8.62549 21.1705C8.48638 21.4227 8.31084 21.6266 8.09932 21.7822C7.8873 21.9376 7.64588 22.0525 7.37557 22.1268C7.10476 22.2013 6.83815 22.2378 6.57493 22.2378C5.87322 22.2378 5.29562 22.0416 4.84268 21.6487C4.38924 21.2562 4.08955 20.8004 3.94338 20.2812L0.522461 21.1928C0.726904 21.9344 1.03394 22.5679 1.44355 23.094C1.85268 23.6203 2.33159 24.0503 2.87979 24.3837C3.42823 24.7171 4.03446 24.9653 4.70019 25.1284C5.36515 25.2915 6.04876 25.3732 6.75047 25.3732C7.46663 25.3732 8.17228 25.2732 8.86686 25.0733C9.54654 24.8777 10.1594 24.5823 10.7064 24.1875C10.5656 24.085 10.4292 23.9765 10.2985 23.8611C9.74417 23.3718 9.30613 22.7792 8.9849 22.0823Z" fill="#1862DA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.104 17.041C13.6979 17.041 12.558 18.1809 12.558 19.5869C12.558 20.9932 13.6979 22.133 15.104 22.133C16.51 22.133 17.6499 20.9932 17.6499 19.5869C17.6499 18.1809 16.51 17.041 15.104 17.041Z" fill="#1862DA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.6855 7.88866C28.9783 7.88866 28.4027 8.46397 28.4027 9.17145C28.4027 9.87869 28.9783 10.4542 29.6855 10.4542C30.393 10.4542 30.9683 9.87869 30.9683 9.17145C30.9683 8.46397 30.393 7.88866 29.6855 7.88866ZM29.6855 11.486C28.4091 11.486 27.371 10.4476 27.371 9.17145C27.371 7.89533 28.4091 6.85693 29.6855 6.85693C30.9619 6.85693 32 7.89533 32 9.17145C32 10.4476 30.9619 11.486 29.6855 11.486Z" fill="#1862DA"/>
+</svg>
--- a/src/drivers/webextension/images/icons/Zakra.png
+++ b/src/drivers/webextension/images/icons/Zakra.png
--- a/src/drivers/webextension/images/icons/route.png
+++ b/src/drivers/webextension/images/icons/route.png
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@ -1282,6 +1282,60 @@
    ],
    "website": "https://colorlib.com/wp/themes/activello"
  },
+  "Colibri WP": {
+    "cats": [
+      80,
+      51
+    ],
+    "description": "Colibri WP is a drag-and-drop WordPress website builder.",
+    "icon": "Colibri WP.png",
+    "requires": "WordPress",
+    "dom": "link[href*='/wp-content/plugins/colibri-page-builder']",
+    "js": {
+      "Colibri": "",
+      "colibriFrontendData": "",
+      "colibriData": ""
+    },
+    "scriptSrc": "/wp-content/plugins/colibri-page-builder.+\\.js(?:.+ver=([\\d\\.\\-\\w]+))?\\;version:\\1",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring",
+      "onetime"
+    ],
+    "website": "https://colibriwp.com"
+  },
+  "Colorlib Travelify": {
+    "cats": [
+      80
+    ],
+    "description": "Colorlib Travelify is a responsive, free, travel WordPress theme.",
+    "icon": "Colorlib.png",
+    "requires": "WordPress",
+    "dom": "link#travelify-style-css",
+    "js": {
+      "travelify_slider_value": ""
+    },
+    "scriptSrc": "/wp-content/themes/travelify/",
+    "pricing": [
+      "freemium"
+    ],
+    "website": "https://colorlib.com/wp/themes/travelify"
+  },
+  "Colorlib Sparkling": {
+    "cats": [
+      80
+    ],
+    "description": "Colorlib Sparkling is a clean, modern, flat design WordPress theme developed using Bootstrap.",
+    "icon": "Colorlib.png",
+    "requires": "WordPress",
+    "dom": "link#sparkling-style-css",
+    "scriptSrc": "/wp-content/themes/sparkling/",
+    "pricing": [
+      "freemium"
+    ],
+    "website": "https://colorlib.com/wp/themes/sparkling"
+  },
  "Colorlib Illdy": {
    "cats": [
      80
--- a/src/technologies/g.json
+++ b/src/technologies/g.json
@ -652,6 +652,16 @@
    "saas": true,
    "website": "https://www.godaddy.com/websites/website-builder"
  },
+  "GoDaddy Lyrical": {
+    "cats": [
+      80
+    ],
+    "description": "GoDaddy Lyrical is a GoDaddy Primer child theme with a focus on photography and beautiful fonts.",
+    "icon": "GoDaddy.svg",
+    "requires": "WordPress",
+    "excludes": "GoDaddy Primer",
+    "dom": "link[href*='/wp-content/themes/lyrical/']",
+  },
  "GoDaddy Uptown Style": {
    "cats": [
      80
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@ -146,6 +146,21 @@
    "scriptSrc": "haravan.*\\.js",
    "website": "https://www.haravan.com"
  },
+  "HashThemes Total": {
+    "cats": [
+      80
+    ],
+    "description": "HashThemes Total is the powerful and creative multipurpose WordPress theme.",
+    "icon": "HashThemes.png",
+    "requires": "WordPress",    
+    "scriptSrc": "/wp-content/themes/(?:t|T)otal(?:-plus)?/",
+    "pricing": [
+      "freemium",
+      "onetime",
+      "low"
+    ],
+    "website": "https://hashthemes.com/wordpress-theme/total"
+  },
  "Haskell": {
    "cats": [
      27
--- a/src/technologies/l.json
+++ b/src/technologies/l.json
@ -348,6 +348,25 @@
    "scriptSrc": "lightbox(?:-plus-jquery)?.{0,32}\\.js",
    "website": "http://lokeshdhakar.com/projects/lightbox2/"
  },
+  "Lightning": {
+    "cats": [
+      80
+    ],
+    "description": "Lightning is a very simple and easy to customize WordPress theme which is based on the Bootstrap.",
+    "icon": "Lightning.png",
+    "requires": "WordPress",
+    "dom": "link[href*='/wp-content/themes/lightning/'], link[href*='/wp-content/themes/lightning-pro/']",
+    "js": {
+      "lightningOpt.header_scrool": ""
+    },
+    "scriptSrc": "/wp-content/themes/lightning(?:-pro)?/.+lightning\\.min\\.js(?:.+ver=([\\d\\.]+))?\\;version:\\1",
+    "pricing": [
+      "freemium",
+      "mid",
+      "recurring"
+    ],
+    "website": "https://lightning.vektor-inc.co.jp/en/"
+  },
  "Lightspeed eCom": {
    "cats": [
      6
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@ -1525,6 +1525,26 @@
    ],
    "website": "https://pressable.com"
  },
+  "PressMaximum Customify": {
+    "cats": [
+      80
+    ],
+    "description": "PressMaximum Customify is lightweight, responsive and flexible multipurpose WordPress theme.",
+    "icon": "PressMaximum.png",
+    "requires": "WordPress",
+    "js": {
+      "Customify": "",
+      "customify_is_mobile": "",
+      "Customify_JS": ""
+    },
+    "scriptSrc": "/wp-content/themes/customify/.+theme\\.min\\.js(?:.+ver=([\\d\\.]+))?\\;version:\\1",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "website": "https://pressmaximum.com/customify"
+  },
  "PrestaShop": {
    "cats": [
      6
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@ -52,6 +52,18 @@
    },
    "website": "https://github.com/ruby/rdoc"
  },
+  "Route": {
+    "cats": [
+      19
+    ],
+    "description": "Route is a delivery and shipping tracking app",
+    "icon": "route.png",
+    "js": {
+      "Routeapp": ""
+    },
+    "scriptSrc": "//cdn.routeapp.io/",
+    "website": "https://route.com/"
+  },
  "RTB House": {
    "cats": [
      77
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@ -1962,6 +1962,23 @@
    "scriptSrc": "widget\\.siteminder\\.com",
    "website": "https://www.siteminder.com"
  },
+
+  "Site Search 360": {
+    "cats": [
+      29
+    ],
+    "description": "Site Search 360 is a site search as a service solution.",
+    "icon": "Site Search 360.svg",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "js": {
+      "ss360Config": ""
+    },
+    "website": "https://www.sitesearch360.com/"
+  },
  "SiteOrigin Vantage": {
    "cats": [
     80
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@ -40,6 +40,27 @@
    "url": "\\/zabbix\\/\\;confidence:30",
    "website": "http://zabbix.com"
  },
+  "Zakra": {
+    "cats": [
+      80
+    ],
+    "description": "Zakra is flexible, fast, lightweight and modern multipurpose WordPress theme that comes with many starter free sites.",
+    "icon": "Zakra.png",
+    "requires": "WordPress",
+    "dom": "link#zakra-style-css",
+    "js": {
+      "zakraFrontend": "",
+      "zakraNavHelper.dimension": ""
+    },
+    "scriptSrc": "/wp-content/themes/zakra/",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring",
+      "onetime"
+    ],
+    "website": "https://zakratheme.com"
+  },
  "Zanox": {
    "cats": [
      36