perimeterx-js-core 0.5.1 → 0.6.0

package/lib/telemetry/DefaultTelemetry.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,178 +7,113 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 (_) 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.DefaultTelemetry = void 0;
-var http_1 = require("../http");
-var activities_1 = require("../activities");
-var utils_1 = require("../utils");
-var constants_1 = require("./constants");
-var __1 = require("..");
-var __2 = require("..");
-var DefaultTelemetry = /** @class */ (function () {
-    function DefaultTelemetry(config, httpClient, base64Utils, hashUtils) {
+import { AUTHORIZATION_HEADER_NAME, CONTENT_TYPE_HEADER_NAME, ContentType, HttpMethod, OutgoingRequestImpl, } from '../http';
+import { ActivityType } from '../activities';
+import { getAuthorizationHeader, Algorithm, removeSensitiveFields, transferExistingProperties, } from '../utils';
+import { TELEMETRY_ENDPOINT, TELEMETRY_HEADER_DELIMITER, TELEMETRY_HEADER_HMAC_INDEX, TELEMETRY_HEADER_NAME, TELEMETRY_HEADER_PART_COUNT, TELEMETRY_HEADER_TIMESTAMP_INDEX, TELEMETRY_UPDATE_REASON, } from './constants';
+export class DefaultTelemetry {
+    constructor(config, httpClient, base64Utils, hmacUtils) {
         this.config = config;
         this.httpClient = httpClient;
         this.base64Utils = base64Utils;
-        this.hashUtils = hashUtils;
+        this.hmacUtils = hmacUtils;
     }
-    DefaultTelemetry.prototype.isValidTelemetryRequest = function (context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var telemetryHeader, _a, e_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 3, , 4]);
-                        telemetryHeader = this.getTelemetryHeader(context);
-                        _a = !!telemetryHeader;
-                        if (!_a) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.isTelemetryHeaderValid(telemetryHeader)];
-                    case 1:
-                        _a = (_b.sent());
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, _a];
-                    case 3:
-                        e_1 = _b.sent();
-                        this.config.logger.debug("error validating telemetry - ".concat(e_1));
-                        return [2 /*return*/, false];
-                    case 4: return [2 /*return*/];
-                }
-            });
+    isValidTelemetryRequest(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const telemetryHeader = this.getTelemetryHeader(context);
+                return !!telemetryHeader && (yield this.isTelemetryHeaderValid(telemetryHeader));
+            }
+            catch (e) {
+                this.config.logger.debug(`error validating telemetry - ${e}`);
+                return false;
+            }
         });
-    };
-    DefaultTelemetry.prototype.sendTelemetry = function (context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.sendTelemetryActivity(context)];
-                    case 1:
-                        _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        e_2 = _a.sent();
-                        this.config.logger.debug("error sending telemetry - ".concat(e_2));
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
+    }
+    sendTelemetry(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.sendTelemetryActivity(context);
+            }
+            catch (e) {
+                this.config.logger.debug(`error sending telemetry - ${e}`);
+            }
         });
-    };
-    DefaultTelemetry.prototype.getTelemetryHeader = function (context) {
-        return context.requestData.request.headers.get(constants_1.TELEMETRY_HEADER_NAME) || '';
-    };
-    DefaultTelemetry.prototype.isTelemetryHeaderValid = function (headerValue) {
-        return __awaiter(this, void 0, void 0, function () {
-            var decodedValue, splitValue, timestamp, givenHmac, curUnixTime, timestampNumber;
-            return __generator(this, function (_a) {
-                this.config.logger.debug('received command to send enforcer telemetry');
-                decodedValue = this.base64Utils.base64Decode(headerValue);
-                splitValue = decodedValue.split(constants_1.TELEMETRY_HEADER_DELIMITER);
-                if (splitValue.length !== constants_1.TELEMETRY_HEADER_PART_COUNT) {
-                    this.config.logger.debug("malformed ".concat(constants_1.TELEMETRY_HEADER_NAME, " header: ").concat(decodedValue));
-                    return [2 /*return*/, false];
-                }
-                timestamp = splitValue[constants_1.TELEMETRY_HEADER_TIMESTAMP_INDEX];
-                givenHmac = splitValue[constants_1.TELEMETRY_HEADER_HMAC_INDEX];
-                if (!this.isTelemetryHmacValid(givenHmac, timestamp)) {
-                    this.config.logger.debug("".concat(constants_1.TELEMETRY_HEADER_NAME, " hmac validation failed. original hmac: ").concat(givenHmac, ", timestamp: ").concat(timestamp, "."));
-                    return [2 /*return*/, false];
-                }
-                curUnixTime = +new Date();
-                timestampNumber = parseInt ? parseInt(timestamp) : Number(timestamp);
-                if (isNaN(timestampNumber) || timestampNumber < curUnixTime) {
-                    this.config.logger.debug("".concat(constants_1.TELEMETRY_HEADER_NAME, " timestamp expired: ").concat(timestamp, " < ").concat(curUnixTime));
-                    return [2 /*return*/, false];
-                }
-                return [2 /*return*/, true];
-            });
+    }
+    getTelemetryHeader(context) {
+        return context.requestData.request.headers.get(TELEMETRY_HEADER_NAME) || '';
+    }
+    isTelemetryHeaderValid(headerValue) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.config.logger.debug('received command to send enforcer telemetry');
+            const decodedValue = this.base64Utils.base64Decode(headerValue);
+            const splitValue = decodedValue.split(TELEMETRY_HEADER_DELIMITER);
+            if (splitValue.length !== TELEMETRY_HEADER_PART_COUNT) {
+                this.config.logger.debug(`malformed ${TELEMETRY_HEADER_NAME} header: ${decodedValue}`);
+                return false;
+            }
+            const timestamp = splitValue[TELEMETRY_HEADER_TIMESTAMP_INDEX];
+            const givenHmac = splitValue[TELEMETRY_HEADER_HMAC_INDEX];
+            if (!this.isTelemetryHmacValid(givenHmac, timestamp)) {
+                this.config.logger.debug(`${TELEMETRY_HEADER_NAME} hmac validation failed. original hmac: ${givenHmac}, timestamp: ${timestamp}.`);
+                return false;
+            }
+            const curUnixTime = +new Date();
+            const timestampNumber = parseInt ? parseInt(timestamp) : Number(timestamp);
+            if (isNaN(timestampNumber) || timestampNumber < curUnixTime) {
+                this.config.logger.debug(`${TELEMETRY_HEADER_NAME} timestamp expired: ${timestamp} < ${curUnixTime}`);
+                return false;
+            }
+            return true;
         });
-    };
-    DefaultTelemetry.prototype.isTelemetryHmacValid = function (givenHmac, timestamp) {
+    }
+    isTelemetryHmacValid(givenHmac, timestamp) {
         try {
-            return givenHmac === this.hashUtils.createHmac(utils_1.Algorithm.SHA256, timestamp, this.config.cookieSecret);
+            return givenHmac === this.hmacUtils.createHmac(Algorithm.SHA256, timestamp, this.config.cookieSecret);
         }
         catch (e) {
-            this.config.logger.debug("caught error validating telemetry hmac: ".concat(e));
+            this.config.logger.debug(`caught error validating telemetry hmac: ${e}`);
             return false;
         }
-    };
-    DefaultTelemetry.prototype.sendTelemetryActivity = function (context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var telemetryRequest;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        telemetryRequest = this.createTelemetryRequest(context);
-                        this.config.logger.debug("sending telemetry to ".concat(telemetryRequest.url));
-                        return [4 /*yield*/, this.httpClient.send(telemetryRequest)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
+    }
+    sendTelemetryActivity(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const telemetryRequest = this.createTelemetryRequest(context);
+            this.config.logger.debug(`sending telemetry to ${telemetryRequest.url}`);
+            yield this.httpClient.send(telemetryRequest);
         });
-    };
-    DefaultTelemetry.prototype.createTelemetryRequest = function (context) {
-        var _a;
-        var url = "".concat(this.config.backendScoreApiUrl).concat(constants_1.TELEMETRY_ENDPOINT);
-        var method = __1.HttpMethod.POST;
-        var headers = (_a = {},
-            _a[http_1.CONTENT_TYPE_HEADER_NAME] = [http_1.ContentType.APPLICATION_JSON],
-            _a[http_1.AUTHORIZATION_HEADER_NAME] = [(0, utils_1.getAuthorizationHeader)(this.config.authToken)],
-            _a);
-        var activity = this.createTelemetryActivity(context);
-        return new __2.OutgoingRequestImpl({ url: url, method: method, headers: headers, body: JSON.stringify(activity) });
-    };
-    DefaultTelemetry.prototype.createTelemetryActivity = function (context) {
-        var SENSITIVE_CONFIG_FIELDS = ['px_auth_token', 'px_cookie_secret'];
-        var config = this.config.toParams();
-        config = (0, utils_1.removeSensitiveFields)(config, SENSITIVE_CONFIG_FIELDS);
-        var activity = {
-            type: activities_1.ActivityType.ENFORCER_TELEMETRY,
+    }
+    createTelemetryRequest(context) {
+        const url = `${this.config.backendScoreApiUrl}${TELEMETRY_ENDPOINT}`;
+        const method = HttpMethod.POST;
+        const headers = {
+            [CONTENT_TYPE_HEADER_NAME]: [ContentType.APPLICATION_JSON],
+            [AUTHORIZATION_HEADER_NAME]: [getAuthorizationHeader(this.config.authToken)],
+        };
+        const activity = this.createTelemetryActivity(context);
+        return new OutgoingRequestImpl({ url: url, method: method, headers: headers, body: JSON.stringify(activity) });
+    }
+    createTelemetryActivity(context) {
+        const SENSITIVE_CONFIG_FIELDS = [
+            'px_auth_token',
+            'px_cookie_secret',
+        ];
+        let config = this.config.toParams();
+        config = removeSensitiveFields(config, SENSITIVE_CONFIG_FIELDS);
+        const activity = {
+            type: ActivityType.ENFORCER_TELEMETRY,
             timestamp: Date.now(),
             px_app_id: this.config.appId,
             details: {
-                update_reason: constants_1.TELEMETRY_UPDATE_REASON,
+                update_reason: TELEMETRY_UPDATE_REASON,
                 module_version: this.config.moduleVersion,
                 enforcer_configs: config,
             },
         };
-        (0, utils_1.transferExistingProperties)(context.serverData, activity.details, {
+        transferExistingProperties(context.serverData, activity.details, {
             osName: 'os_name',
             nodeName: 'node_name',
         });
         return activity;
-    };
-    return DefaultTelemetry;
-}());
-exports.DefaultTelemetry = DefaultTelemetry;
+    }
+}

package/lib/telemetry/ITelemetry.d.ts

@@ -1,13 +1,13 @@
-import { IContext } from '../context';
-export interface ITelemetry {
+import { ReadonlyContext } from '../context';
+export interface ITelemetry<Req, Res> {
     /**
      * @param context - The request context.
      * @returns Promise<boolean> - A Promise resolving to a boolean that indicates whether the request is a valid telemetry request.
      */
-    isValidTelemetryRequest(context: IContext): Promise<boolean>;
+    isValidTelemetryRequest(context: ReadonlyContext<Req, Res>): Promise<boolean>;
     /**
      * @param context - The request context.
      * @returns void
      */
-    sendTelemetry(context: IContext): Promise<void>;
+    sendTelemetry(context: ReadonlyContext<Req, Res>): Promise<void>;
 }

package/lib/telemetry/ITelemetry.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/telemetry/constants.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TELEMETRY_UPDATE_REASON = exports.TELEMETRY_ENDPOINT = exports.TELEMETRY_HEADER_NAME = exports.TELEMETRY_HEADER_PART_COUNT = exports.TELEMETRY_HEADER_HMAC_INDEX = exports.TELEMETRY_HEADER_TIMESTAMP_INDEX = exports.TELEMETRY_HEADER_DELIMITER = void 0;
-exports.TELEMETRY_HEADER_DELIMITER = ':';
-exports.TELEMETRY_HEADER_TIMESTAMP_INDEX = 0;
-exports.TELEMETRY_HEADER_HMAC_INDEX = 1;
-exports.TELEMETRY_HEADER_PART_COUNT = 2;
-exports.TELEMETRY_HEADER_NAME = 'x-px-enforcer-telemetry';
-exports.TELEMETRY_ENDPOINT = '/api/v2/risk/telemetry';
-exports.TELEMETRY_UPDATE_REASON = 'command';
+export const TELEMETRY_HEADER_DELIMITER = ':';
+export const TELEMETRY_HEADER_TIMESTAMP_INDEX = 0;
+export const TELEMETRY_HEADER_HMAC_INDEX = 1;
+export const TELEMETRY_HEADER_PART_COUNT = 2;
+export const TELEMETRY_HEADER_NAME = 'x-px-enforcer-telemetry';
+export const TELEMETRY_ENDPOINT = '/api/v2/risk/telemetry';
+export const TELEMETRY_UPDATE_REASON = 'command';

package/lib/telemetry/index.js

@@ -1,20 +1,2 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultTelemetry = void 0;
-var DefaultTelemetry_1 = require("./DefaultTelemetry");
-Object.defineProperty(exports, "DefaultTelemetry", { enumerable: true, get: function () { return DefaultTelemetry_1.DefaultTelemetry; } });
-__exportStar(require("./constants"), exports);
+export { DefaultTelemetry } from './DefaultTelemetry';
+export * from './constants';

package/lib/telemetry/model/TelemetryActivity.d.ts

@@ -1,7 +1,7 @@
 import { ActivityType } from '../../activities';
 import { ConfigurationParams } from '../../config';
 export declare type TelemetryActivityDetails = {
-    enforcer_configs: ConfigurationParams;
+    enforcer_configs: ConfigurationParams<unknown, unknown>;
     module_version: string;
     update_reason: 'command';
     node_name?: string;

package/lib/telemetry/model/TelemetryActivity.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/utils/Algorithm.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Algorithm = void 0;
-var Algorithm;
+export var Algorithm;
 (function (Algorithm) {
     Algorithm["SHA256"] = "sha256";
     Algorithm["AES_CBC"] = "aes_cbc";
-})(Algorithm = exports.Algorithm || (exports.Algorithm = {}));
+})(Algorithm || (Algorithm = {}));

package/lib/utils/ModuleMode.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleMode = void 0;
-var ModuleMode;
+export var ModuleMode;
 (function (ModuleMode) {
     ModuleMode["MONITOR"] = "monitor";
     ModuleMode["ACTIVE_BLOCKING"] = "active_blocking";
-})(ModuleMode = exports.ModuleMode || (exports.ModuleMode = {}));
+})(ModuleMode || (ModuleMode = {}));

package/lib/utils/VidSource.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VidSource = void 0;
-var VidSource;
+export var VidSource;
 (function (VidSource) {
     VidSource["VID_COOKIE"] = "vid_cookie";
     VidSource["RISK_COOKIE"] = "risk_cookie";
-})(VidSource = exports.VidSource || (exports.VidSource = {}));
+})(VidSource || (VidSource = {}));

package/lib/utils/base64/AtobBase64Utils.js

@@ -1,15 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AtobBase64Utils = void 0;
-var AtobBase64Utils = /** @class */ (function () {
-    function AtobBase64Utils() {
-    }
-    AtobBase64Utils.prototype.base64Decode = function (stringToDecode) {
+export class AtobBase64Utils {
+    base64Decode(stringToDecode) {
         return atob(stringToDecode);
-    };
-    AtobBase64Utils.prototype.base64Encode = function (stringToEncode) {
+    }
+    base64Encode(stringToEncode) {
         return btoa(stringToEncode);
-    };
-    return AtobBase64Utils;
-}());
-exports.AtobBase64Utils = AtobBase64Utils;
+    }
+}

package/lib/utils/base64/BufferBase64Utils.js

@@ -1,18 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BufferBase64Utils = void 0;
-var BufferBase64Utils = /** @class */ (function () {
-    function BufferBase64Utils() {
+export class BufferBase64Utils {
+    base64Decode(stringToDecode) {
+        const buffer = Buffer.from(stringToDecode, BufferBase64Utils.BASE_64_ENCODING);
+        return buffer.toString('utf8');
     }
-    BufferBase64Utils.prototype.base64Decode = function (stringToDecode) {
-        var buffer = Buffer.from(stringToDecode, BufferBase64Utils.BASE_64_ENCODING);
-        return buffer.toString();
-    };
-    BufferBase64Utils.prototype.base64Encode = function (stringToEncode) {
-        var buffer = Buffer.from(stringToEncode);
+    base64Encode(stringToEncode) {
+        const buffer = Buffer.from(stringToEncode, 'utf8');
         return buffer.toString(BufferBase64Utils.BASE_64_ENCODING);
-    };
-    BufferBase64Utils.BASE_64_ENCODING = 'base64';
-    return BufferBase64Utils;
-}());
-exports.BufferBase64Utils = BufferBase64Utils;
+    }
+}
+BufferBase64Utils.BASE_64_ENCODING = 'base64';

package/lib/utils/base64/IBase64Utils.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/utils/base64/JSBase64Base64Utils.js

@@ -1,16 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSBase64Base64Utils = void 0;
-var js_base64_1 = require("js-base64");
-var JSBase64Base64Utils = /** @class */ (function () {
-    function JSBase64Base64Utils() {
+import { encode, decode } from 'js-base64';
+export class JSBase64Base64Utils {
+    base64Encode(stringToEncode) {
+        return encode(stringToEncode);
     }
-    JSBase64Base64Utils.prototype.base64Encode = function (stringToEncode) {
-        return (0, js_base64_1.encode)(stringToEncode);
-    };
-    JSBase64Base64Utils.prototype.base64Decode = function (stringToDecode) {
-        return (0, js_base64_1.decode)(stringToDecode);
-    };
-    return JSBase64Base64Utils;
-}());
-exports.JSBase64Base64Utils = JSBase64Base64Utils;
+    base64Decode(stringToDecode) {
+        return decode(stringToDecode);
+    }
+}

package/lib/utils/base64/index.js

@@ -1,20 +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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./IBase64Utils"), exports);
-__exportStar(require("./JSBase64Base64Utils"), exports);
-__exportStar(require("./BufferBase64Utils"), exports);
-__exportStar(require("./AtobBase64Utils"), exports);
+export * from './IBase64Utils';
+export * from './JSBase64Base64Utils';
+export * from './BufferBase64Utils';
+export * from './AtobBase64Utils';

package/lib/utils/cipher/CryptoCipherUtils.d.ts

@@ -1,12 +1,10 @@
 /// <reference types="node" />
 import * as crypto from 'crypto';
-import { IBase64Utils } from '../base64';
 import { ICipherUtils, Pbkdf2DecryptOptions } from './ICipherUtils';
 declare type CryptoModule = typeof crypto;
 export declare class CryptoCipherUtils implements ICipherUtils {
     private crypto;
-    private base64Utils;
-    constructor(base64Utils: IBase64Utils, cryptoModule?: CryptoModule);
+    constructor(cryptoModule?: CryptoModule);
     pbkdf2Decrypt(secret: string, encryptedString: string, iterations: number, salt: string, options?: Pbkdf2DecryptOptions): Promise<string>;
 }
 export {};

package/lib/utils/cipher/CryptoCipherUtils.js

@@ -1,4 +1,3 @@
-"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) {
@@ -8,58 +7,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 (_) 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.CryptoCipherUtils = void 0;
-var crypto = require("crypto");
-var CryptoCipherUtils = /** @class */ (function () {
-    function CryptoCipherUtils(base64Utils, cryptoModule) {
-        if (cryptoModule === void 0) { cryptoModule = crypto; }
+import * as crypto from 'crypto';
+export class CryptoCipherUtils {
+    constructor(cryptoModule = crypto) {
         this.crypto = cryptoModule;
-        this.base64Utils = base64Utils;
     }
-    CryptoCipherUtils.prototype.pbkdf2Decrypt = function (secret, encryptedString, iterations, salt, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var keylen, ivlen, derivation, key, iv, cipher, decrypted;
-            return __generator(this, function (_a) {
-                keylen = (options === null || options === void 0 ? void 0 : options.keylen) || 32;
-                ivlen = (options === null || options === void 0 ? void 0 : options.ivlen) || 16;
-                derivation = this.crypto.pbkdf2Sync(secret, this.base64Utils.base64Decode(salt), iterations, keylen + ivlen, 'sha256');
-                key = derivation.subarray(0, keylen);
-                iv = derivation.subarray(keylen);
-                cipher = this.crypto.createDecipheriv('aes-256-cbc', key, iv);
-                decrypted = cipher.update(encryptedString, 'base64', 'utf8');
-                decrypted += cipher.final('utf8');
-                return [2 /*return*/, decrypted];
-            });
+    pbkdf2Decrypt(secret, encryptedString, iterations, salt, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const keylen = (options === null || options === void 0 ? void 0 : options.keylen) || 32;
+            const ivlen = (options === null || options === void 0 ? void 0 : options.ivlen) || 16;
+            const derivation = this.crypto.pbkdf2Sync(secret, Buffer.from(salt, 'base64'), iterations, keylen + ivlen, 'sha256');
+            const key = derivation.subarray(0, keylen);
+            const iv = derivation.subarray(keylen);
+            const cipher = this.crypto.createDecipheriv('aes-256-cbc', key, iv);
+            let decrypted = cipher.update(encryptedString, 'base64', 'utf8');
+            decrypted += cipher.final('utf8');
+            return decrypted;
         });
-    };
-    return CryptoCipherUtils;
-}());
-exports.CryptoCipherUtils = CryptoCipherUtils;
+    }
+}

package/lib/utils/cipher/ICipherUtils.d.ts

@@ -1,7 +1,8 @@
+import { AsyncOrSync } from 'ts-essentials';
 export declare type Pbkdf2DecryptOptions = {
     keylen?: number;
     ivlen?: number;
 };
 export interface ICipherUtils {
-    pbkdf2Decrypt(secret: string, encryptedString: string, iterations: number, salt: string, options?: Pbkdf2DecryptOptions): string | Promise<string>;
+    pbkdf2Decrypt(secret: string, encryptedString: string, iterations: number, salt: string, options?: Pbkdf2DecryptOptions): AsyncOrSync<string>;
 }

package/lib/utils/cipher/ICipherUtils.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};