Fix recursive plugin call locking

src-tauri/yaak_plugin_runtime/src/events.rs

@@ -153,6 +153,7 @@ pub struct CopyTextRequest {
 #[ts(export)]
 pub struct RenderHttpRequestRequest {
     pub http_request: HttpRequest,
+    pub purpose: RenderPurpose,
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
@@ -289,21 +290,21 @@ pub struct CallTemplateFunctionResponse {
 #[serde(default, rename_all = "camelCase")]
 #[ts(export)]
 pub struct CallTemplateFunctionArgs {
-    pub purpose: CallTemplateFunctionPurpose,
+    pub purpose: RenderPurpose,
     pub values: HashMap<String, String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
 #[ts(export)]
-pub enum CallTemplateFunctionPurpose {
+pub enum RenderPurpose {
     Send,
     Preview,
 }
 
-impl Default for CallTemplateFunctionPurpose {
+impl Default for RenderPurpose {
     fn default() -> Self {
-        CallTemplateFunctionPurpose::Preview
+        RenderPurpose::Preview
     }
 }
 

src-tauri/yaak_plugin_runtime/src/manager.rs

@@ -1,6 +1,6 @@
 use crate::error::Result;
 use crate::events::{
-    CallHttpRequestActionRequest, CallTemplateFunctionArgs, CallTemplateFunctionPurpose,
+    CallHttpRequestActionRequest, CallTemplateFunctionArgs, RenderPurpose,
     CallTemplateFunctionRequest, CallTemplateFunctionResponse, FilterRequest, FilterResponse,
     GetHttpRequestActionsRequest, GetHttpRequestActionsResponse, GetTemplateFunctionsResponse,
     ImportRequest, ImportResponse, InternalEvent, InternalEventPayload,
@@ -115,7 +115,7 @@ impl PluginManager {
         &self,
         fn_name: &str,
         args: HashMap<String, String>,
-        purpose: CallTemplateFunctionPurpose,
+        purpose: RenderPurpose,
     ) -> Result<Option<String>> {
         let req = CallTemplateFunctionRequest {
             name: fn_name.to_string(),

src-tauri/yaak_plugin_runtime/src/server.rs

@@ -53,7 +53,11 @@ impl PluginHandle {
     }
 
     pub async fn send(&self, event: &InternalEvent) -> Result<()> {
-        info!("Sending event {} {:?}", event.id, self.name().await);
+        info!(
+            "Sending event to plugin {} {:?}",
+            event.id,
+            self.name().await
+        );
         self.to_plugin_tx
             .lock()
             .await
@@ -90,9 +94,9 @@ impl PluginRuntimeGrpcServer {
 
     pub async fn subscribe(&self) -> (String, Receiver<InternalEvent>) {
         let (tx, rx) = mpsc::channel(128);
-        let id = generate_id();
-        self.subscribers.lock().await.insert(id.clone(), tx);
-        (id, rx)
+        let rx_id = generate_id();
+        self.subscribers.lock().await.insert(rx_id.clone(), tx);
+        (rx_id, rx)
     }
 
     pub async fn unsubscribe(&self, rx_id: &str) {
@@ -394,7 +398,7 @@ impl PluginRuntime for PluginRuntimeGrpcServer {
                         for tx in subscribers.values() {
                             // Emit event to the channel for server to handle
                             if let Err(e) = tx.try_send(event.clone()) {
-                                println!("Failed to send to server channel. Receiver probably isn't listening: {:?}", e);
+                                println!("Failed to send to server channel (n={}). Receiver probably isn't listening: {:?}", subscribers.len(), e);
                             }
                         }