improve DateTime parsing

Author: BigBoot

Cargo.lock

@@ -22,6 +22,7 @@ config = { version = "0.15.11" }
 const-str = { version = "0.7.0", features = ["proc"] }
 console-subscriber = { version = "0.4.1" }
 cute_custom_default = { version = "2.2.0" }
+dateparser = { version = "0.2.1" }
 derivative = { version = "2.2.0" }
 derive_more = { version = "2.0.1" }
 dirs = { version = "6.0.0" }

Cargo.toml

@@ -15,6 +15,7 @@ private-api = []
 uptime-kuma-v1 = []
 
 [dependencies]
+dateparser = { workspace = true }
 config = { workspace = true }
 const-str = { workspace = true }
 derivative = { workspace = true }

kuma-client/Cargo.toml

@@ -238,24 +238,44 @@ impl Worker {
     async fn on_event(self: &Arc<Self>, event: Event, payload: Value) -> Result<()> {
         match event {
             Event::MonitorList => {
-                self.on_monitor_list(serde_json::from_value(payload).unwrap())
-                    .await?
+                self.on_monitor_list(
+                    serde_json::from_value(payload)
+                        .log_error(module_path!(), |_| "Failed to deserialize MonitorList")
+                        .unwrap(),
+                )
+                .await?
             }
             Event::NotificationList => {
-                self.on_notification_list(serde_json::from_value(payload).unwrap())
-                    .await?
+                self.on_notification_list(
+                    serde_json::from_value(payload)
+                        .log_error(module_path!(), |_| "Failed to deserialize NotificationList")
+                        .unwrap(),
+                )
+                .await?
             }
             Event::MaintenanceList => {
-                self.on_maintenance_list(serde_json::from_value(payload).unwrap())
-                    .await?
+                self.on_maintenance_list(
+                    serde_json::from_value(payload)
+                        .log_error(module_path!(), |_| "Failed to deserialize MaintenanceList")
+                        .unwrap(),
+                )
+                .await?
             }
             Event::StatusPageList => {
-                self.on_status_page_list(serde_json::from_value(payload).unwrap())
-                    .await?
+                self.on_status_page_list(
+                    serde_json::from_value(payload)
+                        .log_error(module_path!(), |_| "Failed to deserialize StatusPageList")
+                        .unwrap(),
+                )
+                .await?
             }
             Event::DockerHostList => {
-                self.on_docker_host_list(serde_json::from_value(payload).unwrap())
-                    .await?
+                self.on_docker_host_list(
+                    serde_json::from_value(payload)
+                        .log_error(module_path!(), |_| "Failed to deserialize DockerHostList")
+                        .unwrap(),
+                )
+                .await?
             }
             Event::Info => self.on_info().await?,
             Event::AutoLogin => self.on_auto_login().await?,

kuma-client/src/client.rs

@@ -233,8 +233,23 @@ impl<'de> DeserializeAs<'de, Option<Range<PrimitiveDateTime>>> for SerializeDate
             let value = source
                 .into_iter()
                 .map(|o| {
-                    o.map(|s| PrimitiveDateTime::parse(&s, &Iso8601::DATE_TIME))
-                        .transpose()
+                    o.map(|s| -> Result<PrimitiveDateTime, D::Error> {
+                        if let Ok(dt) = dateparser::parse(&s) {
+                            return Ok(PrimitiveDateTime::parse(
+                                &dt.to_rfc3339(),
+                                &Iso8601::DATE_TIME,
+                            )
+                            .unwrap());
+                        }
+                        if let Ok(dt) = PrimitiveDateTime::parse(&s, &Iso8601::DATE_TIME) {
+                            return Ok(dt);
+                        }
+                        Err(serde::de::Error::custom(format!(
+                            "Unable to parse {} as DateTime",
+                            s
+                        )))
+                    })
+                    .transpose()
                 })
                 .collect::<Result<Vec<_>, _>>()
                 .map_err(serde::de::Error::custom)?;