Moduletrace/dsql-admin
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-01-14 16:27:08 +01:00
parent 1564c2811a
commit 81cf010cb5
485 changed files with 1432 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dsql-app/package-shared/shell/checkDb.ts
+4 -4
View File
@@ -1,6 +1,6 @@
require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql";
import grabDbSSL from "../utils/backend/grabDbSSL";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -14,17 +14,17 @@ import grabDbSSL from "../utils/backend/grabDbSSL";
* @returns {Promise<object|null>}
*/
(async () => {
const connection = global.DSQL_DB_CONN;
const CONNECTION = 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);
} catch (error: any) {
console.log("Connection query ERROR =>", error.message);
} finally {
connection.end();
CONNECTION?.end();
process.exit();
}
})();
dsql-app/package-shared/shell/test-external-server.ts
+5 -15
View File
@@ -1,17 +1,5 @@
require("dotenv").config({ path: "./.env" });
import grabDbSSL from "../utils/backend/grabDbSSL";
import mysql from "serverless-mysql";
const connection = mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DB_USER,
password: process.env.DB_PASS,
// database: process.env.DSQL_DB_NAME,
charset: "utf8mb4",
ssl: grabDbSSL(),
},
});
import grabDSQLConnection from "../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -25,13 +13,15 @@ const connection = mysql({
* @returns {Promise<object|null>}
*/
(async () => {
const CONNECTION = grabDSQLConnection({ noDb: true });
/**
* Switch Database
*
* @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));
@@ -39,7 +29,7 @@ const connection = mysql({
} catch (error: any) {
console.log("Connection query ERROR =>", error.message);
} finally {
connection.end();
CONNECTION?.end();
process.exit();
}
})();
dsql-app/package-shared/shell/updateSSLUsers.ts
+5 -5
View File
@@ -1,6 +1,6 @@
require("dotenv").config({ path: "./../.env" });
import grabDbSSL from "../utils/backend/grabDbSSL";
import mysql from "serverless-mysql";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -14,10 +14,10 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>}
*/
(async () => {
const connection = global.DSQL_DB_CONN;
const CONNECTION = grabDSQLConnection();
try {
const result = await connection.query(
const result = await CONNECTION.query(
"SELECT user,host,ssl_type FROM mysql.user"
);
const parsedResults = JSON.parse(JSON.stringify(result));
@@ -39,7 +39,7 @@ import mysql from "serverless-mysql";
continue;
}
const addUserSSL = await connection.query(
const addUserSSL = await CONNECTION.query(
`ALTER USER '${User}'@'${Host}'`
);
@@ -48,7 +48,7 @@ import mysql from "serverless-mysql";
} catch (error: any) {
console.log("Connection query ERROR =>", error.message);
} finally {
connection.end();
CONNECTION.end();
process.exit();
}
})();
dsql-app/package-shared/shell/utils/dbHandler.ts
+6 -5
View File
@@ -3,6 +3,7 @@ import path from "path";
import mysql from "serverless-mysql";
import grabDbSSL from "../../utils/backend/grabDbSSL";
import grabDSQLConnection from "../../utils/grab-dsql-connection";
type Param = {
query: string;
@@ -17,15 +18,15 @@ export default async function dbHandler({
query,
values,
}: Param): Promise<any[] | object | null> {
let connection = global.DSQL_DB_CONN;
const CONNECTION = grabDSQLConnection();
let results;
try {
if (query && values) {
results = await connection.query(query, values);
results = await CONNECTION.query(query, values);
} else {
results = await connection.query(query);
results = await CONNECTION.query(query);
}
} catch (/** @type {any} */ error: any) {
if (process.env.FIRST_RUN) {
@@ -34,7 +35,7 @@ export default async function dbHandler({
console.log("ERROR in dbHandler =>", error.message);
console.log(error);
console.log(connection.config());
console.log(CONNECTION.config());
fs.appendFileSync(
path.resolve(__dirname, "../.tmp/dbErrorLogs.txt"),
@@ -43,7 +44,7 @@ export default async function dbHandler({
);
results = null;
} finally {
await connection?.end();
await CONNECTION?.end();
}
if (results) {