diff --git a/Cargo.lock b/Cargo.lock index 33b21db902..0fd59cb87a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -726,7 +726,11 @@ dependencies = [ "eframe", "egui", "errors", + "http_server_common", "log", + "serde", + "serde_derive", + "serde_json", "tokio 1.16.1", ] diff --git a/crates/programs/aichatbot-sidecar/Cargo.toml b/crates/programs/aichatbot-sidecar/Cargo.toml index 7498a8e78f..1a0edb0fdd 100644 --- a/crates/programs/aichatbot-sidecar/Cargo.toml +++ b/crates/programs/aichatbot-sidecar/Cargo.toml @@ -16,6 +16,7 @@ path = "src/main.rs" # Internal errors = { path = "../../lib/errors" } +http_server_common = { path = "../../lib/http_server_common" } # External clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated @@ -39,3 +40,8 @@ actix-service = "2.0.1" actix-utils = "3.0.0" actix-web = "4.0.0-beta.10" actix-web-actors = "4.0.0-beta.7" + +# Serialization +serde = "1.0.125" +serde_derive = "1.0.125" +serde_json = "1.0.64" diff --git a/crates/programs/aichatbot-sidecar/src/gui/gui.rs b/crates/programs/aichatbot-sidecar/src/gui/gui.rs index 532daae617..6639d0142f 100644 --- a/crates/programs/aichatbot-sidecar/src/gui/gui.rs +++ b/crates/programs/aichatbot-sidecar/src/gui/gui.rs @@ -1,4 +1,5 @@ use eframe::egui; +use log::info; pub struct AppGui { filename: String, diff --git a/crates/programs/aichatbot-sidecar/src/main.rs b/crates/programs/aichatbot-sidecar/src/main.rs index c976fa4513..a77e8e12b0 100644 --- a/crates/programs/aichatbot-sidecar/src/main.rs +++ b/crates/programs/aichatbot-sidecar/src/main.rs @@ -8,14 +8,24 @@ pub mod main_loop; pub mod state; pub mod web_server; +#[macro_use] extern crate serde_derive; + +use std::thread; +use std::time::Duration; +use tokio::runtime::Runtime; +//use actix_rt::Runtime; +use actix_web::{HttpResponse, HttpServer, web}; use clap::{App, Arg}; use crate::main_loop::main_loop; use errors::AnyhowResult; use log::info; use crate::gui::launch_gui::launch_gui; +use crate::web_server::get_next_audio_file_handler::get_next_audio_file_handler; +use crate::web_server::launch_web_server::launch_web_server; -#[tokio::main] +//#[tokio::main] +#[actix_web::main] pub async fn main() -> AnyhowResult<()> { easyenv::init_all_with_default_logging(Some("info")); @@ -34,11 +44,69 @@ pub async fn main() -> AnyhowResult<()> { // .takes_value(true)) // .get_matches(); - info!("starting main loop..."); - let _r = launch_gui()?; + info!("Get runtime..."); - let _r = main_loop().await?; + let tokio_runtime = Runtime::new()?; + + + //info!("Starting main loop..."); + + tokio_runtime.spawn(async { + info!("STARTING MAIN LOOP..."); + let _r = main_loop().await; + }); + + info!("Launching GUI..."); + thread::spawn(|| { + info!("LAUNCHING GUI..."); + let _r = launch_gui(); + }); + + + //tokio_runtime.spawn(async { + // info!("LAUNCHING GUI..."); + // let _r = launch_gui(); + //}); + + info!("Starting web server..."); + + //tokio_runtime.spawn(async move { + // info!("LAUNCHING WEBSERVER..."); + // //let _r = launch_gui(); + // let _r = launch_web_server().await; + //}); + + //thread::spawn(move || { + // info!("LAUNCHING WEBSERVER..."); + // //tokio::runtime::Runtime::new().unwrap().block_on(async { + // tokio_runtime.block_on(async { + // let _r = launch_web_server().await; + // }); + //}); + + +// HttpServer::new(move || { +// let app = actix_web::App::new(); +// //.app_data(web::Data::new(server_state_arc.firehose_publisher.clone())) +// +// app.service( +// web::resource("/next") +// .route(web::get().to(get_next_audio_file_handler)) +// .route(web::head().to(|| HttpResponse::Ok())) +// ) +// }) +// .bind("localhost:23333")? +// .workers(8) +// .run() +// .await?; + + let _r = launch_web_server().await; + + loop { + info!("Sleep"); + thread::sleep(Duration::from_secs(5)); + } Ok(()) } diff --git a/crates/programs/aichatbot-sidecar/src/main_loop.rs b/crates/programs/aichatbot-sidecar/src/main_loop.rs index 953bb7b0bc..8792f9929f 100644 --- a/crates/programs/aichatbot-sidecar/src/main_loop.rs +++ b/crates/programs/aichatbot-sidecar/src/main_loop.rs @@ -8,6 +8,4 @@ pub async fn main_loop() -> AnyhowResult<()> { info!("iter"); thread::sleep(Duration::from_millis(5000)); } - - Ok(()) -} \ No newline at end of file +} diff --git a/crates/programs/aichatbot-sidecar/src/web_server/get_next_audio_file_handler.rs b/crates/programs/aichatbot-sidecar/src/web_server/get_next_audio_file_handler.rs index e69de29bb2..4793ea66c6 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/get_next_audio_file_handler.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/get_next_audio_file_handler.rs @@ -0,0 +1,51 @@ +use actix_http::StatusCode; +use actix_web::{HttpRequest, HttpResponse, ResponseError, web}; +use http_server_common::response::serialize_as_json_error::serialize_as_json_error; + +#[derive(Serialize)] +pub struct GetNextAudioFileResponse { + pub success: bool, + pub is_paused: bool, +} + +#[derive(Debug, Serialize)] +pub enum GetNextAudioFileError { + ServerError, +} + +impl ResponseError for GetNextAudioFileError { + fn status_code(&self) -> StatusCode { + match *self { + GetNextAudioFileError::ServerError => StatusCode::INTERNAL_SERVER_ERROR, + } + } + + fn error_response(&self) -> HttpResponse { + serialize_as_json_error(self) + } +} + +// NB: Not using derive_more::Display since Clion doesn't understand it. +impl std::fmt::Display for GetNextAudioFileError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} + +pub async fn get_next_audio_file_handler( + _http_request: HttpRequest, + //_server_state: web::Data> +) -> Result { + + let response = GetNextAudioFileResponse { + success: true, + is_paused: false, + }; + + let body = serde_json::to_string(&response) + .map_err(|e| GetNextAudioFileError::ServerError)?; + + Ok(HttpResponse::Ok() + .content_type("application/json") + .body(body)) +} diff --git a/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs b/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs new file mode 100644 index 0000000000..3c2710cb51 --- /dev/null +++ b/crates/programs/aichatbot-sidecar/src/web_server/launch_web_server.rs @@ -0,0 +1,22 @@ +use actix_web::{App, HttpResponse, HttpServer, web}; +use crate::web_server::get_next_audio_file_handler::get_next_audio_file_handler; +use errors::AnyhowResult; + +pub async fn launch_web_server() -> AnyhowResult<()> { + HttpServer::new(move || { + let app = App::new(); + //.app_data(web::Data::new(server_state_arc.firehose_publisher.clone())) + + app.service( + web::resource("/next") + .route(web::get().to(get_next_audio_file_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + }) + .bind("localhost:23333")? + .workers(8) + .run() + .await?; + + Ok(()) +} \ No newline at end of file diff --git a/crates/programs/aichatbot-sidecar/src/web_server/mod.rs b/crates/programs/aichatbot-sidecar/src/web_server/mod.rs index 6d5f6c287d..d36640cfe2 100644 --- a/crates/programs/aichatbot-sidecar/src/web_server/mod.rs +++ b/crates/programs/aichatbot-sidecar/src/web_server/mod.rs @@ -1 +1,2 @@ -pub mod get_next_audio_file_handler; \ No newline at end of file +pub mod get_next_audio_file_handler; +pub mod launch_web_server; \ No newline at end of file