Get everything working

src-tauri/src/lib.rs

@@ -43,12 +43,12 @@ use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_re
 use yaak_plugins::events::{
     CallFolderActionArgs, CallFolderActionRequest, CallGrpcRequestActionArgs,
     CallGrpcRequestActionRequest, CallHttpRequestActionArgs, CallHttpRequestActionRequest,
-    CallWebSocketRequestActionArgs, CallWebSocketRequestActionRequest, CallWorkspaceActionArgs,
+    CallWebsocketRequestActionArgs, CallWebsocketRequestActionRequest, CallWorkspaceActionArgs,
     CallWorkspaceActionRequest, Color, FilterResponse, GetFolderActionsResponse,
     GetGrpcRequestActionsResponse, GetHttpAuthenticationConfigResponse,
     GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse,
     GetTemplateFunctionConfigResponse, GetTemplateFunctionSummaryResponse,
-    GetWebSocketRequestActionsResponse, GetWorkspaceActionsResponse, InternalEvent,
+    GetWebsocketRequestActionsResponse, GetWorkspaceActionsResponse, InternalEvent,
     InternalEventPayload, JsonPrimitive, PluginContext, RenderPurpose, ShowToastRequest,
 };
 use yaak_plugins::manager::PluginManager;
@@ -880,22 +880,22 @@ async fn cmd_http_request_actions<R: Runtime>(
 async fn cmd_websocket_request_actions<R: Runtime>(
     window: WebviewWindow<R>,
     plugin_manager: State<'_, PluginManager>,
-) -> YaakResult<Vec<GetWebSocketRequestActionsResponse>> {
+) -> YaakResult<Vec<GetWebsocketRequestActionsResponse>> {
     Ok(plugin_manager.get_websocket_request_actions(&window).await?)
 }
 
 #[tauri::command]
 async fn cmd_call_websocket_request_action<R: Runtime>(
     window: WebviewWindow<R>,
-    req: CallWebSocketRequestActionRequest,
+    req: CallWebsocketRequestActionRequest,
     plugin_manager: State<'_, PluginManager>,
 ) -> YaakResult<()> {
     let websocket_request = window.db().get_websocket_request(&req.args.websocket_request.id)?;
     Ok(plugin_manager
         .call_websocket_request_action(
             &window,
-            CallWebSocketRequestActionRequest {
-                args: CallWebSocketRequestActionArgs { websocket_request },
+            CallWebsocketRequestActionRequest {
+                args: CallWebsocketRequestActionArgs { websocket_request },
                 ..req
             },
         )

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

@@ -91,9 +91,9 @@ pub enum InternalEventPayload {
     CallHttpRequestActionRequest(CallHttpRequestActionRequest),
 
     // WebSocket Request Actions
-    GetWebSocketRequestActionsRequest(EmptyPayload),
-    GetWebSocketRequestActionsResponse(GetWebSocketRequestActionsResponse),
-    CallWebSocketRequestActionRequest(CallWebSocketRequestActionRequest),
+    GetWebsocketRequestActionsRequest(EmptyPayload),
+    GetWebsocketRequestActionsResponse(GetWebsocketRequestActionsResponse),
+    CallWebsocketRequestActionRequest(CallWebsocketRequestActionRequest),
 
     // Workspace Actions
     GetWorkspaceActionsRequest(EmptyPayload),
@@ -1143,15 +1143,15 @@ pub struct CallHttpRequestActionArgs {
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
 #[serde(default, rename_all = "camelCase")]
 #[ts(export, export_to = "gen_events.ts")]
-pub struct GetWebSocketRequestActionsResponse {
-    pub actions: Vec<WebSocketRequestAction>,
+pub struct GetWebsocketRequestActionsResponse {
+    pub actions: Vec<WebsocketRequestAction>,
     pub plugin_ref_id: String,
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
 #[serde(default, rename_all = "camelCase")]
 #[ts(export, export_to = "gen_events.ts")]
-pub struct WebSocketRequestAction {
+pub struct WebsocketRequestAction {
     pub label: String,
     #[ts(optional)]
     pub icon: Option<Icon>,
@@ -1160,16 +1160,16 @@ pub struct WebSocketRequestAction {
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
 #[serde(default, rename_all = "camelCase")]
 #[ts(export, export_to = "gen_events.ts")]
-pub struct CallWebSocketRequestActionRequest {
+pub struct CallWebsocketRequestActionRequest {
     pub index: i32,
     pub plugin_ref_id: String,
-    pub args: CallWebSocketRequestActionArgs,
+    pub args: CallWebsocketRequestActionArgs,
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
 #[serde(default, rename_all = "camelCase")]
 #[ts(export, export_to = "gen_events.ts")]
-pub struct CallWebSocketRequestActionArgs {
+pub struct CallWebsocketRequestActionArgs {
     pub websocket_request: WebsocketRequest,
 }
 

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

@@ -7,13 +7,13 @@ use crate::events::{
     CallHttpAuthenticationActionArgs, CallHttpAuthenticationActionRequest,
     CallHttpAuthenticationRequest, CallHttpAuthenticationResponse, CallHttpRequestActionRequest,
     CallTemplateFunctionArgs, CallTemplateFunctionRequest, CallTemplateFunctionResponse,
-    CallWebSocketRequestActionRequest, CallWorkspaceActionRequest, EmptyPayload, ErrorResponse,
+    CallWebsocketRequestActionRequest, CallWorkspaceActionRequest, EmptyPayload, ErrorResponse,
     FilterRequest, FilterResponse, GetFolderActionsResponse, GetGrpcRequestActionsResponse,
     GetHttpAuthenticationConfigRequest, GetHttpAuthenticationConfigResponse,
     GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse,
     GetTemplateFunctionConfigRequest, GetTemplateFunctionConfigResponse,
     GetTemplateFunctionSummaryResponse, GetThemesRequest, GetThemesResponse,
-    GetWebSocketRequestActionsResponse, GetWorkspaceActionsResponse, ImportRequest, ImportResponse,
+    GetWebsocketRequestActionsResponse, GetWorkspaceActionsResponse, ImportRequest, ImportResponse,
     InternalEvent, InternalEventPayload, JsonPrimitive, PluginContext, RenderPurpose,
 };
 use crate::native_template_functions::{template_function_keyring, template_function_secure};
@@ -486,17 +486,17 @@ impl PluginManager {
     pub async fn get_websocket_request_actions<R: Runtime>(
         &self,
         window: &WebviewWindow<R>,
-    ) -> Result<Vec<GetWebSocketRequestActionsResponse>> {
+    ) -> Result<Vec<GetWebsocketRequestActionsResponse>> {
         let reply_events = self
             .send_and_wait(
                 &PluginContext::new(window),
-                &InternalEventPayload::GetWebSocketRequestActionsRequest(EmptyPayload {}),
+                &InternalEventPayload::GetWebsocketRequestActionsRequest(EmptyPayload {}),
             )
             .await?;
 
         let mut all_actions = Vec::new();
         for event in reply_events {
-            if let InternalEventPayload::GetWebSocketRequestActionsResponse(resp) = event.payload {
+            if let InternalEventPayload::GetWebsocketRequestActionsResponse(resp) = event.payload {
                 all_actions.push(resp.clone());
             }
         }
@@ -631,14 +631,14 @@ impl PluginManager {
     pub async fn call_websocket_request_action<R: Runtime>(
         &self,
         window: &WebviewWindow<R>,
-        req: CallWebSocketRequestActionRequest,
+        req: CallWebsocketRequestActionRequest,
     ) -> Result<()> {
         let ref_id = req.plugin_ref_id.clone();
         let plugin =
             self.get_plugin_by_ref_id(ref_id.as_str()).await.ok_or(PluginNotFoundErr(ref_id))?;
         let event = plugin.build_event_to_send(
             &PluginContext::new(window),
-            &InternalEventPayload::CallWebSocketRequestActionRequest(req),
+            &InternalEventPayload::CallWebsocketRequestActionRequest(req),
             None,
         );
         plugin.send(&event).await?;