perimeterx-js-core 0.24.1 → 0.24.3

package/lib/cjs/graphql/DefaultGraphQLParser.js

@@ -126,16 +126,8 @@ var DefaultGraphQLParser = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var operationNameToTypeMap;
             return __generator(this, function (_a) {
-                if (!operation.query || typeof operation.query !== 'string') {
-                    context.logger.debug('no query found');
-                    return [2 /*return*/, null];
-                }
-                operationNameToTypeMap = this.getOperationNameToTypeMap(operation.query);
-                if (!operationNameToTypeMap) {
-                    context.logger.debug('operationNameToTypeMap returned null');
-                    return [2 /*return*/, null];
-                }
-                return [2 /*return*/, this.getGraphQLData(operationNameToTypeMap, operation, context)];
+                operationNameToTypeMap = operation.query ? this.getOperationNameToTypeMap(operation.query) : null;
+                return [2 /*return*/, this.getGraphQLData(operation, context, operationNameToTypeMap)];
             });
         });
     };
@@ -147,17 +139,17 @@ var DefaultGraphQLParser = /** @class */ (function () {
         while ((match = pattern.exec(query)) !== null) {
             var operationType = match[1];
             var operationName = match[2];
-            if ((0, utils_1.isNullOrUndefined)(operationName) || map[operationName]) {
-                // query contains two operations with the same name which is illegal
-                return null;
-            }
-            else {
-                map[operationName] = operationType;
+            if (!(0, utils_1.isNullOrUndefined)(operationName)) {
+                // if already exists in map, then query contains two operations with
+                // the same name which is illegal, so we use the first one only
+                if (!map[operationName]) {
+                    map[operationName] = operationType;
+                }
             }
         }
         return map;
     };
-    DefaultGraphQLParser.prototype.getGraphQLData = function (operationNameToTypeMap, operation, context) {
+    DefaultGraphQLParser.prototype.getGraphQLData = function (operation, context, operationNameToTypeMap) {
         return __awaiter(this, void 0, void 0, function () {
             var name, type, data, keywords;
             return __generator(this, function (_a) {
@@ -165,9 +157,6 @@ var DefaultGraphQLParser = /** @class */ (function () {
                     case 0:
                         name = this.getOperationName(operationNameToTypeMap, operation);
                         type = this.getOperationType(operation, name, operationNameToTypeMap);
-                        if (!type) {
-                            return [2 /*return*/, null];
-                        }
                         data = { type: type };
                         if (name) {
                             data.name = name;
@@ -190,25 +179,31 @@ var DefaultGraphQLParser = /** @class */ (function () {
         });
     };
     DefaultGraphQLParser.prototype.getOperationType = function (operation, operationName, operationNameToTypeMap) {
-        if (operationName && operationNameToTypeMap[operationName]) {
+        var _a;
+        if (operationName && (operationNameToTypeMap === null || operationNameToTypeMap === void 0 ? void 0 : operationNameToTypeMap[operationName])) {
             return operationNameToTypeMap[operationName];
         }
         if (this.isGraphqlQueryShorthand(operation.query)) {
             return model_1.GraphQLOperationType.QUERY;
         }
-        var match = operation.query.match(new RegExp("^\\s*(".concat(Object.values(model_1.GraphQLOperationType).join('|'), ")(?:\\s|{)")));
+        var match = (_a = operation.query) === null || _a === void 0 ? void 0 : _a.match(new RegExp("^\\s*(".concat(Object.values(model_1.GraphQLOperationType).join('|'), ")(?:\\s|{)")));
         if ((match === null || match === void 0 ? void 0 : match[1]) && !operationName) {
             return match[1];
         }
         return null;
     };
     DefaultGraphQLParser.prototype.isGraphqlQueryShorthand = function (query) {
-        return /^\s*{/.test(query);
+        return query ? /^\s*{/.test(query) : false;
     };
     DefaultGraphQLParser.prototype.getOperationName = function (operationNameToTypeMap, operation) {
-        var _a;
-        return (operation.operationName ||
-            (Object.keys(operationNameToTypeMap).length === 1 ? (_a = Object.keys(operationNameToTypeMap)) === null || _a === void 0 ? void 0 : _a[0] : undefined));
+        if (operation.operationName) {
+            return operation.operationName;
+        }
+        if (operationNameToTypeMap) {
+            var operationNames = Object.keys(operationNameToTypeMap);
+            return operationNames.length === 1 ? operationNames[0] : undefined;
+        }
+        return undefined;
     };
     DefaultGraphQLParser.prototype.getQueryKeywords = function (query, context) {
         return __awaiter(this, void 0, void 0, function () {
@@ -260,7 +255,7 @@ var DefaultGraphQLParser = /** @class */ (function () {
         try {
             this.config.graphqlKeywords.forEach(function (keyword) {
                 var pattern = _this.toGlobalRegExp(keyword);
-                var matchGroup = query.match(pattern);
+                var matchGroup = query === null || query === void 0 ? void 0 : query.match(pattern);
                 if (!matchGroup) {
                     return;
                 }

package/lib/cjs/telemetry/DefaultTelemetry.js

@@ -161,6 +161,10 @@ var DefaultTelemetry = /** @class */ (function () {
             osName: 'os_name',
             nodeName: 'node_name',
         });
+        (0, utils_1.transferExistingProperties)(this.config, activity.details, {
+            remoteConfigId: 'remote_config_id',
+            remoteConfigVersion: 'remote_config_version',
+        });
         return activity;
     };
     return DefaultTelemetry;

package/lib/cjs/utils/constants.js

@@ -14,4 +14,4 @@ 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]+))?)(\/?[^?#]*)(\?[^#]*|)(#.*|)$/;
 exports.REGEX_STRUCTURE = /^\/(.+?)\/([gimsuyvd]*)$/;
-exports.CORE_MODULE_VERSION = 'JS Core 0.24.1';
+exports.CORE_MODULE_VERSION = 'JS Core 0.24.3';

package/lib/esm/graphql/DefaultGraphQLParser.js

@@ -54,16 +54,8 @@ export class DefaultGraphQLParser {
         return data.filter((el) => !isNullOrUndefined(el));
     }
     async parseGraphQLOperation(operation, context) {
-        if (!operation.query || typeof operation.query !== 'string') {
-            context.logger.debug('no query found');
-            return null;
-        }
-        const operationNameToTypeMap = this.getOperationNameToTypeMap(operation.query);
-        if (!operationNameToTypeMap) {
-            context.logger.debug('operationNameToTypeMap returned null');
-            return null;
-        }
-        return this.getGraphQLData(operationNameToTypeMap, operation, context);
+        const operationNameToTypeMap = operation.query ? this.getOperationNameToTypeMap(operation.query) : null;
+        return this.getGraphQLData(operation, context, operationNameToTypeMap);
     }
     getOperationNameToTypeMap(query) {
         const operationTypesString = Object.values(GraphQLOperationType).join('|');
@@ -73,22 +65,19 @@ export class DefaultGraphQLParser {
         while ((match = pattern.exec(query)) !== null) {
             const operationType = match[1];
             const operationName = match[2];
-            if (isNullOrUndefined(operationName) || map[operationName]) {
-                // query contains two operations with the same name which is illegal
-                return null;
-            }
-            else {
-                map[operationName] = operationType;
+            if (!isNullOrUndefined(operationName)) {
+                // if already exists in map, then query contains two operations with
+                // the same name which is illegal, so we use the first one only
+                if (!map[operationName]) {
+                    map[operationName] = operationType;
+                }
             }
         }
         return map;
     }
-    async getGraphQLData(operationNameToTypeMap, operation, context) {
+    async getGraphQLData(operation, context, operationNameToTypeMap) {
         const name = this.getOperationName(operationNameToTypeMap, operation);
         const type = this.getOperationType(operation, name, operationNameToTypeMap);
-        if (!type) {
-            return null;
-        }
         const data = { type };
         if (name) {
             data.name = name;
@@ -106,24 +95,30 @@ export class DefaultGraphQLParser {
         return data;
     }
     getOperationType(operation, operationName, operationNameToTypeMap) {
-        if (operationName && operationNameToTypeMap[operationName]) {
+        if (operationName && operationNameToTypeMap?.[operationName]) {
             return operationNameToTypeMap[operationName];
         }
         if (this.isGraphqlQueryShorthand(operation.query)) {
             return GraphQLOperationType.QUERY;
         }
-        const match = operation.query.match(new RegExp(`^\\s*(${Object.values(GraphQLOperationType).join('|')})(?:\\s|{)`));
+        const match = operation.query?.match(new RegExp(`^\\s*(${Object.values(GraphQLOperationType).join('|')})(?:\\s|{)`));
         if (match?.[1] && !operationName) {
             return match[1];
         }
         return null;
     }
     isGraphqlQueryShorthand(query) {
-        return /^\s*{/.test(query);
+        return query ? /^\s*{/.test(query) : false;
     }
     getOperationName(operationNameToTypeMap, operation) {
-        return (operation.operationName ||
-            (Object.keys(operationNameToTypeMap).length === 1 ? Object.keys(operationNameToTypeMap)?.[0] : undefined));
+        if (operation.operationName) {
+            return operation.operationName;
+        }
+        if (operationNameToTypeMap) {
+            const operationNames = Object.keys(operationNameToTypeMap);
+            return operationNames.length === 1 ? operationNames[0] : undefined;
+        }
+        return undefined;
     }
     async getQueryKeywords(query, context) {
         if (this.config.extractGraphQLKeywords && typeof this.config.extractGraphQLKeywords === 'function') {
@@ -156,7 +151,7 @@ export class DefaultGraphQLParser {
         try {
             this.config.graphqlKeywords.forEach((keyword) => {
                 const pattern = this.toGlobalRegExp(keyword);
-                let matchGroup = query.match(pattern);
+                let matchGroup = query?.match(pattern);
                 if (!matchGroup) {
                     return;
                 }

package/lib/esm/telemetry/DefaultTelemetry.js

@@ -83,6 +83,10 @@ export class DefaultTelemetry {
             osName: 'os_name',
             nodeName: 'node_name',
         });
+        transferExistingProperties(this.config, activity.details, {
+            remoteConfigId: 'remote_config_id',
+            remoteConfigVersion: 'remote_config_version',
+        });
         return activity;
     }
 }

package/lib/esm/utils/constants.js

@@ -11,4 +11,4 @@ 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]+))?)(\/?[^?#]*)(\?[^#]*|)(#.*|)$/;
 export const REGEX_STRUCTURE = /^\/(.+?)\/([gimsuyvd]*)$/;
-export const CORE_MODULE_VERSION = 'JS Core 0.24.1';
+export const CORE_MODULE_VERSION = 'JS Core 0.24.3';

package/lib/types/graphql/DefaultGraphQLParser.d.ts

@@ -15,15 +15,15 @@ export declare class DefaultGraphQLParser<Req, Res, Added, Removed> implements I
     protected parseGraphQLOperations(operations: GraphQLOperation[], context: ReadonlyContext<Req, Res>): Promise<GraphQLData[]>;
     protected parseGraphQLOperation(operation: GraphQLOperation, context: ReadonlyContext<Req, Res>): Promise<GraphQLData | null>;
     protected getOperationNameToTypeMap(query: string): Record<string, GraphQLOperationType> | null;
-    protected getGraphQLData(operationNameToTypeMap: Record<string, GraphQLOperationType>, operation: GraphQLOperation, context: ReadonlyContext<Req, Res>): Promise<GraphQLData | null>;
-    protected getOperationType(operation: GraphQLOperation, operationName: string | undefined, operationNameToTypeMap: Record<string, GraphQLOperationType>): GraphQLOperationType | null;
-    protected isGraphqlQueryShorthand(query: string): boolean;
-    protected getOperationName(operationNameToTypeMap: Record<string, GraphQLOperationType>, operation: GraphQLOperation): string | undefined;
-    protected getQueryKeywords(query: string, context: ReadonlyContext<Req, Res>): Promise<string[] | null>;
+    protected getGraphQLData(operation: GraphQLOperation, context: ReadonlyContext<Req, Res>, operationNameToTypeMap: Record<string, GraphQLOperationType> | null): Promise<GraphQLData | null>;
+    protected getOperationType(operation: GraphQLOperation, operationName: string | undefined, operationNameToTypeMap: Record<string, GraphQLOperationType> | null): GraphQLOperationType | null;
+    protected isGraphqlQueryShorthand(query: string | undefined): boolean;
+    protected getOperationName(operationNameToTypeMap: Record<string, GraphQLOperationType> | null, operation: GraphQLOperation): string | undefined;
+    protected getQueryKeywords(query: string | undefined, context: ReadonlyContext<Req, Res>): Promise<string[] | null>;
     protected cleanKeywords(keywords: string[]): string[];
-    protected getQueryKeywordsFromCustomFunction(query: string, context: ReadonlyContext<Req, Res>, extractKeywords: ExtractGraphQLKeywordsFunction): Promise<string[] | null>;
-    protected getQueryKeywordsFromArray(query: string, context: ReadonlyContext<Req, Res>): string[] | null;
-    protected isSensitiveOperation(operationName: string | undefined, operationType: GraphQLOperationType, keywords: string[] | null): boolean;
+    protected getQueryKeywordsFromCustomFunction(query: string | undefined, context: ReadonlyContext<Req, Res>, extractKeywords: ExtractGraphQLKeywordsFunction): Promise<string[] | null>;
+    protected getQueryKeywordsFromArray(query: string | undefined, context: ReadonlyContext<Req, Res>): string[] | null;
+    protected isSensitiveOperation(operationName: string | undefined, operationType: GraphQLOperationType | null, keywords: string[] | null): boolean;
     protected extractGraphQLVariableNames(variables: Record<string, unknown>): string[];
     protected toGlobalRegExp(pattern: string | RegExp): RegExp;
 }

package/lib/types/graphql/ExtractGraphQLKeywordsFunction.d.ts

@@ -1 +1 @@
-export type ExtractGraphQLKeywordsFunction = (graphqlQuery: string) => string[] | Promise<string[]>;
+export type ExtractGraphQLKeywordsFunction = (graphqlQuery: string | undefined) => string[] | Promise<string[]>;

package/lib/types/graphql/model/GraphQLData.d.ts

@@ -1,6 +1,6 @@
 import { GraphQLOperationType } from './GraphQLOperationType';
 export type GraphQLData = {
-    type?: GraphQLOperationType;
+    type?: GraphQLOperationType | null;
     keywords?: string[];
     name?: string;
     sensitive?: boolean;

package/lib/types/graphql/model/GraphQLOperation.d.ts

@@ -1,5 +1,5 @@
 export type GraphQLOperation = {
-    query: string;
+    query?: string;
     operationName?: string;
     variables?: Record<string, unknown>;
 };

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

@@ -6,6 +6,8 @@ export type TelemetryActivityDetails<Req, Res, Added, Removed> = {
     update_reason: 'command';
     node_name?: string;
     os_name?: string;
+    remote_config_id?: string;
+    remote_config_version?: string;
 };
 export type TelemetryActivity<Req, Res, Added, Removed> = {
     type: ActivityType.ENFORCER_TELEMETRY;

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

@@ -11,4 +11,4 @@ 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 REGEX_STRUCTURE: RegExp;
-export declare const CORE_MODULE_VERSION = "JS Core 0.24.1";
+export declare const CORE_MODULE_VERSION = "JS Core 0.24.3";

package/package.json

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