gRPC Support (#20)

src-tauri/src/http.rs

@@ -1,5 +1,5 @@
-use std::fs::{create_dir_all, File};
 use std::fs;
+use std::fs::{create_dir_all, File};
 use std::io::Write;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -7,28 +7,26 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use base64::Engine;
-use http::{HeaderMap, HeaderName, HeaderValue, Method};
 use http::header::{ACCEPT, USER_AGENT};
+use http::{HeaderMap, HeaderName, HeaderValue, Method};
 use log::{error, info, warn};
-use reqwest::{multipart, Url};
 use reqwest::redirect::Policy;
-use sqlx::{Pool, Sqlite};
+use reqwest::{multipart, Url};
 use sqlx::types::{Json, JsonValue};
-use tauri::{AppHandle, Wry};
+use tauri::AppHandle;
 
-use crate::{emit_side_effect, models, render, response_err};
+use crate::{models, render, response_err};
 
 pub async fn send_http_request(
+    app_handle: &AppHandle,
     request: models::HttpRequest,
     response: &models::HttpResponse,
     environment: Option<models::Environment>,
     cookie_jar: Option<models::CookieJar>,
-    app_handle: &AppHandle<Wry>,
-    pool: &Pool<Sqlite>,
     download_path: Option<PathBuf>,
 ) -> Result<models::HttpResponse, String> {
     let environment_ref = environment.as_ref();
-    let workspace = models::get_workspace(&request.workspace_id, pool)
+    let workspace = models::get_workspace(app_handle, &request.workspace_id)
         .await
         .expect("Failed to get Workspace");
 
@@ -88,7 +86,7 @@ pub async fn send_http_request(
     let url = match Url::from_str(url_string.as_str()) {
         Ok(u) => u,
         Err(e) => {
-            return response_err(response, e.to_string(), app_handle, pool).await;
+            return response_err(response, e.to_string(), app_handle).await;
         }
     };
 
@@ -293,7 +291,7 @@ pub async fn send_http_request(
     let sendable_req = match request_builder.build() {
         Ok(r) => r,
         Err(e) => {
-            return response_err(response, e.to_string(), app_handle, pool).await;
+            return response_err(response, e.to_string(), app_handle).await;
         }
     };
 
@@ -362,12 +360,9 @@ pub async fn send_http_request(
                 );
             }
 
-            response = models::update_response_if_id(&response, pool)
+            response = models::update_response_if_id(app_handle, &response)
                 .await
                 .expect("Failed to update response");
-            if !request.id.is_empty() {
-                emit_side_effect(app_handle, "updated_model", &response);
-            }
 
             // Copy response to download path, if specified
             match (download_path, response.body_path.clone()) {
@@ -397,18 +392,13 @@ pub async fn send_http_request(
                         .collect::<Vec<_>>(),
                 );
                 cookie_jar.cookies = json_cookies;
-                match models::upsert_cookie_jar(pool, &cookie_jar).await {
-                    Ok(updated_jar) => {
-                        emit_side_effect(app_handle, "updated_model", &updated_jar);
-                    }
-                    Err(e) => {
-                        error!("Failed to update cookie jar: {}", e);
-                    }
+                if let Err(e) = models::upsert_cookie_jar(&app_handle, &cookie_jar).await {
+                    error!("Failed to update cookie jar: {}", e);
                 };
             }
 
             Ok(response)
         }
-        Err(e) => response_err(response, e.to_string(), app_handle, pool).await,
+        Err(e) => response_err(response, e.to_string(), app_handle).await,
     }
 }