consolidate flags to use Ruby-made setTimeout

Author: hmsk

README.md

@@ -58,8 +58,8 @@ vm = Quickjs.eval_code(features: [::Quickjs::MODULE_STD])
 # Enable `os` module by quickjs: https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs.eval_code(features: [::Quickjs::MODULE_OS])
 
-# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
-vm = Quickjs.eval_code(features: [::Quickjs::FEATURES_TIMEOUT])
+# Provide `setTimeout` managed by CRuby
+vm = Quickjs.eval_code(features: [::Quickjs::FEATURE_TIMEOUT])
 
 # Inject the polyfill of Intl
 vm = Quickjs.eval_code(features: [::Quickjs::POLYFILL_INTL])
@@ -98,8 +98,8 @@ vm = Quickjs::VM.new(features: [::Quickjs::MODULE_STD])
 # Enable `os` module by quickjs: https://bellard.org/quickjs/quickjs.html#os-module
 vm = Quickjs::VM.new(features: [::Quickjs::MODULE_OS])
 
-# Expose `os.setTimouet` and `os.clearTimeout` from `os` module
-vm = Quickjs::VM.new(features: [::Quickjs::FEATURES_TIMEOUT])
+# Provide `setTimeout` managed by CRuby
+vm = Quickjs::VM.new(features: [::Quickjs::FEATURE_TIMEOUT])
 
 # Inject the polyfill of Intl
 vm = Quickjs::VM.new(features: [::Quickjs::POLYFILL_INTL])

ext/quickjsrb/quickjsrb.c

@@ -542,22 +542,7 @@ static VALUE vm_m_initialize(int argc, VALUE *argv, VALUE r_self)
     JSValue j_osEval = JS_Eval(data->context, enableOs, strlen(enableOs), "<vm>", JS_EVAL_TYPE_MODULE);
     JS_FreeValue(data->context, j_osEval);
   }
-  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureOsTimeoutId))))
-  {
-    char *filename = random_string();
-    js_init_module_os(data->context, filename); // Better if this is limited just only for setTimeout and clearTimeout
-    const char *enableTimeoutTemplate = "import * as _os from '%s';\n"
-                                        "globalThis.setTimeout = _os.setTimeout;\n"
-                                        "globalThis.clearTimeout = _os.clearTimeout;\n";
-    int length = snprintf(NULL, 0, enableTimeoutTemplate, filename);
-    char *enableTimeout = (char *)malloc(length + 1);
-    snprintf(enableTimeout, length + 1, enableTimeoutTemplate, filename);
-
-    JSValue j_timeoutEval = JS_Eval(data->context, enableTimeout, strlen(enableTimeout), "<vm>", JS_EVAL_TYPE_MODULE);
-    free(enableTimeout);
-    JS_FreeValue(data->context, j_timeoutEval);
-  }
-  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureOsTimeoutBetaId))))
+  else if (RTEST(rb_funcall(r_features, rb_intern("include?"), 1, QUICKJSRB_SYM(featureTimeoutId))))
   {
     JS_SetPropertyStr(
         data->context, j_global, "setTimeout",

ext/quickjsrb/quickjsrb.h

@@ -17,8 +17,7 @@ extern const uint8_t qjsc_polyfill_intl_en_min;
 
 const char *featureStdId = "feature_std";
 const char *featureOsId = "feature_os";
-const char *featureOsTimeoutId = "feature_os_timeout";
-const char *featureOsTimeoutBetaId = "feature_os_timeout_beta";
+const char *featureTimeoutId = "feature_timeout";
 const char *featurePolyfillIntlId = "feature_polyfill_intl";
 
 const char *undefinedId = "undefined";
@@ -137,8 +136,7 @@ static void r_define_constants(VALUE r_parent_class)
 {
   rb_define_const(r_parent_class, "MODULE_STD", QUICKJSRB_SYM(featureStdId));
   rb_define_const(r_parent_class, "MODULE_OS", QUICKJSRB_SYM(featureOsId));
-  rb_define_const(r_parent_class, "FEATURES_TIMEOUT", QUICKJSRB_SYM(featureOsTimeoutId));
-  rb_define_const(r_parent_class, "FEATURES_TIMEOUT_BETA", QUICKJSRB_SYM(featureOsTimeoutBetaId));
+  rb_define_const(r_parent_class, "FEATURE_TIMEOUT", QUICKJSRB_SYM(featureTimeoutId));
   rb_define_const(r_parent_class, "POLYFILL_INTL", QUICKJSRB_SYM(featurePolyfillIntlId));
 
   VALUE rb_cQuickjsValue = rb_define_class_under(r_parent_class, "Value", rb_cObject);

test/blocking_test.rb

@@ -82,7 +82,7 @@ class ProcessBlocking < QuickjsBlockingTest
 
   class RubyBasedTimeout < QuickjsBlockingTest
     setup do
-      @vm = Quickjs::VM.new(timeout_msec: 500, features: [::Quickjs::FEATURES_TIMEOUT_BETA])
+      @vm = Quickjs::VM.new(timeout_msec: 500, features: [::Quickjs::FEATURE_TIMEOUT])
     end
     teardown { @vm = nil }
 

test/quickjs_test.rb

@@ -146,10 +146,10 @@ class Exceptions < QuickjsTest
     assert_equal(::Quickjs.eval_code("!!os.kill", { features: [::Quickjs::MODULE_OS] }), true)
   end
 
-  test "js timeout funcs can be injected" do
+  test "only setTimeout is provided per the flag" do
     assert_code("typeof setTimeout === 'undefined'", true)
-    assert_code("typeof clearTimeout === 'undefined'", true)
-    assert_equal(::Quickjs.eval_code("!!setTimeout && !!clearTimeout", { features: [::Quickjs::FEATURES_TIMEOUT] }), true)
+    # assert_code("typeof clearTimeout === 'undefined'", true)
+    assert_equal(::Quickjs.eval_code("typeof setTimeout", { features: [::Quickjs::FEATURE_TIMEOUT] }), 'function')
   end
 
   class QuickjsPolyfillIntlTest < Test::Unit::TestCase