isomorfeus-speednode 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae800090e3226f94d53570baf613f33123e4f95bbb3e384b33d373a17328b60
-  data.tar.gz: 3036d03ea6149df04d5cb53c6d2058893e6d2a61a2ea96f0a24c1d3b694705a0
+  metadata.gz: 1a2f7d96883b92de64ef9d3432854caba940a961a38bc4c22067c33eb8e6c9cd
+  data.tar.gz: 82bdc61da0e3aa48348e59d600e6d39658b7e6fd04f17f00b89cbf0db4986e38
 SHA512:
-  metadata.gz: 13ccaa36e365de0b48dbc5124f8f4ff3ef123ca2177d745c895828aa5037c2d6dba1510803cb2434358117ddd3824c854bc3a44df72c5ca684176077f109c3c8
-  data.tar.gz: e66f98d834d55218c99744b66bde19a680506fd543093e1a0316234480aa46c880262cf33f16cc3722df6a31255c4f8059f4914e4ce40d9485de4233d7aeb282
+  metadata.gz: 6944313b70b37a8fcea6598d4b83e437b644e86ce63a5989b7ce6d55d8f8786eafa33a629bfafbd2c5ee9be167967128e03ab82cb93f873f6f0bd70877bd9fd3
+  data.tar.gz: e06a2a69e670619b5660c9da30d14d7b4f6a8a34d1688ebac88c597bc411c2ef78d8f949496829602f329afd58c7a3c1ccd4e7a3a306be5567b9dbd45e7668c2

data/lib/isomorfeus/speednode/runner.js

@@ -135,7 +135,7 @@ function attachFunctionSource(responder_path, context, func) {
     if (!global.__responder_socket) {\n\
       return new Promise(function(resolve, reject) {\n\
         setTimeout(function(){\n\
-          if (os.platform().indexOf('win') > -1) {\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\
@@ -160,9 +160,9 @@ function attachFunctionSource(responder_path, context, func) {
       socket.on('error', function (err) {\n\
           if (err.syscall === 'connect') {\n\
             // ignore, close will handle\n\
-          } else if (os.platform().indexOf('win') > -1 && err.message.includes('read EPIPE')) {\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') > -1 && err.message.includes('write EPIPE')) {\n\
+          } else if ((os.platform().indexOf('win') == 0) && err.message.includes('write EPIPE')) {\n\
             // ignore, close will handle\n\
           } else { reject(err); }\n\
       });\n\
@@ -200,7 +200,8 @@ function createCompatibleContext(uuid, options) {
 }
 
 function createPermissiveContext(uuid, options) {
-    let c = vm.createContext({ global: { __responder_socket: false }, process: { release: { name: "node" }, env: process.env }, Buffer, clearTimeout, fs, net, os, require, setTimeout });
+    let c = vm.createContext({ __responder_socket: false, process: { release: { name: "node" }, env: process.env }, Buffer, clearTimeout, fs, net, os, require, setTimeout });
+    vm.runInContext('global = globalThis;', c);
     contexts[uuid] = { context: c, options: options };
     return c;
 }
@@ -223,7 +224,7 @@ function getContextOptions(uuid) {
   if (contexts[uuid].options.timeout) {
     options.timeout = contexts[uuid].options.timeout;
   }
-  return options; 
+  return options;
 }
 
 function massageStackTrace(stack) {
@@ -241,7 +242,7 @@ let commands = {
     attach: function(input) {
       let context = getContext(input.context);
       let responder_path;
-      if (os.platform().indexOf('win') > -1) { responder_path = '\\\\\\\\.\\\\pipe\\\\' + socket_path + '_responder'; }
+      if (os.platform().indexOf('win') == 0) { 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);
@@ -285,23 +286,23 @@ 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, result;
         let outputJSON = '';
 
         try { input = JSON.parse(request); }
-        catch(err) { 
+        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) { 
+        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;
@@ -312,13 +313,15 @@ let server = net.createServer(function(s) {
             if (err.message.includes('circular')) { outputJSON = CircularJSON.stringify(result); }
             else { outputJSON = JSON.stringify([['', err].join(''), err.stack]); }
             s.write([outputJSON, "\x04"].join(''));
+            if (process_exit !== false) { process.exit(process_exit); }
             return;
         }
 
-        s.write([outputJSON, "\x04"].join(''));
+        try { s.write([outputJSON, "\x04"].join('')); }
+        catch (err) {}
         if (process_exit !== false) { process.exit(process_exit); }
     });
 });
 
-if (os.platform().indexOf('win') > -1) { server.listen('\\\\.\\pipe\\' + socket_path); }
+if (os.platform().indexOf('win') == 0) { server.listen('\\\\.\\pipe\\' + socket_path); }
 else { server.listen(socket_path); }

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

@@ -56,8 +56,8 @@ module Isomorfeus
         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)
+          proc do
+            Isomorfeus::Speednode::Runtime.responders[socket_path].kill if Isomorfeus::Speednode::Runtime.responders[socket_path]
             exit_node(socket, socket_dir, socket_path, pid)
           end
         end
@@ -65,14 +65,18 @@ module Isomorfeus
         def self.exit_node(socket, socket_dir, socket_path, pid)
           VMCommand.new(socket, "exit", [0]).execute
           socket.close
-          File.unlink(socket_path)
-          Dir.rmdir(socket_dir)
+          File.unlink(socket_path) if File.exist?(socket_path)
+          Dir.rmdir(socket_dir) if socket_dir && Dir.exist?(socket_dir)
           if Gem.win_platform?
             # SIGINT or SIGKILL are unreliable on Windows, try native taskkill first
-            Process.kill('KILL', pid) unless system("taskkill /f /t /pid #{pid} >NUL 2>NUL")
+            unless system("taskkill /f /t /pid #{pid} >NUL 2>NUL")
+              Process.kill('KILL', pid) rescue nil
+            end
           else
-            Process.kill 'KILL', pid
+            Process.kill('KILL', pid) rescue nil
           end
+        rescue
+          nil
         end
 
         def eval(context, source)
@@ -93,7 +97,7 @@ module Isomorfeus
 
         def attach(context, func)
           create_responder(context) unless responder
-          command("attach", {'context' => context, 'func' => func }) 
+          command("attach", {'context' => context, 'func' => func })
         end
 
         def delete_context(context)
@@ -123,12 +127,12 @@ module Isomorfeus
           end
           @pid = Process.spawn({"SOCKET_PATH" => @socket_path}, @options[:binary], @options[:source_maps], @options[:runner_path])
 
-          retries = 20
+          retries = 100
 
           if ExecJS.windows?
             timeout_or_connected = false
             begin
-              retries -= 1 
+              retries -= 1
               begin
                 @socket = Win32::Pipe::Client.new(@socket_path, Win32::Pipe::ACCESS_DUPLEX)
               rescue
@@ -159,6 +163,7 @@ module Isomorfeus
           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
 
         def create_responder(context)

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.4.0'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -28,28 +28,28 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.3
+        version: 3.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.3
+        version: 3.13.9
 - !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
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A fast ExecJS runtime based on nodejs, tuned for Isomorfeus.