quickjs 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b9d276d5d05c5f7cf5ff981573283fa990064d55e60b02dc86f773c892c9a0
-  data.tar.gz: bf3e2ebee03197fdead070a974d40485c77bab90a7ab5153274a3cfb48a7ea4b
+  metadata.gz: 6fa772eb6185fa2bc744d7bb7b0cdb2024ccaf2d2ce34cb221139aaf2e819371
+  data.tar.gz: de4b5651b61eaaafe975ba56ae24b954c28efc9ea0ba2a6fb34f149b62d4aa58
 SHA512:
-  metadata.gz: 4f9431993a243c908c905c25a13c8679f17d3404699a87868c6a195f2eeb0b0e2f1c76716bf4564e076a189f20302ef1d6ade01a763e7827fdc5a4229f23be2c
-  data.tar.gz: 85505319f063a8f1e5c8c42dc4de7d483f9a3e3deb4599203d2d55d2c79d206d26385f8a139a67a87f753cab67fa74f2a74b0ed6f2a864fd5bd37c2588762881
+  metadata.gz: 1095f8d04c0c90756506b8bd16a519b207b3b2a0eda64abecec8fb541a0a5a5c0e11240abce18b03e4ee4d7b4c3a53138513218f12afa4d7e46462f3a93680ef
+  data.tar.gz: 3237ad5b23217199900665605629c5b69c0333ea5951f3a43cf2e26ac65d6a718ff94f262fdaeb5bf0c3b132e60cb0561d60a121045a26bb201bbfd63e8e3a9c

data/README.md

@@ -40,10 +40,10 @@ Quickjs.eval_code("Number('whatever')") #=> :NaN (Quickjs::Value::NAN)
 
 ```rb
 # 1GB memory limit
-Quickjs.eval_code(code, { memoryLimit: 1024 ** 3 })
+Quickjs.eval_code(code, { memory_limit: 1024 ** 3 })
 
 # 1MB max stack size
-Quickjs.eval_code(code, { memoryLimit: 1024 ** 2 })
+Quickjs.eval_code(code, { max_stack_size: 1024 ** 2 })
 ```
 
 #### Enable built-in modules
@@ -58,7 +58,7 @@ Quickjs.eval_code(code, { features: [Quickjs::MODULE_STD] })
 Quickjs.eval_code(code, { features: [Quickjs::MODULE_OS] })
 ```
 
-### Maintain a consistent VM/runtime
+### `Quickjs::VM`: Maintain a consistent VM/runtime
 
 ```rb
 vm = Quickjs::VM.new
@@ -72,15 +72,20 @@ vm.eval_code('a.b;') #=> "d"
 
 ```rb
 vm = Quickjs::VM.new(
-  memory_limit: 1024 * 1024,
-  max_stack_size: 1024 * 1024,
+  memory_limit: 1024 ** 3,
+  max_stack_size: 1024 ** 2,
 )
 ```
 
 ```rb
+# enable std module
+# https://bellard.org/quickjs/quickjs.html#std-module
 vm = Quickjs::VM.new(
   features: [::Quickjs::MODULE_STD],
 )
+
+# enable os module
+# https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs::VM.new(
   features: [::Quickjs::MODULE_OS],
 )
@@ -92,6 +97,17 @@ vm = Quickjs::VM.new(
 vm.dispose!
 ```
 
+#### Define a global function for JS
+
+```rb
+vm = Quickjs::VM.new
+vm.define_function("greetingTo") do |arg1|
+  ['Hello!', arg1].join(' ')
+end
+
+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).

data/ext/quickjsrb/extconf.rb

@@ -11,6 +11,7 @@ $srcs = [
   'cutils.c',
   'quickjs.c',
   'quickjs-libc.c',
+  'quickjsrb-runtime-state.c',
   'quickjsrb.c',
 ]
 

data/ext/quickjsrb/quickjsrb-runtime-state.c

@@ -0,0 +1,92 @@
+#include "quickjsrb-runtime-state.h"
+
+unsigned int hash(const char *key) {
+  unsigned long int value = 0;
+  unsigned int i = 0;
+  unsigned int key_len = strlen(key);
+
+  for (; i < key_len; ++i) {
+    value = value * 37 + key[i];
+  }
+  return value % MAX_NUM_OF_PROC;
+}
+
+ProcEntry *create_proc_entry(const char *key, VALUE proc) {
+  ProcEntry *entry = malloc(sizeof(ProcEntry));
+  entry->key = strdup(key);
+  entry->proc = proc;
+  entry->next = NULL;
+  return entry;
+}
+
+ProcEntryMap *create_proc_entries() {
+  ProcEntryMap *entryMap = malloc(sizeof(ProcEntryMap));
+  entryMap->entries = malloc(sizeof(ProcEntry *) * MAX_NUM_OF_PROC);
+  for (int i = 0; i < MAX_NUM_OF_PROC; ++i) {
+    entryMap->entries[i] = NULL;
+  }
+  return entryMap;
+}
+
+void set_proc(ProcEntryMap *entryMap, const char *key, VALUE proc) {
+  unsigned int slot = hash(key);
+  ProcEntry *entry = entryMap->entries[slot];
+
+  if (entry == NULL) {
+    entryMap->entries[slot] = create_proc_entry(key, proc);
+    return;
+  }
+
+  ProcEntry *prev;
+  while (entry != NULL) {
+    if (strcmp(entry->key, key) == 0) {
+      entry->proc = proc;
+      return;
+    }
+    prev = entry;
+    entry = prev->next;
+  }
+
+  prev->next = create_proc_entry(key, proc);
+}
+
+VALUE get_proc(ProcEntryMap *entryMap, const char *key) {
+  unsigned int slot = hash(key);
+
+  ProcEntry *entry = entryMap->entries[slot];
+
+  while (entry != NULL) {
+    if (strcmp(entry->key, key) == 0) {
+      return entry->proc;
+    }
+    entry = entry->next;
+  }
+
+  return Qnil;
+}
+
+void free_proc_entry_map(ProcEntryMap *entryMap) {
+  for (int i = 0; i < MAX_NUM_OF_PROC; ++i) {
+    ProcEntry *entry = entryMap->entries[i];
+    while (entry != NULL) {
+      ProcEntry *temp = entry;
+      entry = entry->next;
+      free(temp->key);
+      free(temp);
+    }
+  }
+  free(entryMap->entries);
+  free(entryMap);
+}
+
+QuickjsrbRuntimeState *create_quickjsrb_runtime_state() {
+  QuickjsrbRuntimeState *state = malloc(sizeof(QuickjsrbRuntimeState));
+  state->procs = create_proc_entries();
+
+  return state;
+}
+
+void free_quickjsrb_runtime_state(QuickjsrbRuntimeState *state) {
+  free_proc_entry_map(state->procs);
+  free(state);
+}

data/ext/quickjsrb/quickjsrb-runtime-state.h

@@ -0,0 +1,22 @@
+#include "ruby.h"
+
+#define MAX_NUM_OF_PROC 100
+
+typedef struct ProcEntry {
+  char *key;
+  VALUE proc;
+  struct ProcEntry *next;
+} ProcEntry;
+
+typedef struct ProcEntryMap {
+  ProcEntry **entries;
+} ProcEntryMap;
+
+typedef struct QuickjsrbRuntimeState {
+  ProcEntryMap *procs;
+} QuickjsrbRuntimeState;
+
+QuickjsrbRuntimeState *create_quickjsrb_runtime_state();
+VALUE get_proc(ProcEntryMap *entryMap, const char *key);
+void set_proc(ProcEntryMap *entryMap, const char *key, VALUE proc);
+void free_quickjsrb_runtime_state(QuickjsrbRuntimeState *state);

data/ext/quickjsrb/quickjsrb.c

@@ -1,4 +1,65 @@
 #include "quickjsrb.h"
+#include "quickjsrb-runtime-state.h"
+
+struct qvmdata {
+  char alive;
+  struct JSContext *context;
+  struct QuickjsrbRuntimeState *state;
+};
+
+void qvm_free(void* data)
+{
+  free(data);
+}
+
+size_t qvm_size(const void* data)
+{
+  return sizeof(data);
+}
+
+static const rb_data_type_t qvm_type = {
+  .wrap_struct_name = "qvm",
+  .function = {
+    .dmark = NULL,
+    .dfree = qvm_free,
+    .dsize = qvm_size,
+  },
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+VALUE qvm_alloc(VALUE self)
+{
+  struct qvmdata *data;
+
+  return TypedData_Make_Struct(self, struct qvmdata, &qvm_type, data);
+}
+
+static JSValue js_quickjsrb_call_global (JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  struct qvmdata *data = JS_GetContextOpaque(ctx);
+  JSValue maybeFuncName = JS_ToString(ctx, argv[0]);
+  const char *funcName = JS_ToCString(ctx, maybeFuncName);
+
+  VALUE proc = get_proc(data->state->procs, funcName);
+  if (proc == Qnil) {
+    return JS_NewString(ctx, "missing");
+  }
+  JS_FreeValue(ctx, maybeFuncName);
+
+  // TODO: support multiple args
+  JSValue maybeString;
+  VALUE r_array = rb_ary_new2(argc);
+  for (int i = 1; i < argc; ++i) {
+    maybeString = JS_ToString(ctx, argv[i]);
+    const char *msg = JS_ToCString(ctx, maybeString);
+    rb_ary_push(r_array, rb_str_new2(msg));
+  }
+  JS_FreeValue(ctx, maybeString);
+
+  VALUE r_result = rb_funcall(proc, rb_intern("call"), argc - 1, r_array);
+  char *result = StringValueCStr(r_result);
+  return JS_NewString(ctx, result);
+}
 
 VALUE rb_mQuickjs;
 const char *undefinedId = "undefined";
@@ -31,6 +92,13 @@ VALUE to_rb_value (JSValue jsv, JSContext *ctx) {
     return rb_str_new2(msg);
   }
   case JS_TAG_OBJECT: {
+    int promiseState = JS_PromiseState(ctx, jsv);
+    if (promiseState == JS_PROMISE_FULFILLED || promiseState == JS_PROMISE_PENDING) {
+      return to_rb_value(js_std_await(ctx, jsv), ctx);
+    } else if (promiseState == JS_PROMISE_REJECTED) {
+      return to_rb_value(JS_Throw(ctx, JS_PromiseResult(ctx, jsv)), ctx);
+    }
+
     JSValue global = JS_GetGlobalObject(ctx);
     JSValue jsonClass = JS_GetPropertyStr(ctx, global, "JSON");
     JSValue stringifyFunc = JS_GetPropertyStr(ctx, jsonClass, "stringify");
@@ -50,9 +118,28 @@ VALUE to_rb_value (JSValue jsv, JSContext *ctx) {
     return Qnil;
   case JS_TAG_UNDEFINED:
     return ID2SYM(rb_intern(undefinedId));
-  case JS_TAG_EXCEPTION:
-    rb_raise(rb_eRuntimeError, "Something happened by evaluating as JavaScript code");
+  case JS_TAG_EXCEPTION: {
+    JSValue exceptionVal = JS_GetException(ctx);
+    if (JS_IsError(ctx, 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);
+
+      rb_raise(rb_eRuntimeError, "%s: %s", errorClassName, errorClassMessage);
+    } else {
+      const char *errorMessage = JS_ToCString(ctx, exceptionVal);
+
+      rb_raise(rb_eRuntimeError, "%s", errorMessage);
+    }
+
+    JS_FreeValue(ctx, exceptionVal);
     return Qnil;
+  }
   case JS_TAG_BIG_INT: {
     JSValue toStringFunc = JS_GetPropertyStr(ctx, jsv, "toString");
     JSValue strigified = JS_Call(ctx, toStringFunc, jsv, 0, NULL);
@@ -72,39 +159,6 @@ VALUE to_rb_value (JSValue jsv, JSContext *ctx) {
   }
 }
 
-struct qvmdata {
-  struct JSContext *context;
-  char alive;
-};
-
-void qvm_free(void* data)
-{
-  free(data);
-}
-
-size_t qvm_size(const void* data)
-{
-  return sizeof(data);
-}
-
-static const rb_data_type_t qvm_type = {
-  .wrap_struct_name = "qvm",
-  .function = {
-    .dmark = NULL,
-    .dfree = qvm_free,
-    .dsize = qvm_size,
-  },
-  .data = NULL,
-  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-VALUE qvm_alloc(VALUE self)
-{
-  struct qvmdata *data;
-
-  return TypedData_Make_Struct(self, struct qvmdata, &qvm_type, data);
-}
-
 VALUE qvm_m_initialize(int argc, VALUE* argv, VALUE self)
 {
   VALUE r_opts;
@@ -120,9 +174,13 @@ VALUE qvm_m_initialize(int argc, VALUE* argv, VALUE self)
 
   struct qvmdata *data;
   TypedData_Get_Struct(self, struct qvmdata, &qvm_type, data);
+
+  QuickjsrbRuntimeState *state= create_quickjsrb_runtime_state();
   JSRuntime *runtime = JS_NewRuntime();
   data->context = JS_NewContext(runtime);
+  data->state = state;
   data->alive = 1;
+  JS_SetContextOpaque(data->context, data);
 
   JS_SetMemoryLimit(runtime, NUM2UINT(r_memoryLimit));
   JS_SetMaxStackSize(runtime, NUM2UINT(r_maxStackSize));
@@ -152,6 +210,15 @@ VALUE qvm_m_initialize(int argc, VALUE* argv, VALUE self)
     JS_FreeValue(data->context, osEval);
   }
 
+  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;
 }
 
@@ -172,6 +239,35 @@ VALUE qvm_m_evalCode(VALUE self, VALUE r_code)
   return result;
 }
 
+VALUE qvm_m_defineGlobalFunction(VALUE self, VALUE r_name)
+{
+  rb_need_block();
+
+  struct qvmdata *data;
+  TypedData_Get_Struct(self, struct qvmdata, &qvm_type, data);
+
+  if (rb_block_given_p()) {
+    VALUE proc = rb_block_proc();
+
+    char *funcName = StringValueCStr(r_name);
+
+    set_proc(data->state->procs, funcName, 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);
+    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);
+    return rb_funcall(r_name, rb_intern("to_sym"), 0, NULL);
+  }
+
+  return Qnil;
+}
+
 VALUE qvm_m_dispose(VALUE self)
 {
   struct qvmdata *data;
@@ -179,6 +275,7 @@ VALUE qvm_m_dispose(VALUE self)
 
   JSRuntime *runtime = JS_GetRuntime(data->context);
   js_std_free_handlers(runtime);
+  free_quickjsrb_runtime_state(data->state);
   JS_FreeContext(data->context);
   JS_FreeRuntime(runtime);
   data->alive = 0;
@@ -201,5 +298,6 @@ Init_quickjsrb(void)
   rb_define_alloc_func(vmClass, qvm_alloc);
   rb_define_method(vmClass, "initialize", qvm_m_initialize, -1);
   rb_define_method(vmClass, "eval_code", qvm_m_evalCode, 1);
+  rb_define_method(vmClass, "define_function", qvm_m_defineGlobalFunction, 1);
   rb_define_method(vmClass, "dispose!", qvm_m_dispose, 0);
 }

data/lib/quickjs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickjs
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - hmsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -62,6 +62,8 @@ files:
 - ext/quickjsrb/quickjs/run-test262.c
 - ext/quickjsrb/quickjs/unicode_gen.c
 - ext/quickjsrb/quickjs/unicode_gen_def.h
+- ext/quickjsrb/quickjsrb-runtime-state.c
+- ext/quickjsrb/quickjsrb-runtime-state.h
 - ext/quickjsrb/quickjsrb.c
 - ext/quickjsrb/quickjsrb.h
 - lib/quickjs.rb