isomorfeus-speednode 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fdae16925c182e3d86602153873a69f6a507d27d702a8405b70b191854a821
-  data.tar.gz: faa6999fcdc0ffe5a294e975261b3a029227cd291554cd283d7e057a98b655dc
+  metadata.gz: 7b3ece9e49e7a5105aef77b28b04445e4d39e2f22d061bfd1f03e43a79e403eb
+  data.tar.gz: e3d57e156c9d1efa686a18ae784125cc8c9d553e9946cabfd0c1325f20a959f0
 SHA512:
-  metadata.gz: '004933d5d91f7cb58bcdabe3a31ba3cf7b740dd8ebce97fe437d10c16e9e5874938db56f64520119ace1015b830b682bd552e5e9fd69dfa58f6766de14925c90'
-  data.tar.gz: aaa36c20a56c37c462844b8b8e4e2df57224105939ae46a1159e91d59fe5c6bc9eafeb9a9cdccbcb0735623115b2f3e0440047b3ef55807b02fd9150e75786f6
+  metadata.gz: 67a6b031a66b5b29a9db16924087dc013a4c0ce360edbc8c4db3c076766c6c31d00783472a7b6f4d6bde526c61602ff1a78cc4e343c142016ef183005dcb339c
+  data.tar.gz: c4600a01abe22631455c4dce5209f656409a7931b5295116a551420c03c78906b3d6733afac90ebc87ce3835c9af2228b35c1e3bdb86296dc5aac2ce93b4ecdd

data/README.md

@@ -59,7 +59,7 @@ Scripts can be precompiled and stored for repeated execution, which leads to a s
 ```ruby
 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
+context.eval_script(key: 'super') # will run the precompiled script in the context
 ```
 For the actual performance benefit see below.
 
@@ -96,38 +96,28 @@ Attaching and calling ruby methods to/from permissive contexts is not that fast.
 
 Highly scientific, maybe.
 
-1000 rounds using node 16.14.0 on linux (ctx = using context, scsc = using precompiled scripts):
+1000 rounds using isomorfeus-speednode 0.6.1 with node 18.15.0 on a older CPU on Linux
+(ctx = using context, scsc = using precompiled scripts):
 ```
 standard ExecJS CoffeeScript eval benchmark:
-                                            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)
+                                                user     system      total        real
+Isomorfeus Speednode Node.js (V8):          0.107551   0.024227   0.131778 (  1.034893)
+Isomorfeus Speednode Node.js (V8) ctx:      0.081142   0.064432   0.145574 (  0.878249)
+Isomorfeus Speednode Node.js (V8) scsc:     0.058941   0.040266   0.099207 (  0.525479)
+mini_racer (0.6.3, libv8-node 16.10.0):     0.563453   0.416156   0.979609 (  0.628226)
+mini_racer (0.6.3, libv8-node 16.10.0) ctx: 0.393274   0.187259   0.580533 (  0.434056)
 
 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:
-```
-minify discourse_app_minified.js:
-                              user     system      total        real
-isomorfeus-speednode Windows  0.016000   0.078000   0.094000 ( 11.828518)
-isomorfeus-speednode Linux    0.043747   0.000000  15.931284 ( 11.860528)
-mini_racer                    0.043471   0.000000  15.974214 ( 11.923735)
-node                          0.043695   0.000000  15.812040 ( 11.781835)
+                                                user     system      total        real
+Isomorfeus Speednode Node.js (V8):          0.065491   0.026181   0.091672 (  0.196204)
+Isomorfeus Speednode Node.js (V8) ctx:      0.060876   0.029535   0.090411 (  0.197763)
+Isomorfeus Speednode Node.js (V8) scsc:     0.036967   0.045451   0.082418 (  0.133337)
+mini_racer (0.6.3, libv8-node 16.10.0):     0.070333   0.056378   0.126711 (  0.100380)
+mini_racer (0.6.3, libv8-node 16.10.0) ctx: 0.072719   0.049049   0.121768 (  0.095643)
 ```
 
 To run benchmarks:
 - clone repo
-- `cd ruby`
 - `bundle install`
 - `bundle exec rake bench`
 
@@ -135,6 +125,5 @@ To run benchmarks:
 
 To run tests:
 - clone repo
-- `cd ruby`
 - `bundle install`
-- `bundle exec rake test`
+- `bundle exec rake`

data/lib/isomorfeus/speednode/attach_pipe.rb

@@ -223,4 +223,4 @@ module Isomorfeus
       end
     end
   end
-end
+end

data/lib/isomorfeus/speednode/runner.js

@@ -132,70 +132,82 @@ 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) {\n\
-    let context = \"" + context + "\";\n\
-    let func = \"" + func +"\";\n\
-    let request = [context, func, method_args];\n\
-    let responder_path = '" + responder_path + "';\n\
-    if (!global.__responder_socket) {\n\
-      return new Promise(function(resolve, reject) {\n\
-        setTimeout(function(){\n\
-          if (os.platform().indexOf('win') == 0) {\n\
-            let socket = net.connect(responder_path);\n\
-            socket.on('connect', function(){\n\
-              global.__responder_socket = true;\n\
-              socket.destroy();\n\
-              resolve(" + func + "(...method_args));\n\
-            })\n\
-            socket.on('error', function (err) {\n\
-              resolve(" + func + "(...method_args));\n\
-            });\n\
-          } else {\n\
-            if (fs.existsSync(responder_path)) { global.__responder_socket = true; }\n\
-            resolve(" + func + "(...method_args));\n\
-          }\n\
-        }, 10)\n\
-      });\n\
-    }\n\
-    return new Promise(function(resolve, reject) {\n\
-      let request_json = JSON.stringify(request);\n\
-      let buffer = Buffer.alloc(0);\n\
-      let socket = net.connect(responder_path);\n\
-      socket.setTimeout(2000);\n\
-      socket.on('error', function (err) {\n\
-          if (err.syscall === 'connect') {\n\
-            // ignore, close will handle\n\
-          } else if ((os.platform().indexOf('win') == 0) && err.message.includes('read EPIPE')) {\n\
-            // ignore, close will handle\n\
-          } else if ((os.platform().indexOf('win') == 0) && err.message.includes('write EPIPE')) {\n\
-            // ignore, close will handle\n\
-          } else { reject(err); }\n\
-      });\n\
-      socket.on('ready', function () {\n\
-          socket.write(request_json + \"\x04\");\n\
-      });\n\
-      socket.on('data', function (data) {\n\
-          buffer = Buffer.concat([buffer, data]);\n\
-      });\n\
-      socket.on('timeout', function() {\n\
-          socket.destroy();\n\
-          reject();\n\
-      });\n\
-      socket.on('close', function() {\n\
-        if (buffer.length > 0) {\n\
-            let method_result = JSON.parse(buffer.toString('utf8'));\n\
-            if (method_result[0] == 'err') {\n\
-              reject(method_result);\n\
-            } else {\n\
-              resolve(method_result[1]);\n\
-            }\n\
-        } else {\n\
-          resolve(null);\n\
-        }\n\
-      });\n\
-    });\n\
-  }\n";
+  return `${func} = async function(...method_args) {
+    let context = '${context}';
+    let func = '${func}';
+    let request = [context, func, method_args];
+    let responder_path = '${responder_path}';
+    if (!global.__responder_socket) {
+      return new Promise(function(resolve, reject) {
+        setTimeout(function(){
+          if (os.platform() == 'win32') {
+            let socket = net.connect(responder_path);
+            socket.on('connect', function(){
+              global.__responder_socket = true;
+              socket.destroy();
+              resolve(${func}(...method_args));
+            })
+            socket.on('error', function (err) {
+              resolve(${func}(...method_args));
+            });
+          } else {
+            if (fs.existsSync(responder_path)) { global.__responder_socket = true; }
+            resolve(${func}(...method_args));
+          }
+        }, 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, simple_map_replacer);
+      let buffer = Buffer.alloc(0);
+      let socket = net.connect(responder_path);
+      socket.setTimeout(2000);
+      socket.on('error', function (err) {
+          if (err.syscall === 'connect') {
+            // ignore, close will handle
+          } else if ((os.platform() == 'win32') && err.message.includes('read EPIPE')) {
+            // ignore, close will handle
+          } else if ((os.platform() == 'win32') && err.message.includes('write EPIPE')) {
+            // ignore, close will handle
+          } else { reject(err); }
+      });
+      socket.on('ready', function () {
+          socket.write(request_json + "\x04");
+      });
+      socket.on('data', function (data) {
+          buffer = Buffer.concat([buffer, data]);
+      });
+      socket.on('timeout', function() {
+          socket.destroy();
+          reject();
+      });
+      socket.on('close', function() {
+        if (buffer.length > 0) {
+            let method_result = JSON.parse(buffer.toString('utf8'));
+            if (method_result[0] == 'err') {
+              reject(method_result);
+            } else {
+              resolve(method_result[1]);
+            }
+        } else {
+          resolve(null);
+        }
+      });
+    });
+  }`;
 }
 
 function createCompatibleContext(uuid, options) {
@@ -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;
@@ -261,7 +270,7 @@ let commands = {
     attach: function(input) {
       let context = getContext(input.context);
       let responder_path;
-      if (os.platform().indexOf('win') == 0) { responder_path = '\\\\\\\\.\\\\pipe\\\\' + socket_path + '_responder'; }
+      if (process.platform == 'win32') { responder_path = '\\\\\\\\.\\\\pipe\\\\' + socket_path + '_responder'; }
       else { responder_path = socket_path + '_responder' }
       let result = vm.runInContext(attachFunctionSource(responder_path, input.context, input.func), context, { filename: "(execjs)", displayErrors: true });
       return formatResult(result);
@@ -319,15 +328,15 @@ let commands = {
       }
     },
     eval: function (input) {
-      if (input.source.match(/^\s*{/)) { input.source = "(" + input.source + ")"; }
-      else if (input.source.match(/^\s*function\s*\(/)) { input.source = "(" + input.source + ")"; }
+      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 + ")"; }
+        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 {
@@ -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); }
@@ -399,5 +408,5 @@ let server = net.createServer(function(s) {
     });
 });
 
-if (os.platform().indexOf('win') == 0) { server.listen('\\\\.\\pipe\\' + socket_path); }
+if (process.platform == 'win32') { server.listen('\\\\.\\pipe\\' + socket_path); }
 else { server.listen(socket_path); }

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

@@ -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
 
@@ -44,7 +44,7 @@ module Isomorfeus
         attr_reader :responder
 
         def initialize(options)
-          @mutex = Thread::Mutex.new
+          @mutex = ::Thread::Mutex.new
           @socket_path = nil
           @options = options
           @started = false

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/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.6.1'
+    VERSION = '0.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-18 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -33,7 +33,7 @@ dependencies:
         version: 3.13.23
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.15.0
+        version: 3.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 3.13.23
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.15.0
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: win32-pipe
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.18.0
+        version: 5.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.18.0
+        version: 5.18.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A fast ExecJS runtime based on nodejs, tuned for Isomorfeus.