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-01-14 10:49:37 +01:00
parent 2118a55ab6
commit 0cd3eb418c
19 changed files with 307 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-shared/functions/backend/dbHandler.ts
+19 -5
View File
@@ -1,5 +1,6 @@
import fs from "fs";
import serverError from "./serverError";
import mysql from "serverless-mysql";
/**
* # Main DB Handler Function
@@ -12,6 +13,21 @@ export default async function dbHandler(...args: any[]) {
"utf8"
);
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
let results;
/**
@@ -20,10 +36,8 @@ export default async function dbHandler(...args: any[]) {
* @description Fetch data from db if no cache
*/
try {
const connection = global.DSQL_DB_CONN;
results = await new Promise((resolve, reject) => {
connection.query(
CONNECTION.query(
...args,
(error: any, result: any, fields: any) => {
if (error) {
@@ -34,8 +48,6 @@ export default async function dbHandler(...args: any[]) {
}
);
});
await connection.end();
} catch (error: any) {
fs.appendFileSync(
"./.tmp/dbErrorLogs.txt",
@@ -49,6 +61,8 @@ export default async function dbHandler(...args: any[]) {
component: "dbHandler",
message: error.message,
});
} finally {
await CONNECTION?.end();
}
/**
package-shared/shell/checkDb.ts
+16 -4
View File
@@ -1,6 +1,5 @@
require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql";
import grabDbSSL from "../utils/backend/grabDbSSL";
/**
* # Main DB Handler Function
@@ -14,17 +13,30 @@ import grabDbSSL from "../utils/backend/grabDbSSL";
* @returns {Promise<object|null>}
*/
(async () => {
const connection = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
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();
}
})();
package-shared/shell/updateSSLUsers.ts
+17 -5
View File
@@ -1,5 +1,4 @@
require("dotenv").config({ path: "./../.env" });
import grabDbSSL from "../utils/backend/grabDbSSL";
import mysql from "serverless-mysql";
/**
@@ -14,10 +13,23 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>}
*/
(async () => {
const connection = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
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 +51,7 @@ import mysql from "serverless-mysql";
continue;
}
const addUserSSL = await connection.query(
const addUserSSL = await CONNECTION.query(
`ALTER USER '${User}'@'${Host}'`
);
@@ -48,7 +60,7 @@ import mysql from "serverless-mysql";
} catch (error: any) {
console.log("Connection query ERROR =>", error.message);
} finally {
connection.end();
CONNECTION.end();
process.exit();
}
})();
package-shared/shell/utils/dbHandler.ts
+18 -5
View File
@@ -17,15 +17,28 @@ export default async function dbHandler({
query,
values,
}: Param): Promise<any[] | object | null> {
let connection = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
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 +47,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 +56,7 @@ export default async function dbHandler({
);
results = null;
} finally {
await connection?.end();
await CONNECTION?.end();
}
if (results) {
package-shared/utils/backend/global-db/DB_HANDLER.ts
+16 -1
View File
@@ -1,9 +1,24 @@
import mysql from "serverless-mysql";
/**
* # DSQL user read-only DB handler
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/
export default async function DB_HANDLER(...args: any[]) {
const CONNECTION = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
try {
if (!CONNECTION)
package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts
+19 -3
View File
@@ -1,3 +1,4 @@
import mysql from "serverless-mysql";
import connDbHandler from "../../db/conn-db-handler";
type Param = {
@@ -14,25 +15,40 @@ export default async function DSQL_USER_DB_HANDLER({
queryString,
queryValues,
}: Param) {
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
try {
switch (paradigm) {
case "Read Only":
return await connDbHandler(
global.DSQL_READ_ONLY_DB_CONN,
global.DSQL_READ_ONLY_DB_CONN || CONNECTION,
queryString,
queryValues
);
case "Full Access":
return await connDbHandler(
global.DSQL_FULL_ACCESS_DB_CONN,
global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION,
queryString,
queryValues
);
case "FA":
return await connDbHandler(
global.DSQL_FULL_ACCESS_DB_CONN,
global.DSQL_FULL_ACCESS_DB_CONN || CONNECTION,
queryString,
queryValues
);
package-shared/utils/backend/global-db/NO_DB_HANDLER.ts
+19 -4
View File
@@ -5,17 +5,30 @@ import grabDbSSL from "../grabDbSSL";
* # DSQL user read-only DB handler
*/
export default function NO_DB_HANDLER(...args: any[]) {
const NO_DB = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
try {
return new Promise((resolve, reject) => {
NO_DB.query(...args)
CONNECTION.query(...args)
.then((results) => {
NO_DB.end();
CONNECTION.end();
resolve(JSON.parse(JSON.stringify(results)));
})
.catch((err) => {
NO_DB.end();
CONNECTION.end();
resolve({
error: err.message,
sql: err.sql,
@@ -27,5 +40,7 @@ export default function NO_DB_HANDLER(...args: any[]) {
success: false,
error: error.message,
};
} finally {
CONNECTION?.end();
}
}
package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts
+21 -4
View File
@@ -1,18 +1,33 @@
import mysql from "serverless-mysql";
/**
* # Root DB handler
*/
export default function ROOT_DB_HANDLER(...args: any[]) {
const NO_DB = global.DSQL_DB_CONN;
const CONNECTION =
global.DSQL_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
try {
return new Promise((resolve, reject) => {
NO_DB.query(...args)
CONNECTION.query(...args)
.then((results) => {
NO_DB.end();
CONNECTION.end();
resolve(JSON.parse(JSON.stringify(results)));
})
.catch((err) => {
NO_DB.end();
CONNECTION.end();
resolve({
error: err.message,
sql: err.sql,
@@ -24,5 +39,7 @@ export default function ROOT_DB_HANDLER(...args: any[]) {
success: false,
error: error.message,
};
} finally {
CONNECTION?.end();
}
}