feat: commit hash in banner, version command, file upload/download
This commit is contained in:
parent
cb86894369
commit
f7d29a98d3
8 changed files with 202 additions and 9 deletions
|
|
@ -1,6 +1,6 @@
|
|||
use std::time::Duration;
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
extract::{Path, Query, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
Json,
|
||||
|
|
@ -307,6 +307,103 @@ pub async fn maximize_and_focus(
|
|||
}
|
||||
}
|
||||
|
||||
/// GET /version — server version (public, no auth)
|
||||
pub async fn server_version() -> impl IntoResponse {
|
||||
Json(serde_json::json!({
|
||||
"version": env!("CARGO_PKG_VERSION"),
|
||||
"commit": env!("GIT_COMMIT"),
|
||||
}))
|
||||
}
|
||||
|
||||
/// GET /sessions/:id/version — client version
|
||||
pub async fn client_version(
|
||||
Path(session_id): Path<String>,
|
||||
State(state): State<AppState>,
|
||||
) -> impl IntoResponse {
|
||||
match dispatch(&state, &session_id, "version", |rid| {
|
||||
ServerMessage::VersionRequest { request_id: rid }
|
||||
})
|
||||
.await
|
||||
{
|
||||
Ok(ClientMessage::VersionResponse { version, commit, .. }) => (
|
||||
StatusCode::OK,
|
||||
Json(serde_json::json!({ "version": version, "commit": commit })),
|
||||
)
|
||||
.into_response(),
|
||||
Ok(ClientMessage::Error { message, .. }) => (
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json(serde_json::json!({ "error": message })),
|
||||
)
|
||||
.into_response(),
|
||||
Ok(_) => (
|
||||
StatusCode::BAD_GATEWAY,
|
||||
Json(serde_json::json!({ "error": "Unexpected response from client" })),
|
||||
)
|
||||
.into_response(),
|
||||
Err(e) => e.into_response(),
|
||||
}
|
||||
}
|
||||
|
||||
/// POST /sessions/:id/upload
|
||||
#[derive(Deserialize)]
|
||||
pub struct UploadBody {
|
||||
pub path: String,
|
||||
pub content_base64: String,
|
||||
}
|
||||
|
||||
pub async fn upload_file(
|
||||
Path(session_id): Path<String>,
|
||||
State(state): State<AppState>,
|
||||
Json(body): Json<UploadBody>,
|
||||
) -> impl IntoResponse {
|
||||
match dispatch(&state, &session_id, "upload", |rid| ServerMessage::UploadRequest {
|
||||
request_id: rid,
|
||||
path: body.path.clone(),
|
||||
content_base64: body.content_base64.clone(),
|
||||
})
|
||||
.await
|
||||
{
|
||||
Ok(_) => (StatusCode::OK, Json(serde_json::json!({ "ok": true }))).into_response(),
|
||||
Err(e) => e.into_response(),
|
||||
}
|
||||
}
|
||||
|
||||
/// GET /sessions/:id/download?path=...
|
||||
#[derive(Deserialize)]
|
||||
pub struct DownloadQuery {
|
||||
pub path: String,
|
||||
}
|
||||
|
||||
pub async fn download_file(
|
||||
Path(session_id): Path<String>,
|
||||
State(state): State<AppState>,
|
||||
Query(query): Query<DownloadQuery>,
|
||||
) -> impl IntoResponse {
|
||||
match dispatch(&state, &session_id, "download", |rid| ServerMessage::DownloadRequest {
|
||||
request_id: rid,
|
||||
path: query.path.clone(),
|
||||
})
|
||||
.await
|
||||
{
|
||||
Ok(ClientMessage::DownloadResponse { content_base64, size, .. }) => (
|
||||
StatusCode::OK,
|
||||
Json(serde_json::json!({ "content_base64": content_base64, "size": size })),
|
||||
)
|
||||
.into_response(),
|
||||
Ok(ClientMessage::Error { message, .. }) => (
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
Json(serde_json::json!({ "error": message })),
|
||||
)
|
||||
.into_response(),
|
||||
Ok(_) => (
|
||||
StatusCode::BAD_GATEWAY,
|
||||
Json(serde_json::json!({ "error": "Unexpected response from client" })),
|
||||
)
|
||||
.into_response(),
|
||||
Err(e) => e.into_response(),
|
||||
}
|
||||
}
|
||||
|
||||
/// POST /sessions/:id/label
|
||||
#[derive(Deserialize)]
|
||||
pub struct LabelBody {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@ async fn main() -> anyhow::Result<()> {
|
|||
.with(tracing_subscriber::fmt::layer())
|
||||
.init();
|
||||
|
||||
const GIT_COMMIT: &str = env!("GIT_COMMIT");
|
||||
info!("helios-server v{} ({})", env!("CARGO_PKG_VERSION"), GIT_COMMIT);
|
||||
|
||||
let api_key = std::env::var("HELIOS_API_KEY")
|
||||
.unwrap_or_else(|_| "dev-secret".to_string());
|
||||
|
||||
|
|
@ -52,10 +55,14 @@ async fn main() -> anyhow::Result<()> {
|
|||
.route("/sessions/:id/windows/minimize-all", post(api::minimize_all))
|
||||
.route("/sessions/:id/windows/:window_id/focus", post(api::focus_window))
|
||||
.route("/sessions/:id/windows/:window_id/maximize", post(api::maximize_and_focus))
|
||||
.route("/sessions/:id/version", get(api::client_version))
|
||||
.route("/sessions/:id/upload", post(api::upload_file))
|
||||
.route("/sessions/:id/download", get(api::download_file))
|
||||
.layer(middleware::from_fn_with_state(state.clone(), require_api_key));
|
||||
|
||||
let app = Router::new()
|
||||
.route("/ws", get(ws_handler::ws_upgrade))
|
||||
.route("/version", get(api::server_version))
|
||||
.merge(protected)
|
||||
.with_state(state);
|
||||
|
||||
|
|
|
|||
|
|
@ -89,6 +89,8 @@ async fn handle_client_message(session_id: Uuid, msg: ClientMessage, state: &App
|
|||
ClientMessage::ScreenshotResponse { request_id, .. }
|
||||
| ClientMessage::ExecResponse { request_id, .. }
|
||||
| ClientMessage::ListWindowsResponse { request_id, .. }
|
||||
| ClientMessage::VersionResponse { request_id, .. }
|
||||
| ClientMessage::DownloadResponse { request_id, .. }
|
||||
| ClientMessage::Ack { request_id }
|
||||
| ClientMessage::Error { request_id, .. } => {
|
||||
let rid = *request_id;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue