@mentra/crust 3.2.0-dev.116 → 3.2.0-dev.121

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

@@ -459,15 +459,14 @@ class JSCRuntime private constructor(private val appContext: Context) {
      */
     fun dispatchToJs(packageName: String, envelopeJson: String) {
         val record = contexts[packageName] ?: return
-        // Steady-state NACK — re-arm so a wedged QuickJS context surfaces
-        // an __error/ready_nack frame after 3s instead of silently
-        // swallowing the delivery. Skipped during cold-start (timer still
-        // ticking from spawn).
-        if (record.readyAcked) {
-            armReadyNackTimer(record, STEADY_STATE_NACK_TIMEOUT_MS, cold = false)
-        }
         try {
             record.executor.submit {
+                // Arm only once evaluate is about to run. Queue wait during a
+                // long previous turn (WHIP start, etc.) must not count — that
+                // was firing ready_nack while the context was merely busy.
+                if (record.readyAcked) {
+                    armReadyNackTimer(record, STEADY_STATE_NACK_TIMEOUT_MS, cold = false)
+                }
                 // Soft watchdog around evaluate: warn at 5s, kill at 30s.
                 val warn = timerScheduler.schedule({
                     Log.i(TAG, "watchdog: $packageName __deliver blocked >${WATCHDOG_WARN_MS}ms")
@@ -495,12 +494,12 @@ class JSCRuntime private constructor(private val appContext: Context) {
                     runBlocking {
                         record.qjs.evaluate<Any?>(source, filename = "mentrajs:deliver.js")
                     }
-                    // Successful delivery — context is responsive.
-                    record.readyNackTimer?.cancel(false)
-                    record.readyNackTimer = null
                 } catch (e: Throwable) {
                     Log.w(TAG, "dispatchToJs threw in $packageName: ${e.message}", e)
                 } finally {
+                    // Success or throw: the host observed the turn end.
+                    record.readyNackTimer?.cancel(false)
+                    record.readyNackTimer = null
                     warn.cancel(false)
                     killTimer.cancel(false)
                     if (record.watchdogTimer === killTimer) record.watchdogTimer = null

package/ios/Source/JSCRuntime.swift

@@ -63,8 +63,9 @@ public final class JSCRuntime: NSObject {
         /// Monotonic per-context counter for native-issued reqIds.
         var nextTimerToken: Int = 1
         /// signalReady NACK timer. Armed at spawn (15s cold-start) and
-        /// on every dispatchToJs (3s steady-state). Disarmed when the
-        /// polyfill calls __runtime.ready or when the call completes.
+        /// when a __deliver evaluate actually starts (3s steady-state).
+        /// Disarmed when the polyfill calls __runtime.ready or when the
+        /// evaluate returns (success or throw).
         var readyNackTimer: DispatchSourceTimer?
         /// True once the polyfill has signalled ready. Cleared on respawn.
         var readyAcked: Bool = false
@@ -304,14 +305,13 @@ public final class JSCRuntime: NSObject {
             os_log("MentraJS: bad envelope, drop", log: Self.log, type: .error)
             return
         }
-        // Steady-state NACK: re-arm the timer so a wedged JSContext
-        // surfaces a __error/ready_nack frame after 3s instead of silently
-        // swallowing the delivery. Only fires if a cold-start ack already
-        // landed — otherwise the cold-start timer is still ticking.
-        if record.readyAcked {
-            armReadyNackTimer(record: record, timeoutSeconds: Self.steadyStateNackTimeoutSeconds, cold: false)
-        }
         record.queue.async {
+            // Arm only once evaluate is about to run. Queue wait during a
+            // long previous turn must not count — that was firing
+            // ready_nack while the context was merely busy.
+            if record.readyAcked {
+                self.armReadyNackTimer(record: record, timeoutSeconds: Self.steadyStateNackTimeoutSeconds, cold: false)
+            }
             let escaped = Self.jsStringLiteral(json)
             // Soft watchdog: every evaluateScript outside spawn gets a
             // wall-clock timer. If the eval is still running at the warn
@@ -319,16 +319,16 @@ public final class JSCRuntime: NSObject {
             // the context down and emit __error/watchdog_kill so the
             // crash controller (if wired) can drive respawn.
             self.armSoftWatchdog(record: record, label: "__deliver")
+            defer {
+                self.disarmSoftWatchdog(record: record)
+                record.readyNackTimer?.cancel()
+                record.readyNackTimer = nil
+            }
             _ = self.evaluateCatching(
                 record: record,
                 label: "__deliver",
                 source: "globalThis.__deliver(\(escaped));",
             )
-            self.disarmSoftWatchdog(record: record)
-            // On a successful delivery, clear the NACK — the host
-            // observed the eval complete, so the context is responsive.
-            record.readyNackTimer?.cancel()
-            record.readyNackTimer = nil
         }
     }
 

package/package.json

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

package/plugin/build/withAndroid.js

@@ -15,6 +15,9 @@ const MAPBOX_REPO = [
     "        username = 'mapbox'",
     "        password = System.getenv('MAPBOX_DOWNLOADS_TOKEN') ?: (findProperty('MAPBOX_DOWNLOADS_TOKEN') ?: '')",
     "      }",
+    "      content {",
+    "        includeGroupByRegex 'com\\\\.mapbox.*'",
+    "      }",
     "    }",
 ].join("\n");
 const PROTOBUF_EXCLUDE = "exclude group: 'com.google.protobuf', module: 'protobuf-javalite'";