@mentra/crust 3.3.0-dev.577 → 3.3.0-dev.581

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

@@ -8,6 +8,12 @@ import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.functions.Queues
 import java.net.URL
+import java.util.concurrent.Executors
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.cancel
 
 import com.mentra.crust.navigation.NavigationManager
 import com.mentra.crust.heading.HeadingManager
@@ -73,6 +79,22 @@ class CrustModule : Module() {
   // __dispatch from a per-miniapp QuickJS context (SUBSCRIBE, mic, location,
   // display, send, etc.) would be silently dropped on Android.
   @Volatile private var runtimeInstalled: Boolean = false
+
+  // MentraJS calls get their own serial queue. Expo runs every module's default-queue
+  // AsyncFunction on one shared thread, so a blocking call in another module held every
+  // host→miniapp message behind it: the ACS scoped Wi-Fi join waits on the glasses hotspot for
+  // tens of seconds, the miniapp never saw the host's PING, and the host respawned Mentra Call
+  // mid-join. Serial, so spawn, dispatch and kill still run in the order JS issued them.
+  private val mentraJsExecutor =
+          Executors.newSingleThreadExecutor { r ->
+            Thread(r, "MentraJS-bridge").apply { isDaemon = true }
+          }
+  private val mentraJsQueue =
+          CoroutineScope(
+                  mentraJsExecutor.asCoroutineDispatcher() +
+                          SupervisorJob() +
+                          CoroutineName("MentraJS-bridge"),
+          )
   private var notificationEventReceiver: BroadcastReceiver? = null
   private var notificationBridgeContext: android.content.Context? = null
 
@@ -145,6 +167,8 @@ class CrustModule : Module() {
       notificationEventReceiver = null
       notificationBridgeContext = null
       eventEmitter = null
+      mentraJsQueue.cancel()
+      mentraJsExecutor.shutdown()
     }
 
     Function("hello") {
@@ -260,7 +284,7 @@ class CrustModule : Module() {
           polyfillBundleOverride = polyfillBundle.takeIf { it.isNotEmpty() },
           miniappJs = miniappJs,
       )
-    }
+    }.runOnQueue(mentraJsQueue)
 
     AsyncFunction("mentraJsEvaluate") { packageName: String, source: String ->
       val ctx =
@@ -268,7 +292,7 @@ class CrustModule : Module() {
                       ?: appContext.currentActivity
                               ?: throw IllegalStateException("MentraJS: no context")
       JSCRuntime.shared(ctx).evaluate(packageName, source)
-    }
+    }.runOnQueue(mentraJsQueue)
 
     AsyncFunction("mentraJsKill") { packageName: String ->
       val ctx =
@@ -276,7 +300,7 @@ class CrustModule : Module() {
                       ?: appContext.currentActivity
                               ?: throw IllegalStateException("MentraJS: no context")
       JSCRuntime.shared(ctx).kill(packageName)
-    }
+    }.runOnQueue(mentraJsQueue)
 
     AsyncFunction("mentraJsDispatchToJs") { packageName: String, envelope: Map<String, Any?> ->
       val ctx =
@@ -285,7 +309,7 @@ class CrustModule : Module() {
                               ?: throw IllegalStateException("MentraJS: no context")
       val json = org.json.JSONObject(envelope as Map<*, *>).toString()
       JSCRuntime.shared(ctx).dispatchToJs(packageName, json)
-    }
+    }.runOnQueue(mentraJsQueue)
 
     AsyncFunction("mentraJsSetManifest") { packageName: String, permissions: List<String> ->
       val ctx =
@@ -296,7 +320,7 @@ class CrustModule : Module() {
           packageName,
           InstalledMiniappManifest(permissions.toSet()),
       )
-    }
+    }.runOnQueue(mentraJsQueue)
 
     Function("mentraJsAlivePackages") {
       val ctx =
@@ -314,7 +338,7 @@ class CrustModule : Module() {
                       ?: appContext.currentActivity
                               ?: return@AsyncFunction false
       JSCRuntime.shared(ctx).debugForceGC(packageName)
-    }
+    }.runOnQueue(mentraJsQueue)
 
     Function("mentraJsLoadPolyfillBundle") {
       val ctx =

package/package.json

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