io_daemonizer 5 → 6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b48adc5074a3057dd995bd6111fffcaecaf14436d94aa781c822eef10fd95b
-  data.tar.gz: 1f816e2e331f8132844a4fcc1a8da7731d4d08d70165f89ac34c3f985a969466
+  metadata.gz: 9221b86c37a20ab3d79c7fb1fee60e9a7c74aa083d3aff30da43e755c9a02256
+  data.tar.gz: f0b41de14e06824a163ded73f2b70d45bc54c1c086ee8c2419b83af4d1ab3c58
 SHA512:
-  metadata.gz: f531743fc395f854ed431ee7e2f283a206995df75367fe5fe871d8d7d1e238a482b0baf0ea132c8b384055377169870122e443c2840f51b2da092d25c2472dd2
-  data.tar.gz: fe64289f1d5b86e12f52c157e46cb1d8e5d93ac9f95be18aa46e51f34a81f4a42f77a7ca0d193dc22fca2b0636f4f10349e342a97e6f3c0dd36d783ac1f2ee7b
+  metadata.gz: cbcfd15d8a147dc074f4003e7d1a6f2ee17979644220abb54044b740c7023f0f51bab528c395b38b053efb685abac807c4648387b9aa5c1e3cad0d0e45f0ef5f
+  data.tar.gz: 250baadd6ca2b943920408f431a66b5920f1655cfd44b4026f7c08409b23dcf9ad19972e2aae7f900e09268d4f9c472c33e80455a62ddf982e78751da9433f44

data/io_daemonizer.rb

@@ -1,5 +1,6 @@
-# io_daemonizer v.5 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.6 https://github.com/joeyschoblaska/io_daemonizer
 
+require "json"
 require "shellwords"
 require "socket"
 require "stringio"
@@ -30,11 +31,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
 
@@ -82,14 +86,65 @@ 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
+      end
+    end
+
+    private
+
+    def process_buffer
+      parsed = JSON.parse(@buffer)
+      key = parsed.keys[0]
+      value = parsed.values[0]
+
+      case key
+      when "stdout"
+        $stdout.write(value)
+      when "stderr"
+        $stderr.write(value)
+      end
+
+      @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: '6'
 platform: ruby
 authors:
 - Joey Schoblaska
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-07 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: []