@contrast/common 1.34.2 → 1.36.0

package/lib/index.js

@@ -28,7 +28,21 @@ 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.normalizeURI = exports.safeConsoleWarn = exports.safeConsoleError = exports.set = exports.get = exports.groupResultsMap = exports.callChildComponentMethods = exports.callChildComponentMethodsSync = exports.traverseKeys = exports.traverseValues = exports.traverseKeysAndValues = exports.encodeString = exports.isNonEmptyObject = exports.isString = exports.empties = void 0;
+exports.empties = void 0;
+exports.isString = isString;
+exports.isNonEmptyObject = isNonEmptyObject;
+exports.encodeString = encodeString;
+exports.traverseKeysAndValues = traverseKeysAndValues;
+exports.traverseValues = traverseValues;
+exports.traverseKeys = traverseKeys;
+exports.callChildComponentMethodsSync = callChildComponentMethodsSync;
+exports.callChildComponentMethods = callChildComponentMethods;
+exports.groupResultsMap = groupResultsMap;
+exports.get = get;
+exports.set = set;
+exports.safeConsoleError = safeConsoleError;
+exports.safeConsoleWarn = safeConsoleWarn;
+exports.normalizeURI = normalizeURI;
 const constants_1 = require("./constants");
 const primordials_1 = require("./primordials");
 __exportStar(require("./constants"), exports);
@@ -49,16 +63,13 @@ exports.empties = {
 function isString(value) {
     return typeof value === 'string' || value instanceof String;
 }
-exports.isString = isString;
 function isNonEmptyObject(value) {
     return !!value && typeof value === 'object' && Object.keys(value).length > 0;
 }
-exports.isNonEmptyObject = isNonEmptyObject;
 /* c8 ignore next 3 */
 function encodeString(str) {
     return BufferPrototypeToString.call(BufferFrom(str), 'base64');
 }
-exports.encodeString = encodeString;
 function traverse(obj, cb, path, traverseValues, traverseKeys, depth = Infinity) {
     let shouldKeepTraversing = true;
     let reachedDepth = 0;
@@ -115,21 +126,18 @@ function traverseKeysAndValues(obj, cb, depth) {
     }
     traverse(obj, cb, [], true, true, depth);
 }
-exports.traverseKeysAndValues = traverseKeysAndValues;
 function traverseValues(obj, cb, depth) {
     if (typeof obj !== 'object' || obj === null) {
         return;
     }
     traverse(obj, cb, [], true, false, depth);
 }
-exports.traverseValues = traverseValues;
 function traverseKeys(obj, cb, depth) {
     if (typeof obj !== 'object' || obj === null) {
         return;
     }
     traverse(obj, cb, [], false, true, depth);
 }
-exports.traverseKeys = traverseKeys;
 function callChildComponentMethodsSync(parent, method, order) {
     const keys = order || Object.keys(parent);
     for (const key of keys) {
@@ -137,7 +145,6 @@ function callChildComponentMethodsSync(parent, method, order) {
         component?.[method]?.();
     }
 }
-exports.callChildComponentMethodsSync = callChildComponentMethodsSync;
 async function callChildComponentMethods(parent, method, order) {
     const keys = order || Object.keys(parent);
     for (const key of keys) {
@@ -145,7 +152,6 @@ async function callChildComponentMethods(parent, method, order) {
         await component?.[method]?.();
     }
 }
-exports.callChildComponentMethods = callChildComponentMethods;
 function groupResultsMap(resultsMap) {
     const result = {
         commonResultsMap: {},
@@ -184,7 +190,6 @@ function groupResultsMap(resultsMap) {
     }, result);
     return result;
 }
-exports.groupResultsMap = groupResultsMap;
 function get(obj, name) {
     let target = obj;
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -197,7 +202,6 @@ function get(obj, name) {
     }
     return target;
 }
-exports.get = get;
 function set(obj, name, value) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
@@ -210,21 +214,18 @@ function set(obj, name, value) {
     }
     obj[lastProp] = value;
 }
-exports.set = set;
 /** Suppresses output to stderr when installed by the universal agent */
 function safeConsoleError(...args) {
     if (CONTRAST_INSTALLATION_TOOL === 'NONE') {
         console.error(...args);
     }
 }
-exports.safeConsoleError = safeConsoleError;
 /** Suppresses output to stderr when installed by the universal agent */
 function safeConsoleWarn(...args) {
     if (CONTRAST_INSTALLATION_TOOL === 'NONE') {
         console.warn(...args);
     }
 }
-exports.safeConsoleWarn = safeConsoleWarn;
 function normalizeURI(uri) {
     let normalizedUri = uri;
     constants_1.URI_REGEXES.forEach(({ rx, rp }) => {
@@ -233,6 +234,5 @@ function normalizeURI(uri) {
     });
     return normalizedUri;
 }
-exports.normalizeURI = normalizeURI;
 ;
 //# sourceMappingURL=index.js.map

package/lib/primordials.d.ts

@@ -1,14 +1,10 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { inspect } from 'util';
 import fs from 'fs';
 export declare const primordials: {
-    ArrayPrototypeJoin: (separator?: string | undefined) => string;
-    ArrayPrototypeSlice: (start?: number | undefined, end?: number | undefined) => any[];
+    ArrayPrototypeJoin: (separator?: string) => string;
+    ArrayPrototypeSlice: (start?: number, end?: number) => any[];
     BufferFrom: typeof Buffer.from;
-    BufferPrototypeToString: (encoding?: BufferEncoding | undefined, start?: number | undefined, end?: number | undefined) => string;
+    BufferPrototypeToString: (encoding?: BufferEncoding, start?: number, end?: number) => string;
     StringPrototypeConcat: (...strings: string[]) => string;
     StringPrototypeMatch: {
         (regexp: string | RegExp): RegExpMatchArray | null;
@@ -16,7 +12,7 @@ export declare const primordials: {
             [Symbol.match](string: string): RegExpMatchArray | null;
         }): RegExpMatchArray | null;
     };
-    StringPrototypeMatchAll: (regexp: RegExp) => IterableIterator<RegExpMatchArray>;
+    StringPrototypeMatchAll: (regexp: RegExp) => RegExpStringIterator<RegExpExecArray>;
     StringPrototypeReplace: {
         (searchValue: string | RegExp, replaceValue: string): string;
         (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string;
@@ -31,30 +27,36 @@ export declare const primordials: {
         (searchValue: string | RegExp, replaceValue: string): string;
         (searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string;
     };
-    StringPrototypeSlice: (start?: number | undefined, end?: number | undefined) => string;
+    StringPrototypeSlice: (start?: number, end?: number) => string;
     StringPrototypeSplit: {
-        (separator: string | RegExp, limit?: number | undefined): string[];
+        (separator: string | RegExp, limit?: number): string[];
         (splitter: {
-            [Symbol.split](string: string, limit?: number | undefined): string[];
-        }, limit?: number | undefined): string[];
+            [Symbol.split](string: string, limit?: number): string[];
+        }, limit?: number): string[];
     };
-    StringPrototypeSubstr: (from: number, length?: number | undefined) => string;
-    StringPrototypeSubstring: (start: number, end?: number | undefined) => string;
+    StringPrototypeSubstr: (from: number, length?: number) => string;
+    StringPrototypeSubstring: (start: number, end?: number) => string;
     StringPrototypeToLowerCase: () => string;
     StringPrototypeToUpperCase: () => string;
-    StringPrototypeToLocaleLowerCase: (locales?: string | string[] | undefined) => string;
-    StringPrototypeToLocaleUpperCase: (locales?: string | string[] | undefined) => string;
+    StringPrototypeToLocaleLowerCase: {
+        (locales?: string | string[]): string;
+        (locales?: Intl.LocalesArgument): string;
+    };
+    StringPrototypeToLocaleUpperCase: {
+        (locales?: string | string[]): string;
+        (locales?: Intl.LocalesArgument): string;
+    };
     StringPrototypeTrim: () => string;
     RegExpPrototypeTest: (string: string) => boolean;
     RegExpPrototypeExec: (string: string) => RegExpExecArray | null;
     FunctionPrototypeToString: () => string;
-    JSONParse: (text: string, reviver?: ((this: any, key: string, value: any) => any) | undefined) => any;
+    JSONParse: (text: string, reviver?: (this: any, key: string, value: any) => any) => any;
     JSONStringify: {
-        (value: any, replacer?: ((this: any, key: string, value: any) => any) | undefined, space?: string | number | undefined): string;
-        (value: any, replacer?: (string | number)[] | null | undefined, space?: string | number | undefined): string;
+        (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+        (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
     };
     UtilInspect: typeof inspect;
-    PathBasename: (path: string, ext?: string | undefined) => string;
+    PathBasename: (path: string, ext?: string) => string;
     FsOpen: typeof fs.open;
     FsOpenSync: typeof fs.openSync;
     FsReadFile: typeof fs.readFile;

package/lib/types.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { ServerResponse } from 'node:http';
 import { Event, ProtectRuleMode, Rule } from './constants';
@@ -207,7 +205,6 @@ export declare class Blocker {
     block(mode: string, ruleId: string): void;
 }
 export interface ProtectMessage {
-    reqData: ReqData;
     blocker: Blocker;
     policy: Partial<Record<Rule, ProtectRuleMode>>;
     exclusions: any[];
@@ -226,6 +223,13 @@ export interface SourceInfo {
     port: number;
     protocol: string;
     time: number;
+    method: string;
+    rawHeaders: string[];
+    uriPath: string;
+    queries: string;
+    contentType?: string;
+    ip: string;
+    httpVersion: string;
 }
 /**
  * this is known as RequestStore even though, in the future, instrumentation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/common",
-  "version": "1.34.2",
+  "version": "1.36.0",
   "description": "Shared constants and utilities for all Contrast Agent modules",
   "license": "UNLICENSED",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,7 +14,7 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "build": "tsc --build src/",