quickjs 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a639b7afafb5c155725cba8d7927b7f4e146e21369a65a3902e8fe23ef1e3dd
-  data.tar.gz: b0e098ae6c193e761f456642cdcaf5396251785d5bc56b5e807fd540a0615f87
+  metadata.gz: 558b76a18b29f977c09990bec267141fb9feae1f04ddd4265971c7c24e823b9b
+  data.tar.gz: b2dbe1a4a121e92e7f1792690fe755ce021091a4ff402a773b9853c885256dcc
 SHA512:
-  metadata.gz: 9ad93ee1c056d68409daeba63515b8afa8555150044e0543a97bb2f3cb64abf5b8f5a5b1fce75e952721b0277a7807ce521289b70b63157cc489032da7da8f7c
-  data.tar.gz: b36a5f2e7402156e94403c5110ec1acc6141d657b236562b18b57c63c68fd966d4ef25096e3b515f9633093bee2e2a89f65578b4426e0c4184197078c9c2c578
+  metadata.gz: 338bc63e7590c7043cf86c7045f3e93c8269110d3daf49be87ef6477cd99086700a6c0a26dcdc8cf7eb2ce43acc025c419812eeb23ab0b155b59ddd335454db5
+  data.tar.gz: cb075876cdc10e081b95c40882acbe7ed272dacca56050564888a8df5a68c058c31fa61d9151bddf794d6846c1f00052ae74e3d439c493761bf47154f6fcfdc2

data/README.md

@@ -89,6 +89,11 @@ vm = Quickjs::VM.new(
 vm = Quickjs::VM.new(
   features: [::Quickjs::MODULE_OS],
 )
+
+# `eval_code` will be interrupted after 1 sec (default: 100 msec)
+vm = Quickjs::VM.new(
+  timeout_msec: 1_000,
+)
 ```
 
 #### Dispose VM explicitly

data/ext/quickjsrb/quickjsrb.c

@@ -1,10 +1,15 @@
 #include "quickjsrb.h"
 
+typedef struct EvalTime {
+  clock_t limit;
+  clock_t started_at;
+} EvalTime;
+
 typedef struct VMData {
   char alive;
   struct JSContext *context;
-  struct QuickjsrbRuntimeState *state;
   struct ProcEntryMap *procs;
+  struct EvalTime *eval_time;
 } VMData;
 
 void vm_free(void* data)
@@ -123,7 +128,7 @@ VALUE to_rb_value(JSValue jsv, JSContext *ctx) {
   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);
+      return to_rb_value(js_std_await(ctx, jsv), ctx); // should have timeout
     } else if (promiseState == JS_PROMISE_REJECTED) {
       return to_rb_value(JS_Throw(ctx, JS_PromiseResult(ctx, jsv)), ctx);
     }
@@ -215,6 +220,8 @@ VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
   if (NIL_P(r_maxStackSize)) r_maxStackSize = 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();
+  VALUE r_timeout_msec = rb_hash_aref(r_opts, ID2SYM(rb_intern("timeout_msec")));
+  if (NIL_P(r_timeout_msec)) r_timeout_msec= UINT2NUM(100);
 
   VMData *data;
   TypedData_Get_Struct(self, VMData, &vm_type, data);
@@ -222,6 +229,10 @@ VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
   JSRuntime *runtime = JS_NewRuntime();
   data->context = JS_NewContext(runtime);
   data->procs = create_proc_entries();
+
+  EvalTime *eval_time = malloc(sizeof(EvalTime));
+  data->eval_time = eval_time;
+  data->eval_time->limit = (clock_t)(CLOCKS_PER_SEC * NUM2UINT(r_timeout_msec) / 1000);
   data->alive = 1;
   JS_SetContextOpaque(data->context, data);
 
@@ -265,6 +276,11 @@ VALUE vm_m_initialize(int argc, VALUE* argv, VALUE self)
   return self;
 }
 
+static int interrupt_handler(JSRuntime *runtime, void *opaque) {
+	EvalTime *eval_time = opaque;
+	return clock() >= eval_time->started_at + eval_time->limit ? 1 : 0;
+}
+
 VALUE vm_m_evalCode(VALUE self, VALUE r_code)
 {
   VMData *data;
@@ -274,6 +290,10 @@ VALUE vm_m_evalCode(VALUE self, VALUE r_code)
     rb_raise(rb_eRuntimeError, "Quickjs::VM was disposed");
     return Qnil;
   }
+
+  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);
@@ -317,6 +337,7 @@ VALUE vm_m_dispose(VALUE self)
   TypedData_Get_Struct(self, VMData, &vm_type, data);
 
   JSRuntime *runtime = JS_GetRuntime(data->context);
+  JS_SetInterruptHandler(runtime, NULL, NULL);
   js_std_free_handlers(runtime);
   free_proc_entry_map(data->procs);
   JS_FreeContext(data->context);

data/ext/quickjsrb/quickjsrb.h

@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 #include "procs.h"
 

data/lib/quickjs/version.rb

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

metadata

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