From 2fc8678183bc21b959abd2918c69d23840767e1b Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sun, 28 Dec 2025 15:18:01 -0800 Subject: [PATCH] Fix lint errors --- .../src/bindings/gen_models.ts | 2 +- src-tauri/src/http_request.rs | 12 +++++------ src-tauri/yaak-models/src/models.rs | 6 +++--- src-tauri/yaak-plugins/bindings/gen_models.ts | 2 +- src-web/components/Sidebar.tsx | 4 ++-- .../components/WorkspaceActionsDropdown.tsx | 11 +++++++++- src-web/hooks/useWebSocketRequestActions.ts | 20 +++++++++---------- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/packages/plugin-runtime-types/src/bindings/gen_models.ts b/packages/plugin-runtime-types/src/bindings/gen_models.ts index 19584449..454903fe 100644 --- a/packages/plugin-runtime-types/src/bindings/gen_models.ts +++ b/packages/plugin-runtime-types/src/bindings/gen_models.ts @@ -12,7 +12,7 @@ export type HttpRequest = { model: "http_request", id: string, createdAt: string export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, }; -export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: bigint | null, contentLengthCompressed: bigint | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array, remoteAddr: string | null, requestContentLength: bigint | null, requestHeaders: Array, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, }; +export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, }; export type HttpResponseHeader = { name: string, value: string, }; diff --git a/src-tauri/src/http_request.rs b/src-tauri/src/http_request.rs index 64230cbf..54deac7c 100644 --- a/src-tauri/src/http_request.rs +++ b/src-tauri/src/http_request.rs @@ -356,7 +356,7 @@ async fn execute_transaction( })?; // Create bounded channel for receiving events and spawn a task to store them in DB - // Buffer size of 100 events provides backpressure if DB writes are slow + // Buffer size of 100 events provides back pressure if DB writes are slow let (event_tx, mut event_rx) = tokio::sync::mpsc::channel::(100); @@ -466,7 +466,7 @@ async fn execute_transaction( .iter() .map(|(name, value)| HttpResponseHeader { name: name.clone(), value: value.clone() }) .collect(); - r.content_length = http_response.content_length.map(|l| l as i64); + r.content_length = http_response.content_length.map(|l| l as i32); r.state = HttpResponseState::Connected; r.request_headers = http_response .request_headers @@ -528,7 +528,7 @@ async fn execute_transaction( if elapsed_since_update >= UPDATE_INTERVAL_MS { response_ctx.update(|r| { r.elapsed = start.elapsed().as_millis() as i32; - r.content_length = Some(written_bytes as i64); + r.content_length = Some(written_bytes as i32); })?; last_update_time = now; } @@ -542,7 +542,7 @@ async fn execute_transaction( // Final update with closed state and accurate byte count response_ctx.update(|r| { r.elapsed = start.elapsed().as_millis() as i32; - r.content_length = Some(written_bytes as i64); + r.content_length = Some(written_bytes as i32); r.state = HttpResponseState::Closed; })?; @@ -572,7 +572,7 @@ fn write_bytes_to_db_sync( // Update the response with the total request body size response_ctx.update(|r| { - r.request_content_length = Some(data.len() as i64); + r.request_content_length = Some(data.len() as i32); })?; Ok(()) @@ -634,7 +634,7 @@ async fn write_stream_chunks_to_db( app_handle.with_tx(|tx| { debug!("Updating final body length {total_bytes}"); if let Ok(mut response) = tx.get_http_response(&response_id) { - response.request_content_length = Some(total_bytes as i64); + response.request_content_length = Some(total_bytes as i32); tx.update_http_response_if_id(&response, update_source)?; } Ok(()) diff --git a/src-tauri/yaak-models/src/models.rs b/src-tauri/yaak-models/src/models.rs index 6ec3ef67..63418896 100644 --- a/src-tauri/yaak-models/src/models.rs +++ b/src-tauri/yaak-models/src/models.rs @@ -1322,14 +1322,14 @@ pub struct HttpResponse { pub request_id: String, pub body_path: Option, - pub content_length: Option, - pub content_length_compressed: Option, + pub content_length: Option, + pub content_length_compressed: Option, pub elapsed: i32, pub elapsed_headers: i32, pub error: Option, pub headers: Vec, pub remote_addr: Option, - pub request_content_length: Option, + pub request_content_length: Option, pub request_headers: Vec, pub status: i32, pub status_reason: Option, diff --git a/src-tauri/yaak-plugins/bindings/gen_models.ts b/src-tauri/yaak-plugins/bindings/gen_models.ts index 19584449..454903fe 100644 --- a/src-tauri/yaak-plugins/bindings/gen_models.ts +++ b/src-tauri/yaak-plugins/bindings/gen_models.ts @@ -12,7 +12,7 @@ export type HttpRequest = { model: "http_request", id: string, createdAt: string export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, }; -export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: bigint | null, contentLengthCompressed: bigint | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array, remoteAddr: string | null, requestContentLength: bigint | null, requestHeaders: Array, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, }; +export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, }; export type HttpResponseHeader = { name: string, value: string, }; diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx index e09835b0..af1bba18 100644 --- a/src-web/components/Sidebar.tsx +++ b/src-web/components/Sidebar.tsx @@ -37,7 +37,7 @@ import { getCreateDropdownItems } from '../hooks/useCreateDropdownItems'; import { getGrpcRequestActions } from '../hooks/useGrpcRequestActions'; import { useHotKey } from '../hooks/useHotKey'; import { getHttpRequestActions } from '../hooks/useHttpRequestActions'; -import { getWebSocketRequestActions } from '../hooks/useWebSocketRequestActions'; +import { getWebsocketRequestActions } from '../hooks/useWebsocketRequestActions'; import { getFolderActions } from '../hooks/useFolderActions'; import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent'; import { getModelAncestors } from '../hooks/useModelAncestors'; @@ -377,7 +377,7 @@ function Sidebar({ className }: { className?: string }) { }, })), ...(items.length === 1 && child.model === 'websocket_request' - ? await getWebSocketRequestActions() + ? await getWebsocketRequestActions() : [] ).map((a) => ({ label: a.label, diff --git a/src-web/components/WorkspaceActionsDropdown.tsx b/src-web/components/WorkspaceActionsDropdown.tsx index 25a44102..4a1799aa 100644 --- a/src-web/components/WorkspaceActionsDropdown.tsx +++ b/src-web/components/WorkspaceActionsDropdown.tsx @@ -103,7 +103,16 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({ ]; return { workspaceItems, itemsAfter }; - }, [workspaces, workspaceMeta, deleteSendHistory, createWorkspace, workspace?.id]); + }, [ + workspaces, + workspaceMeta, + deleteSendHistory, + createWorkspace, + workspace?.id, + workspace, + workspaceActions.map, + workspaceActions.length, + ]); const handleSwitchWorkspace = useCallback(async (workspaceId: string | null) => { if (workspaceId == null) return; diff --git a/src-web/hooks/useWebSocketRequestActions.ts b/src-web/hooks/useWebSocketRequestActions.ts index 73badd0c..1d60cdf8 100644 --- a/src-web/hooks/useWebSocketRequestActions.ts +++ b/src-web/hooks/useWebSocketRequestActions.ts @@ -1,24 +1,24 @@ import { useQuery } from '@tanstack/react-query'; import type { WebsocketRequest } from '@yaakapp-internal/models'; import type { - CallWebSocketRequestActionRequest, - GetWebSocketRequestActionsResponse, - WebSocketRequestAction, + CallWebsocketRequestActionRequest, + GetWebsocketRequestActionsResponse, + WebsocketRequestAction, } from '@yaakapp-internal/plugins'; import { useMemo } from 'react'; import { invokeCmd } from '../lib/tauri'; import { usePluginsKey } from './usePlugins'; -export type CallableWebSocketRequestAction = Pick & { +export type CallableWebSocketRequestAction = Pick & { call: (request: WebsocketRequest) => Promise; }; -export function useWebSocketRequestActions() { +export function useWebsocketRequestActions() { const pluginsKey = usePluginsKey(); const actionsResult = useQuery({ queryKey: ['websocket_request_actions', pluginsKey], - queryFn: () => getWebSocketRequestActions(), + queryFn: () => getWebsocketRequestActions(), }); // biome-ignore lint/correctness/useExhaustiveDependencies: none @@ -29,16 +29,16 @@ export function useWebSocketRequestActions() { return actions; } -export async function getWebSocketRequestActions() { - const responses = await invokeCmd( +export async function getWebsocketRequestActions() { + const responses = await invokeCmd( 'cmd_websocket_request_actions', ); const actions = responses.flatMap((r) => - r.actions.map((a, i) => ({ + r.actions.map((a: WebsocketRequestAction, i: number) => ({ label: a.label, icon: a.icon, call: async (websocketRequest: WebsocketRequest) => { - const payload: CallWebSocketRequestActionRequest = { + const payload: CallWebsocketRequestActionRequest = { index: i, pluginRefId: r.pluginRefId, args: { websocketRequest },