Refactor gRPC reflection!

src-tauri/src/lib.rs

@@ -6,7 +6,7 @@ extern crate objc;
 use std::collections::HashMap;
 use std::env::current_dir;
 use std::fs;
-use std::fs::{create_dir_all, File, read_to_string};
+use std::fs::{create_dir_all, read_to_string, File};
 use std::path::PathBuf;
 use std::process::exit;
 use std::str::FromStr;
@@ -17,45 +17,45 @@ use fern::colors::ColoredLevelConfig;
 use log::{debug, error, info, warn};
 use rand::random;
 use serde_json::{json, Value};
-use sqlx::{Pool, Sqlite, SqlitePool};
 use sqlx::migrate::Migrator;
 use sqlx::sqlite::SqliteConnectOptions;
 use sqlx::types::Json;
-use tauri::{AppHandle, LogicalSize, RunEvent, State, WebviewUrl, WebviewWindow};
-use tauri::{Manager, WindowEvent};
+use sqlx::{Pool, Sqlite, SqlitePool};
 use tauri::path::BaseDirectory;
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
+use tauri::{AppHandle, LogicalSize, RunEvent, State, WebviewUrl, WebviewWindow};
+use tauri::{Manager, WindowEvent};
 use tauri_plugin_log::{fern, Target, TargetKind};
 use tauri_plugin_shell::ShellExt;
 use tokio::sync::Mutex;
 
-use ::grpc::{Code, deserialize_message, serialize_message, ServiceDefinition};
 use ::grpc::manager::{DynamicMessage, GrpcHandle};
+use ::grpc::{deserialize_message, serialize_message, Code, ServiceDefinition};
 
 use crate::analytics::{AnalyticsAction, AnalyticsResource};
 use crate::grpc::metadata_to_map;
 use crate::http_request::send_http_request;
 use crate::models::{
-    cancel_pending_grpc_connections, cancel_pending_responses, CookieJar,
-    create_http_response, delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar,
-    delete_environment, delete_folder, delete_grpc_connection, delete_grpc_request,
-    delete_http_request, delete_http_response, delete_workspace, duplicate_grpc_request,
-    duplicate_http_request, Environment, EnvironmentVariable, Folder, generate_model_id,
-    get_cookie_jar, get_environment, get_folder, get_grpc_connection,
+    cancel_pending_grpc_connections, cancel_pending_responses, create_http_response,
+    delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar, delete_environment,
+    delete_folder, delete_grpc_connection, delete_grpc_request, delete_http_request,
+    delete_http_response, delete_workspace, duplicate_grpc_request, duplicate_http_request,
+    generate_model_id, get_cookie_jar, get_environment, get_folder, get_grpc_connection,
     get_grpc_request, get_http_request, get_http_response, get_key_value_raw,
-    get_or_create_settings, get_workspace, get_workspace_export_resources, GrpcConnection, GrpcEvent,
-    GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, KeyValue,
-    list_cookie_jars, list_environments, list_folders, list_grpc_connections, list_grpc_events,
-    list_grpc_requests, list_http_requests, list_responses, list_workspaces, ModelType,
-    set_key_value_raw, Settings, update_response_if_id, update_settings, upsert_cookie_jar, upsert_environment,
-    upsert_folder, upsert_grpc_connection, upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace, Workspace,
+    get_or_create_settings, get_workspace, get_workspace_export_resources, list_cookie_jars,
+    list_environments, list_folders, list_grpc_connections, list_grpc_events, list_grpc_requests,
+    list_http_requests, list_responses, list_workspaces, set_key_value_raw, update_response_if_id,
+    update_settings, upsert_cookie_jar, upsert_environment, upsert_folder, upsert_grpc_connection,
+    upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace, CookieJar,
+    Environment, EnvironmentVariable, Folder, GrpcConnection, GrpcEvent, GrpcEventType,
+    GrpcRequest, HttpRequest, HttpResponse, KeyValue, ModelType, Settings, Workspace,
     WorkspaceExportResources,
 };
 use crate::notifications::YaakNotifier;
 use crate::plugin::{
-    find_plugins, get_plugin, ImportResult, PluginCapability,
-    run_plugin_export_curl, run_plugin_filter, run_plugin_import,
+    find_plugins, get_plugin, run_plugin_export_curl, run_plugin_filter, run_plugin_import,
+    ImportResult, PluginCapability,
 };
 use crate::render::{render_request, variables_from_environment};
 use crate::updates::{UpdateMode, YaakUpdater};
@@ -135,26 +135,18 @@ async fn cmd_grpc_reflect(
         .await
         .map_err(|e| e.to_string())?;
 
-    let uri = safe_uri(req.url.as_str());
-    if proto_files.len() > 0 {
-        grpc_handle
-            .lock()
-            .await
-            .services_from_files(
-                &req.id,
-                proto_files
-                    .iter()
-                    .map(|p| PathBuf::from_str(p).unwrap())
-                    .collect(),
-            )
-            .await
-    } else {
-        grpc_handle
-            .lock()
-            .await
-            .services_from_reflection(&req.id, uri.as_str())
-            .await
-    }
+    grpc_handle
+        .lock()
+        .await
+        .services(
+            &req.id,
+            &req.url,
+            &proto_files
+                .iter()
+                .map(|p| PathBuf::from_str(p).unwrap())
+                .collect(),
+        )
+        .await
 }
 
 #[tauri::command]
@@ -231,6 +223,7 @@ async fn cmd_grpc_go(
                 workspace_id: req.workspace_id,
                 request_id: req.id,
                 status: -1,
+                elapsed: 0,
                 url: req.url.clone(),
                 ..Default::default()
             },
@@ -238,6 +231,7 @@ async fn cmd_grpc_go(
         .await
         .map_err(|e| e.to_string())?
     };
+
     let conn_id = conn.id.clone();
 
     let base_msg = GrpcEvent {
@@ -270,12 +264,29 @@ async fn cmd_grpc_go(
         .connect(
             &req.clone().id,
             uri.as_str(),
-            proto_files
+            &proto_files
                 .iter()
                 .map(|p| PathBuf::from_str(p).unwrap())
                 .collect(),
         )
-        .await?;
+        .await;
+
+    let connection = match connection {
+        Ok(c) => c,
+        Err(err) => {
+            upsert_grpc_connection(
+                &w,
+                &GrpcConnection {
+                    elapsed: start.elapsed().as_millis() as i64,
+                    error: Some(err.clone()),
+                    ..conn.clone()
+                },
+            )
+                .await
+                .map_err(|e| e.to_string())?;
+            return Ok(conn_id);
+        }
+    };
 
     let method_desc = connection
         .method(&service, &method)