quickjs 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2a481a2ea280bc0d4a9c7778b62035991bd08293ddef98b4824a40a6a6ccd9
-  data.tar.gz: a40b2f11813f2f82db4c5b9e0931199013671e0983e80566f0b6645709deece7
+  metadata.gz: 5f57f31bd8921f897f9d1c81d1c50d24774bbfba5d31a99528b138e82d3fad58
+  data.tar.gz: 28216a7b1711fe08ad3e2a5b021abebaadd2b5d3808584ff259d0129abf0adf6
 SHA512:
-  metadata.gz: f509a918c4e5ff7d19bdaa8873ee62ede64cfd98e405a7ea6f4eb00a724fc79fc2cd928e2388d0f8e07dcd455834ba1f60ec2a9990b4781bd0012ec5f72a9c16
-  data.tar.gz: b7604b888bc62fe12f6a5b30387891108a24cf1de55e77934cabeeab20fe9ae27f494098448a32a975e9fde99cee9a9af5bdd58c258a0bafb60adc125cedf206
+  metadata.gz: 355b53297b3c27269b71dca93e057ecfe02eac70755b5bd336b212092fb6da3c14ff3b2dd2f77214a62891b28d860e33f961329374ddef485e168dea41b50097
+  data.tar.gz: 7ff16986a8ef0efeff790389805fa6d36f6b03b5983e8f8131ff33f8369514344cc9f9b9f103f036ad305441e06dfdfdacd125bdb8b061967337235d4913c525

data/ext/quickjsrb/quickjsrb.c

@@ -165,6 +165,11 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
         r_error_class = QUICKJSRB_ERROR_FOR(QUICKJSRB_INTERRUPTED_ERROR);
         r_error_message = rb_str_new2("Code evaluation is interrupted by the timeout or something");
       }
+      else if (strcmp(errorClassName, "InternalError") == 0 && strstr(errorClassMessage, "Ruby") != NULL)
+      {
+        r_error_class = QUICKJSRB_ERROR_FOR(QUICKJSRB_RUBY_FUNCTION_ERROR);
+      }
+
       else if (strcmp(errorClassName, "Quickjs::InterruptedError") == 0)
       {
         r_error_class = QUICKJSRB_ERROR_FOR(QUICKJSRB_INTERRUPTED_ERROR);
@@ -211,6 +216,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 +240,25 @@ 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)
+  {
+    j_result = JS_ThrowInternalError(ctx, "unintentional error is raised while executing the function by Ruby: `%s`", funcName);
+  }
+  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 +437,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;
 }
@@ -507,7 +536,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/ext/quickjsrb/quickjsrb.h

@@ -183,6 +183,7 @@ static VALUE r_define_log_class(VALUE r_parent_class)
 #define QUICKJSRB_ROOT_RUNTIME_ERROR "RuntimeError"
 #define QUICKJSRB_INTERRUPTED_ERROR "InterruptedError"
 #define QUICKJSRB_NO_AWAIT_ERROR "NoAwaitError"
+#define QUICKJSRB_RUBY_FUNCTION_ERROR "RubyFunctionError"
 
 #define QUICKJSRB_ERROR_FOR(name) \
   (VALUE) { rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern(name)) }
@@ -211,6 +212,7 @@ static void r_define_exception_classes(VALUE r_parent_class)
   // quickjsrb specific errors
   rb_define_class_under(r_parent_class, QUICKJSRB_INTERRUPTED_ERROR, r_runtime_error);
   rb_define_class_under(r_parent_class, QUICKJSRB_NO_AWAIT_ERROR, r_runtime_error);
+  rb_define_class_under(r_parent_class, QUICKJSRB_RUBY_FUNCTION_ERROR, r_runtime_error);
 }
 
 #endif /* QUICKJSRB_H */

data/lib/quickjs/version.rb

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

data/lib/quickjs.rb

@@ -17,8 +17,8 @@ module Quickjs
     Timeout.timeout(msec / 1_000.0) { proc.call(*args) }
   rescue Timeout::Error
     Quickjs::InterruptedError.new('Ruby runtime got timeout', nil)
-  rescue => e
-    e
+  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.2.3
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json