@netacea/netaceaintegrationbase 2.0.63 → 2.0.65

package/dist/index.cjs

@@ -112,7 +112,7 @@ const matchMap = {
     7: 'asn_',
     8: 'country_',
     9: 'combination_',
-    11: 'headerFP_' // b (base36)
+    b: 'headerFP_'
 };
 const mitigateMap = {
     0: '',
@@ -206,9 +206,9 @@ function matchMitataCookie(netaceaCookie) {
             userId,
             ipHash,
             mitigationType,
-            match: parseInt(match, 36),
-            mitigate: parseInt(mitigate),
-            captcha: parseInt(captcha)
+            match,
+            mitigate,
+            captcha
         };
     }
     return undefined;
@@ -254,9 +254,9 @@ function checkMitataCookie(netaceaCookie, clientIP, secretKey) {
         shouldExpire: false,
         isSameIP: false,
         isPrimaryHashValid: false,
-        captcha: 0,
-        match: 0,
-        mitigate: 0
+        captcha: '0',
+        match: '0',
+        mitigate: '0'
     };
     if (typeof netaceaCookie !== 'string' || netaceaCookie === '') {
         return defaultInvalidResponse;
@@ -270,8 +270,8 @@ function checkMitataCookie(netaceaCookie, clientIP, secretKey) {
         const currentUnixTime = Math.floor(Date.now() / 1000);
         const isExpired = parseInt(mitata.expiry) < currentUnixTime;
         // serve, fail, cookiefail
-        const isCaptchaServe = [1, 3, 5].includes(mitata.captcha);
-        const isHardBlocked = mitata.mitigate === 3;
+        const isCaptchaServe = ['1', '3', '5'].includes(mitata.captcha);
+        const isHardBlocked = mitata.mitigate === '3';
         const shouldExpire = isCaptchaServe || isHardBlocked;
         const currentIPHash = hexSha256(clientIP + '|' + mitata.expiry, secretKey);
         const isSameIP = mitata.ipHash === currentIPHash;
@@ -338,8 +338,8 @@ function checkNetaceaCookieV3(netaceaCookie, clientIP) {
         const isExpired = expiryTimestamp < currentUnixTime;
         const isSameIP = clientIP === netaceaCookieV3.clientIP;
         // serve, fail, cookiefail
-        const isCaptchaServe = [1, 3, 5].includes(netaceaCookieV3.captcha);
-        const isHardBlocked = netaceaCookieV3.mitigate === 3;
+        const isCaptchaServe = ['1', '3', '5'].includes(netaceaCookieV3.captcha);
+        const isHardBlocked = netaceaCookieV3.mitigate === '3';
         const shouldExpire = isCaptchaServe || isHardBlocked;
         return {
             mitata: netaceaCookieV3,
@@ -366,9 +366,9 @@ function matchNetaceaCookieV3(netaceaCookie) {
         userId: '',
         cookieId: '',
         gracePeriod: 0,
-        match: 0,
-        mitigate: 0,
-        captcha: 0,
+        match: '0',
+        mitigate: '0',
+        captcha: '0',
         issueTimestamp: 0,
         issueReason: '',
         checkAllPostRequests: undefined
@@ -380,8 +380,14 @@ function matchNetaceaCookieV3(netaceaCookie) {
         if (fullKey === undefined) {
             fullKey = Object.keys(netaceaCookieV3OptionalKeyMap).find(k => netaceaCookieV3OptionalKeyMap[k] === key);
         }
-        let parsedValue = value === '' ? undefined : Number(value);
-        if (parsedValue !== undefined && isNaN(parsedValue)) {
+        let parsedValue;
+        if (fullKey !== undefined && ['match', 'mitigate', 'captcha'].includes(fullKey)) {
+            parsedValue = value === '' ? undefined : value;
+        }
+        else {
+            parsedValue = value === '' ? undefined : Number(value);
+        }
+        if (parsedValue !== undefined && typeof parsedValue !== 'string' && isNaN(parsedValue)) {
             parsedValue = value;
         }
         cookieParams[fullKey] = parsedValue;
@@ -396,9 +402,9 @@ function defaultInvalidResponse() {
         shouldExpire: false,
         isSameIP: false,
         isPrimaryHashValid: false,
-        captcha: 0,
-        match: 0,
-        mitigate: 0,
+        captcha: '0',
+        match: '0',
+        mitigate: '0',
         issueReason: exports.NetaceaCookieV3IssueReason.NO_SESSION
     };
 }

package/dist/index.d.ts

@@ -367,32 +367,32 @@ interface NetaceaCookieV3 extends NetaceaCookieV3OptionalFeatures {
     userId: string;
     cookieId: string;
     gracePeriod: number;
-    match: number;
-    mitigate: number;
-    captcha: number;
+    match: string;
+    mitigate: string;
+    captcha: string;
     issueTimestamp: number;
     issueReason: string;
 }
-interface MitataCookie$1 {
+interface MitataCookie {
     signature: string;
     expiry: string;
     userId: string;
     ipHash: string;
     mitigationType: string;
-    match: number;
-    mitigate: number;
-    captcha: number;
+    match: string;
+    mitigate: string;
+    captcha: string;
 }
 interface CheckCookieResponse$1 {
-    mitata: MitataCookie$1 | NetaceaCookieV3 | undefined;
+    mitata: MitataCookie | NetaceaCookieV3 | undefined;
     requiresReissue: boolean;
     isExpired: boolean;
     shouldExpire: boolean;
     isSameIP: boolean;
     isPrimaryHashValid: boolean;
-    match: number;
-    mitigate: number;
-    captcha: number;
+    match: string;
+    mitigate: string;
+    captcha: string;
     issueReason: NetaceaCookieV3IssueReason;
 }
 interface FindBestMitigationResponse {
@@ -401,9 +401,9 @@ interface FindBestMitigationResponse {
     parts: NetaceaParts;
 }
 interface NetaceaParts {
-    match: number;
-    mitigate: number;
-    captcha: number;
+    match: string;
+    mitigate: string;
+    captcha: string;
 }
 interface APICallResponse {
     status: number;
@@ -427,16 +427,6 @@ interface ProcessMitigateRequestArgs {
 }
 
 declare const ingestIgnoredIpValue = "ignored";
-interface MitataCookie {
-    signature: string;
-    expiry: string;
-    userId: string;
-    ipHash: string;
-    mitigationType: string;
-    match: number;
-    mitigate: number;
-    captcha: number;
-}
 interface CheckCookieResponse {
     mitata: MitataCookie | NetaceaCookieV3 | undefined;
     requiresReissue: boolean;
@@ -444,9 +434,9 @@ interface CheckCookieResponse {
     shouldExpire: boolean;
     isSameIP: boolean;
     isPrimaryHashValid: boolean;
-    match: number;
-    mitigate: number;
-    captcha: number;
+    match: string;
+    mitigate: string;
+    captcha: string;
     issueReason?: NetaceaCookieV3IssueReason;
     userId?: string | undefined;
 }
@@ -487,12 +477,12 @@ declare const netaceaHeaders: {
     mitataCaptchaExpiry: string;
     eventId: string;
 };
-declare const matchMap: Record<number, string | undefined>;
-declare const mitigateMap: Record<number, string | undefined>;
-declare const captchaMap: Record<number, string | undefined>;
+declare const matchMap: Record<string, string | undefined>;
+declare const mitigateMap: Record<string, string | undefined>;
+declare const captchaMap: Record<string, string | undefined>;
 declare const captchaStatusCodes: Record<string, number | undefined>;
-declare const bestMitigationMap: Record<number, string>;
-declare const bestMitigationCaptchaMap: Record<number, string | undefined>;
+declare const bestMitigationMap: Record<string, string>;
+declare const bestMitigationCaptchaMap: Record<string, string | undefined>;
 declare const netaceaCookieV3KeyMap: Record<string, string>;
 declare const netaceaCookieV3OptionalKeyMap: Record<string, string>;
 declare const netaceaSettingsMap: Record<string, string>;

package/dist/index.mjs

@@ -110,7 +110,7 @@ const matchMap = {
     7: 'asn_',
     8: 'country_',
     9: 'combination_',
-    11: 'headerFP_' // b (base36)
+    b: 'headerFP_'
 };
 const mitigateMap = {
     0: '',
@@ -204,9 +204,9 @@ function matchMitataCookie(netaceaCookie) {
             userId,
             ipHash,
             mitigationType,
-            match: parseInt(match, 36),
-            mitigate: parseInt(mitigate),
-            captcha: parseInt(captcha)
+            match,
+            mitigate,
+            captcha
         };
     }
     return undefined;
@@ -252,9 +252,9 @@ function checkMitataCookie(netaceaCookie, clientIP, secretKey) {
         shouldExpire: false,
         isSameIP: false,
         isPrimaryHashValid: false,
-        captcha: 0,
-        match: 0,
-        mitigate: 0
+        captcha: '0',
+        match: '0',
+        mitigate: '0'
     };
     if (typeof netaceaCookie !== 'string' || netaceaCookie === '') {
         return defaultInvalidResponse;
@@ -268,8 +268,8 @@ function checkMitataCookie(netaceaCookie, clientIP, secretKey) {
         const currentUnixTime = Math.floor(Date.now() / 1000);
         const isExpired = parseInt(mitata.expiry) < currentUnixTime;
         // serve, fail, cookiefail
-        const isCaptchaServe = [1, 3, 5].includes(mitata.captcha);
-        const isHardBlocked = mitata.mitigate === 3;
+        const isCaptchaServe = ['1', '3', '5'].includes(mitata.captcha);
+        const isHardBlocked = mitata.mitigate === '3';
         const shouldExpire = isCaptchaServe || isHardBlocked;
         const currentIPHash = hexSha256(clientIP + '|' + mitata.expiry, secretKey);
         const isSameIP = mitata.ipHash === currentIPHash;
@@ -336,8 +336,8 @@ function checkNetaceaCookieV3(netaceaCookie, clientIP) {
         const isExpired = expiryTimestamp < currentUnixTime;
         const isSameIP = clientIP === netaceaCookieV3.clientIP;
         // serve, fail, cookiefail
-        const isCaptchaServe = [1, 3, 5].includes(netaceaCookieV3.captcha);
-        const isHardBlocked = netaceaCookieV3.mitigate === 3;
+        const isCaptchaServe = ['1', '3', '5'].includes(netaceaCookieV3.captcha);
+        const isHardBlocked = netaceaCookieV3.mitigate === '3';
         const shouldExpire = isCaptchaServe || isHardBlocked;
         return {
             mitata: netaceaCookieV3,
@@ -364,9 +364,9 @@ function matchNetaceaCookieV3(netaceaCookie) {
         userId: '',
         cookieId: '',
         gracePeriod: 0,
-        match: 0,
-        mitigate: 0,
-        captcha: 0,
+        match: '0',
+        mitigate: '0',
+        captcha: '0',
         issueTimestamp: 0,
         issueReason: '',
         checkAllPostRequests: undefined
@@ -378,8 +378,14 @@ function matchNetaceaCookieV3(netaceaCookie) {
         if (fullKey === undefined) {
             fullKey = Object.keys(netaceaCookieV3OptionalKeyMap).find(k => netaceaCookieV3OptionalKeyMap[k] === key);
         }
-        let parsedValue = value === '' ? undefined : Number(value);
-        if (parsedValue !== undefined && isNaN(parsedValue)) {
+        let parsedValue;
+        if (fullKey !== undefined && ['match', 'mitigate', 'captcha'].includes(fullKey)) {
+            parsedValue = value === '' ? undefined : value;
+        }
+        else {
+            parsedValue = value === '' ? undefined : Number(value);
+        }
+        if (parsedValue !== undefined && typeof parsedValue !== 'string' && isNaN(parsedValue)) {
             parsedValue = value;
         }
         cookieParams[fullKey] = parsedValue;
@@ -394,9 +400,9 @@ function defaultInvalidResponse() {
         shouldExpire: false,
         isSameIP: false,
         isPrimaryHashValid: false,
-        captcha: 0,
-        match: 0,
-        mitigate: 0,
+        captcha: '0',
+        match: '0',
+        mitigate: '0',
         issueReason: NetaceaCookieV3IssueReason.NO_SESSION
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netacea/netaceaintegrationbase",
-    "version": "2.0.63",
+    "version": "2.0.65",
     "description": "Base package for Netacea CDN integrations.",
     "type": "module",
     "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     },
     "license": "UNLICENSED",
     "dependencies": {
-        "@netacea/kinesisingest": "^1.5.81"
+        "@netacea/kinesisingest": "^1.5.83"
     },
-    "gitHead": "af8b8bad7175e58592762d5e08f3fca0751bb071"
+    "gitHead": "e14ae9cf5c67bb25f961aeed0ba51f13f2ee230c"
 }