fix http response load when filter (#251)

src-tauri/Cargo.lock

@@ -822,6 +822,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "charset"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
+dependencies = [
+ "base64 0.22.1",
+ "encoding_rs",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.41"
@@ -7826,6 +7836,7 @@ dependencies = [
 name = "yaak-app"
 version = "0.0.0"
 dependencies = [
+ "charset",
  "chrono",
  "cookie",
  "encoding_rs",

src-tauri/Cargo.toml

@@ -83,6 +83,7 @@ yaak-sse = { workspace = true }
 yaak-sync = { workspace = true }
 yaak-templates = { workspace = true }
 yaak-ws = { path = "yaak-ws" }
+charset = "0.1.5"
 
 [workspace.dependencies]
 chrono = "0.4.41"

src-tauri/src/encoding.rs

@@ -1,16 +1,27 @@
-use encoding_rs::SHIFT_JIS;
+use log::debug;
+use mime_guess::{Mime, mime};
+use std::path::Path;
+use std::str::FromStr;
 use tokio::fs;
-use yaak_models::models::HttpResponse;
 
-pub async fn read_response_body<'a>(
-    response: HttpResponse,
-) -> Option<String> {
-    let body_path = match response.body_path {
-        None => return None,
-        Some(p) => p,
-    };
+pub async fn read_response_body(body_path: impl AsRef<Path>, content_type: &str) -> Option<String> {
+    let body = fs::read(body_path).await.ok()?;
+    let body_charset = parse_charset(content_type).unwrap_or("utf-8".to_string());
+    debug!("body_charset: {}", body_charset);
+    if let Some(decoder) = charset::Charset::for_label(body_charset.as_bytes()) {
+        debug!("Using decoder for charset: {}", body_charset);
+        let (cow, real_encoding, exist_replace) = decoder.decode(&body);
+        debug!(
+            "Decoded body with charset: {}, real_encoding: {:?}, exist_replace: {}",
+            body_charset, real_encoding, exist_replace
+        );
+        return cow.into_owned().into();
+    }
 
-    let body = fs::read(body_path).await.unwrap();
-    let (s, _, _) = SHIFT_JIS.decode(body.as_slice());
-    Some(s.to_string())
+    Some(String::from_utf8_lossy(&body).to_string())
+}
+
+fn parse_charset(content_type: &str) -> Option<String> {
+    let mime: Mime = Mime::from_str(content_type).ok()?;
+    mime.get_param(mime::CHARSET).map(|v| v.to_string())
 }

src-tauri/src/lib.rs

@@ -726,33 +726,43 @@ async fn cmd_format_json(text: &str) -> YaakResult<String> {
 }
 
 #[tauri::command]
-async fn cmd_filter_response<R: Runtime>(
+async fn cmd_http_response_body<R: Runtime>(
     window: WebviewWindow<R>,
     app_handle: AppHandle<R>,
-    response_id: &str,
     plugin_manager: State<'_, PluginManager>,
-    filter: &str,
+    response_id: &str,
+    filter: Option<&str>,
 ) -> YaakResult<FilterResponse> {
     let response = app_handle.db().get_http_response(response_id)?;
 
-    if let None = response.body_path {
-        return Err(GenericError("Response body path not set".to_string()));
-    }
-
-    let mut content_type = "".to_string();
-    for header in response.headers.iter() {
-        if header.name.to_lowercase() == "content-type" {
-            content_type = header.value.to_string().to_lowercase();
-            break;
+    let body_path = match response.body_path {
+        None => {
+            return Err(GenericError("Response body path not set".to_string()));
         }
-    }
+        Some(p) => p,
+    };
 
-    let body = read_response_body(response)
+    let content_type = response
+        .headers
+        .iter()
+        .find_map(|h| {
+            if h.name.eq_ignore_ascii_case("content-type") { Some(h.value.as_str()) } else { None }
+        })
+        .unwrap_or_default();
+
+    let body = read_response_body(&body_path, content_type)
         .await
         .ok_or(GenericError("Failed to find response body".to_string()))?;
 
-    // TODO: Have plugins register their own content type (regex?)
-    Ok(plugin_manager.filter_data(&window, filter, &body, &content_type).await?)
+    match filter {
+        Some(filter) if !filter.is_empty() => {
+            Ok(plugin_manager.filter_data(&window, filter, &body, content_type).await?)
+        }
+        _ => Ok(FilterResponse {
+            content: body,
+            error: None,
+        }),
+    }
 }
 
 #[tauri::command]
@@ -1330,7 +1340,7 @@ pub fn run() {
             cmd_delete_send_history,
             cmd_dismiss_notification,
             cmd_export_data,
-            cmd_filter_response,
+            cmd_http_response_body,
             cmd_format_json,
             cmd_get_http_authentication_summaries,
             cmd_get_http_authentication_config,