quickjs 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2a481a2ea280bc0d4a9c7778b62035991bd08293ddef98b4824a40a6a6ccd9
-  data.tar.gz: a40b2f11813f2f82db4c5b9e0931199013671e0983e80566f0b6645709deece7
+  metadata.gz: ecc8aa4eddd6aca97baf0e773c4880b4479b4ac4597e0edf811d256eeb61aeb9
+  data.tar.gz: 37c8eeef2cad6e0d7773e89759c7d2d1659219247883cfd1817f2603ffbf1543
 SHA512:
-  metadata.gz: f509a918c4e5ff7d19bdaa8873ee62ede64cfd98e405a7ea6f4eb00a724fc79fc2cd928e2388d0f8e07dcd455834ba1f60ec2a9990b4781bd0012ec5f72a9c16
-  data.tar.gz: b7604b888bc62fe12f6a5b30387891108a24cf1de55e77934cabeeab20fe9ae27f494098448a32a975e9fde99cee9a9af5bdd58c258a0bafb60adc125cedf206
+  metadata.gz: 2728bcbae59fae1138bdb5aef4e2f22290db93ce6c1e81f031e25c43108287a4f4d93d20afcfd9cb19a0e55593e1ccdadf1d83ebfbb430ee802368b73994cc2b
+  data.tar.gz: d06939ece851f9f4fb1311846826cad5c92e594511948ac9659bb190ebe6f905fdce15b4b9d16cf5df3b08bc5483a6f27d847f3ddf752aaa18bfcf74fec087e1

data/ext/quickjsrb/quickjsrb.c

@@ -1,22 +1,22 @@
 #include "quickjsrb.h"
 
-JSValue to_js_value(JSContext *ctx, VALUE r_value)
+JSValue j_error_from_ruby_error(JSContext *ctx, VALUE r_error)
 {
-  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);
-  }
+  JSValue j_error = JS_NewError(ctx); // may wanna have custom error class to determine in JS' end
+
+  VALUE r_object_id = rb_funcall(r_error, rb_intern("object_id"), 0, NULL);
+  int objectId = NUM2INT(r_object_id);
+  JS_SetPropertyStr(ctx, j_error, "rb_object_id", JS_NewInt32(ctx, objectId));
+
+  VALUE r_exception_message = rb_funcall(r_error, rb_intern("message"), 0, NULL);
+  const char *errorMessage = StringValueCStr(r_exception_message);
+  JS_SetPropertyStr(ctx, j_error, "message", JS_NewString(ctx, errorMessage));
+
+  return j_error;
+}
 
+JSValue to_js_value(JSContext *ctx, VALUE r_value)
+{
   switch (TYPE(r_value))
   {
   case T_NIL:
@@ -72,6 +72,13 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   }
   default:
   {
+    if (TYPE(r_value) == T_OBJECT && RTEST(rb_funcall(
+                                         r_value,
+                                         rb_intern("is_a?"),
+                                         1, rb_const_get(rb_cClass, rb_intern("Exception")))))
+    {
+      return j_error_from_ruby_error(ctx, r_value);
+    }
     VALUE r_inspect_str = rb_funcall(r_value, rb_intern("inspect"), 0, NULL);
     char *str = StringValueCStr(r_inspect_str);
 
@@ -80,6 +87,11 @@ JSValue to_js_value(JSContext *ctx, VALUE r_value)
   }
 }
 
+VALUE r_try_json_parse(VALUE r_str)
+{
+  return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, r_str);
+}
+
 VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 {
   switch (JS_VALUE_GET_NORM_TAG(j_val))
@@ -121,6 +133,23 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       return Qnil;
     }
 
+    if (JS_IsError(ctx, j_val))
+    {
+      JSValue j_errorOriginalRubyObjectId = JS_GetPropertyStr(ctx, j_val, "rb_object_id");
+      int errorOriginalRubyObjectId = 0;
+      if (JS_VALUE_GET_NORM_TAG(j_errorOriginalRubyObjectId) == JS_TAG_INT)
+      {
+        JS_ToInt32(ctx, &errorOriginalRubyObjectId, j_errorOriginalRubyObjectId);
+        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));
+        }
+      }
+      // will support other errors
+    }
+
     JSValue j_global = JS_GetGlobalObject(ctx);
     JSValue j_jsonClass = JS_GetPropertyStr(ctx, j_global, "JSON");
     JSValue j_stringifyFunc = JS_GetPropertyStr(ctx, j_jsonClass, "stringify");
@@ -135,7 +164,21 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     JS_FreeValue(ctx, j_jsonClass);
     JS_FreeValue(ctx, j_global);
 
-    return rb_funcall(rb_const_get(rb_cClass, rb_intern("JSON")), rb_intern("parse"), 1, r_str);
+    if (rb_funcall(r_str, rb_intern("=="), 1, rb_str_new2("undefined")))
+    {
+      return QUICKJSRB_SYM(undefinedId);
+    }
+
+    int couldntParse;
+    VALUE r_result = rb_protect(r_try_json_parse, r_str, &couldntParse);
+    if (couldntParse)
+    {
+      return Qnil;
+    }
+    else
+    {
+      return r_result;
+    }
   }
   case JS_TAG_NULL:
     return Qnil;
@@ -146,6 +189,21 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
     JSValue j_exceptionVal = JS_GetException(ctx);
     if (JS_IsError(ctx, j_exceptionVal))
     {
+      JSValue j_errorOriginalRubyObjectId = JS_GetPropertyStr(ctx, j_exceptionVal, "rb_object_id");
+      int errorOriginalRubyObjectId = 0;
+      if (JS_VALUE_GET_NORM_TAG(j_errorOriginalRubyObjectId) == JS_TAG_INT)
+      {
+        JS_ToInt32(ctx, &errorOriginalRubyObjectId, j_errorOriginalRubyObjectId);
+        JS_FreeValue(ctx, j_errorOriginalRubyObjectId);
+        if (errorOriginalRubyObjectId > 0)
+        {
+          JS_FreeValue(ctx, j_exceptionVal);
+          // may be nice if cover the case of object is missing
+          rb_exc_raise(rb_funcall(rb_const_get(rb_cClass, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, INT2NUM(errorOriginalRubyObjectId)));
+          return Qnil;
+        }
+      }
+
       JSValue j_errorClassName = JS_GetPropertyStr(ctx, j_exceptionVal, "name");
       const char *errorClassName = JS_ToCString(ctx, j_errorClassName);
 
@@ -211,6 +269,18 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
   }
 }
 
+static VALUE r_try_call_proc(VALUE r_try_args)
+{
+  return rb_funcall(
+      rb_const_get(rb_cClass, rb_intern("Quickjs")),
+      rb_intern("_with_timeout"),
+      3,
+      RARRAY_AREF(r_try_args, 2), // timeout
+      RARRAY_AREF(r_try_args, 0), // proc
+      RARRAY_AREF(r_try_args, 1)  // args for proc
+  );
+}
+
 static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv)
 {
   VMData *data = JS_GetContextOpaque(ctx);
@@ -223,17 +293,27 @@ static JSValue js_quickjsrb_call_global(JSContext *ctx, JSValueConst _this, int
   { // Shouldn't happen
     return JS_ThrowReferenceError(ctx, "Proc `%s` is not defined", funcName);
   }
-  JS_FreeCString(ctx, funcName);
 
-  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]));
+  VALUE r_call_args = rb_ary_new();
+  rb_ary_push(r_call_args, r_proc);
+  rb_ary_push(r_call_args, to_rb_value(ctx, argv[1]));
+  rb_ary_push(r_call_args, ULONG2NUM(data->eval_time->limit * 1000 / CLOCKS_PER_SEC));
 
-  return to_js_value(ctx, r_result);
+  int sadnessHappened;
+  VALUE r_result = rb_protect(r_try_call_proc, r_call_args, &sadnessHappened);
+  JSValue j_result;
+  if (sadnessHappened)
+  {
+    VALUE r_error = rb_errinfo();
+    JSValue j_error = j_error_from_ruby_error(ctx, r_error);
+    return JS_Throw(ctx, j_error);
+  }
+  else
+  {
+    j_result = to_js_value(ctx, r_result);
+  }
+  JS_FreeCString(ctx, funcName);
+  return j_result;
 }
 
 static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int _argc, JSValueConst *argv)
@@ -412,30 +492,34 @@ static VALUE vm_m_evalCode(VALUE r_self, VALUE r_code)
   }
 }
 
-static VALUE vm_m_defineGlobalFunction(VALUE r_self, VALUE r_name)
+static VALUE vm_m_defineGlobalFunction(int argc, VALUE *argv, VALUE r_self)
 {
   rb_need_block();
 
+  VALUE r_name;
+  VALUE r_flags;
+  VALUE r_block;
+  rb_scan_args(argc, argv, "10*&", &r_name, &r_flags, &r_block);
+
+  const char *asyncKeyword =
+      RTEST(rb_funcall(r_flags, rb_intern("include?"), 1, ID2SYM(rb_intern("async")))) ? "async " : "";
+
   VMData *data;
   TypedData_Get_Struct(r_self, VMData, &vm_type, data);
 
-  if (rb_block_given_p())
-  {
-    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, r_block);
+  char *funcName = StringValueCStr(r_name);
 
-    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);
+  const char *template = "globalThis['%s'] = %s(...args) => __quickjsrb.runRubyMethod('%s', args);\n";
+  int length = snprintf(NULL, 0, template, funcName, asyncKeyword, funcName);
+  char *result = (char *)malloc(length + 1);
+  snprintf(result, length + 1, template, funcName, asyncKeyword, funcName);
 
-    JSValue j_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, j_codeResult);
-    return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
-  }
+  free(result);
+  JS_FreeValue(data->context, j_codeResult);
+  return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
 
   return Qnil;
 }
@@ -446,13 +530,14 @@ static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
   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"))); // TODO: Use kwargs instead
+  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_funcall(QUICKJSRB_ERROR_FOR(QUICKJSRB_ROOT_RUNTIME_ERROR), rb_intern("new"), 2, r_error_message, Qnil));
     return Qnil;
   }
+  VALUE r_custom_exposure = rb_hash_aref(r_opts, ID2SYM(rb_intern("code_to_expose")));
 
   VMData *data;
   TypedData_Get_Struct(r_self, VMData, &vm_type, data);
@@ -470,8 +555,16 @@ static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)
       r_import_string);
   VALUE r_import_name = rb_ary_entry(r_import_settings, 0);
   char *import_name = StringValueCStr(r_import_name);
-  VALUE r_globalize = rb_ary_entry(r_import_settings, 1);
-  char *globalize = StringValueCStr(r_globalize);
+  VALUE r_default_exposure = rb_ary_entry(r_import_settings, 1);
+  char *globalize;
+  if (RTEST(r_custom_exposure))
+  {
+    globalize = StringValueCStr(r_custom_exposure);
+  }
+  else
+  {
+    globalize = StringValueCStr(r_default_exposure);
+  }
 
   const char *importAndGlobalizeModule = "import %s from '%s';\n"
                                          "%s\n";
@@ -507,7 +600,7 @@ RUBY_FUNC_EXPORTED void Init_quickjsrb(void)
   rb_define_alloc_func(r_class_vm, vm_alloc);
   rb_define_method(r_class_vm, "initialize", vm_m_initialize, -1);
   rb_define_method(r_class_vm, "eval_code", vm_m_evalCode, 1);
-  rb_define_method(r_class_vm, "define_function", vm_m_defineGlobalFunction, 1);
+  rb_define_method(r_class_vm, "define_function", vm_m_defineGlobalFunction, -1);
   rb_define_method(r_class_vm, "import", vm_m_import, -1);
   rb_define_method(r_class_vm, "logs", vm_m_logs, 0);
   r_define_log_class(r_class_vm);

data/lib/quickjs/version.rb

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

data/lib/quickjs.rb

@@ -16,9 +16,9 @@ module Quickjs
   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', nil)
-  rescue => e
-    e
+    raise Quickjs::InterruptedError.new('Ruby runtime got timeout', nil)
+  rescue
+    raise
   end
   module_function :_with_timeout
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json