quickjs 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e231625e712ca98ffcab031b747d11392608eb840b2cafa6881173a5be9ac8
-  data.tar.gz: '099960b9c78f6f7a75990386186a0b149102d73ccbbbb7a1db7e52e120c57833'
+  metadata.gz: d949a011a5d0f2a19d351045d6a0de4550beee0908758c477a339af9d1e5863b
+  data.tar.gz: '09a2510b4a484e6b35a7be189cbd4015a3c575c0a318e8514beee56336c0055e'
 SHA512:
-  metadata.gz: 3cad539bfe3b3a7e254ef4c1a2919c7a12afd29e67e5729acc2f8356896898eef71f1f46c35a62e351b1ac03ba0b8e9fe357c4f69781d5b8a203525068e22261
-  data.tar.gz: d4fcdfe872d91b0fd86bcccd9e58262b233ee99d31a529ba288583e2953ea191f4b9269dacbac9a47256f5d2111f737741fce4d5d26cba5e4fcc97bc450be96b
+  metadata.gz: e8ecb1d0510082d9c0eca95ee6ef7257ff8f15ff4a2ea60fe9bc69e1274de689e71671b0f3f56ddcbe2c23421fa6fcd00b9cafadba653b89550447eb3b2a6310
+  data.tar.gz: af34d0b17332ba6df2e6f6c165d38cdd15ee4684a03f4bc5dc92dac2acdf5512313b263d775e9c942ab70a144e5317b1695b402ecf958ad3a86750662f84e675

data/README.md

@@ -158,6 +158,6 @@ vm,logs.last.raw #=> ['log me', nil]
 
 ## 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).
+Every file in `ext/quickjsrb/quickjs` is licensed under [the MIT License Copyright 2017-2021 by Fabrice Bellard and Charlie Gordon](https://github.com/bellard/quickjs/blob/6e2e68fd0896957f92eb6c242a2e048c1ef3cae0/LICENSE).
 
 For otherwise, [the MIT License, Copyright 2024 by Kengo Hamasaki](/LICENSE).

data/ext/quickjsrb/quickjsrb.c

@@ -109,6 +109,25 @@ 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_r_json(JSContext *ctx, JSValue j_val)
+{
+  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, j_strigified);
+  VALUE r_str = rb_str_new2(msg);
+  JS_FreeCString(ctx, msg);
+
+  JS_FreeValue(ctx, j_strigified);
+  JS_FreeValue(ctx, j_stringifyFunc);
+  JS_FreeValue(ctx, j_jsonClass);
+  JS_FreeValue(ctx, j_global);
+
+  return r_str;
+}
+
 VALUE to_rb_value(JSContext *ctx, JSValue j_val)
 {
   switch (JS_VALUE_GET_NORM_TAG(j_val))
@@ -135,10 +154,16 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
   }
   case JS_TAG_STRING:
   {
-    const char *msg = JS_ToCString(ctx, j_val);
-    VALUE r_str = rb_str_new2(msg);
-    JS_FreeCString(ctx, msg);
-    return r_str;
+    int couldntParse;
+    VALUE r_result = rb_protect(r_try_json_parse, to_r_json(ctx, j_val), &couldntParse);
+    if (couldntParse)
+    {
+      return Qnil;
+    }
+    else
+    {
+      return r_result;
+    }
   }
   case JS_TAG_OBJECT:
   {
@@ -159,20 +184,7 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       }
       // will support other errors like just returning an instance of Error
     }
-
-    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, j_strigified);
-    VALUE r_str = rb_str_new2(msg);
-    JS_FreeCString(ctx, msg);
-
-    JS_FreeValue(ctx, j_strigified);
-    JS_FreeValue(ctx, j_stringifyFunc);
-    JS_FreeValue(ctx, j_jsonClass);
-    JS_FreeValue(ctx, j_global);
+    VALUE r_str = to_r_json(ctx, j_val);
 
     if (rb_funcall(r_str, rb_intern("=="), 1, rb_str_new2("undefined")))
     {
@@ -221,16 +233,8 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       snprintf(headline, length + 1, headlineTemplate, errorClassName, errorClassMessage, stackTrace);
 
       VMData *data = JS_GetContextOpaque(ctx);
-      VALUE r_log_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
-      VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
-      rb_iv_set(r_log, "@severity", ID2SYM(rb_intern("error")));
-      VALUE r_row = rb_ary_new();
-      VALUE r_loghash = rb_hash_new();
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), rb_str_new2(headline));
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(headline));
-      rb_ary_push(r_row, r_loghash);
-      rb_iv_set(r_log, "@row", r_row);
-      rb_ary_push(data->logs, r_log);
+      VALUE r_headline = rb_str_new2(headline);
+      rb_ary_push(data->logs, r_log_new("error", rb_ary_new3(1, r_log_body_new(r_headline, r_headline))));
 
       JS_FreeValue(ctx, j_errorClassMessage);
       JS_FreeValue(ctx, j_errorClassName);
@@ -271,16 +275,8 @@ VALUE to_rb_value(JSContext *ctx, JSValue j_val)
       snprintf(headline, length + 1, headlineTemplate, errorMessage);
 
       VMData *data = JS_GetContextOpaque(ctx);
-      VALUE r_log_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
-      VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
-      rb_iv_set(r_log, "@severity", ID2SYM(rb_intern("error")));
-      VALUE r_row = rb_ary_new();
-      VALUE r_loghash = rb_hash_new();
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), rb_str_new2(headline));
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(headline));
-      rb_ary_push(r_row, r_loghash);
-      rb_iv_set(r_log, "@row", r_row);
-      rb_ary_push(data->logs, r_log);
+      VALUE r_headline = rb_str_new2(headline);
+      rb_ary_push(data->logs, r_log_new("error", rb_ary_new3(1, r_log_body_new(r_headline, r_headline))));
 
       free(headline);
 
@@ -324,84 +320,118 @@ static VALUE r_try_call_proc(VALUE r_try_args)
   );
 }
 
-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, int _magic, JSValue *func_data)
 {
-  VMData *data = JS_GetContextOpaque(ctx);
-  JSValue j_maybeFuncName = JS_ToString(ctx, argv[0]);
-  const char *funcName = JS_ToCString(ctx, j_maybeFuncName);
-  JS_FreeValue(ctx, j_maybeFuncName);
+  const char *funcName = JS_ToCString(ctx, func_data[0]);
 
+  VMData *data = JS_GetContextOpaque(ctx);
   VALUE r_proc = rb_hash_aref(data->defined_functions, rb_str_new2(funcName));
+  // Shouldn't happen
   if (r_proc == Qnil)
-  { // Shouldn't happen
-    return JS_ThrowReferenceError(ctx, "Proc `%s` is not defined", funcName);
+  {
+    return JS_ThrowReferenceError(ctx, "Proc `%s` is not defined", funcName); // TODO: Free funcnName
   }
+  JS_FreeCString(ctx, funcName);
 
   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]));
+
+  VALUE r_argv = rb_ary_new();
+  for (int i = 0; i < argc; i++)
+  {
+    rb_ary_push(r_argv, to_rb_value(ctx, argv[i]));
+  }
+  rb_ary_push(r_call_args, r_argv);
   rb_ary_push(r_call_args, ULONG2NUM(data->eval_time->limit * 1000 / CLOCKS_PER_SEC));
 
   int sadnessHappened;
-  VALUE r_result = rb_protect(r_try_call_proc, r_call_args, &sadnessHappened);
-  JSValue j_result;
-  if (sadnessHappened)
+
+  if (JS_ToBool(ctx, func_data[1]))
   {
-    VALUE r_error = rb_errinfo();
-    JSValue j_error = j_error_from_ruby_error(ctx, r_error);
-    return JS_Throw(ctx, j_error);
+    JSValue promise, resolving_funcs[2];
+    JSValue ret_val;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+      return JS_EXCEPTION;
+
+    // Currently, it's blocking process but should be asynchronized
+    JSValue j_result;
+    VALUE r_result = rb_protect(r_try_call_proc, r_call_args, &sadnessHappened);
+    if (sadnessHappened)
+    {
+      VALUE r_error = rb_errinfo();
+      j_result = j_error_from_ruby_error(ctx, r_error);
+      ret_val = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                        1, (JSValueConst *)&j_result);
+    }
+    else
+    {
+      j_result = to_js_value(ctx, r_result);
+      ret_val = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
+                        1, (JSValueConst *)&j_result);
+    }
+    JS_FreeValue(ctx, j_result);
+    JS_FreeValue(ctx, ret_val);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return promise;
   }
   else
   {
-    j_result = to_js_value(ctx, r_result);
+    VALUE r_result = rb_protect(r_try_call_proc, r_call_args, &sadnessHappened);
+    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
+    {
+      return 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)
+static JSValue js_quickjsrb_log(JSContext *ctx, JSValueConst _this, int argc, JSValueConst *argv, const char *severity)
 {
   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_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
-  VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
-  rb_iv_set(r_log, "@severity", ID2SYM(rb_intern(severity)));
-  JS_FreeCString(ctx, 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++)
+  for (int i = 0; i < argc; i++)
   {
-    VALUE r_loghash = rb_hash_new();
-    JSValue j_logged = JS_GetPropertyUint32(ctx, argv[1], i);
-    if (JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1)
-    {
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), rb_str_new2("Promise"));
-    }
-    else
-    {
-      rb_hash_aset(r_loghash, ID2SYM(rb_intern("raw")), to_rb_value(ctx, j_logged));
-    }
+    JSValue j_logged = argv[i];
+    VALUE r_raw = JS_VALUE_GET_NORM_TAG(j_logged) == JS_TAG_OBJECT && JS_PromiseState(ctx, j_logged) != -1 ? rb_str_new2("Promise") : to_rb_value(ctx, j_logged);
     const char *body = JS_ToCString(ctx, j_logged);
-    JS_FreeValue(ctx, j_logged);
-    rb_hash_aset(r_loghash, ID2SYM(rb_intern("c")), rb_str_new2(body));
+    VALUE r_c = rb_str_new2(body);
     JS_FreeCString(ctx, body);
-    rb_ary_push(r_row, r_loghash);
+
+    rb_ary_push(r_row, r_log_body_new(r_raw, r_c));
   }
 
-  rb_iv_set(r_log, "@row", r_row);
-  rb_ary_push(data->logs, r_log);
+  rb_ary_push(data->logs, r_log_new(severity, r_row));
   return JS_UNDEFINED;
 }
 
+static JSValue js_console_info(JSContext *ctx, JSValueConst this, int argc, JSValueConst *argv)
+{
+  return js_quickjsrb_log(ctx, this, argc, argv, "info");
+}
+
+static JSValue js_console_verbose(JSContext *ctx, JSValueConst this, int argc, JSValueConst *argv)
+{
+  return js_quickjsrb_log(ctx, this, argc, argv, "verbose");
+}
+
+static JSValue js_console_warn(JSContext *ctx, JSValueConst this, int argc, JSValueConst *argv)
+{
+  return js_quickjsrb_log(ctx, this, argc, argv, "warning");
+}
+
+static JSValue js_console_error(JSContext *ctx, JSValueConst this, int argc, JSValueConst *argv)
+{
+  return js_quickjsrb_log(ctx, this, argc, argv, "error");
+}
+
 static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
 {
   VALUE r_opts;
@@ -473,29 +503,27 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     JS_FreeValue(data->context, j_timeoutEval);
   }
 
-  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));
+      data->context, j_console, "log",
+      JS_NewCFunction(data->context, js_console_info, "log", 1));
+  JS_SetPropertyStr(
+      data->context, j_console, "debug",
+      JS_NewCFunction(data->context, js_console_verbose, "debug", 1));
+  JS_SetPropertyStr(
+      data->context, j_console, "info",
+      JS_NewCFunction(data->context, js_console_info, "info", 1));
+  JS_SetPropertyStr(
+      data->context, j_console, "warn",
+      JS_NewCFunction(data->context, js_console_warn, "warn", 1));
+  JS_SetPropertyStr(
+      data->context, j_console, "error",
+      JS_NewCFunction(data->context, js_console_error, "error", 1));
+
+  JSValue j_global = JS_GetGlobalObject(data->context);
   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;
 }
 
@@ -544,27 +572,23 @@ static VALUE vm_m_defineGlobalFunction(int argc, VALUE *argv, VALUE r_self)
   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);
 
   rb_hash_aset(data->defined_functions, r_name, r_block);
   char *funcName = StringValueCStr(r_name);
 
-  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);
+  JSValueConst ruby_data[2];
+  ruby_data[0] = JS_NewString(data->context, funcName);
+  ruby_data[1] = JS_NewBool(data->context, RTEST(rb_funcall(r_flags, rb_intern("include?"), 1, ID2SYM(rb_intern("async")))));
 
-  JSValue j_codeResult = JS_Eval(data->context, result, strlen(result), "<vm>", JS_EVAL_TYPE_MODULE);
+  JSValue j_global = JS_GetGlobalObject(data->context);
+  JS_SetPropertyStr(
+      data->context, j_global, funcName,
+      JS_NewCFunctionData(data->context, js_quickjsrb_call_global, 1, 0, 2, ruby_data));
+  JS_FreeValue(data->context, j_global);
 
-  free(result);
-  JS_FreeValue(data->context, j_codeResult);
   return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
-
-  return Qnil;
 }
 
 static VALUE vm_m_import(int argc, VALUE *argv, VALUE r_self)

data/ext/quickjsrb/quickjsrb.h

@@ -178,6 +178,23 @@ static VALUE r_define_log_class(VALUE r_parent_class)
   return r_log_class;
 }
 
+static VALUE r_log_new(const char *severity, VALUE r_row)
+{
+  VALUE r_log_class = rb_const_get(rb_const_get(rb_const_get(rb_cClass, rb_intern("Quickjs")), rb_intern("VM")), rb_intern("Log"));
+  VALUE r_log = rb_funcall(r_log_class, rb_intern("new"), 0);
+  rb_iv_set(r_log, "@severity", ID2SYM(rb_intern(severity)));
+  rb_iv_set(r_log, "@row", r_row);
+  return r_log;
+}
+
+static VALUE r_log_body_new(VALUE r_raw, VALUE r_c)
+{
+  VALUE r_log_body = rb_hash_new();
+  rb_hash_aset(r_log_body, ID2SYM(rb_intern("raw")), r_raw);
+  rb_hash_aset(r_log_body, ID2SYM(rb_intern("c")), r_c);
+  return r_log_body;
+}
+
 // Exceptions
 
 #define QUICKJSRB_ROOT_RUNTIME_ERROR "RuntimeError"

data/lib/quickjs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json