isomorfeus-speednode 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676da9269c67e955ccfe546dbbbc82bf079e796d1070dd8d699c6523dbc537ba
-  data.tar.gz: b78918192805e28a455e9c5d45594fdc3b683d93ddc6f0a38f13207afecb808a
+  metadata.gz: d163fe97b50cb3d23b187a384ccd95aedd2d11e7092db7e2e2866b9f882427c5
+  data.tar.gz: a95a2273adf37112ff71263470b4dd69843e45ad69ec730611defafe20e95d02
 SHA512:
-  metadata.gz: b933335621ed51658ade944312fea14e1a8b89ec71585e4b99a46fe3a2dc6c94ccc073f6013281ed19ad07d889e91a09bfad75784c9f5004c8a35e3124b4dd2f
-  data.tar.gz: 17c4dd51349c07013c961d714daee25f06c524edae7bb876cc0c78f7eda9519ea8be8c966840b86a08f019ef6b44540b31af09d52e5e8fd36c2576a84b702c44
+  metadata.gz: 9f8070f27aec93fa9c9059f269662a1168f2544c5c97095a472f1b1e29b55bf5d564ecd334c203146bfb9923e90a8cd94d7ea3cc0cd1a8da436f2f44cd0f73f5
+  data.tar.gz: 05e284e4800da68388373a80620874bd624719e1baaac94633d8c61919c8c1bf4b696a6fc256eb90bfe640927a0305124306e14288483289feabb11eba439345

data/README.md

@@ -53,7 +53,7 @@ Evaluation in a permissive context:
 ExecJS.permissive_eval('1+1')
 ```
 
-### Storing scripts for repeated execution
+### 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:
 ```ruby
@@ -61,6 +61,7 @@ context = ExecJS.compile('Test = "test"')
 context.add_script(key: 'super', source: some_large_javascript) # will compile and store the script
 context.eval_script(:key: 'super') # will run the precompiled script in the context
 ```
+For the actual performance benefit see below.
 
 ### Async function support
 
@@ -95,21 +96,24 @@ Attaching and calling ruby methods to/from permissive contexts is not that fast.
 
 Highly scientific, maybe.
 
-1000 rounds using node 16.6.2.:
+1000 rounds using node 16.14.0 on linux (ctx = using context, scsc = using precompiled scripts):
 ```
 standard ExecJS CoffeeScript eval benchmark:
-                                          user     system      total        real
-Isomorfeus Speednode Node.js (V8) Windows 0.079000   0.031000   0.110000 (  0.518821)
-Isomorfeus Speednode Node.js (V8) Linux   0.092049   0.039669   0.131718 (  0.546846)
-mini_racer (V8) 0.4.0 Linux only          0.776317   0.062923   0.839240 (  0.480490)
-Node.js (V8) Linux                        0.330156   0.354536  52.523972 ( 51.203355)
-
-evel overhead benchmark:
-                                          user     system      total        real
-Isomorfeus Speednode Node.js (V8) Windows 0.032000   0.031000   0.063000 (  0.227634)
-Isomorfeus Speednode Node.js (V8) Linux   0.085135   0.022002   0.107137 (  0.153055)
-mini_racer (V8) 0.4.0 Linux only          0.083562   0.115612   0.199174 (  0.128455)
-Node.js (V8) Linux                        0.273238   0.265101  30.169976 ( 29.636668)
+                                            user     system      total        real
+Isomorfeus Speednode Node.js (V8):      0.086443   0.061089   0.147532 (  0.567715)
+Isomorfeus Speednode Node.js (V8) ctx:  0.080821   0.047469   0.128290 (  0.468664)
+Isomorfeus Speednode Node.js (V8) scsc: 0.089423   0.046541   0.135964 (  0.381198) <- fastest
+mini_racer (V8):                        0.723352   0.179944   0.903296 (  0.513696)
+mini_racer (V8) ctx:                    0.475681   0.226101   0.701782 (  0.429463)
+
+eval overhead benchmark:
+                                            user     system      total        real
+Isomorfeus Speednode Node.js (V8):      0.028312   0.062895   0.091207 (  0.199176)
+Isomorfeus Speednode Node.js (V8) ctx:  0.061245   0.027093   0.088338 (  0.183092)
+Isomorfeus Speednode Node.js (V8) scsc: 0.061062   0.019203   0.080265 (  0.107898) <- fastest
+mini_racer (V8):                        0.103914   0.092251   0.196165 (  0.125081)
+mini_racer (V8) ctx:                    0.120440   0.060329   0.180769 (  0.112695)
+
 ```
 minify discourse benchmark from mini_racer:
 ```

data/lib/isomorfeus/execjs_module.rb

@@ -1,5 +1,9 @@
 module ExecJS
   class << self
+    def permissive_bench(source, options = {})
+      runtime.permissive_bench(source, options)
+    end
+
     def permissive_exec(source, options = {})
       runtime.permissive_exec(source, options)
     end

data/lib/isomorfeus/execjs_runtime.rb

@@ -1,6 +1,11 @@
 module ExecJS
   # Abstract base class for runtimes
   class Runtime
+    def permissive_bench(source, options = {})
+      context = permissive_compile("", options)
+      context.bench(source, options)
+    end
+
     def permissive_exec(source, options = {})
       context = permissive_compile("", options)
       context.exec(source, options)

data/lib/isomorfeus/speednode/attach_pipe.rb

@@ -10,9 +10,9 @@ module Isomorfeus
       ERROR_IO_PENDING      = 997
       ERROR_PIPE_CONNECTED  = 535
       ERROR_SUCCESS         = 0
-      
+
       FILE_FLAG_OVERLAPPED  = 0x40000000
-      
+
       INFINITE              = 0xFFFFFFFF
       INVALID_HANDLE_VALUE  = FFI::Pointer.new(-1).address
 
@@ -91,7 +91,7 @@ module Isomorfeus
         overlap[:hEvent] = @events[0]
 
         @pipe = { overlap: overlap, instance: nil, request: FFI::Buffer.new(1, BUFFER_SIZE), bytes_read: 0, reply: FFI::Buffer.new(1, BUFFER_SIZE), bytes_to_write: 0, state: nil, pending_io: false }
-        @pipe[:instance] = CreateNamedPipe(@full_pipe_name, 
+        @pipe[:instance] = CreateNamedPipe(@full_pipe_name,
                                           PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
                                           PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
                                           4,
@@ -102,7 +102,7 @@ module Isomorfeus
         raise "CreateNamedPipe failed with #{GetLastError()}" if @pipe[:instance] == INVALID_HANDLE_VALUE
         @pipe[:pending_io] = connect_to_new_client
         @pipe[:state] = @pipe[:pending_io] ? CONNECTING_STATE : READING_STATE
-        
+
         @events_pointer.write_array_of_ulong_long(@events)
         nil
       end
@@ -194,9 +194,9 @@ module Isomorfeus
       def disconnect_and_reconnect
         FlushFileBuffers(@pipe[:instance])
         STDERR.puts("DisconnectNamedPipe failed with #{GetLastError()}") if !DisconnectNamedPipe(@pipe[:instance])
-    
+
         @pipe[:pending_io] = connect_to_new_client
-        
+
         @pipe[:state] = @pipe[:pending_io] ? CONNECTING_STATE : READING_STATE
       end
 
@@ -207,7 +207,7 @@ module Isomorfeus
         connected = ConnectNamedPipe(@pipe[:instance], @pipe[:overlap].to_ptr)
         last_error = GetLastError()
         raise "ConnectNamedPipe failed with #{last_error} - #{connected}" if connected != 0
-        
+
         case last_error
         when ERROR_IO_PENDING
           pending_io = true

data/lib/isomorfeus/speednode/attach_socket.rb

@@ -29,9 +29,8 @@ module Isomorfeus
             rescue Errno::EAGAIN, Errno::EWOULDBLOCK
             end
           end
-          sleep 0.005
           ret = begin
-                  IO.select([@socket], nil, nil, 1) || next
+                  IO.select([@socket], nil, nil, nil) || next
                 rescue Errno::EBADF
                 end
         end
@@ -43,4 +42,4 @@ module Isomorfeus
       end
     end
   end
-end
+end

data/lib/isomorfeus/speednode/runner.js

@@ -201,6 +201,7 @@ function attachFunctionSource(responder_path, context, func) {
 function createCompatibleContext(uuid, options) {
     let c = vm.createContext();
     vm.runInContext('delete this.console', c, "(execjs)");
+    vm.runInContext('delete this.gc', c, "(execjs)");
     contexts[uuid] = { context: c, options: options };
     return c;
 }
@@ -243,6 +244,18 @@ function massageStackTrace(stack) {
 
 let socket_path = process.env.SOCKET_PATH;
 if (!socket_path) { throw 'No SOCKET_PATH given!'; };
+let debug_contexts = [];
+let commands_swapped = false;
+
+function swap_commands(c) {
+  c.oexec = c.exec;
+  c.exec = c.execd;
+  c.oeval = c.eval;
+  c.eval = c.evald;
+  c.oevsc = c.evsc;
+  c.evsc = c.evscd;
+  commands_swapped = true;
+}
 
 let commands = {
     attach: function(input) {
@@ -253,11 +266,32 @@ let commands = {
       let result = vm.runInContext(attachFunctionSource(responder_path, input.context, input.func), context, { filename: "(execjs)", displayErrors: true });
       return formatResult(result);
     },
+    bench: function (input) {
+      if (typeof global.gc === "function") { global.gc(); }
+      let context = getContext(input.context);
+      let options = getContextOptions(input.context);
+      performance.mark('start_bench');
+      let result = vm.runInContext(input.source, context, options);
+      performance.mark('stop_bench');
+      let duration = performance.measure('bench_time', 'start_bench', 'stop_bench').duration;
+      performance.clearMarks();
+      performance.clearMeasures();
+      if (typeof global.gc === "function") { global.gc(); }
+      return formatResult({ result: result, duration: duration });
+    },
     create: function (input) {
       let context = createCompatibleContext(input.context, input.options);
       let result = vm.runInContext(input.source, context, getContextOptions(input.context));
       return formatResult(result);
     },
+    created: function (input) {
+      debug_contexts.push(input.context);
+      if (!commands_swapped) {
+        swap_commands(commands);
+        let result = eval(input.source);
+        return formatResult(result);
+      } else { return formatResult(true) }
+    },
     createp: function (input) {
       let context = createPermissiveContext(input.context, input.options);
       let result = vm.runInContext(input.source, context, getContextOptions(input.context));
@@ -276,12 +310,30 @@ let commands = {
         let result = vm.runInContext(input.source, getContext(input.context), getContextOptions(input.context));
         return formatResult(result);
     },
+    execd: function(input) {
+      if (debug_contexts.includes(input.context)) {
+        let result = eval(input.source);
+        return formatResult(result);
+      } else {
+        return commands.oexec(input);
+      }
+    },
     eval: function (input) {
       if (input.source.match(/^\s*{/)) { input.source = "(" + input.source + ")"; }
       else if (input.source.match(/^\s*function\s*\(/)) { input.source = "(" + input.source + ")"; }
       let result = vm.runInContext(input.source, getContext(input.context), getContextOptions(input.context));
       return formatResult(result);
     },
+    evald: function(input) {
+      if (debug_contexts.includes(input.context)) {
+        if (input.source.match(/^\s*{/)) { input.source = "(" + input.source + ")"; }
+        else if (input.source.match(/^\s*function\s*\(/)) { input.source = "(" + input.source + ")"; }
+        let result = eval(input.source);
+        return formatResult(result);
+      } else {
+        return commands.oeval(input);
+      }
+    },
     scsc: function (input) {
       if (!scripts[input.context]) { scripts[input.context] = {}; }
       scripts[input.context][input.key] = new vm.Script(input.source);
@@ -291,6 +343,14 @@ let commands = {
       let result = scripts[input.context][input.key].runInContext(getContext(input.context));
       return formatResult(result);
     },
+    evscd: function(input) {
+      if (debug_contexts.includes(input.context)) {
+        let result = scripts[input.context][input.key].runInThisContext();
+        return formatResult(result);
+      } else {
+        return commands.oevsc(input);
+      }
+    }
     // ctxo: function (input) {
     //   return formatResult(getContextOptions(input.context));
     // },
@@ -304,7 +364,7 @@ let server = net.createServer(function(s) {
         if (data[data.length - 1] !== 4) { return; }
 
         let request = received_data.join('').toString('utf8');
-        request = request.substr(0, request.length - 1);
+        request = request.substring(0, request.length - 1);
         received_data = [];
 
         let input, result;
@@ -317,7 +377,7 @@ let server = net.createServer(function(s) {
           return;
         }
 
-        try { result = commands[input.cmd].apply(null, input.args); }
+        try { result = commands[input.cmd](input.args); }
         catch (err) {
           outputJSON = JSON.stringify(['err', ['', err].join(''), massageStackTrace(err.stack)]);
           s.write([outputJSON, "\x04"].join(''));

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

@@ -3,13 +3,17 @@ module Isomorfeus
     class Runtime < ExecJS::Runtime
       class Context < ::ExecJS::Runtime::Context
         def self.finalize(runtime, uuid)
-          proc { runtime.vm.delete_context(uuid) }
+          proc do
+            runtime.vm.delete_context(uuid) rescue nil # if delete_context fails, the vm exited before probably
+          end
         end
 
         def initialize(runtime, source = "", options = {})
           @runtime = runtime
           @uuid = SecureRandom.uuid
           @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
@@ -24,8 +28,14 @@ module Isomorfeus
           rescue
             source = source.force_encoding('UTF-8')
           end
-
-          @permissive ? raw_createp(source, options) : raw_create(source, options)
+          if @debug && @permissive
+            raw_created(source, options)
+          elsif @permissive
+            raw_createp(source, options)
+          else
+            raw_create(source, options)
+          end
+          self.add_script(key: :_internal_exec_fin, source: '!global.__LastExecutionFinished')
         end
 
         # def options
@@ -56,6 +66,10 @@ module Isomorfeus
           await_result
         end
 
+        def bench(source, _options = nil)
+          raw_bench(source) if /\S/ =~ source
+        end
+
         def call(identifier, *args)
           raw_eval("#{identifier}.apply(this, #{::Oj.dump(args, mode: :strict)})")
         end
@@ -92,6 +106,10 @@ module Isomorfeus
 
         protected
 
+        def raw_bench(source)
+          extract_result(@vm.bench(@uuid, encode(source)))
+        end
+
         def raw_eval(source)
           extract_result(@vm.eval(@uuid, encode(source)))
         end
@@ -108,6 +126,14 @@ module Isomorfeus
           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)
@@ -140,7 +166,7 @@ module Isomorfeus
 
         def await_result
           start_time = Time.now
-          while !execution_finished? && !timed_out?(start_time)
+          while eval_script(key: :_internal_exec_fin) && !timed_out?(start_time)
             sleep 0.005
           end
           result = exec <<~JAVASCRIPT
@@ -166,13 +192,9 @@ module Isomorfeus
           extract_result(result)
         end
 
-        def execution_finished?
-          eval 'global.__LastExecutionFinished'
-        end
-
         def timed_out?(start_time)
           if (Time.now - start_time) > @timeout
-            raise "Command Execution timed out!"
+            raise "IsomorfeusSpeednode: Command Execution timed out!"
           end
           false
         end

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

@@ -63,7 +63,7 @@ module Isomorfeus
         end
 
         def self.exit_node(socket, socket_dir, socket_path, pid)
-          VMCommand.new(socket, "exit", [0]).execute
+          VMCommand.new(socket, "exit", 0).execute rescue nil
           socket.close
           File.unlink(socket_path) if File.exist?(socket_path)
           Dir.rmdir(socket_dir) if socket_dir && Dir.exist?(socket_dir)
@@ -95,10 +95,18 @@ module Isomorfeus
           command('exec', {'context' => context, 'source' => source})
         end
 
+        def bench(context, source)
+          command('bench', {'context' => context, 'source' => source})
+        end
+
         def create(context, source, options)
           command('create', {'context' => context, 'source' => source, 'options' => options})
         end
 
+        def created(context, source, options)
+          command('created', {'context' => context, 'source' => source, 'options' => options})
+        end
+
         def createp(context, source, options)
           command('createp', {'context' => context, 'source' => source, 'options' => options})
         end
@@ -110,7 +118,7 @@ module Isomorfeus
 
         def delete_context(context)
           @mutex.synchronize do
-            VMCommand.new(@socket, "deleteContext", [context]).execute rescue nil
+            VMCommand.new(@socket, "deleteContext", context).execute rescue nil
           end
         rescue ThreadError
           nil
@@ -137,9 +145,9 @@ module Isomorfeus
             @socket_dir = Dir.mktmpdir("iso-speednode-")
             @socket_path = File.join(@socket_dir, "socket")
           end
-          @pid = Process.spawn({"SOCKET_PATH" => @socket_path}, @options[:binary], @options[:source_maps], @options[:runner_path])
+          @pid = Process.spawn({"SOCKET_PATH" => @socket_path}, @options[:binary], '--expose-gc', @options[:source_maps], @options[:runner_path])
 
-          retries = 100
+          retries = 500
 
           if ExecJS.windows?
             timeout_or_connected = false
@@ -166,15 +174,6 @@ module Isomorfeus
 
           @started = true
 
-          at_exit do
-            begin
-              self.class.exit_node(@socket, @socket_dir, @socket_path, @pid) unless @socket.closed?
-            rescue
-              # do nothing
-            end
-          end
-
-          ObjectSpace.define_finalizer(self, self.class.finalize(@socket, @socket_dir, @socket_path, @pid))
           Kernel.at_exit { self.class.finalize(@socket, @socket_dir, @socket_path, @pid).call }
         end
 
@@ -204,10 +203,10 @@ module Isomorfeus
           @responder.run
         end
 
-        def command(cmd, *arguments)
+        def command(cmd, argument)
           @mutex.synchronize do
             start_without_synchronization unless @started
-            VMCommand.new(@socket, cmd, arguments).execute
+            VMCommand.new(@socket, cmd, argument).execute
           end
         end
       end

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

@@ -27,12 +27,12 @@ module Isomorfeus
                 sent_bytes += @socket.sendmsg(message.byteslice((sent_bytes)..-1))
               end
             end
-            
+
             begin
               result << @socket.recvmsg()[0]
             end until result.end_with?("\x04")
           end
-          ::Oj.load(result.chop!, create_additions: false)
+          ::Oj.load(result.chop!, mode: :strict)
         end
       end
     end

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.5.2'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.11
+        version: 3.13.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.11
+        version: 3.13.21
 - !ruby/object:Gem::Dependency
   name: win32-pipe
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: 5.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: 5.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A fast ExecJS runtime based on nodejs, tuned for Isomorfeus.