plux 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a48ed6a3720e61c2bce1d3b181f93b2b8c290019c7feb076ca2398a4c0b6f203
-  data.tar.gz: 67d7f993aeba391f3986e284c38846e5bc4afb3305b475e390969c3f3dca5c09
+  metadata.gz: 472f8a38bccdb6c63b10b4291c4cd109598e8819222c4061dd673f3491d58344
+  data.tar.gz: 489ce27db397a3df71058642b8f3dab80ac255cf1ace82f66c12d80980de4efc
 SHA512:
-  metadata.gz: 10539dd311f59a391218943e159d389b99033239136f6aeb04137f39e3d563c5fb5af287d907a708bb1f4cbbfec942e3a1e4d053c64e92147f91ca121b3c1559
-  data.tar.gz: eab024ca828276eebc07118249bd7d9493dde24988f14bd7df71f367d865a5a7580fdc7dc5fdd97e6ee119b56d9cb43f98f9bd81ce0dd58cd74932719c46bed9
+  metadata.gz: 565721905d9e193557d56c78a323f35bd41e1650bb7592607534a6da3cf9f961d66801b2a169477f9b3b2019f06d45e1e08bcda6b146d855d5018b11ba5a6231
+  data.tar.gz: 32d1c59b0a5b169e9ed33302d576dc3d87e42ba376d9f927f61a34d1f5b8bcdf44582fe11a547de0d62c1827158248dfb6293df8fd06cdaa5716f23bcb313741

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plux (0.1.0)
+    plux (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/plux.rb

@@ -3,6 +3,8 @@ require "socket"
 require "plux/version"
 require "plux/server"
 require "plux/client"
+require "plux/parser"
+
 
 module Plux
 

data/lib/plux/client.rb

@@ -4,18 +4,17 @@ module Plux
 
     def initialize(server_name)
       @server_name = server_name
-      UNIXSocket.open(Plux.server_file(server_name)) do |c|
-        reader, @writer = IO.pipe
-        c.send_io(reader)
-        reader.close
-      end
+      @writer = UNIXSocket.open(Plux.server_file(server_name))
     end
 
-    def puts(arg)
-      @writer.puts(arg)
+    def puts(msg)
+      Parser.encode(msg).each do |sub_msg|
+        @writer.write(sub_msg)
+      end
     end
 
     def close
+      puts(Parser::LAST_MSG)
       @writer.close
     end
   end

data/lib/plux/parser.rb

@@ -0,0 +1,67 @@
+module Plux
+  class Parser
+
+    SYSTEM = 36
+    SEPERATOR = '.'.freeze
+    STREAM_MAX_LEN = 4096
+    LAST_MSG = ''.freeze
+
+    def initialize
+      @broken = ''
+    end
+
+    def decode(stream)
+      stream = @broken.concat(stream)
+      result = []
+
+      start = 0
+      pending = stream.length
+
+      until start >= pending
+        sep_idx = stream.index(SEPERATOR, start)
+
+        unless sep_idx
+          len_str = stream[start, pending]
+          @broken.clear
+          @broken.concat(len_str)
+          return result
+        end
+
+        len_str = stream[start, sep_idx - start]
+        est_len = len_str.to_i(SYSTEM)
+        start = sep_idx + 1
+        msg = stream[start, est_len]
+        act_len = msg.length
+
+        if act_len < est_len
+          @broken.clear
+          @broken.concat(len_str)
+          @broken.concat(SEPERATOR)
+          @broken.concat(msg)
+          return result
+        end
+
+        result << msg
+        start += act_len
+      end
+
+      @broken.clear
+      result
+    end
+
+    def self.encode(msg)
+      len = msg.length.to_s(SYSTEM)
+
+      msg = "#{len}#{SEPERATOR}#{msg}"
+      len = msg.length
+
+      return [msg] if len < STREAM_MAX_LEN
+
+      div, mod = len.divmod(STREAM_MAX_LEN)
+      (mod > 0 ? (div + 1) : div).times.map do |start|
+        msg[start * STREAM_MAX_LEN, STREAM_MAX_LEN]
+      end
+    end
+
+  end
+end

data/lib/plux/server.rb

@@ -65,13 +65,24 @@ module Plux
 
     class Worker
       def initialize(socket, worker)
+        par = Parser.new
         t = Thread.new do
-          client = socket.recv_io
-          socket.close
-          while line = client.gets
-            worker.work(line)
+          loop do
+            begin
+              stream = socket.read_nonblock(Parser::STREAM_MAX_LEN)
+            rescue IO::WaitReadable
+              IO.select([socket])
+              retry
+            end
+
+            msgs = par.decode(stream)
+            last_msg = msgs.pop
+
+            msgs.each{ |msg| worker.work(msg) }
+            break if last_msg == Parser::LAST_MSG
+            worker.work(last_msg)
           end
-          client.close
+          socket.close
         end
       end
     end

data/lib/plux/version.rb

@@ -1,3 +1,3 @@
 module Plux
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plux
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - bin/setup
 - lib/plux.rb
 - lib/plux/client.rb
+- lib/plux/parser.rb
 - lib/plux/server.rb
 - lib/plux/version.rb
 - plux.gemspec