nodo 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46009bcd3e3e8e5fd0f0a6f624c3f263caa09c64225878011e557333ffb8e64
-  data.tar.gz: 98eed61321bae14d89725f6884a16d2c3fccc2eb20f808781b10842e2f22ae25
+  metadata.gz: 68a024656d2aaacddb3f52790316307d06acd432c0e5f43d149ad6c716888899
+  data.tar.gz: 07020ab3ca97f25f90e2e0f2b26ecdf43f78312a308852e6f5f0a50e6ad57d73
 SHA512:
-  metadata.gz: ce0e598a9e6cffb816b53ce802a1a412746d195e387424b3362cc765d1fbd03931322c734a3ee6817487151f9969f414e1d99cfc1a4e9bddce99a7d6c7d95e26
-  data.tar.gz: a628c3765b94bd32600f554c1e973703e90a9dbcb06764b3d3256eb6ceb519997b2241f1f7c02474b8859aa2b4ff0049c863bcf047d38fbeeb8ed1be5e1bedb2
+  metadata.gz: 89c52ca6b172f94b4bc55730cad6d9934fe4c1fc914b0236665202ec26f5d98b77790336aed67af275fd2b4d5050dce4675b43d02639a9a5911d2836b651e6ae
+  data.tar.gz: 9a7fe1128ed3198d2ae4a936eda189d806f3a5e3221efb745d71b7b2a92dff546855e7f06a457648241860e1515ec0aae6ea8bc63703d64b0a9ba87a298174c5

data/lib/nodo/core.rb

@@ -12,6 +12,8 @@ module Nodo
     @@mutex = Mutex.new
     
     class << self
+      extend Forwardable
+      
       attr_accessor :class_defined
       
       def inherited(subclass)
@@ -24,6 +26,10 @@ module Nodo
         @instance ||= new
       end
       
+      def class_function(*methods)
+        singleton_class.def_delegators(:instance, *methods)
+      end
+      
       def class_defined?
         !!class_defined
       end
@@ -56,8 +62,10 @@ module Nodo
         self.dependencies = dependencies + mods.merge(deps).map { |name, package| Dependency.new(name, package) }
       end
 
-      def function(name, code)
-        self.functions = functions.merge(name => Function.new(name, code, caller.first))
+      def function(name, _code = nil, timeout: 60, code: nil)
+        code = (code ||= _code).strip
+        raise ArgumentError, 'function code is required' if '' == code
+        self.functions = functions.merge(name => Function.new(name, _code || code, caller.first, timeout))
         define_method(name) { |*args| call_js_method(name, args) }
       end
       
@@ -181,12 +189,15 @@ module Nodo
       request = Net::HTTP::Post.new("/#{clsid}/#{method}", 'Content-Type': 'application/json')
       request.body = JSON.dump(args)
       client = Client.new("unix://#{socket_path}")
+      client.read_timeout = function.timeout if function
       response = client.request(request)
       if response.is_a?(Net::HTTPOK)
         parse_response(response)
       else
         handle_error(response, function)
       end
+    rescue Net::ReadTimeout
+      raise TimeoutError, "function call #{self.class}##{method} timed out"
     rescue Errno::EPIPE, IOError
       # TODO: restart or something? If this happens the process is completely broken
       raise Error, 'Node process failed'
@@ -201,7 +212,8 @@ module Nodo
     end
     
     def parse_response(response)
-      JSON.parse(response.body.force_encoding('UTF-8'))
+      data = response.body.force_encoding('UTF-8')
+      JSON.parse(data) unless data == ''
     end
     
     def with_tempfile(name)

data/lib/nodo/function.rb

@@ -1,9 +1,9 @@
 module Nodo
   class Function
-    attr_reader :name, :code, :source_location
+    attr_reader :name, :code, :source_location, :timeout
   
-    def initialize(name, code, source_location)
-      @name, @code, @source_location = name, code, source_location
+    def initialize(name, code, source_location, timeout)
+      @name, @code, @source_location, @timeout = name, code, source_location, timeout
     end
   
     def to_js

data/lib/nodo/version.rb

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

data/lib/nodo.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'tmpdir'
 require 'tempfile'
 require 'socket'
+require 'forwardable'
 
 module Nodo
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nodo
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler