.gitignore

@@ -1,2 +1 @@
 /target
-Cargo.lock

Cargo.toml

@@ -3,13 +3,6 @@ name = "easee"
 version = "0.1.0"
 edition = "2021"
 authors = ["Maxime Augier <max@xolus.net>"]
-description = "Rust bindings for the Easee cloud API for EV charging devices"
-readme = "README.md"
-repository = "https://github.com/maugier/easee-rs"
-license = "GPL-3.0"
-keywords = ["easee"]
-categories = ["api-bindings"]
-
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/api.rs

@@ -5,7 +5,6 @@ use serde_repr::Deserialize_repr;
 use thiserror::Error;
 use tracing::{debug, info, instrument};
 
-/// API Authentication context
 #[derive(Debug)]
 pub struct Context {
     auth_header: String,
@@ -13,10 +12,10 @@ pub struct Context {
     token_expiration: Instant,
 }
 
-const API_BASE: &str = "https://api.easee.com/api/";
+const API_BASE: &'static str = "https://api.easee.com/api/";
 const REFRESH_TOKEN_DELAY: Duration = Duration::from_secs(600);
 
-#[derive(Clone,Copy,Debug,Eq,Ord,PartialEq,PartialOrd)]
+#[derive(Debug)]
 pub struct NaiveDateTime(pub chrono::NaiveDateTime);
 
 impl<'de> Deserialize<'de> for NaiveDateTime {
@@ -30,7 +29,7 @@ impl<'de> Deserialize<'de> for NaiveDateTime {
     }
 }
 
-#[derive(Clone,Copy,Debug,Eq,Ord,PartialEq,PartialOrd)]
+#[derive(Debug)]
 pub struct UtcDateTime(pub chrono::DateTime<chrono::Utc>);
 
 impl<'de> Deserialize<'de> for UtcDateTime {
@@ -45,7 +44,7 @@ impl<'de> Deserialize<'de> for UtcDateTime {
     }
 }
 
-#[derive(Clone,Debug,Deserialize,Eq,Ord,PartialEq,PartialOrd)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all="camelCase")]
 pub struct Charger {
     pub id: String,
@@ -57,17 +56,16 @@ pub struct Charger {
     pub level_of_access: u32,
 }
 
-#[derive(Clone,Copy,Debug,Deserialize_repr,Eq,Ord,PartialEq,PartialOrd)]
+#[derive(Deserialize_repr, Debug)]
 #[repr(u8)]
 pub enum ChargerOpMode {
     Zero = 0,
     One = 1,
     Paused = 2,
     Charging = 3,
-    Finished = 4,
 }
 
-#[derive(Clone,Debug,Deserialize,PartialEq,PartialOrd)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all="camelCase")]
 pub struct ChargerState {
     pub smart_charging: bool,
@@ -141,7 +139,7 @@ pub struct ChargerState {
 
 }
 
-#[derive(Clone,Debug,Deserialize,PartialEq,PartialOrd)]
+#[derive(Debug,Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ChargingSession {
     pub charger_id: Option<String>,
@@ -168,7 +166,7 @@ pub struct Address {
 
 }
 
-#[derive(Clone,Debug,Deserialize,Eq,Ord,PartialEq,PartialOrd)]
+#[derive(Debug,Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Site {
     pub uuid: Option<String>,
@@ -180,7 +178,7 @@ pub struct Site {
     pub installer_alias: Option<String>
 }
 
-#[derive(Clone,Debug,Deserialize)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct LoginResponse {
     pub access_token: String,
@@ -192,35 +190,23 @@ pub struct LoginResponse {
 
 #[derive(Debug,Error)]
 pub enum ApiError {
-    /// HTTP call caused an IO error
     #[error("io: {0}")]
     IO(#[from] io::Error),
 
-    /// HTTP call failed (404, etc)
     #[error("ureq")]
-    Ureq(#[source] Box<ureq::Error>),
+    Ureq(#[from] ureq::Error),
 
-    /// HTTP call succeeded but the returned JSON document didn't match the expected format
     #[error("unexpected data: {1} when processing {0}")]
     UnexpectedData(serde_json::Value, serde_json::Error),
 
-    /// A JSON datetime field did not contain a string
     #[error("could not deserialize time string")]
     DeserializeFail,
 
-    /// A JSON datetime field could not be parsed
     #[error("format error: {0}")]
     FormatError(#[from] chrono::ParseError)
 }
 
-impl From<ureq::Error> for ApiError {
-    fn from(value: ureq::Error) -> Self {
-        ApiError::Ureq(Box::new(value))
-    }
-}
-
 trait JsonExplicitError {
-    /// Explicitely report the received JSON object we failed to parse
     fn into_json_with_error<T: DeserializeOwned>(self) -> Result<T, ApiError>;
 }
 
@@ -234,7 +220,6 @@ impl JsonExplicitError for ureq::Response {
 
 impl Context {
 
-    /// Build a context from provided acess tokens
     pub fn from_tokens(access_token: &str, refresh_token: String, expires_in: u32) -> Self {
         Self { auth_header: format!("Bearer {}", access_token),
                refresh_token,
@@ -245,7 +230,6 @@ impl Context {
         Self::from_tokens(&resp.access_token, resp.refresh_token, resp.expires_in)
     }
 
-    /// Retrieve access tokens online, by logging in with the provided credentials
     pub fn from_login(user: &str, password: &str) -> Result<Self, ApiError> {
         #[derive(Serialize)]
         #[serde(rename_all="camelCase")]
@@ -260,7 +244,6 @@ impl Context {
         Ok(Self::from_login_response(resp))
     }
 
-    /// Check if the token has reached its expiration date
     fn check_expired(&mut self) -> Result<(), ApiError> {
         if self.token_expiration < Instant::now() {
             debug!("Token has expired");
@@ -269,7 +252,6 @@ impl Context {
         Ok(())
     }
 
-    /// Use the refresh token to refresh credentials
     pub fn refresh_token(&mut self) -> Result<(), ApiError> {
         #[derive(Serialize)]
         #[serde(rename_all="camelCase")]
@@ -280,7 +262,7 @@ impl Context {
         let url = format!("{}accounts/refresh_token", API_BASE);
         let resp: LoginResponse = ureq::post(&url)
             .set("Content-type", "application/json")
-            .send_json(params)?
+            .send_json(&params)?
             .into_json_with_error()?;
 
         *self = Self::from_login_response(resp);
@@ -288,12 +270,10 @@ impl Context {
 
     }
 
-    /// List all sites available to the user
     pub fn sites(&mut self) -> Result<Vec<Site>, ApiError> {
         self.get("sites")
     }
 
-    /// List all chargers available to the user
     pub fn chargers(&mut self) -> Result<Vec<Charger>, ApiError> {
         self.get("chargers")
     }
@@ -313,16 +293,13 @@ impl Context {
             resp = req.call()?
         }
 
-        resp.into_json_with_error()
+        Ok(resp.into_json_with_error()?)
     }
 
     fn maybe_get<T: DeserializeOwned>(&mut self, path: &str) -> Result<Option<T>, ApiError> {
         match self.get(path) {
             Ok(r) => Ok(Some(r)),
-            Err(ApiError::Ureq(e)) => match &*e {
+            Err(ApiError::Ureq(ureq::Error::Status(404, _))) => Ok(None),
-                ureq::Error::Status(404, _ ) => Ok(None),
-                _ => Err(ApiError::Ureq(e))
-            },
             Err(other) => Err(other)
         }
     }
@@ -341,48 +318,39 @@ impl Context {
             resp = req.send_json(params)?
         }
 
-        resp.into_json_with_error()
+        Ok(resp.into_json_with_error()?)
     }
 
 }
 
-/// Energy meter reading
 #[derive(Debug, Deserialize)]
 #[serde(rename_all="camelCase")]
 pub struct MeterReading {
-    /// ID of the charger
     pub charger_id: String,
-
-    /// Lifetime consumed energy, in kWh
     pub life_time_energy: f64,
 }
 
 impl Site {
-    /// Read all energy meters from the given site
     pub fn lifetime_energy(&self, ctx: &mut Context) -> Result<Vec<MeterReading>, ApiError> {
         ctx.get(&format!("sites/{}/energy", self.id))
     }
 }
 
 impl Charger {
-    /// Enable "smart charging" on the charger. This just turns the LED blue, and disables basic charging plans.
     pub fn enable_smart_charging(&self, ctx: &mut Context) -> Result<(), ApiError> {
         let url = format!("chargers/{}/commands/smart_charging", &self.id);
         ctx.post(&url, &())
     }
 
-    /// Read the state of a charger
     pub fn state(&self, ctx: &mut Context) -> Result<ChargerState, ApiError> {
         let url = format!("chargers/{}/state", self.id);
         ctx.get(&url)
     }
 
-    /// Read info about the ongoing charging session
     pub fn ongoing_session(&self, ctx: &mut Context) -> Result<Option<ChargingSession>, ApiError> {
         ctx.maybe_get(&format!("chargers/{}/sessions/ongoing", &self.id))
     }
 
-    /// Read info about the last charging session (not including ongoing one)
     pub fn latest_session(&self, ctx: &mut Context) -> Result<Option<ChargingSession>, ApiError> {
         ctx.maybe_get(&format!("chargers/{}/sessions/latest", &self.id))
     }