drapcode-utility 2.5.6 → 2.5.8

package/build/utils/rest-client.js

@@ -330,15 +330,31 @@ const makeMySqlCall = async (projectId, data, extDbSetting) => {
                 values.push(fileData);
             });
         }
-        const { mysqlDbHostUrl, mysqlDbUser, mysqlDbPassword, mysqlDbName, mysqlDbPort } = extDbSetting || {};
+        const { mysqlDbHostUrl, mysqlDbUser, mysqlDbPassword, mysqlDbName, mysqlDbPort, mysqlDbSslEnabled, mysqlDbSslCa, mysqlDbSslCert, mysqlDbSslKey } = extDbSetting || {};
         const mysqlDBConfig = {
             host: mysqlDbHostUrl,
             user: mysqlDbUser,
             password: mysqlDbPassword,
             database: mysqlDbName,
             port: mysqlDbPort,
+            sslEnabled: mysqlDbSslEnabled,
+            sslCa: '',
+            sslCert: '',
+            sslKey: ''
         };
+        if (mysqlDbSslEnabled) {
+            if (mysqlDbSslCa) {
+                mysqlDBConfig.sslCa = mysqlDbSslCa;
+            }
+            if (mysqlDbSslCert) {
+                mysqlDBConfig.sslCert = mysqlDbSslCert;
+            }
+            if (mysqlDbSslKey) {
+                mysqlDBConfig.sslKey = mysqlDbSslKey;
+            }
+        }
         console.log(`==> Final MySQL projectID: ${projectId} ~ data:>> `, data, " ~ query type :>> ", operation, " ~ finalSql:>> ", finalSql, " ~ values:>> ", values);
+        console.log("🚀 ~ makeMySqlCall ~ process.env.MYSQL_SSL_CERT_PATH:", process.env.MYSQL_SSL_CERT_PATH);
         const connection = await (0, util_1.createMySqlConnection)(mysqlDBConfig);
         try {
             const [rows] = await connection.execute(finalSql, values);

package/build/utils/util.js

@@ -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 fs_1 = __importDefault(require("fs"));
 const mysql = require("mysql2/promise");
 exports.nonFindQuery = ["COUNT", "SUM", "AVG", "MIN", "MAX"];
 // Constants
@@ -595,6 +596,7 @@ const processDerivedFieldInclude = (derivedFieldsInclude) => {
     return derivedFields;
 };
 const replaceValueFromSource = (variableName, environment, tenant) => {
+    console.log("🚀 ~ replaceValueFromSource ~ variableName:", variableName, "~ environment:", environment);
     if (variableName && typeof variableName === "string") {
         if (variableName.startsWith(ENVIRONMENT_FIX_KEY)) {
             return replaceValueFromEnvironment(variableName, environment);
@@ -618,6 +620,7 @@ const replaceValueFromEnvironment = (variableName, environment) => {
         environment &&
         environment.constants) {
         const envConstant = environment.constants.find((env) => env.name === variableName.replace(ENVIRONMENT_FIX_KEY, ""));
+        console.log("🚀 ~ replaceValueFromEnvironment ~ envConstant:", envConstant);
         return envConstant.value;
     }
     else {
@@ -1275,14 +1278,41 @@ 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 { host, user, password, database, port, sslEnabled, sslCa, sslCert, sslKey } = config || {};
+        console.log("🚀 ~ createMySqlConnection ~ sslEnabled:", sslEnabled);
+        console.log("🚀 ~ createMySqlConnection ~ process.env.MYSQL_SSL_CERT_PATH:", process.env.MYSQL_SSL_CERT_PATH);
+        const sslCertsPath = process.env.MYSQL_SSL_CERT_PATH || './';
+        console.log("🚀 ~ createMySqlConnection ~ sslCertsPath:", sslCertsPath);
+        let connection = null;
+        if (sslEnabled) {
+            const connectionOptions = {
+                host,
+                user,
+                password,
+                database,
+                port,
+                ssl: {}
+            };
+            if (sslCa) {
+                connectionOptions.ssl.ca = fs_1.default.readFileSync(`${sslCertsPath}${sslCa}`);
+            }
+            if (sslCert) {
+                connectionOptions.ssl.cert = fs_1.default.readFileSync(`${sslCertsPath}${sslCert}`);
+            }
+            if (sslKey) {
+                connectionOptions.ssl.key = fs_1.default.readFileSync(`${sslCertsPath}${sslKey}`);
+            }
+            connection = await mysql.createConnection(connectionOptions);
+        }
+        else {
+            connection = await mysql.createConnection({
+                host,
+                user,
+                password,
+                database,
+                port,
+            });
+        }
         const [rows] = await connection.execute("select ?+? as sum", [2, 2]);
         console.log("==> MySQL createMySqlConnection ~ Testing connection...", rows);
         return connection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "DrapCode Utility",
   "main": "build/index.js",
   "types": "build/index.d.ts",