@mentra/crust 3.4.0-dev.1011 → 3.4.0-dev.1017

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

@@ -54,6 +54,10 @@ class FetchBridgeTest {
     private val utf8Bytes = byteArrayOf(0xEF.toByte(), 0xBB.toByte(), 0xBF.toByte()) +
         "{\"a\":\"é😀\"}".toByteArray(Charsets.UTF_8) + byteArrayOf(0x00, 0x7F)
 
+    /** Two MB of valid UTF-8 text: arrayBuffer() re-encodes it inside the 32 MB miniapp heap. */
+    private val largeUtf8Text: ByteArray =
+        "héllo 😀 中文 chunk of reply text ".repeat(52_000).toByteArray(Charsets.UTF_8)
+
     // crust's build.gradle ships this file as the runtime's startup.js asset.
     private val polyfill: String by lazy { File("../../jspolyfill/assets/startup.js").readText() }
 
@@ -63,6 +67,7 @@ class FetchBridgeTest {
                 override fun dispatch(request: RecordedRequest): MockResponse = when (request.path) {
                     "/reply.pcm" -> response("application/octet-stream").setBody(Buffer().write(pcm))
                     "/utf8.bin" -> response("application/octet-stream").setBody(Buffer().write(utf8Bytes))
+                    "/large.txt" -> response("text/plain").setBody(Buffer().write(largeUtf8Text))
                     "/data.json" -> response("application/json").setBody("{\"message\":\"héllo 😀 中文\"}")
                     "/upload" -> response("text/plain").setBody("ok")
                     else -> MockResponse().setResponseCode(404)
@@ -108,6 +113,21 @@ class FetchBridgeTest {
         assertArrayEquals(utf8Bytes, bytes(result["bytes"]))
     }
 
+    @Test fun `arrayBuffer re-encodes a large UTF-8 body within the miniapp heap`() {
+        val result = runMiniapp(
+            """
+            const bytes = new Uint8Array(await (await fetch(BASE + "/large.txt")).arrayBuffer())
+            let sum = 0
+            for (let i = 0; i < bytes.length; i++) sum = (sum * 31 + bytes[i]) >>> 0
+            return {length: bytes.length, sum}
+            """,
+        )
+        var sum = 0L
+        for (byte in largeUtf8Text) sum = (sum * 31 + (byte.toInt() and 0xFF)) and 0xFFFFFFFFL
+        assertEquals(largeUtf8Text.size, (result["length"] as Number).toInt())
+        assertEquals(sum, (result["sum"] as Number).toLong())
+    }
+
     @Test fun `responses are sent as text only when that text re-encodes to the same bytes`() {
         val text = JSCPolyfillBridge.fetchResult(responseWith(utf8Bytes))
         assertEquals(String(utf8Bytes, Charsets.UTF_8), text.getString("body"))

package/ios/Resources/startup.js

@@ -571,38 +571,48 @@
       return parts.join("");
     }
     if (typeof g.TextEncoder !== "function") {
+      const codePointAt = (str, i) => {
+        const code = str.charCodeAt(i);
+        if (code >= 55296 && code <= 56319 && i + 1 < str.length) {
+          const next = str.charCodeAt(i + 1);
+          if (next >= 56320 && next <= 57343) return (code - 55296 << 10) + (next - 56320) + 65536;
+        }
+        return code;
+      };
       class TextEncoderPolyfill {
         constructor() {
           this.encoding = "utf-8";
         }
         encode(input) {
           const str = input ?? "";
-          const out = [];
+          let length = 0;
           for (let i = 0; i < str.length; i++) {
-            let code = str.charCodeAt(i);
-            if (code >= 55296 && code <= 56319 && i + 1 < str.length) {
-              const next = str.charCodeAt(i + 1);
-              if (next >= 56320 && next <= 57343) {
-                code = (code - 55296 << 10) + (next - 56320) + 65536;
-                i++;
-              }
-            }
+            const code = codePointAt(str, i);
+            if (code > 65535) i++;
+            length += code < 128 ? 1 : code < 2048 ? 2 : code < 65536 ? 3 : 4;
+          }
+          const out = new Uint8Array(length);
+          let at = 0;
+          for (let i = 0; i < str.length; i++) {
+            const code = codePointAt(str, i);
+            if (code > 65535) i++;
             if (code < 128) {
-              out.push(code);
+              out[at++] = code;
             } else if (code < 2048) {
-              out.push(192 | code >> 6, 128 | code & 63);
+              out[at++] = 192 | code >> 6;
+              out[at++] = 128 | code & 63;
             } else if (code < 65536) {
-              out.push(224 | code >> 12, 128 | code >> 6 & 63, 128 | code & 63);
+              out[at++] = 224 | code >> 12;
+              out[at++] = 128 | code >> 6 & 63;
+              out[at++] = 128 | code & 63;
             } else {
-              out.push(
-                240 | code >> 18,
-                128 | code >> 12 & 63,
-                128 | code >> 6 & 63,
-                128 | code & 63
-              );
+              out[at++] = 240 | code >> 18;
+              out[at++] = 128 | code >> 12 & 63;
+              out[at++] = 128 | code >> 6 & 63;
+              out[at++] = 128 | code & 63;
             }
           }
-          return new Uint8Array(out);
+          return out;
         }
       }
       ;

package/package.json

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