diff --git a/src-tauri/src/http_request.rs b/src-tauri/src/http_request.rs index 6c74d64a..9ce3b1cd 100644 --- a/src-tauri/src/http_request.rs +++ b/src-tauri/src/http_request.rs @@ -442,7 +442,6 @@ pub async fn send_http_request( } // Write body to FS - println!("BODYPATH {body_path:?}"); let mut f = File::options() .create(true) .truncate(true) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index fa3fda0b..d8e326cd 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1969,7 +1969,7 @@ fn monitor_plugin_events(app_handle: &AppHandle) { let app_handle = app_handle.clone(); tauri::async_runtime::spawn(async move { let plugin_manager: State<'_, PluginManager> = app_handle.state(); - let (rx_id, mut rx) = plugin_manager.subscribe().await; + let (rx_id, mut rx) = plugin_manager.subscribe("app").await; while let Some(event) = rx.recv().await { let app_handle = app_handle.clone(); diff --git a/src-tauri/yaak_plugin_runtime/src/manager.rs b/src-tauri/yaak_plugin_runtime/src/manager.rs index 0557b889..e5cb0d6b 100644 --- a/src-tauri/yaak_plugin_runtime/src/manager.rs +++ b/src-tauri/yaak_plugin_runtime/src/manager.rs @@ -273,9 +273,9 @@ impl PluginManager { Ok(()) } - pub async fn subscribe(&self) -> (String, mpsc::Receiver) { + pub async fn subscribe(&self, label: &str) -> (String, mpsc::Receiver) { let (tx, rx) = mpsc::channel(128); - let rx_id = generate_id(); + let rx_id = format!("{label}_{}", generate_id()); self.subscribers.lock().await.insert(rx_id.clone(), tx); (rx_id, rx) } @@ -362,7 +362,8 @@ impl PluginManager { payload: &InternalEventPayload, plugins: Vec, ) -> Result> { - let (rx_id, mut rx) = self.subscribe().await; + let label = format!("wait[{}]", plugins.len()); + let (rx_id, mut rx) = self.subscribe(label.as_str()).await; // 1. Build the events with IDs and everything let events_to_send = plugins