From 972bd1c67e931c8f36c76643087437c489a8556e Mon Sep 17 00:00:00 2001 From: Valmo Trindade Date: Thu, 5 Dec 2024 03:02:16 -0300 Subject: [PATCH] linted extension calls on init function and command index --- addons/main/initPlayerLocal.sqf | 14 +++++++------- src/lib.rs | 6 +++--- src/websocket.rs | 2 -- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/main/initPlayerLocal.sqf b/addons/main/initPlayerLocal.sqf index 18472c5..253dabe 100644 --- a/addons/main/initPlayerLocal.sqf +++ b/addons/main/initPlayerLocal.sqf @@ -1,35 +1,35 @@ if (!hasInterface) exitWith {}; -_initializedServer = "armatak" callExtension ["start",[]] select 0; +_initializedServer = "armatak" callExtension ["websocket:start",[]] select 0; _local_address = "armatak" callExtension ["local_ip", []] select 0; player setVariable ["initializedSocket", _initializedServer]; player setVariable ["localAddress", _local_address]; player addEventHandler ["Killed", { - "armatak" callExtension ["stop", []]; + "armatak" callExtension ["websocket:stop", []]; }]; player addEventHandler ["Deleted", { - "armatak" callExtension ["stop", []]; + "armatak" callExtension ["websocket:stop", []]; }]; player addEventHandler ["Respawn", { params["_unit", "_corpse"]; _unit spawn { - "armatak" callExtension ["start", []]; + "armatak" callExtension ["websocket:start", []]; [{ if (alive _this) then { - "armatak" callExtension ["location",[player call armatak_fnc_extract_info]]; + "armatak" callExtension ["websocket:location",[player call armatak_fnc_extract_info]]; }; }, 1, []] call CBA_fnc_addPerFrameHandler; }; }]; -onPlayerDisconnected "'armatak' callExtension ['stop',[]];"; +onPlayerDisconnected "'armatak' callExtension ['websocket:stop',[]];"; [{ - "armatak" callExtension ["location",[player call armatak_fnc_extract_info]]; + "armatak" callExtension ["websocket:location",[player call armatak_fnc_extract_info]]; }, 1, []] call CBA_fnc_addPerFrameHandler; \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index ee71f1e..d9169d3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,7 +30,7 @@ pub fn init() -> Extension { log4rs::init_config(config).unwrap(); Extension::build() - .group("api", Group::new() + .group("websocket", Group::new() .command("start", websocket::start) .command("stop", websocket::stop) .command("message", websocket::message) @@ -38,11 +38,11 @@ pub fn init() -> Extension { ) .command("local_ip", util::get_local_address) .command("uuid", util::get_uuid) - .command("get_auth_token", api::get_auth_token) .group( - "markers", + "ots_api", Group::new() .command("get", api::markers::get) + .command("get_auth_token", api::get_auth_token) .command("post", api::markers::post) .command("post_debug", api::markers::post_debug) .command("delete", api::markers::delete), diff --git a/src/websocket.rs b/src/websocket.rs index 1513528..01cc214 100644 --- a/src/websocket.rs +++ b/src/websocket.rs @@ -71,7 +71,6 @@ impl WsServer { } } - lazy_static! { static ref WEBSOCKET_SERVER: Arc>> = Arc::new(Mutex::new(None)); } @@ -101,7 +100,6 @@ pub fn message(payload: String) -> &'static str { "Sending message to all WebSocket clients" } - pub fn location(payload: LocationPayload) -> &'static str { if let Some(ref server) = *WEBSOCKET_SERVER.lock().unwrap() { server.send_message(payload);