Websocket Support (#159)

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

@@ -39,10 +39,4 @@ pub enum Error {
     UnknownEventErr,
 }
 
-impl Into<String> for Error {
-    fn into(self) -> String {
-        todo!()
-    }
-}
-
 pub type Result<T> = std::result::Result<T, Error>;

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

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use tauri::{Runtime, WebviewWindow};
 use ts_rs::TS;
 
-use yaak_models::models::{Environment, Folder, GrpcRequest, HttpRequest, HttpResponse, Workspace};
+use yaak_models::models::{Environment, Folder, GrpcRequest, HttpRequest, HttpResponse, WebsocketRequest, Workspace};
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
@@ -873,6 +873,7 @@ pub struct ImportResources {
     pub folders: Vec<Folder>,
     pub http_requests: Vec<HttpRequest>,
     pub grpc_requests: Vec<GrpcRequest>,
+    pub websocket_requests: Vec<WebsocketRequest>,
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]

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

@@ -7,8 +7,9 @@ use tauri::{Manager, RunEvent, Runtime, State};
 pub mod error;
 pub mod events;
 pub mod manager;
-mod nodejs;
 pub mod plugin_handle;
+pub mod template_callback;
+mod nodejs;
 mod server_ws;
 mod util;
 

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

@@ -53,8 +53,8 @@ impl PluginManager {
             PluginRuntimeServerWebsocket::new(events_tx, client_disconnect_tx, client_connect_tx);
 
         let plugin_manager = PluginManager {
-            plugins: Arc::new(Mutex::new(Vec::new())),
-            subscribers: Arc::new(Mutex::new(HashMap::new())),
+            plugins: Default::default(),
+            subscribers: Default::default(),
             ws_service: Arc::new(ws_service.clone()),
             kill_tx: kill_server_tx,
         };

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

@@ -0,0 +1,77 @@
+use crate::events::{FormInput, RenderPurpose, WindowContext};
+use crate::manager::PluginManager;
+use std::collections::HashMap;
+use tauri::{AppHandle, Manager, Runtime};
+use yaak_templates::TemplateCallback;
+
+#[derive(Clone)]
+pub struct PluginTemplateCallback {
+    plugin_manager: PluginManager,
+    window_context: WindowContext,
+    render_purpose: RenderPurpose,
+}
+
+impl PluginTemplateCallback {
+    pub fn new<R: Runtime>(
+        app_handle: &AppHandle<R>,
+        window_context: &WindowContext,
+        render_purpose: RenderPurpose,
+    ) -> PluginTemplateCallback {
+        let plugin_manager = &*app_handle.state::<PluginManager>();
+        PluginTemplateCallback {
+            plugin_manager: plugin_manager.to_owned(),
+            window_context: window_context.to_owned(),
+            render_purpose,
+        }
+    }
+}
+
+impl TemplateCallback for PluginTemplateCallback {
+    async fn run(&self, fn_name: &str, args: HashMap<String, String>) -> Result<String, String> {
+        // The beta named the function `Response` but was changed in stable.
+        // Keep this here for a while because there's no easy way to migrate
+        let fn_name = if fn_name == "Response" { "response" } else { fn_name };
+
+        let function = self
+            .plugin_manager
+            .get_template_functions_with_context(&self.window_context)
+            .await
+            .map_err(|e| e.to_string())?
+            .iter()
+            .flat_map(|f| f.functions.clone())
+            .find(|f| f.name == fn_name)
+            .ok_or("")?;
+
+        let mut args_with_defaults = args.clone();
+
+        // Fill in default values for all args
+        for arg in function.args {
+            let base = match arg {
+                FormInput::Text(a) => a.base,
+                FormInput::Editor(a) => a.base,
+                FormInput::Select(a) => a.base,
+                FormInput::Checkbox(a) => a.base,
+                FormInput::File(a) => a.base,
+                FormInput::HttpRequest(a) => a.base,
+                FormInput::Accordion(_) => continue,
+                FormInput::Banner(_) => continue,
+                FormInput::Markdown(_) => continue,
+            };
+            if let None = args_with_defaults.get(base.name.as_str()) {
+                args_with_defaults.insert(base.name, base.default_value.unwrap_or_default());
+            }
+        }
+
+        let resp = self
+            .plugin_manager
+            .call_template_function(
+                &self.window_context,
+                fn_name,
+                args_with_defaults,
+                self.render_purpose.to_owned(),
+            )
+            .await
+            .map_err(|e| e.to_string())?;
+        Ok(resp.unwrap_or_default())
+    }
+}

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

@@ -1,5 +1,6 @@
-use rand::distributions::{Alphanumeric, DistString};
+use rand::distr::Alphanumeric;
+use rand::Rng;
 
 pub fn gen_id() -> String {
-    Alphanumeric.sample_string(&mut rand::thread_rng(), 5)
+    rand::rng().sample_iter(&Alphanumeric).take(5).map(char::from).collect()
 }