scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-07 08:27:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(cli): tidy socket autostart helper

Browse source 
Dedupe bearer-token extraction and the trailing from_bundle construction
in the managed Unix-socket connect path, return Bind from the
ensure_server_running_on_socket helper to match its sibling, and drop
"target" from its overlong name.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-04-20 14:51:59 -04:00
parent 8f037b68b0
commit 9db635422b
No known key found for this signature in database
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/crates/fabro-cli/src/commands/server/start.rs
View file

@ -103,14 +103,13 @@ pub(crate) async fn ensure_server_running_on_socket(
socket_path: &Path,
config_path: &Path,
storage_dir: &Path,
) -> Result<()> {
let _ = ensure_server_running_with_bind(
) -> Result<Bind> {
ensure_server_running_with_bind(
Some(BindRequest::Unix(socket_path.to_path_buf())),
config_path,
storage_dir,
)
.await?;
Ok(())
.await
}
async fn ensure_server_running_with_bind(

40
lib/crates/fabro-cli/src/server_client.rs
View file

@ -211,7 +211,7 @@ pub(crate) async fn connect_server_with_settings(
) -> Result<ServerStoreClient> {
if let Some(target) = user_config::resolve_nondefault_server_target(args, settings)? {
if let user_config::ServerTarget::UnixSocket(path) = &target {
return connect_managed_unix_socket_target_api_client_bundle(
return connect_managed_unix_socket_api_client_bundle(
path,
&user_config::storage_dir(settings)?,
base_config_path,
@ -224,7 +224,7 @@ pub(crate) async fn connect_server_with_settings(
connect_local_api_client_bundle(&user_config::storage_dir(settings)?, base_config_path).await
}
async fn connect_managed_unix_socket_target_api_client_bundle(
async fn connect_managed_unix_socket_api_client_bundle(
path: &Path,
storage_dir: &Path,
active_config_path: &Path,
@ -236,32 +236,20 @@ async fn connect_managed_unix_socket_target_api_client_bundle(
local_dev_token_fallback(&target),
)?;
let refreshable_oauth = refreshable_oauth(&target, bearer.as_ref())?;
let bearer_token = bearer.as_ref().map(ResolvedBearer::bearer_token);
if let Ok(bundle) = try_connect_unix_socket_api_client_bundle(
path,
Some(storage_dir),
bearer.as_ref().map(ResolvedBearer::bearer_token),
)
.await
let bundle = if let Ok(bundle) =
try_connect_unix_socket_api_client_bundle(path, Some(storage_dir), bearer_token).await
{
return Ok(ServerStoreClient::from_bundle(
bundle,
"http://fabro".to_string(),
refreshable_oauth,
));
}
start::ensure_server_running_on_socket(path, active_config_path, storage_dir)
.await
.with_context(|| format!("Failed to start fabro server for {}", path.display()))?;
let bundle = connect_unix_socket_api_client_bundle(
path,
Some(storage_dir),
bearer.as_ref().map(ResolvedBearer::bearer_token),
)
.await
.with_context(|| format!("Failed to connect to fabro server at {}", path.display()))?;
bundle
} else {
start::ensure_server_running_on_socket(path, active_config_path, storage_dir)
.await
.with_context(|| format!("Failed to start fabro server for {}", path.display()))?;
connect_unix_socket_api_client_bundle(path, Some(storage_dir), bearer_token)
.await
.with_context(|| format!("Failed to connect to fabro server at {}", path.display()))?
};
Ok(ServerStoreClient::from_bundle(
bundle,