Database access refactor (#190)

src-tauri/yaak-plugins/src/manager.rs

@@ -14,7 +14,7 @@ use crate::events::{
 use crate::nodejs::start_nodejs_plugin_runtime;
 use crate::plugin_handle::PluginHandle;
 use crate::server_ws::PluginRuntimeServerWebsocket;
-use log::{info, warn};
+use log::{error, info, warn};
 use std::collections::HashMap;
 use std::env;
 use std::path::PathBuf;
@@ -25,9 +25,11 @@ use tauri::{AppHandle, Manager, Runtime, WebviewWindow};
 use tokio::fs::read_dir;
 use tokio::net::TcpListener;
 use tokio::sync::{mpsc, Mutex};
-use tokio::time::timeout;
-use yaak_models::queries::{generate_id, list_plugins};
+use tokio::time::{timeout, Instant};
+use yaak_models::manager::QueryManagerExt;
+use yaak_models::queries_legacy::generate_id;
 use yaak_templates::error::Error::RenderError;
+use yaak_templates::error::Result as TemplateResult;
 
 #[derive(Clone)]
 pub struct PluginManager {
@@ -157,7 +159,8 @@ impl PluginManager {
             })
             .collect();
 
-        let plugins = list_plugins(app_handle).await.unwrap_or_default();
+        let plugins =
+            app_handle.queries().connect().await.unwrap().list_plugins().unwrap_or_default();
         let installed_plugin_dirs: Vec<PluginCandidate> = plugins
             .iter()
             .map(|p| PluginCandidate {
@@ -208,7 +211,7 @@ impl PluginManager {
 
         // Boot the plugin
         let event = timeout(
-            Duration::from_secs(2),
+            Duration::from_secs(5),
             self.send_to_plugin_and_wait(
                 window_context,
                 &plugin_handle,
@@ -239,12 +242,14 @@ impl PluginManager {
         app_handle: &AppHandle<R>,
         window_context: &WindowContext,
     ) -> Result<()> {
+        let start = Instant::now();
         let candidates = self.list_plugin_dirs(app_handle).await;
         for candidate in candidates.clone() {
             // First remove the plugin if it exists
             if let Some(plugin) = self.get_plugin_by_dir(candidate.dir.as_str()).await {
                 if let Err(e) = self.remove_plugin(window_context, &plugin).await {
-                    warn!("Failed to remove plugin {} {e:?}", candidate.dir);
+                    error!("Failed to remove plugin {} {e:?}", candidate.dir);
+                    continue;
                 }
             }
             if let Err(e) = self
@@ -255,15 +260,13 @@ impl PluginManager {
             }
         }
 
+        let plugins = self.plugins.lock().await;
+        let names = plugins.iter().map(|p| p.dir.to_string()).collect::<Vec<String>>();
         info!(
-            "Initialized all plugins:\n  - {}",
-            self.plugins
-                .lock()
-                .await
-                .iter()
-                .map(|p| p.dir.to_string())
-                .collect::<Vec<String>>()
-                .join("\n  - "),
+            "Initialized {} plugins in {:?}:\n  - {}",
+            plugins.len(),
+            start.elapsed(),
+            names.join("\n  - "),
         );
 
         Ok(())
@@ -598,7 +601,7 @@ impl PluginManager {
         fn_name: &str,
         args: HashMap<String, String>,
         purpose: RenderPurpose,
-    ) -> yaak_templates::error::Result<String> {
+    ) -> TemplateResult<String> {
         let req = CallTemplateFunctionRequest {
             name: fn_name.to_string(),
             args: CallTemplateFunctionArgs {
@@ -615,13 +618,14 @@ impl PluginManager {
         let value = events.into_iter().find_map(|e| match e.payload {
             InternalEventPayload::CallTemplateFunctionResponse(CallTemplateFunctionResponse {
                 value,
-            }) => value,
+            }) => Some(value),
             _ => None,
         });
 
         match value {
-            None => Err(RenderError(format!("Template function not found {fn_name}"))),
-            Some(v) => Ok(v),
+            None => Err(RenderError(format!("Template function {fn_name}(…) not found "))),
+            Some(Some(v)) => Ok(v),           // Plugin returned string
+            Some(None) => Ok("".to_string()), // Plugin returned null
         }
     }