isomorfeus-speednode 0.2.12 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b388ff399cb8efb905e876ff5a6b48ea538633db1fbe9a8602f1083f11858b
-  data.tar.gz: ac6bd1e76e66ab17df66a6d92c1d3aa92f333427bcff0b6d41a3f9b27e967c45
+  metadata.gz: 1e0315df4f6d4730a62a4189ef7f12fcaf01e187d323ca999aa27cd0254ee7ea
+  data.tar.gz: '0711819b4c9280ff1dace7f9f7432f961383bb82cf543a0b3981d01e1a83b2be'
 SHA512:
-  metadata.gz: 1cb15b4d6b5ff6251a5286d3aa8612fe4ab107b010f61546e4ce186a9f2969d58b5533368e1ae064755d512af73716f3f3e3dddf30592048095de494d3a7749a
-  data.tar.gz: b758f28b4c24a186eb4ea1fccacd37e48ff4b27306c49e8038375b59199f91e8fd1c8dec8a6a7783385c4f0b1a819ee8be42570689cccc65e0a74a040b119e63
+  metadata.gz: 706dded2560521f21e3e130cfa266bb725f9891b88cca7331ad5f33e3ea054186a3832a4d6aa7144428085b77bfb1fcd1a4ce09b3fd2dcfc7872e3930b3c974b
+  data.tar.gz: '018b37989b54160cdb3e89ece63dd6feb9a423dd845229472e5d5b75864487d86c0fbcd46369d0ec70e8521afa7ae0f7b91d909344475d3e8b5cb2c8b4692b0b'

data/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2016 John Hawthorn
+Copyright (c) 2019 Jan Biedermann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # isomorfeus-speednode
 
-A fast runtime for execjs using node js.
+A fast runtime for execjs using node js. Works on Linux, BSDs, MacOS and Windows.
 Inspired by [execjs-fastnode](https://github.com/jhawthorn/execjs-fastnode).
 
 ### Community and Support
@@ -26,6 +26,7 @@ If node cant find node modules for the permissive contexts (see below), its poss
 ```ruby
 ENV['NODE_PATH'] = './node_modules'
 ```
+
 ### Contexts
 
 Each ExecJS context runs in a node vm. Speednode offers two kinds of contexts:
@@ -33,8 +34,7 @@ Each ExecJS context runs in a node vm. Speednode offers two kinds of contexts:
 - a permissive context, which is more permissive and allows to `require` node modules.
 
 #### Compatible
-A compatible context can be created with the standard `ExecJS.compile` or code can be executed within a compatible context by using the standard 
-`ExecJS.eval` or `ExecJS.exec`.
+A compatible context can be created with the standard `ExecJS.compile` or code can be executed within a compatible context by using the standard `ExecJS.eval` or `ExecJS.exec`.
 Example for a compatible context:
 ```ruby
 compat_context = ExecJS.compile('Test = "test"')
@@ -56,19 +56,35 @@ ExecJS.permissive_eval('1+1')
 ### Benchmarks
 
 Highly scientific, maybe.
+
+1000 rounds on Linux using node 16.1.0:
+```
+standard ExecJS CoffeeScript call benchmark:
+                                        user     system      total        real
+Node.js (V8) fast                   0.234199   0.093775   0.327974 (  0.877142)
+Isomorfeus Speednode Node.js (V8)   0.108882   0.048014   0.156896 (  0.587261)
+mini_racer (V8)                     0.801764   0.105020   0.906784 (  0.515463)
+Node.js (V8)                        0.420842   0.293893  52.471348 ( 50.990930)
+
+call overhead benchmark:
+                                        user     system      total        real
+Node.js (V8) fast                   0.192230   0.086253   0.278483 (  0.372702)
+Isomorfeus Speednode Node.js (V8)   0.101266   0.034985   0.136251 (  0.214831)
+mini_racer (V8)                     0.163080   0.052209   0.215289 (  0.141151)
+Node.js (V8)                        0.354932   0.218117  29.016030 ( 28.410343)
+```
+
+1000 rounds on Windows 10 using node 16.1.0:
 ```
-standard ExecJS CoffeeScript call benchmark, but 1000 rounds:
-                                                   user     system      total        real
-Isomorfeus Speednode Compatible Node.js (V8)   0.042263   0.017215   0.059478 (  0.442855)
-Node.js (V8) fast                              0.222875   0.087109   0.309984 (  0.806736)
-mini_racer (V8)                                0.425273   0.013478   0.438751 (  0.304434)
-
-
-call overhead benchmark, 1000 rounds:
-                                                   user     system      total        real
-Isomorfeus Speednode Compatible Node.js (V8)   0.023060   0.010358   0.033418 (  0.059640)
-Node.js (V8) fast                              0.191454   0.081396   0.272850 (  0.368568)
-mini_racer (V8)                                0.017091   0.002494   0.019585 (  0.019584)
+standard ExecJS CoffeeScript call benchmark:
+                                        user     system      total        real
+Isomorfeus Speednode Node.js (V8)   0.031000   0.016000   0.047000 (  0.548920)
+Node.js (V8)                        1.172000   2.594000   3.766000 ( 91.619422)
+
+call overhead benchmark:
+                                        user     system      total        real
+Isomorfeus Speednode Node.js (V8)   0.063000   0.000000   0.063000 (  0.162426)
+Node.js (V8)                        0.656000   2.516000   3.172000 ( 63.766556)
 ```
 
 To run benchmarks:

data/lib/isomorfeus/speednode/runner.js

@@ -2,6 +2,7 @@
 
 const vm = require('vm');
 const net = require('net');
+const os = require('os');
 let contexts = {};
 let process_exit = false;
 
@@ -172,27 +173,21 @@ let commands = {
     },
     execp: function execJS(input) {
         let context = getPermissiveContext(input.context);
-        try {
-            let program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
-            let result = program();
-            if (typeof result == 'undefined' && result !== null) { return ['ok']; }
-            else {
-                try { return ['ok', result]; }
-                catch (err) { return ['err', '' + err, err.stack]; }
-            }
-        } catch (err) { return ['err', '' + err, massageStackTrace(err.stack)]; }
+        let result = vm.runInContext(input.source, context, "(execjs)");
+        if (typeof result === 'undefined' && result !== null) { return ['ok']; }
+        else {
+            try { return ['ok', result]; }
+            catch (err) { return ['err', ['', err].join(''), err.stack]; }
+        }
     },
     exec: function execJS(input) {
         let context = getCompatibleContext(input.context);
-        try {
-            let program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
-            let result = program();
-            if (typeof result == 'undefined' && result !== null) { return ['ok']; }
-            else {
-                try { return ['ok', result]; }
-                catch (err) { return ['err', '' + err, err.stack]; }
-            }
-        } catch (err) { return ['err', '' + err, massageStackTrace(err.stack)]; }
+        let result = vm.runInContext(input.source, context, "(execjs)");
+        if (typeof result === 'undefined' && result !== null) { return ['ok']; }
+        else {
+            try { return ['ok', result]; }
+            catch (err) { return ['err', ['', err].join(''), err.stack]; }
+        }
     }
 };
 
@@ -202,23 +197,43 @@ let server = net.createServer(function(s) {
     s.on('data', function (data) {
         received_data.push(data);
         if (data[data.length - 1] !== 4) { return; }
+        
         let request = received_data.join('').toString('utf8');
         request = request.substr(0, request.length - 1);
         received_data = [];
-        let input = JSON.parse(request);
-        let result = commands[input.cmd].apply(null, input.args);
+        
+        let input, result;
         let outputJSON = '';
 
+        try { input = JSON.parse(request); }
+        catch(err) { 
+          outputJSON = JSON.stringify(['err', ['', err].join(''), err.stack]);
+          s.write([outputJSON, "\x04"].join(''));
+          return;
+        }
+
+        try { result = commands[input.cmd].apply(null, input.args); } 
+        catch (err) { 
+          outputJSON = JSON.stringify(['err', ['', err].join(''), massageStackTrace(err.stack)]);
+          s.write([outputJSON, "\x04"].join(''));
+          return;
+        }
+
         try { outputJSON = JSON.stringify(result); }
         catch(err) {
             if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result); }
-            else { outputJSON = JSON.stringify(['err', '' + err, err.stack]); }
+            else { outputJSON = JSON.stringify([['', err].join(''), err.stack]); }
+            s.write([outputJSON, "\x04"].join(''));
+            return;
         }
-        s.write(outputJSON + '\x04');
+
+        s.write([outputJSON, "\x04"].join(''));
         if (process_exit !== false) { process.exit(process_exit); }
     });
 });
 
 let socket_path = process.env.SOCKET_PATH;
 if (!socket_path) { throw 'No SOCKET_PATH given!'; };
-server.listen(socket_path);
+if (os.platform().indexOf('win') > -1) { server.listen('\\\\.\\pipe\\' + socket_path); }
+else { server.listen(socket_path); }
+

data/lib/isomorfeus/speednode/runtime.rb

@@ -1,3 +1,42 @@
+require 'securerandom'
+if Gem.win_platform?
+  require 'win32/pipe'
+
+  module Win32
+    class Pipe
+      def write(data)
+        bytes = FFI::MemoryPointer.new(:ulong)
+
+        raise Error, "no pipe created" unless @pipe
+
+        if @asynchronous
+          bool = WriteFile(@pipe, data, data.bytesize, bytes, @overlapped)
+          bytes_written = bytes.read_ulong
+
+          if bool && bytes_written > 0
+            @pending_io = false
+            return true
+          end
+
+          error = GetLastError()
+          if !bool && error == ERROR_IO_PENDING
+            @pending_io = true
+            return true
+          end
+
+          return false
+        else
+          unless WriteFile(@pipe, data, data.bytesize, bytes, nil)
+            raise SystemCallError.new("WriteFile", FFI.errno)
+          end
+
+          return true
+        end
+      end
+    end
+  end
+end
+
 module Isomorfeus
   module Speednode
     class Runtime < ExecJS::Runtime
@@ -11,10 +50,27 @@ module Isomorfeus
         def execute
           result = ''
           message = ::Oj.dump({ 'cmd' => @cmd, 'args' => @arguments }, mode: :strict)
-          @socket.sendmsg(message + "\x04")
-          begin
-            result << @socket.recvmsg()[0]
-          end until result.end_with?("\x04")
+          message = message + "\x04"
+          bytes_to_send = message.bytesize
+          sent_bytes = 0
+
+          if ExecJS.windows?
+            @socket.write(message)
+            begin
+              result << @socket.read
+            end until result.end_with?("\x04")
+          else
+            sent_bytes = @socket.sendmsg(message)
+            if sent_bytes < bytes_to_send
+              while sent_bytes < bytes_to_send
+                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)
         end
       end
@@ -66,21 +122,40 @@ module Isomorfeus
 
         def start_without_synchronization
           return if @started
-          @socket_dir = Dir.mktmpdir("isomorfeus-speednode-")
-          @socket_path = File.join(@socket_dir, "socket")
+          if ExecJS.windows?
+            @socket_dir = nil
+            @socket_path = SecureRandom.uuid
+          else
+            @socket_dir = Dir.mktmpdir("isomorfeus-speednode-")
+            @socket_path = File.join(@socket_dir, "socket")
+          end
           @pid = Process.spawn({"SOCKET_PATH" => @socket_path}, @options[:binary], @options[:runner_path])
 
           retries = 20
-          while !File.exist?(@socket_path)
-            sleep 0.05
-            retries -= 1
 
-            if retries == 0
-              raise "Unable to start nodejs process in time"
+          if ExecJS.windows?
+            timeout_or_connected = false
+            begin
+              retries -= 1 
+              begin
+                @socket = Win32::Pipe::Client.new(@socket_path, Win32::Pipe::ACCESS_DUPLEX)
+              rescue
+                sleep 0.1
+                raise "Unable to start nodejs process in time" if retries == 0
+                next
+              end
+              timeout_or_connected = true
+            end until timeout_or_connected
+          else
+            while !File.exist?(@socket_path)
+              sleep 0.1
+              retries -= 1
+              raise "Unable to start nodejs process in time" if retries == 0
             end
+
+            @socket = UNIXSocket.new(@socket_path)
           end
 
-          @socket = UNIXSocket.new(@socket_path)
           @started = true
 
           at_exit do

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.2.12'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.1
 platform: ruby
 authors:
 - Jan Biedermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.11.0
+- !ruby/object:Gem::Dependency
+  name: win32-pipe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.14.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +115,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A fast ExecJS runtime based on nodejs, tuned for Isomorfeus.
 test_files: []

data/LICENSE

@@ -1 +0,0 @@
-../LICENSE