Updates

package-shared/utils/backend/grabDbSSL.ts

@@ -2,15 +2,13 @@ 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(): any {
+export default function grabDbSSL(): Return {
     let maxscaleSSLCaCertFileFinal;
 
     try {

package-shared/utils/db/conn-db-handler.ts

@@ -43,10 +43,10 @@ export default async function connDbHandler<ReturnType = any>(
         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<ReturnType = any>(
                         queryObj.values
                     );
 
-                    const results = queryObjRes;
+                    const results = queryObjRes[0];
 
                     if (debug) {
                         debugLog({
@@ -106,7 +106,7 @@ export default async function connDbHandler<ReturnType = any>(
                 };
             }
 
-            return resArray as ReturnType;
+            return resArray;
         } else {
             return null;
         }

package-shared/utils/grab-dsql-connection-config.ts

@@ -1,43 +1,37 @@
 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
-): serverlessMysql.Config {
+): ConnectionConfig {
     const CONN_TIMEOUT = 10000;
 
-    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,
-        },
+    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,
     };
 
-    return _.merge(config, param?.config);
+    return config;
 }

package-shared/utils/grab-dsql-connection.ts

@@ -2,19 +2,17 @@ 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<ServerlessMysql> {
+): Promise<Connection> {
     const config = grabDSQLConnectionConfig(param);
 
     try {
-        const sql = serverlessMysql(config);
-        return sql;
+        return await mariadb.createConnection(config);
     } catch (error) {
         console.log(`Error Grabbing DSQL Connection =>`, config);
         throw error;