linted extension calls on init function and command index

This commit is contained in:
Valmo Trindade
2024-12-05 03:02:16 -03:00
parent e81104f9eb
commit 972bd1c67e
3 changed files with 10 additions and 12 deletions

View File

@@ -1,35 +1,35 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
_initializedServer = "armatak" callExtension ["start",[]] select 0; _initializedServer = "armatak" callExtension ["websocket:start",[]] select 0;
_local_address = "armatak" callExtension ["local_ip", []] select 0; _local_address = "armatak" callExtension ["local_ip", []] select 0;
player setVariable ["initializedSocket", _initializedServer]; player setVariable ["initializedSocket", _initializedServer];
player setVariable ["localAddress", _local_address]; player setVariable ["localAddress", _local_address];
player addEventHandler ["Killed", { player addEventHandler ["Killed", {
"armatak" callExtension ["stop", []]; "armatak" callExtension ["websocket:stop", []];
}]; }];
player addEventHandler ["Deleted", { player addEventHandler ["Deleted", {
"armatak" callExtension ["stop", []]; "armatak" callExtension ["websocket:stop", []];
}]; }];
player addEventHandler ["Respawn", { player addEventHandler ["Respawn", {
params["_unit", "_corpse"]; params["_unit", "_corpse"];
_unit spawn { _unit spawn {
"armatak" callExtension ["start", []]; "armatak" callExtension ["websocket:start", []];
[{ [{
if (alive _this) then { 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; }, 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; }, 1, []] call CBA_fnc_addPerFrameHandler;

View File

@@ -30,7 +30,7 @@ pub fn init() -> Extension {
log4rs::init_config(config).unwrap(); log4rs::init_config(config).unwrap();
Extension::build() Extension::build()
.group("api", Group::new() .group("websocket", Group::new()
.command("start", websocket::start) .command("start", websocket::start)
.command("stop", websocket::stop) .command("stop", websocket::stop)
.command("message", websocket::message) .command("message", websocket::message)
@@ -38,11 +38,11 @@ pub fn init() -> Extension {
) )
.command("local_ip", util::get_local_address) .command("local_ip", util::get_local_address)
.command("uuid", util::get_uuid) .command("uuid", util::get_uuid)
.command("get_auth_token", api::get_auth_token)
.group( .group(
"markers", "ots_api",
Group::new() Group::new()
.command("get", api::markers::get) .command("get", api::markers::get)
.command("get_auth_token", api::get_auth_token)
.command("post", api::markers::post) .command("post", api::markers::post)
.command("post_debug", api::markers::post_debug) .command("post_debug", api::markers::post_debug)
.command("delete", api::markers::delete), .command("delete", api::markers::delete),

View File

@@ -71,7 +71,6 @@ impl WsServer {
} }
} }
lazy_static! { lazy_static! {
static ref WEBSOCKET_SERVER: Arc<Mutex<Option<WsServer>>> = Arc::new(Mutex::new(None)); static ref WEBSOCKET_SERVER: Arc<Mutex<Option<WsServer>>> = Arc::new(Mutex::new(None));
} }
@@ -101,7 +100,6 @@ pub fn message(payload: String) -> &'static str {
"Sending message to all WebSocket clients" "Sending message to all WebSocket clients"
} }
pub fn location(payload: LocationPayload) -> &'static str { pub fn location(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);