Skip to content

feat: Add minimal webpage route to server #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Add minimal webpage route to server #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
705f947
feat: Add minimal webpage route to server
google-labs-jules[bot] May 20, 2025
af3ffd9
fix(server): Correct index page path and refactor headers/test
dev-msp May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 50 additions & 1 deletion server/src/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
use actix_web::{
body::BoxBody,
get,
http::header::ContentType,
middleware::Logger,
post,
web::{self, Data},
App, HttpRequest, HttpResponse, HttpServer, Responder,
};
use crossbeam::channel::{Receiver, Sender};
use serde::Serialize;
use std::fs;
use voice::{
app::{command::Command, response::Response, state::Mode},
audio::Session,
Expand Down Expand Up @@ -65,6 +68,19 @@ async fn set_mode(app: AppChannel, mode: web::Json<Mode>) -> impl Responder {
ApiResponder { content: response }
}

#[get("/")]
async fn serve_index_page() -> impl Responder {
match fs::read_to_string("../server/templates/index.html") {
Ok(content) => HttpResponse::Ok()
.content_type(ContentType::html())
.body(content),
Err(e) => {
log::error!("Failed to read index.html: {}", e);
HttpResponse::NotFound().finish()
}
}
}

pub struct Server {
addr: (String, u16),
commands: Sender<Command>,
Expand Down Expand Up @@ -96,7 +112,10 @@ impl Server {
self.responses.clone(),
)));

App::new().wrap(Logger::default()).service(voice)
App::new()
.wrap(Logger::default())
.service(serve_index_page) // Add this line
.service(voice)
})
.bind(&self.addr)?;

Expand Down Expand Up @@ -129,3 +148,33 @@ pub fn parse_addr_option(s: &str) -> Result<(String, u16), AddressParseError> {

Ok((host.to_string(), port))
}

#[cfg(test)]
mod tests {
use super::*;
use actix_web::{http::header::ContentType, test, App};

#[actix_web::test]
async fn test_serve_index_page_success() {
let app = test::init_service(App::new().service(serve_index_page)).await;

let req = test::TestRequest::get().uri("/").to_request();
let resp = test::call_service(&app, req).await;

assert_eq!(resp.status(), actix_web::http::StatusCode::OK);

let content_type = resp
.headers()
.get(actix_web::http::header::CONTENT_TYPE)
.expect("Response should have a content type");

assert_eq!(
content_type.to_str().unwrap().to_owned(),
ContentType::html().to_string(),
"Content-Type should be text/html"
);

let body_bytes = test::read_body(resp).await;
assert!(String::from_utf8(body_bytes.to_vec()).is_ok());
}
}
11 changes: 11 additions & 0 deletions server/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Minimal Webpage</title>
</head>
<body>
<h1>Hello from the server!</h1>
</body>
</html>
Loading