gRPC manager mostly working

src-tauri/grpc/src/lib.rs

@@ -11,6 +11,7 @@ use crate::proto::{fill_pool, method_desc_to_path};
 mod codec;
 mod json_schema;
 mod proto;
+pub mod manager;
 
 pub fn serialize_options() -> SerializeOptions {
     SerializeOptions::new().skip_default_fields(false)
@@ -32,43 +33,6 @@ pub struct MethodDefinition {
     pub server_streaming: bool,
 }
 
-pub async fn unary(
-    uri: &Uri,
-    service: &str,
-    method: &str,
-    message_json: &str,
-) -> Result<String, String> {
-    let (pool, conn) = fill_pool(uri).await;
-
-    let service = pool.get_service_by_name(service).unwrap();
-    let method = &service.methods().find(|m| m.name() == method).unwrap();
-    let input_message = method.input();
-
-    let mut deserializer = Deserializer::from_str(message_json);
-    let req_message =
-        DynamicMessage::deserialize(input_message, &mut deserializer).map_err(|e| e.to_string())?;
-    deserializer.end().unwrap();
-
-    let mut client = tonic::client::Grpc::new(conn);
-
-    println!(
-        "\n---------- SENDING -----------------\n{}",
-        serde_json::to_string_pretty(&req_message).expect("json")
-    );
-
-    let req = req_message.into_request();
-    let path = method_desc_to_path(method);
-    let codec = DynamicCodec::new(method.clone());
-    client.ready().await.unwrap();
-
-    let resp = client.unary(req, path, codec).await.unwrap();
-    let msg = resp.into_inner();
-    let response_json = serde_json::to_string_pretty(&msg).expect("json to string");
-    println!("\n---------- RECEIVING ---------------\n{}", response_json,);
-
-    Ok(response_json)
-}
-
 struct ClientStream {}
 
 impl Stream for ClientStream {

src-tauri/grpc/src/manager.rs

@@ -0,0 +1,139 @@
+use std::collections::HashMap;
+
+use prost_reflect::{DescriptorPool, DynamicMessage};
+use serde_json::Deserializer;
+use tokio::sync::mpsc;
+use tokio_stream::StreamExt;
+use tonic::transport::{Channel, Uri};
+use tonic::{IntoRequest, Streaming};
+
+use crate::codec::DynamicCodec;
+use crate::proto::{fill_pool, method_desc_to_path};
+
+type Result<T> = std::result::Result<T, String>;
+
+#[derive(Clone)]
+pub struct GrpcConnection {
+    pool: DescriptorPool,
+    conn: Channel,
+}
+
+impl GrpcConnection {
+    pub async fn unary(&self, service: &str, method: &str, message: &str) -> Result<String> {
+        let service = self.pool.get_service_by_name(service).unwrap();
+        let method = &service.methods().find(|m| m.name() == method).unwrap();
+        let input_message = method.input();
+
+        let mut deserializer = Deserializer::from_str(message);
+        let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)
+            .map_err(|e| e.to_string())?;
+        deserializer.end().unwrap();
+
+        let mut client = tonic::client::Grpc::new(self.conn.clone());
+
+        println!(
+            "\n---------- SENDING -----------------\n{}",
+            serde_json::to_string_pretty(&req_message).expect("json")
+        );
+
+        let req = req_message.into_request();
+        let path = method_desc_to_path(method);
+        let codec = DynamicCodec::new(method.clone());
+        client.ready().await.unwrap();
+
+        let resp = client.unary(req, path, codec).await.unwrap();
+        let msg = resp.into_inner();
+        let response_json = serde_json::to_string_pretty(&msg).expect("json to string");
+        println!("\n---------- RECEIVING ---------------\n{}", response_json,);
+
+        Ok(response_json)
+    }
+    pub async fn server_streaming(
+        &self,
+        service: &str,
+        method: &str,
+        message: &str,
+    ) -> Result<Streaming<DynamicMessage>> {
+        let service = self.pool.get_service_by_name(service).unwrap();
+        let method = &service.methods().find(|m| m.name() == method).unwrap();
+        let input_message = method.input();
+
+        let mut deserializer = Deserializer::from_str(message);
+        let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)
+            .map_err(|e| e.to_string())?;
+        deserializer.end().unwrap();
+
+        let mut client = tonic::client::Grpc::new(self.conn.clone());
+
+        println!(
+            "\n---------- SENDING -----------------\n{}",
+            serde_json::to_string_pretty(&req_message).expect("json")
+        );
+
+        let req = req_message.into_request();
+        let path = method_desc_to_path(method);
+        let codec = DynamicCodec::new(method.clone());
+        client.ready().await.unwrap();
+
+        Ok(client
+            .server_streaming(req, path, codec)
+            .await
+            .map_err(|s| s.to_string())?
+            .into_inner())
+    }
+}
+
+pub struct GrpcManager {
+    connections: HashMap<String, GrpcConnection>,
+    pub send: mpsc::Sender<String>,
+    pub recv: mpsc::Receiver<String>,
+}
+
+impl Default for GrpcManager {
+    fn default() -> Self {
+        let (send, recv) = mpsc::channel(100);
+        let connections = HashMap::new();
+        Self {
+            connections,
+            send,
+            recv,
+        }
+    }
+}
+
+impl GrpcManager {
+    pub async fn server_streaming(
+        &mut self,
+        id: &str,
+        uri: Uri,
+        service: &str,
+        method: &str,
+        message: &str,
+    ) -> Result<Streaming<DynamicMessage>> {
+        println!("Server streaming {}", id);
+        self.connect(id, uri)
+            .await
+            .server_streaming(service, method, message)
+            .await
+
+        // while let Some(item) = stream.next().await {
+        //     match item {
+        //         Ok(item) => {
+        //             let item = serde_json::to_string_pretty(&item).unwrap();
+        //             println!("Sending message {}", item);
+        //             self.send.send(item).await.unwrap()
+        //         }
+        //         Err(e) => println!("\terror: {}", e),
+        //     }
+        // }
+
+        // Ok(())
+    }
+
+    pub async fn connect(&mut self, id: &str, uri: Uri) -> GrpcConnection {
+        let (pool, conn) = fill_pool(&uri).await;
+        let connection = GrpcConnection { pool, conn };
+        self.connections.insert(id.to_string(), connection.clone());
+        connection
+    }
+}

src-tauri/src/main.rs

@@ -35,6 +35,7 @@ use tokio::sync::Mutex;
 use tokio::time::sleep;
 use window_shadows::set_shadow;
 
+use grpc::manager::GrpcManager;
 use grpc::ServiceDefinition;
 use window_ext::TrafficLightWindowExt;
 
@@ -44,7 +45,7 @@ use crate::models::{
     cancel_pending_responses, create_response, delete_all_responses, delete_cookie_jar,
     delete_environment, delete_folder, delete_request, delete_response, delete_workspace,
     duplicate_request, find_cookie_jars, find_environments, find_folders, find_requests,
-    find_responses, find_workspaces, get_cookie_jar, get_environment, get_folder,
+    find_responses, find_workspaces, generate_id, get_cookie_jar, get_environment, get_folder,
     get_key_value_raw, get_or_create_settings, get_request, get_response, get_workspace,
     get_workspace_export_resources, set_key_value_raw, update_response_if_id, update_settings,
     upsert_cookie_jar, upsert_environment, upsert_folder, upsert_request, upsert_workspace,
@@ -89,11 +90,7 @@ async fn migrate_db(app_handle: AppHandle<Wry>, db: &Mutex<Pool<Sqlite>>) -> Res
 }
 
 #[tauri::command]
-async fn cmd_grpc_reflect(
+async fn cmd_grpc_reflect(endpoint: &str) -> Result<Vec<ServiceDefinition>, String> {
-    endpoint: &str,
-    // app_handle: AppHandle<Wry>,
-    // db_state: State<'_, Mutex<Pool<Sqlite>>>,
-) -> Result<Vec<ServiceDefinition>, String> {
     let uri = safe_uri(endpoint).map_err(|e| e.to_string())?;
     Ok(grpc::callable(&uri).await)
 }
@@ -104,11 +101,16 @@ async fn cmd_grpc_call_unary(
     service: &str,
     method: &str,
     message: &str,
-    // app_handle: AppHandle<Wry>,
+    grpc_handle: State<'_, Mutex<GrpcManager>>,
-    // db_state: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<String, String> {
     let uri = safe_uri(endpoint).map_err(|e| e.to_string())?;
-    grpc::unary(&uri, service, method, message).await
+    grpc_handle
+        .lock()
+        .await
+        .connect("default", uri)
+        .await
+        .unary(service, method, message)
+        .await
 }
 
 #[tauri::command]
@@ -135,26 +137,30 @@ async fn cmd_grpc_server_streaming(
     method: &str,
     message: &str,
     app_handle: AppHandle<Wry>,
+    grpc_handle: State<'_, Mutex<GrpcManager>>,
 ) -> Result<String, String> {
     let uri = safe_uri(endpoint).map_err(|e| e.to_string())?;
-    let mut stream = grpc::server_streaming(&uri, service, method, message)
+    let conn_id = generate_id(Some("grpc"));
+
+    let mut stream = grpc_handle
+        .lock()
         .await
-        .unwrap()
+        .server_streaming(&conn_id, uri, service, method, message)
-        .into_inner();
+        .await
+        .unwrap();
+
     while let Some(item) = stream.next().await {
         match item {
             Ok(item) => {
-                let s = serde_json::to_string(&item).unwrap();
+                let item = serde_json::to_string_pretty(&item).unwrap();
-                emit_side_effect(&app_handle, "grpc_message", s.clone());
+                println!("Sending message {}", item);
-                println!("GOt item: {}", s);
+                emit_side_effect(&app_handle, "grpc_message", item);
-            }
-            Err(e) => {
-                println!("\terror: {}", e);
             }
+            Err(e) => println!("\terror: {}", e),
         }
     }
 
-    Ok("foo".to_string())
+    Ok(conn_id)
 }
 
 #[tauri::command]
@@ -1002,25 +1008,28 @@ fn main() {
             let url = format!("sqlite://{}?mode=rwc", p_string);
             info!("Connecting to database at {}", url);
 
+            // Add updater
+            let yaak_updater = YaakUpdater::new();
+            app.manage(Mutex::new(yaak_updater));
+
+            // Add GRPC manager
+            let grpc_handle = GrpcManager::default();
+            app.manage(Mutex::new(grpc_handle));
+
+            // Add DB handle
             tauri::async_runtime::block_on(async move {
                 let pool = SqlitePool::connect(p.to_str().unwrap())
                     .await
                     .expect("Failed to connect to database");
-
-                // Setup the DB handle
                 let m = Mutex::new(pool.clone());
                 migrate_db(app.handle(), &m)
                     .await
                     .expect("Failed to migrate database");
                 app.manage(m);
-
-                let yaak_updater = YaakUpdater::new();
-                app.manage(Mutex::new(yaak_updater));
-
                 let _ = cancel_pending_responses(&pool).await;
+            });
 
-                Ok(())
+            Ok(())
-            })
         })
         .invoke_handler(tauri::generate_handler![
             cmd_check_for_updates,

src-web/components/GlobalHooks.tsx

@@ -12,8 +12,8 @@ import { requestsQueryKey } from '../hooks/useRequests';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
 import { responsesQueryKey } from '../hooks/useResponses';
 import { settingsQueryKey } from '../hooks/useSettings';
-import { useSyncWindowTitle } from '../hooks/useSyncWindowTitle';
 import { useSyncAppearance } from '../hooks/useSyncAppearance';
+import { useSyncWindowTitle } from '../hooks/useSyncWindowTitle';
 import { workspacesQueryKey } from '../hooks/useWorkspaces';
 import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
 import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';

src-web/components/GrpcConnectionLayout.tsx

@@ -8,11 +8,13 @@ import type { GrpcMessage } from '../hooks/useGrpc';
 import { useGrpc } from '../hooks/useGrpc';
 import { useKeyValue } from '../hooks/useKeyValue';
 import { Banner } from './core/Banner';
+import { Button } from './core/Button';
 import { Editor } from './core/Editor';
 import { HotKeyList } from './core/HotKeyList';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
 import { JsonAttributeTree } from './core/JsonAttributeTree';
+import { RadioDropdown } from './core/RadioDropdown';
 import { Select } from './core/Select';
 import { Separator } from './core/Separator';
 import { SplitLayout } from './core/SplitLayout';
@@ -149,7 +151,7 @@ export function GrpcConnectionLayout({ style }: Props) {
             ref={urlContainerEl}
             className={classNames(
               'grid grid-cols-[minmax(0,1fr)_auto_auto] gap-1.5',
-              paneSize < 350 && '!grid-cols-1',
+              paneSize < 400 && '!grid-cols-1',
             )}
           >
             <UrlBar
@@ -164,16 +166,24 @@ export function GrpcConnectionLayout({ style }: Props) {
               onUrlChange={url.set}
             />
             <HStack space={1.5}>
-              <Select
+              <RadioDropdown
-                hideLabel
-                name="service"
-                label="Service"
-                className="text-gray-800"
-                size="sm"
                 value={select.value}
+                items={select.options.map((o) => ({
+                  label: o.label,
+                  value: o.value,
+                  type: 'default',
+                  shortLabel: o.label,
+                }))}
                 onChange={handleChangeService}
-                options={select.options}
+              >
-              />
+                <Button
+                  size="sm"
+                  className="border border-highlight font-mono text-xs text-gray-800"
+                  rightSlot={<Icon className="text-gray-600" size="sm" icon="chevronDown" />}
+                >
+                  {select.options.find((o) => o.value === select.value)?.label}
+                </Button>
+              </RadioDropdown>
               <IconButton
                 className="border border-highlight"
                 size="sm"

src-web/components/core/Dropdown.tsx

@@ -473,7 +473,7 @@ function MenuItem({ className, focused, onFocus, item, onSelect, ...props }: Men
       className={classNames(
         className,
         'min-w-[8rem] outline-none px-2 mx-1.5 flex text-sm text-gray-700 whitespace-nowrap',
-        'focus:bg-highlight focus:text-gray-900 rounded',
+        'focus:bg-highlight focus:text-gray-800 rounded',
         item.variant === 'danger' && 'text-red-600',
         item.variant === 'notify' && 'text-pink-600',
       )}