quickjs 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eba12c1c34fab81270517de72da6a8b3c9b561d521a42b80c14411c23555684
-  data.tar.gz: 4bced848c986a41c787306e799b40622d97dff999994b64e615cd3b1c79e586e
+  metadata.gz: 362c16217cefda63b3d8a4e0c41bdf4036c24e49540e5c223efc0751d5c84e44
+  data.tar.gz: 0415d93639765ffc7191964418e3a12f3c5fd51a547e854ff68141f1239c8e91
 SHA512:
-  metadata.gz: 3598ef1f8b5bcbeedf916c101387477b8318e6550a1aa52b6fa4ddb269e261447768428eb4b644e2a0a9cc64ae084830c511cb077b7e25e292eb5d8e84a96460
-  data.tar.gz: 686a93a0a00d747c99d8a0a0f0072a2d0451cc6bfdeeeb512f02817288636d7192a2e2dda52d0e9bf05b92ebb1930f503ca7ce2251c8419ca568c66f825bca1f
+  metadata.gz: d03afbf875aa53a7bbda02ed4ad84bab4f264b77446373f352c0c19d0d6c7cf824e3fd8b5c108cb0dd13872b8f8e53b12488052bd5f80190287c685f8f5bd6b0
+  data.tar.gz: 2fa7eae61259f74229e1ee71c2dd4a6016ef7f26cb1e47cdbe2646b871bb7a0eb41c8e74b3805d4471e5e953153fab2f8ab14f17e934969264cb231ae5a08556

data/README.md

@@ -56,6 +56,9 @@ Quickjs.eval_code(code, { features: [Quickjs::MODULE_STD] })
 # enable os module
 # https://bellard.org/quickjs/quickjs.html#os-module
 Quickjs.eval_code(code, { features: [Quickjs::MODULE_OS] })
+
+# enable timeout features `setTimeout`, `clearTimeout`
+Quickjs.eval_code(code, { features: [Quickjs::FEATURES_TIMEOUT] })
 ```
 
 ### `Quickjs::VM`: Maintain a consistent VM/runtime
@@ -94,9 +97,14 @@ vm = Quickjs::VM.new(
 vm = Quickjs::VM.new(
   timeout_msec: 1_000,
 )
+
+# enable timeout features `setTimeout`, `clearTimeout`
+vm = Quickjs::VM.new(
+  features: [::Quickjs::FEATURES_TIMEOUT],
+)
 ```
 
-#### Define a global function for JS
+#### ⚡️ Define a global function for JS by Ruby
 
 ```rb
 vm = Quickjs::VM.new
@@ -110,4 +118,5 @@ vm.eval_code("greetingTo('Rick')") #=> 'Hello! Rick'
 ## License
 
 Every file in `ext/quickjsrb/quickjs` is licensed under [the MIT License Copyright 2017-2021 by Fabrice Bellard and Charlie Goron](/ext/quickjsrb/quickjs/LICENSE).
+
 For otherwise, [the MIT License, Copyright 2024 by Kengo Hamasaki](/LICENSE).

data/ext/quickjsrb/quickjsrb.c

@@ -11,6 +11,7 @@ typedef struct VMData
   struct JSContext *context;
   VALUE defined_functions;
   struct EvalTime *eval_time;
+  VALUE logs;
 } VMData;
 
 static void vm_free(void *ptr)
@@ -36,6 +37,7 @@ static void vm_mark(void *ptr)
 {
   VMData *data = (VMData *)ptr;
   rb_gc_mark_movable(data->defined_functions);
+  rb_gc_mark_movable(data->logs);
 }
 
 static const rb_data_type_t vm_type = {
@@ -48,11 +50,12 @@ static const rb_data_type_t vm_type = {
     .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-static VALUE vm_alloc(VALUE self)
+static VALUE vm_alloc(VALUE r_self)
 {
   VMData *data;
-  VALUE obj = TypedData_Make_Struct(self, VMData, &vm_type, data);
+  VALUE obj = TypedData_Make_Struct(r_self, VMData, &vm_type, data);
   data->defined_functions = rb_hash_new();
+  data->logs = rb_ary_new();
 
   EvalTime *eval_time = malloc(sizeof(EvalTime));
   data->eval_time = eval_time;
@@ -63,15 +66,31 @@ static VALUE vm_alloc(VALUE self)
   return obj;
 }
 
-VALUE rb_mQuickjs;
+VALUE rb_cQuickjsVMLog, rb_cQuickjsSyntaxError, rb_cQuickjsRuntimeError, rb_cQuickjsInterruptedError, rb_cQuickjsNoAwaitError, rb_cQuickjsTypeError, rb_cQuickjsReferenceError, rb_cQuickjsRangeError, rb_cQuickjsEvalError, rb_cQuickjsURIError, rb_cQuickjsAggregateError;
 const char *undefinedId = "undefined";
 const char *nanId = "NaN";
 
 const char *featureStdId = "feature_std";
 const char *featureOsId = "feature_os";
+const char *featureOsTimeoutId = "feature_os_timeout";
 
 JSValue to_js_value(JSContext *ctx, VALUE r_value)
 {
+  if (RTEST(rb_funcall(
+          r_value,
+          rb_intern("is_a?"),
+          1, rb_const_get(rb_cClass, rb_intern("Exception")))))
+  {
+    JSValue j_error = JS_NewError(ctx);
+    VALUE r_str = rb_funcall(r_value, rb_intern("message"), 0, NULL);
+    char *exceptionMessage = StringValueCStr(r_str);
+    VALUE r_exception_name = rb_funcall(rb_funcall(r_value, rb_intern("class"), 0, NULL), rb_intern("name"), 0, NULL);
+    char *exceptionName = StringValueCStr(r_exception_name);
+    JS_SetPropertyStr(ctx, j_error, "name", JS_NewString(ctx, exceptionName));
+    JS_SetPropertyStr(ctx, j_error, "message", JS_NewString(ctx, exceptionMessage));
+    return JS_Throw(ctx, j_error);
+  }
+
   switch (TYPE(r_value))
   {
   case T_NIL:
@@ -81,15 +100,15 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   {
     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_global = JS_GetGlobalObject(ctx);
+    JSValue j_numberClass = JS_GetPropertyStr(ctx, j_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);
+    JSValue j_stringified = JS_Call(ctx, j_numberClass, JS_UNDEFINED, 1, &j_str);
+    JS_FreeValue(ctx, j_global);
+    JS_FreeValue(ctx, j_numberClass);
     JS_FreeValue(ctx, j_str);
 
-    return stringified;
+    return j_stringified;
   }
   case T_STRING:
   {
@@ -113,17 +132,17 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   {
     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_global = JS_GetGlobalObject(ctx);
+    JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
+    JSValue j_parseFunc = JS_GetPropertyStr(ctx, j_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);
+    JSValue j_stringified = JS_Call(ctx, j_parseFunc, j_jsonClass, 1, &j_str);
+    JS_FreeValue(ctx, j_global);
+    JS_FreeValue(ctx, j_jsonClass);
+    JS_FreeValue(ctx, j_parseFunc);
     JS_FreeValue(ctx, j_str);
 
-    return stringified;
+    return j_stringified;
   }
   default:
   {
@@ -135,73 +154,62 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   }
 }
 
-VALUE to_rb_value(JSValue jsv, JSContext *ctx)
+VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 {
-  switch (JS_VALUE_GET_NORM_TAG(jsv))
+  switch (JS_VALUE_GET_NORM_TAG(j_val))
   {
   case JS_TAG_INT:
   {
     int int_res = 0;
-    JS_ToInt32(ctx, &int_res, jsv);
+    JS_ToInt32(ctx, &int_res, j_val);
     return INT2NUM(int_res);
   }
   case JS_TAG_FLOAT64:
   {
-    if (JS_VALUE_IS_NAN(jsv))
+    if (JS_VALUE_IS_NAN(j_val))
     {
       return ID2SYM(rb_intern(nanId));
     }
     double double_res;
-    JS_ToFloat64(ctx, &double_res, jsv);
+    JS_ToFloat64(ctx, &double_res, j_val);
     return DBL2NUM(double_res);
   }
   case JS_TAG_BOOL:
   {
-    return JS_ToBool(ctx, jsv) > 0 ? Qtrue : Qfalse;
+    return JS_ToBool(ctx, j_val) > 0 ? Qtrue : Qfalse;
   }
   case JS_TAG_STRING:
   {
-    JSValue maybeString = JS_ToString(ctx, jsv);
-    const char *msg = JS_ToCString(ctx, maybeString);
-    JS_FreeValue(ctx, maybeString);
+    const char *msg = JS_ToCString(ctx, j_val);
+    VALUE r_str = rb_str_new2(msg);
     JS_FreeCString(ctx, msg);
-    return rb_str_new2(msg);
+    return r_str;
   }
   case JS_TAG_OBJECT:
   {
-    int promiseState = JS_PromiseState(ctx, jsv);
-    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)
+    int promiseState = JS_PromiseState(ctx, j_val);
+    if (promiseState != -1)
     {
-      JSValue promiseResult = JS_PromiseResult(ctx, jsv);
-      JSValue throw = JS_Throw(ctx, promiseResult);
-      JS_FreeValue(ctx, promiseResult);
-      VALUE rb_errored = to_rb_value(throw, ctx);
-      JS_FreeValue(ctx, throw);
-      return rb_errored;
+      VALUE r_error_message = rb_str_new2("cannot translate a Promise to Ruby. await within JavaScript's end");
+      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+      return Qnil;
     }
 
-    JSValue global = JS_GetGlobalObject(ctx);
-    JSValue jsonClass = JS_GetPropertyStr(ctx, global, "JSON");
-    JSValue stringifyFunc = JS_GetPropertyStr(ctx, jsonClass, "stringify");
-    JSValue strigified = JS_Call(ctx, stringifyFunc, jsonClass, 1, &jsv);
+    JSValue j_global = JS_GetGlobalObject(ctx);
+    JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
+    JSValue j_stringifyFunc = JS_GetPropertyStr(ctx, j_jsonClass, "stringify");
+    JSValue j_strigified = JS_Call(ctx, j_stringifyFunc, j_jsonClass, 1, &j_val);
 
-    const char *msg = JS_ToCString(ctx, strigified);
-    VALUE rbString = rb_str_new2(msg);
+    const char *msg = JS_ToCString(ctx, j_strigified);
+    VALUE r_str = rb_str_new2(msg);
     JS_FreeCString(ctx, msg);
 
-    JS_FreeValue(ctx, global);
-    JS_FreeValue(ctx, strigified);
-    JS_FreeValue(ctx, stringifyFunc);
-    JS_FreeValue(ctx, jsonClass);
+    JS_FreeValue(ctx, j_global);
+    JS_FreeValue(ctx, j_strigified);
+    JS_FreeValue(ctx, j_stringifyFunc);
+    JS_FreeValue(ctx, j_jsonClass);
 
-    return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, rbString);
+    return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, r_str);
   }
   case JS_TAG_NULL:
     return Qnil;
@@ -209,47 +217,95 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx)
     return ID2SYM(rb_intern(undefinedId));
   case JS_TAG_EXCEPTION:
   {
-    JSValue exceptionVal = JS_GetException(ctx);
-    if (JS_IsError(ctx, exceptionVal))
+    JSValue j_exceptionVal = JS_GetException(ctx);
+    if (JS_IsError(ctx, j_exceptionVal))
     {
-      JSValue jsErrorClassName = JS_GetPropertyStr(ctx, exceptionVal, "name");
-      const char *errorClassName = JS_ToCString(ctx, jsErrorClassName);
-
-      JSValue jsErrorClassMessage = JS_GetPropertyStr(ctx, exceptionVal, "message");
-      const char *errorClassMessage = JS_ToCString(ctx, jsErrorClassMessage);
-
-      JS_FreeValue(ctx, jsErrorClassMessage);
-      JS_FreeValue(ctx, jsErrorClassName);
-
-      VALUE rb_errorMessage = rb_sprintf("%s: %s", errorClassName, errorClassMessage);
+      JSValue j_errorClassName = JS_GetPropertyStr(ctx, j_exceptionVal, "name");
+      const char *errorClassName = JS_ToCString(ctx, j_errorClassName);
+
+      JSValue j_errorClassMessage = JS_GetPropertyStr(ctx, j_exceptionVal, "message");
+      const char *errorClassMessage = JS_ToCString(ctx, j_errorClassMessage);
+
+      JS_FreeValue(ctx, j_errorClassMessage);
+      JS_FreeValue(ctx, j_errorClassName);
+
+      VALUE r_error_message = rb_sprintf("%s: %s", errorClassName, errorClassMessage);
+      VALUE r_error_class = rb_eRuntimeError;
+
+      if (strcmp(errorClassName, "SyntaxError") == 0)
+      {
+        r_error_class = rb_cQuickjsSyntaxError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "TypeError") == 0)
+      {
+        r_error_class = rb_cQuickjsTypeError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "ReferenceError") == 0)
+      {
+        r_error_class = rb_cQuickjsReferenceError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "RangeError") == 0)
+      {
+        r_error_class = rb_cQuickjsRangeError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "EvalError") == 0)
+      {
+        r_error_class = rb_cQuickjsEvalError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "URIError") == 0)
+      {
+        r_error_class = rb_cQuickjsURIError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "AggregateError") == 0)
+      {
+        r_error_class = rb_cQuickjsAggregateError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
+      else if (strcmp(errorClassName, "InternalError") == 0 && strstr(errorClassMessage, "interrupted") != NULL)
+      {
+        r_error_class = rb_cQuickjsInterruptedError;
+        r_error_message = rb_str_new2("Code evaluation is interrupted by the timeout or something");
+      }
+      else if (strcmp(errorClassName, "Quickjs::InterruptedError") == 0)
+      {
+        r_error_class = rb_cQuickjsInterruptedError;
+        r_error_message = rb_str_new2(errorClassMessage);
+      }
       JS_FreeCString(ctx, errorClassName);
       JS_FreeCString(ctx, errorClassMessage);
-      JS_FreeValue(ctx, exceptionVal);
-      rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, rb_errorMessage));
+      JS_FreeValue(ctx, j_exceptionVal);
+
+      rb_exc_raise(rb_exc_new_str(r_error_class, r_error_message));
     }
-    else
+    else // exception without Error object
     {
-      const char *errorMessage = JS_ToCString(ctx, exceptionVal);
+      const char *errorMessage = JS_ToCString(ctx, j_exceptionVal);
+      VALUE r_error_message = rb_sprintf("%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, j_exceptionVal);
+      rb_exc_raise(rb_exc_new_str(rb_cQuickjsRuntimeError, r_error_message));
     }
     return Qnil;
   }
   case JS_TAG_BIG_INT:
   {
-    JSValue toStringFunc = JS_GetPropertyStr(ctx, jsv, "toString");
-    JSValue strigified = JS_Call(ctx, toStringFunc, jsv, 0, NULL);
+    JSValue j_toStringFunc = JS_GetPropertyStr(ctx, j_val, "toString");
+    JSValue j_strigified = JS_Call(ctx, j_toStringFunc, j_val, 0, NULL);
 
-    const char *msg = JS_ToCString(ctx, strigified);
-    VALUE rbString = rb_str_new2(msg);
-    JS_FreeValue(ctx, toStringFunc);
-    JS_FreeValue(ctx, strigified);
+    const char *msg = JS_ToCString(ctx, j_strigified);
+    VALUE r_str = rb_str_new2(msg);
+    JS_FreeValue(ctx, j_toStringFunc);
+    JS_FreeValue(ctx, j_strigified);
     JS_FreeCString(ctx, msg);
 
-    return rb_funcall(rbString, rb_intern("to_i"), 0, NULL);
+    return rb_funcall(r_str, rb_intern("to_i"), 0, NULL);
   }
   case JS_TAG_BIG_FLOAT:
   case JS_TAG_BIG_DECIMAL:
@@ -262,35 +318,75 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx)
 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);
+  JSValue j_maybeFuncName = JS_ToString(ctx, argv[0]);
+  const char *funcName = JS_ToCString(ctx, j_maybeFuncName);
+  JS_FreeValue(ctx, j_maybeFuncName);
 
-  VALUE proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
-  if (proc == Qnil)
+  VALUE r_proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
+  if (r_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));
+  VALUE r_result = rb_funcall(
+      rb_const_get(rb_cClass, rb_intern("Quickjs")),
+      rb_intern("_with_timeout"),
+      3,
+      ULONG2NUM(data->eval_time->limit * 1000 / CLOCKS_PER_SEC),
+      r_proc,
+      to_rb_value(ctx, argv[1]));
+
   return to_js_value(ctx, r_result);
 }
 
-static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE self)
+static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv)
+{
+  VMData *data = JS_GetContextOpaque(ctx);
+  JSValue j_severity = JS_ToString(ctx, argv[0]);
+  const char *severity = JS_ToCString(ctx, j_severity);
+  JS_FreeValue(ctx, j_severity);
+
+  VALUE r_log = rb_funcall(rb_cQuickjsVMLog, rb_intern("new"), 0);
+  rb_iv_set(r_log, "@severity", ID2SYM(rb_intern(severity)));
+
+  VALUE r_row = rb_ary_new();
+  int i;
+  JSValue j_length = JS_GetPropertyStr(ctx, argv[1], "length");
+  int count;
+  JS_ToInt32(ctx, &count, j_length);
+  JS_FreeValue(ctx, j_length);
+  for (i = 0; i < count; i++)
+  {
+    JSValue j_logged = JS_GetPropertyUint32(ctx, argv[1], i);
+    const char *body = JS_ToCString(ctx, j_logged);
+    VALUE r_loghash = rb_hash_new();
+    rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(body));
+    rb_ary_push(r_row, r_loghash);
+    JS_FreeValue(ctx, j_logged);
+    JS_FreeCString(ctx, body);
+  }
+
+  rb_iv_set(r_log, "@row", r_row);
+  rb_ary_push(data->logs, r_log);
+  JS_FreeCString(ctx, severity);
+
+  return JS_UNDEFINED;
+}
+
+static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
 {
   VALUE r_opts;
   rb_scan_args(argc, argv, ":", &r_opts);
   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);
-  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);
+  VALUE r_memory_limit = rb_hash_aref(r_opts, ID2SYM(rb_intern("memory_limit")));
+  if (NIL_P(r_memory_limit))
+    r_memory_limit = UINT2NUM(1024 * 1024 * 128);
+  VALUE r_max_stack_size = rb_hash_aref(r_opts, ID2SYM(rb_intern("max_stack_size")));
+  if (NIL_P(r_max_stack_size))
+    r_max_stack_size = 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();
@@ -299,20 +395,19 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE self)
     r_timeout_msec = UINT2NUM(100);
 
   VMData *data;
-  TypedData_Get_Struct(self, VMData, &vm_type, data);
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
   data->eval_time->limit = (clock_t)(CLOCKS_PER_SEC * NUM2UINT(r_timeout_msec) / 1000);
   JS_SetContextOpaque(data->context, data);
   JSRuntime *runtime = JS_GetRuntime(data->context);
 
-  JS_SetMemoryLimit(runtime, NUM2UINT(r_memoryLimit));
-  JS_SetMaxStackSize(runtime, NUM2UINT(r_maxStackSize));
+  JS_SetMemoryLimit(runtime, NUM2UINT(r_memory_limit));
+  JS_SetMaxStackSize(runtime, NUM2UINT(r_max_stack_size));
 
   JS_AddIntrinsicBigFloat(data->context);
   JS_AddIntrinsicBigDecimal(data->context);
   JS_AddIntrinsicOperators(data->context);
   JS_EnableBignumExt(data->context, TRUE);
-  js_std_add_helpers(data->context, 0, NULL);
 
   JS_SetModuleLoaderFunc(runtime, NULL, js_module_loader, NULL);
   js_std_init_handlers(runtime);
@@ -322,8 +417,8 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE self)
     js_init_module_std(data->context, "std");
     const char *enableStd = "import * as std from '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);
+    JSValue j_stdEval = JS_Eval(data->context, enableStd, strlen(enableStd), "<vm>", JS_EVAL_TYPE_MODULE);
+    JS_FreeValue(data->context, j_stdEval);
   }
 
   if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureOsId)))))
@@ -331,20 +426,43 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE self)
     js_init_module_os(data->context, "os");
     const char *enableOs = "import * as os from '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);
+    JSValue j_osEval = JS_Eval(data->context, enableOs, strlen(enableOs), "<vm>", JS_EVAL_TYPE_MODULE);
+    JS_FreeValue(data->context, j_osEval);
+  }
+  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, ID2SYM(rb_intern(featureOsTimeoutId)))))
+  {
+    js_init_module_os(data->context, "_os"); // Better if this is limited just only for setTimeout and clearTimeout
+    const char *enableTimeout = "import * as _os from '_os';\n"
+                                "globalThis.setTimeout = _os.setTimeout;\n"
+                                "globalThis.clearTimeout = _os.clearTimeout;\n";
+    JSValue j_timeoutEval = JS_Eval(data->context, enableTimeout, strlen(enableTimeout), "<vm>", JS_EVAL_TYPE_MODULE);
+    JS_FreeValue(data->context, j_timeoutEval);
   }
 
-  const char *setupGlobalRuby = "globalThis.__ruby = {};\n";
-  JSValue rubyEval = JS_Eval(data->context, setupGlobalRuby, strlen(setupGlobalRuby), "<vm>", JS_EVAL_TYPE_MODULE);
-  JS_FreeValue(data->context, rubyEval);
-
-  JSValue global = JS_GetGlobalObject(data->context);
-  JSValue func = JS_NewCFunction(data->context, js_quickjsrb_call_global, "rubyGlobal", 2);
-  JS_SetPropertyStr(data->context, global, "rubyGlobal", func);
-  JS_FreeValue(data->context, global);
-
-  return self;
+  JSValue j_global = JS_GetGlobalObject(data->context);
+  JSValue j_quickjsrbGlobal = JS_NewObject(data->context);
+  JS_SetPropertyStr(
+      data->context, j_quickjsrbGlobal, "runRubyMethod",
+      JS_NewCFunction(data->context, js_quickjsrb_call_global, "runRubyMethod", 2));
+
+  JS_SetPropertyStr(data->context, j_global, "__quickjsrb", j_quickjsrbGlobal);
+
+  JSValue j_console = JS_NewObject(data->context);
+  JS_SetPropertyStr(
+      data->context, j_quickjsrbGlobal, "log",
+      JS_NewCFunction(data->context, js_quickjsrb_log, "log", 2));
+  JS_SetPropertyStr(data->context, j_global, "console", j_console);
+  JS_FreeValue(data->context, j_global);
+
+  const char *defineLoggers = "console.log = (...args) => __quickjsrb.log('info', args);\n"
+                              "console.debug = (...args) => __quickjsrb.log('verbose', args);\n"
+                              "console.info = (...args) => __quickjsrb.log('info', args);\n"
+                              "console.warn = (...args) => __quickjsrb.log('warning', args);\n"
+                              "console.error = (...args) => __quickjsrb.log('error', args);\n";
+  JSValue j_defineLoggers = JS_Eval(data->context, defineLoggers, strlen(defineLoggers), "<vm>", JS_EVAL_TYPE_GLOBAL);
+  JS_FreeValue(data->context, j_defineLoggers);
+
+  return r_self;
 }
 
 static int interrupt_handler(JSRuntime *runtime, void *opaque)
@@ -353,66 +471,161 @@ static int interrupt_handler(JSRuntime *runtime, void *opaque)
   return clock() >= eval_time->started_at + eval_time->limit ? 1 : 0;
 }
 
-static VALUE vm_m_evalCode(VALUE self, VALUE r_code)
+static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
 {
   VMData *data;
-  TypedData_Get_Struct(self, VMData, &vm_type, data);
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
   data->eval_time->started_at = clock();
   JS_SetInterruptHandler(JS_GetRuntime(data->context), interrupt_handler, data->eval_time);
 
   char *code = StringValueCStr(r_code);
-  JSValue codeResult = JS_Eval(data->context, code, strlen(code), "<code>", JS_EVAL_TYPE_GLOBAL);
-  VALUE result = to_rb_value(codeResult, data->context);
-
-  JS_FreeValue(data->context, codeResult);
-  return result;
+  JSValue j_codeResult = JS_Eval(data->context, code, strlen(code), "<code>", JS_EVAL_TYPE_GLOBAL | JS_EVAL_FLAG_ASYNC);
+  JSValue j_awaitedResult = js_std_await(data->context, j_codeResult);
+  JSValue j_returnedValue = JS_GetPropertyStr(data->context, j_awaitedResult, "value");
+  // Do this by rescuing to_rb_value
+  if (JS_VALUE_GET_NORM_TAG(j_returnedValue) == JS_TAG_OBJECT && JS_PromiseState(data->context, j_returnedValue) != -1)
+  {
+    JS_FreeValue(data->context, j_returnedValue);
+    JS_FreeValue(data->context, j_awaitedResult);
+    VALUE r_error_message = rb_str_new2("An unawaited Promise was returned to the top-level");
+    rb_exc_raise(rb_exc_new_str(rb_cQuickjsNoAwaitError, r_error_message));
+    return Qnil;
+  }
+  else
+  {
+    VALUE result = to_rb_value(data->context, j_returnedValue);
+    JS_FreeValue(data->context, j_returnedValue);
+    JS_FreeValue(data->context, j_awaitedResult);
+    return result;
+  }
 }
 
-static VALUE vm_m_defineGlobalFunction(VALUE self, VALUE r_name)
+static VALUE vm_m_defineGlobalFunction(VALUE r_self, VALUE r_name)
 {
   rb_need_block();
 
   VMData *data;
-  TypedData_Get_Struct(self, VMData, &vm_type, data);
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
   if (rb_block_given_p())
   {
-    VALUE proc = rb_block_proc();
-
+    VALUE r_proc = rb_block_proc();
+    rb_hash_aset(data->defined_functions, r_name, r_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";
-    int length = snprintf(NULL, 0, template, funcName, funcName, funcName, funcName);
+    const char *template = "globalThis['%s'] = (...args) => __quickjsrb.runRubyMethod('%s', args);\n";
+    int length = snprintf(NULL, 0, template, funcName, funcName);
     char *result = (char *)malloc(length + 1);
-    snprintf(result, length + 1, template, funcName, funcName, funcName, funcName);
+    snprintf(result, length + 1, template, funcName, funcName);
 
-    JSValue codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
+    JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
 
     free(result);
-    JS_FreeValue(data->context, codeResult);
+    JS_FreeValue(data->context, j_codeResult);
     return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
   }
 
   return Qnil;
 }
 
+// WISH: vm.import('hey', from: '...source...') imports just default
+// WISH: vm.import('{ member, member2 }', from: '...source...')
+// WISH: vm.import('{ member as aliasedName }', from: '...source...')
+// WISH: vm.import('defaultMember, { member }', from: '...source...')
+// WISH: vm.import('* as all', from: '...source...')
+static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
+{
+  VALUE r_import_string, r_opts;
+  rb_scan_args(argc, argv, "10:", &r_import_string, &r_opts);
+  if (NIL_P(r_opts))
+    r_opts = rb_hash_new();
+  VALUE r_from = rb_hash_aref(r_opts, ID2SYM(rb_intern("from")));
+  if (NIL_P(r_from))
+  {
+    VALUE r_error_message = rb_str_new2("missing import source");
+    rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, r_error_message));
+    return Qnil;
+  }
+
+  VMData *data;
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
+
+  char *source = StringValueCStr(r_from);
+  char *import_name = StringValueCStr(r_import_string);
+  JSValue func = JS_Eval(data->context, source, strlen(source), "mmmodule", JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_COMPILE_ONLY);
+  js_module_set_import_meta(data->context, func, TRUE, FALSE);
+  JS_FreeValue(data->context, func);
+
+  const char *importAndGlobalizeModule = "import * as %s from 'mmmodule';\n"
+                                         "globalThis['%s'] = %s;\n";
+  int length = snprintf(NULL, 0, importAndGlobalizeModule, import_name, import_name, import_name);
+  char *result = (char *)malloc(length + 1);
+  snprintf(result, length + 1, importAndGlobalizeModule, import_name, import_name, import_name);
+
+  JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
+  free(result);
+  JS_FreeValue(data->context, j_codeResult);
+
+  return Qtrue;
+}
+
+static VALUE vm_m_getLogs(VALUE r_self)
+{
+  VMData *data;
+  TypedData_Get_Struct(r_self, VMData, &vm_type, data);
+
+  return data->logs;
+}
+
+static VALUE pick_c(VALUE block_arg, VALUE data, int argc, const VALUE *argv, VALUE blockarg)
+{
+  return rb_hash_aref(block_arg, ID2SYM(rb_intern("c")));
+}
+
+static VALUE vm_m_to_s(VALUE r_self)
+{
+  VALUE row = rb_iv_get(r_self, "@row");
+  VALUE r_ary = rb_block_call(row, rb_intern("map"), 0, NULL, pick_c, Qnil);
+
+  return rb_funcall(r_ary, rb_intern("join"), 1, rb_str_new2(" "));
+}
+
 RUBY_FUNC_EXPORTED void
 Init_quickjsrb(void)
 {
-  rb_mQuickjs = rb_define_module("Quickjs");
+  VALUE rb_mQuickjs = rb_define_module("Quickjs");
   rb_define_const(rb_mQuickjs, "MODULE_STD", ID2SYM(rb_intern(featureStdId)));
   rb_define_const(rb_mQuickjs, "MODULE_OS", ID2SYM(rb_intern(featureOsId)));
-
-  VALUE valueClass = rb_define_class_under(rb_mQuickjs, "Value", rb_cObject);
-  rb_define_const(valueClass, "UNDEFINED", ID2SYM(rb_intern(undefinedId)));
-  rb_define_const(valueClass, "NAN", ID2SYM(rb_intern(nanId)));
-
-  VALUE vmClass = rb_define_class_under(rb_mQuickjs, "VM", rb_cObject);
-  rb_define_alloc_func(vmClass, vm_alloc);
-  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_const(rb_mQuickjs, "FEATURES_TIMEOUT", ID2SYM(rb_intern(featureOsTimeoutId)));
+
+  VALUE rb_cQuickjsValue = rb_define_class_under(rb_mQuickjs, "Value", rb_cObject);
+  rb_define_const(rb_cQuickjsValue, "UNDEFINED", ID2SYM(rb_intern(undefinedId)));
+  rb_define_const(rb_cQuickjsValue, "NAN", ID2SYM(rb_intern(nanId)));
+
+  VALUE rb_cQuickjsVM = rb_define_class_under(rb_mQuickjs, "VM", rb_cObject);
+  rb_define_alloc_func(rb_cQuickjsVM, vm_alloc);
+  rb_define_method(rb_cQuickjsVM, "initialize", vm_m_initialize, -1);
+  rb_define_method(rb_cQuickjsVM, "eval_code", vm_m_evalCode, 1);
+  rb_define_method(rb_cQuickjsVM, "define_function", vm_m_defineGlobalFunction, 1);
+  rb_define_method(rb_cQuickjsVM, "import", vm_m_import, -1);
+  rb_define_method(rb_cQuickjsVM, "logs", vm_m_getLogs, 0);
+
+  rb_cQuickjsVMLog = rb_define_class_under(rb_cQuickjsVM, "Log", rb_cObject);
+  rb_define_attr(rb_cQuickjsVMLog, "severity", 1, 0);
+  rb_define_method(rb_cQuickjsVMLog, "to_s", vm_m_to_s, 0);
+  rb_define_method(rb_cQuickjsVMLog, "inspect", vm_m_to_s, 0);
+
+  rb_cQuickjsRuntimeError = rb_define_class_under(rb_mQuickjs, "RuntimeError", rb_eRuntimeError);
+
+  rb_cQuickjsSyntaxError = rb_define_class_under(rb_mQuickjs, "SyntaxError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsTypeError = rb_define_class_under(rb_mQuickjs, "TypeError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsRangeError = rb_define_class_under(rb_mQuickjs, "RangeError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsReferenceError = rb_define_class_under(rb_mQuickjs, "ReferenceError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsURIError = rb_define_class_under(rb_mQuickjs, "URIError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsEvalError = rb_define_class_under(rb_mQuickjs, "EvalError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsAggregateError = rb_define_class_under(rb_mQuickjs, "AggregateError", rb_cQuickjsRuntimeError);
+
+  rb_cQuickjsInterruptedError = rb_define_class_under(rb_mQuickjs, "InterruptedError", rb_cQuickjsRuntimeError);
+  rb_cQuickjsNoAwaitError = rb_define_class_under(rb_mQuickjs, "NoAwaitError", rb_cQuickjsRuntimeError);
 }

data/lib/quickjs/version.rb

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

data/lib/quickjs.rb

@@ -1,12 +1,25 @@
 # frozen_string_literal: true
 
+require "timeout"
 require "json"
 require_relative "quickjs/version"
 require_relative "quickjs/quickjsrb"
 
 module Quickjs
   def eval_code(code, overwrite_opts = {})
-    Quickjs::VM.new(**overwrite_opts).eval_code(code)
+    vm = Quickjs::VM.new(**overwrite_opts)
+    res = vm.eval_code(code)
+    vm = nil
+    res
   end
   module_function :eval_code
+
+  def _with_timeout(msec, proc, args)
+    Timeout.timeout(msec / 1_000.0) { proc.call(*args) }
+  rescue Timeout::Error
+    Quickjs::InterruptedError.new('Ruby runtime got timeout')
+  rescue => e
+    e
+  end
+  module_function :_with_timeout
 end

metadata

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