This commit addresses parameter naming inconsistencies caused by Tauri v2's requirement for camelCase parameter names in IPC commands. Backend changes (Rust): - Updated all command parameters from snake_case to camelCase - Commands affected: * provider.rs: providerId (×4), timeoutSecs * import_export.rs: filePath (×2), defaultName * config.rs: defaultPath - Added #[allow(non_snake_case)] attributes for camelCase parameters - Removed unused QueryUsageParams struct Frontend changes (TypeScript): - Removed redundant snake_case parameters from all invoke() calls - Updated API files: * usage.ts: removed debug logs, unified to providerId * vscode.ts: updated 8 functions (providerId, timeoutSecs, filePath, defaultName) * settings.ts: updated 4 functions (defaultPath, filePath, defaultName) - Ensured all parameters now use camelCase exclusively Test updates: - Updated MSW handlers to accept both old and new parameter formats during transition - Added i18n mock compatibility for tests Root cause: The issue stemmed from Tauri v2 strictly requiring camelCase for command parameters, while the codebase was using snake_case. This caused parameters like 'provider_id' to not be recognized by the backend, resulting in "missing providerId parameter" errors. BREAKING CHANGE: All Tauri command invocations now require camelCase parameters. Any external tools or scripts calling these commands must be updated accordingly. Fixes: Usage query always failing with "missing providerId" error Fixes: Custom endpoint management not receiving provider ID Fixes: Import/export dialogs not respecting default paths
219 lines
6.9 KiB
TypeScript
219 lines
6.9 KiB
TypeScript
import { http, HttpResponse } from "msw";
|
|
import type { AppId } from "@/lib/api/types";
|
|
import type { McpServer, Provider, Settings } from "@/types";
|
|
import {
|
|
addProvider,
|
|
deleteProvider,
|
|
getCurrentProviderId,
|
|
getProviders,
|
|
listProviders,
|
|
resetProviderState,
|
|
setCurrentProviderId,
|
|
updateProvider,
|
|
updateSortOrder,
|
|
getSettings,
|
|
setSettings,
|
|
getAppConfigDirOverride,
|
|
setAppConfigDirOverrideState,
|
|
getMcpConfig,
|
|
setMcpServerEnabled,
|
|
upsertMcpServer,
|
|
deleteMcpServer,
|
|
} from "./state";
|
|
|
|
const TAURI_ENDPOINT = "http://tauri.local";
|
|
|
|
const withJson = async <T>(request: Request): Promise<T> => {
|
|
try {
|
|
const body = await request.text();
|
|
if (!body) return {} as T;
|
|
return JSON.parse(body) as T;
|
|
} catch {
|
|
return {} as T;
|
|
}
|
|
};
|
|
|
|
const success = <T>(payload: T) => HttpResponse.json(payload as any);
|
|
|
|
export const handlers = [
|
|
http.post(`${TAURI_ENDPOINT}/get_providers`, async ({ request }) => {
|
|
const { app } = await withJson<{ app: AppId }>(request);
|
|
return success(getProviders(app));
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/get_current_provider`, async ({ request }) => {
|
|
const { app } = await withJson<{ app: AppId }>(request);
|
|
return success(getCurrentProviderId(app));
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/update_providers_sort_order`, async ({ request }) => {
|
|
const { updates = [], app } = await withJson<{
|
|
updates: { id: string; sortIndex: number }[];
|
|
app: AppId;
|
|
}>(request);
|
|
updateSortOrder(app, updates);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/update_tray_menu`, () => success(true)),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/switch_provider`, async ({ request }) => {
|
|
const { id, app } = await withJson<{ id: string; app: AppId }>(request);
|
|
const providers = listProviders(app);
|
|
if (!providers[id]) {
|
|
return HttpResponse.json(false, { status: 404 });
|
|
}
|
|
setCurrentProviderId(app, id);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/add_provider`, async ({ request }) => {
|
|
const { provider, app } = await withJson<{
|
|
provider: Provider & { id?: string };
|
|
app: AppId;
|
|
}>(request);
|
|
|
|
const newId = provider.id ?? `mock-${Date.now()}`;
|
|
addProvider(app, { ...provider, id: newId });
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/update_provider`, async ({ request }) => {
|
|
const { provider, app } = await withJson<{
|
|
provider: Provider;
|
|
app: AppId;
|
|
}>(request);
|
|
updateProvider(app, provider);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/delete_provider`, async ({ request }) => {
|
|
const { id, app } = await withJson<{ id: string; app: AppId }>(request);
|
|
deleteProvider(app, id);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/import_default_config`, async () => {
|
|
resetProviderState();
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/open_external`, () => success(true)),
|
|
|
|
// MCP APIs
|
|
http.post(`${TAURI_ENDPOINT}/get_mcp_config`, async ({ request }) => {
|
|
const { app } = await withJson<{ app: AppId }>(request);
|
|
return success(getMcpConfig(app));
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/import_mcp_from_claude`, () => success(1)),
|
|
http.post(`${TAURI_ENDPOINT}/import_mcp_from_codex`, () => success(1)),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/set_mcp_enabled`, async ({ request }) => {
|
|
const { app, id, enabled } = await withJson<{
|
|
app: AppId;
|
|
id: string;
|
|
enabled: boolean;
|
|
}>(request);
|
|
setMcpServerEnabled(app, id, enabled);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/upsert_mcp_server_in_config`, async ({ request }) => {
|
|
const { app, id, spec } = await withJson<{
|
|
app: AppId;
|
|
id: string;
|
|
spec: McpServer;
|
|
}>(request);
|
|
upsertMcpServer(app, id, spec);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/delete_mcp_server_in_config`, async ({ request }) => {
|
|
const { app, id } = await withJson<{ app: AppId; id: string }>(request);
|
|
deleteMcpServer(app, id);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/restart_app`, () => success(true)),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/get_settings`, () => success(getSettings())),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/save_settings`, async ({ request }) => {
|
|
const { settings } = await withJson<{ settings: Settings }>(request);
|
|
setSettings(settings);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/set_app_config_dir_override`, async ({ request }) => {
|
|
const { path } = await withJson<{ path: string | null }>(request);
|
|
setAppConfigDirOverrideState(path ?? null);
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/get_app_config_dir_override`, () =>
|
|
success(getAppConfigDirOverride()),
|
|
),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/apply_claude_plugin_config`, async ({ request }) => {
|
|
const { official } = await withJson<{ official: boolean }>(request);
|
|
setSettings({ enableClaudePluginIntegration: !official });
|
|
return success(true);
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/get_config_dir`, async ({ request }) => {
|
|
const { app } = await withJson<{ app: AppId }>(request);
|
|
return success(app === "claude" ? "/default/claude" : "/default/codex");
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/is_portable_mode`, () => success(false)),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/select_config_directory`, async ({ request }) => {
|
|
const { defaultPath, default_path } = await withJson<{
|
|
defaultPath?: string;
|
|
default_path?: string;
|
|
}>(request);
|
|
const initial = defaultPath ?? default_path;
|
|
return success(initial ? `${initial}/picked` : "/mock/selected-dir");
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/pick_directory`, async ({ request }) => {
|
|
const { defaultPath, default_path } = await withJson<{
|
|
defaultPath?: string;
|
|
default_path?: string;
|
|
}>(request);
|
|
const initial = defaultPath ?? default_path;
|
|
return success(initial ? `${initial}/picked` : "/mock/selected-dir");
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/open_file_dialog`, () =>
|
|
success("/mock/import-settings.json"),
|
|
),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/import_config_from_file`, async ({ request }) => {
|
|
const { filePath } = await withJson<{ filePath: string }>(request);
|
|
if (!filePath) {
|
|
return success({ success: false, message: "Missing file" });
|
|
}
|
|
setSettings({ language: "en" });
|
|
return success({ success: true, backupId: "backup-123" });
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/export_config_to_file`, async ({ request }) => {
|
|
const { filePath } = await withJson<{ filePath: string }>(request);
|
|
if (!filePath) {
|
|
return success({ success: false, message: "Invalid destination" });
|
|
}
|
|
return success({ success: true, filePath });
|
|
}),
|
|
|
|
http.post(`${TAURI_ENDPOINT}/save_file_dialog`, () =>
|
|
success("/mock/export-settings.json"),
|
|
),
|
|
|
|
// Sync current providers live (no-op success)
|
|
http.post(`${TAURI_ENDPOINT}/sync_current_providers_live`, () =>
|
|
success({ success: true }),
|
|
),
|
|
];
|