speednode 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d2a802e8fd3c7f25ef9c9dd0bef1807ec87d860da0a140f8a494868bcc2241
-  data.tar.gz: 4ecc3ad8b012f0f76cf583789b9f78daec2a3606b3b5d94d163c1471d2a45341
+  metadata.gz: 3cb17f3391d9416c0a92291be8beaa42b25d8df70528e400d28a41984e3693bf
+  data.tar.gz: 463169b3ceb3d42703cbee80aa56c7edf2e1196a0114f8607eed173d0d6af583
 SHA512:
-  metadata.gz: 616c54a7dafd5c2ddd67f0479e8fa241303d97cb9b3ac560858378996e46ccc4d976d18b175ba64768b32a9d3b519cf87d61962757fe49361c44aff71f8f7812
-  data.tar.gz: a42e8fa9e0d825ebb7e2c0df0492286db295ce52b1d1dbfb5b459c1a1d6b79f33d4e5b255453da081408fe80a61ec4fc1876d1091eb116609d9af58ec0328f65
+  metadata.gz: fc644dbb0581167a2d03fe19b157cdd82fc2da2af2de29e80b4676e21097c2437e9da5acdb7bd6bdf0d6c52391bea5ad04b5a392e3717c2fb72cf0bc8004f1d5
+  data.tar.gz: 5e391001e4d7b42accf5c4b29ed424637fce9193871feb65a2c145ebc2ac082a94711031e70bf0221d9e70bc77cf40602f916f3571eb7a8d7624624deea52b06

data/README.md

@@ -48,7 +48,7 @@ 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.
+Contexts should be stopped programmatically when no longer needed.
 ```ruby
 context = ExecJS.compile('Test = "test"') # will start a node process
 ExecJS::Runtimes::Speednode.stop_context(context) # will kill the node process
@@ -80,7 +80,7 @@ context.await("foo('test')") # => 'test'
 
 ### Attaching ruby methods to Permissive Contexts
 
-Ruby methods can be attached to Permissive Contexts using Context#attach:
+Ruby methods can be attached to permissive contexts using Context#attach:
 ```ruby
   context = ExecJS.permissive_compile(SOURCE)
   context.attach('foo') { |v| v }

data/lib/speednode/runner.js

@@ -9,8 +9,8 @@ try {
   crypto_var = require('crypto');
 } catch (err) {}
 const crypto = crypto_var;
-let contexts = {};
-let scripts = {};
+let contexts = Object.create(null);
+let scripts = Object.create(null);
 let process_exit = false;
 
 /*** circular-json, originally taken from https://raw.githubusercontent.com/WebReflection/circular-json/
@@ -41,7 +41,7 @@ let process_exit = false;
 
  */
 
-const CircularJSON = {};
+const CircularJSON = Object.create(null);
 CircularJSON.specialChar = '~';
 CircularJSON.safeSpecialChar =  '\\x' + ('0' + CircularJSON.specialChar.charCodeAt(0).toString(16)).slice(-2);
 CircularJSON.escapedSafeSpecialChar = '\\' + CircularJSON.safeSpecialChar;
@@ -240,6 +240,8 @@ function getContext(uuid) {
 
 function getContextOptions(uuid) {
   let options = { filename: "(execjs)", displayErrors: true };
+  if (!contexts[uuid])
+    throw new Error(`Context ${uuid} not found`);
   if (contexts[uuid].options.timeout)
     options.timeout = contexts[uuid].options.timeout;
   return options;

data/lib/speednode/runtime/context.rb

@@ -1,12 +1,6 @@
 module Speednode
   class Runtime < ExecJS::Runtime
     class Context < ::ExecJS::Runtime::Context
-      def self.finalize(runtime, uuid)
-        proc do
-          runtime.unregister_context(uuid)
-        end
-      end
-
       def initialize(runtime, source = "", options = {})
         @runtime = runtime
         @uuid = SecureRandom.uuid
@@ -16,7 +10,7 @@ module Speednode
         @debug = false unless ENV['NODE_OPTIONS']&.include?('--inspect')
         @vm = @runtime.vm
         @timeout = options[:timeout] ? options[:timeout]/1000 : 600
-        
+
         filename = options.delete(:filename)
         source = File.read(filename) if filename
 
@@ -26,8 +20,6 @@ module Speednode
           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
@@ -105,6 +97,10 @@ module Speednode
         raw_exec("(function(){#{source}})()")
       end
 
+      def available?
+        @runtime.context_registered?(@uuid)
+      end
+
       def stop
         @runtime.unregister_context(@uuid)
       end

data/lib/speednode/runtime/vm.rb

@@ -40,14 +40,17 @@ end
 module Speednode
   class Runtime < ExecJS::Runtime
     class VM
-      def self.finalize(socket, socket_dir, socket_path, pid)
+      def self.finalize(socket, socket_dir, socket_path, pid, spawner_pid)
         proc do
-          ::Speednode::Runtime.responders[socket_path].kill if ::Speednode::Runtime.responders[socket_path]
-          exit_node(socket, socket_dir, socket_path, pid)
+          if spawner_pid == Process.pid
+            ::Speednode::Runtime.responders[socket_path].kill if ::Speednode::Runtime.responders[socket_path]
+            exit_node(socket, socket_dir, socket_path, pid, spawner_pid)
+          end
         end
       end
 
-      def self.exit_node(socket, socket_dir, socket_path, pid)
+      def self.exit_node(socket, socket_dir, socket_path, pid, spawner_pid)
+        return if spawner_pid != Process.pid
         VMCommand.new(socket, "exit", 0).execute rescue nil
         socket.close
         File.unlink(socket_path) if File.exist?(socket_path)
@@ -135,8 +138,9 @@ module Speednode
 
       def stop
         return unless @started
+        return if @spawner_pid != Process.pid
         @mutex.synchronize do
-          self.class.exit_node(@socket, @socket_dir, @socket_path, @pid)
+          self.class.exit_node(@socket, @socket_dir, @socket_path, @pid, @spawner_pid)
           @socket_path = nil
           @started = false
           @socket = nil
@@ -154,6 +158,7 @@ module Speednode
           @socket_dir = Dir.mktmpdir("speednode-")
           @socket_path = File.join(@socket_dir, "socket")
         end
+        @spawner_pid = Process.pid
         @pid = Process.spawn({"SOCKET_PATH" => @socket_path}, @options[:binary], '--expose-gc', @options[:source_maps], @options[:runner_path])
         Process.detach(@pid)
 
@@ -184,8 +189,7 @@ module Speednode
 
         @started = true
 
-        exit_proc = self.class.finalize(@socket, @socket_dir, @socket_path, @pid)
-
+        exit_proc = self.class.finalize(@socket, @socket_dir, @socket_path, @pid, @spawner_pid)
         Kernel.at_exit { exit_proc.call }
       end
 

data/lib/speednode/runtime.rb

@@ -24,7 +24,11 @@ module Speednode
       @popen_options = {}
       @popen_options[:external_encoding] = @encoding if @encoding
       @popen_options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
-      @contexts = {} 
+      @contexts = {}
+    end
+
+    def context_registered?(uuid)
+      @contexts.key?(uuid)
     end
 
     def register_context(uuid, context)
@@ -33,8 +37,7 @@ module Speednode
 
     def unregister_context(uuid)
       context = @contexts.delete(uuid)
-      if context && @vm
-        ObjectSpace.undefine_finalizer(context)
+      if context
         @vm.delete_context(uuid) rescue nil # if delete_context fails, the vm exited before probably
       end
       @vm.stop if @contexts.size == 0 && @vm.started?

data/lib/speednode/version.rb

@@ -1,3 +1,3 @@
 module Speednode
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speednode
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.20.0
+        version: 5.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.20.0
+        version: 5.23.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +114,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A fast ExecJS runtime based on nodejs. As fast as mini_racer, but without
-  the need to compile the js engine, because it uses the system provided nodejs.
+description: A fast ExecJS, almost as fast as mini_racer, but without the need to
+  compile the js engine, because it uses the system provided nodejs.
 email: jan@kursator.de
 executables: []
 extensions: []
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A fast ExecJS runtime based on nodejs.