From 689f885d9d4e7eb3c74591da9d835023536d50ee Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Tue, 5 Aug 2025 18:46:53 +0100 Subject: [PATCH] Updates --- .../functions/backend/dbHandler.js | 7 +++-- .../functions/backend/user-db-handler.js | 21 +++++++++++++++ package-shared/functions/backend/dbHandler.ts | 8 +++--- .../functions/backend/user-db-handler.ts | 26 +++++++++++++++++++ package.json | 2 +- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dist/package-shared/functions/backend/dbHandler.js b/dist/package-shared/functions/backend/dbHandler.js index bbabe39..3363989 100644 --- a/dist/package-shared/functions/backend/dbHandler.js +++ b/dist/package-shared/functions/backend/dbHandler.js @@ -36,14 +36,17 @@ function dbHandler(_a) { } } catch (error) { - console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.info); + // console.log("Connection Info =>", JSON.stringify(CONNECTION?.info)); if (error.message && typeof error.message == "string" && error.message.match(/Access denied for user.*password/i)) { throw new Error("Authentication Failed!"); } if (!noErrorLogs) { - console.log("ERROR in dbHandler =>", error.message); + // console.log("ERROR in dbHandler =>", error.message); + // console.log("........................................."); + // console.log("........................................."); + // console.log("........................................."); console.log(error); const tmpFolder = path_1.default.resolve(process.cwd(), "./.tmp"); if (!fs_1.default.existsSync(tmpFolder)) diff --git a/dist/package-shared/functions/backend/user-db-handler.js b/dist/package-shared/functions/backend/user-db-handler.js index 4d7ae99..b69158b 100644 --- a/dist/package-shared/functions/backend/user-db-handler.js +++ b/dist/package-shared/functions/backend/user-db-handler.js @@ -17,6 +17,7 @@ const mariadb_1 = __importDefault(require("mariadb")); const grab_mariadb_main_user_for_user_1 = __importDefault(require("./grab-mariadb-main-user-for-user")); const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handler")); const grabDbSSL_1 = __importDefault(require("../../utils/backend/grabDbSSL")); +const lodash_1 = __importDefault(require("lodash")); function userDbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ query, user, database, debug, tableSchema, values, }) { const { fullName, host, username, password } = yield (0, grab_mariadb_main_user_for_user_1.default)({ user }); @@ -34,6 +35,26 @@ function userDbHandler(_a) { metaAsArray: true, }); const results = yield (0, conn_db_handler_1.default)(connection, query); + if (Array.isArray(results)) { + const parsedDbResults = results.map((res) => parseResultObject(res)); + return parsedDbResults; + } return results; }); } +function parseResultObject(res) { + if (typeof res !== "object") + return res; + if (!res) + return res; + const newRes = lodash_1.default.cloneDeep(res); + const resKeys = Object.keys(res); + for (let i = 0; i < resKeys.length; i++) { + const k = resKeys[i]; + const val = newRes[k]; + if (typeof val == "object" && val) { + newRes[k] = ""; + } + } + return newRes; +} diff --git a/package-shared/functions/backend/dbHandler.ts b/package-shared/functions/backend/dbHandler.ts index 7593bba..017d65a 100644 --- a/package-shared/functions/backend/dbHandler.ts +++ b/package-shared/functions/backend/dbHandler.ts @@ -40,8 +40,7 @@ export default async function dbHandler< results = queryResults[0]; } } catch (error: any) { - console.log("Connection Info =>", CONNECTION?.info); - + // console.log("Connection Info =>", JSON.stringify(CONNECTION?.info)); if ( error.message && typeof error.message == "string" && @@ -51,7 +50,10 @@ export default async function dbHandler< } if (!noErrorLogs) { - console.log("ERROR in dbHandler =>", error.message); + // console.log("ERROR in dbHandler =>", error.message); + // console.log("........................................."); + // console.log("........................................."); + // console.log("........................................."); console.log(error); const tmpFolder = path.resolve(process.cwd(), "./.tmp"); diff --git a/package-shared/functions/backend/user-db-handler.ts b/package-shared/functions/backend/user-db-handler.ts index 527711e..d1787c2 100644 --- a/package-shared/functions/backend/user-db-handler.ts +++ b/package-shared/functions/backend/user-db-handler.ts @@ -3,6 +3,7 @@ import { DSQL_TableSchemaType, UserType } from "../../types"; import grabMariadbMainUserForUser from "./grab-mariadb-main-user-for-user"; import connDbHandler from "../../utils/db/conn-db-handler"; import grabDbSSL from "../../utils/backend/grabDbSSL"; +import _ from "lodash"; type Params = { query?: string; @@ -40,5 +41,30 @@ export default async function userDbHandler({ const results = await connDbHandler(connection, query); + if (Array.isArray(results)) { + const parsedDbResults = results.map((res) => parseResultObject(res)); + return parsedDbResults; + } + return results; } + +function parseResultObject(res: any) { + if (typeof res !== "object") return res; + if (!res) return res; + + const newRes = _.cloneDeep(res); + + const resKeys = Object.keys(res); + + for (let i = 0; i < resKeys.length; i++) { + const k = resKeys[i]; + const val = newRes[k]; + + if (typeof val == "object" && val) { + newRes[k] = ""; + } + } + + return newRes; +} diff --git a/package.json b/package.json index 23581b4..ccc600a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.1.7", + "version": "5.1.8", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {