quickjs 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79081c82cb9b414f3c77b44883c6e025558aea6c3000f204b7da4df411642e4
-  data.tar.gz: 8d0be576f2b301e793e767f8f3a9c7529856e6694d2655beaf14efeb85aab043
+  metadata.gz: 29ad9419055f853b82d642f0c5404d24d476dcc3d0d8e7da4364f06a819b10a3
+  data.tar.gz: 77b07d4c214663c8fd716ab2c9dda3d88c327f3f77b0d350f2987d506a70677e
 SHA512:
-  metadata.gz: 12404c2ffe3dbc5021eefbf6b8b42bdb9a74d2aa649b55eeb57ad92dbb9330c2d95834401af7a8a8471bc85db0adeebd3d877c5d46b421bc0320b356671253b3
-  data.tar.gz: 387ef0a683d6169e113a3488208c8a75d7409e574eddecc416c059cf9d0d0282b1c3a0c267c54b5b74a2065bb843da5a90070db9c33b34ddc86b9919e7161990
+  metadata.gz: 75ba55882ce0d5371e3ba3d584849d012c06a955d230e7b9975266852753dae3db45244fc8b9bf967f86ba25fff52d7c6d8118bab131f9e8b61bb421356597c0
+  data.tar.gz: 97964de7f1ef9f20c548cc8e69da09fe058112193593bb433e8b93e3e42424582f111a306df13df78dd583442dd712bc71e6da8ff0ce17116f19618f8aa803d2

data/ext/quickjsrb/extconf.rb

@@ -37,7 +37,8 @@ else
 end
 
 append_cflags('-fwrapv')
-$CFLAGS << ' ' << '-D_GNU_SOURCE -DCONFIG_VERSION=\"2024-02-14\"'
+# NDEBUG: suppress QuickJS debug assertions that conflict with Ruby 4.0 GC
+$CFLAGS << ' ' << '-D_GNU_SOURCE -DCONFIG_VERSION=\"2024-02-14\" -DNDEBUG'
 
 abort('could not find quickjs.h') unless find_header('quickjs.h')
 abort('could not find cutils.h') unless find_header('cutils.h')

data/ext/quickjsrb/quickjsrb.c

@@ -8,6 +8,10 @@ JSValue j_error_from_ruby_error(JSContext *ctx, VALUE r_error)
   int objectId = NUM2INT(r_object_id);
   JS_SetPropertyStr(ctx, j_error, "rb_object_id", JS_NewInt32(ctx, objectId));
 
+  // Keep the error alive in VMData to prevent GC before find_ruby_error retrieves it
+  VMData *data = JS_GetContextOpaque(ctx);
+  rb_hash_aset(data->alive_errors, r_object_id, r_error);
+
   VALUE r_exception_message = rb_funcall(r_error, rb_intern("message"), 0);
   const char *errorMessage = StringValueCStr(r_exception_message);
   JS_SetPropertyStr(ctx, j_error, "message", JS_NewString(ctx, errorMessage));
@@ -89,8 +93,11 @@ VALUE find_ruby_error(JSContext *ctx, JSValue j_error)
     JS_FreeValue(ctx, j_errorOriginalRubyObjectId);
     if (errorOriginalRubyObjectId > 0)
     {
-      // may be nice if cover the case of object is missing
-      return rb_funcall(rb_const_get(rb_cClass, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, INT2NUM(errorOriginalRubyObjectId));
+      VMData *data = JS_GetContextOpaque(ctx);
+      VALUE r_key = INT2NUM(errorOriginalRubyObjectId);
+      VALUE r_error = rb_hash_aref(data->alive_errors, r_key);
+      rb_hash_delete(data->alive_errors, r_key);
+      return r_error;
     }
   }
   else
@@ -329,7 +336,7 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
     JS_FreeValue(ctx, j_v);
   }
   rb_ary_push(r_call_args, r_argv);
-  rb_ary_push(r_call_args, ULONG2NUM(data->eval_time->limit * 1000 / CLOCKS_PER_SEC));
+  rb_ary_push(r_call_args, ULONG2NUM(data->eval_time->limit_ms));
 
   int sadnessHappened;
 
@@ -507,7 +514,7 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
   VMData *data;
   TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
-  data->eval_time->limit = (clock_t)(CLOCKS_PER_SEC * NUM2UINT(r_timeout_msec) / 1000);
+  data->eval_time->limit_ms = (int64_t)NUM2UINT(r_timeout_msec);
   JS_SetContextOpaque(data->context, data);
   JSRuntime *runtime = JS_GetRuntime(data->context);
 
@@ -580,7 +587,11 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
 static int interrupt_handler(JSRuntime *runtime, void *opaque)
 {
   EvalTime *eval_time = opaque;
-  return clock() >= eval_time->started_at + eval_time->limit ? 1 : 0;
+  struct timespec now;
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  int64_t elapsed_ms = (int64_t)(now.tv_sec - eval_time->started_at.tv_sec) * 1000
+                     + (now.tv_nsec - eval_time->started_at.tv_nsec) / 1000000;
+  return elapsed_ms >= eval_time->limit_ms ? 1 : 0;
 }
 
 static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
@@ -588,7 +599,13 @@ static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
   VMData *data;
   TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
-  data->eval_time->started_at = clock();
+  if (!RB_TYPE_P(r_code, T_STRING))
+  {
+    VALUE r_code_class = rb_class_name(CLASS_OF(r_code));
+    rb_raise(rb_eTypeError, "JavaScript code must be a String, got %s", StringValueCStr(r_code_class));
+  }
+
+  clock_gettime(CLOCK_MONOTONIC, &data->eval_time->started_at);
   JS_SetInterruptHandler(JS_GetRuntime(data->context), interrupt_handler, data->eval_time);
 
   char *code = StringValueCStr(r_code);
@@ -606,9 +623,12 @@ static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
   }
   else
   {
+    // Free j_awaitedResult before to_rb_value because to_rb_value may
+    // raise (longjmp) for JS exceptions, which would skip any cleanup
+    // after it and leak JS GC objects.
+    JS_FreeValue(data->context, j_awaitedResult);
     VALUE result = to_rb_value(data->context, j_returnedValue);
     JS_FreeValue(data->context, j_returnedValue);
-    JS_FreeValue(data->context, j_awaitedResult);
     return result;
   }
 }

data/ext/quickjsrb/quickjsrb.h

@@ -39,8 +39,8 @@ const char *native_errors[] = {
 
 typedef struct EvalTime
 {
-  clock_t limit;
-  clock_t started_at;
+  int64_t limit_ms;
+  struct timespec started_at;
 } EvalTime;
 
 typedef struct VMData
@@ -49,6 +49,7 @@ typedef struct VMData
   VALUE defined_functions;
   struct EvalTime *eval_time;
   VALUE logs;
+  VALUE alive_errors;
 } VMData;
 
 static void vm_free(void *ptr)
@@ -75,6 +76,15 @@ static void vm_mark(void *ptr)
   VMData *data = (VMData *)ptr;
   rb_gc_mark_movable(data->defined_functions);
   rb_gc_mark_movable(data->logs);
+  rb_gc_mark_movable(data->alive_errors);
+}
+
+static void vm_compact(void *ptr)
+{
+  VMData *data = (VMData *)ptr;
+  data->defined_functions = rb_gc_location(data->defined_functions);
+  data->logs = rb_gc_location(data->logs);
+  data->alive_errors = rb_gc_location(data->alive_errors);
 }
 
 static const rb_data_type_t vm_type = {
@@ -83,6 +93,7 @@ static const rb_data_type_t vm_type = {
         .dmark = vm_mark,
         .dfree = vm_free,
         .dsize = vm_size,
+        .dcompact = vm_compact,
     },
     .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -93,6 +104,7 @@ static VALUE vm_alloc(VALUE r_self)
   VALUE obj = TypedData_Make_Struct(r_self, VMData, &vm_type, data);
   data->defined_functions = rb_hash_new();
   data->logs = rb_ary_new();
+  data->alive_errors = rb_hash_new();
 
   EvalTime *eval_time = malloc(sizeof(EvalTime));
   data->eval_time = eval_time;

data/lib/quickjs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quickjs
-  VERSION = "0.11.0"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - hmsk
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -89,7 +88,6 @@ metadata:
   homepage_uri: https://github.com/hmsk/quickjs.rb
   source_code_uri: https://github.com/hmsk/quickjs.rb
   changelog_uri: https://github.com/hmsk/quickjs.rb/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Run binding of QuickJS
 test_files: []