From 43a741f9ace86e303abdbbb268c6606504173774 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Tue, 5 Aug 2025 13:56:51 +0100 Subject: [PATCH] Updates --- bun.lockb | Bin 57523 -> 61162 bytes .../functions/backend/dbHandler.d.ts | 6 +- .../functions/backend/dbHandler.js | 10 ++-- .../handle-mariadb-user-creation.d.ts | 6 +- dist/package-shared/shell/checkDb.js | 2 +- .../shell/test-external-server.js | 2 +- dist/package-shared/shell/updateSSLUsers.js | 4 +- .../utils/backend/grabDbSSL.d.ts | 5 +- .../package-shared/utils/backend/grabDbSSL.js | 1 + .../utils/db/conn-db-handler.js | 4 +- dist/package-shared/utils/endConnection.d.ts | 6 -- dist/package-shared/utils/endConnection.js | 13 ----- .../utils/grab-dsql-connection-config.d.ts | 4 +- .../utils/grab-dsql-connection-config.js | 31 +++++++++-- .../utils/grab-dsql-connection.d.ts | 4 +- .../utils/grab-dsql-connection.js | 5 +- package-shared/functions/backend/dbHandler.ts | 19 ++++--- package-shared/shell/checkDb.ts | 2 +- package-shared/shell/test-external-server.ts | 2 +- package-shared/shell/updateSSLUsers.ts | 6 +- package-shared/utils/backend/grabDbSSL.ts | 6 +- package-shared/utils/db/conn-db-handler.ts | 8 +-- package-shared/utils/endConnection.ts | 14 ----- .../utils/grab-dsql-connection-config.ts | 52 ++++++++++-------- package-shared/utils/grab-dsql-connection.ts | 6 +- package.json | 6 +- 26 files changed, 109 insertions(+), 115 deletions(-) delete mode 100644 dist/package-shared/utils/endConnection.d.ts delete mode 100644 dist/package-shared/utils/endConnection.js delete mode 100644 package-shared/utils/endConnection.ts diff --git a/bun.lockb b/bun.lockb index dc7f18a486c82cbbb6c44001555515175ec952d1..509792605ba4ff67d1616966634627d37db3f6a2 100755 GIT binary patch delta 12513 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 delta 10470 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 diff --git a/dist/package-shared/functions/backend/dbHandler.d.ts b/dist/package-shared/functions/backend/dbHandler.d.ts index 6aee0b2..f4f62d5 100644 --- a/dist/package-shared/functions/backend/dbHandler.d.ts +++ b/dist/package-shared/functions/backend/dbHandler.d.ts @@ -1,4 +1,4 @@ -import { DSQL_TableSchemaType } from "../../types"; +import { DSQL_TableSchemaType, PostInsertReturn } from "../../types"; import { ConnectionConfig } from "mariadb"; type Param({ query, values, noErrorLogs, database, config, }: Param): Promise; +} = PostInsertReturn>({ query, values, noErrorLogs, database, config, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/backend/dbHandler.js b/dist/package-shared/functions/backend/dbHandler.js index bbabe39..a8301d8 100644 --- a/dist/package-shared/functions/backend/dbHandler.js +++ b/dist/package-shared/functions/backend/dbHandler.js @@ -27,16 +27,16 @@ function dbHandler(_a) { try { CONNECTION = yield (0, grab_dsql_connection_1.default)({ database, config }); if (query && values) { - const queryResults = yield CONNECTION.query(query, values); - results = queryResults[0]; + const queryResults = (yield CONNECTION.query(query, values)); + results = queryResults; } else { - const queryResults = yield CONNECTION.query(query); - results = queryResults[0]; + const queryResults = (yield CONNECTION.query(query)); + results = queryResults; } } catch (error) { - console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.info); + console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.getConfig()); if (error.message && typeof error.message == "string" && error.message.match(/Access denied for user.*password/i)) { diff --git a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts index 4fd9e8f..19effbc 100644 --- a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts +++ b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-creation.d.ts @@ -15,9 +15,5 @@ type CreateNewUserParams = { host?: string; password?: string; }; -export declare function createNewSQLUser({ host, password, username, }: CreateNewUserParams): Promise<{ - [k: string]: any; -} | { - [k: string]: any; -}[] | null>; +export declare function createNewSQLUser({ host, password, username, }: CreateNewUserParams): Promise; export {}; diff --git a/dist/package-shared/shell/checkDb.js b/dist/package-shared/shell/checkDb.js index 80105da..9458eee 100644 --- a/dist/package-shared/shell/checkDb.js +++ b/dist/package-shared/shell/checkDb.js @@ -28,7 +28,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne (() => __awaiter(void 0, void 0, void 0, function* () { const CONNECTION = yield (0, grab_dsql_connection_1.default)(); try { - const [result] = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); + const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); console.log("Connection Query Success =>", result); } catch (error) { diff --git a/dist/package-shared/shell/test-external-server.js b/dist/package-shared/shell/test-external-server.js index 51e6183..92f84e9 100644 --- a/dist/package-shared/shell/test-external-server.js +++ b/dist/package-shared/shell/test-external-server.js @@ -33,7 +33,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne * @description If a database is provided, switch to it */ try { - const [result] = yield CONNECTION.query("SHOW DATABASES"); + const result = yield CONNECTION.query("SHOW DATABASES"); const parsedResults = JSON.parse(JSON.stringify(result)); console.log("parsedResults =>", parsedResults); } diff --git a/dist/package-shared/shell/updateSSLUsers.js b/dist/package-shared/shell/updateSSLUsers.js index fde4ac0..d6d45c9 100644 --- a/dist/package-shared/shell/updateSSLUsers.js +++ b/dist/package-shared/shell/updateSSLUsers.js @@ -30,7 +30,7 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name" var _a; const CONNECTION = yield (0, grab_dsql_connection_1.default)(); try { - const [result] = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user"); + const result = (yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user")); for (let i = 0; i < result.length; i++) { const user = result[i]; if (user.User !== process.env.DSQL_DB_READ_ONLY_USERNAME || @@ -42,7 +42,7 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name" if (ssl_type === "ANY") { continue; } - const [addUserSSL] = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`); + const addUserSSL = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`); console.log(`addUserSSL => ${User}@${Host}`, addUserSSL); } } diff --git a/dist/package-shared/utils/backend/grabDbSSL.d.ts b/dist/package-shared/utils/backend/grabDbSSL.d.ts index d507388..77ad19c 100644 --- a/dist/package-shared/utils/backend/grabDbSSL.d.ts +++ b/dist/package-shared/utils/backend/grabDbSSL.d.ts @@ -1,7 +1,4 @@ -import type { ConnectionConfig } from "mariadb"; -type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ -export default function grabDbSSL(): Return; -export {}; +export default function grabDbSSL(): any; diff --git a/dist/package-shared/utils/backend/grabDbSSL.js b/dist/package-shared/utils/backend/grabDbSSL.js index b6996f2..dcd40a5 100644 --- a/dist/package-shared/utils/backend/grabDbSSL.js +++ b/dist/package-shared/utils/backend/grabDbSSL.js @@ -7,6 +7,7 @@ exports.default = grabDbSSL; const fs_1 = __importDefault(require("fs")); const grab_dir_names_1 = __importDefault(require("./names/grab-dir-names")); const path_1 = __importDefault(require("path")); +// type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index a533ca1..0f09dd6 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -42,7 +42,7 @@ values, debug) { throw new Error("Query String Required!"); let queryErrorArray = []; if (typeof query == "string") { - const [results] = yield finalConnection.query(trimQuery(query), values); + const results = (yield finalConnection.query(trimQuery(query), values)); if (debug) { (0, debug_log_1.default)({ log: results, @@ -61,7 +61,7 @@ values, debug) { currentQueryError.sql = queryObj.query; currentQueryError.sqlValues = queryObj.values; const queryObjRes = yield finalConnection.query(trimQuery(queryObj.query), queryObj.values); - const results = queryObjRes[0]; + const results = queryObjRes; if (debug) { (0, debug_log_1.default)({ log: results, diff --git a/dist/package-shared/utils/endConnection.d.ts b/dist/package-shared/utils/endConnection.d.ts deleted file mode 100644 index 422a24e..0000000 --- a/dist/package-shared/utils/endConnection.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import mysql from "mysql"; -/** - * # End MYSQL Connection - */ -declare function endConnection(connection: mysql.Connection): void; -export default endConnection; diff --git a/dist/package-shared/utils/endConnection.js b/dist/package-shared/utils/endConnection.js deleted file mode 100644 index 84aadd0..0000000 --- a/dist/package-shared/utils/endConnection.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -/** - * # End MYSQL Connection - */ -function endConnection(connection) { - if (connection.state !== "disconnected") { - connection.end((err) => { - console.log(err === null || err === void 0 ? void 0 : err.message); - }); - } -} -exports.default = endConnection; diff --git a/dist/package-shared/utils/grab-dsql-connection-config.d.ts b/dist/package-shared/utils/grab-dsql-connection-config.d.ts index 5341bd9..4a805c6 100644 --- a/dist/package-shared/utils/grab-dsql-connection-config.d.ts +++ b/dist/package-shared/utils/grab-dsql-connection-config.d.ts @@ -1,6 +1,6 @@ -import { ConnectionConfig } from "mariadb"; import { DsqlConnectionParam } from "../types"; +import serverlessMysql from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ -export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): ConnectionConfig; +export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): serverlessMysql.Config; diff --git a/dist/package-shared/utils/grab-dsql-connection-config.js b/dist/package-shared/utils/grab-dsql-connection-config.js index 8d3677b..f445f5d 100644 --- a/dist/package-shared/utils/grab-dsql-connection-config.js +++ b/dist/package-shared/utils/grab-dsql-connection-config.js @@ -5,14 +5,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = grabDSQLConnectionConfig; const grabDbSSL_1 = __importDefault(require("./backend/grabDbSSL")); +const lodash_1 = __importDefault(require("lodash")); /** * # Grab General CONNECTION for DSQL */ function grabDSQLConnectionConfig(param) { const CONN_TIMEOUT = 10000; - const config = Object.assign({ host: process.env.DSQL_DB_HOST, user: process.env.DSQL_DB_USERNAME, password: process.env.DSQL_DB_PASSWORD, database: (param === null || param === void 0 ? void 0 : param.database) || - ((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME), port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, charset: "utf8mb4", ssl: (0, grabDbSSL_1.default)(), bigIntAsNumber: true, supportBigNumbers: true, bigNumberStrings: false, dateStrings: true, metaAsArray: true, socketTimeout: CONN_TIMEOUT, connectTimeout: CONN_TIMEOUT, compress: true }, param === null || param === void 0 ? void 0 : param.config); - return config; + const config = { + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: (param === null || param === void 0 ? void 0 : param.database) || + ((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME), + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + ssl: (0, grabDbSSL_1.default)(), + connectTimeout: CONN_TIMEOUT, + dateStrings: true, + compress: true, + decimalNumbers: true, + // supportBigNumbers: true, + // bigNumberStrings: false, + // bigIntAsNumber: true, + // metaAsArray: true, + // socketTimeout: CONN_TIMEOUT, + // ...param?.config, + }, + }; + return lodash_1.default.merge(config, param === null || param === void 0 ? void 0 : param.config); } diff --git a/dist/package-shared/utils/grab-dsql-connection.d.ts b/dist/package-shared/utils/grab-dsql-connection.d.ts index 990d4c7..ceb0a5f 100644 --- a/dist/package-shared/utils/grab-dsql-connection.d.ts +++ b/dist/package-shared/utils/grab-dsql-connection.d.ts @@ -1,6 +1,6 @@ -import { Connection } from "mariadb"; import { DsqlConnectionParam } from "../types"; +import { ServerlessMysql } from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ -export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise; +export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise; diff --git a/dist/package-shared/utils/grab-dsql-connection.js b/dist/package-shared/utils/grab-dsql-connection.js index 4a2c9fc..b08fc39 100644 --- a/dist/package-shared/utils/grab-dsql-connection.js +++ b/dist/package-shared/utils/grab-dsql-connection.js @@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = grabDSQLConnection; -const mariadb_1 = __importDefault(require("mariadb")); const grab_dsql_connection_config_1 = __importDefault(require("./grab-dsql-connection-config")); +const serverless_mysql_1 = __importDefault(require("serverless-mysql")); /** * # Grab General CONNECTION for DSQL */ @@ -22,7 +22,8 @@ function grabDSQLConnection(param) { return __awaiter(this, void 0, void 0, function* () { const config = (0, grab_dsql_connection_config_1.default)(param); try { - return yield mariadb_1.default.createConnection(config); + const sql = (0, serverless_mysql_1.default)(config); + return sql; } catch (error) { console.log(`Error Grabbing DSQL Connection =>`, config); diff --git a/package-shared/functions/backend/dbHandler.ts b/package-shared/functions/backend/dbHandler.ts index 7ef9860..628cf1e 100644 --- a/package-shared/functions/backend/dbHandler.ts +++ b/package-shared/functions/backend/dbHandler.ts @@ -1,8 +1,9 @@ import fs from "fs"; import path from "path"; import grabDSQLConnection from "../../utils/grab-dsql-connection"; -import { DSQL_TableSchemaType } from "../../types"; +import { DSQL_TableSchemaType, PostInsertReturn } from "../../types"; import { Connection, ConnectionConfig } from "mariadb"; +import { ServerlessMysql } from "serverless-mysql"; type Param = { query: string; @@ -18,7 +19,7 @@ type Param = { * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database */ export default async function dbHandler< - T extends { [k: string]: any } = { [k: string]: any } + T extends { [k: string]: any } = PostInsertReturn >({ query, values, @@ -26,21 +27,23 @@ export default async function dbHandler< database, config, }: Param): Promise { - let CONNECTION: Connection | undefined; + let CONNECTION: ServerlessMysql | undefined; let results: T[] | T | null; try { CONNECTION = await grabDSQLConnection({ database, config }); if (query && values) { - const queryResults = await CONNECTION.query(query, values); - results = queryResults[0]; + const queryResults = (await CONNECTION.query(query, values)) as + | T + | T[]; + results = queryResults; } else { - const queryResults = await CONNECTION.query(query); - results = queryResults[0]; + const queryResults = (await CONNECTION.query(query)) as T | T[]; + results = queryResults; } } catch (error: any) { - console.log("Connection Info =>", CONNECTION?.info); + console.log("Connection Info =>", CONNECTION?.getConfig()); if ( error.message && diff --git a/package-shared/shell/checkDb.ts b/package-shared/shell/checkDb.ts index 76a84c8..33f33d1 100644 --- a/package-shared/shell/checkDb.ts +++ b/package-shared/shell/checkDb.ts @@ -16,7 +16,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; const CONNECTION = await grabDSQLConnection(); try { - const [result] = await CONNECTION.query( + const result = await CONNECTION.query( "SELECT id,first_name,last_name FROM users LIMIT 3" ); console.log("Connection Query Success =>", result); diff --git a/package-shared/shell/test-external-server.ts b/package-shared/shell/test-external-server.ts index 38ba677..f959c04 100644 --- a/package-shared/shell/test-external-server.ts +++ b/package-shared/shell/test-external-server.ts @@ -21,7 +21,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; * @description If a database is provided, switch to it */ try { - const [result] = await CONNECTION.query("SHOW DATABASES"); + const result = await CONNECTION.query("SHOW DATABASES"); const parsedResults = JSON.parse(JSON.stringify(result)); diff --git a/package-shared/shell/updateSSLUsers.ts b/package-shared/shell/updateSSLUsers.ts index bba2877..5087c7f 100644 --- a/package-shared/shell/updateSSLUsers.ts +++ b/package-shared/shell/updateSSLUsers.ts @@ -17,9 +17,9 @@ import grabSQLKeyName from "../utils/grab-sql-key-name"; const CONNECTION = await grabDSQLConnection(); try { - const [result] = await CONNECTION.query( + const result = (await CONNECTION.query( "SELECT user,host,ssl_type FROM mysql.user" - ); + )) as any[]; for (let i = 0; i < result.length; i++) { const user = result[i]; @@ -38,7 +38,7 @@ import grabSQLKeyName from "../utils/grab-sql-key-name"; continue; } - const [addUserSSL] = await CONNECTION.query( + const addUserSSL = await CONNECTION.query( `ALTER USER '${User}'@'${Host}'` ); diff --git a/package-shared/utils/backend/grabDbSSL.ts b/package-shared/utils/backend/grabDbSSL.ts index 74801de..254556d 100644 --- a/package-shared/utils/backend/grabDbSSL.ts +++ b/package-shared/utils/backend/grabDbSSL.ts @@ -2,13 +2,15 @@ import fs from "fs"; import grabDirNames from "./names/grab-dir-names"; import type { ConnectionConfig } from "mariadb"; import path from "path"; +import serverlessMysql from "serverless-mysql"; +import { ConnectionOptions } from "tls"; -type Return = ConnectionConfig["ssl"] | undefined; +// type Return = ConnectionConfig["ssl"] | undefined; /** * # Grab SSL */ -export default function grabDbSSL(): Return { +export default function grabDbSSL(): any { let maxscaleSSLCaCertFileFinal; try { diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index 44babfa..ea10b33 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -43,10 +43,10 @@ export default async function connDbHandler( let queryErrorArray: DSQLErrorObject[] = []; if (typeof query == "string") { - const [results] = await finalConnection.query( + const results = (await finalConnection.query( trimQuery(query), values - ); + )) as any; if (debug) { debugLog({ @@ -74,7 +74,7 @@ export default async function connDbHandler( queryObj.values ); - const results = queryObjRes[0]; + const results = queryObjRes; if (debug) { debugLog({ @@ -106,7 +106,7 @@ export default async function connDbHandler( }; } - return resArray; + return resArray as ReturnType; } else { return null; } diff --git a/package-shared/utils/endConnection.ts b/package-shared/utils/endConnection.ts deleted file mode 100644 index 62ad051..0000000 --- a/package-shared/utils/endConnection.ts +++ /dev/null @@ -1,14 +0,0 @@ -import mysql from "mysql"; - -/** - * # End MYSQL Connection - */ -function endConnection(connection: mysql.Connection) { - if (connection.state !== "disconnected") { - connection.end((err) => { - console.log(err?.message); - }); - } -} - -export default endConnection; diff --git a/package-shared/utils/grab-dsql-connection-config.ts b/package-shared/utils/grab-dsql-connection-config.ts index f58f5fa..4910b66 100644 --- a/package-shared/utils/grab-dsql-connection-config.ts +++ b/package-shared/utils/grab-dsql-connection-config.ts @@ -1,37 +1,43 @@ import { ConnectionConfig } from "mariadb"; import grabDbSSL from "./backend/grabDbSSL"; import { DsqlConnectionParam } from "../types"; +import serverlessMysql from "serverless-mysql"; +import { ConnectionOptions } from "tls"; +import _ from "lodash"; /** * # Grab General CONNECTION for DSQL */ export default function grabDSQLConnectionConfig( param?: DsqlConnectionParam -): ConnectionConfig { +): serverlessMysql.Config { const CONN_TIMEOUT = 10000; - const config: ConnectionConfig = { - host: process.env.DSQL_DB_HOST, - user: process.env.DSQL_DB_USERNAME, - password: process.env.DSQL_DB_PASSWORD, - database: - param?.database || - (param?.noDb ? undefined : process.env.DSQL_DB_NAME), - port: process.env.DSQL_DB_PORT - ? Number(process.env.DSQL_DB_PORT) - : undefined, - charset: "utf8mb4", - ssl: grabDbSSL(), - bigIntAsNumber: true, - supportBigNumbers: true, - bigNumberStrings: false, - dateStrings: true, - metaAsArray: true, - socketTimeout: CONN_TIMEOUT, - connectTimeout: CONN_TIMEOUT, - compress: true, - ...param?.config, + const config: serverlessMysql.Config = { + config: { + host: process.env.DSQL_DB_HOST, + user: process.env.DSQL_DB_USERNAME, + password: process.env.DSQL_DB_PASSWORD, + database: + param?.database || + (param?.noDb ? undefined : process.env.DSQL_DB_NAME), + port: process.env.DSQL_DB_PORT + ? Number(process.env.DSQL_DB_PORT) + : undefined, + charset: "utf8mb4", + ssl: grabDbSSL(), + connectTimeout: CONN_TIMEOUT, + dateStrings: true, + compress: true, + decimalNumbers: true, + // supportBigNumbers: true, + // bigNumberStrings: false, + // bigIntAsNumber: true, + // metaAsArray: true, + // socketTimeout: CONN_TIMEOUT, + // ...param?.config, + }, }; - return config; + return _.merge(config, param?.config); } diff --git a/package-shared/utils/grab-dsql-connection.ts b/package-shared/utils/grab-dsql-connection.ts index 7860998..50918bf 100644 --- a/package-shared/utils/grab-dsql-connection.ts +++ b/package-shared/utils/grab-dsql-connection.ts @@ -2,17 +2,19 @@ import mariadb, { Connection, ConnectionConfig } from "mariadb"; import grabDbSSL from "./backend/grabDbSSL"; import { DsqlConnectionParam } from "../types"; import grabDSQLConnectionConfig from "./grab-dsql-connection-config"; +import serverlessMysql, { ServerlessMysql } from "serverless-mysql"; /** * # Grab General CONNECTION for DSQL */ export default async function grabDSQLConnection( param?: DsqlConnectionParam -): Promise { +): Promise { const config = grabDSQLConnectionConfig(param); try { - return await mariadb.createConnection(config); + const sql = serverlessMysql(config); + return sql; } catch (error) { console.log(`Error Grabbing DSQL Connection =>`, config); throw error; diff --git a/package.json b/package.json index 2adf7d8..6811831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.1.5", + "version": "5.1.6", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { @@ -32,7 +32,6 @@ "dependencies": { "@types/ace": "^0.0.52", "@types/lodash": "^4.17.13", - "@types/mysql": "^2.15.21", "@types/next": "^9.0.0", "@types/node": "^22.7.5", "@types/nodemailer": "^6.4.17", @@ -46,6 +45,7 @@ "lodash": "^4.17.21", "mariadb": "^3.4.4", "nodemailer": "^6.9.14", - "sanitize-html": "^2.13.1" + "sanitize-html": "^2.13.1", + "serverless-mysql": "^2.1.0" } }