Refactor error handling and remove unused typing module

- Removed the `typing` module and its associated types and functions.
- Replaced custom error handling with `anyhow` for better error management across various modules.
- Updated function signatures in `calendar`, `iccard`, `jwcas`, `lab`, `jwqywx`, and `sso` implementations to return `anyhow::Result` instead of custom error types.
- Adjusted error handling in `recursion` to use `anyhow` for improved clarity and consistency.
- Ensured all relevant functions propagate errors correctly using the new error handling approach.

Author: H2Sxxa

Cargo.lock

@@ -28,6 +28,7 @@ uuid = { version = "1", features = ["v4", "v3"], optional = true }
 chrono = { version = "0.4", optional = true }
 icalendar = { version = "0.17.5", optional = true }
 const_format = "0.2.34"
+anyhow = "1"
 
 
 [features]

Cargo.toml

@@ -1,3 +1,2 @@
 pub mod app;
 pub mod client;
-pub mod typing;

src/base/mod.rs

@@ -7,7 +7,7 @@ use std::{
 };
 use uuid::Uuid;
 
-use crate::base::typing::{other_error, TorErr};
+use anyhow::{Result, bail};
 
 pub static EVENT_PROP: LazyLock<HashMap<&'static str, &'static str>> = LazyLock::new(|| {
     let mut map: HashMap<&str, &str> = HashMap::new();
@@ -207,28 +207,28 @@ pub trait ApplicationCalendarExt {
         firstweekdate: String,
         schedule: Schedule,
         reminder: Option<i32>,
-    ) -> TorErr<Calendar>;
+    ) -> Result<Calendar>;
     fn generate_icalendar(
         &self,
         firstweekdate: String,
         schedule: Schedule,
         reminder: Option<i32>,
-    ) -> impl Future<Output = TorErr<Calendar>>;
+    ) -> impl Future<Output = Result<Calendar>>;
 }
 
 pub trait CalendarParser {
     /// The Matrix's column is indexed 0~6
     ///
     /// Each Vec<String> is in order.
 
-    fn get_classinfo_week_matrix(&self) -> impl Future<Output = TorErr<Vec<Vec<RawCourse>>>>;
+    fn get_classinfo_week_matrix(&self) -> impl Future<Output = Result<Vec<Vec<RawCourse>>>>;
 }
 
 pub trait TermCalendarParser: CalendarParser {
     fn get_term_classinfo_week_matrix(
         &self,
         term: String,
-    ) -> impl Future<Output = TorErr<Vec<Vec<RawCourse>>>>;
+    ) -> impl Future<Output = Result<Vec<Vec<RawCourse>>>>;
 }
 
 impl<P: CalendarParser> ApplicationCalendarExt for P {
@@ -238,7 +238,7 @@ impl<P: CalendarParser> ApplicationCalendarExt for P {
         firstweekdate: String,
         schedule: Schedule,
         reminder: Option<i32>,
-    ) -> TorErr<Calendar> {
+    ) -> Result<Calendar> {
         let mut calendar = Calendar::new();
         calendar.timezone("Asia/Shanghai").name("课程表");
         let mut classlist = classlist;
@@ -332,7 +332,7 @@ impl<P: CalendarParser> ApplicationCalendarExt for P {
         firstmonday: String,
         schedule: Schedule,
         reminder: Option<i32>,
-    ) -> TorErr<Calendar> {
+    ) -> Result<Calendar> {
         let classlist = self.get_classinfo_week_matrix().await?;
 
         self.generate_icalendar_from_classlist(
@@ -344,15 +344,15 @@ impl<P: CalendarParser> ApplicationCalendarExt for P {
     }
 }
 
-pub fn parse_week_matrix(row_matrix: Vec<Vec<RawCourse>>) -> TorErr<Vec<ParsedCourse>> {
+pub fn parse_week_matrix(row_matrix: Vec<Vec<RawCourse>>) -> Result<Vec<ParsedCourse>> {
     let mut column_matrix: Vec<Vec<RawCourse>> = vec![];
     for i in 0..7 {
         let mut column: Vec<RawCourse> = vec![];
         for v in row_matrix.iter() {
             if let Some(value) = v.get(i) {
                 column.push(value.clone())
             } else {
-                return Err(other_error("Parse Classinfo error"));
+                bail!("Parse Classinfo error");
             }
         }
         column_matrix.push(column);

src/base/typing.rs

@@ -3,17 +3,14 @@ use std::fmt::Display;
 use tokio::join;
 
 use crate::{
-    base::{
-        app::Application,
-        client::Client,
-        typing::{other_error, TorErr},
-    },
+    base::{app::Application, client::Client},
     impls::apps::iccard::{
         iccard_constants::PRESET_DORMBUILDINGS,
         iccard_type::{DormArea, DormBuilding, DormBuildingsData, DormRoomElectricityBillData},
     },
     internals::fields::DEFAULT_HEADERS,
 };
+use anyhow::Result;
 
 pub struct ICCardApplication<C, S> {
     pub client: C,
@@ -38,7 +35,7 @@ impl<C: Client + Clone, S: Display> ICCardApplication<C, S> {
         area: DormArea<impl Into<String>>,
         building: DormBuilding,
         room: impl Into<String>,
-    ) -> TorErr<DormRoomElectricityBillData> {
+    ) -> Result<DormRoomElectricityBillData> {
         let url = self.endpoint("wechat/callinterface/queryElecRoomInfo.html");
         let areaname = area.name.into();
         let areaid = area.id.into();
@@ -69,15 +66,14 @@ impl<C: Client + Clone, S: Display> ICCardApplication<C, S> {
                 }).to_string(),
             }))
             .send()
-            .await
-            .map_err(other_error)?;
-        Ok(response.json().await.map_err(other_error)?)
+            .await?;
+        Ok(response.json().await?)
     }
 
     pub async fn list_buildings(
         &self,
         area: DormArea<impl Into<String>>,
-    ) -> TorErr<DormBuildingsData> {
+    ) -> Result<DormBuildingsData> {
         let url = self.endpoint("wechat/callinterface/queryElecBuilding.html");
         let id = area.id.into();
         let name = area.name.into();
@@ -97,12 +93,11 @@ impl<C: Client + Clone, S: Display> ICCardApplication<C, S> {
                 "account": self.client.account().user,
             }))
             .send()
-            .await
-            .map_err(other_error)?;
-        Ok(response.json().await.map_err(other_error)?)
+            .await?;
+        Ok(response.json().await?)
     }
 
-    pub async fn list_all_preset_buildings(&self) -> TorErr<Vec<DormBuildingsData>> {
+    pub async fn list_all_preset_buildings(&self) -> Result<Vec<DormBuildingsData>> {
         let task = |index: usize| async move {
             let area: DormArea<&'static str> = PRESET_DORMBUILDINGS[index].clone();
 

src/extension/calendar.rs

@@ -5,9 +5,9 @@ use scraper::{ElementRef, Html, Selector};
 
 use crate::base::app::Application;
 use crate::base::client::Client;
-use crate::base::typing::{other_error, EmptyOrErr, TorErr};
 use crate::impls::services::sso_redirect::SSORedirect;
 use crate::internals::recursion::recursion_redirect_handle;
+use anyhow::{bail, Result};
 
 use super::jwcas_type::GradeData;
 
@@ -28,42 +28,39 @@ impl<C: Client + Clone> Application<C> for JwcasApplication<C> {
 
 impl<C: Client + Clone + Send> JwcasApplication<C> {
     /// will call login after [`Self::from_client`]
-    pub async fn from_client_login(client: C) -> TorErr<Self> {
+    pub async fn from_client_login(client: C) -> Result<Self> {
         let app = Self::from_client(client).await;
         app.login().await?;
         Ok(app)
     }
 
     /// Visit this Url will login in too.
-    pub async fn login(&self) -> EmptyOrErr {
+    pub async fn login(&self) -> Result<()> {
         let api = format!("{}/web_cas/web_cas_login_jwgl.aspx", self.root);
-        recursion_redirect_handle(self.client.clone(), &api)
-            .await
-            .map_err(other_error)?;
+        recursion_redirect_handle(self.client.clone(), &api).await?;
         Ok(())
     }
 
-    pub async fn get_classlist_html(&self) -> TorErr<String> {
+    pub async fn get_classlist_html(&self) -> Result<String> {
         self.get_html("/web_jxrw/cx_kb_xsgrkb.aspx").await
     }
 
-    pub async fn get_gradelist_html(&self) -> TorErr<String> {
+    pub async fn get_gradelist_html(&self) -> Result<String> {
         self.get_html("/web_cjgl/cx_cj_jxjhcj_xh.aspx").await
     }
 
-    pub async fn get_html(&self, service: impl Display) -> TorErr<String> {
+    pub async fn get_html(&self, service: impl Display) -> Result<String> {
         let api = format!("{}{}", self.root, service);
 
         if let Ok(response) = self.client.reqwest_client().get(api).send().await {
             if response.status() == StatusCode::OK {
                 return Ok(response.text().await.unwrap());
             }
         }
-
-        Err(other_error(format!("Get {service} failed")))
+        bail!("Get {service} failed");
     }
 
-    pub async fn get_gradeinfo_vec(&self) -> TorErr<Vec<GradeData>> {
+    pub async fn get_gradeinfo_vec(&self) -> Result<Vec<GradeData>> {
         let text = self.get_gradelist_html().await?;
         let tb_up = Selector::parse(r#"table[id="GVkbk"]"#).unwrap();
         let selector = Selector::parse(r#"tr[class="dg1-item"]"#).unwrap();
@@ -97,15 +94,15 @@ fn extract_string(element: Option<&ElementRef>) -> String {
 pub mod calendar {
     use std::collections::HashMap;
 
+    use anyhow::{Context, Result};
     use scraper::{Html, Selector};
 
     use crate::base::client::Client;
-    use crate::base::typing::{other_error, TorErr};
     use crate::extension::calendar::{CalendarParser, RawCourse};
 
     use super::JwcasApplication;
     impl<C: Client + Clone + Send> CalendarParser for JwcasApplication<C> {
-        async fn get_classinfo_week_matrix(&self) -> TorErr<Vec<Vec<RawCourse>>> {
+        async fn get_classinfo_week_matrix(&self) -> Result<Vec<Vec<RawCourse>>> {
             let text = self.get_classlist_html().await?;
             let doc = Html::parse_document(&text);
 
@@ -121,7 +118,7 @@ pub mod calendar {
             let mut teachers = HashMap::new();
             doc.select(&tb_up_rowseletor)
                 .next()
-                .ok_or(other_error("Select Teacher Failed"))?
+                .context("Select Teacher Failed")?
                 .select(&tb_dg1_itemseletor)
                 .for_each(|e| {
                     let items: Vec<String> = e
@@ -143,7 +140,7 @@ pub mod calendar {
             Ok(doc
                 .select(&tb_dn_seletor)
                 .next()
-                .ok_or(other_error("Select Course Failed"))?
+                .context("Select Course Failed")?
                 .select(&tb_dg1_itemseletor)
                 .map(|e| {
                     let mut items: Vec<String> = e

src/impls/apps/iccard/iccard.rs

@@ -1,14 +1,11 @@
 use std::collections::HashMap;
 
 use crate::{
-    base::{
-        app::Application,
-        client::Client,
-        typing::{other_error, EmptyOrErr, TorErr},
-    },
+    base::{app::Application, client::Client},
     impls::login::sso::SSOUniversalLogin,
     internals::fields::DEFAULT_HEADERS,
 };
+use anyhow::Result;
 
 static LABAPP_ROOT: &'static str = "https://sysaqgl.cczu.edu.cn";
 
@@ -24,15 +21,15 @@ impl<C: Client> Application<C> for LabApplication<C> {
 
 impl<C: Client + Clone + Send + Sync> LabApplication<C> {
     /// Support LAN/WAN
-    pub async fn exam_login(&self) -> EmptyOrErr {
+    pub async fn exam_login(&self) -> Result<()> {
         self.client
             .sso_service_login(format!("{LABAPP_ROOT}/labexam/examIDSLogin.php"))
             .await?;
 
         Ok(())
     }
 
-    pub async fn exam_increase_thirty_secs(&self) -> TorErr<LabExamStudyInfo> {
+    pub async fn exam_increase_thirty_secs(&self) -> Result<LabExamStudyInfo> {
         let api = format!("{LABAPP_ROOT}/labexam/exam_xuexi_online.php");
         let mut params = HashMap::new();
         params.insert("cmd", "xuexi_online");
@@ -44,11 +41,9 @@ impl<C: Client + Clone + Send + Sync> LabApplication<C> {
             .headers(DEFAULT_HEADERS.clone())
             .form(&params)
             .send()
-            .await
-            .map_err(other_error)?
+            .await?
             .json()
-            .await
-            .map_err(other_error)?)
+            .await?)
     }
 }