diff --git a/dist/engine/dump.js b/dist/engine/dump.js index ef443d4..da8e3b3 100644 --- a/dist/engine/dump.js +++ b/dist/engine/dump.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; -var _a, _b; +var _a, _b, _c; Object.defineProperty(exports, "__esModule", { value: true }); const path_1 = __importDefault(require("path")); const child_process_1 = require("child_process"); @@ -46,5 +46,6 @@ try { //////////////////////////////////////// } catch (error) { + (_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `MariaDB Dump Error`, error); console.log("Dump Error: ", error.message); } diff --git a/dist/index.d.ts b/dist/index.d.ts index 81dcdcc..37f84fe 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -4,6 +4,7 @@ declare global { var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined; var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined; var DSQL_USE_LOCAL: boolean | undefined; + var ERROR_CALLBACK: ErrorCallback | undefined; } import get from "./package-shared/actions/get"; import post from "./package-shared/actions/post"; @@ -38,6 +39,7 @@ import deleteUser from "./package-shared/actions/users/delete-user"; import dsqlCrud from "./package-shared/utils/data-fetching/crud"; import dsqlMethodCrud from "./package-shared/utils/data-fetching/method-crud"; import debugLog from "./package-shared/utils/logging/debug-log"; +import { ErrorCallback } from "./package-shared/types"; /** * Main Export */ diff --git a/dist/package-shared/actions/post.js b/dist/package-shared/actions/post.js index dfe493d..8a3852b 100644 --- a/dist/package-shared/actions/post.js +++ b/dist/package-shared/actions/post.js @@ -58,6 +58,7 @@ function post(_a) { * @description make a request to datasquirel.com */ const httpResponse = yield new Promise((resolve, reject) => { + var _a; const reqPayloadString = JSON.stringify({ query, queryValues, @@ -68,8 +69,7 @@ function post(_a) { JSON.parse(reqPayloadString); } catch (error) { - console.log(error); - console.log(reqPayloadString); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Parsing HTTP response for post action`, error); return { success: false, payload: null, diff --git a/dist/package-shared/actions/upload-file.js b/dist/package-shared/actions/upload-file.js index 50c2a28..b28f973 100644 --- a/dist/package-shared/actions/upload-file.js +++ b/dist/package-shared/actions/upload-file.js @@ -19,6 +19,7 @@ const grab_host_names_1 = __importDefault(require("../utils/grab-host-names")); */ function uploadImage(_a) { return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, }) { + var _b; const grabedHostNames = (0, grab_host_names_1.default)(); const { host, port, scheme } = grabedHostNames; try { @@ -66,6 +67,7 @@ function uploadImage(_a) { } catch (error) { console.log("Error in uploading file: ", error.message); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Uploading File`, error); return { success: false, payload: null, diff --git a/dist/package-shared/actions/upload-image.js b/dist/package-shared/actions/upload-image.js index ebfb7a7..f25807f 100644 --- a/dist/package-shared/actions/upload-image.js +++ b/dist/package-shared/actions/upload-image.js @@ -20,6 +20,7 @@ const grab_host_names_1 = __importDefault(require("../utils/grab-host-names")); */ function uploadImage(_a) { return __awaiter(this, arguments, void 0, function* ({ key, payload, user_id, }) { + var _b; const grabedHostNames = (0, grab_host_names_1.default)(); const { host, port, scheme } = grabedHostNames; try { @@ -67,6 +68,7 @@ function uploadImage(_a) { } catch (error) { console.log("Error in uploading image: ", error.message); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Uploading Image`, error); return { success: false, payload: null, diff --git a/dist/package-shared/actions/users/get-token.js b/dist/package-shared/actions/users/get-token.js index d4c9b88..49bf723 100644 --- a/dist/package-shared/actions/users/get-token.js +++ b/dist/package-shared/actions/users/get-token.js @@ -14,6 +14,7 @@ const parseCookies_1 = __importDefault(require("../../utils/backend/parseCookies * string and csrf token string */ function getToken({ request, encryptionKey, encryptionSalt, cookieString, }) { + var _a; try { /** * Grab the payload @@ -61,6 +62,7 @@ function getToken({ request, encryptionKey, encryptionSalt, cookieString, }) { return { key, csrf }; } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Getting Token`, error); /** * Return User Object * diff --git a/dist/package-shared/actions/users/login-user.js b/dist/package-shared/actions/users/login-user.js index 89d2667..c3e7802 100644 --- a/dist/package-shared/actions/users/login-user.js +++ b/dist/package-shared/actions/users/login-user.js @@ -26,7 +26,7 @@ const debug_log_1 = __importDefault(require("../../utils/logging/debug-log")); */ function loginUser(_a) { return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, }) { - var _b; + var _b, _c; const grabedHostNames = (0, grab_host_names_1.default)({ userId: user_id || apiUserID }); const { host, port, scheme } = grabedHostNames; const defaultTempLoginFieldName = "temp_login_code"; @@ -164,7 +164,9 @@ function loginUser(_a) { if (token && encryptedPayload) httpResponse["token"] = encryptedPayload; } - catch (error) { } + catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Login User HTTP Response Error`, error); + } const cookieNames = (0, get_auth_cookie_names_1.default)({ database, userId: grabedHostNames.user_id, @@ -183,7 +185,7 @@ function loginUser(_a) { } response === null || response === void 0 ? void 0 : response.setHeader("Set-Cookie", [ `${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`, - `${csrfName}=${(_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.csrf_k};samesite=strict;path=/;HttpOnly=true`, + `${csrfName}=${(_c = httpResponse.payload) === null || _c === void 0 ? void 0 : _c.csrf_k};samesite=strict;path=/;HttpOnly=true`, ]); if (debug) { debugFn("Response Sent!"); diff --git a/dist/package-shared/actions/users/logout-user.js b/dist/package-shared/actions/users/logout-user.js index 15ee1fc..e895823 100644 --- a/dist/package-shared/actions/users/logout-user.js +++ b/dist/package-shared/actions/users/logout-user.js @@ -15,6 +15,7 @@ const debug_log_1 = __importDefault(require("../../utils/logging/debug-log")); * # Logout user */ function logoutUser({ response, database, dsqlUserId, encryptedUserString, request, cookieString, debug, }) { + var _a; /** * Check Encryption Keys * @@ -83,6 +84,7 @@ function logoutUser({ response, database, dsqlUserId, encryptedUserString, reque } catch (error) { console.log("Logout Error:", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Logout User Error`, error); return { success: false, msg: "Logout Failed", diff --git a/dist/package-shared/actions/users/social/github-auth.js b/dist/package-shared/actions/users/social/github-auth.js index 4e96a69..52b4d42 100644 --- a/dist/package-shared/actions/users/social/github-auth.js +++ b/dist/package-shared/actions/users/social/github-auth.js @@ -123,11 +123,12 @@ function githubAuth(_a) { str += chunk; }); response.on("end", function () { + var _a; try { resolve(JSON.parse(str)); } catch (error) { - console.log(error); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Github Auth Error`, error); resolve({ success: false, user: null, diff --git a/dist/package-shared/actions/users/user-auth.js b/dist/package-shared/actions/users/user-auth.js index 0ff6293..75c65e5 100644 --- a/dist/package-shared/actions/users/user-auth.js +++ b/dist/package-shared/actions/users/user-auth.js @@ -23,6 +23,7 @@ const yearInMilliseconds = dayInMilliseconds * 365; * with the user's data */ function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry = weekInMilliseconds, cookieString, csrfHeaderName, debug, }) { + var _a; try { const finalRequest = req || request; const { user_id } = (0, grab_host_names_1.default)({ userId: dsqlUserId }); @@ -147,6 +148,7 @@ function userAuth({ request, req, encryptionKey, encryptionSalt, level, database }; } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `User Auth Error`, error); /** * Return User Object * diff --git a/dist/package-shared/actions/users/validate-temp-email-code.js b/dist/package-shared/actions/users/validate-temp-email-code.js index 534d2f6..a801451 100644 --- a/dist/package-shared/actions/users/validate-temp-email-code.js +++ b/dist/package-shared/actions/users/validate-temp-email-code.js @@ -22,6 +22,7 @@ const ejson_1 = __importDefault(require("../../utils/ejson")); */ function validateTempEmailCode(_a) { return __awaiter(this, arguments, void 0, function* ({ request, email, cookieString, }) { + var _b; try { const keyNames = (0, get_auth_cookie_names_1.default)(); const oneTimeCodeCookieName = keyNames.oneTimeCodeName; @@ -40,6 +41,7 @@ function validateTempEmailCode(_a) { return null; } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Validate Temp Email Code Error`, error); console.log("validateTempEmailCode error:", error.message); return null; } diff --git a/dist/package-shared/actions/users/validate-token.js b/dist/package-shared/actions/users/validate-token.js index edc9a6b..ec18a3d 100644 --- a/dist/package-shared/actions/users/validate-token.js +++ b/dist/package-shared/actions/users/validate-token.js @@ -11,6 +11,7 @@ const decrypt_1 = __importDefault(require("../../functions/dsql/decrypt")); * @description This Function takes in a encrypted token and returns a user object */ function validateToken({ token, encryptionKey, encryptionSalt, }) { + var _a; try { /** * Grab the payload @@ -53,6 +54,7 @@ function validateToken({ token, encryptionKey, encryptionSalt, }) { return userObject; } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Validate Token Error`, error); /** * Return User Object * diff --git a/dist/package-shared/functions/api/query/get.js b/dist/package-shared/functions/api/query/get.js index 0edb3ad..55f9421 100644 --- a/dist/package-shared/functions/api/query/get.js +++ b/dist/package-shared/functions/api/query/get.js @@ -22,6 +22,7 @@ const grab_query_and_values_1 = __importDefault(require("../../../utils/grab-que */ function apiGet(_a) { return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, debug, dbContext, forceLocal, }) { + var _b; const queryAndValues = (0, grab_query_and_values_1.default)({ query, values: queryValues, @@ -78,6 +79,7 @@ function apiGet(_a) { component: "/api/query/get/lines-85-94", message: error.message, }); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `API Get Error`, error); if (debug && global.DSQL_USE_LOCAL) { console.log("apiGet:error", error.message); } diff --git a/dist/package-shared/functions/api/query/post.js b/dist/package-shared/functions/api/query/post.js index 357cd13..47f33e7 100644 --- a/dist/package-shared/functions/api/query/post.js +++ b/dist/package-shared/functions/api/query/post.js @@ -21,7 +21,7 @@ const runQuery_1 = __importDefault(require("../../backend/db/runQuery")); */ function apiPost(_a) { return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, }) { - var _b; + var _b, _c; if (typeof query === "string" && (query === null || query === void 0 ? void 0 : query.match(/^create |^alter |^drop /i))) { return { success: false, msg: "Wrong Input" }; } @@ -75,6 +75,7 @@ function apiPost(_a) { component: "/api/query/post/lines-132-142", message: error.message, }); + (_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `API Post Error`, error); return { success: false, payload: results, diff --git a/dist/package-shared/functions/api/social-login/googleLogin.js b/dist/package-shared/functions/api/social-login/googleLogin.js index df8afed..6f53154 100644 --- a/dist/package-shared/functions/api/social-login/googleLogin.js +++ b/dist/package-shared/functions/api/social-login/googleLogin.js @@ -22,7 +22,7 @@ const hashPassword_1 = __importDefault(require("../../dsql/hashPassword")); */ function googleLogin(_a) { return __awaiter(this, arguments, void 0, function* ({ usertype, foundUser, isSocialValidated, isUserValid, reqBody, serverRes, loginFailureReason, }) { - var _b; + var _b, _c; const client = new google_auth_library_1.OAuth2Client(process.env.DSQL_GOOGLE_CLIENT_ID); let isGoogleAuthValid = false; let newFoundUser = null; @@ -114,6 +114,7 @@ function googleLogin(_a) { component: "googleLogin", message: error.message, }); + (_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Google Login Error`, error); loginFailureReason = error; isUserValid = false; isSocialValidated = false; diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.js b/dist/package-shared/functions/api/social-login/handleSocialDb.js index 2a2af70..a466291 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.js +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.js @@ -26,6 +26,7 @@ const loginSocialUser_1 = __importDefault(require("./loginSocialUser")); */ function handleSocialDb(_a) { return __awaiter(this, arguments, void 0, function* ({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, debug, }) { + var _b; try { const finalDbName = global.DSQL_USE_LOCAL ? undefined @@ -209,6 +210,7 @@ function handleSocialDb(_a) { } catch (error) { console.log("ERROR in 'handleSocialDb.ts' backend function =>", error.message); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Handle Social DB Error`, error); return { success: false, payload: null, diff --git a/dist/package-shared/functions/backend/addAdminUserOnLogin.js b/dist/package-shared/functions/backend/addAdminUserOnLogin.js index 9641681..fa68467 100644 --- a/dist/package-shared/functions/backend/addAdminUserOnLogin.js +++ b/dist/package-shared/functions/backend/addAdminUserOnLogin.js @@ -27,6 +27,7 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-d */ function addAdminUserOnLogin(_a) { return __awaiter(this, arguments, void 0, function* ({ query, user, }) { + var _b; try { const finalDbHandler = global.DSQL_USE_LOCAL ? LOCAL_DB_HANDLER_1.default @@ -100,6 +101,7 @@ function addAdminUserOnLogin(_a) { } } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Add Admin User On Login Error`, error); (0, serverError_1.default)({ component: "addAdminUserOnLogin", message: error.message, diff --git a/dist/package-shared/functions/backend/auth/write-auth-files.js b/dist/package-shared/functions/backend/auth/write-auth-files.js index 032c00e..2060b28 100644 --- a/dist/package-shared/functions/backend/auth/write-auth-files.js +++ b/dist/package-shared/functions/backend/auth/write-auth-files.js @@ -16,6 +16,7 @@ const grabAuthDirs = () => { }; exports.grabAuthDirs = grabAuthDirs; const initAuthFiles = () => { + var _a; try { const authDirs = (0, exports.grabAuthDirs)(); if (!fs_1.default.existsSync(authDirs.root)) @@ -26,6 +27,7 @@ const initAuthFiles = () => { } catch (error) { console.log(`Error initializing Auth Files: ${error.message}`); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Initializing Auth Files`, error); return false; } }; diff --git a/dist/package-shared/functions/backend/db/addDbEntry.js b/dist/package-shared/functions/backend/db/addDbEntry.js index 1bdf91d..1c23e0b 100644 --- a/dist/package-shared/functions/backend/db/addDbEntry.js +++ b/dist/package-shared/functions/backend/db/addDbEntry.js @@ -24,7 +24,7 @@ const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is */ function addDbEntry(_a) { return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, }) { - var _b, _c; + var _b, _c, _d; /** * Initialize variables */ @@ -132,6 +132,7 @@ function addDbEntry(_a) { } catch (error) { console.log("DSQL: Error in parsing data keys =>", error.message); + (_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error parsing Data Keys`, error); continue; } } diff --git a/dist/package-shared/functions/backend/db/deleteDbEntry.js b/dist/package-shared/functions/backend/db/deleteDbEntry.js index 576ed7d..650ca6a 100644 --- a/dist/package-shared/functions/backend/db/deleteDbEntry.js +++ b/dist/package-shared/functions/backend/db/deleteDbEntry.js @@ -21,6 +21,7 @@ const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-han */ function deleteDbEntry(_a) { return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }) { + var _b; try { const isMaster = forceLocal ? true @@ -46,6 +47,7 @@ function deleteDbEntry(_a) { return deletedEntry; } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Deleting Entry`, error); return null; } }); diff --git a/dist/package-shared/functions/backend/dbHandler.js b/dist/package-shared/functions/backend/dbHandler.js index 94a3862..393a8a7 100644 --- a/dist/package-shared/functions/backend/dbHandler.js +++ b/dist/package-shared/functions/backend/dbHandler.js @@ -22,7 +22,7 @@ const path_1 = __importDefault(require("path")); */ function dbHandler(...args) { return __awaiter(this, void 0, void 0, function* () { - var _a; + var _a, _b; ((_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"); const CONNECTION = (0, grab_dsql_connection_1.default)(); @@ -50,6 +50,7 @@ function dbHandler(...args) { fs_1.default.mkdirSync(tmpFolder, { recursive: true }); fs_1.default.appendFileSync(path_1.default.resolve(tmpFolder, "./dbErrorLogs.txt"), JSON.stringify(error, null, 4) + "\n" + Date() + "\n\n\n", "utf8"); results = null; + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `DB Handler Error`, error); (0, serverError_1.default)({ component: "dbHandler", message: error.message, diff --git a/dist/package-shared/functions/backend/fullAccessDbHandler.js b/dist/package-shared/functions/backend/fullAccessDbHandler.js index d31a097..926d577 100644 --- a/dist/package-shared/functions/backend/fullAccessDbHandler.js +++ b/dist/package-shared/functions/backend/fullAccessDbHandler.js @@ -21,6 +21,7 @@ const serverError_1 = __importDefault(require("./serverError")); */ function fullAccessDbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ queryString, tableSchema, queryValuesArray, forceLocal, }) { + var _b; /** * Declare variables * @@ -41,6 +42,7 @@ function fullAccessDbHandler(_a) { } catch (error) { //////////////////////////////////////// + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Full Access DB Handler Error`, error); (0, serverError_1.default)({ component: "fullAccessDbHandler", message: error.message, diff --git a/dist/package-shared/functions/backend/grabUserSchemaData.js b/dist/package-shared/functions/backend/grabUserSchemaData.js index ce5dfa4..c533a56 100644 --- a/dist/package-shared/functions/backend/grabUserSchemaData.js +++ b/dist/package-shared/functions/backend/grabUserSchemaData.js @@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path")); * # Grab User Schema Data */ function grabUserSchemaData({ userId, }) { + var _a; try { const userSchemaFilePath = path_1.default.resolve(process.cwd(), `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${userId}/main.json`); const userSchemaData = JSON.parse(fs_1.default.readFileSync(userSchemaFilePath, "utf-8")); @@ -21,6 +22,7 @@ function grabUserSchemaData({ userId, }) { component: "grabUserSchemaData", message: error.message, }); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Grabbing User Schema Data`, error); return null; } } diff --git a/dist/package-shared/functions/backend/setUserSchemaData.js b/dist/package-shared/functions/backend/setUserSchemaData.js index c3f7561..e18228f 100644 --- a/dist/package-shared/functions/backend/setUserSchemaData.js +++ b/dist/package-shared/functions/backend/setUserSchemaData.js @@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path")); * # Set User Schema Data */ function setUserSchemaData({ userId, schemaData, }) { + var _a; try { const userSchemaFilePath = path_1.default.resolve(process.cwd(), `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${userId}/main.json`); fs_1.default.writeFileSync(userSchemaFilePath, JSON.stringify(schemaData), "utf8"); @@ -21,6 +22,7 @@ function setUserSchemaData({ userId, schemaData, }) { component: "/functions/backend/setUserSchemaData", message: error.message, }); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Setting User Schema`, error); return false; } } diff --git a/dist/package-shared/functions/backend/updateUsersTableSchema.js b/dist/package-shared/functions/backend/updateUsersTableSchema.js index d3700b5..8a7099e 100644 --- a/dist/package-shared/functions/backend/updateUsersTableSchema.js +++ b/dist/package-shared/functions/backend/updateUsersTableSchema.js @@ -23,7 +23,7 @@ const grabSchemaFieldsFromData_1 = __importDefault(require("./grabSchemaFieldsFr */ function updateUsersTableSchema(_a) { return __awaiter(this, arguments, void 0, function* ({ userId, database, newFields, newPayload, }) { - var _b, _c; + var _b, _c, _d; try { const dbFullName = database; const userSchemaData = (0, grabUserSchemaData_1.default)({ userId }); @@ -52,7 +52,7 @@ function updateUsersTableSchema(_a) { return `Done!`; } catch (error) { - console.log(`addUsersTableToDb.ts ERROR: ${error.message}`); + (_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error Updating User Table Schema`, error); (0, serverError_1.default)({ component: "addUsersTableToDb", message: error.message, diff --git a/dist/package-shared/functions/backend/varDatabaseDbHandler.js b/dist/package-shared/functions/backend/varDatabaseDbHandler.js index b193bd9..2eface8 100644 --- a/dist/package-shared/functions/backend/varDatabaseDbHandler.js +++ b/dist/package-shared/functions/backend/varDatabaseDbHandler.js @@ -22,6 +22,7 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle */ function varDatabaseDbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, database, tableSchema, debug, }) { + var _b; let CONNECTION = (0, grab_dsql_connection_1.default)({ fa: true }); if (global.DSQL_USE_LOCAL) CONNECTION = (0, grab_dsql_connection_1.default)({ local: true }); @@ -47,6 +48,7 @@ function varDatabaseDbHandler(_a) { } catch (error) { console.log("\x1b[31mvarDatabaseDbHandler ERROR\x1b[0m =>", database, error); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarDb Handler Error`, error); (0, serverError_1.default)({ component: "varDatabaseDbHandler/lines-52-53", message: error.message, diff --git a/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js b/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js index 3323080..f71c407 100644 --- a/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js +++ b/dist/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.js @@ -22,6 +22,7 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle */ function varReadOnlyDatabaseDbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, forceLocal, }) { + var _b; let results; const DB_CONN = forceLocal ? global.DSQL_DB_CONN @@ -35,6 +36,7 @@ function varReadOnlyDatabaseDbHandler(_a) { message: error.message, noMail: true, }); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarReadOnlyDB Handler Error`, error); return error.message; } finally { diff --git a/dist/package-shared/functions/dsql/decrypt.js b/dist/package-shared/functions/dsql/decrypt.js index 45b8fdb..becf4fe 100644 --- a/dist/package-shared/functions/dsql/decrypt.js +++ b/dist/package-shared/functions/dsql/decrypt.js @@ -12,6 +12,7 @@ const grab_keys_1 = __importDefault(require("../../utils/grab-keys")); * # Decrypt Function */ function decrypt({ encryptedString, encryptionKey, encryptionSalt, }) { + var _a; if (!(encryptedString === null || encryptedString === void 0 ? void 0 : encryptedString.match(/./))) { console.log("Encrypted string is invalid"); return encryptedString; @@ -35,6 +36,7 @@ function decrypt({ encryptedString, encryptionKey, encryptionSalt, }) { } catch (error) { console.log("Error in decrypting =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Decrypting data`, error); return encryptedString; } } diff --git a/dist/package-shared/functions/dsql/encrypt.js b/dist/package-shared/functions/dsql/encrypt.js index 3f07c5e..55efc1a 100644 --- a/dist/package-shared/functions/dsql/encrypt.js +++ b/dist/package-shared/functions/dsql/encrypt.js @@ -12,6 +12,7 @@ const grab_keys_1 = __importDefault(require("../../utils/grab-keys")); * # Encrypt String */ function encrypt({ data, encryptionKey, encryptionSalt, }) { + var _a; if (!(data === null || data === void 0 ? void 0 : data.match(/./))) { console.log("Encryption string is invalid"); return data; @@ -36,6 +37,7 @@ function encrypt({ data, encryptionKey, encryptionSalt, }) { } catch (error) { console.log("Error in encrypting =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Encrypting Data`, error); return data; } } diff --git a/dist/package-shared/shell/checkDb.js b/dist/package-shared/shell/checkDb.js index b55ba6c..a7ac02e 100644 --- a/dist/package-shared/shell/checkDb.js +++ b/dist/package-shared/shell/checkDb.js @@ -26,6 +26,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne * @returns {Promise} */ (() => __awaiter(void 0, void 0, void 0, function* () { + var _a; const CONNECTION = (0, grab_dsql_connection_1.default)(); try { const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3"); @@ -33,6 +34,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne } catch (error) { console.log("Connection query ERROR =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Checking DB`, error); } finally { CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end(); diff --git a/dist/package-shared/shell/createDbFromSchema/check-db-record.js b/dist/package-shared/shell/createDbFromSchema/check-db-record.js index 85c2ea0..8d8aaef 100644 --- a/dist/package-shared/shell/createDbFromSchema/check-db-record.js +++ b/dist/package-shared/shell/createDbFromSchema/check-db-record.js @@ -22,6 +22,7 @@ const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEn */ function checkDbRecordCreateDbSchema(_a) { return __awaiter(this, arguments, void 0, function* ({ userId, dbSchema, }) { + var _b; try { const { dbFullName, dbName, dbSlug, dbDescription, dbImage, childDatabase, childDatabaseDbFullName, } = dbSchema; let recordedDbEntryArray = userId @@ -58,6 +59,7 @@ function checkDbRecordCreateDbSchema(_a) { return recordedDbEntry; } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Checking DB Record on Creating Schema`, error); return undefined; } }); diff --git a/dist/package-shared/shell/createDbFromSchema/check-table-record.js b/dist/package-shared/shell/createDbFromSchema/check-table-record.js index d566069..01d6b93 100644 --- a/dist/package-shared/shell/createDbFromSchema/check-table-record.js +++ b/dist/package-shared/shell/createDbFromSchema/check-table-record.js @@ -23,6 +23,7 @@ const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEn */ function checkTableRecordCreateDbSchema(_a) { return __awaiter(this, arguments, void 0, function* ({ userId, tableSchema, dbSchema, dbRecord, dbFullName, }) { + var _b; if (!tableSchema) return undefined; try { @@ -86,6 +87,7 @@ function checkTableRecordCreateDbSchema(_a) { return recordedTableEntry; } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Checking Table Record on Creating Schema`, error); return undefined; } }); diff --git a/dist/package-shared/shell/createDbFromSchema/handle-indexes.js b/dist/package-shared/shell/createDbFromSchema/handle-indexes.js index d578897..e351c6f 100644 --- a/dist/package-shared/shell/createDbFromSchema/handle-indexes.js +++ b/dist/package-shared/shell/createDbFromSchema/handle-indexes.js @@ -22,6 +22,7 @@ const varDatabaseDbHandler_1 = __importDefault(require("../utils/varDatabaseDbHa */ function handleIndexescreateDbFromSchema(_a) { return __awaiter(this, arguments, void 0, function* ({ dbFullName, tableName, indexes, }) { + var _b; for (let g = 0; g < indexes.length; g++) { const { indexType, indexName, indexTableFields, alias } = indexes[g]; if (!(alias === null || alias === void 0 ? void 0 : alias.match(/./))) @@ -42,6 +43,7 @@ function handleIndexescreateDbFromSchema(_a) { throw new Error("This Index Does not Exist"); } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Handling Indexes on Creating Schema`, error); /** * @description Create new index if determined that it * doesn't exist in MYSQL db diff --git a/dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.js b/dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.js index 848c98f..9249478 100644 --- a/dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.js +++ b/dist/package-shared/shell/mariadb-users/refreshUsersAndGrants.js @@ -27,7 +27,7 @@ const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1"; */ function refreshUsersAndGrants(_a) { return __awaiter(this, arguments, void 0, function* ({ userId, mariadbUserHost, mariadbUsername, sqlUserID, }) { - var _b, _c, _d, _e; + var _b, _c, _d, _e, _f; const mariadbUsers = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM mariadb_users`, })); @@ -190,7 +190,7 @@ function refreshUsersAndGrants(_a) { } } catch (error) { - console.log(`Error in adding SQL user =>`, error.message); + (_f = global.ERROR_CALLBACK) === null || _f === void 0 ? void 0 : _f.call(global, `Error Refreshing MariaDB Users and Grants`, error); } } }); diff --git a/dist/package-shared/shell/mariadb-users/resetSQLPasswords.js b/dist/package-shared/shell/mariadb-users/resetSQLPasswords.js index f9ae408..711250e 100644 --- a/dist/package-shared/shell/mariadb-users/resetSQLPasswords.js +++ b/dist/package-shared/shell/mariadb-users/resetSQLPasswords.js @@ -22,6 +22,7 @@ const encrypt_1 = __importDefault(require("../../functions/dsql/encrypt")); */ function resetSQLCredentialsPasswords() { return __awaiter(this, void 0, void 0, function* () { + var _a; const users = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM users`, })); @@ -61,7 +62,7 @@ function resetSQLCredentialsPasswords() { } } catch (error) { - console.log(`Error Updating User ${user.id} Password =>`, error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting MariaDB User Password`, error); } } process.exit(); diff --git a/dist/package-shared/shell/mariadb-users/users/create-user.js b/dist/package-shared/shell/mariadb-users/users/create-user.js index 8cf53e1..dc51bce 100644 --- a/dist/package-shared/shell/mariadb-users/users/create-user.js +++ b/dist/package-shared/shell/mariadb-users/users/create-user.js @@ -28,6 +28,7 @@ const tmpDir = process.argv[process.argv.length - 1]; */ function createUser() { return __awaiter(this, void 0, void 0, function* () { + var _a; /** * Validate Form * @@ -126,7 +127,7 @@ function createUser() { return true; } catch (error) { - console.log(`Error in creating user => ${error.message}`); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Creating User`, error); return false; } }); diff --git a/dist/package-shared/shell/mariadb-users/users/update-user.js b/dist/package-shared/shell/mariadb-users/users/update-user.js index b723e5d..8996d0a 100644 --- a/dist/package-shared/shell/mariadb-users/users/update-user.js +++ b/dist/package-shared/shell/mariadb-users/users/update-user.js @@ -24,6 +24,7 @@ const tmpDir = process.argv[process.argv.length - 1]; */ function createUser() { return __awaiter(this, void 0, void 0, function* () { + var _a; /** * Validate Form * @@ -65,7 +66,7 @@ function createUser() { return true; } catch (error) { - console.log(`Error in creating user => ${error.message}`); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating User`, error); return false; } }); diff --git a/dist/package-shared/shell/resetSQLCredentials.js b/dist/package-shared/shell/resetSQLCredentials.js index a26cbe8..5946530 100644 --- a/dist/package-shared/shell/resetSQLCredentials.js +++ b/dist/package-shared/shell/resetSQLCredentials.js @@ -25,6 +25,7 @@ const encrypt_1 = __importDefault(require("../functions/dsql/encrypt")); */ function resetSQLCredentials() { return __awaiter(this, void 0, void 0, function* () { + var _a; const users = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM users`, })); @@ -63,6 +64,7 @@ function resetSQLCredentials() { console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.`); } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting SQL credentials`, error); console.log(`Error in adding SQL user =>`, error.message); } } diff --git a/dist/package-shared/shell/resetSQLCredentialsPasswords.js b/dist/package-shared/shell/resetSQLCredentialsPasswords.js index 6f52b44..cf983cc 100644 --- a/dist/package-shared/shell/resetSQLCredentialsPasswords.js +++ b/dist/package-shared/shell/resetSQLCredentialsPasswords.js @@ -22,6 +22,7 @@ const encrypt_1 = __importDefault(require("../functions/dsql/encrypt")); */ function resetSQLCredentialsPasswords() { return __awaiter(this, void 0, void 0, function* () { + var _a; const users = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM users`, })); @@ -51,7 +52,7 @@ function resetSQLCredentialsPasswords() { console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`); } catch (error) { - console.log(`Error Updating User ${user.id} Password =>`, error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating MariaDB User`, error); } } process.exit(); diff --git a/dist/package-shared/shell/setSQLCredentials.js b/dist/package-shared/shell/setSQLCredentials.js index d81acfe..7db358c 100644 --- a/dist/package-shared/shell/setSQLCredentials.js +++ b/dist/package-shared/shell/setSQLCredentials.js @@ -28,6 +28,7 @@ const encrypt_1 = __importDefault(require("../functions/dsql/encrypt")); */ function setSQLCredentials() { return __awaiter(this, void 0, void 0, function* () { + var _a; const users = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM users`, })); @@ -61,7 +62,7 @@ function setSQLCredentials() { console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.`); } catch (error) { - console.log(`Error in adding SQL user =>`, error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Setting SQL credentials`, error); } } }); diff --git a/dist/package-shared/shell/test-external-server.js b/dist/package-shared/shell/test-external-server.js index c43b738..b234c94 100644 --- a/dist/package-shared/shell/test-external-server.js +++ b/dist/package-shared/shell/test-external-server.js @@ -26,6 +26,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne * @returns {Promise} */ (() => __awaiter(void 0, void 0, void 0, function* () { + var _a; const CONNECTION = (0, grab_dsql_connection_1.default)({ noDb: true }); /** * Switch Database @@ -38,7 +39,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne console.log("parsedResults =>", parsedResults); } catch (error) { - console.log("Connection query ERROR =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Testing External Server`, error); } finally { CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end(); diff --git a/dist/package-shared/shell/testSQLEscape.js b/dist/package-shared/shell/testSQLEscape.js index 21b0386..f0b7eec 100644 --- a/dist/package-shared/shell/testSQLEscape.js +++ b/dist/package-shared/shell/testSQLEscape.js @@ -33,6 +33,7 @@ const encrypt_1 = __importDefault(require("../functions/dsql/encrypt")); */ function testSQLEscape() { return __awaiter(this, void 0, void 0, function* () { + var _a; const users = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM users`, })); @@ -70,7 +71,7 @@ function testSQLEscape() { console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.`); } catch (error) { - console.log(`Error in adding SQL user =>`, error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Testing SQL Escape`, error); } } process.exit(); diff --git a/dist/package-shared/shell/updateChildrenTablesOnDb.js b/dist/package-shared/shell/updateChildrenTablesOnDb.js index 641139f..8d5512b 100644 --- a/dist/package-shared/shell/updateChildrenTablesOnDb.js +++ b/dist/package-shared/shell/updateChildrenTablesOnDb.js @@ -17,6 +17,7 @@ const fs_1 = __importDefault(require("fs")); require("dotenv").config({ path: "./../.env" }); function updateChildrenTablesOnDb() { return __awaiter(this, void 0, void 0, function* () { + var _a; /** * Grab Schema * @@ -48,7 +49,7 @@ function updateChildrenTablesOnDb() { } } catch (error) { - console.log(error); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating Children Tables on DB`, error); } process.exit(); }); diff --git a/dist/package-shared/shell/updateDbSlugsForTableRecords.js b/dist/package-shared/shell/updateDbSlugsForTableRecords.js index c91c328..16778aa 100644 --- a/dist/package-shared/shell/updateDbSlugsForTableRecords.js +++ b/dist/package-shared/shell/updateDbSlugsForTableRecords.js @@ -32,6 +32,7 @@ const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HAND }).then((tables) => __awaiter(void 0, void 0, void 0, function* () { // console.log(tables); // process.exit(); + var _a; for (let i = 0; i < tables.length; i++) { const table = tables[i]; try { @@ -45,6 +46,7 @@ const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HAND message: error.message, user: {}, }); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating DB Slugs For Table Records`, error); } } process.exit(); diff --git a/dist/package-shared/shell/updateSSLUsers.js b/dist/package-shared/shell/updateSSLUsers.js index 1b642c0..e54707a 100644 --- a/dist/package-shared/shell/updateSSLUsers.js +++ b/dist/package-shared/shell/updateSSLUsers.js @@ -26,7 +26,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne * @returns {Promise} */ (() => __awaiter(void 0, void 0, void 0, function* () { - var _a; + var _a, _b; const CONNECTION = (0, grab_dsql_connection_1.default)(); try { const result = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user"); @@ -47,7 +47,7 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne } } catch (error) { - console.log("Connection query ERROR =>", error.message); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Updating SSL Users`, error); } finally { CONNECTION.end(); diff --git a/dist/package-shared/shell/utils/dbHandler.js b/dist/package-shared/shell/utils/dbHandler.js index 0a3a61f..4b373ed 100644 --- a/dist/package-shared/shell/utils/dbHandler.js +++ b/dist/package-shared/shell/utils/dbHandler.js @@ -22,6 +22,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-co */ function dbHandler(_a) { return __awaiter(this, arguments, void 0, function* ({ query, values, }) { + var _b; const CONNECTION = (0, grab_dsql_connection_1.default)(); let results; try { @@ -33,6 +34,7 @@ function dbHandler(_a) { } } catch (error) { + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `DB Handler Error...`, error); if (process.env.FIRST_RUN) { return null; } diff --git a/dist/package-shared/shell/utils/noDatabaseDbHandler.js b/dist/package-shared/shell/utils/noDatabaseDbHandler.js index db6131a..fd976f7 100644 --- a/dist/package-shared/shell/utils/noDatabaseDbHandler.js +++ b/dist/package-shared/shell/utils/noDatabaseDbHandler.js @@ -16,12 +16,13 @@ exports.default = noDatabaseDbHandler; const dbHandler_1 = __importDefault(require("./dbHandler")); function noDatabaseDbHandler(queryString) { return __awaiter(this, void 0, void 0, function* () { + var _a; let results; try { results = yield (0, dbHandler_1.default)({ query: queryString }); } catch (error) { - console.log("ERROR in noDatabaseDbHandler =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `No DB Handler Error`, error); } if (results) { return results; diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 1e3cac8..72c1381 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1351,4 +1351,5 @@ export type DsqlCrudParam T; debug?: boolean; }; +export type ErrorCallback = (title: string, error: Error) => void; export {}; diff --git a/dist/package-shared/utils/backend/global-db/DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/DB_HANDLER.js index 84c5a0d..d098d54 100644 --- a/dist/package-shared/utils/backend/global-db/DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/DB_HANDLER.js @@ -20,6 +20,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connecti */ function DB_HANDLER(...args) { return __awaiter(this, void 0, void 0, function* () { + var _a; const CONNECTION = (0, grab_dsql_connection_1.default)(); try { if (!CONNECTION) @@ -28,7 +29,7 @@ function DB_HANDLER(...args) { return JSON.parse(JSON.stringify(results)); } catch (error) { - console.log("DB Error =>", error); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `DB_HANDLER Error`, error); return { success: false, error: error.message, diff --git a/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js index ffd5400..648a5cb 100644 --- a/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.js @@ -20,6 +20,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connecti */ function DSQL_USER_DB_HANDLER(_a) { return __awaiter(this, arguments, void 0, function* ({ paradigm, queryString, queryValues, }) { + var _b; const CONNECTION = paradigm == "Read Only" ? (0, grab_dsql_connection_1.default)({ ro: true }) : (0, grab_dsql_connection_1.default)({ fa: true }); @@ -27,7 +28,7 @@ function DSQL_USER_DB_HANDLER(_a) { return yield (0, conn_db_handler_1.default)(CONNECTION, queryString, queryValues); } catch (error) { - console.log(`DSQL_USER_DB_HANDLER Error: ${error.message}`); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `DSQL_USER_DB_HANDLER Error`, error); return null; } finally { diff --git a/dist/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.js index 6787c43..61951bc 100644 --- a/dist/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.js @@ -19,13 +19,14 @@ const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connecti */ function LOCAL_DB_HANDLER(...args) { return __awaiter(this, void 0, void 0, function* () { + var _a; const MASTER = (0, grab_dsql_connection_1.default)(); try { const results = yield MASTER.query(...args); return JSON.parse(JSON.stringify(results)); } catch (error) { - console.log("DB Error =>", error.message); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `LOCAL_DB_HANDLER Error`, error); return { success: false, error: error.message, diff --git a/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js index 16e49ad..497965e 100644 --- a/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/NO_DB_HANDLER.js @@ -9,6 +9,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connecti * # DSQL user read-only DB handler */ function NO_DB_HANDLER(...args) { + var _a; const CONNECTION = (0, grab_dsql_connection_1.default)(); try { return new Promise((resolve, reject) => { @@ -27,6 +28,7 @@ function NO_DB_HANDLER(...args) { }); } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `NO_DB_HANDLER Error`, error); return { success: false, error: error.message, diff --git a/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js b/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js index b769c9d..a0fcba2 100644 --- a/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js +++ b/dist/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.js @@ -9,6 +9,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../grab-dsql-connecti * # Root DB handler */ function ROOT_DB_HANDLER(...args) { + var _a; const CONNECTION = (0, grab_dsql_connection_1.default)(); try { return new Promise((resolve, reject) => { @@ -27,6 +28,7 @@ function ROOT_DB_HANDLER(...args) { }); } catch (error) { + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `ROOT_DB_HANDLER Error`, error); return { success: false, error: error.message, diff --git a/dist/package-shared/utils/backend/parseCookies.js b/dist/package-shared/utils/backend/parseCookies.js index fe35e0c..81d0e03 100644 --- a/dist/package-shared/utils/backend/parseCookies.js +++ b/dist/package-shared/utils/backend/parseCookies.js @@ -9,6 +9,7 @@ exports.default = parseCookies; * returns the cookies as a JS object */ function parseCookies({ request, cookieString, }) { + var _a; try { /** @type {string | undefined} */ const cookieStr = request @@ -36,7 +37,7 @@ function parseCookies({ request, cookieString, }) { return cookieObject; } catch (error) { - console.log(`ERROR parsing cookies: ${error.message}`); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Parse Cookies Error`, error); return {}; } } diff --git a/dist/package-shared/utils/data-fetching/method-crud.js b/dist/package-shared/utils/data-fetching/method-crud.js index b4585c1..235e4f8 100644 --- a/dist/package-shared/utils/data-fetching/method-crud.js +++ b/dist/package-shared/utils/data-fetching/method-crud.js @@ -20,7 +20,7 @@ const numberfy_1 = __importDefault(require("../numberfy")); const crud_1 = __importDefault(require("./crud")); function dsqlMethodCrud(_a) { return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transformData, existingData, body, query, targetId, sanitize, transformQuery, debug, }) { - var _b, _c; + var _b, _c, _d; let result = { success: false, }; @@ -157,6 +157,7 @@ function dsqlMethodCrud(_a) { return result; } catch (error) { + (_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Method Crud Error`, error); return result; } }); diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index 295b8de..e68fa13 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -29,6 +29,7 @@ query, */ values) { return __awaiter(this, void 0, void 0, function* () { + var _a, _b; try { if (!conn) throw new Error("No Connection Found!"); @@ -47,7 +48,7 @@ values) { resArray.push(JSON.parse(JSON.stringify(queryObjRes))); } catch (error) { - console.log(`connDbHandler Query Error: ${error.message}`); + (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Connection DB Handler Query Error`, error); resArray.push(null); } } @@ -58,8 +59,7 @@ values) { } } catch (error) { - console.log(`connDbHandler Error: ${error.message}`); - console.log(conn === null || conn === void 0 ? void 0 : conn.config()); + (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Connection DB Handler Error`, error); return null; } finally { diff --git a/engine/dump.ts b/engine/dump.ts index 6139f1b..f9c04cc 100644 --- a/engine/dump.ts +++ b/engine/dump.ts @@ -57,5 +57,6 @@ try { //////////////////////////////////////// //////////////////////////////////////// } catch (error: any) { + global.ERROR_CALLBACK?.(`MariaDB Dump Error`, error as Error); console.log("Dump Error: ", error.message); } diff --git a/index.ts b/index.ts index 3b4a993..73c1302 100644 --- a/index.ts +++ b/index.ts @@ -5,6 +5,7 @@ declare global { var DSQL_READ_ONLY_DB_CONN: ServerlessMysql | undefined; var DSQL_FULL_ACCESS_DB_CONN: ServerlessMysql | undefined; var DSQL_USE_LOCAL: boolean | undefined; + var ERROR_CALLBACK: ErrorCallback | undefined; } import get from "./package-shared/actions/get"; @@ -46,6 +47,7 @@ import deleteUser from "./package-shared/actions/users/delete-user"; import dsqlCrud from "./package-shared/utils/data-fetching/crud"; import dsqlMethodCrud from "./package-shared/utils/data-fetching/method-crud"; import debugLog from "./package-shared/utils/logging/debug-log"; +import { ErrorCallback } from "./package-shared/types"; /** * User Functions Object diff --git a/package-shared/actions/post.ts b/package-shared/actions/post.ts index 73c1460..ade00aa 100644 --- a/package-shared/actions/post.ts +++ b/package-shared/actions/post.ts @@ -83,8 +83,10 @@ export default async function post({ try { JSON.parse(reqPayloadString); } catch (error) { - console.log(error); - console.log(reqPayloadString); + global.ERROR_CALLBACK?.( + `Error Parsing HTTP response for post action`, + error as Error + ); return { success: false, diff --git a/package-shared/actions/upload-file.ts b/package-shared/actions/upload-file.ts index 4220219..a5c98b1 100644 --- a/package-shared/actions/upload-file.ts +++ b/package-shared/actions/upload-file.ts @@ -87,6 +87,7 @@ export default async function uploadImage({ return httpResponse as Return; } catch (error: any) { console.log("Error in uploading file: ", error.message); + global.ERROR_CALLBACK?.(`Error Uploading File`, error as Error); return { success: false, diff --git a/package-shared/actions/upload-image.ts b/package-shared/actions/upload-image.ts index c3ed249..40f0143 100644 --- a/package-shared/actions/upload-image.ts +++ b/package-shared/actions/upload-image.ts @@ -91,6 +91,7 @@ export default async function uploadImage({ return httpResponse as FunctionReturn; } catch (error: any) { console.log("Error in uploading image: ", error.message); + global.ERROR_CALLBACK?.(`Error Uploading Image`, error as Error); return { success: false, diff --git a/package-shared/actions/users/get-token.ts b/package-shared/actions/users/get-token.ts index 67d3010..3335376 100644 --- a/package-shared/actions/users/get-token.ts +++ b/package-shared/actions/users/get-token.ts @@ -80,6 +80,8 @@ export default function getToken({ */ return { key, csrf }; } catch (error) { + global.ERROR_CALLBACK?.(`Error Getting Token`, error as Error); + /** * Return User Object * diff --git a/package-shared/actions/users/login-user.ts b/package-shared/actions/users/login-user.ts index 6da0bd8..f8623f6 100644 --- a/package-shared/actions/users/login-user.ts +++ b/package-shared/actions/users/login-user.ts @@ -229,7 +229,12 @@ export default async function loginUser({ try { if (token && encryptedPayload) httpResponse["token"] = encryptedPayload; - } catch (error) {} + } catch (error) { + global.ERROR_CALLBACK?.( + `Login User HTTP Response Error`, + error as Error + ); + } const cookieNames = getAuthCookieNames({ database, diff --git a/package-shared/actions/users/logout-user.ts b/package-shared/actions/users/logout-user.ts index 95e4398..3d86102 100644 --- a/package-shared/actions/users/logout-user.ts +++ b/package-shared/actions/users/logout-user.ts @@ -117,6 +117,8 @@ export default function logoutUser({ }; } catch (error: any) { console.log("Logout Error:", error.message); + global.ERROR_CALLBACK?.(`Logout User Error`, error as Error); + return { success: false, msg: "Logout Failed", diff --git a/package-shared/actions/users/social/github-auth.ts b/package-shared/actions/users/social/github-auth.ts index e037164..d3843ba 100644 --- a/package-shared/actions/users/social/github-auth.ts +++ b/package-shared/actions/users/social/github-auth.ts @@ -183,7 +183,10 @@ export default async function githubAuth({ try { resolve(JSON.parse(str)); } catch (error) { - console.log(error); + global.ERROR_CALLBACK?.( + `Github Auth Error`, + error as Error + ); resolve({ success: false, diff --git a/package-shared/actions/users/user-auth.ts b/package-shared/actions/users/user-auth.ts index dfb784f..42941e9 100644 --- a/package-shared/actions/users/user-auth.ts +++ b/package-shared/actions/users/user-auth.ts @@ -199,6 +199,8 @@ export default function userAuth({ payload: userObject, }; } catch (error: any) { + global.ERROR_CALLBACK?.(`User Auth Error`, error as Error); + /** * Return User Object * diff --git a/package-shared/actions/users/validate-temp-email-code.ts b/package-shared/actions/users/validate-temp-email-code.ts index f24decb..fb72d21 100644 --- a/package-shared/actions/users/validate-temp-email-code.ts +++ b/package-shared/actions/users/validate-temp-email-code.ts @@ -44,6 +44,10 @@ export default async function validateTempEmailCode({ return null; } catch (error: any) { + global.ERROR_CALLBACK?.( + `Validate Temp Email Code Error`, + error as Error + ); console.log("validateTempEmailCode error:", error.message); return null; } diff --git a/package-shared/actions/users/validate-token.ts b/package-shared/actions/users/validate-token.ts index 3d330b6..f2c8e27 100644 --- a/package-shared/actions/users/validate-token.ts +++ b/package-shared/actions/users/validate-token.ts @@ -66,6 +66,7 @@ export default function validateToken({ */ return userObject; } catch (error) { + global.ERROR_CALLBACK?.(`Validate Token Error`, error as Error); /** * Return User Object * diff --git a/package-shared/functions/api/query/get.ts b/package-shared/functions/api/query/get.ts index d71c312..524a68c 100644 --- a/package-shared/functions/api/query/get.ts +++ b/package-shared/functions/api/query/get.ts @@ -101,6 +101,8 @@ export default async function apiGet< message: error.message, }); + global.ERROR_CALLBACK?.(`API Get Error`, error as Error); + if (debug && global.DSQL_USE_LOCAL) { console.log("apiGet:error", error.message); } diff --git a/package-shared/functions/api/query/post.ts b/package-shared/functions/api/query/post.ts index cf808fd..d850478 100644 --- a/package-shared/functions/api/query/post.ts +++ b/package-shared/functions/api/query/post.ts @@ -94,6 +94,8 @@ export default async function apiPost({ message: error.message, }); + global.ERROR_CALLBACK?.(`API Post Error`, error as Error); + return { success: false, payload: results, diff --git a/package-shared/functions/api/social-login/googleLogin.ts b/package-shared/functions/api/social-login/googleLogin.ts index 626e22a..f906f54 100644 --- a/package-shared/functions/api/social-login/googleLogin.ts +++ b/package-shared/functions/api/social-login/googleLogin.ts @@ -139,6 +139,8 @@ export default async function googleLogin({ message: error.message, }); + global.ERROR_CALLBACK?.(`Google Login Error`, error as Error); + loginFailureReason = error; isUserValid = false; diff --git a/package-shared/functions/api/social-login/handleSocialDb.ts b/package-shared/functions/api/social-login/handleSocialDb.ts index 8bc47b5..4eb4016 100644 --- a/package-shared/functions/api/social-login/handleSocialDb.ts +++ b/package-shared/functions/api/social-login/handleSocialDb.ts @@ -271,6 +271,8 @@ export default async function handleSocialDb({ error.message ); + global.ERROR_CALLBACK?.(`Handle Social DB Error`, error as Error); + return { success: false, payload: null, diff --git a/package-shared/functions/backend/addAdminUserOnLogin.ts b/package-shared/functions/backend/addAdminUserOnLogin.ts index 36f44e0..c9a9a20 100644 --- a/package-shared/functions/backend/addAdminUserOnLogin.ts +++ b/package-shared/functions/backend/addAdminUserOnLogin.ts @@ -132,6 +132,11 @@ export default async function addAdminUserOnLogin({ ); } } catch (error: any) { + global.ERROR_CALLBACK?.( + `Add Admin User On Login Error`, + error as Error + ); + serverError({ component: "addAdminUserOnLogin", message: error.message, diff --git a/package-shared/functions/backend/auth/write-auth-files.ts b/package-shared/functions/backend/auth/write-auth-files.ts index 00edcb4..4ade0da 100644 --- a/package-shared/functions/backend/auth/write-auth-files.ts +++ b/package-shared/functions/backend/auth/write-auth-files.ts @@ -22,6 +22,10 @@ export const initAuthFiles = () => { return true; } catch (error: any) { console.log(`Error initializing Auth Files: ${error.message}`); + global.ERROR_CALLBACK?.( + `Error Initializing Auth Files`, + error as Error + ); return false; } }; diff --git a/package-shared/functions/backend/db/addDbEntry.ts b/package-shared/functions/backend/db/addDbEntry.ts index a6e5bea..1a7bdfd 100644 --- a/package-shared/functions/backend/db/addDbEntry.ts +++ b/package-shared/functions/backend/db/addDbEntry.ts @@ -170,6 +170,7 @@ export default async function addDbEntry({ } } catch (error: any) { console.log("DSQL: Error in parsing data keys =>", error.message); + global.ERROR_CALLBACK?.(`Error parsing Data Keys`, error as Error); continue; } } diff --git a/package-shared/functions/backend/db/deleteDbEntry.ts b/package-shared/functions/backend/db/deleteDbEntry.ts index a79b0b2..29c7880 100644 --- a/package-shared/functions/backend/db/deleteDbEntry.ts +++ b/package-shared/functions/backend/db/deleteDbEntry.ts @@ -54,6 +54,7 @@ export default async function deleteDbEntry({ */ return deletedEntry; } catch (error) { + global.ERROR_CALLBACK?.(`Error Deleting Entry`, error as Error); return null; } } diff --git a/package-shared/functions/backend/dbHandler.ts b/package-shared/functions/backend/dbHandler.ts index 70bde29..1595e8a 100644 --- a/package-shared/functions/backend/dbHandler.ts +++ b/package-shared/functions/backend/dbHandler.ts @@ -49,6 +49,8 @@ export default async function dbHandler(...args: any[]) { results = null; + global.ERROR_CALLBACK?.(`DB Handler Error`, error as Error); + serverError({ component: "dbHandler", message: error.message, diff --git a/package-shared/functions/backend/fullAccessDbHandler.ts b/package-shared/functions/backend/fullAccessDbHandler.ts index 21aae91..21dd784 100644 --- a/package-shared/functions/backend/fullAccessDbHandler.ts +++ b/package-shared/functions/backend/fullAccessDbHandler.ts @@ -41,6 +41,8 @@ export default async function fullAccessDbHandler({ } catch (error: any) { //////////////////////////////////////// + global.ERROR_CALLBACK?.(`Full Access DB Handler Error`, error as Error); + serverError({ component: "fullAccessDbHandler", message: error.message, diff --git a/package-shared/functions/backend/grabUserSchemaData.ts b/package-shared/functions/backend/grabUserSchemaData.ts index 02dc5bb..84b7e61 100644 --- a/package-shared/functions/backend/grabUserSchemaData.ts +++ b/package-shared/functions/backend/grabUserSchemaData.ts @@ -26,6 +26,11 @@ export default function grabUserSchemaData({ message: error.message, }); + global.ERROR_CALLBACK?.( + `Error Grabbing User Schema Data`, + error as Error + ); + return null; } } diff --git a/package-shared/functions/backend/setUserSchemaData.ts b/package-shared/functions/backend/setUserSchemaData.ts index 9d1db28..fd52b4b 100644 --- a/package-shared/functions/backend/setUserSchemaData.ts +++ b/package-shared/functions/backend/setUserSchemaData.ts @@ -33,6 +33,8 @@ export default function setUserSchemaData({ message: error.message, }); + global.ERROR_CALLBACK?.(`Error Setting User Schema`, error as Error); + return false; } } diff --git a/package-shared/functions/backend/updateUsersTableSchema.ts b/package-shared/functions/backend/updateUsersTableSchema.ts index 78d0f35..66bde09 100644 --- a/package-shared/functions/backend/updateUsersTableSchema.ts +++ b/package-shared/functions/backend/updateUsersTableSchema.ts @@ -65,7 +65,10 @@ export default async function updateUsersTableSchema({ return `Done!`; } catch (error: any) { - console.log(`addUsersTableToDb.ts ERROR: ${error.message}`); + global.ERROR_CALLBACK?.( + `Error Updating User Table Schema`, + error as Error + ); serverError({ component: "addUsersTableToDb", diff --git a/package-shared/functions/backend/varDatabaseDbHandler.ts b/package-shared/functions/backend/varDatabaseDbHandler.ts index 59e44f9..df6e516 100644 --- a/package-shared/functions/backend/varDatabaseDbHandler.ts +++ b/package-shared/functions/backend/varDatabaseDbHandler.ts @@ -55,6 +55,9 @@ export default async function varDatabaseDbHandler({ database, error ); + + global.ERROR_CALLBACK?.(`VarDb Handler Error`, error as Error); + serverError({ component: "varDatabaseDbHandler/lines-52-53", message: error.message, diff --git a/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts b/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts index 4f80d39..8bb34ad 100644 --- a/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts +++ b/package-shared/functions/backend/varReadOnlyDatabaseDbHandler.ts @@ -34,6 +34,8 @@ export default async function varReadOnlyDatabaseDbHandler({ noMail: true, }); + global.ERROR_CALLBACK?.(`VarReadOnlyDB Handler Error`, error as Error); + return error.message; } finally { DB_CONN?.end(); diff --git a/package-shared/functions/dsql/decrypt.ts b/package-shared/functions/dsql/decrypt.ts index f3ac739..a47888c 100644 --- a/package-shared/functions/dsql/decrypt.ts +++ b/package-shared/functions/dsql/decrypt.ts @@ -52,6 +52,7 @@ export default function decrypt({ return decrypted; } catch (error: any) { console.log("Error in decrypting =>", error.message); + global.ERROR_CALLBACK?.(`Error Decrypting data`, error as Error); return encryptedString; } } diff --git a/package-shared/functions/dsql/encrypt.ts b/package-shared/functions/dsql/encrypt.ts index be09530..7ba6699 100644 --- a/package-shared/functions/dsql/encrypt.ts +++ b/package-shared/functions/dsql/encrypt.ts @@ -53,6 +53,7 @@ export default function encrypt({ return encrypted; } catch (error: any) { console.log("Error in encrypting =>", error.message); + global.ERROR_CALLBACK?.(`Error Encrypting Data`, error as Error); return data; } } diff --git a/package-shared/shell/checkDb.ts b/package-shared/shell/checkDb.ts index aa7aefc..06a255a 100644 --- a/package-shared/shell/checkDb.ts +++ b/package-shared/shell/checkDb.ts @@ -23,6 +23,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; console.log("Connection Query Success =>", result); } catch (error: any) { console.log("Connection query ERROR =>", error.message); + global.ERROR_CALLBACK?.(`Error Checking DB`, error as Error); } finally { CONNECTION?.end(); process.exit(); diff --git a/package-shared/shell/createDbFromSchema/check-db-record.ts b/package-shared/shell/createDbFromSchema/check-db-record.ts index fb15c60..c428ba3 100644 --- a/package-shared/shell/createDbFromSchema/check-db-record.ts +++ b/package-shared/shell/createDbFromSchema/check-db-record.ts @@ -67,6 +67,10 @@ export default async function checkDbRecordCreateDbSchema({ return recordedDbEntry; } catch (error) { + global.ERROR_CALLBACK?.( + `Error Checking DB Record on Creating Schema`, + error as Error + ); return undefined; } } diff --git a/package-shared/shell/createDbFromSchema/check-table-record.ts b/package-shared/shell/createDbFromSchema/check-table-record.ts index a4c0e85..233f431 100644 --- a/package-shared/shell/createDbFromSchema/check-table-record.ts +++ b/package-shared/shell/createDbFromSchema/check-table-record.ts @@ -110,6 +110,10 @@ export default async function checkTableRecordCreateDbSchema({ return recordedTableEntry; } catch (error) { + global.ERROR_CALLBACK?.( + `Error Checking Table Record on Creating Schema`, + error as Error + ); return undefined; } } diff --git a/package-shared/shell/createDbFromSchema/handle-indexes.ts b/package-shared/shell/createDbFromSchema/handle-indexes.ts index 1beb810..7f9f0a5 100644 --- a/package-shared/shell/createDbFromSchema/handle-indexes.ts +++ b/package-shared/shell/createDbFromSchema/handle-indexes.ts @@ -42,6 +42,11 @@ export default async function handleIndexescreateDbFromSchema({ if (!existingKeyInDb[0]) throw new Error("This Index Does not Exist"); } catch (error) { + global.ERROR_CALLBACK?.( + `Error Handling Indexes on Creating Schema`, + error as Error + ); + /** * @description Create new index if determined that it * doesn't exist in MYSQL db diff --git a/package-shared/shell/mariadb-users/refreshUsersAndGrants.ts b/package-shared/shell/mariadb-users/refreshUsersAndGrants.ts index 8e29dc9..cea0d4d 100644 --- a/package-shared/shell/mariadb-users/refreshUsersAndGrants.ts +++ b/package-shared/shell/mariadb-users/refreshUsersAndGrants.ts @@ -250,7 +250,10 @@ export default async function refreshUsersAndGrants({ } } } catch (error: any) { - console.log(`Error in adding SQL user =>`, error.message); + global.ERROR_CALLBACK?.( + `Error Refreshing MariaDB Users and Grants`, + error as Error + ); } } } diff --git a/package-shared/shell/mariadb-users/resetSQLPasswords.ts b/package-shared/shell/mariadb-users/resetSQLPasswords.ts index 65bbbe1..86e4896 100644 --- a/package-shared/shell/mariadb-users/resetSQLPasswords.ts +++ b/package-shared/shell/mariadb-users/resetSQLPasswords.ts @@ -59,9 +59,9 @@ async function resetSQLCredentialsPasswords() { ); } } catch (error: any) { - console.log( - `Error Updating User ${user.id} Password =>`, - error.message + global.ERROR_CALLBACK?.( + `Error Resetting MariaDB User Password`, + error as Error ); } } diff --git a/package-shared/shell/mariadb-users/users/create-user.ts b/package-shared/shell/mariadb-users/users/create-user.ts index 89f3293..414bd72 100644 --- a/package-shared/shell/mariadb-users/users/create-user.ts +++ b/package-shared/shell/mariadb-users/users/create-user.ts @@ -168,7 +168,7 @@ async function createUser() { return true; } catch (error: any) { - console.log(`Error in creating user => ${error.message}`); + global.ERROR_CALLBACK?.(`Error Creating User`, error as Error); return false; } } diff --git a/package-shared/shell/mariadb-users/users/update-user.ts b/package-shared/shell/mariadb-users/users/update-user.ts index c75c927..dc4dc0e 100644 --- a/package-shared/shell/mariadb-users/users/update-user.ts +++ b/package-shared/shell/mariadb-users/users/update-user.ts @@ -56,7 +56,7 @@ async function createUser() { return true; } catch (error: any) { - console.log(`Error in creating user => ${error.message}`); + global.ERROR_CALLBACK?.(`Error Updating User`, error as Error); return false; } } diff --git a/package-shared/shell/resetSQLCredentials.ts b/package-shared/shell/resetSQLCredentials.ts index e449077..c4fc665 100644 --- a/package-shared/shell/resetSQLCredentials.ts +++ b/package-shared/shell/resetSQLCredentials.ts @@ -66,6 +66,10 @@ async function resetSQLCredentials() { `User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.` ); } catch (error: any) { + global.ERROR_CALLBACK?.( + `Error Resetting SQL credentials`, + error as Error + ); console.log(`Error in adding SQL user =>`, error.message); } } diff --git a/package-shared/shell/resetSQLCredentialsPasswords.ts b/package-shared/shell/resetSQLCredentialsPasswords.ts index 700b6f6..87deada 100644 --- a/package-shared/shell/resetSQLCredentialsPasswords.ts +++ b/package-shared/shell/resetSQLCredentialsPasswords.ts @@ -47,9 +47,9 @@ async function resetSQLCredentialsPasswords() { `User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.` ); } catch (error: any) { - console.log( - `Error Updating User ${user.id} Password =>`, - error.message + global.ERROR_CALLBACK?.( + `Error Updating MariaDB User`, + error as Error ); } } diff --git a/package-shared/shell/setSQLCredentials.ts b/package-shared/shell/setSQLCredentials.ts index e5d61a9..667707c 100644 --- a/package-shared/shell/setSQLCredentials.ts +++ b/package-shared/shell/setSQLCredentials.ts @@ -60,7 +60,10 @@ async function setSQLCredentials() { `User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.` ); } catch (error: any) { - console.log(`Error in adding SQL user =>`, error.message); + global.ERROR_CALLBACK?.( + `Error Setting SQL credentials`, + error as Error + ); } } } diff --git a/package-shared/shell/test-external-server.ts b/package-shared/shell/test-external-server.ts index 66efa8a..b1e69f6 100644 --- a/package-shared/shell/test-external-server.ts +++ b/package-shared/shell/test-external-server.ts @@ -27,7 +27,10 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; console.log("parsedResults =>", parsedResults); } catch (error: any) { - console.log("Connection query ERROR =>", error.message); + global.ERROR_CALLBACK?.( + `Error Testing External Server`, + error as Error + ); } finally { CONNECTION?.end(); process.exit(); diff --git a/package-shared/shell/testSQLEscape.ts b/package-shared/shell/testSQLEscape.ts index 174806f..d2e9bc0 100644 --- a/package-shared/shell/testSQLEscape.ts +++ b/package-shared/shell/testSQLEscape.ts @@ -75,7 +75,7 @@ export default async function testSQLEscape() { `User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.` ); } catch (error: any) { - console.log(`Error in adding SQL user =>`, error.message); + global.ERROR_CALLBACK?.(`Error Testing SQL Escape`, error as Error); } } diff --git a/package-shared/shell/updateChildrenTablesOnDb.ts b/package-shared/shell/updateChildrenTablesOnDb.ts index b859230..5cd61cf 100644 --- a/package-shared/shell/updateChildrenTablesOnDb.ts +++ b/package-shared/shell/updateChildrenTablesOnDb.ts @@ -45,7 +45,10 @@ async function updateChildrenTablesOnDb() { } } } catch (error) { - console.log(error); + global.ERROR_CALLBACK?.( + `Error Updating Children Tables on DB`, + error as Error + ); } process.exit(); diff --git a/package-shared/shell/updateDbSlugsForTableRecords.ts b/package-shared/shell/updateDbSlugsForTableRecords.ts index 4e8217f..35043d8 100644 --- a/package-shared/shell/updateDbSlugsForTableRecords.ts +++ b/package-shared/shell/updateDbSlugsForTableRecords.ts @@ -42,6 +42,11 @@ varDatabaseDbHandler({ message: error.message, user: {}, }); + + global.ERROR_CALLBACK?.( + `Error Updating DB Slugs For Table Records`, + error as Error + ); } } diff --git a/package-shared/shell/updateSSLUsers.ts b/package-shared/shell/updateSSLUsers.ts index c137a23..8c842d6 100644 --- a/package-shared/shell/updateSSLUsers.ts +++ b/package-shared/shell/updateSSLUsers.ts @@ -46,7 +46,7 @@ import grabDSQLConnection from "../utils/grab-dsql-connection"; console.log(`addUserSSL => ${User}@${Host}`, addUserSSL); } } catch (error: any) { - console.log("Connection query ERROR =>", error.message); + global.ERROR_CALLBACK?.(`Error Updating SSL Users`, error as Error); } finally { CONNECTION.end(); process.exit(); diff --git a/package-shared/shell/utils/dbHandler.ts b/package-shared/shell/utils/dbHandler.ts index 5f61f5a..0721d40 100644 --- a/package-shared/shell/utils/dbHandler.ts +++ b/package-shared/shell/utils/dbHandler.ts @@ -26,6 +26,8 @@ export default async function dbHandler({ results = await CONNECTION.query(query); } } catch (error: any) { + global.ERROR_CALLBACK?.(`DB Handler Error...`, error as Error); + if (process.env.FIRST_RUN) { return null; } diff --git a/package-shared/shell/utils/noDatabaseDbHandler.ts b/package-shared/shell/utils/noDatabaseDbHandler.ts index d7d971f..e47d71b 100644 --- a/package-shared/shell/utils/noDatabaseDbHandler.ts +++ b/package-shared/shell/utils/noDatabaseDbHandler.ts @@ -8,7 +8,7 @@ export default async function noDatabaseDbHandler( try { results = await dbHandler({ query: queryString }); } catch (error: any) { - console.log("ERROR in noDatabaseDbHandler =>", error.message); + global.ERROR_CALLBACK?.(`No DB Handler Error`, error as Error); } if (results) { diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index ef9897e..5c6f881 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1523,3 +1523,5 @@ export type DsqlCrudParam< sanitize?: (data?: T) => T; debug?: boolean; }; + +export type ErrorCallback = (title: string, error: Error) => void; diff --git a/package-shared/utils/backend/global-db/DB_HANDLER.ts b/package-shared/utils/backend/global-db/DB_HANDLER.ts index 6a63710..b04ad06 100644 --- a/package-shared/utils/backend/global-db/DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/DB_HANDLER.ts @@ -15,7 +15,7 @@ export default async function DB_HANDLER(...args: any[]) { return JSON.parse(JSON.stringify(results)); } catch (error: any) { - console.log("DB Error =>", error); + global.ERROR_CALLBACK?.(`DB_HANDLER Error`, error as Error); return { success: false, error: error.message, diff --git a/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts b/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts index 54ab5f8..12ed52e 100644 --- a/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/DSQL_USER_DB_HANDLER.ts @@ -23,7 +23,7 @@ export default async function DSQL_USER_DB_HANDLER({ try { return await connDbHandler(CONNECTION, queryString, queryValues); } catch (error: any) { - console.log(`DSQL_USER_DB_HANDLER Error: ${error.message}`); + global.ERROR_CALLBACK?.(`DSQL_USER_DB_HANDLER Error`, error as Error); return null; } finally { CONNECTION?.end(); diff --git a/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts b/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts index 983620c..31bc14b 100644 --- a/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/LOCAL_DB_HANDLER.ts @@ -11,7 +11,7 @@ export default async function LOCAL_DB_HANDLER(...args: any[]) { return JSON.parse(JSON.stringify(results)); } catch (error: any) { - console.log("DB Error =>", error.message); + global.ERROR_CALLBACK?.(`LOCAL_DB_HANDLER Error`, error as Error); return { success: false, error: error.message, diff --git a/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts b/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts index 020a539..941299a 100644 --- a/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/NO_DB_HANDLER.ts @@ -24,6 +24,7 @@ export default function NO_DB_HANDLER(...args: any[]) { }); }); } catch (error: any) { + global.ERROR_CALLBACK?.(`NO_DB_HANDLER Error`, error as Error); return { success: false, error: error.message, diff --git a/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts b/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts index 1103078..ff153a9 100644 --- a/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts +++ b/package-shared/utils/backend/global-db/ROOT_DB_HANDLER.ts @@ -22,6 +22,7 @@ export default function ROOT_DB_HANDLER(...args: any[]) { }); }); } catch (error: any) { + global.ERROR_CALLBACK?.(`ROOT_DB_HANDLER Error`, error as Error); return { success: false, error: error.message, diff --git a/package-shared/utils/backend/parseCookies.ts b/package-shared/utils/backend/parseCookies.ts index 71f3602..37392b2 100644 --- a/package-shared/utils/backend/parseCookies.ts +++ b/package-shared/utils/backend/parseCookies.ts @@ -45,8 +45,7 @@ export default function parseCookies({ return cookieObject; } catch (error: any) { - console.log(`ERROR parsing cookies: ${error.message}`); - + global.ERROR_CALLBACK?.(`Parse Cookies Error`, error as Error); return {}; } } diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts index 95f21da..236e50f 100644 --- a/package-shared/utils/data-fetching/method-crud.ts +++ b/package-shared/utils/data-fetching/method-crud.ts @@ -210,6 +210,7 @@ export default async function dsqlMethodCrud< } return result; } catch (error) { + global.ERROR_CALLBACK?.(`Method Crud Error`, error as Error); return result; } } diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index a2f2c47..aedfb88 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -45,7 +45,10 @@ export default async function connDbHandler( ); resArray.push(JSON.parse(JSON.stringify(queryObjRes))); } catch (error: any) { - console.log(`connDbHandler Query Error: ${error.message}`); + global.ERROR_CALLBACK?.( + `Connection DB Handler Query Error`, + error as Error + ); resArray.push(null); } } @@ -55,8 +58,7 @@ export default async function connDbHandler( return null; } } catch (error: any) { - console.log(`connDbHandler Error: ${error.message}`); - console.log(conn?.config()); + global.ERROR_CALLBACK?.(`Connection DB Handler Error`, error as Error); return null; } finally { conn?.end(); diff --git a/package.json b/package.json index 1918c11..69d2e2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.1.5", + "version": "4.1.6", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {