Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 630b8dab30 | |||
| b87f277e2d | |||
| 732f53f2d0 | |||
| 6aa03cca63 | |||
| 58d8e34828 | |||
| 47e446b433 | |||
| e11ba1a652 | |||
| 07c4b321d1 |
Generated
+1
-1
@@ -436,7 +436,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dosh"
|
||||
version = "1.0.0-rc15"
|
||||
version = "1.0.0-rc18"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "dosh"
|
||||
version = "1.0.0-rc15"
|
||||
version = "1.0.0-rc18"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
|
||||
|
||||
@@ -36,7 +36,9 @@ persistence-check:
|
||||
package-check:
|
||||
$(MAKE) package-release-linux
|
||||
$(MAKE) package-release-windows
|
||||
sh scripts/verify-release-artifacts.sh
|
||||
sh scripts/verify-release-artifacts.sh \
|
||||
target/dosh-release/dosh-linux-x86_64.tar.gz \
|
||||
target/dosh-release/dosh-windows-x86_64.zip
|
||||
|
||||
install:
|
||||
sh install.sh --from-current
|
||||
|
||||
@@ -44,6 +44,7 @@ dosh setup HOST
|
||||
dosh HOST
|
||||
dosh HOST COMMAND
|
||||
dosh update
|
||||
dosh update --client|--server|--both
|
||||
```
|
||||
|
||||
Useful commands:
|
||||
|
||||
@@ -22,11 +22,14 @@ artifact_version() {
|
||||
esac
|
||||
}
|
||||
|
||||
if [ "$#" -gt 0 ]; then
|
||||
artifacts="$*"
|
||||
else
|
||||
artifacts="$out_dir/dosh-linux-x86_64.tar.gz $out_dir/dosh-macos-aarch64.tar.gz $out_dir/dosh-windows-x86_64.zip"
|
||||
fi
|
||||
|
||||
failed=0
|
||||
for artifact in \
|
||||
"$out_dir/dosh-linux-x86_64.tar.gz" \
|
||||
"$out_dir/dosh-macos-aarch64.tar.gz" \
|
||||
"$out_dir/dosh-windows-x86_64.zip"; do
|
||||
for artifact in $artifacts; do
|
||||
if [ ! -f "$artifact" ]; then
|
||||
echo "missing release artifact: $artifact" >&2
|
||||
failed=1
|
||||
|
||||
+334
-37
@@ -260,7 +260,7 @@ async fn main() -> Result<()> {
|
||||
return run_file_cat_command(&args);
|
||||
}
|
||||
if args.server.as_deref() == Some("update") {
|
||||
return run_update(&config, update_check_requested(&args.command)?);
|
||||
return run_update(&config, parse_update_options(&args.command)?);
|
||||
}
|
||||
if args.server.as_deref() == Some("setup") {
|
||||
return run_setup_command(&config, &args).await;
|
||||
@@ -2501,7 +2501,6 @@ fn download_file(
|
||||
let mut file = if offset > 0 {
|
||||
let file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.append(true)
|
||||
.open(local)
|
||||
.with_context(|| format!("open {}", local.display()))?;
|
||||
@@ -2842,12 +2841,95 @@ fn run_remote_script(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn update_check_requested(command: &[String]) -> Result<bool> {
|
||||
match command {
|
||||
[] => Ok(false),
|
||||
[flag] if flag == "--check" || flag == "-n" => Ok(true),
|
||||
_ => Err(anyhow!("usage: dosh update [--check]")),
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum UpdateRole {
|
||||
Auto,
|
||||
Client,
|
||||
Server,
|
||||
Both,
|
||||
}
|
||||
|
||||
impl UpdateRole {
|
||||
fn installer_arg(self) -> &'static str {
|
||||
match self {
|
||||
UpdateRole::Auto => {
|
||||
if local_server_install_detected() {
|
||||
"both"
|
||||
} else {
|
||||
"client"
|
||||
}
|
||||
}
|
||||
UpdateRole::Client => "client",
|
||||
UpdateRole::Server => "server",
|
||||
UpdateRole::Both => "both",
|
||||
}
|
||||
}
|
||||
|
||||
fn installer_arg_for_os(self, os: &str) -> Result<&'static str> {
|
||||
if os == "windows" {
|
||||
return match self {
|
||||
UpdateRole::Auto | UpdateRole::Client => Ok("client"),
|
||||
UpdateRole::Server | UpdateRole::Both => {
|
||||
Err(anyhow!("Windows installs support client updates only"))
|
||||
}
|
||||
};
|
||||
}
|
||||
Ok(self.installer_arg())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
struct UpdateOptions {
|
||||
check_only: bool,
|
||||
role: UpdateRole,
|
||||
}
|
||||
|
||||
fn parse_update_options(command: &[String]) -> Result<UpdateOptions> {
|
||||
let mut options = UpdateOptions {
|
||||
check_only: false,
|
||||
role: UpdateRole::Auto,
|
||||
};
|
||||
for arg in command {
|
||||
match arg.as_str() {
|
||||
"--check" | "-n" => options.check_only = true,
|
||||
"--client" => options.role = update_role_flag(options.role, UpdateRole::Client)?,
|
||||
"--server" => options.role = update_role_flag(options.role, UpdateRole::Server)?,
|
||||
"--both" => options.role = update_role_flag(options.role, UpdateRole::Both)?,
|
||||
_ => {
|
||||
return Err(anyhow!(
|
||||
"usage: dosh update [--check] [--client|--server|--both]"
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(options)
|
||||
}
|
||||
|
||||
fn update_role_flag(current: UpdateRole, requested: UpdateRole) -> Result<UpdateRole> {
|
||||
if current != UpdateRole::Auto && current != requested {
|
||||
return Err(anyhow!("choose only one of --client, --server, or --both"));
|
||||
}
|
||||
Ok(requested)
|
||||
}
|
||||
|
||||
fn local_server_install_detected() -> bool {
|
||||
if cfg!(windows) {
|
||||
return false;
|
||||
}
|
||||
let service = dirs::home_dir()
|
||||
.map(|home| home.join(".config/systemd/user/dosh-server.service"))
|
||||
.filter(|path| path.exists())
|
||||
.is_some();
|
||||
if service {
|
||||
return true;
|
||||
}
|
||||
let Ok(exe) = std::env::current_exe() else {
|
||||
return false;
|
||||
};
|
||||
let Some(bin_dir) = exe.parent() else {
|
||||
return false;
|
||||
};
|
||||
bin_dir.join("dosh-server").exists() || bin_dir.join("dosh-server.exe").exists()
|
||||
}
|
||||
|
||||
fn release_artifact_name() -> &'static str {
|
||||
@@ -2862,6 +2944,18 @@ fn release_artifact_name() -> &'static str {
|
||||
}
|
||||
}
|
||||
|
||||
fn update_installer_name(os: &str) -> &'static str {
|
||||
if os == "windows" {
|
||||
"install.ps1"
|
||||
} else {
|
||||
"install.sh"
|
||||
}
|
||||
}
|
||||
|
||||
fn update_installer_url(raw_base: &str, os: &str) -> String {
|
||||
format!("{raw_base}/raw/branch/main/{}", update_installer_name(os))
|
||||
}
|
||||
|
||||
fn latest_release_download_url(repo: &str, artifact: &str) -> Option<String> {
|
||||
let web = repo
|
||||
.strip_suffix(".git")
|
||||
@@ -2968,20 +3062,23 @@ fn url_reachable(url: &str) -> Result<bool> {
|
||||
Ok(status.success())
|
||||
}
|
||||
|
||||
fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<()> {
|
||||
fn run_update(config: &dosh::config::ClientConfig, options: UpdateOptions) -> Result<()> {
|
||||
let repo = config
|
||||
.update_repo
|
||||
.clone()
|
||||
.unwrap_or_else(|| "https://git.palav.dev/Palav/dosh.git".to_string());
|
||||
let raw_base = raw_base_from_repo(&repo);
|
||||
let installer = format!("{raw_base}/raw/branch/main/install.sh");
|
||||
let os = std::env::consts::OS;
|
||||
let installer = update_installer_url(&raw_base, os);
|
||||
let artifact = release_artifact_name();
|
||||
if check_only {
|
||||
let installer_role = options.role.installer_arg_for_os(os)?;
|
||||
if options.check_only {
|
||||
let local_version = env!("CARGO_PKG_VERSION");
|
||||
let latest_tag = latest_release_tag(&repo)?;
|
||||
println!("dosh {local_version}");
|
||||
println!("repo: {repo}");
|
||||
println!("installer: {installer}");
|
||||
println!("role: {installer_role}");
|
||||
match latest_tag.as_deref() {
|
||||
Some(tag) => {
|
||||
let latest_version = release_version_from_tag(tag);
|
||||
@@ -3017,13 +3114,79 @@ fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<(
|
||||
.join("dosh")
|
||||
.join("source");
|
||||
let use_prebuilt = std::env::var("DOSH_USE_PREBUILT").unwrap_or_else(|_| "1".to_string());
|
||||
let status = run_update_installer(
|
||||
config,
|
||||
&repo,
|
||||
&installer,
|
||||
installer_role,
|
||||
&update_cache.display().to_string(),
|
||||
&use_prebuilt,
|
||||
)?;
|
||||
if !status.success() {
|
||||
return Err(anyhow!("dosh update failed with status {status}"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn run_update_installer(
|
||||
config: &dosh::config::ClientConfig,
|
||||
repo: &str,
|
||||
installer: &str,
|
||||
installer_role: &str,
|
||||
update_cache: &str,
|
||||
use_prebuilt: &str,
|
||||
) -> Result<std::process::ExitStatus> {
|
||||
if cfg!(windows) {
|
||||
let script = windows_update_script(
|
||||
config,
|
||||
repo,
|
||||
installer,
|
||||
installer_role,
|
||||
update_cache,
|
||||
use_prebuilt,
|
||||
);
|
||||
return Command::new("powershell.exe")
|
||||
.arg("-NoProfile")
|
||||
.arg("-ExecutionPolicy")
|
||||
.arg("Bypass")
|
||||
.arg("-Command")
|
||||
.arg(script)
|
||||
.stdin(Stdio::null())
|
||||
.status()
|
||||
.context("run dosh update installer");
|
||||
}
|
||||
let script = unix_update_script(
|
||||
config,
|
||||
repo,
|
||||
installer,
|
||||
installer_role,
|
||||
update_cache,
|
||||
use_prebuilt,
|
||||
);
|
||||
Command::new("sh")
|
||||
.arg("-c")
|
||||
.arg(script)
|
||||
.stdin(Stdio::null())
|
||||
.status()
|
||||
.context("run dosh update installer")
|
||||
}
|
||||
|
||||
fn unix_update_script(
|
||||
config: &dosh::config::ClientConfig,
|
||||
repo: &str,
|
||||
installer: &str,
|
||||
installer_role: &str,
|
||||
update_cache: &str,
|
||||
use_prebuilt: &str,
|
||||
) -> String {
|
||||
let mut script = format!(
|
||||
"curl -fsSL {} | DOSH_REPO={} DOSH_PORT={} DOSH_UPDATE_CACHE={} DOSH_UPDATE_QUIET=1 DOSH_USE_PREBUILT={} sh -s -- client",
|
||||
shell_word(&installer),
|
||||
shell_word(&repo),
|
||||
"curl -fsSL {} | DOSH_REPO={} DOSH_PORT={} DOSH_UPDATE_CACHE={} DOSH_UPDATE_QUIET=1 DOSH_USE_PREBUILT={} sh -s -- {}",
|
||||
shell_word(installer),
|
||||
shell_word(repo),
|
||||
config.update_port.unwrap_or(config.dosh_port),
|
||||
shell_word(&update_cache.display().to_string()),
|
||||
shell_word(&use_prebuilt)
|
||||
shell_word(update_cache),
|
||||
shell_word(use_prebuilt),
|
||||
shell_word(installer_role)
|
||||
);
|
||||
if config.server != "user@example.com" {
|
||||
script.push_str(&format!(" --server {}", shell_word(&config.server)));
|
||||
@@ -3031,16 +3194,47 @@ fn run_update(config: &dosh::config::ClientConfig, check_only: bool) -> Result<(
|
||||
if let Some(host) = &config.dosh_host {
|
||||
script.push_str(&format!(" --dosh-host {}", shell_word(host)));
|
||||
}
|
||||
let status = Command::new("sh")
|
||||
.arg("-c")
|
||||
.arg(script)
|
||||
.stdin(Stdio::null())
|
||||
.status()
|
||||
.context("run dosh update installer")?;
|
||||
if !status.success() {
|
||||
return Err(anyhow!("dosh update failed with status {status}"));
|
||||
script
|
||||
}
|
||||
|
||||
fn windows_update_script(
|
||||
config: &dosh::config::ClientConfig,
|
||||
repo: &str,
|
||||
installer: &str,
|
||||
installer_role: &str,
|
||||
update_cache: &str,
|
||||
use_prebuilt: &str,
|
||||
) -> String {
|
||||
let mut script = String::from("$ErrorActionPreference='Stop';");
|
||||
script.push_str("$ProgressPreference='SilentlyContinue';");
|
||||
for (name, value) in [
|
||||
("DOSH_REPO", repo),
|
||||
("DOSH_ROLE", installer_role),
|
||||
(
|
||||
"DOSH_PORT",
|
||||
&config.update_port.unwrap_or(config.dosh_port).to_string(),
|
||||
),
|
||||
("DOSH_UPDATE_CACHE", update_cache),
|
||||
("DOSH_UPDATE_QUIET", "1"),
|
||||
("DOSH_USE_PREBUILT", use_prebuilt),
|
||||
] {
|
||||
script.push_str(&format!("$env:{name}={};", powershell_string(value)));
|
||||
}
|
||||
Ok(())
|
||||
if config.server != "user@example.com" {
|
||||
script.push_str(&format!(
|
||||
"$env:DOSH_SERVER={};",
|
||||
powershell_string(&config.server)
|
||||
));
|
||||
}
|
||||
if let Some(host) = &config.dosh_host {
|
||||
script.push_str(&format!("$env:DOSH_HOST={};", powershell_string(host)));
|
||||
}
|
||||
script.push_str(&format!("irm {} | iex", powershell_string(installer)));
|
||||
script
|
||||
}
|
||||
|
||||
fn powershell_string(value: &str) -> String {
|
||||
format!("'{}'", value.replace('\'', "''"))
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
@@ -7565,11 +7759,12 @@ mod tests {
|
||||
FRAME_GAP_RESYNC_AFTER_MS, FrameBuffer, LocalForward, MAX_PENDING_USER_INPUT_BYTES,
|
||||
POST_SUBMIT_ALL_INPUT_HOLD, PendingStreamOpen, PredictMode, Predictor,
|
||||
RESTART_STATUS_SCRIPT, RemoteForward, STARTUP_INPUT_HOLD, SshConfig, StartupGateMode,
|
||||
StatusAction, auth_allows, cache_key, cache_server_prefix, cleanup_stream_state,
|
||||
clear_cached_credentials, ensure_tui_safe_status_overlay, input_contains_focus_in,
|
||||
input_matches_escape, is_local_status_target, is_resume_response_for_client,
|
||||
latest_release_download_url, load_first_native_identity_with_prompt, parse_dynamic_forward,
|
||||
parse_escape_key, parse_local_forward, parse_remote_forward, parse_ssh_config,
|
||||
StatusAction, UpdateOptions, UpdateRole, auth_allows, cache_key, cache_server_prefix,
|
||||
cleanup_stream_state, clear_cached_credentials, ensure_tui_safe_status_overlay,
|
||||
input_contains_focus_in, input_matches_escape, is_local_status_target,
|
||||
is_resume_response_for_client, latest_release_download_url,
|
||||
load_first_native_identity_with_prompt, parse_dynamic_forward, parse_escape_key,
|
||||
parse_local_forward, parse_remote_forward, parse_ssh_config, parse_update_options,
|
||||
post_submit_hold_duration, queue_pending_user_input, raw_contains_host_table,
|
||||
recv_response_until, refresh_live_addr, release_tag_download_url,
|
||||
release_tag_from_effective_url, release_version_from_tag, render_status_clear,
|
||||
@@ -7580,8 +7775,8 @@ mod tests {
|
||||
should_repaint_idle_alternate_screen, split_after_command_submit, ssh_destination_host,
|
||||
ssh_username, ssh_with_user, startup_command, status_ssh_target, strip_stale_mouse_reports,
|
||||
strip_terminal_focus_reports, terminal_private_mode_transition, toml_bare_key_or_quoted,
|
||||
update_check_requested, update_version_status, upsert_managed_block, valid_forward_host,
|
||||
vscode_safe_alias,
|
||||
unix_update_script, update_installer_url, update_version_status, upsert_managed_block,
|
||||
valid_forward_host, vscode_safe_alias, windows_update_script,
|
||||
};
|
||||
use dosh::config::{ClientConfig, CommandExtension, HostConfig};
|
||||
use dosh::native::EnvVar;
|
||||
@@ -8695,12 +8890,114 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_check_accepts_only_check_flag() {
|
||||
assert!(!update_check_requested(&[]).unwrap());
|
||||
assert!(update_check_requested(&["--check".to_string()]).unwrap());
|
||||
assert!(update_check_requested(&["-n".to_string()]).unwrap());
|
||||
assert!(update_check_requested(&["--wat".to_string()]).is_err());
|
||||
assert!(update_check_requested(&["--check".to_string(), "extra".to_string()]).is_err());
|
||||
fn update_options_accept_check_and_role_flags() {
|
||||
assert_eq!(
|
||||
parse_update_options(&[]).unwrap(),
|
||||
UpdateOptions {
|
||||
check_only: false,
|
||||
role: UpdateRole::Auto,
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
parse_update_options(&["--check".to_string()]).unwrap(),
|
||||
UpdateOptions {
|
||||
check_only: true,
|
||||
role: UpdateRole::Auto,
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
parse_update_options(&["-n".to_string(), "--server".to_string()]).unwrap(),
|
||||
UpdateOptions {
|
||||
check_only: true,
|
||||
role: UpdateRole::Server,
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
parse_update_options(&["--both".to_string()]).unwrap(),
|
||||
UpdateOptions {
|
||||
check_only: false,
|
||||
role: UpdateRole::Both,
|
||||
}
|
||||
);
|
||||
assert!(parse_update_options(&["--wat".to_string()]).is_err());
|
||||
assert!(parse_update_options(&["--client".to_string(), "--server".to_string()]).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_installer_uses_platform_native_script() {
|
||||
assert_eq!(
|
||||
update_installer_url("https://git.palav.dev/Palav/dosh", "linux"),
|
||||
"https://git.palav.dev/Palav/dosh/raw/branch/main/install.sh"
|
||||
);
|
||||
assert_eq!(
|
||||
update_installer_url("https://git.palav.dev/Palav/dosh", "macos"),
|
||||
"https://git.palav.dev/Palav/dosh/raw/branch/main/install.sh"
|
||||
);
|
||||
assert_eq!(
|
||||
update_installer_url("https://git.palav.dev/Palav/dosh", "windows"),
|
||||
"https://git.palav.dev/Palav/dosh/raw/branch/main/install.ps1"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn windows_update_roles_are_client_only() {
|
||||
assert_eq!(
|
||||
UpdateRole::Auto.installer_arg_for_os("windows").unwrap(),
|
||||
"client"
|
||||
);
|
||||
assert_eq!(
|
||||
UpdateRole::Client.installer_arg_for_os("windows").unwrap(),
|
||||
"client"
|
||||
);
|
||||
assert!(UpdateRole::Server.installer_arg_for_os("windows").is_err());
|
||||
assert!(UpdateRole::Both.installer_arg_for_os("windows").is_err());
|
||||
assert_eq!(
|
||||
UpdateRole::Both.installer_arg_for_os("linux").unwrap(),
|
||||
"both"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_scripts_are_native_to_the_platform() {
|
||||
let config = ClientConfig {
|
||||
server: "palav".to_string(),
|
||||
dosh_host: Some("dosh.example.com".to_string()),
|
||||
dosh_port: 50000,
|
||||
update_port: Some(50001),
|
||||
..ClientConfig::default()
|
||||
};
|
||||
let unix = unix_update_script(
|
||||
&config,
|
||||
"https://git.palav.dev/Palav/dosh.git",
|
||||
"https://git.palav.dev/Palav/dosh/raw/branch/main/install.sh",
|
||||
"both",
|
||||
"/tmp/dosh-cache",
|
||||
"1",
|
||||
);
|
||||
assert!(unix.contains("curl -fsSL"));
|
||||
assert!(unix.contains("install.sh"));
|
||||
assert!(unix.contains("sh -s -- 'both'"));
|
||||
assert!(unix.contains("--server 'palav'"));
|
||||
assert!(unix.contains("--dosh-host 'dosh.example.com'"));
|
||||
|
||||
let windows = windows_update_script(
|
||||
&config,
|
||||
"https://git.palav.dev/Palav/dosh.git",
|
||||
"https://git.palav.dev/Palav/dosh/raw/branch/main/install.ps1",
|
||||
"client",
|
||||
"C:\\Users\\palav\\AppData\\Local\\dosh\\source",
|
||||
"1",
|
||||
);
|
||||
assert!(
|
||||
windows.contains(
|
||||
"irm 'https://git.palav.dev/Palav/dosh/raw/branch/main/install.ps1' | iex"
|
||||
)
|
||||
);
|
||||
assert!(windows.contains("$env:DOSH_ROLE='client';"));
|
||||
assert!(windows.contains("$env:DOSH_SERVER='palav';"));
|
||||
assert!(windows.contains("$env:DOSH_HOST='dosh.example.com';"));
|
||||
assert!(!windows.contains("install.sh"));
|
||||
assert!(!windows.contains(" sh -s "));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+38
-12
@@ -53,6 +53,7 @@ const STREAM_RETIRED_TOMBSTONES: usize = 16 * 1024;
|
||||
/// have accumulated since the last mirror. Keeps the atomic write off the
|
||||
/// per-packet hot path while bounding how much fresh output a crash can lose.
|
||||
const SCREEN_PERSIST_BYTES: usize = 4096;
|
||||
const SCREEN_PERSIST_MAX_AGE: Duration = Duration::from_millis(250);
|
||||
const IMPLICIT_EMPTY_SESSION_GRACE_SECS: u64 = 300;
|
||||
|
||||
/// Sentinel `target_host` sent to the client on a server-initiated `StreamOpen`
|
||||
@@ -251,7 +252,7 @@ async fn serve(config_path: Option<std::path::PathBuf>) -> Result<()> {
|
||||
if config.persist_sessions {
|
||||
let flush_state = Arc::clone(&state);
|
||||
tokio::spawn(async move {
|
||||
let mut interval = tokio::time::interval(Duration::from_secs(2));
|
||||
let mut interval = tokio::time::interval(SCREEN_PERSIST_MAX_AGE);
|
||||
loop {
|
||||
interval.tick().await;
|
||||
flush_persistent_screens(&flush_state);
|
||||
@@ -376,6 +377,10 @@ struct Session {
|
||||
/// `output_seq` at the last successful screen mirror, so the periodic flush
|
||||
/// skips sessions whose screen has not changed.
|
||||
last_persisted_seq: u64,
|
||||
/// Last time this session's screen was considered for a mirror. Combined
|
||||
/// with the byte threshold so low-throughput prompt/TUI updates persist
|
||||
/// quickly without writing on every packet in high-throughput bursts.
|
||||
last_screen_persist_at: Instant,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
@@ -511,6 +516,7 @@ impl ServerState {
|
||||
persistent,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now() - SCREEN_PERSIST_MAX_AGE,
|
||||
},
|
||||
);
|
||||
Ok(())
|
||||
@@ -648,6 +654,7 @@ impl ServerState {
|
||||
persistent: true,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: output_seq,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
eprintln!(
|
||||
@@ -1736,10 +1743,10 @@ async fn handle_detach(state: &Arc<Mutex<ServerState>>, packet: &protocol::Packe
|
||||
let (key, _) = find_client_decrypt_key(state, &packet.header)?;
|
||||
let _ = protocol::decrypt_body(packet, &key, CLIENT_TO_SERVER)?;
|
||||
let mut locked = state.lock().expect("server state poisoned");
|
||||
if let Some(client) = locked.client_mut(&packet.header.conn_id) {
|
||||
if !client.replay.accept(packet.header.seq) {
|
||||
return Ok(());
|
||||
}
|
||||
if let Some(client) = locked.client_mut(&packet.header.conn_id)
|
||||
&& !client.replay.accept(packet.header.seq)
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
locked.remove_client_everywhere(&packet.header.conn_id);
|
||||
Ok(())
|
||||
@@ -2674,7 +2681,6 @@ async fn handle_file_request(
|
||||
let (file, temp_path, written, atomic) = if resume && final_path.exists() {
|
||||
let mut file = fs::OpenOptions::new()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.append(true)
|
||||
.open(&final_path)
|
||||
.with_context(|| format!("open {}", final_path.display()))?;
|
||||
@@ -3451,16 +3457,20 @@ async fn broadcast_output(
|
||||
session.recent.pop_front();
|
||||
}
|
||||
// For a persistent session, mirror the screen to disk periodically so a
|
||||
// post-restart reattach repaints. Throttled by accumulated bytes to keep
|
||||
// the (atomic) write off the per-packet hot path. The actual file write
|
||||
// happens after the lock is dropped.
|
||||
// post-restart reattach repaints. Throttled by accumulated bytes or a
|
||||
// short wall-clock age so low-throughput prompt/TUI changes persist
|
||||
// quickly while large bursts still avoid per-packet disk writes. The
|
||||
// actual file write happens after the lock is dropped.
|
||||
if session.persistent {
|
||||
session.bytes_since_persist = session
|
||||
.bytes_since_persist
|
||||
.saturating_add(output.bytes.len());
|
||||
if session.bytes_since_persist >= SCREEN_PERSIST_BYTES {
|
||||
let now = Instant::now();
|
||||
if session.bytes_since_persist >= SCREEN_PERSIST_BYTES
|
||||
|| now.duration_since(session.last_screen_persist_at) >= SCREEN_PERSIST_MAX_AGE
|
||||
{
|
||||
session.bytes_since_persist = 0;
|
||||
session.last_persisted_seq = output_seq;
|
||||
session.last_screen_persist_at = now;
|
||||
let screen = session.parser.screen();
|
||||
persist_screen = Some((
|
||||
output.session.clone(),
|
||||
@@ -3519,6 +3529,8 @@ async fn broadcast_output(
|
||||
persist::save_screen(&sessions_dir, &name, cols, rows, output_seq, &snapshot)
|
||||
{
|
||||
eprintln!("screen persist for {name} failed: {err:#}");
|
||||
} else {
|
||||
mark_screen_persisted(state, &name, output_seq);
|
||||
}
|
||||
}
|
||||
for (endpoint, packet) in sends {
|
||||
@@ -3800,8 +3812,8 @@ fn flush_persistent_screens(state: &Arc<Mutex<ServerState>>) {
|
||||
if !session.persistent || session.output_seq == session.last_persisted_seq {
|
||||
continue;
|
||||
}
|
||||
session.last_persisted_seq = session.output_seq;
|
||||
session.bytes_since_persist = 0;
|
||||
session.last_screen_persist_at = Instant::now();
|
||||
let screen = session.parser.screen();
|
||||
to_write.push((
|
||||
name.clone(),
|
||||
@@ -3818,10 +3830,19 @@ fn flush_persistent_screens(state: &Arc<Mutex<ServerState>>) {
|
||||
persist::save_screen(&sessions_dir, &name, cols, rows, output_seq, &snapshot)
|
||||
{
|
||||
eprintln!("screen flush for {name} failed: {err:#}");
|
||||
} else {
|
||||
mark_screen_persisted(state, &name, output_seq);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn mark_screen_persisted(state: &Arc<Mutex<ServerState>>, name: &str, output_seq: u64) {
|
||||
let mut locked = state.lock().expect("server state poisoned");
|
||||
if let Some(session) = locked.sessions.get_mut(name) {
|
||||
session.last_persisted_seq = session.last_persisted_seq.max(output_seq);
|
||||
}
|
||||
}
|
||||
|
||||
fn cleanup_disconnected_clients(state: &Arc<Mutex<ServerState>>) {
|
||||
// Sessions removed here are dropped after the lock is released so their
|
||||
// shells are killed (PtyHandle::drop) without holding up the event loop.
|
||||
@@ -4382,6 +4403,7 @@ mod tests {
|
||||
persistent: false,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
state.client_index.insert(client_id, "test".to_string());
|
||||
@@ -4445,6 +4467,7 @@ mod tests {
|
||||
persistent: false,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
state.client_index.insert(client_id, "test".to_string());
|
||||
@@ -4520,6 +4543,7 @@ mod tests {
|
||||
persistent: false,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
state.client_index.insert(client_id, "test".to_string());
|
||||
@@ -4689,6 +4713,7 @@ mod tests {
|
||||
persistent: false,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
// Keep the O(1) conn_id index in sync, matching `insert_client`.
|
||||
@@ -4785,6 +4810,7 @@ mod tests {
|
||||
persistent: false,
|
||||
bytes_since_persist: 0,
|
||||
last_persisted_seq: 0,
|
||||
last_screen_persist_at: Instant::now(),
|
||||
},
|
||||
);
|
||||
state.client_index.insert(client_id, "test".to_string());
|
||||
|
||||
@@ -19,6 +19,29 @@ fn release_scripts_skip_stale_artifacts_when_auto_discovering() {
|
||||
assert!(publish.contains("actual=\"$(artifact_version \"$artifact\" || true)\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn package_check_verifies_only_artifacts_it_builds() {
|
||||
let makefile = include_str!("../Makefile");
|
||||
let verify = include_str!("../scripts/verify-release-artifacts.sh");
|
||||
assert!(
|
||||
verify.contains("if [ \"$#\" -gt 0 ]; then"),
|
||||
"release verifier must accept an explicit artifact list"
|
||||
);
|
||||
let package_check = makefile
|
||||
.split("package-check:")
|
||||
.nth(1)
|
||||
.and_then(|tail| tail.split("\ninstall:").next())
|
||||
.expect("package-check target");
|
||||
assert!(package_check.contains("package-release-linux"));
|
||||
assert!(package_check.contains("package-release-windows"));
|
||||
assert!(package_check.contains("dosh-linux-x86_64.tar.gz"));
|
||||
assert!(package_check.contains("dosh-windows-x86_64.zip"));
|
||||
assert!(
|
||||
!package_check.contains("dosh-macos-aarch64.tar.gz"),
|
||||
"Linux package-check does not build macOS artifacts, so it must not depend on one"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn systemd_service_does_not_sandbox_remote_shells() {
|
||||
let service = include_str!("../packaging/systemd/dosh-server.service");
|
||||
|
||||
Reference in New Issue
Block a user