Add simple api

Author: MaximMaximS

Cargo.lock

@@ -4,4 +4,5 @@ resolver = "2"
 members = [
     "rezvrh_scraper",
     "rezvrh_cli",
+    "rezvrh_api",
 ]

Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "rezvrh_api"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0"
+axum = "0.7"
+base64 = "0.21.7"
+rezvrh_scraper = { path = "../rezvrh_scraper" }
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = "1.0.113"
+thiserror = "1.0.56"
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

rezvrh_api/Cargo.toml

@@ -0,0 +1,96 @@
+use axum::{
+    extract::Query,
+    http::{HeaderMap, StatusCode},
+    response::{IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
+use base64::prelude::*;
+use rezvrh_scraper::{Bakalari, Error as BakalariError};
+use thiserror::Error;
+
+// Extract basic auth from headers
+fn auth(headers: &HeaderMap) -> Option<(String, String)> {
+    let auth = headers.get("authorization")?;
+    let auth = auth.to_str().ok()?;
+    let auth = auth.strip_prefix("Basic ")?;
+    let auth = BASE64_STANDARD.decode(auth).ok()?;
+    let auth = String::from_utf8(auth).ok()?;
+    let (username, password) = auth.split_once(':')?;
+    Some((username.to_string(), password.to_string()))
+}
+
+#[derive(Debug, Error)]
+enum ApiError {
+    #[error("Unauthorized")]
+    Unauthorized,
+    #[error("Bad URL")]
+    BadUrl,
+    #[error("Scrape error: {0}")]
+    ScrapeError(#[from] BakalariError),
+}
+
+impl IntoResponse for ApiError {
+    fn into_response(self) -> Response {
+        match self {
+            Self::Unauthorized => StatusCode::UNAUTHORIZED.into_response(),
+            Self::ScrapeError(err) => {
+                (StatusCode::INTERNAL_SERVER_ERROR, err.to_string()).into_response()
+            }
+            Self::BadUrl => (StatusCode::BAD_REQUEST, "No URL provided").into_response(),
+        }
+    }
+}
+
+#[derive(serde::Deserialize)]
+struct GetQuery {
+    url: String,
+}
+
+async fn get_api(headers: HeaderMap, query: Query<GetQuery>) -> Result<Bakalari, ApiError> {
+    let (username, password) = auth(&headers).ok_or(ApiError::Unauthorized)?;
+    let url = query.url.parse().map_err(|_| ApiError::BadUrl)?;
+    Ok(Bakalari::from_creds_no_store((&username, &password), url).await?)
+}
+
+async fn get_rooms(
+    headers: HeaderMap,
+    query: Query<GetQuery>,
+) -> Result<Json<Vec<String>>, ApiError> {
+    let bakalari = get_api(headers, query).await?;
+    let classes = bakalari.get_objects(rezvrh_scraper::Type::Room);
+    Ok(Json(classes))
+}
+
+async fn get_classes(
+    headers: HeaderMap,
+    query: Query<GetQuery>,
+) -> Result<Json<Vec<String>>, ApiError> {
+    let bakalari = get_api(headers, query).await?;
+    let classes = bakalari.get_objects(rezvrh_scraper::Type::Class);
+    Ok(Json(classes))
+}
+
+async fn get_teachers(
+    headers: HeaderMap,
+    query: Query<GetQuery>,
+) -> Result<Json<Vec<String>>, ApiError> {
+    let bakalari = get_api(headers, query).await?;
+    let classes = bakalari.get_objects(rezvrh_scraper::Type::Teacher);
+    Ok(Json(classes))
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    // build our application with a single route
+    let app = Router::new()
+        .route("/", get(|| async { "Hello, World!" }))
+        .route("/classes", get(get_classes))
+        .route("/rooms", get(get_rooms))
+        .route("/teachers", get(get_teachers));
+
+    // run our app with hyper, listening globally on port 3000
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await?;
+    axum::serve(listener, app).await?;
+    Ok(())
+}

rezvrh_api/src/main.rs

@@ -7,11 +7,12 @@ description = "A CLI tool for rezvrh"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.79"
-clap = { version = "4.4.18", features = ["derive"] }
+anyhow = "1"
+clap = { version = "4.4", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 reqwest = "0.11"
-inquire = "0.6.2"
+inquire = "0.6"
 serde_json = "1.0"
 rezvrh_scraper = { path = "../rezvrh_scraper" }
+md-5 = "0.10.6"

rezvrh_cli/Cargo.toml

@@ -8,10 +8,10 @@ description = "Bakalari scraper"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-derive_more = { version = "1.0.0-beta.6", features = ["full"] }
-once_cell = "1.19.0"
+derive_more = { version = "1.0.0-beta", features = ["full"] }
+once_cell = "1"
 reqwest = "0.11"
-scraper = "0.18.1"
+scraper = "0.18"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"

rezvrh_scraper/Cargo.toml

@@ -1,5 +1,6 @@
 mod modules;
 
 pub use modules::bakalari::Bakalari;
+pub use modules::bakalari::RequestError as Error;
 pub use modules::timetable::RawType as Type;
 pub use modules::timetable::Which;

rezvrh_scraper/src/lib.rs

@@ -49,11 +49,13 @@ impl Bakalari {
     /// Get list of objects
     #[must_use]
     pub fn get_objects(&self, typ: RawType) -> Vec<String> {
-        match typ {
+        let mut obj = match typ {
             RawType::Class => self.get_classes(),
             RawType::Teacher => self.get_teachers(),
             RawType::Room => self.get_rooms(),
-        }
+        };
+        obj.sort();
+        obj
     }
 
     /// Get selector

rezvrh_scraper/src/modules/bakalari/info.rs

@@ -12,7 +12,7 @@ impl Bakalari {
         let client = self.client();
         let res = client
             .reqwest_client()
-            .get(client.url().join("/timetable/public").unwrap())
+            .get(client.url().join("timetable/public").unwrap())
             .header("Cookie", format!("BakaAuth={}", self.get_token().await?))
             .send()
             .await?;

rezvrh_scraper/src/modules/bakalari/other.rs

@@ -20,7 +20,7 @@ impl Bakalari {
             .get(
                 client
                     .url()
-                    .join(&format!("/timetable/public/{which}/{timetable_type}"))
+                    .join(&format!("timetable/public/{which}/{timetable_type}"))
                     .unwrap(),
             )
             .header("Cookie", format!("BakaAuth={}", self.get_token().await?))

rezvrh_scraper/src/modules/bakalari/timetable.rs

@@ -49,7 +49,7 @@ pub async fn get_info(
     RequestError,
 > {
     let res = client
-        .get(url.join("/timetable/public").unwrap())
+        .get(url.join("timetable/public").unwrap())
         .header("Cookie", format!("BakaAuth={token}"))
         .send()
         .await?;

rezvrh_scraper/src/modules/bakalari/util.rs

@@ -30,10 +30,8 @@ pub enum ParseError {
     Lesson(#[from] LessonParseError),
 }
 
-static NAME_SELECTOR: Lazy<Selector> =
-    Lazy::new(|| Selector::parse("span.bk-day-day").unwrap());
-static DATE_SELECTOR: Lazy<Selector> =
-    Lazy::new(|| Selector::parse("span.bk-day-date").unwrap());
+static NAME_SELECTOR: Lazy<Selector> = Lazy::new(|| Selector::parse("span.bk-day-day").unwrap());
+static DATE_SELECTOR: Lazy<Selector> = Lazy::new(|| Selector::parse("span.bk-day-date").unwrap());
 static CELL_SELECTOR: Lazy<Selector> =
     Lazy::new(|| Selector::parse("div.bk-timetable-cell").unwrap());
 

rezvrh_scraper/src/modules/timetable/day.rs

@@ -49,7 +49,8 @@ impl Hour {
         let num = single_iter(num.text(), || ParseError::NoNumText)?;
         let num = num.parse::<usize>().map_err(ParseError::ParseNum)?;
         if num != i + 1 {
-            return Err(ParseError::MismatchedNum);
+            println!("num: {num}, i: {i}");
+            //return Err(ParseError::MismatchedNum);
         }
 
         let mut times = hour.select(&TIMES_SELECTOR);