execjs-pcruntime 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec9e69936452420277727dacd0c7d27331b7766c8008c433cd840a8c6f38f45
-  data.tar.gz: 75271e7344781d9338c09263b1ac036355147cd228ae0b7581272cfb3dc53a1a
+  metadata.gz: 0ed5dacd1dab7ff7ef42dc43084d6c00da36cd3f228e02517cd0e33492bce55b
+  data.tar.gz: 486214245b193a1000bd930758767776398c3f4f47f68a49086a09cf500300eb
 SHA512:
-  metadata.gz: b8a8075e90042f2e6183dae5faf84e3c8749b0b8138e9f30fc3499287eef1cf2a3120f5bc7d5c9e3427ce9fe088ad0b28f38cfa3a4471df6b9c25cb4b3c38006
-  data.tar.gz: '088fe43e02e523346e26ad05cd8617aa3298e046b90760cdafcdb7d0f74fd9a4b3c0ab56e8489e65ac51493850611faf267bd1899a3486088153ddc9fd594ad0'
+  metadata.gz: b625a73b8da1b28469a4df46500cba801b16279a81adde6479d0671d7f2a942d4d45f73552bd967422237bcc2dcc398083310dea69c24b81c7dc00f031f43d6d
+  data.tar.gz: '088e05880ba92eaf812c25aac7c6e56935294c1af8cc36693fb1d7a3ae26da0f783c8307a7a3f283f976a43cff595bc1b0ec7101e921dc7c72ec8b991be421ac'

data/lib/execjs/pcruntime/context_process_runtime.rb

@@ -20,10 +20,7 @@ module ExecJS
           super
 
           # @type [JSRuntimeHandle]
-          @runtime = runtime.create_runtime_handle
-
-          # load initial source to Context
-          @runtime.evaluate(source.encode('UTF-8'))
+          @runtime = runtime.create_runtime_handle source.encode('UTF-8')
         end
 
         # implementation of ExecJS::Runtime::Context#eval
@@ -52,17 +49,19 @@ module ExecJS
 
       # Handle of JavaScript Runtime
       # launch Runtime by .new and finished on finalizer
+      # rubocop:disable Metrics/ClassLength
       class JSRuntimeHandle
         # @param [Array<String>] binary Launch command for the node(or similar JavaScript Runtime) binary,
         #     such as ['node'], ['deno', 'run'].
         # @param [String] initial_source_path Path of .js Runtime loads at startup.
-        def initialize(binary, initial_source_path)
-          Dir::Tmpname.create 'execjs_pcruntime' do |path|
-            # Dir::Tmpname.create rescues Errno::EEXIST and retry block
-            # So, raise it if failed to create Process.
-            @runtime_pid = create_process(path, *binary, initial_source_path) || raise(Errno::EEXIST)
-            @socket_path = path
-          end
+        def initialize(binary, initial_source_path, compile_source, semaphore)
+          @semaphore = semaphore
+          @binary = binary
+          @initial_source_path = initial_source_path
+          @compile_source = compile_source
+          @recreate_process_lock = Mutex.new
+          @runtime_pid, @socket_path = initialize_process
+          evaluate(@compile_source)
           ObjectSpace.define_finalizer(self, self.class.finalizer(@runtime_pid))
         end
 
@@ -70,7 +69,35 @@ module ExecJS
         # @param [String] source JavaScript source code
         # @return [object]
         def evaluate(source)
-          post_request(@socket_path, '/eval', 'text/javascript', source)
+          socket_path = @socket_path
+          post_request(socket_path, '/eval', 'text/javascript', source)
+        rescue RuntimeError, ProgramError => e
+          raise e
+        rescue StandardError => e
+          warn e.full_message
+          retry if socket_path != @socket_path
+          @recreate_process_lock.synchronize do
+            @runtime_pid, @socket_path = recreate_process if socket_path == @socket_path
+          end
+          retry
+        end
+
+        # kill JavaScript runtime process and re-create
+        # @return [[Integer, String]] [runtime_pid, socket_path]
+        def recreate_process
+          runtime_pid = @runtime_pid
+          begin
+            err = self.class.kill_process(runtime_pid)
+            warn err.full_message unless err.nil?
+            runtime_pid, socket_path = initialize_process
+            post_request(socket_path, '/eval', 'text/javascript', @compile_source)
+          rescue RuntimeError, ProgramError => e
+            raise e
+          rescue StandardError => e
+            warn e.full_message
+            retry
+          end
+          [runtime_pid, socket_path]
         end
 
         # Create a procedure to kill the Process that has specified pid.
@@ -96,6 +123,20 @@ module ExecJS
 
         private
 
+        # create temporary filename for UNIX Domain Socket and spawn JavaScript runtime process
+        # @return [[Integer, String]] [runtime_pid, socket_path]
+        def initialize_process
+          runtime_pid = 0
+          socket_path = ''
+          Dir::Tmpname.create 'execjs_pcruntime' do |path|
+            # Dir::Tmpname.create rescues Errno::EEXIST and retry block
+            # So, raise it if failed to create Process.
+            runtime_pid = create_process(path, *@binary, @initial_source_path) || raise(Errno::EEXIST)
+            socket_path = path
+          end
+          [runtime_pid, socket_path]
+        end
+
         # Attempt to execute the block several times, spacing out the attempts over a certain period.
         # @param [Integer] times maximum number of attempts
         # @yieldreturn [Boolean] true iff succeed execute
@@ -148,6 +189,7 @@ module ExecJS
         # so suppressing lint errors.
         # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         def post_request(socket_path, path, content_type = nil, body = nil)
+          @semaphore.acquire
           socket = create_socket socket_path
 
           # timeout occurred during the test
@@ -187,10 +229,15 @@ module ExecJS
             error.set_backtrace(stack)
             raise error
           end
+        ensure
+          @semaphore.release
         end
+
         # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
       end
 
+      # rubocop:enable Metrics/ClassLength
+
       attr_reader :name
 
       # @param [String] name name of Runtime
@@ -203,6 +250,8 @@ module ExecJS
         @runner_path = runner_path
         @binary = nil
         @deprecated = deprecated
+        # limit number of threads 128 to avoid Errno::ECONNREFUSED
+        @semaphore = Semaphore.new 128
       end
 
       # implementation of ExecJS::Runtime#available?
@@ -217,8 +266,8 @@ module ExecJS
 
       # Launch JavaScript Runtime and return its handle.
       # @return [JSRuntimeHandle]
-      def create_runtime_handle
-        JSRuntimeHandle.new(binary, @runner_path)
+      def create_runtime_handle(compile_source)
+        JSRuntimeHandle.new(binary, @runner_path, compile_source, @semaphore)
       end
 
       private
@@ -256,5 +305,26 @@ module ExecJS
         nil
       end
     end
+
+    # Semaphore
+    # implemented with Thread::Queue
+    # since faster than Concurrent::Semaphore and Mutex+ConditionVariable
+    class Semaphore
+      # @param [Integer] limit
+      def initialize(limit)
+        @queue = Thread::Queue.new
+        limit.times { @queue.push nil }
+      end
+
+      # acquires 1 of permits from this semaphore, blocking until be available.
+      def acquire
+        @queue.pop
+      end
+
+      # releases 1 of permits
+      def release
+        @queue.push nil
+      end
+    end
   end
 end

data/lib/execjs/pcruntime/version.rb

@@ -2,6 +2,6 @@
 
 module Execjs
   module PCRuntime
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execjs-pcruntime
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - White-Green
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs