drapcode-utility 2.3.4 → 2.3.6

package/build/encryption/crypt.js

@@ -115,7 +115,7 @@ const decryptFile = async (encryptedFilePath, key, iv) => {
 };
 exports.decryptFile = decryptFile;
 const handleExtraString = (key, append = true) => {
-    if (!key || key === "undefined")
+    if (!key || key === "undefined" || typeof key === "undefined")
         return key;
     if (append) {
         const prefix = crypto_1.default.randomBytes(2).toString("hex");

package/build/utils/common-util.d.ts

@@ -1,4 +1,4 @@
-import { PageContent, WebhookContent, ExternalApiContent, CustomComponentContent, CustomMappingContent, TaskContent, EventContent, SnippetContent, LocalizationContent, PluginContent, DevApiContent, TemplateContent, CollectionContent } from "./file-util";
+import { PageContent, WebhookContent, ExternalApiContent, CustomComponentContent, CustomMappingContent, TaskContent, EventContent, SnippetContent, LocalizationContent, PluginContent, DevApiContent, TemplateContent, CollectionContent, ExternalDbContent } from "./file-util";
 /**
  * Page Related
  */
@@ -77,3 +77,9 @@ export declare const saveTemplates: (projectId: string, templates: TemplateConte
 export declare const loadCollections: (projectId: string) => CollectionContent[];
 export declare const loadCollection: (projectId: string, uuid: string) => CollectionContent | null;
 export declare const saveCollections: (projectId: string, collections: CollectionContent[]) => void;
+/**
+ * External DB Related
+ */
+export declare const loadExternalDbs: (projectId: string) => ExternalDbContent[];
+export declare const loadExternalDb: (projectId: string, uuid: string) => ExternalDbContent | null;
+export declare const saveExternalDbs: (projectId: string, externalDbs: ExternalDbContent[]) => void;

package/build/utils/common-util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveCollections = exports.loadCollection = exports.loadCollections = exports.saveTemplates = exports.loadTemplate = exports.loadTemplates = exports.saveDevAPIs = exports.loadDevAPI = exports.loadDevAPIs = exports.savePlugins = exports.loadPlugin = exports.loadPlugins = exports.saveLocalizations = exports.loadLocalization = exports.loadLocalizations = exports.saveSnippets = exports.loadSnippet = exports.loadSnippets = exports.saveEvents = exports.loadEvent = exports.loadEvents = exports.saveTasks = exports.loadTask = exports.loadTasks = exports.saveCustomMappings = exports.loadCustomMapping = exports.loadCustomMappings = exports.saveCustomComponents = exports.loadCustomComponent = exports.loadCustomComponents = exports.saveExternalApis = exports.loadExternalApi = exports.loadExternalApis = exports.saveWebhooks = exports.loadWebhook = exports.loadWebhooks = exports.saveProjectPages = exports.loadPage = exports.loadPages = void 0;
+exports.saveExternalDbs = exports.loadExternalDb = exports.loadExternalDbs = exports.saveCollections = exports.loadCollection = exports.loadCollections = exports.saveTemplates = exports.loadTemplate = exports.loadTemplates = exports.saveDevAPIs = exports.loadDevAPI = exports.loadDevAPIs = exports.savePlugins = exports.loadPlugin = exports.loadPlugins = exports.saveLocalizations = exports.loadLocalization = exports.loadLocalizations = exports.saveSnippets = exports.loadSnippet = exports.loadSnippets = exports.saveEvents = exports.loadEvent = exports.loadEvents = exports.saveTasks = exports.loadTask = exports.loadTasks = exports.saveCustomMappings = exports.loadCustomMapping = exports.loadCustomMappings = exports.saveCustomComponents = exports.loadCustomComponent = exports.loadCustomComponents = exports.saveExternalApis = exports.loadExternalApi = exports.loadExternalApis = exports.saveWebhooks = exports.loadWebhook = exports.loadWebhooks = exports.saveProjectPages = exports.loadPage = exports.loadPages = void 0;
 const path_1 = __importDefault(require("path"));
 const file_util_1 = require("./file-util");
 /**
@@ -218,3 +218,18 @@ const saveCollections = (projectId, collections) => {
     });
 };
 exports.saveCollections = saveCollections;
+/**
+ * External DB Related
+ */
+const loadExternalDbs = (projectId) => {
+    return (0, file_util_1.loadJsonFilesFromSubfolder)(projectId, "external-dbs");
+};
+exports.loadExternalDbs = loadExternalDbs;
+const loadExternalDb = (projectId, uuid) => {
+    return (0, file_util_1.loadSingleJsonFromSubfolder)(projectId, "external-dbs", uuid);
+};
+exports.loadExternalDb = loadExternalDb;
+const saveExternalDbs = (projectId, externalDbs) => {
+    (0, file_util_1.saveEntities)(projectId, "external-dbs", externalDbs, (extDb) => extDb.uuid);
+};
+exports.saveExternalDbs = saveExternalDbs;

package/build/utils/file-util.d.ts

@@ -43,6 +43,9 @@ export interface CollectionContent extends FileContent {
     uuid: string;
     collectionName: string;
 }
+export interface ExternalDbContent extends FileContent {
+    uuid: string;
+}
 export declare const checkFolder: (folderPath: string) => void;
 export declare const verifyProjectSettingFolder: (projectId: string) => boolean;
 export declare const readFile: (filePath: string) => FileContent | null;

package/build/utils/rest-client.d.ts

@@ -1,4 +1,4 @@
-export declare const callCurlRequest: (setting: any, user?: any, tenant?: any, userSetting?: any, subTenant?: any, data?: any, timeout?: number, timeoutMessage?: string, envConstants?: {}, downloadBytes?: boolean, requestDataType?: string, wrapJsonDataInArray?: boolean, projectId?: string, dataTransferObject?: any, isRawJSON?: boolean, browserStorageData?: any) => Promise<{
+export declare const callCurlRequest: (setting: any, user?: any, tenant?: any, userSetting?: any, subTenant?: any, data?: any, timeout?: number, timeoutMessage?: string, envConstants?: {}, downloadBytes?: boolean, requestDataType?: string, wrapJsonDataInArray?: boolean, projectId?: string, dataTransferObject?: any, isRawJSON?: boolean, browserStorageData?: any, dtoExternalAPI?: any) => Promise<{
     data: any;
     status: number;
     success: boolean;

package/build/utils/rest-client.js

@@ -7,15 +7,14 @@ exports.callCurlRequest = void 0;
 const axios_1 = __importDefault(require("axios"));
 const util_1 = require("./util");
 const drapcode_logger_1 = require("drapcode-logger");
+const drapcode_constant_1 = require("drapcode-constant");
 var FormData = require("form-data");
 var fs = require("fs");
 const qs = require("qs");
-const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}, subTenant = {}, data = {}, timeout = 0, timeoutMessage = "", envConstants = {}, downloadBytes = false, requestDataType = "", wrapJsonDataInArray = false, projectId = "", dataTransferObject = {}, isRawJSON = false, browserStorageData = {}) => {
+const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}, subTenant = {}, data = {}, timeout = 0, timeoutMessage = "", envConstants = {}, downloadBytes = false, requestDataType = "", wrapJsonDataInArray = false, projectId = "", dataTransferObject = {}, isRawJSON = false, browserStorageData = {}, dtoExternalAPI = {}) => {
     let { url, params, methodType, authType, requestHeader, accessToken, headers = [], isMultipart, files, awsSignPluginConfig = null, body } = setting;
     const { bodyRawJSONUrlEncoded, bodyDataFrom } = body || {};
-    const { sessionValue, sessionFormValue, 
-    // sessionStorageData: sessionStorageValue,
-    localStorageData: localStorageValue, cookiesData: cookiesValue, } = browserStorageData || {};
+    const { sessionValue, sessionFormValue, localStorageData: localStorageValue, cookiesData: cookiesValue, } = browserStorageData || {};
     drapcode_logger_1.logger.info(`STEP 1 Replacing placeholder key values...`, {
         label: projectId,
     });
@@ -122,7 +121,6 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
     }
     try {
         let result = null;
-        // console.log("🚀 ~ callCurlRequest ~ isRawJSON:", isRawJSON, "~ bodyRawJSONUrlEncoded:", bodyRawJSONUrlEncoded, "~ bodyDataFrom:", bodyDataFrom, "~ requestDataType:", requestDataType)
         drapcode_logger_1.logger.info(`** isRawJSON: ${isRawJSON}, ~ bodyRawJSONUrlEncoded: ${bodyRawJSONUrlEncoded}, ~ bodyDataFrom: ${bodyDataFrom}, ~ requestDataType: ${requestDataType}`, { label: projectId });
         if (isRawJSON) {
             if (bodyDataFrom === "RAW_JSON" && bodyRawJSONUrlEncoded) {
@@ -140,7 +138,18 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
             if (requestDataType === "NO_BODY_DATA")
                 data = {};
         }
-        result = await makeAxiosCall(projectId, methodType, url, headerValue, data, timeout, wrapJsonDataInArray, awsSignPluginConfig);
+        const isTypeMySQL = dtoExternalAPI?.dtoExternalApiType === drapcode_constant_1.MYSQL &&
+            dtoExternalAPI?.dtoExternalDbId;
+        drapcode_logger_1.logger.info(`** isTypeMySQL: ${isTypeMySQL}`, { label: projectId });
+        if (isTypeMySQL) {
+            const { dtoExternalDb, dtoSearchString } = dtoExternalAPI;
+            const { setting: extDbSetting } = dtoExternalDb;
+            data["searchQuery"] = dtoSearchString;
+            result = await makeMySqlCall(projectId, data, extDbSetting);
+        }
+        else {
+            result = await makeAxiosCall(projectId, methodType, url, headerValue, data, timeout, wrapJsonDataInArray, awsSignPluginConfig);
+        }
         drapcode_logger_1.logger.info(`result.headers: ${result?.headers}`, { label: projectId });
         if (!result) {
             const errorMessage = "No Response from Server";
@@ -266,3 +275,69 @@ const makeAxiosCall = async (projectId, methodType, url, axiosConfig, data, time
         return error;
     }
 };
+const makeMySqlCall = async (projectId, data, extDbSetting) => {
+    const allowedOps = ["select", "insert", "update", "delete"];
+    let result = "";
+    try {
+        const { sql: sqlQuery, params: sqlParams = [], pagination: sqlPagination, sort: sqlSort, searchQuery } = data || {};
+        if (!sqlQuery || !sqlQuery.trim()) {
+            return { status: 400, error: "SQL Query is empty" };
+        }
+        const operation = sqlQuery.trim().split(/\s+/)[0].toLowerCase();
+        if (!allowedOps.includes(operation)) {
+            return { status: 403, error: "Only SELECT, INSERT, UPDATE, DELETE operations are allowed." };
+        }
+        let finalSql = sqlQuery.trim();
+        const values = [...sqlParams];
+        // Add WHERE clause if needed
+        const hasWhere = finalSql.toLowerCase().includes("where");
+        if (searchQuery && !hasWhere) {
+            finalSql += (0, util_1.buildWhereClause)(searchQuery);
+        }
+        // Add ORDER BY clause
+        finalSql += (0, util_1.buildOrderByClause)(sqlSort);
+        // Add LIMIT/OFFSET clause
+        finalSql += (0, util_1.buildLimitOffsetClause)(sqlPagination, values);
+        const { mysqlDbHostUrl, mysqlDbUser, mysqlDbPassword, mysqlDbName, mysqlDbPort } = extDbSetting || {};
+        const mysqlDBConfig = {
+            host: mysqlDbHostUrl,
+            user: mysqlDbUser,
+            password: mysqlDbPassword,
+            database: mysqlDbName,
+            port: mysqlDbPort,
+        };
+        console.log(`==> Final MySQL data for projectID: ${projectId}:>> `, data, " with finalSql:>> ", finalSql, " and values:>> ", values);
+        const connection = await (0, util_1.createMySqlConnection)(mysqlDBConfig);
+        try {
+            const [rows] = await connection.execute(finalSql, values);
+            let total = null;
+            if (sqlPagination?.getTotal) {
+                total = await (0, util_1.getTotalRecords)(connection, sqlQuery, sqlParams);
+            }
+            result = {
+                status: 200,
+                success: true,
+                data: {
+                    content: rows,
+                    totalRecords: total,
+                    returned: Array.isArray(rows) ? rows.length : 0
+                },
+                totalRecords: total,
+                returned: Array.isArray(rows) ? rows.length : 0,
+            };
+        }
+        catch (err) {
+            console.error(`==> MySQL projectID: ${projectId} ~ err:`, err);
+            return { status: 500, error: err };
+        }
+        finally {
+            await connection.end();
+            console.log(`==> MySQL projectID: ${projectId} ~ Connection cleanup!`);
+        }
+        return result;
+    }
+    catch (error) {
+        console.error(`==> MySQL projectID: ${projectId} ~ error:`, error);
+        return { status: 500, error };
+    }
+};

package/build/utils/util.d.ts

@@ -155,4 +155,21 @@ type responseDataType = {
     data: any;
 };
 export declare const getAwsSignature: (axiosConfig: any, awsSignPluginConfig: any) => Promise<responseDataType>;
+export declare const createMySqlConnection: (config: any) => Promise<any>;
+/**
+ * Helper to parse search query string into SQL WHERE clause
+ */
+export declare const buildWhereClause: (searchQuery: string) => string;
+/**
+ * Helper to build ORDER BY clause
+ */
+export declare const buildOrderByClause: (sqlSort: any) => string;
+/**
+ * Helper to build LIMIT/OFFSET clause and update values array
+ */
+export declare const buildLimitOffsetClause: (sqlPagination: any, values: any[]) => string;
+/**
+ * Helper to get total record count for pagination
+ */
+export declare const getTotalRecords: (connection: any, sqlQuery: string, sqlParams: any[]) => Promise<number | null>;
 export {};

package/build/utils/util.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiply = exports.average = exports.substraction = exports.addition = exports.validateNumbers = exports.checkAndConvertNumber = exports.evaluateCustomSentence = exports.strJoin = exports.markdownToHtml = exports.substr = exports.truncate = exports.titleCase = exports.trim = exports.slugify = exports.upperCase = exports.lowerCase = exports.capitalize = exports.replaceUnderscoreWithSlash = exports.replaceSlashWithUnderscore = exports.toggleConsoleLogs = exports.validateUrl = exports.validateData = exports.fillDefaultValues = exports.replaceValueFromSource = exports.processFieldsInclude = exports.removeMongoDbId = exports.replaceTransferObjectValueIntoExpression = exports.unflattenObject = exports.parseValueFromData = exports.parseJsonString = exports.replaceDataValueIntoExpression = exports.formatCustomCSSClasses = exports.validateAlphanumericString = exports.convertItemToArray = exports.arraysEqual = exports.checkAndCompareValue = exports.restructureData = exports.formatCollectionAndFieldName = exports.cleanCollectionAndFieldName = exports.getSpecialCharectorReplacedExpression = exports.validateUuidString = exports.validateEmail = exports.dynamicSort = exports.isObject = exports.isEmptyObject = exports.isEmpty = exports.clearSpaceAndReformat = exports.camelize = exports.validateString = exports.nonFindQuery = void 0;
-exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
+exports.getTotalRecords = exports.buildLimitOffsetClause = exports.buildOrderByClause = exports.buildWhereClause = exports.createMySqlConnection = exports.getAwsSignature = exports.replaceValuesFromRequestMapping = exports.replaceValuesFromObjArr = exports.checkFieldValueType = exports.getPrimaryFieldNameOfDataSource = exports.getFieldSchemaForDataSourcePrimaryId = exports.getMappingObjKey = exports.getItemDataForArrayFields = exports.getFileObjectList = exports.getFindQuery = exports.mergeObjects = exports.dateDifference = exports.formatDate = exports.evaluateJSLogic = exports.evaluateCurrency = exports.evaluateExpression = exports.divide = void 0;
 const drapcode_constant_1 = require("drapcode-constant");
 const lodash_1 = __importDefault(require("lodash"));
 const showdown_1 = __importDefault(require("showdown"));
@@ -17,6 +17,7 @@ const moment_1 = __importDefault(require("moment"));
 const mime_types_1 = __importDefault(require("mime-types"));
 const uuid_2 = require("uuid");
 const aws4_1 = require("aws4");
+const mysql = require('mysql2/promise');
 exports.nonFindQuery = ["COUNT", "SUM", "AVG", "MIN", "MAX"];
 // Constants
 const DERIVED_FIELD_EXCLUDES = [
@@ -149,7 +150,9 @@ const dynamicSort = (property) => {
         if (!aValue ||
             !bValue ||
             aValue === "undefined" ||
-            bValue === "undefined") {
+            bValue === "undefined" ||
+            typeof aValue === "undefined" ||
+            typeof bValue === "undefined") {
             return 0;
         }
         if (typeof aValue === "number" || typeof bValue === "number") {
@@ -1222,3 +1225,67 @@ const getAwsSignature = async (axiosConfig, awsSignPluginConfig) => {
     return response;
 };
 exports.getAwsSignature = getAwsSignature;
+const createMySqlConnection = async (config) => {
+    try {
+        const { host, user, password, database, port } = config || {};
+        const connection = await mysql.createConnection({
+            host: host,
+            user: user,
+            password: password,
+            database: database,
+            port: port,
+        });
+        const [rows] = await connection.execute('select ?+? as sum', [2, 2]);
+        console.log('==> MySQL createMySqlConnection ~ Testing connection...', rows);
+        return connection;
+    }
+    catch (error) {
+        console.error("==> MySQL createMySqlConnection ~ error:", error);
+        throw error;
+    }
+};
+exports.createMySqlConnection = createMySqlConnection;
+/**
+ * Helper to parse search query string into SQL WHERE clause
+ */
+const buildWhereClause = (searchQuery) => {
+    if (!searchQuery)
+        return "";
+    const params = searchQuery.split("&").map((pair) => {
+        const [key, value] = pair.split("=");
+        return `${decodeURIComponent(key)}="${decodeURIComponent(value)}"`;
+    });
+    return params.length ? ` WHERE ${params.join(" AND ")}` : "";
+};
+exports.buildWhereClause = buildWhereClause;
+/**
+ * Helper to build ORDER BY clause
+ */
+const buildOrderByClause = (sqlSort) => {
+    if (sqlSort?.column && sqlSort?.order) {
+        const order = sqlSort.order.toUpperCase() === "DESC" ? "DESC" : "ASC";
+        return ` ORDER BY \`${sqlSort.column}\` ${order}`;
+    }
+    return "";
+};
+exports.buildOrderByClause = buildOrderByClause;
+/**
+ * Helper to build LIMIT/OFFSET clause and update values array
+ */
+const buildLimitOffsetClause = (sqlPagination, values) => {
+    if (sqlPagination?.limit && sqlPagination?.offset !== undefined) {
+        values.push(parseInt(sqlPagination.limit), parseInt(sqlPagination.offset));
+        return " LIMIT ? OFFSET ?";
+    }
+    return "";
+};
+exports.buildLimitOffsetClause = buildLimitOffsetClause;
+/**
+ * Helper to get total record count for pagination
+ */
+const getTotalRecords = async (connection, sqlQuery, sqlParams) => {
+    const countSql = `SELECT COUNT(*) as total FROM (${sqlQuery}) as count_table`;
+    const [countRows] = await connection.execute(countSql, sqlParams);
+    return countRows[0]?.total ?? null;
+};
+exports.getTotalRecords = getTotalRecords;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -26,8 +26,8 @@
     "@types/mime-types": "^2.1.4",
     "@types/uuid": "^9.0.8",
     "del-cli": "^5.0.0",
-    "typescript": "^5.3.3",
-    "ts-loader": "^9.5.1"
+    "ts-loader": "^9.5.1",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@aws-sdk/client-kms": "^3.540.0",
@@ -42,9 +42,9 @@
     "axios": "^1.1.2",
     "date-fns": "^4.1.0",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.9.4",
+    "drapcode-constant": "^1.9.6",
     "drapcode-logger": "^1.3.5",
-    "drapcode-redis": "^1.3.12",
+    "drapcode-redis": "^1.4.0",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",
@@ -53,6 +53,7 @@
     "mathjs": "^14.4.0",
     "mime-types": "^2.1.35",
     "moment": "^2.29.0",
+    "mysql2": "^3.14.5",
     "numeral": "^2.0.6",
     "showdown": "^2.1.0",
     "svgo": "^3.3.2",