From 8f7d5425ad5ede3147561febd8265c91cb3692b3 Mon Sep 17 00:00:00 2001
From: Valmo Trindade <val_mo_jr@hotmail.com>
Date: Sat, 17 May 2025 04:47:01 -0300
Subject: [PATCH] linted all websocket callbacks

---
 addons/main/XEH_postInit.sqf | 12 +++++++++---
 src/websocket.rs             | 22 ++++++++++------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/main/XEH_postInit.sqf b/addons/main/XEH_postInit.sqf
index 792148f..f130478 100644
--- a/addons/main/XEH_postInit.sqf
+++ b/addons/main/XEH_postInit.sqf
@@ -1,13 +1,19 @@
-waitUntil { !isNil "BIS_fnc_init" };
+#include "script_component.hpp"
+
+missionNamespace setVariable ["have_this_runned", true];
 
 addMissionEventHandler ["ExtensionCallback", {
 	params ["_name", "_function", "_data"];
 
-	if (_name == "armatak_websocket") then {
+	if (_name == "WEBSOCKET") then {
 		[_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;
 	};
 
diff --git a/src/websocket.rs b/src/websocket.rs
index e310e5c..6cbf3b5 100644
--- a/src/websocket.rs
+++ b/src/websocket.rs
@@ -101,12 +101,10 @@ impl WsServer {
                 // Handle event callbacks with valid Context
                 match event_rx.try_recv() {
                     Ok(WsEvent::FirstClientConnected) => {
-                        info!("Triggering callback: client_connected");
-                        let _ = ctx.callback_null("armatak_websocket", "client_connected");
+                        let _ = ctx.callback_null("WEBSOCKET", "Client connected");
                     }
                     Ok(WsEvent::LastClientDisconnected) => {
-                        info!("Triggering callback: client_disconnected");
-                        let _ = ctx.callback_null("armatak_websocket", "client_disconnected");
+                        let _ = ctx.callback_null("WEBSOCKET WARNING", "Client disconnected");
                     }
                     Err(_) => {}
                 }
@@ -139,36 +137,36 @@ pub fn start(ctx: Context) -> &'static str {
     let mut server_guard = WEBSOCKET_SERVER.lock().unwrap();
     *server_guard = Some(server);
 
-    info!("WebSocket server started.");
     "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() {
-        info!("Broadcasting message: {}", payload);
+        info!("Broadcasting message: {}", payload); // why the fuck i did this?
         server.send_message(payload);
     } else {
-        info!("WebSocket server is not running.");
+        let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
     }
 
     "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() {
         server.send_message(payload);
     } else {
-        info!("WebSocket server is not running.");
+        let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
     }
 
     "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() {
         server.stop();
+        let _ = ctx.callback_null("WEBSOCKET WARNING", "Websocket stopped");
     } else {
-        info!("WebSocket server is not running.");
+        let _ = ctx.callback_null("WEBSOCKET ERROR", "Websocket is not running");
     }
 
     "Stopping WebSocket Server"