io_daemonizer 4 → 7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32930632de1bc82574c36effe2665f42e3759f1260142d185dad0deed19f3ded
-  data.tar.gz: e86887bcd129dc4997febb337779420a5bcd644e17489b6e395a90c19fa91b69
+  metadata.gz: 659f573346f478e82593492d57366baa4f704cdad86495f71f9e14d3ab656e53
+  data.tar.gz: '028c6285884760b1a2fa0330844128c1f63a713bc6efa1b2e6775f4ae3dcd64d'
 SHA512:
-  metadata.gz: 0d45b854ab37c9dfc7bc06ae83ced4c1ef2b82b59fb94f0d5ba8bf5042e96732b5afc9514e982242faf9bcc72ff18bf2b1fc2d695ed83cf39f5986186dbdb1b2
-  data.tar.gz: 38ad97f6c54e41d057a4d6c0dacb41420b273d8549560fe75da9cf87e443acb513ca0c12044ef260f4d6e9a5dfbe11ed9609620589298b1aff23adcfcd660e1d
+  metadata.gz: ebb22484722226e4761a4a29176f9b62f95513f693653c93adc7deb815f491b5b5711579c8ba29cf2810bb9c16f3e8539201cc287607ac4cf4e73074b35e21fc
+  data.tar.gz: 3ee8bd1928ca173f3ccd5d9e10e47809bac6224f8e5d2eacece6aaf45d97328d5fcceae3201e3f7dbbe2d8df9059d5cf93dbd2401d117ae2223e224969a53d03

data/io_daemonizer.rb

@@ -1,11 +1,12 @@
-# io_daemonizer v.4 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.7.1 https://github.com/joeyschoblaska/io_daemonizer
 
+require "json"
 require "shellwords"
 require "socket"
 require "stringio"
 
 class IODaemonizer
-  def self.wrap(port:, setup:, run:)
+  def self.wrap(port:, setup:, run:, autostart: true)
     case ARGV[0]
     when "start"
       puts "starting server..."
@@ -14,18 +15,28 @@ class IODaemonizer
       puts "stopping server..."
       send_request(port: port, args: ARGV)
     else
-      send_request(port: port, args: ARGV)
+      begin
+        send_request(port: port, args: ARGV)
+      rescue Errno::ECONNREFUSED => e
+        raise(e) unless autostart
+        Daemon.run(port: port, setup: setup, run: run, fork: true)
+        sleep 0.1
+        send_request(port: port, args: ARGV)
+      end
     end
   rescue Errno::ECONNREFUSED
     puts "server not running or not responding"
   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
 
@@ -39,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:)
@@ -73,14 +84,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 if ch == "}"
+      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: '4'
+  version: '7.1'
 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: []