From dc495c58562c1cfe1732b62524154d713eb7632f Mon Sep 17 00:00:00 2001
From: Matthias Wright <matthias.s.wright@gmail.com>
Date: Mon, 29 Apr 2024 21:38:23 +0800
Subject: [PATCH] feat(js-poc): separate query params from path

---
 services/js-poc/examples/js-poc-client.rs |  2 +
 services/js-poc/src/lib.rs                | 56 ++++++++++++++++++-----
 services/js-poc/src/stream.rs             |  4 ++
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/services/js-poc/examples/js-poc-client.rs b/services/js-poc/examples/js-poc-client.rs
index c1b8006ef..458da848d 100644
--- a/services/js-poc/examples/js-poc-client.rs
+++ b/services/js-poc/examples/js-poc-client.rs
@@ -33,6 +33,8 @@ async fn main() -> anyhow::Result<()> {
                 origin,
                 uri,
                 path: None,
+                query_params: None,
+                url_fragment: None,
                 method: None,
                 headers: None,
                 param,
diff --git a/services/js-poc/src/lib.rs b/services/js-poc/src/lib.rs
index c735f42eb..39ba632fa 100644
--- a/services/js-poc/src/lib.rs
+++ b/services/js-poc/src/lib.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use anyhow::{anyhow, bail, Context};
 use arrayref::array_ref;
 use cid::Cid;
@@ -110,6 +112,8 @@ async fn handle_request(
         origin,
         uri,
         path,
+        query_params: _,
+        url_fragment: _,
         method: _,
         headers: _,
         param,
@@ -284,14 +288,16 @@ fn extract_request(url: &Url, body: &[u8], detail: &TransportDetail) -> Option<R
     if path.is_empty() {
         path.push('/');
     }
-    if let Some(q) = url.query() {
-        path.push('?');
-        path.push_str(q);
-    }
-    if let Some(f) = url.fragment() {
-        path.push('#');
-        path.push_str(f);
-    }
+
+    let query_params: HashMap<String, String> = url
+        .query_pairs()
+        .map(|(key, val)| (key.to_string(), val.to_string()))
+        .collect();
+    let query_params = if query_params.is_empty() {
+        None
+    } else {
+        Some(query_params)
+    };
 
     let param = if body.is_empty() {
         url.query_pairs()
@@ -315,6 +321,8 @@ fn extract_request(url: &Url, body: &[u8], detail: &TransportDetail) -> Option<R
         origin,
         uri: seg2.to_string(),
         path: Some(path),
+        query_params,
+        url_fragment: url.fragment().map(|frag| frag.to_string()),
         method,
         headers,
         param,
@@ -343,6 +351,8 @@ mod tests {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
                 path: Some("/".to_string()),
+                query_params: None,
+                url_fragment: None,
                 method: None,
                 headers: None,
                 param: None,
@@ -359,6 +369,8 @@ mod tests {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
                 path: Some("/a".to_string()),
+                query_params: None,
+                url_fragment: None,
                 method: None,
                 headers: None,
                 param: None,
@@ -375,12 +387,16 @@ mod tests {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
                 path: Some("/a/b".to_string()),
+                query_params: None,
+                url_fragment: None,
                 method: None,
                 headers: None,
                 param: None,
             })
         );
 
+        let mut query_params = HashMap::new();
+        query_params.insert("a".to_string(), "4".to_string());
         assert_eq!(
             extract_request(
                 &Url::parse("http://fleek/blake3/content-hash/a/b?a=4").unwrap(),
@@ -390,13 +406,17 @@ mod tests {
             Some(Request {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
-                path: Some("/a/b?a=4".to_string()),
+                path: Some("/a/b".to_string()),
+                query_params: Some(query_params),
+                url_fragment: None,
                 method: None,
                 headers: None,
                 param: None,
             })
         );
 
+        let mut query_params = HashMap::new();
+        query_params.insert("a".to_string(), "4".to_string());
         assert_eq!(
             extract_request(
                 &Url::parse("http://fleek/blake3/content-hash/a/b?a=4#hello").unwrap(),
@@ -406,13 +426,18 @@ mod tests {
             Some(Request {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
-                path: Some("/a/b?a=4#hello".to_string()),
+                path: Some("/a/b".to_string()),
+                query_params: Some(query_params),
+                url_fragment: Some("hello".to_string()),
                 method: None,
                 headers: None,
                 param: None,
             })
         );
 
+        let mut query_params = HashMap::new();
+        query_params.insert("a".to_string(), "4".to_string());
+        query_params.insert("param".to_string(), "{\"a\": 4}".to_string());
         assert_eq!(
             extract_request(
                 &Url::parse(
@@ -425,13 +450,18 @@ mod tests {
             Some(Request {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
-                path: Some("/a/b?a=4&param=%7B%22a%22%3A%204%7D#hello".to_string()),
+                path: Some("/a/b".to_string()),
+                query_params: Some(query_params),
+                url_fragment: Some("hello".to_string()),
                 method: None,
                 headers: None,
                 param: Some(json!({"a": 4})),
             })
         );
 
+        let mut query_params = HashMap::new();
+        query_params.insert("a".to_string(), "4".to_string());
+        query_params.insert("param".to_string(), "{\"a\": 4}".to_string());
         assert_eq!(
             extract_request(
                 &Url::parse(
@@ -444,7 +474,9 @@ mod tests {
             Some(Request {
                 origin: Origin::Blake3,
                 uri: "content-hash".to_string(),
-                path: Some("/a/b?a=4&param=%7B%22a%22%3A%204%7D#hello".to_string()),
+                path: Some("/a/b".to_string()),
+                query_params: Some(query_params),
+                url_fragment: Some("hello".to_string()),
                 method: None,
                 headers: None,
                 param: Some(json!({"hello": 5})),
diff --git a/services/js-poc/src/stream.rs b/services/js-poc/src/stream.rs
index 68cfa03cc..b8e8b9075 100644
--- a/services/js-poc/src/stream.rs
+++ b/services/js-poc/src/stream.rs
@@ -15,6 +15,10 @@ pub struct Request {
     pub uri: String,
     /// Optional path to provide as the window location
     pub path: Option<String>,
+    /// The query params from the url, if they exist
+    pub query_params: Option<HashMap<String, String>>,
+    /// The url fragment identifier, if it exists
+    pub url_fragment: Option<String>,
     /// Http method
     pub method: Option<HttpMethod>,
     /// Headers from the http request