npm - @platform-x/hep-notification-client - Versions diffs - 1.2.9 → 1.3.1 - Mend

@platform-x/hep-notification-client 1.2.9 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/src/common/service/secretKeyManager.services.d.ts CHANGED Viewed

@@ -0,0 +1,7 @@
+export declare class SecretKeyServices {
+    private ruleCache;
+    /**
+     * Fetches all the secret keys
+     */
+    getSecretKeys(): Promise<any>;
+}

package/dist/src/common/service/secretKeyManager.services.js CHANGED Viewed

@@ -1,38 +1,58 @@
 "use strict";
-// import { secretManager } from 'hep-secret-access';
-// import config from '../../config';
-// import { DynamicValues } from '../../platform-x/constants';
-// export class SecretKeyServices {
-//   private ruleCache = new Map<string, any | null>();
-//   /**
-//    * Fetches all the secret keys
-//    */
-//   public async getSecretKeys() {
-//     try {
-//       // Initialize secret manager object
-//       if (this.ruleCache.has('secret_data')) {
-//         return this.ruleCache.get('secret_data')!;
-//       }
-//       const secretObject = secretManager();
-//       // If secret mode is ENV – read one by one
-//       // for local testing
-//       if (config?.SECRET_MODE === 'env') {
-//         const keyConfig: Record<any, any> = {};
-//         for (const key of Object.values(DynamicValues)) {
-//           // Fetch individual value (existing read() method)
-//           const value = await secretObject.read(key);
-//           keyConfig[key] = value;
-//         }
-//         this.ruleCache.set('secret_data', keyConfig);
-//         return keyConfig;
-//       }
-//       // else – fetch all secrets from GSM
-//       const data = await secretObject.readAllSecrets();
-//       this.ruleCache.set('secret_data', data);
-//       return data;
-//     } catch (err) {
-//       return {};
-//     }
-//   }
-// }
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecretKeyServices = void 0;
+const hep_secret_access_1 = require("hep-secret-access");
+const config_1 = __importDefault(require("../../config"));
+const constants_1 = require("../../platform-x/constants");
+class SecretKeyServices {
+    constructor() {
+        this.ruleCache = new Map();
+    }
+    /**
+     * Fetches all the secret keys
+     */
+    getSecretKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // Initialize secret manager object
+                if (this.ruleCache.has('secret_data')) {
+                    return this.ruleCache.get('secret_data');
+                }
+                const secretObject = (0, hep_secret_access_1.secretManager)();
+                // If secret mode is ENV – read one by one
+                // for local testing
+                if ((config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.SECRET_MODE) === 'env') {
+                    const keyConfig = {};
+                    for (const key of Object.values(constants_1.DynamicValues)) {
+                        // Fetch individual value (existing read() method)
+                        const value = yield secretObject.read(key);
+                        keyConfig[key] = value;
+                    }
+                    this.ruleCache.set('secret_data', keyConfig);
+                    return keyConfig;
+                }
+                // else – fetch all secrets from GSM
+                const data = yield secretObject.readAllSecrets();
+                this.ruleCache.set('secret_data', data);
+                return data;
+            }
+            catch (err) {
+                return {};
+            }
+        });
+    }
+}
+exports.SecretKeyServices = SecretKeyServices;
 //# sourceMappingURL=secretKeyManager.services.js.map

package/dist/src/common/util/solrConnector.d.ts CHANGED Viewed

@@ -1,35 +1,47 @@
 interface SolrQuery {
     query(query: string | object | null | undefined): any;
     paginate(start?: number, rows?: number): any;
-    filterList(fields: any): any;
-    sort(fields: any): any;
-    filterQuery(fields: any): any;
+    filterList(fields: object | string[] | null | undefined): any;
+    sort(fields: object | string[] | null | undefined): any;
+    filterQuery(fields: object | string[] | null | undefined): any;
+    facet(fields: object | string | null | undefined): any;
 }
 export declare class SolrClient {
     private host;
     private port;
     private core;
     private path;
+    private httpClient;
+    private queryParams;
     private secure;
-    private solrNodeClient;
-    private solrQuery;
     constructor(core?: string);
     getQuery(): any;
     createQuery(): SolrQuery;
     executeSearch(): Promise<any>;
     /**
-     * solrSearch- fn to call solr search
+     * solrSearch - fn to call solr search via Solr 9 HTTP API
      * @param queryParams
      * @param fields
      * @param fieldType
      * @param sortData
+     * @param filterQuery
      * @returns
      */
-    solrSearch(queryParams: any, fields?: any, fieldType?: any, sortData?: any, filterQuery?: any): Promise<unknown>;
+    solrSearch(queryParams: any, fields?: any, fieldType?: any, sortData?: any, filterQuery?: any): Promise<any>;
+    /**
+     * Function to delete document from solr via Solr 9 HTTP API
+     * @param query
+     * @returns
+     */
+    deleteByQuery(query: string | object): Promise<boolean>;
+    private _executeHttpRequest;
+    private _handleSearchError;
+    private _checkSolrResponse;
     private query;
     private paginate;
     private filterList;
     private sort;
+    private facet;
     private filterQuery;
 }
 export {};

package/dist/src/common/util/solrConnector.js CHANGED Viewed

@@ -17,141 +17,282 @@ const logger_1 = require("./logger");
 const index_1 = __importDefault(require("../../config/index"));
 const errorHandler_1 = require("./errorHandler");
 const constants_1 = require("../../platform-x/constants");
-const solr = require('solr-client');
+const axios_1 = __importDefault(require("axios"));
+// Solr constants
+const SOLR_RESPONSE_FORMAT = 'json';
+const SOLR_SELECT_ENDPOINT = '/select';
+const SOLR_UPDATE_ENDPOINT = '/update';
+const SOLR_DEFAULT_QUERY = '*:*';
+const SOLR_QUERY_JOIN_OPERATOR = ' AND ';
+const SOLR_PROTOCOL_HTTPS = 'https';
+const SOLR_PROTOCOL_HTTP = 'http';
+// Error constants
+const SOLR_ERROR_NETWORK = 'Network error';
+const SOLR_ERROR_EXECUTION = 'Solr execution error';
+const SOLR_ERROR_CODE_ETIMEDOUT = 'ETIMEDOUT';
+const SOLR_ERROR_CODE_ECONNRESET = 'ECONNRESET';
+const SOLR_ERROR_CODE_ECONNABORTED = 'ECONNABORTED';
+const SOLR_TIMEOUT_KEYWORD = 'timeout';
+const HTTP_STATUS_OK = 200;
+const HTTP_STATUS_REQUEST_TIMEOUT = 408;
+/**
+ * Prepares query value - handles both string and object types
+ * @param query - string, object, null, or undefined
+ * @returns formatted query string for Solr
+ */
+const prepareQuery = (query) => {
+    if (!query)
+        return SOLR_DEFAULT_QUERY;
+    if (typeof query === 'string')
+        return query;
+    if (typeof query === 'object' && !Array.isArray(query)) {
+        return Object.entries(query)
+            .map(([field, value]) => {
+            if (typeof value === 'string') {
+                if (value.includes('"') || value.includes("'") || value.includes('*') || value.includes('(') || value.includes('[')) {
+                    return `${field}:${value}`;
+                }
+                return `${field}:"${value}"`;
+            }
+            return `${field}:${value}`;
+        })
+            .join(SOLR_QUERY_JOIN_OPERATOR);
+    }
+    return SOLR_DEFAULT_QUERY;
+};
 class SolrClient {
     constructor(core) {
-        this.host = index_1.default.SOLR.HOST || '';
-        this.port = Number(index_1.default.SOLR.PORT);
-        this.path = index_1.default.SOLR.PATH || '/solr';
-        this.secure = false;
-        this.core = core || process.env.SOLR_CORE || '';
-        const options = {
-            host: this.host,
-            port: this.port,
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        this.host = (_b = (_a = index_1.default === null || index_1.default === void 0 ? void 0 : index_1.default.SOLR) === null || _a === void 0 ? void 0 : _a.HOST) !== null && _b !== void 0 ? _b : '';
+        this.port = Number((_c = index_1.default === null || index_1.default === void 0 ? void 0 : index_1.default.SOLR) === null || _c === void 0 ? void 0 : _c.PORT);
+        this.path = (_e = (_d = index_1.default === null || index_1.default === void 0 ? void 0 : index_1.default.SOLR) === null || _d === void 0 ? void 0 : _d.PATH) !== null && _e !== void 0 ? _e : '/solr';
+        this.secure = (_f = index_1.default === null || index_1.default === void 0 ? void 0 : index_1.default.SOLR) === null || _f === void 0 ? void 0 : _f.SECURE;
+        this.core = (_h = core !== null && core !== void 0 ? core : (_g = process.env) === null || _g === void 0 ? void 0 : _g.SOLR_CORE) !== null && _h !== void 0 ? _h : '';
+        const protocol = this.secure ? SOLR_PROTOCOL_HTTPS : SOLR_PROTOCOL_HTTP;
+        const baseURL = `${protocol}://${this.host}:${this.port}${this.path}`;
+        this.httpClient = axios_1.default.create({
+            baseURL,
+            headers: {
+                'Content-Type': constants_1.HTTP_CONTENT_TYPE_JSON,
+                'Accept': constants_1.HTTP_CONTENT_TYPE_JSON,
+            },
+        });
+        this.queryParams = { wt: SOLR_RESPONSE_FORMAT };
+        logger_1.Logger.info('SolrClient initialized for Solr 9', 'SolrClient');
+        logger_1.Logger.debug('SolrClient initialization payload', 'SolrClient', {
+            baseURL,
             core: this.core,
-            path: this.path,
-            secure: this.secure,
-        };
-        this.solrNodeClient = solr.createClient(options);
-        this.solrQuery = null;
+        });
     }
     getQuery() {
-        return this.solrQuery;
+        return this.queryParams;
     }
     createQuery() {
-        this.solrQuery = this.solrNodeClient.createQuery();
+        this.queryParams = {
+            wt: SOLR_RESPONSE_FORMAT,
+            start: 0,
+            rows: constants_1.DEFAULT_SOLR_ROWS,
+        };
         return {
             query: this.query.bind(this),
             filterQuery: this.filterQuery.bind(this),
             sort: this.sort.bind(this),
             filterList: this.filterList.bind(this),
             paginate: this.paginate.bind(this),
+            facet: this.facet.bind(this),
         };
     }
     executeSearch() {
-        logger_1.Logger.info('SOLR ExecuteSearch Reached', 'executeSearch');
-        const q = this.solrQuery;
-        logger_1.Logger.debug('Before calling search method', 'executeSearch', q);
-        //try {
-        return new Promise((resolve, reject) => {
-            this.solrNodeClient.search(q, function (err, res) {
-                if (err) {
-                    logger_1.Logger.error(`Error in Solr Search for query:--------------------->`, 'executeSearch', err);
-                    let solrError = new errorHandler_1.SolrError(err.message || err.name, Number(err.statusCode));
-                    logger_1.Logger.error('Error in Solr Search for query: ${q}', 'solrSearch', err);
-                    reject(solrError);
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c, _d, _e;
+                try {
+                    const response = yield this._executeHttpRequest('executeSearch');
+                    const responseData = (_e = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.grouped) !== null && _b !== void 0 ? _b : (_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.docs) !== null && _e !== void 0 ? _e : [];
+                    resolve(responseData);
                 }
-                else {
-                    logger_1.Logger.debug('Before returning search result', 'executeSearch', res);
-                    resolve(res.response.docs);
+                catch (error) {
+                    reject(this._handleSearchError(error, 'executeSearch'));
                 }
-            });
+            }));
         });
-        // } catch (err: any) {
-        //   Logger.info(`SOLR EXECUTION ERRROR------${err}`);
-        //   throw err;
-        // }
     }
     /**
-     * solrSearch- fn to call solr search
+     * solrSearch - fn to call solr search via Solr 9 HTTP API
      * @param queryParams
      * @param fields
      * @param fieldType
      * @param sortData
+     * @param filterQuery
      * @returns
      */
     solrSearch(queryParams, fields, fieldType, sortData, filterQuery) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.Logger.debug('Before calling solrSearch method', 'solrSearch', queryParams);
-            return new Promise((resolve, reject) => {
-                logger_1.Logger.info('Reached Solr Search', 'solrSearch');
-                logger_1.Logger.debug('Reached Solr Search', 'solrSearch', { queryParams });
-                const defaultRows = constants_1.DEFAULT_SOLR_ROWS;
-                let query = this.solrNodeClient.createQuery();
-                if (filterQuery) {
-                    query.matchFilter(filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filterKey, filterQuery === null || filterQuery === void 0 ? void 0 : filterQuery.filterValue);
-                }
-                if (queryParams) {
-                    query.q(fieldType);
-                }
-                else {
-                    query.q(`*:*`);
-                }
-                if (queryParams && queryParams.pagination) {
-                    query.start(queryParams.pagination.start ? queryParams.pagination.start : 0);
-                    query.rows(queryParams.pagination.rows
-                        ? queryParams.pagination.rows
-                        : defaultRows);
-                }
-                else {
-                    query.start(0);
-                    query.rows(defaultRows);
-                }
-                if (fields) {
-                    let fieldsTemp = Array.isArray(fields) ? fields : Object.keys(fields);
-                    query.fl(fieldsTemp);
-                }
-                if (sortData) {
-                    query.sort(sortData);
-                }
-                this.solrNodeClient.search(query, function (err, res) {
-                    if (err) {
-                        let solrError = new errorHandler_1.SolrError(err.message || err.name, Number(err.statusCode));
-                        logger_1.Logger.error(`Error in Solr Search for query: ${query}`, 'solrSearch', err);
-                        reject(solrError);
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c, _d, _e;
+                try {
+                    logger_1.Logger.info('Reached Solr Search', 'solrSearch');
+                    logger_1.Logger.debug('Reached Solr Search', 'solrSearch', { queryParams });
+                    const q = qCommon(queryParams, fieldType);
+                    const { start, rows } = paginationCommon(queryParams);
+                    this.queryParams = {
+                        q,
+                        start,
+                        rows,
+                        wt: SOLR_RESPONSE_FORMAT,
+                    };
+                    if (filterQuery) {
+                        this.queryParams.fq = `${filterQuery.filterKey}:${filterQuery.filterValue}`;
                     }
-                    else {
-                        logger_1.Logger.debug('Before returning search result', 'solrSearch', res);
-                        resolve(res.response.docs);
+                    if (fields) {
+                        const fieldsTemp = Array.isArray(fields) ? fields : Object.keys(fields);
+                        this.queryParams.fl = fieldsTemp.join(',');
                     }
+                    if (sortData) {
+                        this.queryParams.sort = sortData;
+                    }
+                    const response = yield this._executeHttpRequest('solrSearch');
+                    const responseData = (_e = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.grouped) !== null && _b !== void 0 ? _b : (_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.docs) !== null && _e !== void 0 ? _e : [];
+                    resolve(responseData);
+                }
+                catch (error) {
+                    logger_1.Logger.debug('Reached in solr connector.ts', 'solrSearch', this.queryParams);
+                    reject(this._handleSearchError(error, 'solrSearch'));
+                }
+            }));
+        });
+    }
+    /**
+     * Function to delete document from solr via Solr 9 HTTP API
+     * @param query
+     * @returns
+     */
+    deleteByQuery(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger_1.Logger.info('Reached Solr Search', 'solrSearch');
+            logger_1.Logger.debug('Reached Solr Search', 'solrSearch', { queryParams: query });
+            const queryString = prepareQuery(query);
+            const endpoint = this.core
+                ? `/${this.core}${SOLR_UPDATE_ENDPOINT}?commit=true`
+                : `${SOLR_UPDATE_ENDPOINT}?commit=true`;
+            try {
+                const response = yield this.httpClient.post(endpoint, {
+                    delete: { query: queryString },
                 });
+                this._checkSolrResponse(response, 'deleteByQuery');
+                return true;
+            }
+            catch (err) {
+                const solrError = this._handleSearchError(err, 'deleteByQuery');
+                throw solrError;
+            }
+        });
+    }
+    _executeHttpRequest(methodName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = this.core
+                ? `/${this.core}${SOLR_SELECT_ENDPOINT}`
+                : SOLR_SELECT_ENDPOINT;
+            // http call to solr with query params
+            const response = yield this.httpClient.get(endpoint, {
+                params: this.queryParams,
+                validateStatus: (status) => status < 500 /* HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR */,
             });
+            // Check for errors in the response status and data
+            this._checkSolrResponse(response, methodName);
+            return response;
+        });
+    }
+    // Common error handling for all search methods
+    _handleSearchError(error, methodName) {
+        var _a;
+        // Enhanced timeout error detection
+        const isTimeout = ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes(SOLR_TIMEOUT_KEYWORD)) ||
+            (error === null || error === void 0 ? void 0 : error.code) === SOLR_ERROR_CODE_ETIMEDOUT ||
+            (error === null || error === void 0 ? void 0 : error.code) === SOLR_ERROR_CODE_ECONNRESET ||
+            (error === null || error === void 0 ? void 0 : error.code) === SOLR_ERROR_CODE_ECONNABORTED;
+        const errorStatus = (error === null || error === void 0 ? void 0 : error.status) ||
+            (error === null || error === void 0 ? void 0 : error.statusCode) ||
+            (isTimeout
+                ? HTTP_STATUS_REQUEST_TIMEOUT
+                : 500 /* HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR */);
+        const solrError = new errorHandler_1.SolrError((error === null || error === void 0 ? void 0 : error.message) || SOLR_ERROR_NETWORK, errorStatus);
+        logger_1.Logger.error(`Error in ${methodName}`, methodName, {
+            error: error === null || error === void 0 ? void 0 : error.message,
+            errorCode: error === null || error === void 0 ? void 0 : error.code,
+            isTimeoutError: isTimeout,
+            statusCode: errorStatus,
         });
+        if (isTimeout) {
+            logger_1.Logger.error(`TIMEOUT DETECTED in ${methodName}`, methodName, {
+                errorMessage: error === null || error === void 0 ? void 0 : error.message,
+                errorCode: error === null || error === void 0 ? void 0 : error.code,
+            });
+        }
+        return solrError;
+    }
+    // Check the solr response for errors
+    _checkSolrResponse(response, methodName) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        if ((response === null || response === void 0 ? void 0 : response.status) !== HTTP_STATUS_OK ||
+            ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.error) ||
+            (((_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.responseHeader) &&
+                ((_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.responseHeader) === null || _d === void 0 ? void 0 : _d.status) !== 0)) {
+            const errorMsg = (_g = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.error) === null || _f === void 0 ? void 0 : _f.msg) !== null && _g !== void 0 ? _g : SOLR_ERROR_EXECUTION;
+            const error = new errorHandler_1.SolrError(errorMsg, response === null || response === void 0 ? void 0 : response.status);
+            logger_1.Logger.error(`Error in ${methodName}: ${errorMsg}`, methodName);
+            throw error;
+        }
     }
     query(query) {
-        let queryString = query || `*:*`;
-        this.solrQuery.q(queryString);
+        this.queryParams.q = prepareQuery(query);
     }
     paginate(start, rows) {
-        this.solrQuery.start(start || 0);
-        this.solrQuery.rows(rows || constants_1.DEFAULT_SOLR_ROWS);
+        this.queryParams.start = start !== null && start !== void 0 ? start : 0;
+        this.queryParams.rows = rows !== null && rows !== void 0 ? rows : constants_1.DEFAULT_SOLR_ROWS;
     }
     filterList(fields) {
         if (fields) {
-            let fieldsTemp = Array.isArray(fields) ? fields : Object.keys(fields);
-            this.solrQuery.fl(fieldsTemp);
+            const fieldsArray = Array.isArray(fields) ? fields : Object.keys(fields);
+            this.queryParams.fl = fieldsArray.join(',');
         }
     }
     sort(fields) {
         if (fields) {
-            this.solrQuery.sort(fields);
+            this.queryParams.sort = fields;
+        }
+    }
+    facet(fields) {
+        if (fields) {
+            this.queryParams.facet = true;
+            this.queryParams['facet.field'] = fields;
         }
     }
     filterQuery(fields) {
-        if (fields === null || fields === void 0 ? void 0 : fields.length) {
-            this.solrQuery.fq(fields);
+        if (fields) {
+            this.queryParams.fq = fields;
         }
     }
 }
 exports.SolrClient = SolrClient;
+const qCommon = (queryParams, fieldType) => {
+    if (queryParams) {
+        if (typeof fieldType === 'string')
+            return fieldType;
+        if (typeof fieldType === 'object')
+            return prepareQuery(fieldType);
+        return SOLR_DEFAULT_QUERY;
+    }
+    return SOLR_DEFAULT_QUERY;
+};
+const paginationCommon = (queryParams) => {
+    var _a, _b;
+    let start = 0;
+    let rows = constants_1.DEFAULT_SOLR_ROWS;
+    if (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pagination) {
+        start = (_a = queryParams.pagination.start) !== null && _a !== void 0 ? _a : 0;
+        rows = (_b = queryParams.pagination.rows) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_SOLR_ROWS;
+    }
+    return { start, rows };
+};
 //# sourceMappingURL=solrConnector.js.map

package/dist/src/index.js CHANGED Viewed

@@ -15,6 +15,7 @@ const getIAMSecrets = () => {
         throw new Error("IAM secrets not initialized");
     }
     return injectedSecretService.getSecretKeys(); // returns cached data
+    // return new SecretKeyServices().getSecretKeys(); // secret gateway
 };
 exports.getIAMSecrets = getIAMSecrets;
 //# sourceMappingURL=index.js.map

package/dist/src/platform-x/util/emailHandler.js CHANGED Viewed

@@ -47,12 +47,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailHandler = void 0;
 const emailDataSource_1 = require("../dataSource/emailDataSource");
-const HTMLParser = __importStar(require("node-html-parser"));
 const style_1 = require("../constants/style");
 const config_1 = __importDefault(require("../../config"));
 const constants_1 = require("../constants");
 const lodash_1 = require("lodash");
 const emailTemplate_1 = require("./emailTemplate");
+const HTMLParser = require('node-html-parser');
 const moment = require('moment-timezone');
 const sgMail = require('@sendgrid/mail');
 const sgHelpers = require('@sendgrid/helpers');
@@ -372,6 +372,7 @@ class EmailHandler {
                 }
                 if (templateData && ((_a = Object.keys(templateData)) === null || _a === void 0 ? void 0 : _a.length) !== 0) {
                     const root = HTMLParser.parse(templateData === null || templateData === void 0 ? void 0 : templateData.body);
+                    isCFF = (templateData === null || templateData === void 0 ? void 0 : templateData.email_from) && (templateData === null || templateData === void 0 ? void 0 : templateData.email_from) !== '' ? templateData === null || templateData === void 0 ? void 0 : templateData.email_from : isCFF;
                     const emailConfiguration = {
                         email: (_b = reqBody.replacement_variables) === null || _b === void 0 ? void 0 : _b.EMAIL,
                         emailTemplate: root ? root.toString() : '',
@@ -493,7 +494,7 @@ class EmailHandler {
     }
     fetchEmailTemplateData(reqBody) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             try {
                 logger_1.Logger.info('EmailHandler: Reached fetchEmailTemplateData', 'fetchEmailTemplateData');
                 let { email_type } = reqBody;
@@ -504,12 +505,14 @@ class EmailHandler {
                     if ((templateSolrRes === null || templateSolrRes === void 0 ? void 0 : templateSolrRes.length) > 0) {
                         templateData.body = ((_a = templateSolrRes === null || templateSolrRes === void 0 ? void 0 : templateSolrRes[0]) === null || _a === void 0 ? void 0 : _a.hclplatformx_Body) || '';
                         templateData.subject = ((_b = templateSolrRes === null || templateSolrRes === void 0 ? void 0 : templateSolrRes[0]) === null || _b === void 0 ? void 0 : _b.hclplatformx_Subject) || '';
+                        templateData.email_from = ((_c = templateSolrRes === null || templateSolrRes === void 0 ? void 0 : templateSolrRes[0]) === null || _c === void 0 ? void 0 : _c.hclplatformx_To) || '';
                     }
                 }
                 else {
                     let templateRes = yield new formBuilder_dao_1.default().fetch('email_templates', { name: email_type });
-                    templateData.body = (_c = templateRes === null || templateRes === void 0 ? void 0 : templateRes[0]) === null || _c === void 0 ? void 0 : _c.body;
-                    templateData.subject = (_d = templateRes === null || templateRes === void 0 ? void 0 : templateRes[0]) === null || _d === void 0 ? void 0 : _d.subject;
+                    templateData.body = (_d = templateRes === null || templateRes === void 0 ? void 0 : templateRes[0]) === null || _d === void 0 ? void 0 : _d.body;
+                    templateData.subject = (_e = templateRes === null || templateRes === void 0 ? void 0 : templateRes[0]) === null || _e === void 0 ? void 0 : _e.subject;
+                    templateData.email_from = ((_f = templateRes === null || templateRes === void 0 ? void 0 : templateRes[0]) === null || _f === void 0 ? void 0 : _f.to) || '';
                 }
                 return templateData;
             }

package/dist/src/platform-x/util/solr-data-source/SolrHttpDataSource.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { DataSource } from 'apollo-datasource';
 export interface Pagination {
     start: number;
     rows: number;
@@ -8,17 +9,19 @@ export interface FilterQueryType {
 }
 export interface SolrQueryRequest {
     query: string | object;
-    filterQuery?: FilterQueryType[] | null | any;
+    filterQuery?: FilterQueryType[] | null;
     pagination?: Pagination;
     filter?: object | string[];
     sort?: object;
 }
-export declare class SolrHttpDataSource<TContext = any> {
-    private solr;
+export declare class SolrHttpDataSource<TContext = any> extends DataSource {
     context: TContext;
+    private solr;
     private cache;
     private memoizedResults;
-    constructor();
+    constructor(core?: string);
+    initialize({ context, cache }?: any): void;
+    didEncounterError(error: any): void;
     cacheKey(id: string): string;
     memoizedCacheKey(): string;
     createQuery(queryRequest: SolrQueryRequest): void;

package/dist/src/platform-x/util/solr-data-source/SolrHttpDataSource.js CHANGED Viewed

@@ -13,12 +13,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolrHttpDataSource = void 0;
+const apollo_datasource_1 = require("apollo-datasource");
+const apollo_server_caching_1 = require("apollo-server-caching");
 const solrConnector_1 = require("../../../common/util/solrConnector");
 const quick_lru_1 = __importDefault(require("@alloc/quick-lru"));
-class SolrHttpDataSource {
+const logger_1 = require("../../../common/util/logger");
+class SolrHttpDataSource extends apollo_datasource_1.DataSource {
     // private loader: DataLoader<unknown, unknown, unknown>;
-    constructor() {
-        this.solr = new solrConnector_1.SolrClient();
+    constructor(core) {
+        super();
+        this.solr = new solrConnector_1.SolrClient(core);
         this.memoizedResults = new quick_lru_1.default({
             // The maximum number of items before evicting the least recently used items.
             maxSize: 50,
@@ -28,45 +32,57 @@ class SolrHttpDataSource {
         });
         // this.loader = new DataLoader(ids => dbClient.getByIds(ids))
     }
-    // initialize({ context, cache }:any = {}) {
-    //     this.context = context;
-    //     this.cache = cache || new InMemoryLRUCache();
-    // }
-    // didEncounterError(error:any) {
-    //     throw error;
-    // }
+    initialize({ context, cache } = {}) {
+        this.context = context;
+        this.cache = cache || new apollo_server_caching_1.InMemoryLRUCache();
+    }
+    didEncounterError(error) {
+        throw error;
+    }
     cacheKey(id) {
         return `solr-${id}`;
     }
     memoizedCacheKey() {
-        var _a;
-        // return (
-        //   JSON.parse(JSON.stringify(this.solr.getQuery())) as any
-        // )?.parameters?.join('&');
-        const data = JSON.parse(JSON.stringify(this.solr.getQuery()));
-        return (_a = data === null || data === void 0 ? void 0 : data.parameters) === null || _a === void 0 ? void 0 : _a.join('&');
+        const queryParams = this.solr.getQuery();
+        return queryParams ? new URLSearchParams(queryParams).toString() : '';
     }
     createQuery(queryRequest) {
         let { query, pagination, filter, sort, filterQuery } = queryRequest;
-        let solrQuery = this.solr.createQuery();
-        solrQuery.query(query); // q
-        solrQuery.paginate(pagination === null || pagination === void 0 ? void 0 : pagination.start, pagination === null || pagination === void 0 ? void 0 : pagination.rows); // start, rows
-        solrQuery.filterList(filter); // fl
-        solrQuery.sort(sort); // sort
-        solrQuery.filterQuery(filterQuery); // fq
+        try {
+            let solrQuery = this.solr.createQuery();
+            solrQuery.query(query); // q
+            solrQuery.paginate(pagination === null || pagination === void 0 ? void 0 : pagination.start, pagination === null || pagination === void 0 ? void 0 : pagination.rows); // start, rows
+            solrQuery.filterList(filter); // fl
+            solrQuery.sort(sort); // sort
+            solrQuery.filterQuery(filterQuery); // fq
+            logger_1.Logger.info('SolrHttpDataSource:Solr Query created', 'createQuery');
+            logger_1.Logger.debug('SolrHttpDataSource query payload', 'createQuery', {
+                query: JSON.stringify(this.solr.getQuery()),
+            });
+        }
+        catch (err) {
+            logger_1.Logger.error('Error with SOLR query creation: ', 'SOLR  creation', err);
+            throw err;
+        }
     }
     executeSearch() {
         return __awaiter(this, void 0, void 0, function* () {
             let response;
-            let cacheKey = this.memoizedCacheKey();
-            if (this.memoizedResults.has(cacheKey)) {
-                response = yield this.memoizedResults.get(cacheKey); // NOSONAR
-                return response;
+            try {
+                let cacheKey = this.memoizedCacheKey();
+                if (this.memoizedResults.has(cacheKey)) {
+                    response = this.memoizedResults.get(cacheKey); // eslint-disable-line  @typescript-eslint/no-non-null-assertion
+                    return response;
+                }
+                else {
+                    response = yield this.solr.executeSearch();
+                    this.memoizedResults.set(cacheKey, response);
+                    return response;
+                }
             }
-            else {
-                response = yield this.solr.executeSearch();
-                this.memoizedResults.set(cacheKey, response);
-                return response;
+            catch (err) {
+                logger_1.Logger.error('Error with SOLR query execution: ', 'SOLR QUERY', err);
+                throw err;
             }
         });
     }

package/package.json CHANGED Viewed

@@ -1,11 +1,13 @@
 {
   "name": "@platform-x/hep-notification-client",
-  "version": "1.2.9",
+  "version": "1.3.1",
   "description": "@platform-x/hep-notification-client",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "scripts": {
-    "build": "tsc && npm run copy-static",
+        "devstart": "npm run build && tsc-watch --onSuccess \"node ./dist/src/index.js\"",
+     "start": "node ./dist/src/index.js",
+      "build": "tsc && npm run copy-static",
     "copy-static": "xcopy src\\templates dist\\templates /E /I /Y"
   },
   "author": "",
@@ -16,6 +18,7 @@
     "@types/node": "^22.15.3",
     "@types/uuid": "^10.0.0",
     "ts-node": "^10.9.2",
+    "tsc-watch": "^7.2.0",
     "typescript": "^5.8.3"
   },
   "dependencies": {
@@ -30,6 +33,7 @@
     "@types/lodash": "^4.14.171",
     "@types/node": "^15.12.2",
     "@types/twilio": "^3.19.2",
+    "apollo-datasource": "^3.3.2",
     "apollo-server-caching": "^3.3.0",
     "axios": "0.21.4",
     "bunyan": "^1.8.15",
@@ -53,7 +57,7 @@
     "request-ip": "2.1.3",
     "solr-client": "0.10.0-rc6",
     "twilio": "^5.3.6",
-    "uuid": "8.3.2"
+    "uuid": "^8.3.2"
   },
   "private": false,
   "publishConfig": {

package/dist/src/common/util/secretKeyManager.d.ts DELETED Viewed

@@ -1,7 +0,0 @@
-export declare class SecretKeyServices {
-    private ruleCache;
-    /**
-     * Fetches all the secret keys
-     */
-    getSecretKeys(): Promise<any>;
-}

package/dist/src/common/util/secretKeyManager.js DELETED Viewed

@@ -1,58 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SecretKeyServices = void 0;
-const hep_secret_access_1 = require("hep-secret-access");
-const constants_1 = require("../../platform-x/constants");
-const config_1 = __importDefault(require("../../config"));
-class SecretKeyServices {
-    constructor() {
-        this.ruleCache = new Map();
-    }
-    /**
-     * Fetches all the secret keys
-     */
-    getSecretKeys() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // Initialize secret manager object
-                if (this.ruleCache.has('secret_data')) {
-                    return this.ruleCache.get('secret_data');
-                }
-                const secretObject = (0, hep_secret_access_1.secretManager)();
-                // If secret mode is ENV – read one by one
-                // for local testing
-                if ((config_1.default === null || config_1.default === void 0 ? void 0 : config_1.default.SECRET_MODE) === 'env') {
-                    const keyConfig = {};
-                    for (const key of Object.values(constants_1.DynamicValues)) {
-                        // Fetch individual value (existing read() method)
-                        const value = yield secretObject.read(key);
-                        keyConfig[key] = value;
-                    }
-                    this.ruleCache.set('secret_data', keyConfig);
-                    return keyConfig;
-                }
-                // else – fetch all secrets from GSM
-                const data = yield secretObject.readAllSecrets();
-                this.ruleCache.set('secret_data', data);
-                return data;
-            }
-            catch (err) {
-                return {};
-            }
-        });
-    }
-}
-exports.SecretKeyServices = SecretKeyServices;
-//# sourceMappingURL=secretKeyManager.js.map

package/dist/src/platform-x/interface/interface.d.ts DELETED Viewed

@@ -1,4 +0,0 @@
-export interface PushNotifyProvider {
-    fetchTopics(): Promise<any>;
-    sendNotificationsToTopics(topics: string[], notification: any): Promise<any>;
-}

package/dist/src/platform-x/interface/interface.js DELETED Viewed

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