@netacea/netaceaintegrationbase 1.5.0 → 1.8.1

package/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.8.1](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/netaceaintegrationbase@1.8.0...@netacea/netaceaintegrationbase@1.8.1) (2022-01-04)
+
+**Note:** Version bump only for package @netacea/netaceaintegrationbase
+
+
+
+
+
+# [1.8.0](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/netaceaintegrationbase@1.7.0...@netacea/netaceaintegrationbase@1.8.0) (2021-12-08)
+
+
+### Features
+
+* **integrations:** PR-16: Bumped versions ([418e08b](https://github.com/Netacea/JavascriptATAIntegration/commit/418e08bac751b0df6c946c1f1c46fb3af3da3612))
+* **integrations:** PR-31: allow mitata expiry to be configured ([218f0d1](https://github.com/Netacea/JavascriptATAIntegration/commit/218f0d10d3f06d998e7aa18755f73b4977958814))
+* **integrations:** PR-31: remove useFakeTimers() where not necessary ([6db65f7](https://github.com/Netacea/JavascriptATAIntegration/commit/6db65f7aae72b0688b640a37134e29da8fe4f760))
+* **intgegrations:** PR-31: rename mitata.valid to isPrimaryHashValid ([08eddec](https://github.com/Netacea/JavascriptATAIntegration/commit/08eddece2a8abb1641e94f93fb9b3e9ac5cec6cd))
+
+
+
+
+
+# [1.7.0](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/netaceaintegrationbase@1.6.0...@netacea/netaceaintegrationbase@1.7.0) (2021-08-17)
+
+
+### Features
+
+* **SCAL-31:** Fix fail open ([ea8be37](https://github.com/Netacea/JavascriptATAIntegration/commit/ea8be3798631c2fe8b585b7e63f4d40834f7ab6e))
+* **SCAL-31:** Fix path to not use URL lib ([5dfa283](https://github.com/Netacea/JavascriptATAIntegration/commit/5dfa2836663a7527ff650e12cb1eeae1e5b499ad))
+* **SCAL-31:** Fix query test and lint ([1070293](https://github.com/Netacea/JavascriptATAIntegration/commit/1070293263f1456aef51fea54af0d557330594df))
+* **SCAL-31:** Fix unit test ([8cd60b2](https://github.com/Netacea/JavascriptATAIntegration/commit/8cd60b2a88c2909758bde82787542f9d5d0e6e08))
+* **SCAL-31:** Undefined bctype when empty string ([da6d140](https://github.com/Netacea/JavascriptATAIntegration/commit/da6d140ef35bf374a839e388f0f77d515324959e))
+* **SCAL-31:** v2 log format ([b937b85](https://github.com/Netacea/JavascriptATAIntegration/commit/b937b8570a02ddb0d65c7e3e2452fbde2d2ead97))
+
+
+
+
+
+# [1.6.0](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/netaceaintegrationbase@1.5.0...@netacea/netaceaintegrationbase@1.6.0) (2021-08-04)
+
+
+### Features
+
+* **PB-1834:** Batched ingest ([b41a8c6](https://github.com/Netacea/JavascriptATAIntegration/commit/b41a8c6c26f7bf85c107a23bef24c75a82e6098b))
+* **PB-1834:** Batched ingest using cloudfront fully working ([638b7e7](https://github.com/Netacea/JavascriptATAIntegration/commit/638b7e7e80888944c8bfaf7c2c4bae728eee1bd5))
+* **PB-1834:** Removing only and skip and fixing tests ([ef5003f](https://github.com/Netacea/JavascriptATAIntegration/commit/ef5003f0499ea29c14b0dba880581b748f4e0905))
+
+
+
+
+
 # [1.5.0](https://github.com/Netacea/JavascriptATAIntegration/compare/@netacea/netaceaintegrationbase@1.3.0...@netacea/netaceaintegrationbase@1.5.0) (2021-07-21)
 
 

package/dist/NetaceaBase.d.ts

@@ -1,54 +1,11 @@
-import NetaceaKinesis, { KinesisIngestConfigArgs } from '@netacea/kinesisingest';
-export interface MakeRequestArgs {
-    host: string;
-    path: string;
-    headers: {
-        [key: string]: string;
-    };
-    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
-    body?: any;
-    timeout?: number;
-}
-export interface MakeRequestResponse {
-    status: number;
-    headers: {
-        [key: string]: string;
-    };
-    body?: any;
-}
-export interface NetaceaBaseArgs {
-    apiKey: string;
-    secretKey?: string;
-    captchaSiteKey?: string;
-    captchaSecretKey?: string;
-    timeout?: number;
-    retries?: number;
-    ingestServiceUrl?: string;
-    mitigationServiceUrl?: string;
-    mitigationType?: NetaceaMitigationType;
-    ingestType?: NetaceaIngestType;
-    kinesis?: KinesisIngestConfigArgs;
-}
+import type { ComposeResultResponse, IngestArgs, InjectResponse, MakeRequestArgs, MakeRequestResponse, MitigateResponse, NetaceaBaseArgs, NetaceaMitigationResponse, WebLog, V2WebLog, NetaceaResponseBase } from './NetaceaBase.types';
+import { NetaceaIngestType, NetaceaLogVersion, NetaceaMitigationType } from './NetaceaBase.enums';
+import NetaceaKinesis from '@netacea/kinesisingest';
 interface FindBestMitigationResponse {
     sessionStatus: string;
     mitigation: string;
     parts: NetaceaParts;
 }
-export interface InjectHeaders {
-    'x-netacea-match': string;
-    'x-netacea-mitigate': string;
-    'x-netacea-captcha': string;
-    'x-netacea-event-id'?: string;
-}
-export interface ComposeResultResponse {
-    body?: string;
-    apiCallStatus: number;
-    setCookie: string[];
-    sessionStatus: string;
-    mitigation: string;
-    mitigated: boolean;
-    injectHeaders?: InjectHeaders;
-}
 interface NetaceaParts {
     match: number;
     mitigate: number;
@@ -58,70 +15,6 @@ interface APICallResponse {
     status: number;
     body?: any;
 }
-export interface IngestArgs {
-    ip: string;
-    userAgent: string;
-    status: string;
-    method: string;
-    path: string;
-    protocol: string;
-    referer: string;
-    bytesSent: string;
-    requestTime: string;
-    mitataCookie?: string;
-    sessionStatus?: string;
-    integrationType?: string;
-    integrationVersion?: string;
-}
-export interface WebLog {
-    Request: string;
-    TimeLocal: string;
-    RealIp: string;
-    UserAgent: string;
-    Status: string;
-    RequestTime: string;
-    BytesSent: string;
-    Referer: string;
-    NetaceaUserIdCookie: string;
-    NetaceaMitigationApplied: string;
-    IntegrationType?: string;
-    IntegrationVersion?: string;
-}
-export declare enum NetaceaIngestType {
-    HTTP = "HTTP",
-    KINESIS = "KINESIS"
-}
-export declare enum NetaceaMitigationType {
-    /**
-     * Run Netacea with mitigation mode enabled.
-     * This will serve Captcha pages and Forbidden pages when instructed to do so
-     */
-    MITIGATE = "MITIGATE",
-    /**
-     * Run Netacea with Inject mode enabled.
-     * The end-user will only receive a cookie.
-     * The origin server will receive 3 headers,
-     *
-     * 'x-netacea-match' indicating what was matched (nothing(0), ua(1), ip(2), etc...)
-     *
-     * 'x-netacea-mitigate' indicating what action would've be taken (nothing (0), block(1), allow(2), etc...)
-     *
-     * 'x-netacea-captcha' indicating what captcha action would've been taken
-     */
-    INJECT = "INJECT",
-    /**
-     * Run Netacea with Ingest only mode
-     * No cookies will be set for the end user.
-     * No mitigations will be applied.
-     *
-     * **It's recommended to start in this mode!**
-     */
-    INGEST = "INGEST"
-}
-export interface NetaceaResponseBase {
-    setCookie?: string[];
-    sessionStatus: string;
-}
 interface ProcessMitigateRequestArgs {
     url: string;
     method: string;
@@ -131,15 +24,6 @@ interface ProcessMitigateRequestArgs {
     userAgent: string;
     getBodyFn: () => Promise<any>;
 }
-export interface MitigateResponse<T = any> extends NetaceaResponseBase {
-    response?: T;
-}
-export interface InjectResponse<T = any> extends MitigateResponse<T> {
-    injectHeaders: InjectHeaders | undefined;
-    response?: T | undefined;
-}
-export declare type NetaceaMitigationResponse<T> = MitigateResponse<T> | InjectResponse<T> | undefined;
-export declare type NetaceaMakeRequest = (args: MakeRequestArgs) => Promise<MakeRequestResponse>;
 export default abstract class NetaceaBase<RequestArgs = any, Response = any> {
     protected apiKey: string;
     protected secretKey?: string;
@@ -148,6 +32,8 @@ export default abstract class NetaceaBase<RequestArgs = any, Response = any> {
     protected captchaSiteKey?: string;
     protected captchaSecretKey?: string;
     protected ingestType: NetaceaIngestType;
+    protected readonly logVersion: NetaceaLogVersion;
+    protected mitataCookieExpirySeconds: number;
     private readonly mitigationServiceUrl;
     private readonly ingestServiceUrl;
     protected readonly mitigationType: NetaceaMitigationType;
@@ -157,15 +43,18 @@ export default abstract class NetaceaBase<RequestArgs = any, Response = any> {
     protected readonly kinesis?: NetaceaKinesis;
     abstract ingest(...args: any[]): Promise<any>;
     abstract getCookieHeader(args: RequestArgs): string | null | undefined;
-    constructor({ apiKey, secretKey, timeout, retries, mitigationServiceUrl, ingestServiceUrl, mitigationType, captchaSiteKey, captchaSecretKey, ingestType, kinesis }: NetaceaBaseArgs);
+    constructor({ apiKey, secretKey, timeout, retries, mitigationServiceUrl, ingestServiceUrl, mitigationType, captchaSiteKey, captchaSecretKey, ingestType, kinesis, logVersion, mitataCookieExpirySeconds }: NetaceaBaseArgs);
     runMitigation(args: RequestArgs): Promise<NetaceaMitigationResponse<Response>>;
     protected readCookie(cookieName: string, cookies: string | null | undefined): string | undefined;
     protected callIngest(args: IngestArgs): Promise<void>;
     private makeIngestApiCall;
-    protected constructWebLog({ ip, userAgent, status, method, path, protocol, referer, bytesSent, requestTime, mitataCookie, sessionStatus, integrationType, integrationVersion }: IngestArgs): WebLog;
+    private constructV2WebLog;
+    private constructV1WebLog;
+    protected constructWebLog(args: IngestArgs): WebLog | V2WebLog;
     protected check(netaceaCookie: string | undefined, clientIP: string, userAgent: string, captchaCookie?: string): Promise<ComposeResultResponse>;
+    private createMitata;
     private processCaptcha;
-    private getCookiesFromHeaders;
+    private getMitataCaptchaFromHeaders;
     private makeCaptchaAPICall;
     private getApiCallResponseFromResponse;
     private buildCookieFromValues;
@@ -176,7 +65,7 @@ export default abstract class NetaceaBase<RequestArgs = any, Response = any> {
     protected APIError(response: APICallResponse): Error;
     protected isUrlCaptchaPost(url: string, method: string): boolean;
     protected processMitigateRequest(args: ProcessMitigateRequestArgs): Promise<ComposeResultResponse>;
-    protected setWorkerCookie(userId: string | undefined, saltKey: string): NetaceaResponseBase;
+    protected setIngestOnlyMitataCookie(userId: string | undefined): NetaceaResponseBase;
     protected processIngest(args: RequestArgs): NetaceaResponseBase;
 }
 export {};

package/dist/NetaceaBase.enums.d.ts

@@ -0,0 +1,35 @@
+export declare enum NetaceaIngestType {
+    HTTP = "HTTP",
+    KINESIS = "KINESIS"
+}
+export declare enum NetaceaLogVersion {
+    V1 = "V1",
+    V2 = "V2"
+}
+export declare enum NetaceaMitigationType {
+    /**
+     * Run Netacea with mitigation mode enabled.
+     * This will serve Captcha pages and Forbidden pages when instructed to do so
+     */
+    MITIGATE = "MITIGATE",
+    /**
+     * Run Netacea with Inject mode enabled.
+     * The end-user will only receive a cookie.
+     * The origin server will receive 3 headers,
+     *
+     * 'x-netacea-match' indicating what was matched (nothing(0), ua(1), ip(2), etc...)
+     *
+     * 'x-netacea-mitigate' indicating what action would've be taken (nothing (0), block(1), allow(2), etc...)
+     *
+     * 'x-netacea-captcha' indicating what captcha action would've been taken
+     */
+    INJECT = "INJECT",
+    /**
+     * Run Netacea with Ingest only mode
+     * No cookies will be set for the end user.
+     * No mitigations will be applied.
+     *
+     * **It's recommended to start in this mode!**
+     */
+    INGEST = "INGEST"
+}

package/dist/NetaceaBase.enums.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetaceaMitigationType = exports.NetaceaLogVersion = exports.NetaceaIngestType = void 0;
+var NetaceaIngestType;
+(function (NetaceaIngestType) {
+    NetaceaIngestType["HTTP"] = "HTTP";
+    NetaceaIngestType["KINESIS"] = "KINESIS";
+})(NetaceaIngestType = exports.NetaceaIngestType || (exports.NetaceaIngestType = {}));
+var NetaceaLogVersion;
+(function (NetaceaLogVersion) {
+    NetaceaLogVersion["V1"] = "V1";
+    NetaceaLogVersion["V2"] = "V2";
+})(NetaceaLogVersion = exports.NetaceaLogVersion || (exports.NetaceaLogVersion = {}));
+var NetaceaMitigationType;
+(function (NetaceaMitigationType) {
+    /**
+     * Run Netacea with mitigation mode enabled.
+     * This will serve Captcha pages and Forbidden pages when instructed to do so
+     */
+    NetaceaMitigationType["MITIGATE"] = "MITIGATE";
+    /**
+     * Run Netacea with Inject mode enabled.
+     * The end-user will only receive a cookie.
+     * The origin server will receive 3 headers,
+     *
+     * 'x-netacea-match' indicating what was matched (nothing(0), ua(1), ip(2), etc...)
+     *
+     * 'x-netacea-mitigate' indicating what action would've be taken (nothing (0), block(1), allow(2), etc...)
+     *
+     * 'x-netacea-captcha' indicating what captcha action would've been taken
+     */
+    NetaceaMitigationType["INJECT"] = "INJECT";
+    /**
+     * Run Netacea with Ingest only mode
+     * No cookies will be set for the end user.
+     * No mitigations will be applied.
+     *
+     * **It's recommended to start in this mode!**
+     */
+    NetaceaMitigationType["INGEST"] = "INGEST";
+})(NetaceaMitigationType = exports.NetaceaMitigationType || (exports.NetaceaMitigationType = {}));
+//# sourceMappingURL=NetaceaBase.enums.js.map

package/dist/NetaceaBase.enums.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetaceaBase.enums.js","sourceRoot":"","sources":["../src/NetaceaBase.enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,wCAAmB,CAAA;AACrB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,8BAAS,CAAA;IACT,8BAAS,CAAA;AACX,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,qBA0BX;AA1BD,WAAY,qBAAqB;IAC/B;;;OAGG;IACH,8CAAqB,CAAA;IACrB;;;;;;;;;;OAUG;IACH,0CAAiB,CAAA;IACjB;;;;;;OAMG;IACH,0CAAiB,CAAA;AACnB,CAAC,EA1BW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QA0BhC"}

package/dist/NetaceaBase.js

@@ -1,44 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetaceaMitigationType = exports.NetaceaIngestType = void 0;
+const NetaceaBase_enums_1 = require("./NetaceaBase.enums");
 const dictionary_1 = require("./dictionary");
 const mitataCookie_1 = require("./mitataCookie");
 const kinesisingest_1 = require("@netacea/kinesisingest");
 const ONE_HOUR_IN_SECONDS = 60 * 60;
 const ONE_DAY_IN_SECONDS = ONE_HOUR_IN_SECONDS * 24;
-var NetaceaIngestType;
-(function (NetaceaIngestType) {
-    NetaceaIngestType["HTTP"] = "HTTP";
-    NetaceaIngestType["KINESIS"] = "KINESIS";
-})(NetaceaIngestType = exports.NetaceaIngestType || (exports.NetaceaIngestType = {}));
-var NetaceaMitigationType;
-(function (NetaceaMitigationType) {
-    /**
-     * Run Netacea with mitigation mode enabled.
-     * This will serve Captcha pages and Forbidden pages when instructed to do so
-     */
-    NetaceaMitigationType["MITIGATE"] = "MITIGATE";
-    /**
-     * Run Netacea with Inject mode enabled.
-     * The end-user will only receive a cookie.
-     * The origin server will receive 3 headers,
-     *
-     * 'x-netacea-match' indicating what was matched (nothing(0), ua(1), ip(2), etc...)
-     *
-     * 'x-netacea-mitigate' indicating what action would've be taken (nothing (0), block(1), allow(2), etc...)
-     *
-     * 'x-netacea-captcha' indicating what captcha action would've been taken
-     */
-    NetaceaMitigationType["INJECT"] = "INJECT";
-    /**
-     * Run Netacea with Ingest only mode
-     * No cookies will be set for the end user.
-     * No mitigations will be applied.
-     *
-     * **It's recommended to start in this mode!**
-     */
-    NetaceaMitigationType["INGEST"] = "INGEST";
-})(NetaceaMitigationType = exports.NetaceaMitigationType || (exports.NetaceaMitigationType = {}));
 function correctTimeout(timeout) {
     return timeout <= 0 ? defaultTimeout : timeout;
 }
@@ -48,11 +15,23 @@ function correctRetries(retries) {
     }
     return retries > maximumRetries ? maximumRetries : retries;
 }
+function safeParseInt(value, defaultValue = 0) {
+    if (isNaN(value)) {
+        return defaultValue;
+    }
+    return parseInt(value);
+}
 const maximumRetries = 5;
 const defaultTimeout = 3000;
+function configureMitataExpiry(mitigationType, expirySeconds) {
+    if (expirySeconds === undefined) {
+        return mitigationType === NetaceaBase_enums_1.NetaceaMitigationType.INGEST ? ONE_HOUR_IN_SECONDS : 60;
+    }
+    return expirySeconds;
+}
 class NetaceaBase {
     // eslint-disable-next-line max-lines-per-function
-    constructor({ apiKey, secretKey, timeout = defaultTimeout, retries = maximumRetries, mitigationServiceUrl = 'https://mitigations.netacea.net', ingestServiceUrl = 'https://ingest.netacea.net', mitigationType = NetaceaMitigationType.INGEST, captchaSiteKey, captchaSecretKey, ingestType = NetaceaIngestType.HTTP, kinesis }) {
+    constructor({ apiKey, secretKey, timeout = defaultTimeout, retries = maximumRetries, mitigationServiceUrl = 'https://mitigations.netacea.net', ingestServiceUrl = 'https://ingest.netacea.net', mitigationType = NetaceaBase_enums_1.NetaceaMitigationType.INGEST, captchaSiteKey, captchaSecretKey, ingestType = NetaceaBase_enums_1.NetaceaIngestType.HTTP, kinesis, logVersion, mitataCookieExpirySeconds }) {
         if (apiKey === null || apiKey === undefined) {
             throw new Error('apiKey is a required parameter');
         }
@@ -61,8 +40,9 @@ class NetaceaBase {
         this.mitigationServiceUrl = mitigationServiceUrl;
         this.ingestServiceUrl = ingestServiceUrl;
         this.mitigationType = mitigationType;
-        this.ingestType = ingestType !== null && ingestType !== void 0 ? ingestType : NetaceaIngestType.HTTP;
-        if (this.ingestType === NetaceaIngestType.KINESIS) {
+        this.ingestType = ingestType !== null && ingestType !== void 0 ? ingestType : NetaceaBase_enums_1.NetaceaIngestType.HTTP;
+        this.logVersion = logVersion !== null && logVersion !== void 0 ? logVersion : NetaceaBase_enums_1.NetaceaLogVersion.V1;
+        if (this.ingestType === NetaceaBase_enums_1.NetaceaIngestType.KINESIS) {
             if (kinesis === undefined) {
                 // eslint-disable-next-line no-console
                 console.warn(`NETACEA WARN: no kinesis args provided, when ingestType is ${this.ingestType}`);
@@ -75,29 +55,38 @@ class NetaceaBase {
             }
         }
         if (captchaSiteKey !== undefined || captchaSecretKey !== undefined) {
-            if (typeof captchaSiteKey === 'string' && typeof captchaSecretKey === 'string') {
-                this.captchaSiteKey = captchaSiteKey;
-                this.captchaSecretKey = captchaSecretKey;
-            }
-            else {
-                // eslint-disable-next-line no-console
-                console.warn('NETACEA WARN: failed to configure captcha keys');
-            }
+            this.captchaSiteKey = captchaSiteKey;
+            this.captchaSecretKey = captchaSecretKey;
         }
         this.timeout = correctTimeout(timeout);
         this.retries = correctRetries(retries);
+        this.mitataCookieExpirySeconds = configureMitataExpiry(mitigationType, mitataCookieExpirySeconds);
     }
     async runMitigation(args) {
-        switch (this.mitigationType) {
-            case NetaceaMitigationType.MITIGATE:
-                return await this.mitigate(args);
-            case NetaceaMitigationType.INJECT:
-                return await this.inject(args);
-            case NetaceaMitigationType.INGEST:
-                return this.processIngest(args);
-            default:
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                throw new Error(`Netacea Error: Mitigation type ${this.mitigationType} not recognised`);
+        try {
+            switch (this.mitigationType) {
+                case NetaceaBase_enums_1.NetaceaMitigationType.MITIGATE:
+                    return await this.mitigate(args);
+                case NetaceaBase_enums_1.NetaceaMitigationType.INJECT:
+                    return await this.inject(args);
+                case NetaceaBase_enums_1.NetaceaMitigationType.INGEST:
+                    return this.processIngest(args);
+                default:
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    throw new Error(`Netacea Error: Mitigation type ${this.mitigationType} not recognised`);
+            }
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('Netacea FAILOPEN Error:', e);
+            return {
+                injectHeaders: {
+                    'x-netacea-captcha': '0',
+                    'x-netacea-match': '0',
+                    'x-netacea-mitigate': '0'
+                },
+                sessionStatus: ''
+            };
         }
     }
     readCookie(cookieName, cookies) {
@@ -112,7 +101,7 @@ class NetaceaBase {
     }
     async callIngest(args) {
         const body = this.constructWebLog(args);
-        if (this.ingestType === NetaceaIngestType.KINESIS) {
+        if (this.ingestType === NetaceaBase_enums_1.NetaceaIngestType.KINESIS) {
             if (this.kinesis === undefined) {
                 // eslint-disable-next-line no-console
                 console.error('Netacea Error: Unable to log as Kinesis has not been defined.');
@@ -150,18 +139,53 @@ class NetaceaBase {
             timeout: this.timeout
         });
     }
-    constructWebLog({ ip, userAgent, status, method, path, protocol, referer, bytesSent, requestTime, mitataCookie, sessionStatus, integrationType, integrationVersion }) {
-        const requestValue = `${method} ${path} ${protocol}`;
-        const timeLocal = new Date();
-        const timestamp = timeLocal.toUTCString();
+    constructV2WebLog({ ip, userAgent, status, method, path, protocol, referer, bytesSent, requestTime, mitataCookie, sessionStatus, integrationType, integrationVersion }) {
+        var _a;
+        const now = new Date();
+        // Paths must be prefixed with '/'
+        if (path[0] !== '/') {
+            path = `/${path}`;
+        }
+        let actualQuery;
+        const splitPath = path.split('?');
+        if (splitPath.length > 1) {
+            actualQuery = `?${splitPath[1]}`;
+        }
+        const actualPath = splitPath[0];
+        const userId = (_a = mitataCookie_1.matchMitataCookie(mitataCookie)) === null || _a === void 0 ? void 0 : _a.userId;
+        const log = {
+            status,
+            method,
+            'bytes_sent': safeParseInt(bytesSent),
+            'referrer': referer === '' ? undefined : referer,
+            'request': `${method} ${actualPath}${actualQuery !== null && actualQuery !== void 0 ? actualQuery : ''} ${protocol}`,
+            'request_time': safeParseInt(requestTime),
+            'integration_type': integrationType,
+            'integration_version': integrationVersion,
+            'client': ip,
+            'user_agent': userAgent,
+            'bc_type': sessionStatus === '' ? undefined : sessionStatus,
+            'hour': now.getUTCHours(),
+            'minute': now.getUTCMinutes(),
+            // '2021-08-04T14:22:41.155Z' = toISOString()
+            '@timestamp': now.toISOString().replace('Z', '+00:00'),
+            'path': actualPath,
+            protocol,
+            'query': actualQuery,
+            'user_id': userId
+        };
+        return log;
+    }
+    constructV1WebLog({ ip, userAgent, status, method, path, protocol, referer, bytesSent, requestTime, mitataCookie, sessionStatus, integrationType, integrationVersion }) {
+        const timestamp = new Date().toUTCString();
         return {
-            Request: requestValue,
+            Request: `${method} ${path} ${protocol}`,
             TimeLocal: timestamp,
             RealIp: ip,
             UserAgent: userAgent,
             Status: status,
-            RequestTime: requestTime,
-            BytesSent: bytesSent === '' ? '0' : bytesSent,
+            RequestTime: requestTime === null || requestTime === void 0 ? void 0 : requestTime.toString(),
+            BytesSent: bytesSent === null || bytesSent === void 0 ? void 0 : bytesSent.toString(),
             Referer: referer === '' ? '-' : referer,
             NetaceaUserIdCookie: mitataCookie !== null && mitataCookie !== void 0 ? mitataCookie : '',
             NetaceaMitigationApplied: sessionStatus !== null && sessionStatus !== void 0 ? sessionStatus : '',
@@ -169,21 +193,31 @@ class NetaceaBase {
             IntegrationVersion: integrationVersion !== null && integrationVersion !== void 0 ? integrationVersion : ''
         };
     }
+    constructWebLog(args) {
+        args.bytesSent = args.bytesSent === '' ? '0' : args.bytesSent;
+        if (this.logVersion === NetaceaBase_enums_1.NetaceaLogVersion.V2) {
+            return this.constructV2WebLog(args);
+        }
+        return this.constructV1WebLog(args);
+    }
     async check(netaceaCookie, clientIP, userAgent, captchaCookie) {
+        var _a, _b;
         let status, match, mitigate, captcha, body, setCookie, eventId;
         if (this.secretKey === undefined) {
             throw new Error('Secret key is required to mitigate');
         }
-        const cookieInfo = mitataCookie_1.checkCookie(netaceaCookie, this.secretKey);
-        if (!cookieInfo.valid || cookieInfo.expired) {
+        const cookieInfo = mitataCookie_1.checkMitataCookie(netaceaCookie, clientIP, this.secretKey);
+        if (!cookieInfo.isPrimaryHashValid || cookieInfo.requiresReissue) {
             // Get latest mitigation information
-            const result = await this.makeMitigateAPICall(netaceaCookie, clientIP, userAgent, captchaCookie);
+            const result = await this.makeMitigateAPICall((_a = cookieInfo.mitata) === null || _a === void 0 ? void 0 : _a.userId, clientIP, userAgent, captchaCookie);
             status = result.status;
             match = result.match;
             mitigate = result.mitigate;
             captcha = result.captcha;
             body = result.body;
-            setCookie = result.setCookie;
+            setCookie = [
+                this.createMitata(clientIP, (_b = cookieInfo.mitata) === null || _b === void 0 ? void 0 : _b.userId, match, mitigate, captcha, result.mitataMaxAge)
+            ];
             eventId = result.eventId;
         }
         else {
@@ -196,38 +230,44 @@ class NetaceaBase {
         }
         return this.composeResult(body, setCookie, status, match, mitigate, captcha, false, eventId);
     }
+    createMitata(clientIP, userId, match, mitigate, captcha, maxAge = 86400, expiry = undefined) {
+        // serve, fail, cookiefail
+        const isCaptchaServe = [1, 3, 5].includes(captcha);
+        const expiryDelta = isCaptchaServe ? -this.mitataCookieExpirySeconds : this.mitataCookieExpirySeconds;
+        const mitataExpiry = expiry !== null && expiry !== void 0 ? expiry : Math.floor(Date.now() / 1000) + expiryDelta;
+        if (this.secretKey === undefined) {
+            throw new Error('Cannot build cookie without secret key.');
+        }
+        const mitataCode = [match, mitigate, captcha].join('');
+        const mitataValue = mitataCookie_1.createMitataCookie(clientIP, userId, mitataExpiry, this.secretKey, mitataCode);
+        return this.buildCookieFromValues('_mitata', mitataValue, maxAge, '/');
+    }
     async processCaptcha(netaceaCookie, clientIP, userAgent, captchaData) {
         const { status, match, mitigate, captcha, body, setCookie } = await this.makeCaptchaAPICall(netaceaCookie, clientIP, userAgent, captchaData);
         return this.composeResult(body, setCookie, status, match, mitigate, captcha, true);
     }
-    getCookiesFromHeaders(headers) {
-        const setCookie = [];
-        const mitata = headers[dictionary_1.netaceaHeaders.mitata];
-        const mitataExpiry = parseInt(headers[dictionary_1.netaceaHeaders.mitataExpiry]);
-        const mitataCookie = this.buildCookieFromValues('_mitata', mitata, mitataExpiry);
-        if (mitataCookie !== undefined) {
-            setCookie.push(mitataCookie);
-        }
+    getMitataCaptchaFromHeaders(headers) {
         if (Object.prototype.hasOwnProperty.call(headers, dictionary_1.netaceaHeaders.mitataCaptcha)) {
             const mitataCaptcha = headers[dictionary_1.netaceaHeaders.mitataCaptcha];
             const mitataCaptchaExpiry = parseInt(headers[dictionary_1.netaceaHeaders.mitataCaptchaExpiry]);
             const mitataCaptchaCookie = this.buildCookieFromValues('_mitatacaptcha', mitataCaptcha, mitataCaptchaExpiry);
             if (mitataCaptchaCookie !== undefined) {
-                setCookie.push(mitataCaptchaCookie);
+                return mitataCaptchaCookie;
             }
         }
-        return setCookie;
+        return undefined;
     }
     async makeCaptchaAPICall(netaceaCookie, clientIP, userAgent, captchaData) {
         const headers = {
             'X-Netacea-API-Key': this.apiKey,
             'X-Netacea-Client-IP': clientIP,
             'user-agent': userAgent,
-            'cookie': this.buildCookieHeader({
-                _mitata: netaceaCookie
-            }),
             'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
         };
+        const mitata = mitataCookie_1.matchMitataCookie(netaceaCookie);
+        if (mitata !== undefined) {
+            headers['X-Netacea-UserId'] = mitata.userId;
+        }
         if (this.captchaSiteKey !== undefined && this.captchaSecretKey !== undefined) {
             headers['X-Netacea-Captcha-Site-Key'] = this.captchaSiteKey;
             headers['X-Netacea-Captcha-Secret-Key'] = this.captchaSecretKey;
@@ -240,16 +280,25 @@ class NetaceaBase {
             body: captchaData,
             timeout: this.timeout
         });
-        return this.getApiCallResponseFromResponse(res);
+        return this.getApiCallResponseFromResponse(res, mitata === null || mitata === void 0 ? void 0 : mitata.userId, clientIP);
     }
-    getApiCallResponseFromResponse(response) {
+    getApiCallResponseFromResponse(response, userId, clientIP) {
         if (response.status !== 200) {
             throw this.APIError(response);
         }
         const match = parseInt(response.headers[dictionary_1.netaceaHeaders.match]);
         const mitigate = parseInt(response.headers[dictionary_1.netaceaHeaders.mitigate]);
         const captcha = parseInt(response.headers[dictionary_1.netaceaHeaders.captcha]);
-        const setCookie = this.getCookiesFromHeaders(response.headers);
+        let mitataMaxAge = parseInt(response.headers[dictionary_1.netaceaHeaders.mitataExpiry]);
+        if (isNaN(mitataMaxAge)) {
+            mitataMaxAge = 86400;
+        }
+        const mitata = this.createMitata(clientIP, userId, match, mitigate, captcha);
+        const mitataCaptcha = this.getMitataCaptchaFromHeaders(response.headers);
+        const setCookie = [
+            mitata,
+            mitataCaptcha
+        ].filter(c => c !== undefined);
         const eventId = response.headers[dictionary_1.netaceaHeaders.eventId];
         return {
             status: response.status,
@@ -258,14 +307,12 @@ class NetaceaBase {
             captcha,
             setCookie,
             body: response.body,
-            eventId
+            eventId,
+            mitataMaxAge
         };
     }
     buildCookieFromValues(cookieName, value, maxAge, path = '/') {
-        if (value !== undefined && maxAge !== undefined) {
-            return `${cookieName}=${value}; Max-Age=${maxAge}; Path=${path}`;
-        }
-        return undefined;
+        return `${cookieName}=${value}; Max-Age=${maxAge}; Path=${path}`;
     }
     buildCookieHeader(cookies) {
         let cookiestr = '';
@@ -279,16 +326,18 @@ class NetaceaBase {
         }
         return cookiestr;
     }
-    async makeMitigateAPICall(netaceaCookie, clientIP, userAgent, captchaCookie) {
+    async makeMitigateAPICall(userId, clientIP, userAgent, captchaCookie) {
         const headers = {
             'X-Netacea-API-Key': this.apiKey,
             'X-Netacea-Client-IP': clientIP,
             'user-agent': userAgent,
             'cookie': this.buildCookieHeader({
-                _mitata: netaceaCookie,
                 _mitatacaptcha: captchaCookie
             })
         };
+        if (userId !== undefined) {
+            headers['X-Netacea-UserId'] = userId;
+        }
         if (this.captchaSiteKey !== undefined && this.captchaSecretKey !== undefined) {
             headers['X-Netacea-Captcha-Site-Key'] = this.captchaSiteKey;
             headers['X-Netacea-Captcha-Secret-Key'] = this.captchaSecretKey;
@@ -300,7 +349,7 @@ class NetaceaBase {
             method: 'GET',
             timeout: this.timeout
         });
-        return this.getApiCallResponseFromResponse(res);
+        return this.getApiCallResponseFromResponse(res, userId, clientIP);
     }
     composeResult(body, setCookie, status, match, mitigate, captcha, isCaptchaPost, eventId) {
         const bestMitigation = this.findBestMitigation(match, mitigate, captcha, isCaptchaPost);
@@ -316,7 +365,7 @@ class NetaceaBase {
                 dictionary_1.mitigationTypes.captchaPass
             ].includes(bestMitigation.mitigation)
         };
-        if (this.mitigationType === NetaceaMitigationType.INJECT) {
+        if (this.mitigationType === NetaceaBase_enums_1.NetaceaMitigationType.INJECT) {
             const injectHeaders = {
                 'x-netacea-match': bestMitigation.parts.match.toString(),
                 'x-netacea-mitigate': bestMitigation.parts.mitigate.toString(),
@@ -350,7 +399,7 @@ class NetaceaBase {
                 mitigation = bestCaptchaMitigation;
             }
         }
-        if (this.mitigationType === NetaceaMitigationType.INJECT) {
+        if (this.mitigationType === NetaceaBase_enums_1.NetaceaMitigationType.INJECT) {
             mitigation = dictionary_1.mitigationTypes.none;
         }
         return {
@@ -386,35 +435,26 @@ class NetaceaBase {
             ? this.processCaptcha(args.mitata, args.clientIp, args.userAgent, await args.getBodyFn())
             : this.check(args.mitata, args.clientIp, args.userAgent, args.mitataCaptcha));
     }
-    setWorkerCookie(userId, saltKey) {
-        const expiryTime = Math.floor(Date.now() / 1000) + ONE_HOUR_IN_SECONDS;
-        const userCookie = mitataCookie_1.createWorkerCookie(userId, expiryTime, saltKey);
-        const mitataCookie = this.buildCookieFromValues('_mitata', userCookie, ONE_DAY_IN_SECONDS);
-        const setCookie = [];
-        if (mitataCookie !== undefined) {
-            setCookie.push(mitataCookie);
-        }
+    setIngestOnlyMitataCookie(userId) {
+        const mitataCookie = this.createMitata(mitataCookie_1.ingestIgnoredIpValue, userId, 0, 0, 0, ONE_DAY_IN_SECONDS);
         return {
             sessionStatus: '',
-            setCookie
+            setCookie: [mitataCookie]
         };
     }
     processIngest(args) {
+        var _a;
         if (this.secretKey === undefined) {
             throw new Error('Secret key is required for ingest');
         }
         const cookies = this.getCookieHeader(args);
         const netaceaCookie = this.readCookie('_mitata', cookies);
-        if (netaceaCookie === undefined) {
-            return this.setWorkerCookie(undefined, this.secretKey);
-        }
-        const cookieInfo = mitataCookie_1.checkCookie(netaceaCookie, this.secretKey);
-        if (!cookieInfo.valid) {
-            return this.setWorkerCookie(undefined, this.secretKey);
+        const cookieInfo = mitataCookie_1.checkMitataCookie(netaceaCookie, mitataCookie_1.ingestIgnoredIpValue, this.secretKey);
+        if (!cookieInfo.isPrimaryHashValid) {
+            return this.setIngestOnlyMitataCookie(undefined);
         }
-        if (cookieInfo.expired) {
-            const mitata = mitataCookie_1.matchMitataCookie(netaceaCookie);
-            return this.setWorkerCookie(mitata === null || mitata === void 0 ? void 0 : mitata.userId, this.secretKey);
+        if (cookieInfo.requiresReissue) {
+            return this.setIngestOnlyMitataCookie((_a = cookieInfo.mitata) === null || _a === void 0 ? void 0 : _a.userId);
         }
         return {
             sessionStatus: '',

package/dist/NetaceaBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"NetaceaBase.js","sourceRoot":"","sources":["../src/NetaceaBase.ts"],"names":[],"mappings":";;;AAAA,6CAIqB;AAErB,iDAIuB;AACvB,0DAE+B;AAC/B,MAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,CAAA;AACnC,MAAM,kBAAkB,GAAG,mBAAmB,GAAG,EAAE,CAAA;AAuGnD,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,wCAAmB,CAAA;AACrB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,qBA0BX;AA1BD,WAAY,qBAAqB;IAC/B;;;OAGG;IACH,8CAAqB,CAAA;IACrB;;;;;;;;;;OAUG;IACH,0CAAiB,CAAA;IACjB;;;;;;OAMG;IACH,0CAAiB,CAAA;AACnB,CAAC,EA1BW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QA0BhC;AA6BD,SAAS,cAAc,CAAE,OAAe;IACtC,OAAO,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAA;AAChD,CAAC;AAED,SAAS,cAAc,CAAE,OAAe;IACtC,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO,CAAC,CAAA;KACT;IACD,OAAO,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAA;AAC5D,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,CAAA;AACxB,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B,MAA8B,WAAW;IAmBvC,kDAAkD;IAClD,YAAa,EACX,MAAM,EACN,SAAS,EACT,OAAO,GAAG,cAAc,EACxB,OAAO,GAAG,cAAc,EACxB,oBAAoB,GAAG,iCAAiC,EACxD,gBAAgB,GAAG,4BAA4B,EAC/C,cAAc,GAAG,qBAAqB,CAAC,MAAM,EAC7C,cAAc,EACd,gBAAgB,EAChB,UAAU,GAAG,iBAAiB,CAAC,IAAI,EACnC,OAAO,EACS;QAChB,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;SAClD;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,iBAAiB,CAAC,IAAI,CAAA;QACtD,IAAI,IAAI,CAAC,UAAU,KAAK,iBAAiB,CAAC,OAAO,EAAE;YACjD,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;aAC9F;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAc,CAAC;oBAChC,GAAG,OAAO;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAA;aACH;SACF;QACD,IAAI,cAAc,KAAK,SAAS,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClE,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;gBAC9E,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;gBACpC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;aACzC;iBAAM;gBACL,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;aAC/D;SACF;QACD,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QACtC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAE,IAAiB;QAC3C,QAAQ,IAAI,CAAC,cAAc,EAAE;YAC3B,KAAK,qBAAqB,CAAC,QAAQ;gBACjC,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAClC,KAAK,qBAAqB,CAAC,MAAM;gBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAChC,KAAK,qBAAqB,CAAC,MAAM;gBAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;YACjC;gBACE,4EAA4E;gBAC5E,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,cAAc,iBAAiB,CAAC,CAAA;SAC1F;IACH,CAAC;IAES,UAAU,CAAE,UAAkB,EAAE,OAAkC;QAC1E,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC7C,OAAO,SAAS,CAAA;SACjB;QACD,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,aAAa,CAAC,CAAA;QAC1D,MAAM,WAAW,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC7C,IAAI,UAAU,KAAK,IAAI,IAAI,WAAW,KAAK,IAAI;YAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;QACxE,OAAO,SAAS,CAAA;IAClB,CAAC;IAES,KAAK,CAAC,UAAU,CAAE,IAAgB;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,IAAI,CAAC,UAAU,KAAK,iBAAiB,CAAC,OAAO,EAAE;YACjD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAA;gBAC9E,OAAM;aACP;YACD,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBACxB,GAAG,IAAI;oBACP,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;aACrB;YAAC,OAAO,CAAC,EAAE;gBACV,sCAAsC;gBACtC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;aAC5C;SACF;aAAM;YACL,MAAM,OAAO,GAAG;gBACd,mBAAmB,EAAE,IAAI,CAAC,MAAM;gBAChC,cAAc,EAAE,kBAAkB;aACnC,CAAA;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;YACvD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;aACzB;SACF;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAE,OAAgC,EAAE,IAAY;QAC7E,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,gBAAgB;YAC3B,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,GAAG;YACT,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAA;IACJ,CAAC;IAES,eAAe,CAAE,EACzB,EAAE,EACF,SAAS,EACT,MAAM,EACN,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,SAAS,EACT,WAAW,EACX,YAAY,EACZ,aAAa,EACb,eAAe,EACf,kBAAkB,EACP;QACX,MAAM,YAAY,GAAG,GAAG,MAAM,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAA;QACpD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;QAC5B,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO;YACL,OAAO,EAAE,YAAY;YACrB,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,EAAE;YACV,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,WAAW;YACxB,SAAS,EAAE,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YAC7C,OAAO,EAAE,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO;YACvC,mBAAmB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACvC,wBAAwB,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE;YAC7C,eAAe,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE;YACtC,kBAAkB,EAAE,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE;SAC7C,CAAA;IACH,CAAC;IAES,KAAK,CAAC,KAAK,CAAE,aAAiC,EACtD,QAAgB,EAChB,SAAiB,EACjB,aAAsB;QAEtB,IAAI,MAAc,EAAE,KAAa,EAAE,QAAgB,EAAE,OAAe,EAClE,IAAwB,EAAE,SAAmB,EAAE,OAA2B,CAAA;QAC5E,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QACD,MAAM,UAAU,GAAG,0BAAW,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAC7D,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,OAAO,EAAE;YAC3C,oCAAoC;YACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;YAChG,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YACtB,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YACpB,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAC1B,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YACxB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YAClB,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAC5B,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;SACzB;aAAM;YACL,MAAM,GAAG,CAAC,CAAC,CAAA;YACX,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;YACxB,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;YAC9B,OAAO,GAAG,UAAU,CAAC,OAAO,CAAA;YAC5B,IAAI,GAAG,SAAS,CAAA;YAChB,SAAS,GAAG,EAAE,CAAA;SACf;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAC9F,CAAC;IAEO,KAAK,CAAC,cAAc,CAAE,aAAiC,EAC7D,QAAgB,EAChB,SAAiB,EACjB,WAAgB;QAEhB,MAAM,EACJ,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAClD,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;QAClF,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACpF,CAAC;IAEO,qBAAqB,CAAE,OAAgC;QAC7D,MAAM,SAAS,GAAa,EAAE,CAAA;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,2BAAc,CAAC,MAAM,CAAC,CAAA;QAC7C,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,YAAY,CAAC,CAAC,CAAA;QACnE,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;QAChF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAC7B;QAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAc,CAAC,aAAa,CAAC,EAAE;YAC/E,MAAM,aAAa,GAAG,OAAO,CAAC,2BAAc,CAAC,aAAa,CAAC,CAAA;YAC3D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,mBAAmB,CAAC,CAAC,CAAA;YACjF,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,aAAa,EAAE,mBAAmB,CAAC,CAAA;YAC5G,IAAI,mBAAmB,KAAK,SAAS,EAAE;gBACrC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;aACpC;SACF;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAE,aAAiC,EACjE,QAAgB,EAChB,SAAiB,EACjB,WAAgB;QAEhB,MAAM,OAAO,GAA4B;YACvC,mBAAmB,EAAE,IAAI,CAAC,MAAM;YAChC,qBAAqB,EAAE,QAAQ;YAC/B,YAAY,EAAE,SAAS;YACvB,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC;gBAC/B,OAAO,EAAE,aAAa;aACvB,CAAC;YACF,cAAc,EAAE,kDAAkD;SACnE,CAAA;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YAC5E,OAAO,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAA;YAC3D,OAAO,CAAC,8BAA8B,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAA;SAChE;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,oBAAoB;YAC/B,IAAI,EAAE,mBAAmB;YACzB,OAAO;YACP,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,CAAA;IACjD,CAAC;IAEO,8BAA8B,CAAE,QAA6B;QACnE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;YAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;SAC9B;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,KAAK,CAAC,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,QAAQ,CAAC,CAAC,CAAA;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAA;QAClE,MAAM,SAAS,GAAa,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACxE,MAAM,OAAO,GAAuB,QAAQ,CAAC,OAAO,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAA;QAC5E,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK;YACL,QAAQ;YACR,OAAO;YACP,SAAS;YACT,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO;SACR,CAAA;IACH,CAAC;IAEO,qBAAqB,CAAE,UAAkB,EAAE,KAAc,EAAE,MAAe,EAAE,IAAI,GAAG,GAAG;QAC5F,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE;YAC/C,OAAO,GAAG,UAAU,IAAI,KAAK,aAAa,MAAM,UAAU,IAAI,EAAE,CAAA;SACjE;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,iBAAiB,CAAE,OAA4C;QACrE,IAAI,SAAS,GAAG,EAAE,CAAA;QAClB,IAAI,SAAS,GAAG,EAAE,CAAA;QAClB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;YACnC,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC7B,SAAS,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,IAAI,WAAW,EAAE,CAAA;gBAC9D,SAAS,GAAG,IAAI,CAAA;aACjB;SACF;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAE,aAAiC,EAClE,QAAgB,EAChB,SAAiB,EACjB,aAAiC;QAEjC,MAAM,OAAO,GAA4B;YACvC,mBAAmB,EAAE,IAAI,CAAC,MAAM;YAChC,qBAAqB,EAAE,QAAQ;YAC/B,YAAY,EAAE,SAAS;YACvB,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC;gBAC/B,OAAO,EAAE,aAAa;gBACtB,cAAc,EAAE,aAAa;aAC9B,CAAC;SACH,CAAA;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YAC5E,OAAO,CAAC,4BAA4B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAA;YAC3D,OAAO,CAAC,8BAA8B,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAA;SAChE;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,oBAAoB;YAC/B,IAAI,EAAE,GAAG;YACT,OAAO;YACP,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,CAAA;IACjD,CAAC;IAEO,aAAa,CAAE,IAAwB,EAC7C,SAAmB,EACnB,MAAc,EACd,KAAa,EACb,QAAgB,EAChB,OAAe,EACf,aAAsB,EACtB,OAAgB;QAEhB,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAA;QACvF,MAAM,MAAM,GAA0B;YACpC,IAAI;YACJ,aAAa,EAAE,MAAM;YACrB,SAAS;YACT,aAAa,EAAE,cAAc,CAAC,aAAa;YAC3C,UAAU,EAAE,cAAc,CAAC,UAAU;YACrC,SAAS,EAAE;gBACT,4BAAe,CAAC,KAAK;gBACrB,4BAAe,CAAC,OAAO;gBACvB,4BAAe,CAAC,WAAW;aAC5B,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;SACtC,CAAA;QACD,IAAI,IAAI,CAAC,cAAc,KAAK,qBAAqB,CAAC,MAAM,EAAE;YACxD,MAAM,aAAa,GAAkB;gBACnC,iBAAiB,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACxD,oBAAoB,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE;gBAC9D,mBAAmB,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;aAC7D,CAAA;YACD,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,aAAa,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAA;aAC9C;YACD,MAAM,CAAC,aAAa,GAAG,aAAa,CAAA;SACrC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,kBAAkB,CAAE,KAAa,EACzC,QAAgB,EAChB,OAAe,EACf,aAAsB;;QAEtB,MAAM,OAAO,GAAG,SAAS,CAAA;QACzB,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,OAAO,KAAK,CAAC,EAAE;gBACjB,OAAO,GAAG,CAAC,CAAA;aACZ;iBAAM,IAAI,OAAO,KAAK,CAAC,EAAE;gBACxB,OAAO,GAAG,CAAC,CAAA;aACZ;SACF;QAED,IAAI,aAAa,SAAG,qBAAQ,CAAC,KAAK,CAAC,mCAAI,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;QACtD,aAAa,UAAI,wBAAW,CAAC,QAAQ,CAAC,mCAAI,OAAO,CAAA;QACjD,IAAI,UAAU,GAAG,8BAAiB,CAAC,QAAQ,CAAC,CAAA;QAC5C,IAAI,OAAO,KAAK,CAAC,EAAE;YACjB,aAAa,IAAI,GAAG,GAAG,OAAC,uBAAU,CAAC,OAAO,CAAC,mCAAI,OAAO,CAAC,CAAA;YACvD,MAAM,qBAAqB,GAAG,qCAAwB,CAAC,OAAO,CAAC,CAAA;YAC/D,IAAI,qBAAqB,KAAK,SAAS,EAAE;gBACvC,UAAU,GAAG,qBAAqB,CAAA;aACnC;SACF;QACD,IAAI,IAAI,CAAC,cAAc,KAAK,qBAAqB,CAAC,MAAM,EAAE;YACxD,UAAU,GAAG,4BAAe,CAAC,IAAI,CAAA;SAClC;QACD,OAAO;YACL,aAAa;YACb,UAAU;YACV,KAAK,EAAE;gBACL,KAAK;gBACL,QAAQ;gBACR,OAAO;aACR;SACF,CAAA;IACH,CAAC;IAES,QAAQ,CAAE,QAAyB;QAC3C,IAAI,OAAO,GAAG,eAAe,CAAA;QAC7B,QAAQ,QAAQ,CAAC,MAAM,EAAE;YACvB,KAAK,GAAG;gBACN,OAAO,GAAG,qBAAqB,CAAA;gBAC/B,MAAK;YACP,KAAK,GAAG;gBACN,OAAO,GAAG,cAAc,CAAA;gBACxB,MAAK;YACP,KAAK,GAAG;gBACN,OAAO,GAAG,iBAAiB,CAAA;gBAC3B,MAAK;SACR;QACD,OAAO,IAAI,KAAK,CAAC,+BAA+B,OAAO,cAAc,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IACzF,CAAC;IAES,gBAAgB,CAAE,GAAW,EAAE,MAAc;QACrD,OAAO,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM,CAAA;IAC7E,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAE,IAAgC;QACtE,OAAO,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACxD,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACzF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAC7E,CAAA;IACH,CAAC;IAES,eAAe,CAAE,MAA0B,EAAE,OAAe;QACpE,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,mBAAmB,CAAA;QAC9E,MAAM,UAAU,GAAG,iCAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAA;QAC1F,MAAM,SAAS,GAAa,EAAE,CAAA;QAE9B,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAC7B;QAED,OAAO;YACL,aAAa,EAAE,EAAE;YACjB,SAAS;SACV,CAAA;IACH,CAAC;IAES,aAAa,CAAE,IAAiB;QACxC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;SACrD;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAEzD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;SACvD;QAED,MAAM,UAAU,GAAG,0BAAW,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAE7D,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACrB,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;SACvD;QAED,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,MAAM,MAAM,GAAG,gCAAiB,CAAC,aAAa,CAAC,CAAA;YAC/C,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;SAC5D;QAED,OAAO;YACL,aAAa,EAAE,EAAE;YACjB,SAAS,EAAE,EAAE;SACd,CAAA;IACH,CAAC;CACF;AAzdD,8BAydC"}
+{"version":3,"file":"NetaceaBase.js","sourceRoot":"","sources":["../src/NetaceaBase.ts"],"names":[],"mappings":"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"}

package/dist/NetaceaBase.types.d.ts

@@ -0,0 +1,112 @@
+import { KinesisIngestConfigArgs } from '@netacea/kinesisingest';
+import { NetaceaIngestType, NetaceaLogVersion, NetaceaMitigationType } from './NetaceaBase.enums';
+export interface MakeRequestArgs {
+    host: string;
+    path: string;
+    headers: {
+        [key: string]: string;
+    };
+    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+    body?: any;
+    timeout?: number;
+}
+export interface MakeRequestResponse {
+    status: number;
+    headers: {
+        [key: string]: string;
+    };
+    body?: any;
+}
+export interface NetaceaBaseArgs {
+    apiKey: string;
+    secretKey?: string;
+    captchaSiteKey?: string;
+    captchaSecretKey?: string;
+    timeout?: number;
+    retries?: number;
+    ingestServiceUrl?: string;
+    mitigationServiceUrl?: string;
+    mitigationType?: NetaceaMitigationType;
+    ingestType?: NetaceaIngestType;
+    kinesis?: KinesisIngestConfigArgs;
+    logVersion?: NetaceaLogVersion;
+    mitataCookieExpirySeconds?: number;
+}
+export interface InjectHeaders {
+    'x-netacea-match': string;
+    'x-netacea-mitigate': string;
+    'x-netacea-captcha': string;
+    'x-netacea-event-id'?: string;
+}
+export interface ComposeResultResponse {
+    body?: string;
+    apiCallStatus: number;
+    setCookie: string[];
+    sessionStatus: string;
+    mitigation: string;
+    mitigated: boolean;
+    injectHeaders?: InjectHeaders;
+}
+export interface IngestArgs {
+    ip: string;
+    userAgent: string;
+    status: string;
+    method: string;
+    path: string;
+    protocol: string;
+    referer: string;
+    bytesSent: string | number;
+    requestTime: string | number;
+    mitataCookie?: string;
+    sessionStatus?: string;
+    integrationType?: string;
+    integrationVersion?: string;
+}
+export interface WebLog {
+    Request: string;
+    TimeLocal: string;
+    RealIp: string;
+    UserAgent: string;
+    Status: string;
+    RequestTime: string;
+    BytesSent: string;
+    Referer: string;
+    NetaceaUserIdCookie: string;
+    NetaceaMitigationApplied: string;
+    IntegrationType?: string;
+    IntegrationVersion?: string;
+}
+export interface V2WebLog {
+    '@timestamp': string;
+    bc_type?: string;
+    bytes_sent: number;
+    client: string;
+    domain_name?: string;
+    domain_name_orig?: string;
+    hour: number;
+    integration_type?: string;
+    integration_version?: string;
+    method: string;
+    minute: number;
+    path: string;
+    protocol: string;
+    query?: string;
+    referrer?: string;
+    request: string;
+    request_time: number;
+    status: string;
+    user_agent: string;
+    user_id?: string;
+}
+export interface NetaceaResponseBase {
+    setCookie?: string[];
+    sessionStatus: string;
+}
+export interface MitigateResponse<T = any> extends NetaceaResponseBase {
+    response?: T;
+}
+export interface InjectResponse<T = any> extends MitigateResponse<T> {
+    injectHeaders: InjectHeaders | undefined;
+    response?: T | undefined;
+}
+export declare type NetaceaMitigationResponse<T> = MitigateResponse<T> | InjectResponse<T> | undefined;

package/dist/NetaceaBase.types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=NetaceaBase.types.js.map

package/dist/NetaceaBase.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetaceaBase.types.js","sourceRoot":"","sources":["../src/NetaceaBase.types.ts"],"names":[],"mappings":""}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import NetaceaBase from './NetaceaBase';
-export { MakeRequestArgs, MakeRequestResponse, NetaceaBaseArgs, WebLog, MitigateResponse, InjectResponse, ComposeResultResponse, NetaceaMitigationType, NetaceaMitigationResponse, InjectHeaders, NetaceaResponseBase, NetaceaIngestType, NetaceaMakeRequest } from './NetaceaBase';
-export { MitataCookie, matchMitataCookie } from './mitataCookie';
+export * from './NetaceaBase.enums';
+export * from './NetaceaBase.types';
+export { MitataCookie, CheckCookieResponse, matchMitataCookie, checkMitataCookie, createMitataCookie, hexSha256, ingestIgnoredIpValue } from './mitataCookie';
 export default NetaceaBase;

package/dist/index.js

@@ -1,10 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const NetaceaBase_1 = require("./NetaceaBase");
-var NetaceaBase_2 = require("./NetaceaBase");
-Object.defineProperty(exports, "NetaceaMitigationType", { enumerable: true, get: function () { return NetaceaBase_2.NetaceaMitigationType; } });
-Object.defineProperty(exports, "NetaceaIngestType", { enumerable: true, get: function () { return NetaceaBase_2.NetaceaIngestType; } });
+__exportStar(require("./NetaceaBase.enums"), exports);
+__exportStar(require("./NetaceaBase.types"), exports);
 var mitataCookie_1 = require("./mitataCookie");
 Object.defineProperty(exports, "matchMitataCookie", { enumerable: true, get: function () { return mitataCookie_1.matchMitataCookie; } });
+Object.defineProperty(exports, "checkMitataCookie", { enumerable: true, get: function () { return mitataCookie_1.checkMitataCookie; } });
+Object.defineProperty(exports, "createMitataCookie", { enumerable: true, get: function () { return mitataCookie_1.createMitataCookie; } });
+Object.defineProperty(exports, "hexSha256", { enumerable: true, get: function () { return mitataCookie_1.hexSha256; } });
+Object.defineProperty(exports, "ingestIgnoredIpValue", { enumerable: true, get: function () { return mitataCookie_1.ingestIgnoredIpValue; } });
 exports.default = NetaceaBase_1.default;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,+CAAuC;AACvC,6CAcsB;AANpB,oHAAA,qBAAqB,OAAA;AAIrB,gHAAA,iBAAiB,OAAA;AAInB,+CAGuB;AADrB,iHAAA,iBAAiB,OAAA;AAGnB,kBAAe,qBAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAuC;AACvC,sDAAmC;AACnC,sDAAmC;AACnC,+CAQuB;AALrB,iHAAA,iBAAiB,OAAA;AACjB,iHAAA,iBAAiB,OAAA;AACjB,kHAAA,kBAAkB,OAAA;AAClB,yGAAA,SAAS,OAAA;AACT,oHAAA,oBAAoB,OAAA;AAGtB,kBAAe,qBAAW,CAAA"}

package/dist/mitataCookie.d.ts

@@ -1,22 +1,27 @@
+export declare const ingestIgnoredIpValue = "ignored";
 export interface MitataCookie {
     signature: string;
     expiry: string;
     userId: string;
+    ipHash: string;
     mitigationType: string;
     match: number;
     mitigate: number;
     captcha: number;
 }
-interface CheckCookieResponse {
-    expired: boolean;
-    valid: boolean;
+export interface CheckCookieResponse {
+    mitata: MitataCookie | undefined;
+    requiresReissue: boolean;
+    isExpired: boolean;
+    shouldExpire: boolean;
+    isSameIP: boolean;
+    isPrimaryHashValid: boolean;
     match: number;
     mitigate: number;
     captcha: number;
 }
-export declare function matchMitataCookie(netaceaCookie: string): MitataCookie | undefined;
+export declare function matchMitataCookie(netaceaCookie: string | undefined): MitataCookie | undefined;
 export declare function generateId(length?: number, charset?: string[]): string;
-export declare function createWorkerCookie(userId: string | undefined, expiryTime: number, saltKey: string): string;
+export declare function createMitataCookie(clientIP: string, userId: string | undefined, expiryTime: number, saltKey: string, mitCode?: string): string;
 export declare function hexSha256(value: string, saltKey: string): string;
-export declare function checkCookie(netaceaCookie: string | undefined, secretKey: string): CheckCookieResponse;
-export {};
+export declare function checkMitataCookie(netaceaCookie: string | undefined, clientIP: string, secretKey: string): CheckCookieResponse;

package/dist/mitataCookie.js

@@ -1,18 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkCookie = exports.hexSha256 = exports.createWorkerCookie = exports.generateId = exports.matchMitataCookie = void 0;
+exports.checkMitataCookie = exports.hexSha256 = exports.createMitataCookie = exports.generateId = exports.matchMitataCookie = exports.ingestIgnoredIpValue = void 0;
 const crypto_1 = require("crypto");
 const dictionary_1 = require("./dictionary");
+// Using clientIP has no advantage when setting cookies in Ingest Only mode.
+// We therefore use a dummy value in place of the IP.
+// This brings its own advantage in that if the integration is switched
+// from INGEST to MITIGATE, then the INGEST cookie will be treated as expired
+// & a new MITIGATE cookie will be set
+exports.ingestIgnoredIpValue = 'ignored';
 const BASE_62_CHARSET = '1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
-const mitataCookieRegExp = /(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d)(\d)(\d))/;
+const mitataCookieRegExp = /^(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/(.*)_\/@#\/((\d)(\d)(\d))$/;
 function matchMitataCookie(netaceaCookie) {
+    if (netaceaCookie === undefined) {
+        return undefined;
+    }
     const matches = netaceaCookie.match(mitataCookieRegExp);
     if (matches !== null && matches !== undefined) {
-        const [, signature, expiry, userId, mitigationType, match, mitigate, captcha] = matches;
+        const [, signature, expiry, userId, ipHash, mitigationType, match, mitigate, captcha] = matches;
         return {
             signature,
             expiry,
             userId,
+            ipHash,
             mitigationType,
             match: parseInt(match),
             mitigate: parseInt(mitigate),
@@ -30,27 +40,36 @@ function generateId(length = 16, charset = BASE_62_CHARSET) {
     return `c${randomString}`;
 }
 exports.generateId = generateId;
-function createWorkerCookie(userId, expiryTime, saltKey) {
-    const ingestCookieValue = '000';
+function createMitataCookie(clientIP, userId, expiryTime, saltKey, mitCode = '000') {
     if (userId === undefined) {
         userId = generateId();
     }
-    const originCookieValue = `${expiryTime}${dictionary_1.COOKIEDELIMITER}${userId}${dictionary_1.COOKIEDELIMITER}${ingestCookieValue}`;
+    const ipHash = hexSha256(clientIP + '|' + String(expiryTime), saltKey);
+    const originCookieValue = [
+        expiryTime,
+        userId,
+        ipHash,
+        mitCode
+    ].join(dictionary_1.COOKIEDELIMITER);
     const value = hexSha256(originCookieValue, saltKey);
     const cookieValue = `${value}${dictionary_1.COOKIEDELIMITER}${originCookieValue}`;
     return cookieValue;
 }
-exports.createWorkerCookie = createWorkerCookie;
+exports.createMitataCookie = createMitataCookie;
 function hexSha256(value, saltKey) {
     const hash = crypto_1.createHmac('sha256', saltKey);
     hash.update(value);
     return Buffer.from(hash.digest('hex')).toString('base64');
 }
 exports.hexSha256 = hexSha256;
-function checkCookie(netaceaCookie, secretKey) {
+function checkMitataCookie(netaceaCookie, clientIP, secretKey) {
     const defaultInvalidResponse = {
-        expired: false,
-        valid: false,
+        mitata: undefined,
+        requiresReissue: false,
+        isExpired: false,
+        shouldExpire: false,
+        isSameIP: false,
+        isPrimaryHashValid: false,
         captcha: 0,
         match: 0,
         mitigate: 0
@@ -62,16 +81,22 @@ function checkCookie(netaceaCookie, secretKey) {
     if (mitata !== undefined) {
         // Check cookie signature
         const mitSvcStringValue = [
-            mitata.expiry, mitata.userId, mitata.mitigationType
+            mitata.expiry, mitata.userId, mitata.ipHash, mitata.mitigationType
         ].join(dictionary_1.COOKIEDELIMITER);
-        const mitSvcHMAC = crypto_1.createHmac('sha256', secretKey)
-            .update(mitSvcStringValue)
-            .digest('hex');
-        const expired = Math.floor(Date.now() / 1000) > parseInt(mitata.expiry);
-        const valid = mitata.signature === Buffer.from(mitSvcHMAC).toString('base64');
+        const currentUnixTime = Math.floor(Date.now() / 1000);
+        const isExpired = parseInt(mitata.expiry) < currentUnixTime;
+        // serve, fail, cookiefail
+        const shouldExpire = [1, 3, 5].includes(mitata.captcha);
+        const currentIPHash = hexSha256(clientIP + '|' + mitata.expiry, secretKey);
+        const isSameIP = mitata.ipHash === currentIPHash;
+        const valid = mitata.signature === hexSha256(mitSvcStringValue, secretKey);
         return {
-            expired,
-            valid,
+            mitata,
+            requiresReissue: isExpired || !isSameIP,
+            isExpired,
+            shouldExpire,
+            isSameIP,
+            isPrimaryHashValid: valid,
             match: mitata.match,
             mitigate: mitata.mitigate,
             captcha: mitata.captcha
@@ -79,5 +104,5 @@ function checkCookie(netaceaCookie, secretKey) {
     }
     return defaultInvalidResponse;
 }
-exports.checkCookie = checkCookie;
+exports.checkMitataCookie = checkMitataCookie;
 //# sourceMappingURL=mitataCookie.js.map

package/dist/mitataCookie.js.map

@@ -1 +1 @@
-{"version":3,"file":"mitataCookie.js","sourceRoot":"","sources":["../src/mitataCookie.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mitataCookie.js","sourceRoot":"","sources":["../src/mitataCookie.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netacea/netaceaintegrationbase",
-  "version": "1.5.0",
+  "version": "1.8.1",
   "description": "Base package for Netacea CDN integrations.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "typescript": "^3.9.7"
   },
   "dependencies": {
-    "@netacea/kinesisingest": "^1.1.0"
+    "@netacea/kinesisingest": "^1.2.0"
   },
-  "gitHead": "5c362b71c0191e5e5ab5dc36d374e651cc0641a6"
+  "gitHead": "09872268284b4550ac50a49e04d0a670fa030ca0"
 }