refactor: restructure the picoserve code into HttpApiService
This commit is contained in:
+8
-23
@@ -18,8 +18,8 @@ use esp_hal::timer::timg::TimerGroup;
|
||||
use esp_println as _;
|
||||
use esp_radio::wifi::sta::StationConfig;
|
||||
use esp_radio::wifi::{ControllerConfig, Interface, WifiController};
|
||||
use picoserve::routing::get;
|
||||
use picoserve::{AppBuilder, AppRouter};
|
||||
|
||||
use cover_theif::http_api::{self, HttpApiProps, HttpApiService};
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
@@ -40,16 +40,6 @@ macro_rules! mk_static {
|
||||
const SSID: &str = env!("SSID");
|
||||
const PASSWORD: &str = env!("PASSWORD");
|
||||
|
||||
struct AppProps;
|
||||
|
||||
impl AppBuilder for AppProps {
|
||||
type PathRouter = impl picoserve::routing::PathRouter;
|
||||
|
||||
fn build_app(self) -> picoserve::Router<Self::PathRouter> {
|
||||
picoserve::Router::new().route("/", get(|| async move { "Hello World" }))
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(
|
||||
clippy::large_stack_frames,
|
||||
reason = "it's not unusual to allocate larger buffers etc. in main"
|
||||
@@ -109,17 +99,7 @@ async fn main(spawner: Spawner) -> ! {
|
||||
info!("Got IP: {}", config.address);
|
||||
}
|
||||
|
||||
let app = mk_static!(AppRouter<AppProps>, AppProps.build_app());
|
||||
|
||||
let port = 80;
|
||||
let mut tcp_rx_buffer = [0; 1024];
|
||||
let mut tcp_tx_buffer = [0; 1024];
|
||||
let mut http_buffer = [0; 2048];
|
||||
let web_serve_config = picoserve::Config::const_default().keep_connection_alive();
|
||||
|
||||
picoserve::Server::new(app, &web_serve_config, &mut http_buffer)
|
||||
.listen_and_serve(0, net_stack, port, &mut tcp_rx_buffer, &mut tcp_tx_buffer)
|
||||
.await;
|
||||
spawner.spawn(http_api_serve_task(HttpApiService::new(net_stack, Default::default(), Default::default())).unwrap());
|
||||
|
||||
loop {
|
||||
info!("Hello world");
|
||||
@@ -157,3 +137,8 @@ async fn connection(mut controller: WifiController<'static>) {
|
||||
async fn net_task(mut runner: Runner<'static, Interface<'static>>) {
|
||||
runner.run().await
|
||||
}
|
||||
|
||||
#[embassy_executor::task]
|
||||
async fn http_api_serve_task(mut service: HttpApiService<'static, HttpApiProps>) {
|
||||
service.serve().await;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user