StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

feat(main): debug launched clients flag

Browse Source
This commit is contained in:
Nova
2024-09-04 05:14:43 -04:00
parent 1ca054c2b3
commit 4683710f09
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -54,6 +54,10 @@ struct CliArgs {
#[clap(id = "PRIORITY", short = 'o', long = "overlay", action)] #[clap(id = "PRIORITY", short = 'o', long = "overlay", action)]
overlay_priority: Option<u32>, overlay_priority: Option<u32>,
/// Debug the clients started by the server
#[clap(short = 'd', long = "debug", action)]
debug_launched_clients: bool,
/// Run a script when ready for clients to connect. If this is not set the script at $HOME/.config/stardust/startup will be ran if it exists. /// Run a script when ready for clients to connect. If this is not set the script at $HOME/.config/stardust/startup will be ran if it exists.
#[clap(id = "PATH", short = 'e', long = "execute-startup-script", action)] #[clap(id = "PATH", short = 'e', long = "execute-startup-script", action)]
startup_script: Option<PathBuf>, startup_script: Option<PathBuf>,

35
src/session.rs
View File

@@ -37,17 +37,22 @@ pub async fn save_session(project_dirs: &ProjectDirs) {
pub fn launch_start(cli_args: &CliArgs, project_dirs: &ProjectDirs) -> Vec<Child> { pub fn launch_start(cli_args: &CliArgs, project_dirs: &ProjectDirs) -> Vec<Child> {
match (&cli_args.restore, &cli_args.startup_script) { match (&cli_args.restore, &cli_args.startup_script) {
(Some(session_id), _) => { (Some(session_id), _) => restore_session(
restore_session(&project_dirs.state_dir().unwrap().join(session_id)) &project_dirs.state_dir().unwrap().join(session_id),
} cli_args.debug_launched_clients,
(None, Some(startup_script)) => { ),
run_script(&startup_script.clone().canonicalize().unwrap_or_default()) (None, Some(startup_script)) => run_script(
} &startup_script.clone().canonicalize().unwrap_or_default(),
(None, None) => run_script(&project_dirs.config_dir().join("startup")), cli_args.debug_launched_clients,
),
(None, None) => run_script(
&project_dirs.config_dir().join("startup"),
cli_args.debug_launched_clients,
),
} }
} }
pub fn restore_session(session_dir: &Path) -> Vec<Child> { pub fn restore_session(session_dir: &Path, debug_launched_clients: bool) -> Vec<Child> {
let Ok(clients) = session_dir.read_dir() else { let Ok(clients) = session_dir.read_dir() else {
return Vec::new(); return Vec::new();
}; };
@@ -55,22 +60,24 @@ pub fn restore_session(session_dir: &Path) -> Vec<Child> {
.filter_map(Result::ok) .filter_map(Result::ok)
.filter_map(|c| ClientStateParsed::from_file(&c.path())) .filter_map(|c| ClientStateParsed::from_file(&c.path()))
.filter_map(ClientStateParsed::launch_command) .filter_map(ClientStateParsed::launch_command)
.filter_map(run_client) .filter_map(|c| run_client(c, debug_launched_clients))
.collect() .collect()
} }
pub fn run_script(script_path: &Path) -> Vec<Child> { pub fn run_script(script_path: &Path, debug_launched_clients: bool) -> Vec<Child> {
let _ = std::fs::set_permissions(script_path, std::fs::Permissions::from_mode(0o755)); let _ = std::fs::set_permissions(script_path, std::fs::Permissions::from_mode(0o755));
let startup_command = Command::new(script_path); let startup_command = Command::new(script_path);
run_client(startup_command) run_client(startup_command, debug_launched_clients)
.map(|c| vec![c]) .map(|c| vec![c])
.unwrap_or_default() .unwrap_or_default()
} }
pub fn run_client(mut command: Command) -> Option<Child> { pub fn run_client(mut command: Command, debug_launched_clients: bool) -> Option<Child> {
command.stdin(Stdio::null()); command.stdin(Stdio::null());
command.stdout(Stdio::null()); if !debug_launched_clients {
command.stderr(Stdio::null()); command.stdout(Stdio::null());
command.stderr(Stdio::null());
}
for (var, value) in connection_env() { for (var, value) in connection_env() {
command.env(var, value); command.env(var, value);
} }