Merge pull request #109 from fingerprintjs/dev

Updates for pro agent (#108)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fingerprintjs/botd",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "botd is a browser library for JavaScript bot detection",
   "keywords": [
     "bot",

playground/index.html

@@ -31,7 +31,9 @@
       <div id="result-text">Detecting...</div>
     </div>
     <div id="error-container" class="medium-container">
-      <pre id="error-message">Lorem ipsum dolor sit amet consectetur adipisicing elit. Reiciendis, suscipit assumenda dicta, iste, eius possimus sunt asperiores debitis quam voluptatum deleniti obcaecati facere nisi deserunt reprehenderit nobis sapiente explicabo non.</pre>
+      <pre id="error-message">
+Lorem ipsum dolor sit amet consectetur adipisicing elit. Reiciendis, suscipit assumenda dicta, iste, eius possimus sunt asperiores debitis quam voluptatum deleniti obcaecati facere nisi deserunt reprehenderit nobis sapiente explicabo non.</pre
+      >
     </div>
     <div class="medium-container content-card">
       <div class="logs-top-bar">

playground/style.css

@@ -3,10 +3,9 @@
   --accent-dark-color: rgb(140, 39, 3);
   --error-color: #b3261e;
   --font-family: 'Fira Mono', monospace;
-  --font-family-consolas: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  --font-family-consolas: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
 }
 
-
 body {
   width: 100%;
   height: 100%;
@@ -27,7 +26,6 @@ body {
   box-sizing: border-box;
 }
 
-
 .container {
   width: calc(100% - 128px);
   max-width: 1536px;
@@ -90,15 +88,15 @@ body {
     margin-top: 32px;
   }
 
-  #navbar .logo  {
+  #navbar .logo {
     margin-top: 0;
     width: 256px;
   }
 
   #navbar #navbar-chevron {
     transform: rotate(90deg);
   }
-  
+
   #navbar #playground-actions {
     margin-left: 0;
     margin: 32px 0px;
@@ -139,14 +137,15 @@ h2 {
   transition: 0.15s;
 }
 
-.github-card:active, .github-card:focus {
+.github-card:active,
+.github-card:focus {
   background-color: rgba(0, 0, 0, 0.12);
   transition: 0.15s;
 }
 
 .github-card::before {
   display: block;
-  content: "";
+  content: '';
   width: 32px;
   height: 32px;
   background-image: url(../resources/github_icon.svg);
@@ -177,7 +176,6 @@ h2 {
   font-weight: 600;
 }
 
-
 .orange-button {
   background-color: var(--accent-color);
   color: #fff;
@@ -190,11 +188,15 @@ h2 {
   background-color: transparent;
 }
 
-.orange-button:hover, .orange-button:active, .orange-button:focus {
+.orange-button:hover,
+.orange-button:active,
+.orange-button:focus {
   background-color: var(--accent-dark-color);
 }
 
-.orange-button-outlined:hover, .orange-button-outlined:active, .orange-button-outlined:focus {
+.orange-button-outlined:hover,
+.orange-button-outlined:active,
+.orange-button-outlined:focus {
   background-color: rgba(240, 68, 5, 0.12);
 }
 
@@ -208,7 +210,6 @@ h2 {
   padding: var(--content-card-padding);
 }
 
-
 #result {
   overflow: hidden;
   margin: 96px auto;
@@ -219,7 +220,6 @@ h2 {
   --bot-icon-url: url(../resources/robot-off-outline.svg);
 }
 
-
 .result-detected {
   --bot-icon-color: #f44336 !important;
   --bot-icon-url: url(../resources/robot-outline.svg) !important;
@@ -230,7 +230,6 @@ h2 {
   --bot-icon-url: url(../resources/alert-circle-outline.svg) !important;
 }
 
-
 .result-bot-icon-container {
   width: 128px;
   height: 128px;
@@ -241,7 +240,7 @@ h2 {
 }
 
 .result-bot-icon-container::before {
-  content: "";
+  content: '';
   display: block;
   background-color: var(--bot-icon-color);
   opacity: 0.08;
@@ -276,7 +275,6 @@ h2 {
   transition: 0.2s color;
 }
 
-
 .logs-content {
   background-color: #282c34;
   color: #fff;

src/detectors/document_element_keys.ts

@@ -0,0 +1,9 @@
+import { BotKind, ComponentDict, DetectorResponse, State } from '../types'
+import { includes } from '../utils/misc'
+
+export function detectDocumentAttributes({ documentElementKeys }: ComponentDict): DetectorResponse {
+  if (documentElementKeys.state !== State.Success) return false
+  if (includes(documentElementKeys.value, 'selenium', 'webdriver', 'driver')) {
+    return BotKind.Selenium
+  }
+}

src/detectors/index.ts

@@ -1,5 +1,5 @@
 import { detectAppVersion } from './app_version'
-import { detectDocumentAttributes } from './document_attributes'
+import { detectDocumentAttributes } from './document_element_keys'
 import { detectDocumentProperties } from './document_properties'
 import { detectErrorTrace } from './error_trace'
 import { detectEvalLengthInconsistency } from './eval_length'

src/sources/document_element_keys.ts

@@ -0,0 +1,12 @@
+import { BotdError, State } from '../types'
+
+export default function getDocumentElementKeys(): string[] {
+  if (document.documentElement === undefined) {
+    throw new BotdError(State.Undefined, 'document.documentElement is undefined')
+  }
+  const { documentElement } = document
+  if (typeof documentElement.getAttributeNames !== 'function') {
+    throw new BotdError(State.NotFunction, 'document.documentElement.getAttributeNames is not a function')
+  }
+  return documentElement.getAttributeNames()
+}

src/sources/index.ts

@@ -1,25 +1,18 @@
 import getAppVersion from './app_version'
-import getDeviceMemory from './device_memory'
-import getDocumentAttributes from './document_element_attributes'
+import getDocumentElementKeys from './document_element_keys'
 import getDocumentProperties from './document_properties'
 import getErrorTrace from './error_trace'
 import getEvalLength from './eval_length'
 import getFunctionBind from './function_bind'
-import getHardwareConcurrency from './hardware_concurrency'
 import getLanguages from './languages'
 import areMimeTypesConsistent from './mime_types_consistence'
 import getNotificationPermissions from './notification_permissions'
-import getOsCpu from './os_cpu'
-import getPlatform from './platform'
 import getPluginsArray from './plugins_array'
 import getPluginsLength from './plugins_length'
 import getProcess, { ProcessPayload } from './process'
 import getProductSub from './product_sub'
 import getRTT from './rtt'
-import getScreenResolution from './screen_resolution'
-import getTouchSupport from './touch_support'
 import getUserAgent from './user_agent'
-import getVendor from './vendor'
 import getWebDriver from './webdriver'
 import getWebGL from './webgl'
 import getWindowExternal from './window_external'
@@ -42,18 +35,11 @@ export const sources = {
   webDriver: getWebDriver,
   languages: getLanguages,
   notificationPermissions: getNotificationPermissions,
-  documentAttributes: getDocumentAttributes,
+  documentElementKeys: getDocumentElementKeys,
   functionBind: getFunctionBind,
   process: getProcess,
   documentProps: getDocumentProperties,
   windowProps: getWindowProperties,
-  osCpu: getOsCpu,
-  deviceMemory: getDeviceMemory,
-  screenResolution: getScreenResolution,
-  hardwareConcurrency: getHardwareConcurrency,
-  platform: getPlatform,
-  touchSupport: getTouchSupport,
-  vendor: getVendor,
 }
 
 export { WindowSizePayload, ProcessPayload }

src/sources/languages.ts

@@ -13,7 +13,7 @@ export default function getLanguages(): string[][] {
   if (Array.isArray(n.languages)) {
     const browserEngine = getBrowserEngineKind()
     // Starting from Chromium 86, there is only a single value in `navigator.language` in Incognito mode:
-    // the value of `navigator.language`. Therefore the value is ignored in this browser.
+    // the value of `navigator.language`. Therefore, the value is ignored in this browser.
     if (!(browserEngine === BrowserEngineKind.Chromium && isChromium86OrNewer())) {
       result.push(n.languages)
     }