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 11:14:50 +01:00
parent edd555c088
commit d55fe64d47
30 changed files with 225 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-shared/functions/api/users/api-login.ts
+5 -2
View File
@@ -54,6 +54,8 @@ export default async function apiLoginUser({
})
: null;
console.log("Finding DSQL User ...");
let foundUser = await varDatabaseDbHandler({
queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
queryValuesArray: [email, username],
@@ -61,6 +63,8 @@ export default async function apiLoginUser({
useLocal,
});
console.log("foundUser", foundUser);
if ((!foundUser || !foundUser[0]) && !social)
return {
success: false,
@@ -81,8 +85,7 @@ export default async function apiLoginUser({
email_login_code &&
email_login_field
) {
/** @type {string} */
const tempCode = foundUser[0][email_login_field];
const tempCode: string = foundUser[0][email_login_field];
if (!tempCode) throw new Error("No code Found!");
package-shared/functions/backend/dbHandler.ts
+2 -12
View File
@@ -1,6 +1,7 @@
import fs from "fs";
import serverError from "./serverError";
import mysql from "serverless-mysql";
import grabDSQLConnection from "../../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -13,18 +14,7 @@ export default async function dbHandler(...args: any[]) {
"utf8"
);
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
let results;
package-shared/shell/checkDb.ts
+2 -12
View File
@@ -1,5 +1,6 @@
require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -13,18 +14,7 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>}
*/
(async () => {
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
try {
const result = await CONNECTION.query(
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();
}
})();
package-shared/shell/updateSSLUsers.ts
+2 -12
View File
@@ -1,5 +1,6 @@
require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/**
* # Main DB Handler Function
@@ -13,18 +14,7 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>}
*/
(async () => {
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
try {
const result = await CONNECTION.query(
package-shared/shell/utils/dbHandler.ts
+2 -12
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,18 +18,7 @@ export default async function dbHandler({
query,
values,
}: Param): Promise<any[] | object | null> {
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
let results;
package-shared/utils/backend/global-db/DB_HANDLER.ts
+2 -12
View File
@@ -1,22 +1,12 @@
import mysql from "serverless-mysql";
import grabDSQLConnection from "../../grab-dsql-connection";
/**
* # 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 = 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",
},
});
const CONNECTION = grabDSQLConnection();
try {
if (!CONNECTION)
package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts
+3 -111
View File
@@ -1,5 +1,5 @@
import mysql from "serverless-mysql";
import connDbHandler from "../../db/conn-db-handler";
import grabDSQLConnection from "../../grab-dsql-connection";
type Param = {
paradigm: "Full Access" | "FA" | "Read Only";
@@ -17,28 +17,8 @@ export default async function DSQL_USER_DB_HANDLER({
}: Param) {
const CONNECTION =
paradigm == "Read Only"
? mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_READ_ONLY_USERNAME,
password: process.env.DSQL_DB_READ_ONLY_PASSWORD,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
})
: mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_FULL_ACCESS_USERNAME,
password: process.env.DSQL_DB_FULL_ACCESS_PASSWORD,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
});
? grabDSQLConnection({ ro: true })
: grabDSQLConnection({ fa: true });
try {
return await connDbHandler(CONNECTION, queryString, queryValues);
@@ -48,92 +28,4 @@ export default async function DSQL_USER_DB_HANDLER({
} finally {
CONNECTION?.end();
}
// try {
// return new Promise((resolve, reject) => {
// const fullAccess = paradigm?.match(/full.access|^fa$/i)
// ? true
// : false;
// try {
// if (fullAccess) {
// DSQL_USER = mysql({
// config: {
// host: process.env.DSQL_DB_HOST,
// user: process.env.DSQL_DB_FULL_ACCESS_USERNAME,
// password: process.env.DSQL_DB_FULL_ACCESS_PASSWORD,
// database: database,
// ssl: grabDbSSL(),
// },
// });
// } else {
// DSQL_USER = mysql({
// config: {
// host: process.env.DSQL_DB_HOST,
// user: process.env.DSQL_DB_READ_ONLY_USERNAME,
// password: process.env.DSQL_DB_READ_ONLY_PASSWORD,
// database: database,
// ssl: grabDbSSL(),
// },
// });
// }
// /**
// * ### Run query Function
// * @param {any} results
// */
// function runQuery(results: any) {
// DSQL_USER.end();
// resolve(JSON.parse(JSON.stringify(results)));
// }
// /**
// * ### Query Error
// * @param {any} err
// */
// function queryError(err: any) {
// DSQL_USER.end();
// resolve({
// error: err.message,
// queryStringGenerated: queryString,
// queryValuesGenerated: queryValues,
// sql: err.sql,
// });
// }
// if (
// queryValues &&
// Array.isArray(queryValues) &&
// queryValues[0]
// ) {
// DSQL_USER.query(queryString, queryValues)
// .then(runQuery)
// .catch(queryError);
// } else {
// DSQL_USER.query(queryString)
// .then(runQuery)
// .catch(queryError);
// }
// ////////////////////////////////////////
// } catch (/** @type {any} */ error: any) {
// ////////////////////////////////////////
// fs.appendFileSync(
// "./.tmp/dbErrorLogs.txt",
// error.message + "\n" + Date() + "\n\n\n",
// "utf8"
// );
// resolve({
// error: error.message,
// });
// }
// });
// } catch (/** @type {any} */ error: any) {
// return {
// success: false,
// error: error.message,
// };
// }
}
package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts
+5 -26
View File
@@ -1,45 +1,24 @@
import mysql from "serverless-mysql";
import grabDbSSL from "../grabDbSSL";
import grabDSQLConnection from "../../grab-dsql-connection";
/**
* # DSQL user read-only DB handler
*/
export default async function LOCAL_DB_HANDLER(...args: any[]) {
const MASTER = 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",
ssl: grabDbSSL(),
},
onConnect: () => {
console.log("Connection Successful!");
},
onConnectError: (/** @type {any} */ err: any) => {
console.log("Connection Error", err.message);
},
onError: (/** @type {any} */ err: any) => {
console.log("Client Error", err.message);
},
});
const MASTER = grabDSQLConnection();
console.log("Querying ...");
try {
const results = await MASTER.query(...args);
await MASTER.end();
return JSON.parse(JSON.stringify(results));
} catch (/** @type {any} */ error: any) {
} catch (error: any) {
console.log("DB Error =>", error.message);
return {
success: false,
error: error.message,
};
} finally {
await MASTER?.end();
}
}
package-shared/utils/backend/global-db/NO_DB_HANDLER.ts
+2 -12
View File
@@ -1,22 +1,12 @@
import mysql from "serverless-mysql";
import grabDbSSL from "../grabDbSSL";
import grabDSQLConnection from "../../grab-dsql-connection";
/**
* # DSQL user read-only DB handler
*/
export default function NO_DB_HANDLER(...args: any[]) {
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
try {
return new Promise((resolve, reject) => {
package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts
+2 -13
View File
@@ -1,21 +1,10 @@
import mysql from "serverless-mysql";
import grabDSQLConnection from "../../grab-dsql-connection";
/**
* # Root DB handler
*/
export default function ROOT_DB_HANDLER(...args: any[]) {
const CONNECTION = 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",
},
});
const CONNECTION = grabDSQLConnection();
try {
return new Promise((resolve, reject) => {
package-shared/utils/grab-dsql-connection.ts
+71
View File
@@ -0,0 +1,71 @@
import mysql, { ServerlessMysql } from "serverless-mysql";
type Param = {
/**
* Read Only?
*/
ro?: boolean;
/**
* Full Access?
*/
fa?: boolean;
/**
* Full Access?
*/
noDb?: boolean;
};
/**
* # Grab General CONNECTION for DSQL
*/
export default function grabDSQLConnection(param?: Param): ServerlessMysql {
if (param?.ro) {
return (
DSQL_READ_ONLY_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_READ_ONLY_USERNAME,
password: process.env.DSQL_DB_READ_ONLY_PASSWORD,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
})
);
}
if (param?.fa) {
return (
global.DSQL_FULL_ACCESS_DB_CONN ||
mysql({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_FULL_ACCESS_USERNAME,
password: process.env.DSQL_DB_FULL_ACCESS_PASSWORD,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
})
);
}
return (
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: param?.noDb ? undefined : process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
})
);
}