@mentra/crust 3.3.0-dev.515 → 3.3.0-dev.517

package/android/src/main/java/com/mentra/crust/CrustModule.kt

@@ -170,13 +170,23 @@ class CrustModule : Module() {
     }
 
     AsyncFunction("nativeHttpRequest") {
-      method: String, url: String, headers: Map<String, String>, body: String? ->
-      val result = JSCPolyfillBridge.executeHttp(method, url, headers, body)
-      mapOf(
-        "status" to result.status,
-        "statusText" to result.statusText,
-        "headers" to result.headers,
-        "body" to result.body,
+      method: String, url: String, headers: Map<String, String>, body: String?, promise: expo.modules.kotlin.Promise ->
+      JSCPolyfillBridge.enqueueHttp(
+        method,
+        url,
+        headers,
+        body,
+        onResult = { result ->
+          promise.resolve(
+            mapOf(
+              "status" to result.status,
+              "statusText" to result.statusText,
+              "headers" to result.headers,
+              "body" to result.body,
+            )
+          )
+        },
+        onError = { error -> promise.reject("E_NATIVE_HTTP", error.message ?: "Native HTTP request failed", error) },
       )
     }
 

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

@@ -52,21 +52,49 @@ object JSCPolyfillBridge {
         val body: String,
     )
 
-    /** 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() ?: "",
-            )
+    /**
+     * Shared OkHttp path for host cloud-client requests. Asynchronous because Expo runs every
+     * module's AsyncFunction on one shared thread: a blocking call here stalls miniapp delivery
+     * and every other native module for the length of the request, up to [callTimeout].
+     */
+    fun enqueueHttp(
+        method: String,
+        url: String,
+        headers: Map<String, String>,
+        bodyString: String?,
+        onResult: (HttpResult) -> Unit,
+        onError: (Throwable) -> Unit,
+    ) {
+        val request = try {
+            buildHttpRequest(method, url, headers, bodyString)
+        } catch (e: Throwable) {
+            onError(e)
+            return
         }
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) = onError(e)
+
+            override fun onResponse(call: Call, response: Response) {
+                try {
+                    response.use { r ->
+                        val responseHeaders = mutableMapOf<String, String>()
+                        for (name in r.headers.names()) {
+                            responseHeaders[name.lowercase()] = r.headers.values(name).joinToString(", ")
+                        }
+                        onResult(
+                            HttpResult(
+                                status = r.code,
+                                statusText = r.message,
+                                headers = responseHeaders,
+                                body = r.body?.string() ?: "",
+                            )
+                        )
+                    }
+                } catch (e: Throwable) {
+                    onError(e)
+                }
+            }
+        })
     }
 
     /** Keep host HTTP and miniapp fetch body semantics identical, including empty POSTs. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/crust",
-  "version": "3.3.0-dev.515",
+  "version": "3.3.0-dev.517",
   "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.515"
+    "@mentra/jspolyfill": "3.3.0-dev.517"
   },
   "devDependencies": {
     "@expo/config-plugins": ">=8.0.0",