isomorfeus-speednode 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6853c585356e8829a315a146dbf12f7625f90eb2d23683147279c5eab581fe4f
-  data.tar.gz: 7fd22dc8309c7d25685cc921853ac52f9ed342dac22ab71883226c2525ca48a0
+  metadata.gz: 91aa4cb54a3cb13afcf15476f841f711ce8de37c0573dfcdbd535aeda3a5dcbd
+  data.tar.gz: 4f1f9ccd06769d21ea4f25171cf128a69d8e4ea942f4417b10413f0df830b944
 SHA512:
-  metadata.gz: 67668d00cf0294ed3df27c4992e95f671799cfea181cb01b33ed4c789870a7e3ab1f953c0d09e0010a8e119e6f5101aa6a31716f54d1498ca1ea5e83bfebc486
-  data.tar.gz: 2ea56bc9974145a6c1bab593c15001e9f7e56edb432ee38a656c2f88087ebb6935ed0f5653f4841bd362d0a70a601e01a55dcedcd9986bf5c5bae6de8257429e
+  metadata.gz: ae92dbfa6c44909c8d9b27392cab6ae86854d25343074441b5b5657c54d36bbc5bf332b19c25fd9694f2a58d75abfdc859982cf79a08a7128916943e40c04ae3
+  data.tar.gz: b68a5bd5ebc54b333c67918f6a0a51f8fe871d5607c6b36b987163dd195243b1cb21181e4f52f714528b381ea7a81f43160b5327ddbf4380472cfc58daece9f2

data/README.md

@@ -53,6 +53,13 @@ Evaluation in a permissive context:
 ExecJS.permissive_eval('1+1')
 ```
 
+#### Stopping Contexts
+Contexts can be stopped programmatically. If all contexts of a VM are stopped, the VM itself will be shut down with Node exiting, freeing memory and resources.
+```ruby
+context = ExecJS.compile('Test = "test"') # will start a node process
+ExecJS::Runtimes::Speednode.stop_context(context) # will kill the node process
+```
+
 ### Precompiling and Storing scripts for repeated execution
 
 Scripts can be precompiled and stored for repeated execution, which leads to a significant performance improvement, especially for larger scripts:

data/lib/isomorfeus/speednode/runner.js

@@ -132,6 +132,13 @@ CircularJSON.stringify = function stringify(value, replacer, space, doNotResolve
   };
 /*** end of circular-json ***/
 
+// serialize Map as Object, also below in attach
+function simple_map_replacer(key, value) {
+  if (value && typeof value === 'object' && value.constructor.name === "Map")
+    return Object.fromEntries(value);
+  return value;
+}
+
 function attachFunctionSource(responder_path, context, func) {
   return `${func} = async function(...method_args) {
     let context = '${context}';
@@ -158,8 +165,13 @@ function attachFunctionSource(responder_path, context, func) {
         }, 10)
       });
     }
+    function simple_map_replacer(key, value) {
+      if (value && typeof value === 'object' && value.constructor.name === "Map")
+        return Object.fromEntries(value);
+      return value;
+    }
     return new Promise(function(resolve, reject) {
-      let request_json = JSON.stringify(request);
+      let request_json = JSON.stringify(request, simple_map_replacer);
       let buffer = Buffer.alloc(0);
       let socket = net.connect(responder_path);
       socket.setTimeout(2000);
@@ -228,18 +240,15 @@ function getContext(uuid) {
 
 function getContextOptions(uuid) {
   let options = { filename: "(execjs)", displayErrors: true };
-  if (contexts[uuid].options.timeout) {
+  if (contexts[uuid].options.timeout)
     options.timeout = contexts[uuid].options.timeout;
-  }
   return options;
 }
 
 function massageStackTrace(stack) {
-  if (stack && stack.indexOf("SyntaxError") == 0) {
+  if (stack && stack.indexOf("SyntaxError") == 0)
       return "(execjs):1\n" + stack;
-  } else {
-      return stack;
-  }
+  return stack;
 }
 
 let socket_path = process.env.SOCKET_PATH;
@@ -300,7 +309,7 @@ let commands = {
     deleteContext: function(uuid) {
         delete contexts[uuid];
         delete scripts[uuid]
-        return [1];
+        return ['ok', Object.keys(contexts).length];
     },
     exit: function(code) {
         process_exit = code;
@@ -384,9 +393,9 @@ let server = net.createServer(function(s) {
           return;
         }
 
-        try { outputJSON = JSON.stringify(result); }
+        try { outputJSON = JSON.stringify(result, simple_map_replacer); }
         catch(err) {
-            if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result); }
+            if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result, simple_map_replacer); }
             else { outputJSON = JSON.stringify([['', err].join(''), err.stack]); }
             s.write([outputJSON, "\x04"].join(''));
             if (process_exit !== false) { process.exit(process_exit); }

data/lib/isomorfeus/speednode/runtime/context.rb

@@ -4,22 +4,20 @@ module Isomorfeus
       class Context < ::ExecJS::Runtime::Context
         def self.finalize(runtime, uuid)
           proc do
-            runtime.vm.delete_context(uuid) rescue nil # if delete_context fails, the vm exited before probably
+            runtime.unregister_context(uuid)
           end
         end
 
         def initialize(runtime, source = "", options = {})
           @runtime = runtime
           @uuid = SecureRandom.uuid
+          @runtime.register_context(@uuid, self)
           @permissive = !!options.delete(:permissive)
           @debug = @permissive ? !!options.delete(:debug) { false } : false
           @debug = false unless ENV['NODE_OPTIONS']&.include?('--inspect')
           @vm = @runtime.vm
-          @context = nil
           @timeout = options[:timeout] ? options[:timeout]/1000 : 600
-
-          ObjectSpace.define_finalizer(self, self.class.finalize(@runtime, @uuid))
-
+          
           filename = options.delete(:filename)
           source = File.read(filename) if filename
 
@@ -28,6 +26,9 @@ module Isomorfeus
           rescue
             source = source.force_encoding('UTF-8')
           end
+
+          ObjectSpace.define_finalizer(self, self.class.finalize(@runtime, @uuid))
+
           if @debug && @permissive
             raw_created(source, options)
           elsif @permissive
@@ -35,7 +36,8 @@ module Isomorfeus
           else
             raw_create(source, options)
           end
-          self.add_script(key: :_internal_exec_fin, source: '!global.__LastExecutionFinished')
+
+          add_script(key: :_internal_exec_fin, source: '!global.__LastExecutionFinished')
         end
 
         # def options
@@ -104,6 +106,10 @@ module Isomorfeus
           raw_exec("(function(){#{source}})()")
         end
 
+        def stop
+          @runtime.unregister_context(@uuid)
+        end
+
         protected
 
         def raw_bench(source)
@@ -119,26 +125,20 @@ module Isomorfeus
         end
 
         def raw_create(source, options)
-          return if @context
           source = encode(source)
           result = @vm.create(@uuid, source, options)
-          @context = true
           extract_result(result)
         end
 
         def raw_created(source, options)
-          return if @context
           source = encode(source)
           result = @vm.created(@uuid, source, options)
-          @context = true
           extract_result(result)
         end
 
         def raw_createp(source, options)
-          return if @context
           source = encode(source)
           result = @vm.createp(@uuid, source, options)
-          @context = true
           extract_result(result)
         end
 
@@ -165,7 +165,7 @@ module Isomorfeus
         end
 
         def await_result
-          start_time = Time.now
+          start_time = ::Time.now
           while eval_script(key: :_internal_exec_fin) && !timed_out?(start_time)
             sleep 0.005
           end
@@ -193,7 +193,7 @@ module Isomorfeus
         end
 
         def timed_out?(start_time)
-          if (Time.now - start_time) > @timeout
+          if (::Time.now - start_time) > @timeout
             raise "IsomorfeusSpeednode: Command Execution timed out!"
           end
           false

data/lib/isomorfeus/speednode/runtime/vm.rb

@@ -5,7 +5,7 @@ if Gem.win_platform?
   module Win32
     class Pipe
       def write(data)
-        bytes = FFI::MemoryPointer.new(:ulong)
+        bytes = ::FFI::MemoryPointer.new(:ulong)
 
         raise Error, "no pipe created" unless @pipe
 
@@ -41,20 +41,6 @@ module Isomorfeus
   module Speednode
     class Runtime < ExecJS::Runtime
       class VM
-        attr_reader :responder
-
-        def initialize(options)
-          @mutex = Thread::Mutex.new
-          @socket_path = nil
-          @options = options
-          @started = false
-          @socket = nil
-        end
-
-        def started?
-          @started
-        end
-
         def self.finalize(socket, socket_dir, socket_path, pid)
           proc do
             Isomorfeus::Speednode::Runtime.responders[socket_path].kill if Isomorfeus::Speednode::Runtime.responders[socket_path]
@@ -79,6 +65,20 @@ module Isomorfeus
           nil
         end
 
+        attr_reader :responder
+
+        def initialize(options)
+          @mutex = ::Thread::Mutex.new
+          @socket_path = nil
+          @options = options
+          @started = false
+          @socket = nil
+        end
+
+        def started?
+          @started
+        end
+
         def evsc(context, key)
           command('evsc', { 'context' => context, 'key' => key })
         end
@@ -134,6 +134,16 @@ module Isomorfeus
           end
         end
 
+        def stop
+          return unless @started
+          @mutex.synchronize do
+            self.class.exit_node(@socket, @socket_dir, @socket_path, @pid)
+            @socket_path = nil
+            @started = false
+            @socket = nil
+          end
+        end
+
         private
 
         def start_without_synchronization

data/lib/isomorfeus/speednode/runtime/vm_command.rb

@@ -15,7 +15,7 @@ module Isomorfeus
           bytes_to_send = message.bytesize
           sent_bytes = 0
 
-          if ExecJS.windows?
+          if ::ExecJS.windows?
             @socket.write(message)
             begin
               result << @socket.read

data/lib/isomorfeus/speednode/runtime.rb

@@ -19,14 +19,30 @@ module Isomorfeus
         @name        = options[:name]
         @binary      = Isomorfeus::Speednode::NodeCommand.cached(options[:command])
         @runner_path = options[:runner_path]
+        @vm = VM.new(binary: @binary, source_maps: '--enable-source-maps', runner_path: @runner_path)
         @encoding    = options[:encoding]
         @deprecated  = !!options[:deprecated]
-
-        @vm = VM.new(binary: @binary, source_maps: '--enable-source-maps', runner_path: @runner_path)
-
         @popen_options = {}
         @popen_options[:external_encoding] = @encoding if @encoding
         @popen_options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
+        @contexts = {} 
+      end
+
+      def register_context(uuid, context)
+        @contexts[uuid] = context
+      end
+
+      def unregister_context(uuid)
+        context = @contexts.delete(uuid)
+        if context && @vm
+          ObjectSpace.undefine_finalizer(context)
+          _ok, cc = @vm.delete_context(uuid) rescue nil # if delete_context fails, the vm exited before probably
+        end
+        @vm.stop if @contexts.size == 0 && @vm.started?
+      end
+
+      def stop_context(context)
+        unregister_context(context.instance_variable_get(:@uuid))
       end
 
       def available?

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.6.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs