quickjs 0.17.0 → 0.18.0

data/ext/quickjsrb/quickjsrb.h

@@ -57,6 +57,16 @@ typedef struct VMData
   VALUE log_listener;
   VALUE alive_objects;
   VALUE module_loader;
+  VALUE on_unhandled_rejection;
+  // Memoize (specifier, importer) → canonical so the user's loader Proc
+  // runs at most once per distinct pair across the VM's lifetime. Without
+  // this, QuickJS calls normalize on every import statement — including
+  // duplicates within the same file — and we'd re-invoke the user proc.
+  VALUE module_resolution_cache;
+  // Carries `code` from the normalize-phase Proc call to the load-phase
+  // JS_Eval that follows. Keyed by canonical; populated when the user's
+  // loader returns either a raw source String or `{ code:, as: }`.
+  VALUE module_source_cache;
   JSValue j_file_proxy_creator;
   // Once the runtime has hit JS-level "out of memory", the QuickJS heap is in
   // a fragile state where further evaluation can trigger a use-after-free in
@@ -64,21 +74,33 @@ typedef struct VMData
   // Trip this flag so subsequent eval_code/call calls refuse cleanly with a
   // Ruby exception instead of risking a process crash.
   bool oom_poisoned;
+  // Set by VM#dispose! to release the multi-MB JS heap before Ruby GC sees
+  // enough pressure to collect the wrapper. Doubles as a double-free guard
+  // for the dfree handler.
+  bool disposed;
 } VMData;
 
+static void vm_teardown_context(JSContext *ctx)
+{
+  JSRuntime *runtime = JS_GetRuntime(ctx);
+  JS_SetInterruptHandler(runtime, NULL, NULL);
+  js_std_free_handlers(runtime);
+  JS_FreeContext(ctx);
+  JS_FreeRuntime(runtime);
+}
+
 static void vm_free(void *ptr)
 {
   VMData *data = (VMData *)ptr;
   free(data->eval_time);
 
-  if (!JS_IsUndefined(data->j_file_proxy_creator))
-    JS_FreeValue(data->context, data->j_file_proxy_creator);
+  if (!data->disposed)
+  {
+    if (!JS_IsUndefined(data->j_file_proxy_creator))
+      JS_FreeValue(data->context, data->j_file_proxy_creator);
 
-  JSRuntime *runtime = JS_GetRuntime(data->context);
-  JS_SetInterruptHandler(runtime, NULL, NULL);
-  js_std_free_handlers(runtime);
-  JS_FreeContext(data->context);
-  JS_FreeRuntime(runtime);
+    vm_teardown_context(data->context);
+  }
 
   xfree(ptr);
 }
@@ -95,6 +117,9 @@ static void vm_mark(void *ptr)
   rb_gc_mark_movable(data->log_listener);
   rb_gc_mark_movable(data->alive_objects);
   rb_gc_mark_movable(data->module_loader);
+  rb_gc_mark_movable(data->on_unhandled_rejection);
+  rb_gc_mark_movable(data->module_resolution_cache);
+  rb_gc_mark_movable(data->module_source_cache);
 }
 
 static void vm_compact(void *ptr)
@@ -104,6 +129,9 @@ static void vm_compact(void *ptr)
   data->log_listener = rb_gc_location(data->log_listener);
   data->alive_objects = rb_gc_location(data->alive_objects);
   data->module_loader = rb_gc_location(data->module_loader);
+  data->on_unhandled_rejection = rb_gc_location(data->on_unhandled_rejection);
+  data->module_resolution_cache = rb_gc_location(data->module_resolution_cache);
+  data->module_source_cache = rb_gc_location(data->module_source_cache);
 }
 
 static const rb_data_type_t vm_type = {
@@ -137,8 +165,12 @@ static VALUE vm_alloc(VALUE r_self)
   data->log_listener = Qnil;
   data->alive_objects = rb_hash_new();
   data->module_loader = Qnil;
+  data->on_unhandled_rejection = Qnil;
+  data->module_resolution_cache = rb_hash_new();
+  data->module_source_cache = rb_hash_new();
   data->j_file_proxy_creator = JS_UNDEFINED;
   data->oom_poisoned = false;
+  data->disposed = false;
 
   EvalTime *eval_time = malloc(sizeof(EvalTime));
   data->eval_time = eval_time;