From b4ac02f9ec0f82bb2091feeb43c3e09a3cf0aae9 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:39:45 -0600 Subject: [PATCH] Remove all async/await stuff --- scripts/server/account.js | 26 ++++++++-------- scripts/server/chat.js | 2 +- scripts/server/command.js | 16 +++++++--- scripts/server/config.js | 2 +- scripts/server/developer.js | 6 ++-- scripts/server/email.js | 32 +++++++++---------- scripts/server/event.js | 6 ++-- scripts/server/job.js | 10 +++--- scripts/server/locale.js | 50 +++++++++++++++--------------- scripts/server/native/connected.js | 8 ++--- scripts/server/native/ragemp.js | 10 +++--- scripts/server/startup.js | 4 +-- scripts/shared/utilities.js | 22 ++++++------- 13 files changed, 100 insertions(+), 94 deletions(-) diff --git a/scripts/server/account.js b/scripts/server/account.js index 936d14e6..180803a1 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -802,7 +802,7 @@ function getAccountHashingFunction() { // =========================================================================== -async function isNameRegistered(name) { +function isNameRegistered(name) { let accountData = loadAccountFromName(name, true); if (accountData.databaseId > 0) { return true; @@ -1732,34 +1732,34 @@ function generateEmailVerificationCode() { // =========================================================================== -async function sendEmailVerificationEmail(client, emailVerificationCode) { +function sendEmailVerificationEmail(client, emailVerificationCode) { let emailBodyText = getEmailConfig().bodyContent.confirmEmail; emailBodyText = emailBodyText.replace("{VERIFICATIONCODE}", emailVerificationCode); emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); - await sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Confirm email on ${getServerName()}`, emailBodyText); + sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Confirm email on ${getServerName()}`, emailBodyText); } // =========================================================================== -async function sendPasswordResetEmail(client, verificationCode) { +function sendPasswordResetEmail(client, verificationCode) { let emailBodyText = getEmailConfig().bodyContent.confirmPasswordReset; emailBodyText = emailBodyText.replace("{VERIFICATIONCODE}", verificationCode); emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); - await sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Reset your password on ${getServerName()}`, emailBodyText); + sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Reset your password on ${getServerName()}`, emailBodyText); } // =========================================================================== -async function verifyAccountEmail(accountData, verificationCode) { +function verifyAccountEmail(accountData, verificationCode) { let emailVerificationCode = generateRandomString(10); let emailBodyText = getEmailConfig().bodyContent.confirmEmail; emailBodyText = emailBodyText.replace("{VERIFICATIONCODE}", emailVerificationCode); emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); - await sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Confirm email on ${getServerName()}`, emailBodyText); + sendEmail(getPlayerData(client).accountData.emailAddress, getPlayerData(client).accountData.name, `Confirm email on ${getServerName()}`, emailBodyText); getPlayerData(client).accountData.emailAddress = emailAddress; getPlayerData(client).accountData.emailVerificationCode = module.hashing.sha512(emailVerificationCode); @@ -1767,7 +1767,7 @@ async function verifyAccountEmail(accountData, verificationCode) { // =========================================================================== -async function sendAccountLoginFailedNotification(emailAddress, name, ip, game = getGame()) { +function sendAccountLoginFailedNotification(emailAddress, name, ip, game = getGame()) { let countryName = module.geoip.getCountryName(getGlobalConfig().geoIPCountryDatabaseFilePath, ip); let subDivisionName = module.geoip.getSubdivisionName(getGlobalConfig().geoIPCityDatabaseFilePath, ip); let cityName = module.geoip.getCityName(getGlobalConfig().geoIPCityDatabaseFilePath, ip); @@ -1779,13 +1779,13 @@ async function sendAccountLoginFailedNotification(emailAddress, name, ip, game = emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); emailBodyText = emailBodyText.replace("{TIMESTAMP}", new Date().toLocaleString('en-US')); - await sendEmail(emailAddress, name, `Login failed on ${getServerName()}`, emailBodyText); + sendEmail(emailAddress, name, `Login failed on ${getServerName()}`, emailBodyText); return true; } // =========================================================================== -async function sendAccountLoginSuccessNotification(emailAddress, name, ip, game = getGame()) { +function sendAccountLoginSuccessNotification(emailAddress, name, ip, game = getGame()) { let countryName = module.geoip.getCountryName(getGlobalConfig().geoIPCountryDatabaseFilePath, ip); let subDivisionName = module.geoip.getSubdivisionName(getGlobalConfig().geoIPCityDatabaseFilePath, ip); let cityName = module.geoip.getCityName(getGlobalConfig().geoIPCityDatabaseFilePath, ip); @@ -1797,7 +1797,7 @@ async function sendAccountLoginSuccessNotification(emailAddress, name, ip, game emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); emailBodyText = emailBodyText.replace("{TIMESTAMP}", new Date().toLocaleString('en-US')); - await sendEmail(emailAddress, name, `Login successful on ${getServerName()}`, emailBodyText); + sendEmail(emailAddress, name, `Login successful on ${getServerName()}`, emailBodyText); return true; } @@ -1843,13 +1843,13 @@ function isPlayerATester(client) { // =========================================================================== -async function sendAccountTwoFactorAuthCode(emailAddress, name, twoFactorAuthCode) { +function sendAccountTwoFactorAuthCode(emailAddress, name, twoFactorAuthCode) { let emailBodyText = getEmailConfig().bodyContent.twoFactorAuthentication; emailBodyText = emailBodyText.replace("{2FACODE}", twoFactorAuthCode); emailBodyText = emailBodyText.replace("{GAMENAME}", getGameName(getGame())); emailBodyText = emailBodyText.replace("{SERVERNAME}", getServerName()); - await sendEmail(emailAddress, name, `Login code for ${getServerName()}`, emailBodyText); + sendEmail(emailAddress, name, `Login code for ${getServerName()}`, emailBodyText); return true; } diff --git a/scripts/server/chat.js b/scripts/server/chat.js index cb2aff40..dd1b40ee 100644 --- a/scripts/server/chat.js +++ b/scripts/server/chat.js @@ -68,7 +68,7 @@ function processPlayerChat(client, messageText) { let clients = getClients(); for(let i in clients) { let translatedText; - translatedText = await translateMessage(messageText, getPlayerData(client).locale, getPlayerData(clients[i]).locale); + translatedText = translateMessage(messageText, getPlayerData(client).locale, getPlayerData(clients[i]).locale); let original = (getPlayerData(client).locale == getPlayerData(clients[i]).locale) ? `` : ` {ALTCOLOUR}(${messageText})`; messagePlayerNormal(clients[i], `💬 ${getCharacterFullName(client)}: [#FFFFFF]${translatedText}${original}`, clients[i], getColourByName("mediumGrey")); diff --git a/scripts/server/command.js b/scripts/server/command.js index 67e6bc24..040419ac 100644 --- a/scripts/server/command.js +++ b/scripts/server/command.js @@ -884,11 +884,11 @@ function processPlayerCommand(command, params, client) { return true; } - let possibleAlias = getPlayerAliasForCommand(command); - if (possibleAlias) { - // Just change to the command the alias is for, then continue as normal - command = possibleAlias.forCommand; - } + //let possibleAlias = getPlayerAliasForCommand(client, command); + //if (possibleAlias) { + // // Just change to the command the alias is for, then continue as normal + // command = possibleAlias.forCommand; + //} let commandData = getCommand(toLowerCase(command)); @@ -1097,4 +1097,10 @@ function getCommandFromParams(params) { return false; } +// =========================================================================== + +function getPlayerAliasForCommand(client, command) { + return command; +} + // =========================================================================== \ No newline at end of file diff --git a/scripts/server/config.js b/scripts/server/config.js index 81c3d1a3..3d3627f2 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -897,7 +897,7 @@ function setServerRealWorldTimeZoneCommand(command, params, client) { * @return {bool} Whether or not the command was successful * */ -async function reloadServerConfigurationCommand(command, params, client) { +function reloadServerConfigurationCommand(command, params, client) { serverConfig = loadServerConfigFromGameAndPort(server.game, server.port); applyConfigToServer(serverConfig); updateServerRules(); diff --git a/scripts/server/developer.js b/scripts/server/developer.js index b4cee546..c6c2b7c6 100644 --- a/scripts/server/developer.js +++ b/scripts/server/developer.js @@ -448,7 +448,7 @@ function saveServerDataCommand(command, params, client) { // =========================================================================== -async function testEmailCommand(command, params, client) { +function testEmailCommand(command, params, client) { sendEmail(params, "Player", "Test email", "Just testing the email system for the server!"); return true; @@ -548,7 +548,7 @@ function isDevelopmentServer() { // =========================================================================== -async function migrateSubAccountsToPerServerData() { +function migrateSubAccountsToPerServerData() { let dbConnection = connectToDatabase(); let dbAssoc = []; @@ -569,7 +569,7 @@ async function migrateSubAccountsToPerServerData() { // =========================================================================== -async function resetAllAccountsHotkeysToDefault() { +function resetAllAccountsHotkeysToDefault() { let dbConnection = connectToDatabase(); let dbAssoc = []; diff --git a/scripts/server/email.js b/scripts/server/email.js index 1e4b0121..13b13b8d 100644 --- a/scripts/server/email.js +++ b/scripts/server/email.js @@ -21,28 +21,28 @@ function initEmailScript() { // =========================================================================== -async function sendEmail(toEmail, toName, subject, body) { +function sendEmail(toEmail, toName, subject, body) { switch (getEmailConfig().method) { case V_EMAIL_METHOD_SMTP_MODULE: if (!checkForSMTPModule()) { return false; } - Promise.resolve().then(() => { - module.smtp.send( - getEmailConfig().smtp.host, - getEmailConfig().smtp.port, - intToBool(getEmailConfig().smtp.useTLS), - getEmailConfig().smtp.username, - getEmailConfig().smtp.password, - toEmail, - toName, - subject, - body, - getEmailConfig().smtp.from, - getEmailConfig().smtp.fromName - ); - }); + //Promise.resolve().then(() => { + module.smtp.send( + getEmailConfig().smtp.host, + getEmailConfig().smtp.port, + intToBool(getEmailConfig().smtp.useTLS), + getEmailConfig().smtp.username, + getEmailConfig().smtp.password, + toEmail, + toName, + subject, + body, + getEmailConfig().smtp.from, + getEmailConfig().smtp.fromName + ); + //}); break; case V_EMAIL_METHOD_GET_REQUEST: diff --git a/scripts/server/event.js b/scripts/server/event.js index 68fab98b..a8615ee4 100644 --- a/scripts/server/event.js +++ b/scripts/server/event.js @@ -148,7 +148,7 @@ function onPlayerQuit(event, client, quitReasonId) { // =========================================================================== -async function onPlayerChat(event, client, messageText) { +function onPlayerChat(event, client, messageText) { event.preventDefault(); processPlayerChat(client, messageText); } @@ -451,7 +451,7 @@ function onPedSpawn(ped) { // =========================================================================== -async function onPlayerSpawn(client) { +function onPlayerSpawn(client) { logToConsole(LOG_WARN | LOG_DEBUG, `[V.RP.Event] Player ${getPlayerDisplayForConsole(client)} spawned!`); //logToConsole(LOG_DEBUG, `[V.RP.Event] Checking for ${getPlayerDisplayForConsole(client)}'s player ped`); //if(getPlayerPed(client) == null) { @@ -462,7 +462,7 @@ async function onPlayerSpawn(client) { //logToConsole(LOG_DEBUG, `[V.RP.Event] ${getPlayerDisplayForConsole(client)}'s player ped is valid. Continuing spawn processing ...`); if (areServerElementsSupported()) { - await waitUntil(() => client != null && getPlayerPed(client) != null); + waitUntil(() => client != null && getPlayerPed(client) != null); } stopRadioStreamForPlayer(client); diff --git a/scripts/server/job.js b/scripts/server/job.js index 9f372865..a9d4fbe8 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -1553,11 +1553,11 @@ function reloadAllJobsCommand(command, params, client) { deleteAllJobPickups(); clearArray(getServerData().jobs); - Promise.resolve().then(() => { - getServerData().jobs = loadJobsFromDatabase(); - spawnAllJobPickups(); - spawnAllJobBlips(); - }); + //Promise.resolve().then(() => { + getServerData().jobs = loadJobsFromDatabase(); + spawnAllJobPickups(); + spawnAllJobBlips(); + //}); announceAdminAction("AllJobsReloaded"); } diff --git a/scripts/server/locale.js b/scripts/server/locale.js index 8e010769..c4e11c67 100644 --- a/scripts/server/locale.js +++ b/scripts/server/locale.js @@ -264,34 +264,34 @@ function reloadLocaleConfigurationCommand(command, params, client) { // =========================================================================== -async function translateMessage(messageText, translateFrom = getGlobalConfig().locale.defaultLanguageId, translateTo = getGlobalConfig().locale.defaultLanguageId) { - return new Promise(resolve => { - if (translateFrom == translateTo) { - resolve(messageText); - } +function translateMessage(messageText, translateFrom = getGlobalConfig().locale.defaultLanguageId, translateTo = getGlobalConfig().locale.defaultLanguageId) { + //return new Promise(resolve => { + if (translateFrom == translateTo) { + resolve(messageText); + } - for (let i in cachedTranslations[translateFrom][translateTo]) { - if (cachedTranslations[translateFrom][translateTo][i][0] == messageText) { - logToConsole(LOG_DEBUG, `[Translate]: Using existing translation for ${getGlobalConfig().locale.locales[translateFrom].englishName} to ${getGlobalConfig().locale.locales[translateTo].englishName} - (${messageText}), (${cachedTranslations[translateFrom][translateTo][i][1]})`); - resolve(cachedTranslations[translateFrom][translateTo][i][1]); - return true; - } + for (let i in cachedTranslations[translateFrom][translateTo]) { + if (cachedTranslations[translateFrom][translateTo][i][0] == messageText) { + logToConsole(LOG_DEBUG, `[Translate]: Using existing translation for ${getGlobalConfig().locale.locales[translateFrom].englishName} to ${getGlobalConfig().locale.locales[translateTo].englishName} - (${messageText}), (${cachedTranslations[translateFrom][translateTo][i][1]})`); + resolve(cachedTranslations[translateFrom][translateTo][i][1]); + return true; } + } - let thisTranslationURL = getGlobalConfig().locale.translateURL.format(encodeURIComponent(messageText), toUpperCase(getGlobalConfig().locale.locales[translateFrom].isoCode), toUpperCase(getGlobalConfig().locale.locales[translateTo].isoCode), getGlobalConfig().locale.apiEmail); - httpGet( - thisTranslationURL, - "", - function (data) { - data = ArrayBufferToString(data); - let translationData = JSON.parse(data); - cachedTranslations[translateFrom][translateTo].push([messageText, translationData.responseData.translatedText]); - resolve(translationData.responseData.translatedText); - }, - function (data) { - } - ); - }); + let thisTranslationURL = getGlobalConfig().locale.translateURL.format(encodeURIComponent(messageText), toUpperCase(getGlobalConfig().locale.locales[translateFrom].isoCode), toUpperCase(getGlobalConfig().locale.locales[translateTo].isoCode), getGlobalConfig().locale.apiEmail); + httpGet( + thisTranslationURL, + "", + function (data) { + data = ArrayBufferToString(data); + let translationData = JSON.parse(data); + cachedTranslations[translateFrom][translateTo].push([messageText, translationData.responseData.translatedText]); + resolve(translationData.responseData.translatedText); + }, + function (data) { + } + ); + //}); } // =========================================================================== diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index 7014ea28..b2a85077 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -876,10 +876,10 @@ function disconnectFromDatabase(dbConnection, force = false) { function queryDatabase(dbConnection, queryString, useThread = false) { logToConsole(LOG_DEBUG, `[V.RP.Database] Query string: ${queryString}`); if (useThread == true) { - Promise.resolve().then(() => { - let queryResult = dbConnection.query(queryString); - return queryResult; - }); + //Promise.resolve().then(() => { + let queryResult = dbConnection.query(queryString); + return queryResult; + //}); } else { return dbConnection.query(queryString); } diff --git a/scripts/server/native/ragemp.js b/scripts/server/native/ragemp.js index 8faa0621..dbe3610d 100644 --- a/scripts/server/native/ragemp.js +++ b/scripts/server/native/ragemp.js @@ -806,10 +806,10 @@ function disconnectFromDatabase(dbConnection) { function queryDatabase(dbConnection, queryString, useThread = false) { logToConsole(LOG_DEBUG, `[V.RP.Database] Query string: ${queryString}`); if (useThread == true) { - Promise.resolve().then(() => { - let queryResult = dbConnection.query(queryString); - return queryResult; - }); + //Promise.resolve().then(() => { + let queryResult = dbConnection.query(queryString); + return queryResult; + //}); } else { return dbConnection.query(queryString); } @@ -857,7 +857,7 @@ function freeDatabaseQuery(dbQuery) { // =========================================================================== -async function fetchQueryAssoc(dbConnection, queryString) { +function fetchQueryAssoc(dbConnection, queryString) { return dbConnection.query(queryString, function (err, result, fields) { return result; }); diff --git a/scripts/server/startup.js b/scripts/server/startup.js index 88a4b157..f55def0d 100644 --- a/scripts/server/startup.js +++ b/scripts/server/startup.js @@ -7,7 +7,7 @@ // TYPE: Server (JavaScript) // =========================================================================== -async function initServerScripts() { +function initServerScripts() { checkForAllRequiredModules(); initDatabaseScript(); @@ -41,7 +41,7 @@ async function initServerScripts() { // Load config and stuff loadGlobalConfig(); - await loadServerConfig(); + loadServerConfig(); applyConfigToServer(getServerConfig()); // Load all the server data diff --git a/scripts/shared/utilities.js b/scripts/shared/utilities.js index 5d4ff5ac..bf261484 100644 --- a/scripts/shared/utilities.js +++ b/scripts/shared/utilities.js @@ -2311,17 +2311,17 @@ function removeSlashesFromString(str) { // =========================================================================== -async function waitUntil(condition) { - return new Promise((resolve) => { - let interval = setInterval(() => { - if (!condition()) { - return; - } - - clearInterval(interval); - resolve(); - }, 1); - }); +function waitUntil(condition) { + //return new Promise((resolve) => { + // let interval = setInterval(() => { + // if (!condition()) { + // return; + // } + // + // clearInterval(interval); + // resolve(); + // }, 1); + //}); } // ===========================================================================