@react-native-quickjs/quickjs 1.0.0-alpha.1 → 1.0.0-alpha.3

package/engine/quickjs-rel/quickjs.h

@@ -184,6 +184,7 @@ enum {
     JS_TAG_SYMBOL      = -8,
     JS_TAG_STRING      = -7,
     JS_TAG_STRING_ROPE = -6,
+    JS_TAG_LAZY_JSON   = -4, /* internal, immediate lazy JSON tape-node index */
     JS_TAG_MODULE      = -3, /* used internally */
     JS_TAG_FUNCTION_BYTECODE = -2, /* used internally */
     JS_TAG_OBJECT      = -1,
@@ -396,7 +397,9 @@ static inline bool JS_VALUE_IS_NAN(JSValue v)
 #define JS_VALUE_IS_BOTH_INT(v1, v2) ((JS_VALUE_GET_TAG(v1) | JS_VALUE_GET_TAG(v2)) == 0)
 #define JS_VALUE_IS_BOTH_FLOAT(v1, v2) (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v1)) && JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v2)))
 
-#define JS_VALUE_HAS_REF_COUNT(v) ((unsigned)JS_VALUE_GET_TAG(v) >= (unsigned)JS_TAG_FIRST)
+#define JS_VALUE_HAS_REF_COUNT(v) \
+    (JS_VALUE_GET_TAG(v) != JS_TAG_LAZY_JSON && \
+     (unsigned)JS_VALUE_GET_TAG(v) >= (unsigned)JS_TAG_FIRST)
 
 /* special values */
 #define JS_NULL      JS_MKVAL(JS_TAG_NULL, 0)
@@ -509,6 +512,8 @@ typedef struct JSGCObjectHeader JSGCObjectHeader;
 JS_EXTERN JSRuntime *JS_NewRuntime(void);
 /* info lifetime must exceed that of rt */
 JS_EXTERN void JS_SetRuntimeInfo(JSRuntime *rt, const char *info);
+/* QJS_JSON_LAZY=0/1 remains available as a process-level test override. */
+JS_EXTERN void JS_SetJSONLazyEnabled(JSRuntime *rt, bool enabled);
 /* use 0 to disable memory limit */
 JS_EXTERN void JS_SetMemoryLimit(JSRuntime *rt, size_t limit);
 JS_EXTERN void JS_SetDumpFlags(JSRuntime *rt, uint64_t flags);
@@ -710,7 +715,6 @@ JS_EXTERN void *js_malloc(JSContext *ctx, size_t size);
 JS_EXTERN void js_free(JSContext *ctx, void *ptr);
 JS_EXTERN void *js_realloc(JSContext *ctx, void *ptr, size_t size);
 JS_EXTERN size_t js_malloc_usable_size(JSContext *ctx, const void *ptr);
-JS_EXTERN void *js_realloc2(JSContext *ctx, void *ptr, size_t size, size_t *pslack);
 JS_EXTERN void *js_mallocz(JSContext *ctx, size_t size);
 JS_EXTERN char *js_strdup(JSContext *ctx, const char *str);
 JS_EXTERN char *js_strndup(JSContext *ctx, const char *s, size_t n);
@@ -1196,10 +1200,24 @@ JS_EXTERN JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
 JS_EXTERN JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
                                    JSValueConst replacer, JSValueConst space0);
 
-typedef void JSFreeArrayBufferDataFunc(JSRuntime *rt, void *opaque, void *ptr);
+/* Manages the backing memory of an externally created ArrayBuffer.
+   When 'size' is zero, 'ptr' must be freed and NULL returned. Otherwise the
+   block must be resized to 'size' bytes and the new pointer returned, or NULL
+   if that is not possible, indicating a memory error, in which case 'ptr' must
+   stay valid and the ArrayBuffer keeps its current size. */
+typedef void *JSReallocArrayBufferDataFunc(JSRuntime *rt, void *opaque,
+                                           void *ptr, size_t size);
+/* Creates an ArrayBuffer backed by 'buf'. Pass a zero 'max_len' for a regular,
+   fixed length ArrayBuffer; a non-zero 'max_len' makes it resizable and is its
+   maxByteLength. 'realloc_func' may be NULL if the memory must not be managed
+   by quickjs at all; such an ArrayBuffer can neither be resized nor
+   transferred to a different length. It is required for resizable
+   ArrayBuffers, except for SharedArrayBuffers: those commit their maximum size
+   upfront and therefore need 'buf' to be at least 'max_len' bytes big. */
 JS_EXTERN JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
-                                    JSFreeArrayBufferDataFunc *free_func, void *opaque,
-                                    bool is_shared);
+                                    size_t max_len,
+                                    JSReallocArrayBufferDataFunc *realloc_func,
+                                    void *opaque, bool is_shared);
 JS_EXTERN JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len);
 JS_EXTERN void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj);
 JS_EXTERN uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj);
@@ -1232,8 +1250,8 @@ JS_EXTERN JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
                                          size_t *pbyte_length,
                                          size_t *pbytes_per_element);
 JS_EXTERN JSValue JS_NewUint8Array(JSContext *ctx, uint8_t *buf, size_t len,
-                                   JSFreeArrayBufferDataFunc *free_func, void *opaque,
-                                   bool is_shared);
+                                   JSReallocArrayBufferDataFunc *realloc_func,
+                                   void *opaque, bool is_shared);
 /* returns -1 if not a typed array otherwise return a JSTypedArrayEnum value */
 JS_EXTERN int JS_GetTypedArrayType(JSValueConst obj);
 JS_EXTERN JSValue JS_NewUint8ArrayCopy(JSContext *ctx, const uint8_t *buf, size_t len);
@@ -1254,10 +1272,14 @@ typedef enum JSPromiseStateEnum {
 } JSPromiseStateEnum;
 
 JS_EXTERN JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs);
+JS_EXTERN JSValue JS_PromiseThen(JSContext *ctx, JSValueConst promise,
+                                JSValueConst on_fulfilled,
+                                JSValueConst on_rejected);
 JS_EXTERN JSPromiseStateEnum JS_PromiseState(JSContext *ctx,
                                              JSValueConst promise);
 JS_EXTERN JSValue JS_PromiseResult(JSContext *ctx, JSValueConst promise);
 JS_EXTERN bool JS_IsPromise(JSValueConst val);
+JS_EXTERN void JS_PromiseMarkAsHandled(JSContext *ctx, JSValueConst promise);
 JS_EXTERN JSValue JS_NewSettledPromise(JSContext *ctx, bool is_reject, JSValueConst value);
 
 JS_EXTERN JSValue JS_NewSymbol(JSContext *ctx, const char *description, bool is_global);
@@ -1384,6 +1406,18 @@ JS_EXTERN uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValueConst o
    writer in the same process (e.g. another Worker on the same runtime). */
 #define JS_READ_OBJ_SAB       (1 << 2) /* allow SharedArrayBuffer */
 #define JS_READ_OBJ_REFERENCE (1 << 3) /* allow object references */
+/* Defer function-body deserialization, including local definitions, constant
+   pools, bytecode, object-literal metadata and debug data, until first use.
+   The atom table is also populated on demand. This moves work from startup to
+   the first call of each deferred function. The payload is copied internally,
+   so `buf` need not outlive the call. Requires JS_READ_OBJ_BYTECODE and is
+   incompatible with JS_READ_OBJ_REFERENCE and JS_READ_OBJ_SAB. */
+#define JS_READ_OBJ_LAZY      (1 << 4)
+/* With JS_READ_OBJ_LAZY, point at the caller's buffer instead of copying it.
+   The caller owns the bytes and must keep them alive and unmodified until every
+   value and runtime created from the payload has been freed. Requires
+   JS_READ_OBJ_LAZY; invalid combinations are rejected. */
+#define JS_READ_OBJ_BORROW    (1 << 5)
 JS_EXTERN JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len, int flags);
 JS_EXTERN JSValue JS_ReadObject2(JSContext *ctx, const uint8_t *buf, size_t buf_len,
                                  int flags, JSSABTab *psab_tab);
@@ -1561,8 +1595,8 @@ JS_EXTERN int JS_SetModuleExportList(JSContext *ctx, JSModuleDef *m,
 /* Version */
 
 #define QJS_VERSION_MAJOR 0
-#define QJS_VERSION_MINOR 15
-#define QJS_VERSION_PATCH 1
+#define QJS_VERSION_MINOR 16
+#define QJS_VERSION_PATCH 2
 #define QJS_VERSION_SUFFIX ""
 
 JS_EXTERN const char* JS_GetVersion(void);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-quickjs/quickjs",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.3",
   "description": "QuickJS JSI runtime for React Native, built from source",
   "keywords": [
     "react-native",
@@ -60,9 +60,21 @@
     "configure": "cmake -B build -DCMAKE_BUILD_TYPE=Debug",
     "build": "cmake --build build -j8",
     "test": "npm run configure && npm run build && ctest --test-dir build --output-on-failure -j4",
-    "bench": "cmake -B build-release -DCMAKE_BUILD_TYPE=Release && cmake --build build-release -j8 && ctest --test-dir build-release -V -R jsi_bench",
+    "bench": "cmake -B build-release -DCMAKE_BUILD_TYPE=Release && cmake --build build-release -j8 --target qjs-bench native-call-bench && node tools/benchmark/bench.mjs",
+    "bench:build": "cmake -B build-release -DCMAKE_BUILD_TYPE=Release && cmake --build build-release -j8 --target qjs-bench native-call-bench",
+    "bench:octane": "node tools/benchmark/bench.mjs octane",
+    "bench:workloads": "node tools/benchmark/bench.mjs react minireact rn primitives data strings surface suspense modern arrayholes jsonparse",
+    "bench:kernels": "node tools/benchmark/bench.mjs compiler jit",
+    "bench:calls": "node tools/benchmark/bench.mjs calls",
+    "bench:startup": "node tools/benchmark/bench.mjs startup",
+    "bench:record": "node tools/benchmark/bench.mjs --save",
+    "bench:gate": "node tools/benchmark/bench.mjs --against",
+    "bench:list": "node tools/benchmark/bench.mjs --list",
+    "bench:device": "node tools/benchmark/bench.mjs --device",
     "bytecode": "./build/qjsc-ng",
     "clean": "rm -rf build build-release",
+    "format": "clang-format -i $(git ls-files '*.c' '*.h' '*.cpp' '*.mm' | grep -Ev '^(engine/|tests/third_party/|modules/napi/)' | grep -v '^android/src/main/jni/JJSRuntimeFactory.h$')",
+    "format:check": "clang-format --dry-run --Werror $(git ls-files '*.c' '*.h' '*.cpp' '*.mm' | grep -Ev '^(engine/|tests/third_party/|modules/napi/)' | grep -v '^android/src/main/jni/JJSRuntimeFactory.h$')",
     "prepack": "node scripts/check-submodule.js && node scripts/apply-patches.js --check && node scripts/sync-quickjs-rel.js --check",
     "postinstall": "node scripts/postinstall.js",
     "example": "npm run --workspace @react-native-quickjs/example",
@@ -102,6 +114,6 @@
     }
   },
   "dependencies": {
-    "@react-native-quickjs/text-encoding": "1.0.0"
+    "@react-native-quickjs/text-encoding": "1.0.1"
   }
 }

package/src/runtime/QuickJSRuntime.cpp

@@ -297,8 +297,14 @@ struct ArrayBufferProxy {
   std::shared_ptr<jsi::MutableBuffer> buffer;
 };
 
-void freeArrayBufferProxy(JSRuntime * /*rt*/, void *opaque, void * /*ptr*/) {
-  delete static_cast<ArrayBufferProxy *>(opaque);
+void *reallocArrayBufferProxy(
+    JSRuntime * /*rt*/, void *opaque, void * /*ptr*/, size_t size) {
+  ArrayBufferProxy *proxy = static_cast<ArrayBufferProxy *>(opaque);
+  if (size == 0) {
+    delete proxy;
+    return nullptr;
+  }
+  return nullptr;
 }
 
 const char *kEnumeratePropertyNamesSource =
@@ -1047,8 +1053,14 @@ jsi::Value QuickJSRuntime::evaluateSource(
 
 jsi::Value QuickJSRuntime::evaluateBytecode(
     const uint8_t *payload, size_t size) {
-  JSValue function =
-      JS_ReadObject(context_, payload, size, JS_READ_OBJ_BYTECODE);
+#ifndef RNQJS_BYTECODE_LAZY
+#define RNQJS_BYTECODE_LAZY 1
+#endif
+  int readFlags = JS_READ_OBJ_BYTECODE;
+#if RNQJS_BYTECODE_LAZY
+  readFlags |= JS_READ_OBJ_LAZY;
+#endif
+  JSValue function = JS_ReadObject(context_, payload, size, readFlags);
   if (JS_IsException(function)) {
     // Almost always an engine mismatch. quickjs bytecode loads only in the
     // build that wrote it, and "bytecode function expected" does not say so.
@@ -1737,7 +1749,8 @@ jsi::ArrayBuffer QuickJSRuntime::createArrayBuffer(
   auto *proxy = new ArrayBufferProxy{std::move(buffer)};
 
   JSValue arrayBuffer = JS_NewArrayBuffer(
-      context_, data, size, freeArrayBufferProxy, proxy, false);
+      context_, data, size, /*max_len*/ 0, reallocArrayBufferProxy, proxy,
+      false);
   if (JS_IsException(arrayBuffer)) {
     delete proxy;
     throwPendingError();