Install plugins from Yaak plugin registry (#230)

src-tauri/src/lib.rs

@@ -36,12 +36,13 @@ use yaak_models::models::{
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_resources};
 use yaak_plugins::events::{
-    BootResponse, CallHttpRequestActionRequest, FilterResponse,
-    GetHttpAuthenticationConfigResponse, GetHttpAuthenticationSummaryResponse,
-    GetHttpRequestActionsResponse, GetTemplateFunctionsResponse, InternalEvent,
-    InternalEventPayload, JsonPrimitive, PluginWindowContext, RenderPurpose,
+    CallHttpRequestActionRequest, FilterResponse, GetHttpAuthenticationConfigResponse,
+    GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse,
+    GetTemplateFunctionsResponse, InternalEvent, InternalEventPayload, JsonPrimitive,
+    PluginWindowContext, RenderPurpose,
 };
 use yaak_plugins::manager::PluginManager;
+use yaak_plugins::plugin_meta::PluginMetadata;
 use yaak_plugins::template_callback::PluginTemplateCallback;
 use yaak_sse::sse::ServerSentEvent;
 use yaak_templates::format::format_json;
@@ -1039,14 +1040,13 @@ async fn cmd_plugin_info<R: Runtime>(
     id: &str,
     app_handle: AppHandle<R>,
     plugin_manager: State<'_, PluginManager>,
-) -> YaakResult<BootResponse> {
+) -> YaakResult<PluginMetadata> {
     let plugin = app_handle.db().get_plugin(id)?;
     Ok(plugin_manager
         .get_plugin_by_dir(plugin.directory.as_str())
         .await
         .ok_or(GenericError("Failed to find plugin for info".to_string()))?
-        .info()
-        .await)
+        .info())
 }
 
 #[tauri::command]

src-tauri/src/plugin_events.rs

@@ -86,8 +86,8 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 environment.as_ref(),
                 &cb,
             )
-            .await
-            .expect("Failed to render http request");
+                .await
+                .expect("Failed to render http request");
             Some(InternalEventPayload::RenderHttpRequestResponse(RenderHttpRequestResponse {
                 http_request,
             }))
@@ -115,7 +115,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 &InternalEventPayload::ShowToastRequest(ShowToastRequest {
                     message: format!(
                         "Plugin error from {}: {}",
-                        plugin_handle.name().await,
+                        plugin_handle.info().name,
                         resp.error
                     ),
                     color: Some(Color::Danger),
@@ -188,7 +188,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 cookie_jar,
                 &mut tokio::sync::watch::channel(false).1, // No-op cancel channel
             )
-            .await;
+                .await;
 
             let http_response = match result {
                 Ok(r) => r,
@@ -257,17 +257,17 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
             None
         }
         InternalEventPayload::SetKeyValueRequest(req) => {
-            let name = plugin_handle.name().await;
+            let name = plugin_handle.info().name;
             app_handle.db().set_plugin_key_value(&name, &req.key, &req.value);
             Some(InternalEventPayload::SetKeyValueResponse(SetKeyValueResponse {}))
         }
         InternalEventPayload::GetKeyValueRequest(req) => {
-            let name = plugin_handle.name().await;
+            let name = plugin_handle.info().name;
             let value = app_handle.db().get_plugin_key_value(&name, &req.key).map(|v| v.value);
             Some(InternalEventPayload::GetKeyValueResponse(GetKeyValueResponse { value }))
         }
         InternalEventPayload::DeleteKeyValueRequest(req) => {
-            let name = plugin_handle.name().await;
+            let name = plugin_handle.info().name;
             let deleted = app_handle.db().delete_plugin_key_value(&name, &req.key).unwrap();
             Some(InternalEventPayload::DeleteKeyValueResponse(DeleteKeyValueResponse { deleted }))
         }

src-tauri/src/uri_scheme.rs

@@ -4,7 +4,6 @@ use log::{info, warn};
 use std::collections::HashMap;
 use tauri::{AppHandle, Emitter, Manager, Runtime, Url};
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};
-use yaak_plugins::api::get_plugin;
 use yaak_plugins::events::{Color, ShowToastRequest};
 use yaak_plugins::install::download_and_install;
 
@@ -23,14 +22,10 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
         "install-plugin" => {
             let name = query_map.get("name").unwrap();
             let version = query_map.get("version").cloned();
-            let plugin_version = get_plugin(&app_handle, &name, version).await?;
             _ = window.set_focus();
             let confirmed_install = app_handle
                 .dialog()
-                .message(format!(
-                    "Install plugin {}@{}?",
-                    plugin_version.name, plugin_version.version
-                ))
+                .message(format!("Install plugin {name} {version:?}?",))
                 .kind(MessageDialogKind::Info)
                 .buttons(MessageDialogButtons::OkCustom("Install".to_string()))
                 .blocking_show();
@@ -39,14 +34,11 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
                 return Ok(());
             }
 
-            download_and_install(window, &plugin_version).await?;
+            let pv = download_and_install(window, name, version).await?;
             app_handle.emit(
                 "show_toast",
                 ShowToastRequest {
-                    message: format!(
-                        "Installed {}@{}",
-                        plugin_version.name, plugin_version.version
-                    ),
+                    message: format!("Installed {name}@{}", pv.version),
                     color: Some(Color::Success),
                     icon: None,
                 },