is-antibot 2.0.3 → 2.0.5

package/package.json

@@ -2,7 +2,7 @@
   "name": "is-antibot",
   "description": "Detect antibot protection from 30+ providers — Cloudflare, Akamai, DataDome, PerimeterX, Kasada, Imperva, reCAPTCHA, hCaptcha, Turnstile, and more.",
   "homepage": "https://antibot.microlink.io/",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "exports": {
     ".": "./src/index.js",
     "./providers.json": "./src/providers.json",
@@ -72,7 +72,7 @@
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
-    "ava": "latest",
+    "ava": "7",
     "browser-sync": "latest",
     "c8": "latest",
     "ci-publish": "latest",

package/src/index.js

@@ -176,6 +176,7 @@ const createRegExp = (pattern, flags = '') => new RegExp(pattern, flags)
 const createCompiledDetection = (detection, matches) => ({
   type: detection.type,
   domain: detection.domain,
+  domainWithoutSuffix: detection.domainWithoutSuffix,
   matches
 })
 
@@ -259,8 +260,19 @@ const DETECTION_COMPILERS = {
   }
 }
 
-const compileDetection = detection =>
-  DETECTION_COMPILERS[detection.type](detection)
+const compileDetection = detection => {
+  const compiled = DETECTION_COMPILERS[detection.type](detection)
+  const statusCodes = detection.statusCodes
+  if (!Array.isArray(statusCodes) || statusCodes.length === 0) {
+    return compiled
+  }
+  const allowed = new Set(statusCodes)
+  const innerMatches = compiled.matches
+  return {
+    ...compiled,
+    matches: context => allowed.has(context.statusCode) && innerMatches(context)
+  }
+}
 
 const compileProviders = ({ providers = [] } = {}) =>
   providers.map(provider => ({
@@ -285,7 +297,13 @@ const detectWithProviders = (
   const headerNames = getHeaderNames(headers)
   const hasUrl = Boolean(url)
 
-  let domain
+  let parsedUrl
+  const getParsedUrl = () => {
+    if (!hasUrl) return null
+    if (!parsedUrl) parsedUrl = parseUrl(url)
+    return parsedUrl
+  }
+
   const context = {
     getHeader,
     headerNames,
@@ -297,10 +315,16 @@ const detectWithProviders = (
 
   for (const provider of compiledProviders) {
     for (const detection of provider.detections) {
-      if (detection.domain) {
-        if (!hasUrl) continue
-        if (domain === undefined) domain = parseUrl(url).domain
-        if (detection.domain !== domain) continue
+      if (detection.domain || detection.domainWithoutSuffix) {
+        const parsed = getParsedUrl()
+        if (!parsed) continue
+        if (detection.domain && detection.domain !== parsed.domain) continue
+        if (
+          detection.domainWithoutSuffix &&
+          detection.domainWithoutSuffix !== parsed.domainWithoutSuffix
+        ) {
+          continue
+        }
       }
       if (!detection.matches(context)) continue
       return createResult(

package/src/providers.json

@@ -686,6 +686,31 @@
         }
       ]
     },
+    {
+      "name": "amazon",
+      "detections": [
+        {
+          "type": "headers",
+          "domainWithoutSuffix": "amazon",
+          "statusCodes": [500],
+          "rules": [
+            {
+              "header": "x-cache",
+              "startsWith": "Error from cloudfront"
+            }
+          ]
+        },
+        {
+          "type": "html",
+          "domainWithoutSuffix": "amazon",
+          "rules": [
+            {
+              "contains": "csm-captcha-instrumentation"
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "anubis",
       "detections": [

package/src/schema.json

@@ -57,6 +57,18 @@
           "type": "string",
           "description": "When set, this detection only applies if the request URL's registrable domain matches (e.g. 'reddit.com')."
         },
+        "domainWithoutSuffix": {
+          "type": "string",
+          "description": "When set, this detection only applies if the request URL's registrable domain without public suffix matches (e.g. 'amazon' for amazon.es, amazon.co.uk, amazon.com)."
+        },
+        "statusCodes": {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          },
+          "minItems": 1,
+          "description": "When set, the detection matches only if the response status code equals one of these values (AND with the detection's rules)."
+        },
         "rules": {
           "type": "array",
           "minItems": 1,