Merge pull request #81 from dicej/remove-case-conversion-workarounds

remove workarounds for `quickjs-wasm-rs` case conversion

Author: dicej

Cargo.lock

@@ -9,14 +9,10 @@ interface BaseHttpRequest {
     method: string
     uri: string
     body?: ArrayBuffer
-}
-
-interface SpinHttpRequest extends BaseHttpRequest {
-    headers: Array<[string, string]>
+    headers: Record<string, string>
 }
 
 interface HttpRequest extends BaseHttpRequest {
-    headers: Record<string, string>
     json:() => object
     text: () => string
 }
@@ -33,7 +29,7 @@ interface SpinSDK {
     config: SpinConfig
     /** @internal */
     http: {
-        send: (arg0: SpinHttpRequest) => HttpResponse
+        send: (arg0: BaseHttpRequest) => HttpResponse
     }
     redis: {
         get: (address: string, key: string) => ArrayBuffer
@@ -48,8 +44,9 @@ interface SpinSDK {
 }
 
 interface FetchOptions {
-    method: string
-    headers: object
+    method?: string
+    headers?: Record<string, string>
+    body?: ArrayBuffer
 }
 
 interface FetchHeaders {
@@ -68,15 +65,11 @@ interface FetchResult {
 
 /** @internal */
 function fetch(uri: string, options?: FetchOptions) {
-    let reqHeaders: Array<[string, string]> = []
-    if (options && options.headers) {
-        reqHeaders = Object.entries(options.headers)
-    }
     const { status, headers, body } = spinSdk.http.send({
         method: (options && options.method) || "GET",
         uri,
-        ...(options || {}),
-        headers: reqHeaders
+        headers: (options && options.headers) || {},
+        body: options && options.body,
     })
     return Promise.resolve({
         status,
@@ -97,7 +90,7 @@ function fetch(uri: string, options?: FetchOptions) {
 declare global {
     const spinSdk: SpinSDK
     function fetch(uri: string, options?: object) : Promise<FetchResult>
-    
+
 }
 
 /** @internal */

crates/spin-js-engine/src/js_sdk/modules/spinSdk.ts

@@ -37,17 +37,7 @@ struct HttpRequest {
     method: String,
     uri: String,
     #[serde(default)]
-    headers: Vec<(String, String)>,
-    body: Option<ByteBuf>,
-}
-
-// Seperate Structure to add headers without having to use serde
-// serde causes issues with headers as it sanitzes keys leading to headers being invalid
-// (eg) content-type becomes contentType.
-#[derive(Serialize, Deserialize, Debug)]
-struct JSHttpRequest {
-    method: String,
-    uri: String,
+    headers: HashMap<String, String>,
     body: Option<ByteBuf>,
 }
 
@@ -366,7 +356,7 @@ fn redis_sadd(context: &Context, _this: &Value, args: &[Value]) -> Result<Value>
 
 fn redis_smembers(context: &Context, _this: &Value, args: &[Value]) -> Result<Value> {
     match args {
-        [address, key, ] => {
+        [address, key] => {
             let address = &deserialize_helper(address)?;
             let key = &deserialize_helper(key)?;
             let value = redis::smembers(address, key)
@@ -513,15 +503,19 @@ fn handle(request: Request) -> Result<Response> {
 
     global.set_property("process", process)?;
 
-    let headers = context.object_value()?;
-    for (key, value) in request.headers().iter() {
-        let header_value = context.value_from_str(str::from_utf8(value.as_bytes())?)?;
-        headers.set_property(key.as_str().to_owned(), header_value)?;
-    }
-
-    let request = JSHttpRequest {
+    let request = HttpRequest {
         method: request.method().as_str().to_owned(),
         uri: request.uri().to_string(),
+        headers: request
+            .headers()
+            .iter()
+            .map(|(k, v)| {
+                Ok((
+                    k.as_str().to_owned(),
+                    str::from_utf8(v.as_bytes())?.to_owned(),
+                ))
+            })
+            .collect::<Result<_>>()?,
         body: request
             .into_body()
             .map(|bytes| ByteBuf::from(bytes.deref())),
@@ -530,7 +524,7 @@ fn handle(request: Request) -> Result<Response> {
     request.serialize(&mut serializer)?;
     let request_value = serializer.value;
     let body = request.body;
-    request_value.set_property("headers", headers)?;
+
     request_value.set_property(
         "text",
         context.wrap_callback({
@@ -578,7 +572,7 @@ fn handle(request: Request) -> Result<Response> {
         }
     }
 
-    Ok(builder.body(response.body.map(|buffer| buffer.into_vec().into()))?)
+    Ok(builder.body(response.body.map(|buffer| buffer.to_vec().into()))?)
 }
 
 fn deserialize_helper(value: &Value) -> Result<String> {

crates/spin-js-engine/src/lib.rs

@@ -5,9 +5,9 @@ interface BaseHttpRequest {
     method: string;
     uri: string;
     body?: ArrayBuffer;
+    headers: Record<string, string>;
 }
 interface HttpRequest extends BaseHttpRequest {
-    headers: Record<string, string>;
     json: () => object;
     text: () => string;
 }