perimeterx-js-core 0.15.0 → 0.15.2

package/lib/cjs/activities/HttpBatchedActivityClient.js

@@ -61,10 +61,12 @@ var HttpBatchedActivityClient = /** @class */ (function (_super) {
         _this.batchSize = config.maxActivityBatchSize;
         _this.timeoutMs = config.activityBatchTimeoutMs;
         _this.maxBufferSize = _this.batchSize * 2;
+        _this.shouldKill = false;
         _this.startTimer();
         return _this;
     }
     HttpBatchedActivityClient.prototype.stop = function () {
+        this.shouldKill = true;
         this.stopTimer();
     };
     HttpBatchedActivityClient.prototype.postActivities = function (activities) {
@@ -99,7 +101,9 @@ var HttpBatchedActivityClient = /** @class */ (function (_super) {
                         _b.label = 2;
                     case 2:
                         sentSuccessfully = _a;
-                        this.startTimer();
+                        if (!this.shouldKill) {
+                            this.startTimer();
+                        }
                         return [2 /*return*/, sentSuccessfully];
                 }
             });
@@ -107,14 +111,17 @@ var HttpBatchedActivityClient = /** @class */ (function (_super) {
     };
     HttpBatchedActivityClient.prototype.flush = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var sentSuccessfully;
+            var bufferCopy, sentSuccessfully;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, _super.prototype.postActivities.call(this, this.buffer)];
+                    case 0:
+                        bufferCopy = this.buffer.concat();
+                        this.clear();
+                        return [4 /*yield*/, _super.prototype.postActivities.call(this, bufferCopy)];
                     case 1:
                         sentSuccessfully = _a.sent();
-                        if (sentSuccessfully) {
-                            this.clear();
+                        if (!sentSuccessfully) {
+                            this.buffer = this.buffer.concat(bufferCopy);
                         }
                         return [2 /*return*/, sentSuccessfully];
                 }

package/lib/cjs/enforcer/EnforcerBase.js

@@ -154,17 +154,18 @@ var EnforcerBase = /** @class */ (function () {
                     case 3:
                         _a.sent();
                         return [2 /*return*/, result.response ? this.convertToRes.apply(this, __spreadArray([result.response], args, false)) : null];
-                    case 4:
-                        this.preserveContext.apply(this, __spreadArray([context], args, false));
-                        return [4 /*yield*/, this.enforceFlow.execute(context)];
+                    case 4: return [4 /*yield*/, this.preserveContext.apply(this, __spreadArray([context], args, false))];
                     case 5:
+                        _a.sent();
+                        return [4 /*yield*/, this.enforceFlow.execute(context)];
+                    case 6:
                         result = _a.sent();
-                        if (!result.done) return [3 /*break*/, 7];
+                        if (!result.done) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.endEnforcerFlow.execute(context)];
-                    case 6:
+                    case 7:
                         _a.sent();
                         return [2 /*return*/, result.response ? this.convertToRes.apply(this, __spreadArray([result.response], args, false)) : null];
-                    case 7: return [2 /*return*/, null];
+                    case 8: return [2 /*return*/, null];
                 }
             });
         });

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

@@ -21,11 +21,7 @@ var EndEnforcerFlow = /** @class */ (function (_super) {
     __extends(EndEnforcerFlow, _super);
     function EndEnforcerFlow(config, _a) {
         var logServiceClient = _a.logServiceClient;
-        var phasesArray = [];
-        if (logServiceClient) {
-            phasesArray.push(new impl_1.SendLogsPhase(config, logServiceClient));
-        }
-        return _super.call(this, phasesArray) || this;
+        return _super.call(this, [new impl_1.SendLogsPhase(config, logServiceClient)]) || this;
     }
     return EndEnforcerFlow;
 }(impl_1.CompositePhase));

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

@@ -43,15 +43,16 @@ var SendLogsPhase = /** @class */ (function () {
         this.logServiceClient = logServiceClient;
     }
     SendLogsPhase.prototype.execute = function (context) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!context.shouldSendLogs) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.logServiceClient.sendLogs(context, this.config.logger.getLogs())];
+                        return [4 /*yield*/, ((_a = this.logServiceClient) === null || _a === void 0 ? void 0 : _a.sendLogs(context, this.config.logger.getLogs()))];
                     case 1:
-                        _a.sent();
-                        _a.label = 2;
+                        _b.sent();
+                        _b.label = 2;
                     case 2:
                         this.config.logger.clearLogs();
                         return [2 /*return*/, { done: false }];

package/lib/cjs/utils/constants.js

@@ -13,4 +13,4 @@ exports.PUSH_DATA_HMAC_HEADER_NAME = 'x-px-pushdata';
 exports.PUSH_DATA_FEATURE_HEADER_NAME = 'x-px-feature';
 exports.EMAIL_ADDRESS_REGEX = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/;
 exports.URL_REGEX = /^(https?\:)\/\/(([^@\s:]+):?([^@\s]*)@)?(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/;
-exports.CORE_MODULE_VERSION = 'JS Core 0.15.0';
+exports.CORE_MODULE_VERSION = 'JS Core 0.15.2';

package/lib/esm/activities/HttpBatchedActivityClient.js

@@ -5,15 +5,18 @@ export class HttpBatchedActivityClient extends HttpActivityClient {
     maxBufferSize;
     buffer;
     timeoutId;
+    shouldKill;
     constructor(config, httpClient) {
         super(config, httpClient);
         this.buffer = [];
         this.batchSize = config.maxActivityBatchSize;
         this.timeoutMs = config.activityBatchTimeoutMs;
         this.maxBufferSize = this.batchSize * 2;
+        this.shouldKill = false;
         this.startTimer();
     }
     stop() {
+        this.shouldKill = true;
         this.stopTimer();
     }
     async postActivities(activities) {
@@ -32,13 +35,17 @@ export class HttpBatchedActivityClient extends HttpActivityClient {
     async triggerFlush() {
         this.stopTimer();
         const sentSuccessfully = this.buffer.length > 0 && (await this.flush());
-        this.startTimer();
+        if (!this.shouldKill) {
+            this.startTimer();
+        }
         return sentSuccessfully;
     }
     async flush() {
-        const sentSuccessfully = await super.postActivities(this.buffer);
-        if (sentSuccessfully) {
-            this.clear();
+        const bufferCopy = this.buffer.concat();
+        this.clear();
+        const sentSuccessfully = await super.postActivities(bufferCopy);
+        if (!sentSuccessfully) {
+            this.buffer = this.buffer.concat(bufferCopy);
         }
         return sentSuccessfully;
     }

package/lib/esm/enforcer/EnforcerBase.js

@@ -75,7 +75,7 @@ export class EnforcerBase {
             await this.endEnforcerFlow.execute(context);
             return result.response ? this.convertToRes(result.response, ...args) : null;
         }
-        this.preserveContext(context, ...args);
+        await this.preserveContext(context, ...args);
         result = await this.enforceFlow.execute(context);
         if (result.done) {
             await this.endEnforcerFlow.execute(context);

package/lib/esm/phase/flow/EndEnforcerFlow.js

@@ -1,10 +1,6 @@
 import { CompositePhase, SendLogsPhase } from '../impl';
 export class EndEnforcerFlow extends CompositePhase {
     constructor(config, { logServiceClient }) {
-        const phasesArray = [];
-        if (logServiceClient) {
-            phasesArray.push(new SendLogsPhase(config, logServiceClient));
-        }
-        super(phasesArray);
+        super([new SendLogsPhase(config, logServiceClient)]);
     }
 }

package/lib/esm/phase/impl/SendLogsPhase.js

@@ -7,7 +7,7 @@ export class SendLogsPhase {
     }
     async execute(context) {
         if (context.shouldSendLogs) {
-            await this.logServiceClient.sendLogs(context, this.config.logger.getLogs());
+            await this.logServiceClient?.sendLogs(context, this.config.logger.getLogs());
         }
         this.config.logger.clearLogs();
         return { done: false };

package/lib/esm/utils/constants.js

@@ -10,4 +10,4 @@ export const PUSH_DATA_HMAC_HEADER_NAME = 'x-px-pushdata';
 export const PUSH_DATA_FEATURE_HEADER_NAME = 'x-px-feature';
 export const EMAIL_ADDRESS_REGEX = /^[a-zA-Z0-9_+&*-]+(?:\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,7}$/;
 export const URL_REGEX = /^(https?\:)\/\/(([^@\s:]+):?([^@\s]*)@)?(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/;
-export const CORE_MODULE_VERSION = 'JS Core 0.15.0';
+export const CORE_MODULE_VERSION = 'JS Core 0.15.2';

package/lib/types/activities/HttpBatchedActivityClient.d.ts

@@ -1,6 +1,6 @@
 import { HttpActivityClient } from './HttpActivityClient';
 import { IConfiguration } from '../config';
-import { AsyncActivity } from './model/AsyncActivity';
+import { AsyncActivity } from './model';
 import { IHttpClient } from '../http';
 export declare class HttpBatchedActivityClient<Req, Res> extends HttpActivityClient<Req, Res> {
     private readonly batchSize;
@@ -8,6 +8,7 @@ export declare class HttpBatchedActivityClient<Req, Res> extends HttpActivityCli
     private readonly maxBufferSize;
     private buffer;
     private timeoutId;
+    private shouldKill;
     constructor(config: IConfiguration<Req, Res>, httpClient: IHttpClient);
     stop(): void;
     protected postActivities(activities: AsyncActivity[]): Promise<boolean>;

package/lib/types/enforcer/EnforcerBase.d.ts

@@ -8,6 +8,7 @@ import { Products } from '../products';
 import { IActivityClient } from '../activities';
 import { IEnforcer } from './IEnforcer';
 import { EnforcerBaseOptions, EnforcerOptionsType } from './options';
+import { AsyncOrSync } from 'ts-essentials';
 export declare abstract class EnforcerBase<TokenV extends TokenVersion, Req, Res, EnforceArgs extends any[], PostEnforceArgs extends any[]> implements IEnforcer<EnforceArgs, PostEnforceArgs, Promise<null | Res>, Promise<void>> {
     protected readonly config: IConfiguration<Req, Res>;
     protected readonly filterFlow: IPhase<Req, Res>;
@@ -21,7 +22,7 @@ export declare abstract class EnforcerBase<TokenV extends TokenVersion, Req, Res
      * @returns IContext - The context for the request.
      * @protected
      */
-    protected abstract constructContext(...args: EnforceArgs): IContext<Req, Res>;
+    protected abstract constructContext(...args: EnforceArgs): AsyncOrSync<IContext<Req, Res>>;
     /**
      * Saves the provided context for future use in the postEnforce function.
      * @param context - The IContext that should be saved
@@ -29,7 +30,7 @@ export declare abstract class EnforcerBase<TokenV extends TokenVersion, Req, Res
      * @returns void
      * @protected
      */
-    protected abstract preserveContext(context: IContext<Req, Res>, ...args: EnforceArgs): void;
+    protected abstract preserveContext(context: IContext<Req, Res>, ...args: EnforceArgs): AsyncOrSync<void>;
     /**
      * A function that retrieves the already generated context for use in the postEnforce function.
      * @param args - The PostEnforce args required to enforce the incoming request.

package/lib/types/utils/constants.d.ts

@@ -10,4 +10,4 @@ export declare const PUSH_DATA_HMAC_HEADER_NAME = "x-px-pushdata";
 export declare const PUSH_DATA_FEATURE_HEADER_NAME = "x-px-feature";
 export declare const EMAIL_ADDRESS_REGEX: RegExp;
 export declare const URL_REGEX: RegExp;
-export declare const CORE_MODULE_VERSION = "JS Core 0.15.0";
+export declare const CORE_MODULE_VERSION = "JS Core 0.15.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perimeterx-js-core",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "",
   "type": "module",
   "typesVersions": {