@mentra/crust 3.3.0-dev.382 → 3.3.0-dev.388

package/android/src/main/java/com/mentra/crust/jsc/JSCPolyfillBridge.kt

@@ -54,6 +54,23 @@ object JSCPolyfillBridge {
 
     /** Shared OkHttp execution path for host cloud-client requests. */
     fun executeHttp(method: String, url: String, headers: Map<String, String>, bodyString: String?): HttpResult {
+        val request = buildHttpRequest(method, url, headers, bodyString)
+        httpClient.newCall(request).execute().use { response ->
+            val responseHeaders = mutableMapOf<String, String>()
+            for (name in response.headers.names()) {
+                responseHeaders[name.lowercase()] = response.headers.values(name).joinToString(", ")
+            }
+            return HttpResult(
+                status = response.code,
+                statusText = response.message,
+                headers = responseHeaders,
+                body = response.body?.string() ?: "",
+            )
+        }
+    }
+
+    /** Keep host HTTP and miniapp fetch body semantics identical, including empty POSTs. */
+    internal fun buildHttpRequest(method: String, url: String, headers: Map<String, String>, bodyString: String?): Request {
         val builder = Request.Builder().url(url)
         for ((name, value) in headers) builder.header(name, value)
         val contentType = headers.entries
@@ -66,18 +83,7 @@ object JSCPolyfillBridge {
             else -> null
         }
         builder.method(upperMethod, requestBody)
-        httpClient.newCall(builder.build()).execute().use { response ->
-            val responseHeaders = mutableMapOf<String, String>()
-            for (name in response.headers.names()) {
-                responseHeaders[name.lowercase()] = response.headers.values(name).joinToString(", ")
-            }
-            return HttpResult(
-                status = response.code,
-                statusText = response.message,
-                headers = responseHeaders,
-                body = response.body?.string() ?: "",
-            )
-        }
+        return builder.build()
     }
 
     /** Idempotent. Call once on host boot, after the dispatcher is created. */
@@ -220,20 +226,9 @@ object JSCPolyfillBridge {
             }?.toMap() ?: emptyMap()
             val bodyString = req["body"] as? String
 
-            val builder = Request.Builder().url(url)
-            for ((k, v) in headers) builder.header(k, v)
-            // HTTP header names are case-insensitive. The JS fetch caller will
-            // commonly provide `Content-Type`; a direct lowercase map lookup
-            // misses that value and causes OkHttp to emit application/octet-stream.
-            val contentType = headers.entries
-                .firstOrNull { (name, _) -> name.equals("content-type", ignoreCase = true) }
-                ?.value
-            val body = if (bodyString.isNullOrEmpty()) null else bodyString.toRequestBody(
-                (contentType ?: "application/octet-stream").toMediaTypeOrNull()
-            )
-            builder.method(method.uppercase(), body)
+            val request = buildHttpRequest(method, url, headers, bodyString)
 
-            httpClient.newCall(builder.build()).enqueue(object : Callback {
+            httpClient.newCall(request).enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
                     deliverError(runtime, packageName, reqId, "fetch: ${e.message}")
                 }

package/android/src/test/java/com/mentra/crust/jsc/HttpRequestTest.kt

@@ -0,0 +1,32 @@
+package com.mentra.crust.jsc
+
+import okhttp3.Request
+import okio.Buffer
+import org.junit.Assert.*
+import org.junit.Test
+
+class HttpRequestTest {
+    private fun request(method: String, body: String? = null): Request =
+        JSCPolyfillBridge.buildHttpRequest(method, "https://example.com/stream", mapOf("Content-Type" to "application/json"), body)
+
+    @Test fun `bodyless post put and patch produce valid zero byte requests`() {
+        for (method in listOf("post", "PUT", "PATCH")) for (body in listOf(null, "")) {
+            val request = request(method, body)
+            assertEquals(method.uppercase(), request.method)
+            assertNotNull(request.body)
+            assertEquals(0L, request.body!!.contentLength())
+        }
+    }
+
+    @Test fun `get head and delete can omit a body`() {
+        for (method in listOf("GET", "HEAD", "DELETE")) assertNull(request(method).body)
+    }
+
+    @Test fun `nonempty body and content type survive request construction`() {
+        val request = request("POST", "{\"status\":\"stopped\"}")
+        val buffer = Buffer()
+        request.body!!.writeTo(buffer)
+        assertEquals("{\"status\":\"stopped\"}", buffer.readUtf8())
+        assertEquals("application/json; charset=utf-8", request.body!!.contentType().toString())
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/crust",
-  "version": "3.3.0-dev.382",
+  "version": "3.3.0-dev.388",
   "description": "Mentra Native Module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -35,7 +35,7 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/Mentra-Community/MentraOS/tree/dev/mobile/modules/crust#readme",
   "dependencies": {
-    "@mentra/jspolyfill": "3.3.0-dev.382"
+    "@mentra/jspolyfill": "3.3.0-dev.388"
   },
   "devDependencies": {
     "@expo/config-plugins": ">=8.0.0",