Merge pull request #22 from FxQnLr/0.3.3

0.3.3

1 files changed, 75 insertions, 23 deletions

diff --git a/src/main.rs b/src/main.rs
index d17984f..00fc6ce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,30 @@
-use crate::config::Config;
-use crate::db::init_db_pool;
-use crate::routes::device;
-use crate::routes::start::start;
-use crate::routes::status::status;
-use crate::services::ping::StatusMap;
-use axum::middleware::from_fn_with_state;
-use axum::routing::{get, put};
-use axum::{routing::post, Router};
+use crate::{
+    config::Config,
+    db::init_db_pool,
+    routes::{device, start, status},
+    services::ping::{BroadcastCommand, StatusMap},
+};
+use axum::{
+    middleware::from_fn_with_state,
+    routing::{get, post},
+    Router,
+};
 use dashmap::DashMap;
-use services::ping::BroadcastCommand;
 use sqlx::PgPool;
-use std::env;
-use std::sync::Arc;
+use time::UtcOffset;
+use std::{env, sync::Arc};
 use tokio::sync::broadcast::{channel, Sender};
 use tracing::{info, level_filters::LevelFilter};
-use tracing_subscriber::fmt::time::UtcTime;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{
+    fmt::{self, time::OffsetTime},
+    prelude::*,
+    EnvFilter,
+};
+use utoipa::{
+    openapi::security::{ApiKey, ApiKeyValue, SecurityScheme},
+    Modify, OpenApi,
+};
+use utoipa_swagger_ui::SwaggerUi;
 
 mod config;
 mod db;
@@ -25,20 +34,62 @@ mod routes;
 mod services;
 mod wol;
 
+#[derive(OpenApi)]
+#[openapi(
+    paths(
+        start::start,
+        device::get,
+        device::get_path,
+        device::post,
+        device::put,
+    ),
+    components(
+        schemas(
+            start::Payload,
+            start::Response,
+            device::PutDevicePayload,
+            device::GetDevicePayload,
+            device::PostDevicePayload,
+            db::DeviceSchema,
+        )
+    ),
+    modifiers(&SecurityAddon),
+    tags(
+        (name = "Webol", description = "Webol API")
+    )
+)]
+struct ApiDoc;
+
+struct SecurityAddon;
+
+impl Modify for SecurityAddon {
+    fn modify(&self, openapi: &mut utoipa::openapi::OpenApi) {
+        if let Some(components) = openapi.components.as_mut() {
+            components.add_security_scheme(
+                "api_key",
+                SecurityScheme::ApiKey(ApiKey::Header(ApiKeyValue::new("Authorization"))),
+            );
+        }
+    }
+}
+
 #[tokio::main]
+#[allow(deprecated)]
 async fn main() -> color_eyre::eyre::Result<()> {
     color_eyre::install()?;
 
+    let config = Config::load()?;
+
     let time_format =
         time::macros::format_description!("[year]-[month]-[day] [hour]:[minute]:[second]");
-    let loc = UtcTime::new(time_format);
+    let time = OffsetTime::new(UtcOffset::from_hms(config.timeoffset, 0, 0)?, time_format);
 
     let file_appender = tracing_appender::rolling::daily("logs", "webol.log");
     let (non_blocking, _guard) = tracing_appender::non_blocking(file_appender);
 
     tracing_subscriber::registry()
         .with(fmt::layer().with_writer(non_blocking).with_ansi(false))
-        .with(fmt::layer().with_timer(loc))
+        .with(fmt::layer().with_timer(time))
         .with(
             EnvFilter::builder()
                 .with_default_directive(LevelFilter::INFO.into())
@@ -48,8 +99,6 @@ async fn main() -> color_eyre::eyre::Result<()> {
 
     let version = env!("CARGO_PKG_VERSION");
 
-    let config = Config::load()?;
-
     info!("start webol v{}", version);
 
     let db = init_db_pool(&config.database_url).await;
@@ -67,12 +116,15 @@ async fn main() -> color_eyre::eyre::Result<()> {
     };
 
     let app = Router::new()
-        .route("/start", post(start))
-        .route("/device", get(device::get))
-        .route("/device", put(device::put))
-        .route("/device", post(device::post))
-        .route("/status", get(status))
+        .route("/start", post(start::start))
+        .route(
+            "/device",
+            post(device::post).get(device::get).put(device::put),
+        )
+        .route("/device/:id", get(device::get_path))
+        .route("/status", get(status::status))
         .route_layer(from_fn_with_state(shared_state.clone(), extractors::auth))
+        .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
         .with_state(Arc::new(shared_state));
 
     let addr = config.serveraddr;