quickjs 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0461f98dbe3171e88609b060aa9fb414ba881b0977d983d6ec7897726a0559c
-  data.tar.gz: 84ed4cf19c1d5191e9cd57b789cc3138691f7ad2059b515a2ce4280051105c46
+  metadata.gz: 8eba12c1c34fab81270517de72da6a8b3c9b561d521a42b80c14411c23555684
+  data.tar.gz: 4bced848c986a41c787306e799b40622d97dff999994b64e615cd3b1c79e586e
 SHA512:
-  metadata.gz: c98d7daf116e5513a19b99e4ef387f3b1b60389c3bb9f91822cc1d437bf87cc72041cd97c7cdf2a8a8cb55a86df93a3cf7fe472733017ae4a315831397a56cd5
-  data.tar.gz: f177d0e31b8d6499fcf922bd85dc594aa2acd0bf8d93d696256c4a3a7a1595eeb874df7e14e8447694a3045b3f2b9d8279633550e535fc8f257311c613c043b6
+  metadata.gz: 3598ef1f8b5bcbeedf916c101387477b8318e6550a1aa52b6fa4ddb269e261447768428eb4b644e2a0a9cc64ae084830c511cb077b7e25e292eb5d8e84a96460
+  data.tar.gz: 686a93a0a00d747c99d8a0a0f0072a2d0451cc6bfdeeeb512f02817288636d7192a2e2dda52d0e9bf05b92ebb1930f503ca7ce2251c8419ca568c66f825bca1f

data/README.md

@@ -96,12 +96,6 @@ vm = Quickjs::VM.new(
 )
 ```
 
-#### Dispose VM explicitly
-
-```rb
-vm.dispose!
-```
-
 #### Define a global function for JS
 
 ```rb

data/ext/quickjsrb/quickjsrb.c

@@ -1,27 +1,35 @@
 #include "quickjsrb.h"
 
-typedef struct EvalTime {
+typedef struct EvalTime
+{
   clock_t limit;
   clock_t started_at;
 } EvalTime;
 
-typedef struct VMData {
-  char alive;
+typedef struct VMData
+{
   struct JSContext *context;
   VALUE defined_functions;
   struct EvalTime *eval_time;
 } VMData;
 
-static void vm_free(void* ptr)
+static void vm_free(void *ptr)
 {
   VMData *data = (VMData *)ptr;
   free(data->eval_time);
+
+  JSRuntime *runtime = JS_GetRuntime(data->context);
+  JS_SetInterruptHandler(runtime, NULL, NULL);
+  js_std_free_handlers(runtime);
+  JS_FreeContext(data->context);
+  JS_FreeRuntime(runtime);
+
   xfree(ptr);
 }
 
-size_t vm_size(const void* data)
+size_t vm_size(const void *data)
 {
-  return sizeof(data);
+  return sizeof(VMData);
 }
 
 static void vm_mark(void *ptr)
@@ -31,14 +39,13 @@ static void vm_mark(void *ptr)
 }
 
 static const rb_data_type_t vm_type = {
-  .wrap_struct_name = "quickjsvm",
-  .function = {
-    .dmark = vm_mark,
-    .dfree = vm_free,
-    .dsize = vm_size,
-  },
-  .data = NULL,
-  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+    .wrap_struct_name = "quickjsvm",
+    .function = {
+        .dmark = vm_mark,
+        .dfree = vm_free,
+        .dsize = vm_size,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 static VALUE vm_alloc(VALUE self)
@@ -50,6 +57,9 @@ static VALUE vm_alloc(VALUE self)
   EvalTime *eval_time = malloc(sizeof(EvalTime));
   data->eval_time = eval_time;
 
+  JSRuntime *runtime = JS_NewRuntime();
+  data->context = JS_NewContext(runtime);
+
   return obj;
 }
 
@@ -60,96 +70,115 @@ const char *nanId = "NaN";
 const char *featureStdId = "feature_std";
 const char *featureOsId = "feature_os";
 
-JSValue to_js_value(JSContext *ctx, VALUE r_value) {
-  switch (TYPE(r_value)) {
-    case T_NIL:
-      return JS_NULL;
-    case T_FIXNUM:
-    case T_FLOAT: {
-      VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
-      char *str = StringValueCStr(r_str);
-      JSValue global = JS_GetGlobalObject(ctx);
-      JSValue numberClass = JS_GetPropertyStr(ctx, global, "Number");
-      JSValue j_str = JS_NewString(ctx, str);
-      JSValue stringified = JS_Call(ctx, numberClass, JS_UNDEFINED, 1, &j_str);
-      JS_FreeValue(ctx, global);
-      JS_FreeValue(ctx, numberClass);
-      JS_FreeValue(ctx, j_str);
-
-      return stringified;
-    }
-    case T_STRING: {
-      char *str = StringValueCStr(r_value);
+JSValue to_js_value(JSContext *ctx, VALUE r_value)
+{
+  switch (TYPE(r_value))
+  {
+  case T_NIL:
+    return JS_NULL;
+  case T_FIXNUM:
+  case T_FLOAT:
+  {
+    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
+    char *str = StringValueCStr(r_str);
+    JSValue global = JS_GetGlobalObject(ctx);
+    JSValue numberClass = JS_GetPropertyStr(ctx, global, "Number");
+    JSValue j_str = JS_NewString(ctx, str);
+    JSValue stringified = JS_Call(ctx, numberClass, JS_UNDEFINED, 1, &j_str);
+    JS_FreeValue(ctx, global);
+    JS_FreeValue(ctx, numberClass);
+    JS_FreeValue(ctx, j_str);
 
-      return JS_NewString(ctx, str);
-    }
-    case T_SYMBOL: {
-      VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
-      char *str = StringValueCStr(r_str);
+    return stringified;
+  }
+  case T_STRING:
+  {
+    char *str = StringValueCStr(r_value);
 
-      return JS_NewString(ctx, str);
-    }
-    case T_TRUE:
-      return JS_TRUE;
-    case T_FALSE:
-      return JS_FALSE;
-    case T_HASH:
-    case T_ARRAY: {
-      VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0, NULL);
-      char *str = StringValueCStr(r_json_str);
-      JSValue global = JS_GetGlobalObject(ctx);
-      JSValue jsonClass = JS_GetPropertyStr(ctx, global, "JSON");
-      JSValue parseFunc = JS_GetPropertyStr(ctx, jsonClass, "parse");
-      JSValue j_str = JS_NewString(ctx, str);
-      JSValue stringified = JS_Call(ctx, parseFunc, jsonClass, 1, &j_str);
-      JS_FreeValue(ctx, global);
-      JS_FreeValue(ctx, jsonClass);
-      JS_FreeValue(ctx, parseFunc);
-      JS_FreeValue(ctx, j_str);
-
-      return stringified;
-    }
-    default: {
-      VALUE r_inspect_str = rb_funcall(r_value, rb_intern("inspect"), 0, NULL);
-      char *str = StringValueCStr(r_inspect_str);
+    return JS_NewString(ctx, str);
+  }
+  case T_SYMBOL:
+  {
+    VALUE r_str = rb_funcall(r_value, rb_intern("to_s"), 0, NULL);
+    char *str = StringValueCStr(r_str);
 
-      return JS_NewString(ctx, str);
-    }
+    return JS_NewString(ctx, str);
+  }
+  case T_TRUE:
+    return JS_TRUE;
+  case T_FALSE:
+    return JS_FALSE;
+  case T_HASH:
+  case T_ARRAY:
+  {
+    VALUE r_json_str = rb_funcall(r_value, rb_intern("to_json"), 0, NULL);
+    char *str = StringValueCStr(r_json_str);
+    JSValue global = JS_GetGlobalObject(ctx);
+    JSValue jsonClass = JS_GetPropertyStr(ctx, global, "JSON");
+    JSValue parseFunc = JS_GetPropertyStr(ctx, jsonClass, "parse");
+    JSValue j_str = JS_NewString(ctx, str);
+    JSValue stringified = JS_Call(ctx, parseFunc, jsonClass, 1, &j_str);
+    JS_FreeValue(ctx, global);
+    JS_FreeValue(ctx, jsonClass);
+    JS_FreeValue(ctx, parseFunc);
+    JS_FreeValue(ctx, j_str);
+
+    return stringified;
+  }
+  default:
+  {
+    VALUE r_inspect_str = rb_funcall(r_value, rb_intern("inspect"), 0, NULL);
+    char *str = StringValueCStr(r_inspect_str);
+
+    return JS_NewString(ctx, str);
+  }
   }
 }
 
-VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
-  switch(JS_VALUE_GET_NORM_TAG(jsv)) {
-  case JS_TAG_INT: {
+VALUE to_rb_value(JSValue jsv, JSContext *ctx)
+{
+  switch (JS_VALUE_GET_NORM_TAG(jsv))
+  {
+  case JS_TAG_INT:
+  {
     int int_res = 0;
     JS_ToInt32(ctx, &int_res, jsv);
     return INT2NUM(int_res);
   }
-  case JS_TAG_FLOAT64: {
-    if (JS_VALUE_IS_NAN(jsv)) {
+  case JS_TAG_FLOAT64:
+  {
+    if (JS_VALUE_IS_NAN(jsv))
+    {
       return ID2SYM(rb_intern(nanId));
     }
     double double_res;
     JS_ToFloat64(ctx, &double_res, jsv);
     return DBL2NUM(double_res);
   }
-  case JS_TAG_BOOL: {
+  case JS_TAG_BOOL:
+  {
     return JS_ToBool(ctx, jsv) > 0 ? Qtrue : Qfalse;
   }
-  case JS_TAG_STRING: {
+  case JS_TAG_STRING:
+  {
     JSValue maybeString = JS_ToString(ctx, jsv);
     const char *msg = JS_ToCString(ctx, maybeString);
     JS_FreeValue(ctx, maybeString);
+    JS_FreeCString(ctx, msg);
     return rb_str_new2(msg);
   }
-  case JS_TAG_OBJECT: {
+  case JS_TAG_OBJECT:
+  {
     int promiseState = JS_PromiseState(ctx, jsv);
-    if (promiseState == JS_PROMISE_FULFILLED || promiseState == JS_PROMISE_PENDING) {
+    if (promiseState == JS_PROMISE_FULFILLED || promiseState == JS_PROMISE_PENDING)
+    {
       JSValue awaited = js_std_await(ctx, jsv);
       VALUE rb_awaited = to_rb_value(awaited, ctx); // TODO: should have timeout
       JS_FreeValue(ctx, awaited);
       return rb_awaited;
-    } else if (promiseState == JS_PROMISE_REJECTED) {
+    }
+    else if (promiseState == JS_PROMISE_REJECTED)
+    {
       JSValue promiseResult = JS_PromiseResult(ctx, jsv);
       JSValue throw = JS_Throw(ctx, promiseResult);
       JS_FreeValue(ctx, promiseResult);
@@ -165,6 +194,7 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
 
     const char *msg = JS_ToCString(ctx, strigified);
     VALUE rbString = rb_str_new2(msg);
+    JS_FreeCString(ctx, msg);
 
     JS_FreeValue(ctx, global);
     JS_FreeValue(ctx, strigified);
@@ -177,9 +207,11 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
     return Qnil;
   case JS_TAG_UNDEFINED:
     return ID2SYM(rb_intern(undefinedId));
-  case JS_TAG_EXCEPTION: {
+  case JS_TAG_EXCEPTION:
+  {
     JSValue exceptionVal = JS_GetException(ctx);
-    if (JS_IsError(ctx, exceptionVal)) {
+    if (JS_IsError(ctx, exceptionVal))
+    {
       JSValue jsErrorClassName = JS_GetPropertyStr(ctx, exceptionVal, "name");
       const char *errorClassName = JS_ToCString(ctx, jsErrorClassName);
 
@@ -189,24 +221,33 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
       JS_FreeValue(ctx, jsErrorClassMessage);
       JS_FreeValue(ctx, jsErrorClassName);
 
-      rb_raise(rb_eRuntimeError, "%s: %s", errorClassName, errorClassMessage);
-    } else {
+      VALUE rb_errorMessage = rb_sprintf("%s: %s", errorClassName, errorClassMessage);
+      JS_FreeCString(ctx, errorClassName);
+      JS_FreeCString(ctx, errorClassMessage);
+      JS_FreeValue(ctx, exceptionVal);
+      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, rb_errorMessage));
+    }
+    else
+    {
       const char *errorMessage = JS_ToCString(ctx, exceptionVal);
 
-      rb_raise(rb_eRuntimeError, "%s", errorMessage);
+      VALUE rb_errorMessage = rb_sprintf("%s", errorMessage);
+      JS_FreeCString(ctx, errorMessage);
+      JS_FreeValue(ctx, exceptionVal);
+      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, rb_errorMessage));
     }
-
-    JS_FreeValue(ctx, exceptionVal);
     return Qnil;
   }
-  case JS_TAG_BIG_INT: {
+  case JS_TAG_BIG_INT:
+  {
     JSValue toStringFunc = JS_GetPropertyStr(ctx, jsv, "toString");
     JSValue strigified = JS_Call(ctx, toStringFunc, jsv, 0, NULL);
 
     const char *msg = JS_ToCString(ctx, strigified);
     VALUE rbString = rb_str_new2(msg);
-    JS_FreeValue(ctx, strigified);
     JS_FreeValue(ctx, toStringFunc);
+    JS_FreeValue(ctx, strigified);
+    JS_FreeCString(ctx, msg);
 
     return rb_funcall(rbString, rb_intern("to_i"), 0, NULL);
   }
@@ -218,45 +259,51 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
   }
 }
 
-static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv) {
+static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv)
+{
   VMData *data = JS_GetContextOpaque(ctx);
   JSValue maybeFuncName = JS_ToString(ctx, argv[0]);
   const char *funcName = JS_ToCString(ctx, maybeFuncName);
   JS_FreeValue(ctx, maybeFuncName);
 
   VALUE proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
-  if (proc == Qnil) { // Shouldn't happen
+  if (proc == Qnil)
+  { // Shouldn't happen
     return JS_ThrowReferenceError(ctx, "Proc `%s` is not defined", funcName);
   }
+  JS_FreeCString(ctx, funcName);
 
   // TODO: cover timeout for calling proc
   VALUE r_result = rb_apply(proc, rb_intern("call"), to_rb_value(argv[1], ctx));
   return to_js_value(ctx, r_result);
 }
 
-static VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
+static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE self)
 {
   VALUE r_opts;
   rb_scan_args(argc, argv, ":", &r_opts);
-  if (NIL_P(r_opts)) r_opts = rb_hash_new();
+  if (NIL_P(r_opts))
+    r_opts = rb_hash_new();
 
   VALUE r_memoryLimit = rb_hash_aref(r_opts, ID2SYM(rb_intern("memory_limit")));
-  if (NIL_P(r_memoryLimit)) r_memoryLimit = UINT2NUM(1024 * 1024 * 128);
+  if (NIL_P(r_memoryLimit))
+    r_memoryLimit = UINT2NUM(1024 * 1024 * 128);
   VALUE r_maxStackSize = rb_hash_aref(r_opts, ID2SYM(rb_intern("max_stack_size")));
-  if (NIL_P(r_maxStackSize)) r_maxStackSize = UINT2NUM(1024 * 1024 * 4);
+  if (NIL_P(r_maxStackSize))
+    r_maxStackSize = UINT2NUM(1024 * 1024 * 4);
   VALUE r_features = rb_hash_aref(r_opts, ID2SYM(rb_intern("features")));
-  if (NIL_P(r_features)) r_features = rb_ary_new();
+  if (NIL_P(r_features))
+    r_features = rb_ary_new();
   VALUE r_timeout_msec = rb_hash_aref(r_opts, ID2SYM(rb_intern("timeout_msec")));
-  if (NIL_P(r_timeout_msec)) r_timeout_msec= UINT2NUM(100);
+  if (NIL_P(r_timeout_msec))
+    r_timeout_msec = UINT2NUM(100);
 
   VMData *data;
   TypedData_Get_Struct(self, VMData, &vm_type, data);
 
-  JSRuntime *runtime = JS_NewRuntime();
-  data->context = JS_NewContext(runtime);
   data->eval_time->limit = (clock_t)(CLOCKS_PER_SEC * NUM2UINT(r_timeout_msec) / 1000);
-  data->alive = 1;
   JS_SetContextOpaque(data->context, data);
+  JSRuntime *runtime = JS_GetRuntime(data->context);
 
   JS_SetMemoryLimit(runtime, NUM2UINT(r_memoryLimit));
   JS_SetMaxStackSize(runtime, NUM2UINT(r_maxStackSize));
@@ -270,18 +317,20 @@ static VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
   JS_SetModuleLoaderFunc(runtime, NULL, js_module_loader, NULL);
   js_std_init_handlers(runtime);
 
-  if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureStdId))))) {
+  if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureStdId)))))
+  {
     js_init_module_std(data->context, "std");
     const char *enableStd = "import * as std from 'std';\n"
-        "globalThis.std = std;\n";
+                            "globalThis.std = std;\n";
     JSValue stdEval = JS_Eval(data->context, enableStd, strlen(enableStd), "<vm>", JS_EVAL_TYPE_MODULE);
     JS_FreeValue(data->context, stdEval);
   }
 
-  if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureOsId))))) {
+  if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureOsId)))))
+  {
     js_init_module_os(data->context, "os");
     const char *enableOs = "import * as os from 'os';\n"
-        "globalThis.os = os;\n";
+                           "globalThis.os = os;\n";
     JSValue osEval = JS_Eval(data->context, enableOs, strlen(enableOs), "<vm>", JS_EVAL_TYPE_MODULE);
     JS_FreeValue(data->context, osEval);
   }
@@ -298,9 +347,10 @@ static VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
   return self;
 }
 
-static int interrupt_handler(JSRuntime *runtime, void *opaque) {
-	EvalTime *eval_time = opaque;
-	return clock() >= eval_time->started_at + eval_time->limit ? 1 : 0;
+static int interrupt_handler(JSRuntime *runtime, void *opaque)
+{
+  EvalTime *eval_time = opaque;
+  return clock() >= eval_time->started_at + eval_time->limit ? 1 : 0;
 }
 
 static VALUE vm_m_evalCode(VALUE self, VALUE r_code)
@@ -308,11 +358,6 @@ static VALUE vm_m_evalCode(VALUE self, VALUE r_code)
   VMData *data;
   TypedData_Get_Struct(self, VMData, &vm_type, data);
 
-  if (data->alive < 1) {
-    rb_raise(rb_eRuntimeError, "Quickjs::VM was disposed");
-    return Qnil;
-  }
-
   data->eval_time->started_at = clock();
   JS_SetInterruptHandler(JS_GetRuntime(data->context), interrupt_handler, data->eval_time);
 
@@ -331,43 +376,29 @@ static VALUE vm_m_defineGlobalFunction(VALUE self, VALUE r_name)
   VMData *data;
   TypedData_Get_Struct(self, VMData, &vm_type, data);
 
-  if (rb_block_given_p()) {
+  if (rb_block_given_p())
+  {
     VALUE proc = rb_block_proc();
 
     char *funcName = StringValueCStr(r_name);
 
     rb_hash_aset(data->defined_functions, r_name, proc);
 
-    const char* template = "globalThis.__ruby['%s'] = (...args) => rubyGlobal('%s', args);\nglobalThis['%s'] = globalThis.__ruby['%s'];\n";
+    const char *template = "globalThis.__ruby['%s'] = (...args) => rubyGlobal('%s', args);\nglobalThis['%s'] = globalThis.__ruby['%s'];\n";
     int length = snprintf(NULL, 0, template, funcName, funcName, funcName, funcName);
-    char* result = (char*)malloc(length + 1);
+    char *result = (char *)malloc(length + 1);
     snprintf(result, length + 1, template, funcName, funcName, funcName, funcName);
 
     JSValue codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
 
-    JS_FreeValue(data->context, codeResult);
     free(result);
+    JS_FreeValue(data->context, codeResult);
     return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
   }
 
   return Qnil;
 }
 
-static VALUE vm_m_dispose(VALUE self)
-{
-  VMData *data;
-  TypedData_Get_Struct(self, VMData, &vm_type, data);
-
-  JSRuntime *runtime = JS_GetRuntime(data->context);
-  JS_SetInterruptHandler(runtime, NULL, NULL);
-  js_std_free_handlers(runtime);
-  JS_FreeContext(data->context);
-  JS_FreeRuntime(runtime);
-  data->alive = 0;
-
-  return Qnil;
-}
-
 RUBY_FUNC_EXPORTED void
 Init_quickjsrb(void)
 {
@@ -384,5 +415,4 @@ Init_quickjsrb(void)
   rb_define_method(vmClass, "initialize", vm_m_initialize, -1);
   rb_define_method(vmClass, "eval_code", vm_m_evalCode, 1);
   rb_define_method(vmClass, "define_function", vm_m_defineGlobalFunction, 1);
-  rb_define_method(vmClass, "dispose!", vm_m_dispose, 0);
 }

data/lib/quickjs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json