nodo 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2a8ef54e67cf745b78353e740a440edf45ee300e97d50d7e0edd93abf33bf62
-  data.tar.gz: 4c5196d63edf85242640050487a86b582fb2fe9d373b79408750973b88622a68
+  metadata.gz: e46009bcd3e3e8e5fd0f0a6f624c3f263caa09c64225878011e557333ffb8e64
+  data.tar.gz: 98eed61321bae14d89725f6884a16d2c3fccc2eb20f808781b10842e2f22ae25
 SHA512:
-  metadata.gz: aad587338156426fd70ba262b01086056e70730aeff6774e70272c01898c9ba81e2937121226304dc00cd38f83917a788da5507160577747829a595a03a37e13
-  data.tar.gz: 14abb31d37eb578bba1233afa22c6f1d5c79ea28d9cb48eefa052604a3d148494f58c7af019b6ec85682348d357fdef79d14fea2e4d90cb30de96a6222b5935f
+  metadata.gz: ce0e598a9e6cffb816b53ce802a1a412746d195e387424b3362cc765d1fbd03931322c734a3ee6817487151f9969f414e1d99cfc1a4e9bddce99a7d6c7d95e26
+  data.tar.gz: a628c3765b94bd32600f554c1e973703e90a9dbcb06764b3d3256eb6ceb519997b2241f1f7c02474b8859aa2b4ff0049c863bcf047d38fbeeb8ed1be5e1bedb2

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/nodo.svg)](http://badge.fury.io/rb/nodo)
+[![Gem Version](https://badge.fury.io/rb/nodo.svg)](http://badge.fury.io/rb/nodo)  [![build](https://github.com/mtgrosser/nodo/actions/workflows/build.yml/badge.svg)](https://github.com/mtgrosser/nodo/actions/workflows/build.yml)
 
 # Nōdo – call Node.js from Ruby
 
@@ -61,7 +61,7 @@ Install your modules to `node_modules`:
 $ yarn add uuid
 ```
 
-Then `require` your dependencies:
+`require`ing your dependencies will make the library available as a `const` with the same name:
 
 ```ruby
 class Bar < Nodo::Core
@@ -78,8 +78,12 @@ bar = Bar.new
 bar.v4 => "b305f5c4-db9a-4504-b0c3-4e097a5ec8b9"
 ```
 
+
 ### Aliasing requires
 
+If the library name cannot be used as name of the constant, the `const` name
+can be given using hash syntax:
+
 ```ruby
 class FooBar < Nodo::Core
   require commonjs: '@rollup/plugin-commonjs'

data/lib/nodo/client.rb

@@ -28,10 +28,10 @@ module Nodo
 
     def connect_unix
       s = Timeout.timeout(@open_timeout) { UNIXSocket.open(@socket_path) }
-      @socket = Net::BufferedIO.new(s)
-      @socket.read_timeout = @read_timeout
-      @socket.continue_timeout = @continue_timeout
-      @socket.debug_output = @debug_output
+      @socket = Net::BufferedIO.new(s, read_timeout: @read_timeout,
+                                       write_timeout: @write_timeout,
+                                       continue_timeout: @continue_timeout,
+                                       debug_output: @debug_output)
       on_connect
     end
   end

data/lib/nodo/core.rb

@@ -12,7 +12,6 @@ module Nodo
     @@mutex = Mutex.new
     
     class << self
-      
       attr_accessor :class_defined
       
       def inherited(subclass)
@@ -80,6 +79,8 @@ module Nodo
             process.exit(1);
           }
           
+          process.title = `nodo-core ${socket}`;
+          
           const shutdown = () => {
             nodo.core.close(() => { process.exit(0) });
           };
@@ -104,16 +105,6 @@ module Nodo
           })()
         JS
       end
-
-      protected
-
-      def finalize(pid, tmpdir)
-        proc do
-          Process.kill(:SIGTERM, pid)
-          Process.wait(pid)
-          FileUtils.remove_entry(tmpdir) if File.directory?(tmpdir)
-        end
-      end
       
       private
       
@@ -155,23 +146,31 @@ module Nodo
       return if self.class.class_defined?
       call_js_method(DEFINE_METHOD, self.class.generate_class_code)
       self.class.class_defined = true
-#    rescue => e
- #     raise Error, e.message
     end
-
+    
     def spawn_process
       @@tmpdir = Pathname.new(Dir.mktmpdir('nodo'))
       env = Nodo.env.merge('NODE_PATH' => Nodo.modules_root.to_s)
-      @@node_pid = Process.spawn(env, Nodo.binary, '-e', self.class.generate_core_code, '--', socket_path.to_s)
-      ObjectSpace.define_finalizer(self, self.class.send(:finalize, node_pid, tmpdir))
+      @@node_pid = Process.spawn(env, Nodo.binary, '-e', self.class.generate_core_code, '--', socket_path.to_s, err: :out)
+      at_exit do
+        Process.kill(:SIGTERM, node_pid) rescue Errno::ECHILD
+        Process.wait(node_pid) rescue Errno::ECHILD
+        FileUtils.remove_entry(tmpdir) if File.directory?(tmpdir)
+      end
     end
     
     def wait_for_socket
       start = Time.now
-      until socket_path.exist?
-        raise TimeoutError, "socket #{socket_path} not found" if Time.now - start > TIMEOUT
-        sleep(0.2)
+      socket = nil
+      while Time.now - start < TIMEOUT
+        begin
+          break if socket = UNIXSocket.new(socket_path)
+        rescue Errno::ENOENT, Errno::ECONNREFUSED, Errno::ENOTDIR
+          sleep 0.2
+        end
       end
+      socket.close if socket
+      raise TimeoutError, "could not connect to socket #{socket_path}" unless socket
     end
 
     def call_js_method(method, args)
@@ -205,5 +204,14 @@ module Nodo
       JSON.parse(response.body.force_encoding('UTF-8'))
     end
     
+    def with_tempfile(name)
+      ext = File.extname(name)
+      result = nil
+      Tempfile.create([File.basename(name, ext), ext], tmpdir) do |file|
+        result = yield(file)
+      end
+      result
+    end
+    
   end
 end

data/lib/nodo/version.rb

@@ -1,3 +1,3 @@
 module Nodo
-  VERSION = '1.5.1'
+  VERSION = '1.5.3'
 end

data/lib/nodo.rb

@@ -2,6 +2,8 @@ require 'pathname'
 require 'json'
 require 'fileutils'
 require 'tmpdir'
+require 'tempfile'
+require 'socket'
 
 module Nodo
   class << self
@@ -21,4 +23,4 @@ require_relative 'nodo/constant'
 require_relative 'nodo/client'
 require_relative 'nodo/core'
 
-require_relative 'nodo/railtie' if defined?(Rails)
+require_relative 'nodo/railtie' if defined?(Rails::Railtie)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nodo
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Matthias Grosser
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Call Node.js from Ruby