Import from Curl

src-tauri/src/lib.rs

@@ -5,56 +5,57 @@ extern crate objc;
 
 use std::collections::HashMap;
 use std::env::current_dir;
-use std::fs::{create_dir_all, read_to_string, File};
+use std::fs;
+use std::fs::{create_dir_all, File, read_to_string};
 use std::path::PathBuf;
 use std::process::exit;
 use std::str::FromStr;
 
-use ::http::uri::InvalidUri;
 use ::http::Uri;
+use ::http::uri::InvalidUri;
 use base64::Engine;
 use fern::colors::ColoredLevelConfig;
 use log::{debug, error, info, warn};
 use rand::random;
 use serde_json::{json, Value};
+use sqlx::{Pool, Sqlite, SqlitePool};
 use sqlx::migrate::Migrator;
 use sqlx::sqlite::SqliteConnectOptions;
 use sqlx::types::Json;
-use sqlx::{Pool, Sqlite, SqlitePool};
+use tauri::{AppHandle, RunEvent, State, WebviewUrl, WebviewWindow};
+use tauri::{Manager, WindowEvent};
 use tauri::path::BaseDirectory;
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
-use tauri::{AppHandle, RunEvent, State, WebviewUrl, WebviewWindow};
-use tauri::{Manager, WindowEvent};
 use tauri_plugin_log::{fern, Target, TargetKind};
 use tauri_plugin_shell::ShellExt;
 use tokio::sync::Mutex;
 use tokio::time::sleep;
 
+use ::grpc::{Code, deserialize_message, serialize_message, ServiceDefinition};
 use ::grpc::manager::{DynamicMessage, GrpcHandle};
-use ::grpc::{deserialize_message, serialize_message, Code, ServiceDefinition};
 use window_ext::TrafficLightWindowExt;
 
 use crate::analytics::{AnalyticsAction, AnalyticsResource};
 use crate::grpc::metadata_to_map;
 use crate::http::send_http_request;
 use crate::models::{
-    cancel_pending_grpc_connections, cancel_pending_responses, create_http_response,
-    delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar, delete_environment,
-    delete_folder, delete_grpc_connection, delete_grpc_request, delete_http_request,
-    delete_http_response, delete_workspace, duplicate_grpc_request, duplicate_http_request,
-    generate_model_id, get_cookie_jar, get_environment, get_folder, get_grpc_connection,
+    cancel_pending_grpc_connections, cancel_pending_responses, CookieJar,
+    create_http_response, delete_all_grpc_connections, delete_all_http_responses, delete_cookie_jar,
+    delete_environment, delete_folder, delete_grpc_connection, delete_grpc_request,
+    delete_http_request, delete_http_response, delete_workspace, duplicate_grpc_request,
+    duplicate_http_request, Environment, EnvironmentVariable, Folder, generate_model_id,
+    get_cookie_jar, get_environment, get_folder, get_grpc_connection,
     get_grpc_request, get_http_request, get_http_response, get_key_value_raw,
-    get_or_create_settings, get_workspace, get_workspace_export_resources, list_cookie_jars,
-    list_environments, list_folders, list_grpc_connections, list_grpc_events, list_grpc_requests,
-    list_http_requests, list_responses, list_workspaces, set_key_value_raw, update_response_if_id,
-    update_settings, upsert_cookie_jar, upsert_environment, upsert_folder, upsert_grpc_connection,
-    upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace, CookieJar,
-    Environment, EnvironmentVariable, Folder, GrpcConnection, GrpcEvent, GrpcEventType,
-    GrpcRequest, HttpRequest, HttpRequestHeader, HttpResponse, KeyValue, ModelType, Settings,
+    get_or_create_settings, get_workspace, get_workspace_export_resources, GrpcConnection, GrpcEvent,
+    GrpcEventType, GrpcRequest, HttpRequest, HttpRequestHeader, HttpResponse,
+    KeyValue, list_cookie_jars, list_environments, list_folders, list_grpc_connections,
+    list_grpc_events, list_grpc_requests, list_http_requests, list_responses, list_workspaces,
+    ModelType, set_key_value_raw, Settings, update_response_if_id, update_settings, upsert_cookie_jar,
+    upsert_environment, upsert_folder, upsert_grpc_connection, upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_workspace,
     Workspace, WorkspaceExportResources,
 };
-use crate::plugin::{run_plugin_export_curl, ImportResult};
+use crate::plugin::{ImportResult, run_plugin_export_curl, run_plugin_import};
 use crate::render::render_request;
 use crate::updates::{update_mode_from_str, UpdateMode, YaakUpdater};
 use crate::window_menu::app_menu;
@@ -736,8 +737,11 @@ async fn cmd_import_data(
         "importer-postman",
         "importer-curl",
     ];
+    let file = fs::read_to_string(file_path)
+        .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
+    let file_contents = file.as_str();
     for plugin_name in plugins {
-        let v = plugin::run_plugin_import(&w.app_handle(), plugin_name, file_path)
+        let v = plugin::run_plugin_import(&w.app_handle(), plugin_name, file_contents)
             .await
             .map_err(|e| e.to_string())?;
         if let Some(r) = v {
@@ -874,6 +878,32 @@ async fn cmd_request_to_curl(
     Ok(run_plugin_export_curl(&app, &rendered)?)
 }
 
+#[tauri::command]
+async fn cmd_curl_to_request(
+    app: AppHandle,
+    command: &str,
+    workspace_id: &str,
+) -> Result<HttpRequest, String> {
+    let v = run_plugin_import(&app, "importer-curl", command)
+        .await
+        .map_err(|e| e.to_string());
+    match v {
+        Ok(Some(r)) => r
+            .resources
+            .http_requests
+            .get(0)
+            .ok_or("No curl command found".to_string())
+            .map(|r| {
+                let mut request = r.clone();
+                request.workspace_id = workspace_id.into();
+                request.id = "".to_string();
+                request
+            }),
+        Ok(None) => Err("Did not find curl request".to_string()),
+        Err(e) => Err(e),
+    }
+}
+
 #[tauri::command]
 async fn cmd_export_data(
     window: WebviewWindow,
@@ -1585,6 +1615,7 @@ pub fn run() {
             cmd_create_grpc_request,
             cmd_create_http_request,
             cmd_create_workspace,
+            cmd_curl_to_request,
             cmd_delete_all_grpc_connections,
             cmd_delete_all_http_responses,
             cmd_delete_cookie_jar,

src-tauri/src/plugin.rs

@@ -1,17 +1,16 @@
-use std::fs;
 use std::rc::Rc;
 
-use boa_engine::builtins::promise::PromiseState;
 use boa_engine::{
-    js_string, module::SimpleModuleLoader, property::Attribute, Context, JsNativeError, JsValue,
-    Module, Source,
+    Context, js_string, JsNativeError, JsValue, Module, module::SimpleModuleLoader,
+    property::Attribute, Source,
 };
+use boa_engine::builtins::promise::PromiseState;
 use boa_runtime::Console;
 use log::{debug, error};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use tauri::path::BaseDirectory;
 use tauri::{AppHandle, Manager};
+use tauri::path::BaseDirectory;
 
 use crate::models::{HttpRequest, WorkspaceExportResources};
 
@@ -68,11 +67,8 @@ pub fn run_plugin_export_curl(
 pub async fn run_plugin_import(
     app_handle: &AppHandle,
     plugin_name: &str,
-    file_path: &str,
+    file_contents: &str,
 ) -> Result<Option<ImportResult>, String> {
-    let file = fs::read_to_string(file_path)
-        .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
-    let file_contents = file.as_str();
     let result_json = run_plugin(
         app_handle,
         plugin_name,