From 44e56449e36dd0bc34eb573e67c06ff47e290369 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 19 May 2022 18:55:19 -0500 Subject: [PATCH] Move event stuff to native --- scripts/server/event.js | 44 ++------- scripts/server/native/connected.js | 141 +++++++++-------------------- 2 files changed, 52 insertions(+), 133 deletions(-) diff --git a/scripts/server/event.js b/scripts/server/event.js index 38f57708..4fdb6f57 100644 --- a/scripts/server/event.js +++ b/scripts/server/event.js @@ -15,35 +15,7 @@ function initEventScript() { // =========================================================================== -function addAllEventHandlers() { - addEventHandler("onResourceStart", onResourceStart); - addEventHandler("onResourceStop", onResourceStop); - addEventHandler("onServerStop", onResourceStop); - - addEventHandler("onProcess", onProcess); - addEventHandler("onEntityProcess", onEntityProcess); - - addEventHandler("onPlayerConnect", onPlayerConnect); - addEventHandler("onPlayerJoin", onPlayerJoin); - addEventHandler("onPlayerJoined", onPlayerJoined); - addEventHandler("onPlayerChat", onPlayerChat); - addEventHandler("onPlayerQuit", onPlayerQuit); - addEventHandler("onElementStreamIn", onElementStreamIn); - addEventHandler("onElementStreamOut", onElementStreamOut); - - addEventHandler("onPedSpawn", onPedSpawn); - addEventHandler("onPedEnterVehicle", onPedEnteringVehicle); - addEventHandler("onPedExitVehicle", onPedExitingVehicle); - - addEventHandler("onPedEnteringVehicle", onPedEnteringVehicle); - addEventHandler("onPedExitingVehicle", onPedExitingVehicle); - - //addEventHandler("OnPlayerCommand", onPlayerCommand); -} - -// =========================================================================== - -function onPlayerConnect(event, ipAddress, port) { +function onInitialConnectionToServer(ipAddress, port) { logToConsole(LOG_INFO, `[VRR.Event] Client connecting (IP: ${ipAddress})`); //if(isIpAddressBanned(ipAddress)) { // messagePlayerError(client, "You are banned from this server!"); @@ -53,7 +25,7 @@ function onPlayerConnect(event, ipAddress, port) { // =========================================================================== -function onPlayerJoin(event, client) { +function onPlayerJoin(client) { logToConsole(LOG_INFO, `[VRR.Event] Client ${getPlayerName(client)}[${getPlayerId(client)}] joining from ${getPlayerIP(client)}`); if(isFadeCameraSupported()) { @@ -73,13 +45,13 @@ function onPlayerJoin(event, client) { // =========================================================================== -function onPlayerJoined(event, client) { +function onPlayerJoined(client) { } // =========================================================================== -function onElementStreamIn(event, element, client) { +function onElementStreamIn(element, client) { //if(getPlayerDimension(client) != getElementDimension(element)) { // event.preventDefault(); //} @@ -94,13 +66,13 @@ function onElementStreamIn(event, element, client) { // =========================================================================== -function onElementStreamOut(event, element, client) { +function onElementStreamOut(element, client) { } // =========================================================================== -function onPlayerQuit(event, client, quitReasonId) { +function onPlayerQuit(client, quitReasonId) { logToConsole(LOG_INFO, `👋 Client ${getPlayerDisplayForConsole(client)} disconnected (${disconnectReasons[quitReasonId]}[${quitReasonId}])`); updateConnectionLogOnQuit(client, quitReasonId); @@ -129,14 +101,14 @@ function onPlayerQuit(event, client, quitReasonId) { // =========================================================================== -async function onPlayerChat(event, client, messageText) { +async function onPlayerChat(client, messageText) { processPlayerChat(client, messageText); event.preventDefault(); } // =========================================================================== -function onProcess(event, deltaTime) { +function onProcess(deltaTime = 0) { updateServerGameTime(); //checkPlayerSpawning(); //checkPlayerPedState(); diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index 758d0e39..d9cf87c0 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -912,103 +912,6 @@ function quickDatabaseQuery(queryString) { // =========================================================================== -function executeDatabaseQueryCommand(command, params, client) { - if(areParamsEmpty(params)) { - messagePlayerSyntax(client, getCommandSyntaxText(command)); - return false; - } - - if(!targetClient) { - messagePlayerError(client, "That player was not found!"); - return false; - } - - if(targetCode == "") { - messagePlayerError(client, "You didn't enter any code!"); - return false; - } - - let success = quickDatabaseQuery(params); - - if(!success) { - messagePlayerAlert(client, `Database query failed to execute: {ALTCOLOUR}${query}`); - } else if(typeof success != "boolean") { - messagePlayeSuccess(client, `Database query successful: {ALTCOLOUR}${query}`); - messagePlayerInfo(client, `Returns: ${success}`); - } else { - messagePlayerSuccess(client, `Database query successful: {ALTCOLOUR}${query}`); - } - return true; -} - -// =========================================================================== - -function setConstantsAsGlobalVariablesInDatabase() { - let dbConnection = connectToDatabase(); - let entries = Object.entries(global); - for(let i in entries) { - logToConsole(LOG_DEBUG, `[VRR.Database] Checking entry ${i} (${entries[i]})`); - if(toString(i).slice(0, 3).indexOf("VRR_") != -1) { - logToConsole(LOG_DEBUG, `[VRR.Database] Adding ${i} (${entries[i]}) to database global variables`); - } - } -} - -// =========================================================================== - -function createDatabaseInsertQuery(tableName, data) { - let fields = []; - let values = []; - - for(let i in data) { - if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][0] != 'NaN') { - if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') { - fields.push(data[i][0]); - - if(typeof data[i][1] == "string") { - if(data[i][1] == "{UNIXTIMESTAMP}") { - values.push("UNIX_TIMESTAMP()"); - } else { - values.push(`'${data[i][1]}'`); - } - } else { - values.push(data[i][1]); - } - } - } - } - - let queryString = `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})`; - return queryString; -} - -// =========================================================================== - -function createDatabaseUpdateQuery(tableName, data, whereClause) { - let values = []; - - for(let i in data) { - if(data[i][0] != "undefined" && data[i][0] != NaN && data[i][0] != 'NaN') { - if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') { - if(typeof data[i][1] == "string") { - if(data[i][1] == "{UNIXTIMESTAMP}") { - values.push(`${data[i][0]}=UNIX_TIMESTAMP()`); - } else { - values.push(`${data[i][0]}='${data[i][1]}'`); - } - } else { - values.push(`${data[i][0]}=${data[i][1]}`); - } - } - } - } - - let queryString = `UPDATE ${tableName} SET ${values.join(", ")} WHERE ${whereClause}`; - return queryString; -} - -// =========================================================================== - function sendNetworkEventToPlayer(eventName, client, ...args) { let argsArray = [eventName, client]; argsArray = argsArray.concat(args); @@ -1267,6 +1170,24 @@ function getCountryNameFromIP(ip) { // =========================================================================== +function getSubdivisionNameFromIP(ip) { + if(module.geoip.getSubdivisionName(ip)) { + return module.geoip.getSubdivisionName(ip); + } + return false; +} + +// =========================================================================== + +function getCityNameFromIP(ip) { + if(module.geoip.getCityNameFromIP(ip)) { + return module.geoip.getCityNameFromIP(ip); + } + return false; +} + +// =========================================================================== + function getServerPort() { return server.port; } @@ -1283,4 +1204,30 @@ function setVehicleTrunkState(vehicle, trunkState) { sendNetworkEventToPlayer("vrr.veh.trunk", null, getVehicleForNetworkEvent(vehicle), trunkState); } +// =========================================================================== + +function addAllEventHandlers() { + addEventHandler("onResourceStart", onResourceStart); + addEventHandler("onResourceStop", onResourceStop); + addEventHandler("onServerStop", onResourceStop); + + addEventHandler("onProcess", onProcess); + addEventHandler("onEntityProcess", onEntityProcess); + + addEventHandler("onPlayerConnect", onInitialConnectionToServer); + addEventHandler("onPlayerJoin", onPlayerJoin); + addEventHandler("onPlayerJoined", onPlayerJoined); + addEventHandler("onPlayerChat", onPlayerChat); + addEventHandler("onPlayerQuit", onPlayerQuit); + addEventHandler("onElementStreamIn", onElementStreamIn); + addEventHandler("onElementStreamOut", onElementStreamOut); + + addEventHandler("onPedSpawn", onPedSpawn); + addEventHandler("onPedEnterVehicle", onPedEnteringVehicle); + addEventHandler("onPedExitVehicle", onPedExitingVehicle); + + addEventHandler("onPedEnteringVehicle", onPedEnteringVehicle); + addEventHandler("onPedExitingVehicle", onPedExitingVehicle); +} + // =========================================================================== \ No newline at end of file