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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.d.ts vendored
View File

@ -1,3 +1,9 @@
import { ServerlessMysql } from "serverless-mysql";
declare global {
var DSQL_DB_CONN: ServerlessMysql | undefined;
var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined;
var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined;
}
/** /**
* Imports * Imports
*/ */

3
dist/package-shared/functions/api/users/api-login.js vendored
View File

@ -45,12 +45,14 @@ function apiLoginUser(_a) {
password: password, password: password,
}) })
: null; : null;
console.log("Finding DSQL User ...");
let foundUser = yield (0, varDatabaseDbHandler_1.default)({ let foundUser = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`, queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
queryValuesArray: [email, username], queryValuesArray: [email, username],
database: dbFullName, database: dbFullName,
useLocal, useLocal,
}); });
console.log("foundUser", foundUser);
if ((!foundUser || !foundUser[0]) && !social) if ((!foundUser || !foundUser[0]) && !social)
return { return {
success: false, success: false,
@ -69,7 +71,6 @@ function apiLoginUser(_a) {
email_login && email_login &&
email_login_code && email_login_code &&
email_login_field) { email_login_field) {
/** @type {string} */
const tempCode = foundUser[0][email_login_field]; const tempCode = foundUser[0][email_login_field];
if (!tempCode) if (!tempCode)
throw new Error("No code Found!"); throw new Error("No code Found!");

15
dist/package-shared/functions/backend/dbHandler.js vendored
View File

@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dbHandler; exports.default = dbHandler;
const fs_1 = __importDefault(require("fs")); const fs_1 = __importDefault(require("fs"));
const serverError_1 = __importDefault(require("./serverError")); const serverError_1 = __importDefault(require("./serverError"));
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-connection"));
/** /**
* # Main DB Handler Function * # Main DB Handler Function
*/ */
@ -24,18 +24,7 @@ function dbHandler(...args) {
var _a; var _a;
((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) && ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8"); fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8");
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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; let results;
/** /**
* Fetch from db * Fetch from db

15
dist/package-shared/shell/checkDb.js vendored
View File

@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" }); require("dotenv").config({ path: "./../.env" });
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-connection"));
/** /**
* # Main DB Handler Function * # Main DB Handler Function
* @async * @async
@ -26,18 +26,7 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
* @returns {Promise<object|null>} * @returns {Promise<object|null>}
*/ */
(() => __awaiter(void 0, void 0, void 0, function* () { (() => __awaiter(void 0, void 0, void 0, function* () {
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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 { try {
const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3");
console.log("Connection Query Success =>", result); console.log("Connection Query Success =>", result);

18
dist/package-shared/shell/test-external-server.js vendored
View File

@ -13,18 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./.env" }); require("dotenv").config({ path: "./.env" });
const grabDbSSL_1 = __importDefault(require("../utils/backend/grabDbSSL")); const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-connection"));
const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
const connection = (0, serverless_mysql_1.default)({
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: (0, grabDbSSL_1.default)(),
},
});
/** /**
* # Main DB Handler Function * # Main DB Handler Function
* @async * @async
@ -37,13 +26,14 @@ const connection = (0, serverless_mysql_1.default)({
* @returns {Promise<object|null>} * @returns {Promise<object|null>}
*/ */
(() => __awaiter(void 0, void 0, void 0, function* () { (() => __awaiter(void 0, void 0, void 0, function* () {
const CONNECTION = (0, grab_dsql_connection_1.default)({ noDb: true });
/** /**
* Switch Database * Switch Database
* *
* @description If a database is provided, switch to it * @description If a database is provided, switch to it
*/ */
try { try {
const result = yield connection.query("SHOW DATABASES"); const result = yield CONNECTION.query("SHOW DATABASES");
const parsedResults = JSON.parse(JSON.stringify(result)); const parsedResults = JSON.parse(JSON.stringify(result));
console.log("parsedResults =>", parsedResults); console.log("parsedResults =>", parsedResults);
} }
@ -51,7 +41,7 @@ const connection = (0, serverless_mysql_1.default)({
console.log("Connection query ERROR =>", error.message); console.log("Connection query ERROR =>", error.message);
} }
finally { finally {
connection.end(); CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end();
process.exit(); process.exit();
} }
}))(); }))();

15
dist/package-shared/shell/updateSSLUsers.js vendored
View File

@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" }); require("dotenv").config({ path: "./../.env" });
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-connection"));
/** /**
* # Main DB Handler Function * # Main DB Handler Function
* @async * @async
@ -27,18 +27,7 @@ const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
*/ */
(() => __awaiter(void 0, void 0, void 0, function* () { (() => __awaiter(void 0, void 0, void 0, function* () {
var _a; var _a;
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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 { try {
const result = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user"); const result = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user");
const parsedResults = JSON.parse(JSON.stringify(result)); const parsedResults = JSON.parse(JSON.stringify(result));

15
dist/package-shared/shell/utils/dbHandler.js vendored
View File

@ -15,25 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dbHandler; exports.default = dbHandler;
const fs_1 = __importDefault(require("fs")); const fs_1 = __importDefault(require("fs"));
const path_1 = __importDefault(require("path")); const path_1 = __importDefault(require("path"));
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-connection"));
/** /**
* # Main DB Handler Function * # Main DB Handler Function
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/ */
function dbHandler(_a) { function dbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, values, }) { return __awaiter(this, arguments, void 0, function* ({ query, values, }) {
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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; let results;
try { try {
if (query && values) { if (query && values) {

15
dist/package-shared/utils/backend/global-db/DB_HANDLER.js vendored
View File

@ -13,25 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = DB_HANDLER; exports.default = DB_HANDLER;
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connection"));
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/ */
function DB_HANDLER(...args) { function DB_HANDLER(...args) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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 { try {
if (!CONNECTION) if (!CONNECTION)
throw new Error("No Connection provided to DB_HANDLER function!"); throw new Error("No Connection provided to DB_HANDLER function!");

106
dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js vendored
View File

@ -13,36 +13,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = DSQL_USER_DB_HANDLER; exports.default = DSQL_USER_DB_HANDLER;
const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
const conn_db_handler_1 = __importDefault(require("../../db/conn-db-handler")); const conn_db_handler_1 = __importDefault(require("../../db/conn-db-handler"));
const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connection"));
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
*/ */
function DSQL_USER_DB_HANDLER(_a) { function DSQL_USER_DB_HANDLER(_a) {
return __awaiter(this, arguments, void 0, function* ({ paradigm, queryString, queryValues, }) { return __awaiter(this, arguments, void 0, function* ({ paradigm, queryString, queryValues, }) {
const CONNECTION = paradigm == "Read Only" const CONNECTION = paradigm == "Read Only"
? (0, serverless_mysql_1.default)({ ? (0, grab_dsql_connection_1.default)({ ro: true })
config: { : (0, grab_dsql_connection_1.default)({ fa: true });
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",
},
})
: (0, serverless_mysql_1.default)({
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",
},
});
try { try {
return yield (0, conn_db_handler_1.default)(CONNECTION, queryString, queryValues); return yield (0, conn_db_handler_1.default)(CONNECTION, queryString, queryValues);
} }
@ -53,85 +33,5 @@ function DSQL_USER_DB_HANDLER(_a) {
finally { finally {
CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end(); CONNECTION === null || CONNECTION === void 0 ? void 0 : 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,
// };
// }
}); });
} }

32
dist/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.js vendored
View File

@ -13,47 +13,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = LOCAL_DB_HANDLER; exports.default = LOCAL_DB_HANDLER;
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connection"));
const grabDbSSL_1 = __importDefault(require("../grabDbSSL"));
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
*/ */
function LOCAL_DB_HANDLER(...args) { function LOCAL_DB_HANDLER(...args) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const MASTER = (0, serverless_mysql_1.default)({ const MASTER = (0, grab_dsql_connection_1.default)();
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: (0, grabDbSSL_1.default)(),
},
onConnect: () => {
console.log("Connection Successful!");
},
onConnectError: (/** @type {any} */ err) => {
console.log("Connection Error", err.message);
},
onError: (/** @type {any} */ err) => {
console.log("Client Error", err.message);
},
});
console.log("Querying ..."); console.log("Querying ...");
try { try {
const results = yield MASTER.query(...args); const results = yield MASTER.query(...args);
yield MASTER.end();
return JSON.parse(JSON.stringify(results)); return JSON.parse(JSON.stringify(results));
} }
catch ( /** @type {any} */error) { catch (error) {
console.log("DB Error =>", error.message); console.log("DB Error =>", error.message);
return { return {
success: false, success: false,
error: error.message, error: error.message,
}; };
} }
finally {
yield (MASTER === null || MASTER === void 0 ? void 0 : MASTER.end());
}
}); });
} }

15
dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js vendored
View File

@ -4,23 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = NO_DB_HANDLER; exports.default = NO_DB_HANDLER;
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connection"));
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
*/ */
function NO_DB_HANDLER(...args) { function NO_DB_HANDLER(...args) {
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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 { try {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
CONNECTION.query(...args) CONNECTION.query(...args)

15
dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js vendored
View File

@ -4,23 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = ROOT_DB_HANDLER; exports.default = ROOT_DB_HANDLER;
const serverless_mysql_1 = __importDefault(require("serverless-mysql")); const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connection"));
/** /**
* # Root DB handler * # Root DB handler
*/ */
function ROOT_DB_HANDLER(...args) { function ROOT_DB_HANDLER(...args) {
const CONNECTION = (0, serverless_mysql_1.default)({ const CONNECTION = (0, grab_dsql_connection_1.default)();
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 { try {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
CONNECTION.query(...args) CONNECTION.query(...args)

20
dist/package-shared/utils/grab-dsql-connection.d.ts vendored Normal file
View File

@ -0,0 +1,20 @@
import { 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;
export {};

53
dist/package-shared/utils/grab-dsql-connection.js vendored Normal file
View File

@ -0,0 +1,53 @@
"use strict";
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = grabDSQLConnection;
const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
/**
* # Grab General CONNECTION for DSQL
*/
function grabDSQLConnection(param) {
if (param === null || param === void 0 ? void 0 : param.ro) {
return (DSQL_READ_ONLY_DB_CONN ||
(0, serverless_mysql_1.default)({
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 === null || param === void 0 ? void 0 : param.fa) {
return (global.DSQL_FULL_ACCESS_DB_CONN ||
(0, serverless_mysql_1.default)({
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 ||
(0, serverless_mysql_1.default)({
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: (param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME,
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
},
}));
}

1
dist/users/login-user.js vendored
View File

@ -82,7 +82,6 @@ function loginUser(_a) {
(DSQL_DB_PASSWORD === null || DSQL_DB_PASSWORD === void 0 ? void 0 : DSQL_DB_PASSWORD.match(/./)) && (DSQL_DB_PASSWORD === null || DSQL_DB_PASSWORD === void 0 ? void 0 : DSQL_DB_PASSWORD.match(/./)) &&
(DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) && (DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) &&
useLocal) { useLocal) {
/** @type {import("../package-shared/types").DSQL_DatabaseSchemaType | undefined} */
let dbSchema; let dbSchema;
try { try {
const localDbSchemaPath = path_1.default.resolve(process.cwd(), "dsql.schema.json"); const localDbSchemaPath = path_1.default.resolve(process.cwd(), "dsql.schema.json");

8
index.ts
View File

@ -1,3 +1,11 @@
import { ServerlessMysql } from "serverless-mysql";
declare global {
var DSQL_DB_CONN: ServerlessMysql | undefined;
var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined;
var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined;
}
/** /**
* Imports * Imports
*/ */

7
package-shared/functions/api/users/api-login.ts
View File

@ -54,6 +54,8 @@ export default async function apiLoginUser({
}) })
: null; : null;
console.log("Finding DSQL User ...");
let foundUser = await varDatabaseDbHandler({ let foundUser = await varDatabaseDbHandler({
queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`, queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
queryValuesArray: [email, username], queryValuesArray: [email, username],
@ -61,6 +63,8 @@ export default async function apiLoginUser({
useLocal, useLocal,
}); });
console.log("foundUser", foundUser);
if ((!foundUser || !foundUser[0]) && !social) if ((!foundUser || !foundUser[0]) && !social)
return { return {
success: false, success: false,
@ -81,8 +85,7 @@ export default async function apiLoginUser({
email_login_code && email_login_code &&
email_login_field email_login_field
) { ) {
/** @type {string} */ const tempCode: string = foundUser[0][email_login_field];
const tempCode = foundUser[0][email_login_field];
if (!tempCode) throw new Error("No code Found!"); if (!tempCode) throw new Error("No code Found!");

14
package-shared/functions/backend/dbHandler.ts
View File

@ -1,6 +1,7 @@
import fs from "fs"; import fs from "fs";
import serverError from "./serverError"; import serverError from "./serverError";
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDSQLConnection from "../../utils/grab-dsql-connection";
/** /**
* # Main DB Handler Function * # Main DB Handler Function
@ -13,18 +14,7 @@ export default async function dbHandler(...args: any[]) {
"utf8" "utf8"
); );
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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; let results;

14
package-shared/shell/checkDb.ts
View File

@ -1,5 +1,6 @@
require("dotenv").config({ path: "./../.env" }); require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/** /**
* # Main DB Handler Function * # Main DB Handler Function
@ -13,18 +14,7 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>} * @returns {Promise<object|null>}
*/ */
(async () => { (async () => {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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 { try {
const result = await CONNECTION.query( const result = await CONNECTION.query(

20
package-shared/shell/test-external-server.ts
View File

@ -1,17 +1,5 @@
require("dotenv").config({ path: "./.env" }); require("dotenv").config({ path: "./.env" });
import grabDbSSL from "../utils/backend/grabDbSSL"; import grabDSQLConnection from "../utils/grab-dsql-connection";
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(),
},
});
/** /**
* # Main DB Handler Function * # Main DB Handler Function
@ -25,13 +13,15 @@ const connection = mysql({
* @returns {Promise<object|null>} * @returns {Promise<object|null>}
*/ */
(async () => { (async () => {
const CONNECTION = grabDSQLConnection({ noDb: true });
/** /**
* Switch Database * Switch Database
* *
* @description If a database is provided, switch to it * @description If a database is provided, switch to it
*/ */
try { try {
const result = await connection.query("SHOW DATABASES"); const result = await CONNECTION.query("SHOW DATABASES");
const parsedResults = JSON.parse(JSON.stringify(result)); const parsedResults = JSON.parse(JSON.stringify(result));
@ -39,7 +29,7 @@ const connection = mysql({
} catch (error: any) { } catch (error: any) {
console.log("Connection query ERROR =>", error.message); console.log("Connection query ERROR =>", error.message);
} finally { } finally {
connection.end(); CONNECTION?.end();
process.exit(); process.exit();
} }
})(); })();

14
package-shared/shell/updateSSLUsers.ts
View File

@ -1,5 +1,6 @@
require("dotenv").config({ path: "./../.env" }); require("dotenv").config({ path: "./../.env" });
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDSQLConnection from "../utils/grab-dsql-connection";
/** /**
* # Main DB Handler Function * # Main DB Handler Function
@ -13,18 +14,7 @@ import mysql from "serverless-mysql";
* @returns {Promise<object|null>} * @returns {Promise<object|null>}
*/ */
(async () => { (async () => {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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 { try {
const result = await CONNECTION.query( const result = await CONNECTION.query(

14
package-shared/shell/utils/dbHandler.ts
View File

@ -3,6 +3,7 @@ import path from "path";
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDbSSL from "../../utils/backend/grabDbSSL"; import grabDbSSL from "../../utils/backend/grabDbSSL";
import grabDSQLConnection from "../../utils/grab-dsql-connection";
type Param = { type Param = {
query: string; query: string;
@ -17,18 +18,7 @@ export default async function dbHandler({
query, query,
values, values,
}: Param): Promise<any[] | object | null> { }: Param): Promise<any[] | object | null> {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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; let results;

14
package-shared/utils/backend/global-db/DB_HANDLER.ts
View File

@ -1,22 +1,12 @@
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDSQLConnection from "../../grab-dsql-connection";
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/ */
export default async function DB_HANDLER(...args: any[]) { export default async function DB_HANDLER(...args: any[]) {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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 { try {
if (!CONNECTION) if (!CONNECTION)

114
package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts
View File

@ -1,5 +1,5 @@
import mysql from "serverless-mysql";
import connDbHandler from "../../db/conn-db-handler"; import connDbHandler from "../../db/conn-db-handler";
import grabDSQLConnection from "../../grab-dsql-connection";
type Param = { type Param = {
paradigm: "Full Access" | "FA" | "Read Only"; paradigm: "Full Access" | "FA" | "Read Only";
@ -17,28 +17,8 @@ export default async function DSQL_USER_DB_HANDLER({
}: Param) { }: Param) {
const CONNECTION = const CONNECTION =
paradigm == "Read Only" paradigm == "Read Only"
? mysql({ ? grabDSQLConnection({ ro: true })
config: { : grabDSQLConnection({ fa: true });
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",
},
});
try { try {
return await connDbHandler(CONNECTION, queryString, queryValues); return await connDbHandler(CONNECTION, queryString, queryValues);
@ -48,92 +28,4 @@ export default async function DSQL_USER_DB_HANDLER({
} finally { } finally {
CONNECTION?.end(); 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,
// };
// }
} }

31
package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts
View File

@ -1,45 +1,24 @@
import mysql from "serverless-mysql"; import grabDSQLConnection from "../../grab-dsql-connection";
import grabDbSSL from "../grabDbSSL";
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
*/ */
export default async function LOCAL_DB_HANDLER(...args: any[]) { export default async function LOCAL_DB_HANDLER(...args: any[]) {
const MASTER = mysql({ const MASTER = grabDSQLConnection();
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);
},
});
console.log("Querying ..."); console.log("Querying ...");
try { try {
const results = await MASTER.query(...args); const results = await MASTER.query(...args);
await MASTER.end();
return JSON.parse(JSON.stringify(results)); return JSON.parse(JSON.stringify(results));
} catch (/** @type {any} */ error: any) { } catch (error: any) {
console.log("DB Error =>", error.message); console.log("DB Error =>", error.message);
return { return {
success: false, success: false,
error: error.message, error: error.message,
}; };
} finally {
await MASTER?.end();
} }
} }

14
package-shared/utils/backend/global-db/NO_DB_HANDLER.ts
View File

@ -1,22 +1,12 @@
import mysql from "serverless-mysql"; import mysql from "serverless-mysql";
import grabDbSSL from "../grabDbSSL"; import grabDbSSL from "../grabDbSSL";
import grabDSQLConnection from "../../grab-dsql-connection";
/** /**
* # DSQL user read-only DB handler * # DSQL user read-only DB handler
*/ */
export default function NO_DB_HANDLER(...args: any[]) { export default function NO_DB_HANDLER(...args: any[]) {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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 { try {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

15
package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts
View File

@ -1,21 +1,10 @@
import mysql from "serverless-mysql"; import grabDSQLConnection from "../../grab-dsql-connection";
/** /**
* # Root DB handler * # Root DB handler
*/ */
export default function ROOT_DB_HANDLER(...args: any[]) { export default function ROOT_DB_HANDLER(...args: any[]) {
const CONNECTION = mysql({ const CONNECTION = grabDSQLConnection();
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 { try {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

71
package-shared/utils/grab-dsql-connection.ts Normal file
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",
},
})
);
}

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "3.4.9", "version": "3.5.0",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {

10
users/login-user.ts
View File

@ -6,7 +6,10 @@ import grabHostNames from "../package-shared/utils/grab-host-names";
import apiLoginUser from "../package-shared/functions/api/users/api-login"; import apiLoginUser from "../package-shared/functions/api/users/api-login";
import getAuthCookieNames from "../package-shared/functions/backend/cookies/get-auth-cookie-names"; import getAuthCookieNames from "../package-shared/functions/backend/cookies/get-auth-cookie-names";
import { writeAuthFile } from "../package-shared/functions/backend/auth/write-auth-files"; import { writeAuthFile } from "../package-shared/functions/backend/auth/write-auth-files";
import { APILoginFunctionReturn } from "../package-shared/types"; import {
APILoginFunctionReturn,
DSQL_DatabaseSchemaType,
} from "../package-shared/types";
type Param = { type Param = {
key?: string; key?: string;
@ -122,10 +125,7 @@ export default async function loginUser({
DSQL_DB_NAME?.match(/./) && DSQL_DB_NAME?.match(/./) &&
useLocal useLocal
) { ) {
/** @type {import("../package-shared/types").DSQL_DatabaseSchemaType | undefined} */ let dbSchema: DSQL_DatabaseSchemaType | undefined;
let dbSchema:
| import("../package-shared/types").DSQL_DatabaseSchemaType
| undefined;
try { try {
const localDbSchemaPath = path.resolve( const localDbSchemaPath = path.resolve(