io_daemonizer 5 → 7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b48adc5074a3057dd995bd6111fffcaecaf14436d94aa781c822eef10fd95b
-  data.tar.gz: 1f816e2e331f8132844a4fcc1a8da7731d4d08d70165f89ac34c3f985a969466
+  metadata.gz: b77913ca0b5c285bb8a710fd00053a24866b53573ba9c41bb16ed602e31b38c4
+  data.tar.gz: 547656ffb02c86efcc71e61fc880b2123c107ec6db9b2f1096a7f1cef295ec70
 SHA512:
-  metadata.gz: f531743fc395f854ed431ee7e2f283a206995df75367fe5fe871d8d7d1e238a482b0baf0ea132c8b384055377169870122e443c2840f51b2da092d25c2472dd2
-  data.tar.gz: fe64289f1d5b86e12f52c157e46cb1d8e5d93ac9f95be18aa46e51f34a81f4a42f77a7ca0d193dc22fca2b0636f4f10349e342a97e6f3c0dd36d783ac1f2ee7b
+  metadata.gz: 6fd051362f2c045038893605755df28027058bc6207a9e7c59f2637061b8dc38887677575303403430d5acc78480ac571bb2a30cc826cbc27c6d42e99ad7baff
+  data.tar.gz: 2b83f413fa0cdbf040844263e5b0ac0e6a0feb2f3742bd77cc796bc310cfcea7b40823ee8941462a3c2a9283e1d2043b22b14175b94287b86da5dfa8bf39f21c

data/io_daemonizer.rb

@@ -1,5 +1,6 @@
-# io_daemonizer v.5 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.7.2 https://github.com/joeyschoblaska/io_daemonizer
 
+require "json"
 require "shellwords"
 require "socket"
 require "stringio"
@@ -18,9 +19,7 @@ class IODaemonizer
         send_request(port: port, args: ARGV)
       rescue Errno::ECONNREFUSED => e
         raise(e) unless autostart
-        daemon = Daemon.new(port: port, setup: setup, run: run)
-        daemon.setup
-        fork { daemon.start }
+        Daemon.run(port: port, setup: setup, run: run, fork: true)
         sleep 0.1
         send_request(port: port, args: ARGV)
       end
@@ -30,11 +29,14 @@ class IODaemonizer
   end
 
   def self.send_request(port:, args:)
+    consumer = LabeledIOConsumer.new
+
     TCPSocket.open("127.0.0.1", port) do |socket|
       socket.puts args.shelljoin
       socket.write $stdin.tty? ? "" : $stdin.read
       socket.close_write
-      STDOUT.write(socket.read(4096)) until socket.eof?
+
+      consumer.write(socket.read) until socket.eof?
     end
   end
 
@@ -48,10 +50,10 @@ class IODaemonizer
   end
 
   class Daemon
-    def self.run(port:, setup:, run:)
+    def self.run(port:, setup:, run:, fork: false)
       daemon = new(port: port, setup: setup, run: run)
       daemon.setup
-      daemon.start
+      fork ? Kernel.fork { daemon.start } : daemon.start
     end
 
     def initialize(port:, setup:, run:)
@@ -82,14 +84,59 @@ class IODaemonizer
       else
         IODaemonizer.redirect(
           stdin: StringIO.new(body.join),
-          stdout: socket,
-          stderr: socket
+          stdout: IOLabeler.new(1, socket, "stdout"),
+          stderr: IOLabeler.new(2, socket, "stderr")
         ) { @context.instance_exec args, &@run }
       end
     rescue => e
       socket.write e.inspect
+      raise e
     ensure
+      socket.close_write
       socket.close
     end
   end
+
+  class IOLabeler < IO
+    attr_reader :label
+
+    def initialize(fd, socket, label)
+      super(fd)
+      @socket = socket
+      @label = label
+    end
+
+    def write(chunk)
+      @socket.write({ @label => chunk }.to_json)
+    end
+
+    def reopen(io)
+      @label = io&.label || @label
+    end
+  end
+
+  class LabeledIOConsumer
+    def initialize
+      @buffer = ""
+    end
+
+    def write(chunk)
+      chunk.chars.each do |ch|
+        @buffer << ch
+        process_buffer if ch == "}"
+      end
+    end
+
+    private
+
+    def process_buffer
+      parsed = JSON.parse(@buffer)
+
+      $stdout.write(parsed["stdout"]) if parsed["stdout"]
+      $stderr.write(parsed["stderr"]) if parsed["stderr"]
+
+      @buffer = ""
+    rescue JSON::ParserError
+    end
+  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: io_daemonizer
 version: !ruby/object:Gem::Version
-  version: '5'
+  version: '7.2'
 platform: ruby
 authors:
 - Joey Schoblaska
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies: []
-description: Wrap a Ruby script that speaks IO in a daemon so that you only pay the
-  startup overhead once.
+description: Wrap a Ruby script that speaks stdio in a daemon so that you only pay
+  the startup overhead once.
 email: joey.schoblaska@gmail.com
 executables: []
 extensions: []