io_daemonizer 3 → 6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fe90c198a168ddb60ba8664074e8ba81eb4e08fbfac69e86af72edea74e937f
-  data.tar.gz: a386e4e1e76bbf154944d579d9220a35bfe7123d4725ef20bc22a2c3950a3fd1
+  metadata.gz: 9221b86c37a20ab3d79c7fb1fee60e9a7c74aa083d3aff30da43e755c9a02256
+  data.tar.gz: f0b41de14e06824a163ded73f2b70d45bc54c1c086ee8c2419b83af4d1ab3c58
 SHA512:
-  metadata.gz: 2804cf8d50674070fe9bd9c6c8fb951bd6868acd7ee01a3862963b6e22f122ad09ea56113e892e93185a0d2caf58a30dcf24b570bcfbce86db62cc35f0a389d9
-  data.tar.gz: 291594bc93f1a5b269c8a668815ff3bc9f1ebc18cb01c164d014307701e1d72224e89b950b5ef1a4b02b7cdc655a22770ad90fda506b140357be90403d289df7
+  metadata.gz: cbcfd15d8a147dc074f4003e7d1a6f2ee17979644220abb54044b740c7023f0f51bab528c395b38b053efb685abac807c4648387b9aa5c1e3cad0d0e45f0ef5f
+  data.tar.gz: 250baadd6ca2b943920408f431a66b5920f1655cfd44b4026f7c08409b23dcf9ad19972e2aae7f900e09268d4f9c472c33e80455a62ddf982e78751da9433f44

data/io_daemonizer.rb

@@ -1,33 +1,44 @@
-# io_daemonizer v.3 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.6 https://github.com/joeyschoblaska/io_daemonizer
 
+require "json"
 require "shellwords"
 require "socket"
 require "stringio"
 
 class IODaemonizer
-  PORT = ENV["IO_DAEMONIZER_PORT"] || 5289
-
-  def self.wrap(setup: -> {}, run: -> {})
+  def self.wrap(port:, setup:, run:, autostart: true)
     case ARGV[0]
     when "start"
       puts "starting server..."
-      Daemon.run(setup: setup, run: run)
+      Daemon.run(port: port, setup: setup, run: run)
     when "stop"
       puts "stopping server..."
-      send_request(ARGV)
+      send_request(port: port, args: ARGV)
     else
-      send_request(ARGV)
+      begin
+        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 }
+        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(args)
-    TCPSocket.open("127.0.0.1", PORT) do |socket|
+  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
 
@@ -41,13 +52,14 @@ class IODaemonizer
   end
 
   class Daemon
-    def self.run(setup: -> {}, run: -> {})
-      daemon = new(setup: setup, run: run)
+    def self.run(port:, setup:, run:)
+      daemon = new(port: port, setup: setup, run: run)
       daemon.setup
       daemon.start
     end
 
-    def initialize(setup: -> {}, run: -> {})
+    def initialize(port:, setup:, run:)
+      @port = port
       @setup = setup
       @run = run
       @context = Object.new
@@ -58,7 +70,7 @@ class IODaemonizer
     end
 
     def start
-      @server = TCPServer.open("127.0.0.1", PORT)
+      @server = TCPServer.open("127.0.0.1", @port)
       Process.daemon(true)
       read_socket(@server.accept) until @server.closed?
     end
@@ -74,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: '3'
+  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: []
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: IO Daemonizer