fix(relay): better matching for content-type detection (hoppscotch#5025)

Author: CuriousCorrelation

packages/hoppscotch-agent/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-agent",
   "private": true,
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "scripts": {
     "dev": "vite",

packages/hoppscotch-agent/src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-agent"
-version = "0.1.9"
+version = "0.1.10"
 description = "A cross-platform HTTP request agent for Hoppscotch for advanced request handling including custom headers, certificates, proxies, and local system integration."
 authors = ["AndrewBastin", "CuriousCorrelation"]
 edition = "2021"

packages/hoppscotch-agent/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
   "productName": "Hoppscotch Agent",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "identifier": "io.hoppscotch.agent",
   "build": {
     "beforeDevCommand": "pnpm dev",

packages/hoppscotch-agent/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0-rc",
   "productName": "Hoppscotch Agent Portable",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "identifier": "io.hoppscotch.agent",
   "build": {
     "beforeDevCommand": "pnpm dev",

packages/hoppscotch-agent/src-tauri/tauri.portable.conf.json

@@ -83,25 +83,35 @@ impl ResponseHandler {
     fn determine_media_type(&self) -> MediaType {
         tracing::trace!("Determining response content type");
 
-        // TODO: Check for other capitalizations, `content-type` or `CONTENT-TYPE`
         self.headers
-            .get("Content-Type")
-            .and_then(|content_type| content_type.parse::<Mime>().ok())
-            .and_then(|mime| match (mime.type_(), mime.subtype()) {
-                (mime::APPLICATION, mime::JSON) => Some(MediaType::Json),
-                (mime::APPLICATION, name) if name == "ld+json" => Some(MediaType::JsonLd),
-                (mime::APPLICATION, mime::XML) => Some(MediaType::Xml),
-                (mime::APPLICATION, mime::WWW_FORM_URLENCODED) => Some(MediaType::FormUrlEncoded),
-                (mime::APPLICATION, mime::OCTET_STREAM) => Some(MediaType::OctetStream),
-                (mime::TEXT, mime::PLAIN) => Some(MediaType::TextPlain),
-                (mime::TEXT, mime::HTML) => Some(MediaType::TextHtml),
-                (mime::TEXT, mime::CSS) => Some(MediaType::TextCss),
-                (mime::TEXT, mime::CSV) => Some(MediaType::TextCsv),
-                (mime::TEXT, mime::XML) => Some(MediaType::TextXml),
-                (mime::MULTIPART, name) if name == "form-data" => {
-                    Some(MediaType::MultipartFormData)
+            .iter()
+            .find_map(|(k, v)| {
+                if k.to_lowercase() == "content-type" {
+                    v.parse::<Mime>()
+                        .ok()
+                        .and_then(|mime| match (mime.type_(), mime.subtype()) {
+                            (mime::APPLICATION, mime::JSON) => Some(MediaType::Json),
+                            (mime::APPLICATION, mime::XML) => Some(MediaType::Xml),
+                            (mime::APPLICATION, mime::OCTET_STREAM) => Some(MediaType::OctetStream),
+                            (mime::TEXT, mime::PLAIN) => Some(MediaType::TextPlain),
+                            (mime::TEXT, mime::HTML) => Some(MediaType::TextHtml),
+                            (mime::TEXT, mime::CSS) => Some(MediaType::TextCss),
+                            (mime::TEXT, mime::CSV) => Some(MediaType::TextCsv),
+                            (mime::TEXT, mime::XML) => Some(MediaType::TextXml),
+                            (mime::APPLICATION, mime::WWW_FORM_URLENCODED) => {
+                                Some(MediaType::FormUrlEncoded)
+                            }
+                            (mime::APPLICATION, name) if name == "ld+json" => {
+                                Some(MediaType::JsonLd)
+                            }
+                            (mime::MULTIPART, name) if name == "form-data" => {
+                                Some(MediaType::MultipartFormData)
+                            }
+                            _ => None,
+                        })
+                } else {
+                    None
                 }
-                _ => None,
             })
             .or(infer::get(&self.body)
                 .map(|kind| MediaType::from_str(kind.mime_type()).ok())

packages/hoppscotch-desktop/plugin-workspace/relay/src/response.rs

@@ -18,35 +18,24 @@ fn hopp_auth_port() -> u16 {
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    tracing::info!("Starting Hoppscotch Desktop v{}", env!("CARGO_PKG_VERSION"));
-
-    let server_port = portpicker::pick_unused_port().expect("Cannot find unused port");
-    SERVER_PORT
-        .set(server_port)
-        .expect("Failed to set server port");
-    tracing::info!("Selected server port: {}", server_port);
-
     tauri::Builder::default()
-        .plugin(
-            tauri_plugin_window_state::Builder::new()
-                .with_state_flags(
-                    StateFlags::SIZE
-                        | StateFlags::POSITION
-                        | StateFlags::MAXIMIZED
-                        | StateFlags::FULLSCREEN,
-                )
-                .with_denylist(&["main"])
-                .build(),
-        )
-        .plugin(tauri_plugin_process::init())
-        .plugin(tauri_plugin_updater::Builder::new().build())
-        .plugin(tauri_plugin_store::Builder::new().build())
-        .plugin(tauri_plugin_deep_link::init())
-        .plugin(tauri_plugin_dialog::init())
         .setup(|app| {
             let handle = app.handle().clone();
-            tracing::info!(app_name = %app.package_info().name, "Configuring deep link handler");
 
+            logger::setup(app.handle().clone())?;
+            tracing::info!("Logger setup complete");
+
+            let server_port = portpicker::pick_unused_port().expect("Cannot find unused port");
+            tracing::info!("Selected server port: {}", server_port);
+            SERVER_PORT
+                .set(server_port)
+                .expect("Failed to set server port");
+            let port = *SERVER_PORT.get().expect("Server port not initialized");
+            tracing::info!(port = port, "Initializing server with pre-selected port");
+            let port = server::init(port, handle.clone());
+            tracing::info!(port = port, "Server initialization complete");
+
+            tracing::info!(app_name = %app.package_info().name, "Configuring deep link handler");
             app.deep_link().on_open_url(move |event| {
                 let urls = event.urls();
                 tracing::info!(
@@ -64,24 +53,29 @@ pub fn run() {
                         );
                     });
             });
-            Ok(())
-        })
-        .setup(|app| {
-            let handle = app.handle().clone();
 
-            let port = *SERVER_PORT.get().expect("Server port not initialized");
-            tracing::info!(port = port, "Initializing server with pre-selected port");
-            let port = server::init(port, handle);
-            tracing::info!(port = port, "Server initialization complete");
+            tracing::info!("Starting Hoppscotch Desktop v{}", env!("CARGO_PKG_VERSION"));
+
             Ok(())
         })
+        .plugin(
+            tauri_plugin_window_state::Builder::new()
+                .with_state_flags(
+                    StateFlags::SIZE
+                        | StateFlags::POSITION
+                        | StateFlags::MAXIMIZED
+                        | StateFlags::FULLSCREEN,
+                )
+                .with_denylist(&["main"])
+                .build(),
+        )
+        .plugin(tauri_plugin_process::init())
+        .plugin(tauri_plugin_updater::Builder::new().build())
+        .plugin(tauri_plugin_store::Builder::new().build())
+        .plugin(tauri_plugin_deep_link::init())
+        .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_fs::init())
-        .setup(|app| {
-            logger::setup(app.handle().clone())?;
-            tracing::info!("Logger setup complete");
-            Ok(())
-        })
         .plugin(tauri_plugin_appload::init(
             VendorConfigBuilder::new().bundle(
                 include_bytes!("../../bundle.zip").to_vec(),