chore(types): add more api types to the api client

src-tauri/Cargo.toml

@@ -40,7 +40,8 @@ serde_derive = "1.0.164"
 thiserror = "1.0.44"
 specta = "1.0.5"
 tauri-specta = { version = "1.0.2", features = ["javascript", "typescript"] }
-clap = { version = "4.3.19", features = ["derive"] }
+clap = { version = "4.3.11", features = ["derive"] }
+futures = "0.3.28"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

src-tauri/core/handlers.rs

@@ -4,7 +4,7 @@
 
 #[allow(unused_imports)]
 use crate::core::transfer::*;
-use crate::{HueHueHueError, HueHueHueState};
+use crate::{HueHueHueBackendError, HueHueHueState};
 
 get!("/resource/light", lights, HueV2LightResponse);
 get!("/resource/light/{id}", light, HueV2LightResponse, [id]);
@@ -226,7 +226,7 @@
 pub async fn set_selected_bridge(
     mdns_name: String,
     state: State<'_, HueHueHueState>,
-) -> Result<(), HueHueHueError> {
+) -> Result<(), HueHueHueBackendError> {
     let mut huehuehue = state.0.lock().await;
     huehuehue.set_selected_bridge(mdns_name)?;
 
@@ -237,7 +237,7 @@
 #[specta::specta]
 pub async fn get_discovered_bridges(
     state: State<'_, HueHueHueState>,
-) -> Result<Vec<(String, IpAddr)>, HueHueHueError> {
+) -> Result<Vec<(String, IpAddr)>, HueHueHueBackendError> {
     let huehuehue = state.0.lock().await;
 
     Ok(huehuehue
@@ -250,7 +250,7 @@
 
 #[tauri::command]
 #[specta::specta]
-pub async fn abort_discover(state: State<'_, HueHueHueState>) -> Result<(), HueHueHueError> {
+pub async fn abort_discover(state: State<'_, HueHueHueState>) -> Result<(), HueHueHueBackendError> {
     let mut huehuehue = state.0.lock().await;
 
     huehuehue.abort_discover()

src-tauri/core/macros.rs

@@ -4,7 +4,7 @@
     ($method:expr, $endpoint:expr, $endpointname:ident, $returntype:ident $(, $body:ident)? $(, [$($param:expr),+])?) => {
         paste::paste! {
             impl crate::HueHueHue {
-                pub async fn [<$method:lower _ $endpointname>](&self $(, body: $body)? $(, $($param: impl Into<String>),+)?) -> Result<$returntype, crate::HueHueHueError> {
+                pub async fn [<$method:lower _ $endpointname>](&self $(, body: $body)? $(, $($param: impl Into<String>),+)?) -> Result<$returntype, crate::HueHueHueBackendError> {
                     #[allow(unused_mut)]
                     let mut endpoint: String = $endpoint.into();
                     $($(endpoint = endpoint.replace(format!("{{{}}}", stringify!($param)).as_str(), $param.into().as_str()));+;)?
@@ -21,7 +21,7 @@
 
             #[tauri::command]
             #[specta::specta]
-            pub async fn [<$method:lower _ $endpointname>]($(body: $body, )? $($($param: String),+,)? state: tauri::State<'_, crate::HueHueHueState>) -> Result<$returntype, crate::HueHueHueError> {
+            pub async fn [<$method:lower _ $endpointname>]($(body: $body, )? $($($param: String),+,)? state: tauri::State<'_, crate::HueHueHueState>) -> Result<$returntype, crate::HueHueHueBackendError> {
                 let huehuehue = state.0.lock().await;
                 crate::HueHueHue::[<$method:lower _ $endpointname>](&huehuehue $(,body as $body)? $(,$($param)+)?).await
             }