execjs-pcruntime 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec9e69936452420277727dacd0c7d27331b7766c8008c433cd840a8c6f38f45
-  data.tar.gz: 75271e7344781d9338c09263b1ac036355147cd228ae0b7581272cfb3dc53a1a
+  metadata.gz: a6f5cbb865a9d767748d30d1d4066d5739d93e218ba643a54872d49a139ed4dd
+  data.tar.gz: f8b27ca7a6faee4525e79f0252e2054afbe6d1698e85ddaeaf9602e62d4c392d
 SHA512:
-  metadata.gz: b8a8075e90042f2e6183dae5faf84e3c8749b0b8138e9f30fc3499287eef1cf2a3120f5bc7d5c9e3427ce9fe088ad0b28f38cfa3a4471df6b9c25cb4b3c38006
-  data.tar.gz: '088fe43e02e523346e26ad05cd8617aa3298e046b90760cdafcdb7d0f74fd9a4b3c0ab56e8489e65ac51493850611faf267bd1899a3486088153ddc9fd594ad0'
+  metadata.gz: 315555b3b6d1b661abd6c4c37b95899d94abfa84e0b525e2211d77d7ade941a55aa4ee8f17d0ef314f71ae79e7fc3eea6c329b63ffb01aca459128b464d4652a
+  data.tar.gz: 4bdc7ecfb0cbf781fee0c27fcefc6a218c1dbd3916ba71e3e3c97729a7c676e633e5d1451cf20e44a26f2e65694de94cfc7e24757a3d3ba4af4b47ed4f19e969

data/.github/workflows/check.yml

@@ -0,0 +1,23 @@
+name: Check
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  rubocop:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+      - name: Install dependencies
+        run: bundle install
+      - name: Run RuboCop
+        run: bundle exec rubocop

data/.github/workflows/test.yml

@@ -13,7 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.1', '3.0']
+        ruby-version: ['3.3', '3.2', '3.1']
+        node-version: ['16', '18', '20', '22']
 
     steps:
       - uses: actions/checkout@v3
@@ -21,7 +22,11 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
       - name: Install dependencies
         run: bundle install
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rake

data/Gemfile

@@ -16,5 +16,5 @@ end
 
 group :test do
   gem 'minitest', '~> 5.0'
-  gem 'rake', '~> 12.0'
+  gem 'rake', '~> 13.0'
 end

data/README.md

@@ -60,7 +60,7 @@ bundle exec rake
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/execjs-pcruntime. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/heyinc/execjs-pcruntime. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -68,4 +68,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Execjs::Pcruntime project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/execjs-pcruntime/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Execjs::Pcruntime project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/heyinc/execjs-pcruntime/blob/master/CODE_OF_CONDUCT.md).

data/execjs-pcruntime.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'execjs-pcruntime'
   spec.version       = Execjs::PCRuntime::VERSION
   spec.authors       = ['White-Green']
-  spec.required_ruby_version = '>=3.0.0'
+  spec.required_ruby_version = '>=3.1.0'
   spec.summary       = 'Fast ExecJS Runtime using Process as a Context.'
   spec.homepage      = 'https://rubygems.org/gems/execjs-pcruntime'
   spec.license       = 'MIT'

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
@@ -155,6 +197,7 @@ module ExecJS
           socket.write_timeout *= 100
 
           request = Net::HTTP::Post.new(path)
+          request['Host'] = 'localhost'
           request['Connection'] = 'close'
           unless content_type.nil?
             request['Content-Type'] = content_type
@@ -187,10 +230,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 +251,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 +267,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 +306,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.3.0'
   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.3.0
 platform: ruby
 authors:
 - White-Green
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -30,6 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/check.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -69,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Fast ExecJS Runtime using Process as a Context.