diff --git a/dist/index.d.ts b/dist/index.d.ts index 6a07bb2..21606f5 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,9 +1,3 @@ -import { ServerlessMysql } from "serverless-mysql"; -declare global { - var DSQL_DB_CONN: ServerlessMysql | undefined; - var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined; - var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined; -} /** * Imports */ diff --git a/dist/package-shared/functions/backend/dbHandler.js b/dist/package-shared/functions/backend/dbHandler.js index cfa896d..a9e2c39 100644 --- a/dist/package-shared/functions/backend/dbHandler.js +++ b/dist/package-shared/functions/backend/dbHandler.js @@ -24,19 +24,18 @@ function dbHandler(...args) { var _a; ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) && fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8"); - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); let results; /** * Fetch from db diff --git a/dist/package-shared/shell/checkDb.js b/dist/package-shared/shell/checkDb.js index cb54ef0..d3cf88f 100644 --- a/dist/package-shared/shell/checkDb.js +++ b/dist/package-shared/shell/checkDb.js @@ -26,19 +26,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); * @returns {Promise} */ (() => __awaiter(void 0, void 0, void 0, function* () { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); console.log("Connection Query Success =>", result); diff --git a/dist/package-shared/shell/updateSSLUsers.js b/dist/package-shared/shell/updateSSLUsers.js index e6d0508..00b1ed6 100644 --- a/dist/package-shared/shell/updateSSLUsers.js +++ b/dist/package-shared/shell/updateSSLUsers.js @@ -27,19 +27,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); */ (() => __awaiter(void 0, void 0, void 0, function* () { var _a; - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { const result = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user"); const parsedResults = JSON.parse(JSON.stringify(result)); diff --git a/dist/package-shared/shell/utils/dbHandler.js b/dist/package-shared/shell/utils/dbHandler.js index f833fc4..792c6c2 100644 --- a/dist/package-shared/shell/utils/dbHandler.js +++ b/dist/package-shared/shell/utils/dbHandler.js @@ -22,19 +22,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); */ function dbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ query, values, }) { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); let results; try { if (query && values) { diff --git a/dist/package-shared/utils/backend/global-db/DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/DB_HANDLER.js index 4ddb8cc..2900c37 100644 --- a/dist/package-shared/utils/backend/global-db/DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/DB_HANDLER.js @@ -20,19 +20,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); */ function DB_HANDLER(...args) { return __awaiter(this, void 0, void 0, function* () { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { if (!CONNECTION) throw new Error("No Connection provided to DB_HANDLER function!"); diff --git a/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js index fc9fac4..67f91b4 100644 --- a/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js @@ -20,13 +20,23 @@ const conn_db_handler_1 = __importDefault(require("../../db/conn-db-handler")); */ function DSQL_USER_DB_HANDLER(_a) { return __awaiter(this, arguments, void 0, function* ({ paradigm, queryString, queryValues, }) { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ + const CONNECTION = paradigm == "Read Only" + ? (0, serverless_mysql_1.default)({ config: { host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, + user: process.env.DSQL_DB_READ_ONLY_USERNAME, + password: process.env.DSQL_DB_READ_ONLY_PASSWORD, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }) + : (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_FULL_ACCESS_USERNAME, + password: process.env.DSQL_DB_FULL_ACCESS_PASSWORD, port: process.env.DSQL_DB_PORT ? Number(process.env.DSQL_DB_PORT) : undefined, @@ -34,21 +44,15 @@ function DSQL_USER_DB_HANDLER(_a) { }, }); try { - switch (paradigm) { - case "Read Only": - return yield (0, conn_db_handler_1.default)(global.DSQL_READ_ONLY_DB_CONN || CONNECTION, queryString, queryValues); - case "Full Access": - return yield (0, conn_db_handler_1.default)(global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION, queryString, queryValues); - case "FA": - return yield (0, conn_db_handler_1.default)(global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION, queryString, queryValues); - default: - return null; - } + return yield (0, conn_db_handler_1.default)(CONNECTION, queryString, queryValues); } catch (error) { console.log(`DSQL_USER_DB_HANDLER Error: ${error.message}`); return null; } + finally { + CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end(); + } // try { // return new Promise((resolve, reject) => { // const fullAccess = paradigm?.match(/full.access|^fa$/i) diff --git a/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js index 997d6bf..5d04add 100644 --- a/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js @@ -9,19 +9,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); * # DSQL user read-only DB handler */ function NO_DB_HANDLER(...args) { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { return new Promise((resolve, reject) => { CONNECTION.query(...args) diff --git a/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js index 69adae5..f51f223 100644 --- a/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js @@ -9,19 +9,18 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql")); * # Root DB handler */ function ROOT_DB_HANDLER(...args) { - const CONNECTION = global.DSQL_DB_CONN || - (0, serverless_mysql_1.default)({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = (0, serverless_mysql_1.default)({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { return new Promise((resolve, reject) => { CONNECTION.query(...args) diff --git a/index.ts b/index.ts index 2b5924d..570feac 100644 --- a/index.ts +++ b/index.ts @@ -1,10 +1,3 @@ -import { ServerlessMysql } from "serverless-mysql"; -declare global { - var DSQL_DB_CONN: ServerlessMysql | undefined; - var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined; - var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined; -} - /** * Imports */ diff --git a/package-shared/functions/backend/dbHandler.ts b/package-shared/functions/backend/dbHandler.ts index c08b4eb..3c5be19 100644 --- a/package-shared/functions/backend/dbHandler.ts +++ b/package-shared/functions/backend/dbHandler.ts @@ -13,20 +13,18 @@ export default async function dbHandler(...args: any[]) { "utf8" ); - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); let results; diff --git a/package-shared/shell/checkDb.ts b/package-shared/shell/checkDb.ts index dda3aa2..aa5c234 100755 --- a/package-shared/shell/checkDb.ts +++ b/package-shared/shell/checkDb.ts @@ -13,20 +13,18 @@ import mysql from "serverless-mysql"; * @returns {Promise} */ (async () => { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { const result = await CONNECTION.query( diff --git a/package-shared/shell/updateSSLUsers.ts b/package-shared/shell/updateSSLUsers.ts index 3945c20..cc59046 100755 --- a/package-shared/shell/updateSSLUsers.ts +++ b/package-shared/shell/updateSSLUsers.ts @@ -13,20 +13,18 @@ import mysql from "serverless-mysql"; * @returns {Promise} */ (async () => { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { const result = await CONNECTION.query( diff --git a/package-shared/shell/utils/dbHandler.ts b/package-shared/shell/utils/dbHandler.ts index 4cebea7..82d7073 100755 --- a/package-shared/shell/utils/dbHandler.ts +++ b/package-shared/shell/utils/dbHandler.ts @@ -17,20 +17,18 @@ export default async function dbHandler({ query, values, }: Param): Promise { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); let results; diff --git a/package-shared/utils/backend/global-db/DB_HANDLER.ts b/package-shared/utils/backend/global-db/DB_HANDLER.ts index c9935ce..b183af4 100644 --- a/package-shared/utils/backend/global-db/DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/DB_HANDLER.ts @@ -5,20 +5,18 @@ import mysql from "serverless-mysql"; * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database */ export default async function DB_HANDLER(...args: any[]) { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { if (!CONNECTION) diff --git a/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts b/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts index 324d7c2..0d86a1a 100644 --- a/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts @@ -16,49 +16,37 @@ export default async function DSQL_USER_DB_HANDLER({ queryValues, }: Param) { const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + paradigm == "Read Only" + ? mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_READ_ONLY_USERNAME, + password: process.env.DSQL_DB_READ_ONLY_PASSWORD, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }) + : mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_FULL_ACCESS_USERNAME, + password: process.env.DSQL_DB_FULL_ACCESS_PASSWORD, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { - switch (paradigm) { - case "Read Only": - return await connDbHandler( - global.DSQL_READ_ONLY_DB_CONN || CONNECTION, - queryString, - queryValues - ); - - case "Full Access": - return await connDbHandler( - global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION, - queryString, - queryValues - ); - - case "FA": - return await connDbHandler( - global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION, - queryString, - queryValues - ); - - default: - return null; - } + return await connDbHandler(CONNECTION, queryString, queryValues); } catch (error: any) { console.log(`DSQL_USER_DB_HANDLER Error: ${error.message}`); return null; + } finally { + CONNECTION?.end(); } // try { diff --git a/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts b/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts index 2504213..8b4802d 100644 --- a/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts @@ -5,20 +5,18 @@ import grabDbSSL from "../grabDbSSL"; * # DSQL user read-only DB handler */ export default function NO_DB_HANDLER(...args: any[]) { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { return new Promise((resolve, reject) => { diff --git a/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts b/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts index 73a5a38..d3ff7f1 100644 --- a/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts @@ -4,20 +4,18 @@ import mysql from "serverless-mysql"; * # Root DB handler */ export default function ROOT_DB_HANDLER(...args: any[]) { - const CONNECTION = - global.DSQL_DB_CONN || - mysql({ - config: { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: process.env.DSQL_DB_NAME, - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - }, - }); + const CONNECTION = mysql({ + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: process.env.DSQL_DB_NAME, + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + }, + }); try { return new Promise((resolve, reject) => { diff --git a/package.json b/package.json index eac4bce..336038d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.4.8", + "version": "3.4.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {