valmojr/armatak
1
0
Fork 0
mirror of https://github.com/valmojr/armatak.git synced 2026-06-14 10:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

linted all websocket callbacks

Browse Source
This commit is contained in:
Valmo Trindade
2025-05-17 04:47:01 -03:00
parent 938f0bcb6a
commit 8f7d5425ad
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addons/main/XEH_postInit.sqf
View File

@@ -1,13 +1,19 @@
waitUntil { !isNil "BIS_fnc_init" }; #include "script_component.hpp"
missionNamespace setVariable ["have_this_runned", true];
addMissionEventHandler ["ExtensionCallback", { addMissionEventHandler ["ExtensionCallback", {
params ["_name", "_function", "_data"]; params ["_name", "_function", "_data"];
if (_name == "armatak_websocket") then { if (_name == "WEBSOCKET") then {
[_function, "success", _name] call armatak_main_fnc_notify; [_function, "success", _name] call armatak_main_fnc_notify;
}; };
if (_name == "armatak_websocket_error") then { if (_name == "WEBSOCKET WARNING") then {
[_function, "warning", "WEBSOCKET"] call armatak_main_fnc_notify;
};
if (_name == "WEBSOCKET ERROR") then {
[_function, "error", _name] call armatak_main_fnc_notify; [_function, "error", _name] call armatak_main_fnc_notify;
}; };

22
src/websocket.rs
View File

@@ -101,12 +101,10 @@ impl WsServer {
// Handle event callbacks with valid Context // Handle event callbacks with valid Context
match event_rx.try_recv() { match event_rx.try_recv() {
Ok(WsEvent::FirstClientConnected) => { Ok(WsEvent::FirstClientConnected) => {
info!("Triggering callback: client_connected"); let _ = ctx.callback_null("WEBSOCKET", "Client connected");
let _ = ctx.callback_null("armatak_websocket", "client_connected");
} }
Ok(WsEvent::LastClientDisconnected) => { Ok(WsEvent::LastClientDisconnected) => {
info!("Triggering callback: client_disconnected"); let _ = ctx.callback_null("WEBSOCKET WARNING", "Client disconnected");
let _ = ctx.callback_null("armatak_websocket", "client_disconnected");
} }
Err(_) => {} Err(_) => {}
} }
@@ -139,36 +137,36 @@ pub fn start(ctx: Context) -> &'static str {
let mut server_guard = WEBSOCKET_SERVER.lock().unwrap(); let mut server_guard = WEBSOCKET_SERVER.lock().unwrap();
*server_guard = Some(server); *server_guard = Some(server);
info!("WebSocket server started.");
"Starting WebSocket Server" "Starting WebSocket Server"
} }
pub fn message(payload: String) -> &'static str { pub fn message(ctx: Context, payload: String) -> &'static str {
if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() { if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() {
info!("Broadcasting message: {}", payload); info!("Broadcasting message: {}", payload); // why the fuck i did this?
server.send_message(payload); server.send_message(payload);
} else { } else {
info!("WebSocket server is not running."); let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
} }
"Sending message to all WebSocket clients" "Sending message to all WebSocket clients"
} }
pub fn location(payload: LocationPayload) -> &'static str { pub fn location(ctx: Context, payload: LocationPayload) -> &'static str {
if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() { if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() {
server.send_message(payload); server.send_message(payload);
} else { } else {
info!("WebSocket server is not running."); let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
} }
"Sending location to all WebSocket clients" "Sending location to all WebSocket clients"
} }
pub fn stop() -> &'static str { pub fn stop(ctx: Context) -> &'static str {
if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() { if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() {
server.stop(); server.stop();
let _ = ctx.callback_null("WEBSOCKET WARNING", "Websocket stopped");
} else { } else {
info!("WebSocket server is not running."); let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
} }
"Stopping WebSocket Server" "Stopping WebSocket Server"