perimeterx-js-core 0.10.0 → 0.12.0

package/lib/cjs/impl/hash/SubtleCryptoHashUtils.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -60,7 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubtleCryptoHashUtils = void 0;
-var crypto = __importStar(require("crypto"));
 var utils_1 = require("../../utils");
 var SubtleCryptoHashUtils = /** @class */ (function () {
     function SubtleCryptoHashUtils(subtleCrypto) {
@@ -74,7 +50,7 @@ var SubtleCryptoHashUtils = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         textUint8 = new TextEncoder().encode(text);
-                        return [4 /*yield*/, this.subtle.digest(this.convertAlgo(algo), textUint8)];
+                        return [4 /*yield*/, this.subtle.digest((0, utils_1.algoToSubtleCryptoString)(algo), textUint8)];
                     case 1:
                         hashBuffer = _a.sent();
                         hashArray = Array.from(new Uint8Array(hashBuffer));
@@ -83,13 +59,6 @@ var SubtleCryptoHashUtils = /** @class */ (function () {
             });
         });
     };
-    SubtleCryptoHashUtils.prototype.convertAlgo = function (algo) {
-        switch (algo) {
-            case utils_1.Algorithm.SHA256:
-            default:
-                return 'SHA-256';
-        }
-    };
     return SubtleCryptoHashUtils;
 }());
 exports.SubtleCryptoHashUtils = SubtleCryptoHashUtils;

package/lib/cjs/impl/hmac/CryptoHmacUtils.js

@@ -32,16 +32,11 @@ var CryptoHmacUtils = /** @class */ (function () {
         this.crypto = cryptoModule;
     }
     CryptoHmacUtils.prototype.createHmac = function (algo, payload, secret) {
-        switch (algo) {
-            case utils_1.Algorithm.SHA256:
-                var hmac = this.crypto.createHmac('sha256', secret);
-                hmac.setEncoding('hex');
-                hmac.write(payload);
-                hmac.end();
-                return hmac.read();
-            default:
-                return '';
-        }
+        var hmac = this.crypto.createHmac((0, utils_1.algoToCryptoString)(algo), secret);
+        hmac.setEncoding('hex');
+        hmac.write(payload);
+        hmac.end();
+        return hmac.read();
     };
     return CryptoHmacUtils;
 }());

package/lib/cjs/impl/hmac/SubtleCryptoHmacUtils.js

@@ -0,0 +1,72 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubtleCryptoHmacUtils = void 0;
+var utils_1 = require("../../utils");
+var SubtleCryptoHmacUtils = /** @class */ (function () {
+    function SubtleCryptoHmacUtils(subtleCrypto) {
+        if (subtleCrypto === void 0) { subtleCrypto = crypto.subtle; }
+        this.subtle = subtleCrypto;
+    }
+    SubtleCryptoHmacUtils.prototype.createHmac = function (algo, payload, secret) {
+        return __awaiter(this, void 0, void 0, function () {
+            var encodedStr, encodedPassword, importedKey, signature;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        encodedStr = new TextEncoder().encode(payload);
+                        encodedPassword = new TextEncoder().encode(secret);
+                        return [4 /*yield*/, this.subtle.importKey('raw', encodedPassword, { name: 'HMAC', hash: { name: (0, utils_1.algoToSubtleCryptoString)(algo) } }, false, ['sign'])];
+                    case 1:
+                        importedKey = _a.sent();
+                        return [4 /*yield*/, this.subtle.sign({ name: 'HMAC' }, importedKey, encodedStr)];
+                    case 2:
+                        signature = _a.sent();
+                        return [2 /*return*/, this.bufferToHex(signature)];
+                }
+            });
+        });
+    };
+    SubtleCryptoHmacUtils.prototype.bufferToHex = function (buffer) {
+        return Array.prototype.map
+            .call(new Uint8Array(buffer), function (x) { return ('00' + x.toString(16)).slice(-2); })
+            .join('');
+    };
+    return SubtleCryptoHmacUtils;
+}());
+exports.SubtleCryptoHmacUtils = SubtleCryptoHmacUtils;

package/lib/cjs/impl/http/phin/PhinIncomingResponse.js

@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PhinIncomingResponse = void 0;
 var http_1 = require("../../../http");
+var DefaultUrlUtils_1 = require("../../url/DefaultUrlUtils");
 var PhinIncomingResponse = /** @class */ (function () {
     function PhinIncomingResponse(response) {
         this.status = response.statusCode;
@@ -67,9 +68,11 @@ var PhinIncomingResponse = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _b = (_a = http_1.URLUtils).parseSearchParams;
+                        _b = (_a = new DefaultUrlUtils_1.DefaultUrlUtils()).createUrlSearchParams;
                         return [4 /*yield*/, this.text()];
-                    case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+                    case 1: 
+                    // Using DefaultUrlUtils since Phin safely assumes Node.js environment
+                    return [2 /*return*/, _b.apply(_a, [_c.sent()])];
                 }
             });
         });

package/lib/cjs/impl/url/CustomImplUrlUtils.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomImplUrlUtils = void 0;
+var utils_1 = require("../../utils");
+var UrlImpl_1 = require("./UrlImpl");
+var UrlSearchParamsImpl_1 = require("./UrlSearchParamsImpl");
+var CustomImplUrlUtils = /** @class */ (function () {
+    function CustomImplUrlUtils() {
+    }
+    CustomImplUrlUtils.prototype.createUrl = function (rawUrl) {
+        return new UrlImpl_1.UrlImpl(rawUrl);
+    };
+    CustomImplUrlUtils.prototype.createUrlSearchParams = function (params) {
+        return new UrlSearchParamsImpl_1.UrlSearchParamsImpl(this, params);
+    };
+    CustomImplUrlUtils.prototype.decodeUriComponent = function (uriComponent) {
+        // https://www.npmjs.com/package/as-uri-encode-decode
+        // Note: Does not work well with multibyte characters
+        var result = '';
+        for (var i = 0; i < uriComponent.length; i++) {
+            if (uriComponent.charAt(i) === '+') {
+                result += ' ';
+                continue;
+            }
+            if (uriComponent.charAt(i) === '%' &&
+                uriComponent.charAt(i + 1) !== '%' &&
+                uriComponent.charAt(i + 2) !== '%') {
+                var charCode = parseInt(uriComponent.charAt(i + 1) + uriComponent.charAt(i + 2), 16);
+                var char = String.fromCharCode(charCode);
+                result += char;
+                i += 2;
+                continue;
+            }
+            result += uriComponent.charAt(i);
+        }
+        return result;
+    };
+    CustomImplUrlUtils.prototype.encodeUriComponent = function (uriComponent) {
+        // https://www.npmjs.com/package/as-uri-encode-decode
+        // Note: Does not work well with multibyte characters
+        var result = '';
+        for (var i = 0; i < uriComponent.length; i++) {
+            var c = uriComponent.charAt(i);
+            if (this.isSafe(c)) {
+                result += c;
+            }
+            else {
+                result += '%' + c.charCodeAt(0).toString(16).toUpperCase();
+            }
+        }
+        return result;
+    };
+    CustomImplUrlUtils.prototype.encodeUri = function (uri) {
+        throw new utils_1.EnforcerError('method not implemented: CustomImplUrlUtils.encodeUri()');
+    };
+    CustomImplUrlUtils.prototype.decodeUri = function (uri) {
+        throw new utils_1.EnforcerError('method not implemented: CustomImplUrlUtils.decodeUri()');
+    };
+    CustomImplUrlUtils.prototype.isSafe = function (c) {
+        return ((c >= 'a' && c <= 'z') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c >= '0' && c <= '9') ||
+            c == '-' ||
+            c == '_' ||
+            c == '.' ||
+            c == '*' ||
+            c == '!');
+    };
+    return CustomImplUrlUtils;
+}());
+exports.CustomImplUrlUtils = CustomImplUrlUtils;

package/lib/cjs/impl/url/DefaultUrlUtils.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultUrlUtils = void 0;
+var DefaultUrlUtils = /** @class */ (function () {
+    function DefaultUrlUtils() {
+    }
+    DefaultUrlUtils.prototype.createUrl = function (rawUrl) {
+        return new URL(rawUrl);
+    };
+    DefaultUrlUtils.prototype.createUrlSearchParams = function (params) {
+        return new URLSearchParams(params);
+    };
+    DefaultUrlUtils.prototype.decodeUriComponent = function (uriComponent) {
+        return decodeURIComponent(uriComponent);
+    };
+    DefaultUrlUtils.prototype.encodeUriComponent = function (uriComponent) {
+        return encodeURIComponent(uriComponent);
+    };
+    DefaultUrlUtils.prototype.decodeUri = function (uri) {
+        return decodeURI(uri);
+    };
+    DefaultUrlUtils.prototype.encodeUri = function (uri) {
+        return encodeURI(uri);
+    };
+    return DefaultUrlUtils;
+}());
+exports.DefaultUrlUtils = DefaultUrlUtils;

package/lib/cjs/{http/utils → impl/url}/UrlImpl.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UrlImpl = void 0;
 var utils_1 = require("../../utils");
-var URLUtils_1 = require("./URLUtils");
+var UrlSearchParamsImpl_1 = require("./UrlSearchParamsImpl");
+var CustomImplUrlUtils_1 = require("./CustomImplUrlUtils");
 var UrlImpl = /** @class */ (function () {
     function UrlImpl(rawUrl) {
         var match = rawUrl.match(utils_1.URL_REGEX);
@@ -56,7 +57,7 @@ var UrlImpl = /** @class */ (function () {
     });
     Object.defineProperty(UrlImpl.prototype, "searchParams", {
         get: function () {
-            return URLUtils_1.URLUtils.parseSearchParams(this.search);
+            return new UrlSearchParamsImpl_1.UrlSearchParamsImpl(new CustomImplUrlUtils_1.CustomImplUrlUtils(), this.search);
         },
         enumerable: false,
         configurable: true

package/lib/cjs/{http/utils → impl/url}/UrlSearchParamsImpl.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UrlSearchParamsImpl = void 0;
-// This file is based on the implementation found here:
-// https://github.com/pinglu85/BFEdevSolutions/blob/main/Coding-Problems/80.implement-your-own-URLSearchParams.md
-var URLUtils_1 = require("./URLUtils");
 var UrlSearchParamsImpl = /** @class */ (function () {
-    function UrlSearchParamsImpl(init) {
+    function UrlSearchParamsImpl(urlUtils, init) {
+        this.urlUtils = urlUtils;
         this._searchParamsArray = [];
         this._searchParamsMap = new Map();
         if (init) {
@@ -57,18 +55,19 @@ var UrlSearchParamsImpl = /** @class */ (function () {
             this.append(name, value);
             return;
         }
-        name = URLUtils_1.URLUtils.decodeUriComponent(name);
-        value = URLUtils_1.URLUtils.decodeUriComponent(value);
+        name = this.urlUtils.decodeUriComponent(name);
+        value = this.urlUtils.decodeUriComponent(value);
         this._searchParamsMap.set(name, [value]);
         var searchParamIdx = this._searchParamsArray.findIndex(function (param) { return param[0] === name; });
         this._searchParamsArray[searchParamIdx][1] = value;
         this._searchParamsArray = this._searchParamsArray.filter(function (param, idx) { return param[0] !== name || idx === searchParamIdx; });
     };
     UrlSearchParamsImpl.prototype.toString = function () {
+        var _this = this;
         return this._searchParamsArray
             .map(function (_a) {
             var key = _a[0], value = _a[1];
-            return "".concat(URLUtils_1.URLUtils.encodeUriComponent(key), "=").concat(URLUtils_1.URLUtils.encodeUriComponent(value));
+            return "".concat(_this.urlUtils.encodeUriComponent(key), "=").concat(_this.urlUtils.encodeUriComponent(value));
         })
             .join('&');
     };
@@ -108,8 +107,8 @@ var UrlSearchParamsImpl = /** @class */ (function () {
         }
     };
     UrlSearchParamsImpl.prototype._saveParam = function (key, value) {
-        key = URLUtils_1.URLUtils.decodeUriComponent(key);
-        value = URLUtils_1.URLUtils.decodeUriComponent(value);
+        key = this.urlUtils.decodeUriComponent(key);
+        value = this.urlUtils.decodeUriComponent(value);
         this._searchParamsArray.push([key, value]);
         this._storeParamInSearchParamsMap(key, value);
     };

package/lib/cjs/logger/HttpLogServiceClient.js

@@ -84,15 +84,14 @@ var HttpLogServiceClient = /** @class */ (function () {
         });
     };
     HttpLogServiceClient.prototype.enrichLogRecord = function (context, log) {
-        var requestData = context.requestData;
-        var url = http_1.URLUtils.parseURL(requestData.rawUrl);
+        var _a = context.requestData, method = _a.method, url = _a.url, rawUrl = _a.rawUrl;
         var logMeta = {
             container: 'enforcer',
             appID: this.appId,
-            method: requestData.method,
+            method: method,
             host: url.host,
-            url: requestData.rawUrl,
-            path: url.pathname + requestData.url.search,
+            url: rawUrl,
+            path: url.pathname + url.search,
             requestId: context.requestId,
         };
         if (this.remoteConfigId && this.remoteConfigVersion) {

package/lib/cjs/phase/flow/EnforceFlow.js

@@ -29,7 +29,10 @@ var EnforceFlow = /** @class */ (function (_super) {
             new impl_1.RiskApiPhase(config, products, riskApiClient),
             new impl_1.AdditionalActivityHandlerPhase(config),
             new impl_1.SendAsyncActivitiesOnRequestPhase(activityClient),
-            new impl_1.CreateBlockResponsePhase(config, (_b = {}, _b[products_1.ProductName.BOT_DEFENDER] = products[products_1.ProductName.BOT_DEFENDER], _b), cors),
+            new impl_1.CreateBlockResponsePhase(config, (_b = {},
+                _b[products_1.ProductName.BOT_DEFENDER] = products[products_1.ProductName.BOT_DEFENDER],
+                _b[products_1.ProductName.HYPE_SALE_CHALLENGE] = products[products_1.ProductName.HYPE_SALE_CHALLENGE],
+                _b), cors),
             new impl_1.ModifyIncomingRequestPhase(Object.values(products)),
         ]) || this;
     }

package/lib/cjs/phase/impl/DecideActionPhase.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecideActionPhase = void 0;
 var logger_1 = require("../../logger");
 var action_1 = require("../../action");
+var blocker_1 = require("../../blocker");
 var DecideActionPhase = /** @class */ (function () {
     function DecideActionPhase(config) {
         this.config = config;
@@ -59,10 +60,17 @@ var DecideActionPhase = /** @class */ (function () {
                 }
                 context.action = action;
                 context.reasons = reasons;
+                this.modifyBlockActionIfNeeded(context);
                 return [2 /*return*/];
             });
         });
     };
+    DecideActionPhase.prototype.modifyBlockActionIfNeeded = function (context) {
+        var isHypeSaleChallengeBlock = context.reasons.hsc && (context.action === action_1.Action.BLOCK || context.action === action_1.Action.SIMULATED_BLOCK);
+        if (isHypeSaleChallengeBlock) {
+            context.blockAction = blocker_1.BlockAction.HYPE_SALE_CHALLENGE;
+        }
+    };
     return DecideActionPhase;
 }());
 exports.DecideActionPhase = DecideActionPhase;

package/lib/cjs/phase/impl/EnrichContextFromRequestPhase.js

@@ -75,10 +75,10 @@ var EnrichContextFromRequestPhase = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.addGraphQLDataToContext(context)];
                     case 2:
                         _a.sent();
-                        return [4 /*yield*/, this.addProductDataToContext(context)];
+                        return [4 /*yield*/, this.addCustomParametersToContext(context)];
                     case 3:
                         _a.sent();
-                        return [4 /*yield*/, this.addCustomParametersToContext(context)];
+                        return [4 /*yield*/, this.addProductDataToContext(context)];
                     case 4:
                         _a.sent();
                         return [4 /*yield*/, this.updateContextDecision(context)];

package/lib/cjs/phase/impl/RiskApiPhase.js

@@ -54,9 +54,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RiskApiPhase = void 0;
 var action_1 = require("../../action");
 var utils_1 = require("../../utils");
-var DecideActionPhase_1 = require("./DecideActionPhase");
-var products_1 = require("../../products");
 var pxhd_1 = require("../../pxhd");
+var DecideActionPhase_1 = require("./DecideActionPhase");
 var RiskApiPhase = /** @class */ (function (_super) {
     __extends(RiskApiPhase, _super);
     function RiskApiPhase(config, products, riskApiClient) {
@@ -90,17 +89,16 @@ var RiskApiPhase = /** @class */ (function (_super) {
         return context.action === action_1.Action.TRIGGER_RISK_API;
     };
     RiskApiPhase.prototype.triggerRiskApi = function (context) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var riskApiData;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        context.riskApiData.s2sCallReason =
-                            ((_a = context.reasons) === null || _a === void 0 ? void 0 : _a[products_1.ProductName.BOT_DEFENDER]) || ((_b = context.reasons) === null || _b === void 0 ? void 0 : _b[products_1.ProductName.CREDENTIAL_INTELLIGENCE]);
+                        context.riskApiData.s2sCallReason = (0, action_1.getReasonForHighestPriorityProduct)(context.reasons);
+                        context.riskApiData.riskStartTime = Date.now();
                         return [4 /*yield*/, this.riskApiClient.executeRiskApi(context)];
                     case 1:
-                        riskApiData = _c.sent();
+                        riskApiData = _a.sent();
                         Object.assign(context.riskApiData, riskApiData);
                         return [2 /*return*/];
                 }

package/lib/cjs/products/bot_defender/BotDefender.js

@@ -62,7 +62,8 @@ var BotDefender = /** @class */ (function () {
     function BotDefender(config, options) {
         var _a, _b, _c;
         this.config = config;
-        this.firstParty = (_a = options.firstParty) !== null && _a !== void 0 ? _a : new first_party_1.DefaultBotDefenderFirstParty(config);
+        this.firstParty =
+            (_a = options.firstParty) !== null && _a !== void 0 ? _a : new first_party_1.DefaultBotDefenderFirstParty(config, { urlUtils: options.urlUtils });
         this.filter = (_b = options.filter) !== null && _b !== void 0 ? _b : new filter_1.DefaultBotDefenderFilter(config, options.ipRangeChecker);
         this.blocker = (_c = options.blocker) !== null && _c !== void 0 ? _c : new block_1.DefaultBotDefenderBlocker(config, options.base64Utils);
     }

package/lib/cjs/products/bot_defender/block/captcha/CaptchaBlocker.js

@@ -7,9 +7,9 @@ var HtmlCaptchaBlocker_1 = require("./HtmlCaptchaBlocker");
 var CaptchaBlocker = /** @class */ (function () {
     function CaptchaBlocker(config, base64Utils) {
         this.config = config;
-        this.jsonCaptchaBlocker = new JsonCaptchaBlocker_1.JsonCaptchaBlocker(config);
+        this.jsonCaptchaBlocker = new JsonCaptchaBlocker_1.JsonCaptchaBlocker(config, base64Utils);
         this.mobileCaptchaBlocker = new MobileCaptchaBlocker_1.MobileCaptchaBlocker(config, base64Utils);
-        this.htmlCaptchaBlocker = new HtmlCaptchaBlocker_1.HtmlCaptchaBlocker(config);
+        this.htmlCaptchaBlocker = new HtmlCaptchaBlocker_1.HtmlCaptchaBlocker(config, base64Utils);
     }
     CaptchaBlocker.prototype.createBlockResponse = function (context) {
         if (this.mobileCaptchaBlocker.shouldBlock(context)) {

package/lib/cjs/products/bot_defender/block/captcha/HtmlCaptchaBlocker.js

@@ -1,26 +1,35 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HtmlCaptchaBlocker = void 0;
 var http_1 = require("../../../../http");
-var utils_1 = require("../utils");
+var blocker_1 = require("../../../../blocker");
 var templates_1 = require("../templates");
-var HtmlCaptchaBlocker = /** @class */ (function () {
-    function HtmlCaptchaBlocker(config) {
-        this.config = config;
+var HtmlCaptchaBlocker = /** @class */ (function (_super) {
+    __extends(HtmlCaptchaBlocker, _super);
+    function HtmlCaptchaBlocker(config, base64Utils) {
+        var _this = _super.call(this, http_1.ContentType.TEXT_HTML) || this;
+        _this.config = config;
+        _this.base64Utils = base64Utils;
+        return _this;
     }
-    HtmlCaptchaBlocker.prototype.createBlockResponse = function (context) {
-        var _a;
-        var status = 403;
-        var headers = (_a = {},
-            _a[http_1.CONTENT_TYPE_HEADER_NAME] = [http_1.ContentType.TEXT_HTML],
-            _a);
-        var body = (0, utils_1.renderHtml)(templates_1.CAPTCHA_TEMPLATE, (0, utils_1.createBlockData)(this.config, context));
-        return new http_1.MinimalResponseImpl({
-            body: body,
-            status: status,
-            headers: headers,
-        });
+    HtmlCaptchaBlocker.prototype.createBlockBody = function (context) {
+        return (0, blocker_1.renderHtml)(templates_1.CAPTCHA_TEMPLATE, (0, blocker_1.createBlockData)(this.config, context, this.base64Utils));
     };
     return HtmlCaptchaBlocker;
-}());
+}(blocker_1.BlockerBase));
 exports.HtmlCaptchaBlocker = HtmlCaptchaBlocker;

package/lib/cjs/products/bot_defender/block/captcha/JsonCaptchaBlocker.js

@@ -1,29 +1,39 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonCaptchaBlocker = void 0;
 var blocker_1 = require("../../../../blocker");
-var http_1 = require("../../../../http");
-var utils_1 = require("../utils");
-var JsonCaptchaBlocker = /** @class */ (function () {
-    function JsonCaptchaBlocker(config) {
-        this.config = config;
+var JsonCaptchaBlocker = /** @class */ (function (_super) {
+    __extends(JsonCaptchaBlocker, _super);
+    function JsonCaptchaBlocker(config, base64Utils) {
+        var _this = _super.call(this) || this;
+        _this.config = config;
+        _this.base64Utils = base64Utils;
+        return _this;
     }
     JsonCaptchaBlocker.prototype.shouldBlock = function (context) {
         if (!this.config.advancedBlockingResponseEnabled) {
             return false;
         }
-        var acceptHeaderValue = context.requestData.request.headers.get(http_1.ACCEPT_HEADER_NAME) || '';
-        var acceptHeaderContainsJson = acceptHeaderValue === null || acceptHeaderValue === void 0 ? void 0 : acceptHeaderValue.split(',').some(function (value) { return value.toLowerCase() === http_1.ContentType.APPLICATION_JSON; });
-        return !context.isMobile && context.blockAction !== blocker_1.BlockAction.RATE_LIMIT && acceptHeaderContainsJson;
+        return context.blockAction !== blocker_1.BlockAction.RATE_LIMIT && _super.prototype.shouldBlock.call(this, context);
     };
-    JsonCaptchaBlocker.prototype.createBlockResponse = function (context) {
-        var _a;
-        var status = 403;
-        var headers = (_a = {},
-            _a[http_1.CONTENT_TYPE_HEADER_NAME] = [http_1.ContentType.APPLICATION_JSON],
-            _a);
-        var blockData = (0, utils_1.createBlockData)(this.config, context);
-        var jsonBlockPayload = {
+    JsonCaptchaBlocker.prototype.createJsonPayload = function (context) {
+        var blockData = (0, blocker_1.createBlockData)(this.config, context, this.base64Utils);
+        return {
             appId: blockData.appId,
             jsClientSrc: blockData.jsClientSrc,
             customLogo: blockData.customLogo,
@@ -34,9 +44,7 @@ var JsonCaptchaBlocker = /** @class */ (function () {
             blockScript: blockData.blockScript,
             altBlockScript: blockData.altBlockScript,
         };
-        var body = JSON.stringify(jsonBlockPayload);
-        return new http_1.MinimalResponseImpl({ status: status, headers: headers, body: body });
     };
     return JsonCaptchaBlocker;
-}());
+}(blocker_1.JsonBlockerBase));
 exports.JsonCaptchaBlocker = JsonCaptchaBlocker;