Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby
2025-08-05 15:27:07 +01:00
parent 43a741f9ac
commit eb98148533
23 changed files with 84 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-shared/functions/backend/dbHandler.ts
+10 -13
View File
@@ -1,11 +1,10 @@
import fs from "fs";
import path from "path";
import grabDSQLConnection from "../../utils/grab-dsql-connection";
import { DSQL_TableSchemaType, PostInsertReturn } from "../../types";
import { DSQL_TableSchemaType } from "../../types";
import { Connection, ConnectionConfig } from "mariadb";
import { ServerlessMysql } from "serverless-mysql";
type Param<T extends { [k: string]: any } = { [k: string]: any }> = {
type Param = {
query: string;
values?: string[] | object;
noErrorLogs?: boolean;
@@ -19,31 +18,29 @@ type Param<T extends { [k: string]: any } = { [k: string]: any }> = {
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/
export default async function dbHandler<
T extends { [k: string]: any } = PostInsertReturn
T extends { [k: string]: any } = { [k: string]: any }
>({
query,
values,
noErrorLogs,
database,
config,
}: Param<T>): Promise<T[] | T | null> {
let CONNECTION: ServerlessMysql | undefined;
}: Param): Promise<T[] | T | null> {
let CONNECTION: Connection | undefined;
let results: T[] | T | null;
try {
CONNECTION = await grabDSQLConnection({ database, config });
if (query && values) {
const queryResults = (await CONNECTION.query(query, values)) as
| T
| T[];
results = queryResults;
const queryResults = await CONNECTION.query(query, values);
results = queryResults[0];
} else {
const queryResults = (await CONNECTION.query(query)) as T | T[];
results = queryResults;
const queryResults = await CONNECTION.query(query);
results = queryResults[0];
}
} catch (error: any) {
console.log("Connection Info =>", CONNECTION?.getConfig());
console.log("Connection Info =>", CONNECTION?.info);
if (
error.message &&
package-shared/shell/checkDb.ts
+1 -1
View File
@@ -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);
package-shared/shell/test-external-server.ts
+1 -1
View File
@@ -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));
package-shared/shell/updateSSLUsers.ts
+3 -3
View File
@@ -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}'`
);
package-shared/utils/backend/grabDbSSL.ts
+2 -4
View File
@@ -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
+4 -4
View File
@@ -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
+23 -29
View File
@@ -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 -4
View File
@@ -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;