@glassly/crust 0.3.5-dev.750 → 0.3.5-dev.753

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

@@ -219,6 +219,13 @@ object JSCPolyfillBridge {
                 ks to vs
             }?.toMap() ?: emptyMap()
             val bodyString = req["body"] as? String
+            val bodyBytes = (req["bodyBase64"] as? String)?.let { encoded ->
+                try {
+                    Base64.decode(encoded, Base64.DEFAULT)
+                } catch (e: IllegalArgumentException) {
+                    return@register JSCDispatchOutcome.Error("INVALID_ARGS", "fetch.request: bodyBase64 is not base64")
+                }
+            }
 
             val builder = Request.Builder().url(url)
             for ((k, v) in headers) builder.header(k, v)
@@ -228,10 +235,16 @@ object JSCPolyfillBridge {
             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 mediaType = (contentType ?: "application/octet-stream").toMediaTypeOrNull()
+            val upperMethod = method.uppercase()
+            val body = when {
+                upperMethod == "GET" || upperMethod == "HEAD" -> null
+                bodyBytes != null -> bodyBytes.toRequestBody(mediaType)
+                bodyString != null -> bodyString.toRequestBody(mediaType)
+                upperMethod == "POST" || upperMethod == "PUT" || upperMethod == "PATCH" -> "".toRequestBody(null)
+                else -> null
+            }
+            builder.method(upperMethod, body)
 
             httpClient.newCall(builder.build()).enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {

package/ios/Resources/startup.js

@@ -546,15 +546,36 @@
         return out;
       };
     }
+    function bytesToBase64(bytes) {
+      const b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+      let out = "";
+      let i = 0;
+      while (i < bytes.length) {
+        const c1 = bytes[i++];
+        const c2 = i < bytes.length ? bytes[i++] : NaN;
+        const c3 = i < bytes.length ? bytes[i++] : NaN;
+        const e1 = c1 >> 2;
+        const e2 = (c1 & 3) << 4 | (Number.isNaN(c2) ? 0 : c2 >> 4);
+        const e3 = Number.isNaN(c2) ? 64 : (c2 & 15) << 2 | (Number.isNaN(c3) ? 0 : c3 >> 6);
+        const e4 = Number.isNaN(c3) ? 64 : c3 & 63;
+        out += b64[e1] + b64[e2] + (e3 === 64 ? "=" : b64[e3]) + (e4 === 64 ? "=" : b64[e4]);
+      }
+      return out;
+    }
     if (typeof g.fetch !== "function") {
       ;
       g.fetch = async (input, init) => {
         const url = typeof input === "string" ? input : input.toString();
         const method = (init?.method ?? "GET").toUpperCase();
         let bodyString = null;
+        let bodyBase64 = null;
         const reqBody = init?.body;
         if (typeof reqBody === "string") {
           bodyString = reqBody;
+        } else if (reqBody instanceof ArrayBuffer) {
+          bodyBase64 = bytesToBase64(new Uint8Array(reqBody));
+        } else if (ArrayBuffer.isView(reqBody)) {
+          bodyBase64 = bytesToBase64(new Uint8Array(reqBody.buffer, reqBody.byteOffset, reqBody.byteLength));
         } else if (reqBody && typeof reqBody.toString === "function") {
           bodyString = reqBody.toString();
         }
@@ -577,7 +598,7 @@
           }
         }
         const sendRequest = g.__sendRequest;
-        const result = await sendRequest("fetch", "request", [{ url, method, headers, body: bodyString }]);
+        const result = await sendRequest("fetch", "request", [{ url, method, headers, body: bodyString, bodyBase64 }]);
         const bodyText = typeof result.body === "string" ? result.body : "";
         const responseHeaders = new Map(Object.entries(result.headers ?? {}));
         class ResponseLike {
@@ -617,22 +638,7 @@
       };
     }
     if (typeof g.WebSocket !== "function") {
-      let bytesToBase642 = function(bytes) {
-        const b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-        let out = "";
-        let i = 0;
-        while (i < bytes.length) {
-          const c1 = bytes[i++];
-          const c2 = i < bytes.length ? bytes[i++] : NaN;
-          const c3 = i < bytes.length ? bytes[i++] : NaN;
-          const e1 = c1 >> 2;
-          const e2 = (c1 & 3) << 4 | (Number.isNaN(c2) ? 0 : c2 >> 4);
-          const e3 = Number.isNaN(c2) ? 64 : (c2 & 15) << 2 | (Number.isNaN(c3) ? 0 : c3 >> 6);
-          const e4 = Number.isNaN(c3) ? 64 : c3 & 63;
-          out += b64[e1] + b64[e2] + (e3 === 64 ? "=" : b64[e3]) + (e4 === 64 ? "=" : b64[e4]);
-        }
-        return out;
-      }, base64ToBytes2 = function(s) {
+      let base64ToBytes2 = function(s) {
         const b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
         const clean = s.replace(/=+$/, "");
         const out = [];
@@ -654,7 +660,7 @@
         if (typeof q === "function") q(fn);
         else g.Promise.resolve().then(fn);
       };
-      var bytesToBase64 = bytesToBase642, base64ToBytes = base64ToBytes2, queueMicrotaskSafe = queueMicrotaskSafe2;
+      var base64ToBytes = base64ToBytes2, queueMicrotaskSafe = queueMicrotaskSafe2;
       const sockets = /* @__PURE__ */ new Map();
       g.__deliverWebSocketEvent = (sid, type, payload) => {
         const sock = sockets.get(sid);
@@ -713,7 +719,7 @@
           } else {
             kind = "binary";
             const bytes = data instanceof ArrayBuffer ? new Uint8Array(data) : new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-            payload = bytesToBase642(bytes);
+            payload = bytesToBase64(bytes);
           }
           try {
             __dispatch("ws", "send", JSON.stringify([{ sid: this.sid, kind, payload }]));

package/ios/Source/JSCPolyfillBridge.swift

@@ -100,14 +100,25 @@ public enum JSCPolyfillBridge {
             }
 
             var urlRequest = URLRequest(url: url)
-            urlRequest.httpMethod = (req["method"] as? String) ?? "GET"
+            let method = (req["method"] as? String) ?? "GET"
+            urlRequest.httpMethod = method
             if let headers = req["headers"] as? [String: Any] {
                 for (k, v) in headers {
                     urlRequest.setValue(String(describing: v), forHTTPHeaderField: k)
                 }
             }
-            if let body = req["body"] as? String, !body.isEmpty {
-                urlRequest.httpBody = body.data(using: .utf8)
+            let upperMethod = method.uppercased()
+            if upperMethod == "GET" || upperMethod == "HEAD" {
+                urlRequest.httpBody = nil
+            } else if let encoded = req["bodyBase64"] as? String {
+                guard let data = Data(base64Encoded: encoded) else {
+                    return .error(code: "INVALID_ARGS", message: "fetch.request: bodyBase64 is not base64")
+                }
+                urlRequest.httpBody = data
+            } else if let body = req["body"] as? String {
+                urlRequest.httpBody = Data(body.utf8)
+            } else if ["POST", "PUT", "PATCH"].contains(upperMethod) {
+                urlRequest.httpBody = Data()
             }
 
             // Reasonable defaults — caller can override later by passing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/crust",
-  "version": "0.3.5-dev.750",
+  "version": "0.3.5-dev.753",
   "description": "Glassly Native Module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -35,7 +35,7 @@
   "license": "MIT",
   "homepage": "https://github.com/fossephate/crust#readme",
   "dependencies": {
-    "@glassly/jspolyfill": "0.3.5-dev.750"
+    "@glassly/jspolyfill": "0.3.5-dev.753"
   },
   "devDependencies": {
     "@expo/config-plugins": ">=8.0.0",