plux 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a48ed6a3720e61c2bce1d3b181f93b2b8c290019c7feb076ca2398a4c0b6f203
-  data.tar.gz: 67d7f993aeba391f3986e284c38846e5bc4afb3305b475e390969c3f3dca5c09
+  metadata.gz: fe3a01341377759b20ec857779769a121787a2caa79d1f06c33871e779a4a2db
+  data.tar.gz: bdd9a7988dd40776d31b62989b59191b3474436f6a0a847869eb1b568de59303
 SHA512:
-  metadata.gz: 10539dd311f59a391218943e159d389b99033239136f6aeb04137f39e3d563c5fb5af287d907a708bb1f4cbbfec942e3a1e4d053c64e92147f91ca121b3c1559
-  data.tar.gz: eab024ca828276eebc07118249bd7d9493dde24988f14bd7df71f367d865a5a7580fdc7dc5fdd97e6ee119b56d9cb43f98f9bd81ce0dd58cd74932719c46bed9
+  metadata.gz: 1dda3d9c1d45d6acd3af4f8cdba9e3ba954b5d3c8ac0c35cada18ffcf89c08bfe7aabdf31ecb46de30c304a57a78c8762d1b66694244f0b7252974c12337fac5
+  data.tar.gz: 142cff4debc8825f8911d2c542d2f03e13a04d49d9a81a8cf414f313073d5be9eb67b608d58c8d03be0ec0a069d4db2c95b1c957769860bb7a841edb6abe05a6

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    plux (0.1.0)
+    plux (0.1.6)
+      nio4r (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,6 +10,7 @@ GEM
     coderay (1.1.2)
     method_source (0.9.2)
     minitest (5.14.1)
+    nio4r (2.5.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -21,32 +21,57 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# start one and only process named 'abc',
+# start one and only process named 'abc', with 2 threads in it (1 thread if not specified),
 # no matter the code below is called how many times in whatever processes/threads
-server = Plux.worker(:abc) do
+server = Plux.worker(:abc, thread: 2) do
 
-  # prepare resources like mq/db, to handle requests
-  def initialize
+  # prepare thread-safe resources like mq/db, to handle requests
+  def prepare
     # @db = ...
   end
 
   # threads call this method to deal with clients' message
-  def work(msg)
+  def process(msg)
     # @db << parse(msg)
   end
 end
 
-# five threads will be started to handle these clients,
-# and finished once their counterparts call close
+# clients connect, send msg, and close concurrently
 5.times do |n|
   Thread.new do
     client = server.connect
-    client.puts "hello #{n}"
+    client.puts "hello"
+    client.puts "my name is #{n}"
     client.close
   end
 end
 ```
 
+Also, you can boot multiple servers(processes) with same logic:
+
+```ruby
+class AwesomeServer < Plux::Engine
+  # prepare thread-safe resources like mq/db, to handle requests
+  def prepare
+    # @db = ...
+  end
+
+  # threads call this method to deal with clients' message
+  def process(msg)
+    # @db << parse(msg)
+  end
+end
+
+a = AwesomeServer.new(:a)
+b = AwesomeServer.new(:b)
+c = AwesomeServer.new(:c, thread: 4)
+
+a_client = a.connect
+b_client = b.connect
+c_client = c.connect
+c_client_2 = c.connect
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/plux.rb

@@ -3,6 +3,9 @@ require "socket"
 require "plux/version"
 require "plux/server"
 require "plux/client"
+require "plux/parser"
+require "plux/engine"
+
 
 module Plux
 
@@ -30,10 +33,12 @@ module Plux
       File.join(dir, "#{server_name}.so")
     end
 
-    def worker(name, &block)
-      Server.new(name).boot(block)
+    def worker(name, thread: 1, &block)
+      worker = Class.new(&block).new
+      Server.new(name, thread: thread).boot(worker)
     end
   end
 
   FileUtils.mkdir_p(self.dir)
+
 end

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/engine.rb

@@ -0,0 +1,18 @@
+module Plux
+  class Engine
+
+    def initialize(name, thread: 1)
+      @server = Server.new(name, thread: thread).boot(self)
+    end
+
+    def connect
+      @server.connect
+    end
+
+    def prepare
+    end
+
+    def process(msg)
+    end
+  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/reactor.rb

@@ -0,0 +1,76 @@
+module Plux
+  class Reactor
+    def initialize(count, worker)
+      @worker = worker
+      @msg_q = Queue.new
+      @count = count
+
+      @nio = NIO::Selector.new
+      @newly_accepted = Queue.new
+      @closed = []
+
+      receive
+      process
+    end
+
+    def register(socket)
+      @newly_accepted << socket
+      @nio.wakeup
+    end
+
+    private
+
+    def receive
+      Thread.new do
+        loop do
+          @closed.size.times{ @nio.deregister(@closed.pop) }
+
+          @newly_accepted.size.times do
+            socket = @newly_accepted.pop
+            mon = @nio.register(socket, :r)
+            mon.value = Worker.new(socket, @msg_q)
+          end
+
+          @nio.select do |m|
+            next if m.value.process
+            @closed << m.io
+          end
+        end
+      end
+    end
+
+    def process
+      @count.times.each do
+        Thread.new do
+          loop{ @worker.process(@msg_q.deq) }
+        end
+      end
+    end
+
+    class Worker
+      def initialize(socket, q)
+        @parser = Parser.new
+        @socket = socket
+        @q = q
+      end
+
+      def process
+        stream = @socket.read_nonblock(Parser::STREAM_MAX_LEN, exception: false)
+        return true if stream == :wait_readable
+
+        msgs = @parser.decode(stream)
+        last_msg = msgs.pop
+
+        msgs.each{ |msg| @q << msg }
+        if last_msg == Parser::LAST_MSG
+          @socket.close
+          return false
+        end
+        @q << last_msg
+
+        true
+      end
+    end
+
+  end
+end

data/lib/plux/server.rb

@@ -1,3 +1,6 @@
+require "nio"
+require "plux/reactor"
+
 module Plux
 
   class Server
@@ -6,13 +9,14 @@ module Plux
     Active = {}
     at_exit{ Active.values.each(&:close) }
 
-    def initialize(name)
+    def initialize(name, thread: )
       @name = name
+      @thread = thread
     end
 
-    def boot(block)
+    def boot(worker)
       Plux.lock_pid_file(name) do |file|
-        start_server_if_not_pid(file, block)
+        start_server_if_not_pid(file, worker)
       end
       self
     end
@@ -27,7 +31,7 @@ module Plux
 
     private
 
-    def start_server_if_not_pid(file, block)
+    def start_server_if_not_pid(file, worker)
       @pid = file.read.to_i
       return unless pid == 0
 
@@ -39,11 +43,9 @@ module Plux
         child.close
         UNIXServer.open(Plux.server_file(name)) do |serv|
           parent.close
-          worker = Class.new(&block).new
-          loop do
-            socket = serv.accept
-            Worker.new(socket, worker)
-          end
+          worker.prepare
+          reactor = Reactor.new(@thread, worker)
+          loop{ reactor.register(serv.accept) }
         end
       end
 
@@ -62,20 +64,6 @@ module Plux
         File.delete(Plux.send(file, name))
       end
     end
-
-    class Worker
-      def initialize(socket, worker)
-        t = Thread.new do
-          client = socket.recv_io
-          socket.close
-          while line = client.gets
-            worker.work(line)
-          end
-          client.close
-        end
-      end
-    end
-
   end
 
 end

data/lib/plux/version.rb

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

data/plux.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
+
+  spec.add_dependency "nio4r", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plux
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - block24block@gmail.com
@@ -85,6 +99,9 @@ files:
 - bin/setup
 - lib/plux.rb
 - lib/plux/client.rb
+- lib/plux/engine.rb
+- lib/plux/parser.rb
+- lib/plux/reactor.rb
 - lib/plux/server.rb
 - lib/plux/version.rb
 - plux.gemspec