bayserver-core 3.0.3 → 3.3.1

data/lib/baykit/bayserver/util/selector.rb

@@ -9,150 +9,113 @@ module Baykit
         OP_READ = 1
         OP_WRITE = 2
 
-        attr :channels
+        attr :io_op_map
         attr :lock
 
         def initialize
-          @channels = {}
+          @io_op_map = {}
           @lock = Mutex.new()
         end
 
         def register(ch, op)
-          #BayLog.debug("register io=%s", ch)
-          if not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
-            raise ArgumentError
-          end
+          validate_channel(ch)
           if op & OP_READ != 0
-            register_read(ch, @channels)
+            register_read(ch, @io_op_map)
           end
           if op & OP_WRITE != 0
-            register_write(ch, @channels)
+            register_write(ch, @io_op_map)
           end
         end
 
         def unregister(ch)
-          #BayLog.debug("unregister io=%s", ch)
-          if  not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
-            raise ArgumentError
-          end
-          unregister_read(ch, @channels)
-          unregister_write(ch, @channels)
+          validate_channel(ch)
+          unregister_read(ch, @io_op_map)
+          unregister_write(ch, @io_op_map)
         end
 
         def modify(ch, op)
-          if  not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
-            raise ArgumentError
-          end
+          validate_channel(ch)
           if op & OP_READ != 0
-            register_read(ch, @channels)
+            register_read(ch, @io_op_map)
           else
-            unregister_read(ch, @channels)
+            unregister_read(ch, @io_op_map)
           end
 
           if op & OP_WRITE != 0
-            register_write(ch, @channels)
+            register_write(ch, @io_op_map)
           else
-            unregister_write(ch, @channels)
+            unregister_write(ch, @io_op_map)
           end
         end
 
         def get_op(ch)
-          if not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
-            raise ArgumentError
-          end
-          return @channels[ch]
+          validate_channel(ch)
+          return @io_op_map[ch]
         end
 
-        def select(timeout_sec = nil)
-          if timeout_sec == nil
-            timeout_sec = 0
-          end
-          except_list = []
-
-          read_list = []
-          write_list = []
+        def count
           @lock.synchronize do
-            @channels.keys().each do |ch|
-              if (@channels[ch] & OP_READ) != 0
-                read_list << ch
-              end
-              if (@channels[ch] & OP_WRITE) != 0
-                write_list << ch
-              end
-            end
-          end
-          #BayLog.debug("Select read_list=%s", read_list)
-          #BayLog.debug("Select write_list=%s", write_list)
-          selected_read_list, selected_write_list = Kernel.select(read_list, write_list, except_list, timeout_sec)
-
-          result = {}
-          if selected_read_list != nil
-            selected_read_list.each do |ch|
-              register_read(ch, result)
-            end
-          end
-
-          if selected_write_list != nil
-            selected_write_list.each do |ch|
-              register_write(ch, result)
-            end
+            return @io_op_map.length
           end
+        end
 
-          return result
+        def select(timeout_sec = nil)
+          raise NotImplementedError
         end
 
-        def count
-          @lock.synchronize do
-            return @channels.length
+        def validate_channel(ch)
+          unless ch.is_a?(IO) || (defined?(OpenSSL::SSL::SSLSocket) && ch.is_a?(OpenSSL::SSL::SSLSocket))
+            raise ArgumentError
           end
         end
 
         private
-
-        def register_read(ch, ch_list)
+        def register_read(io, io_op)
           @lock.synchronize do
-            if ch_list.include?(ch)
-              ch_list[ch] = (ch_list[ch] | OP_READ)
+            if io_op.key?(io)
+              io_op[io] = (io_op[io] | OP_READ)
             else
-              ch_list[ch] = OP_READ
+              io_op[io] = OP_READ
             end
           end
         end
 
-        def register_write(ch, ch_list)
+        def register_write(io, io_op)
           @lock.synchronize do
-            if ch_list.include?(ch)
-              ch_list[ch] = (ch_list[ch] | OP_WRITE)
+            if io_op.key?(io)
+              io_op[io] = (io_op[io] | OP_WRITE)
             else
-              ch_list[ch] = OP_WRITE
+              io_op[io] = OP_WRITE
             end
           end
         end
 
-        def unregister_read(ch, ch_list)
+        def unregister_read(io, io_op)
           @lock.synchronize do
-            if ch_list.include?(ch)
-              if ch_list[ch] == OP_READ
-                ch_list.delete(ch)
+            if io_op.include?(io)
+              if io_op[io] == OP_READ
+                io_op.delete(io)
               else
-                ch_list[ch] = OP_WRITE
+                io_op[io] = OP_WRITE
               end
             end
           end
         end
 
 
-        def unregister_write(ch, ch_list)
+        def unregister_write(io, io_op)
           @lock.synchronize do
-            if ch_list.include?(ch)
-              if ch_list[ch] == OP_WRITE
-                ch_list.delete(ch)
+            if io_op.include?(io)
+              if io_op[io] == OP_WRITE
+                io_op.delete(io)
               else
-                ch_list[ch] = OP_READ
+                io_op[io] = OP_READ
               end
             end
           end
         end
+
+
       end
     end
   end

data/lib/baykit/bayserver/util/simple_buffer.rb

@@ -29,7 +29,7 @@ module Baykit
         end
 
         def put_byte(b)
-          put([b], 0, 1);
+          put(b.chr, 0, 1);
         end
 
         def put(bytes, pos=0, len=bytes.length)

data/lib/baykit/bayserver/version.rb

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
       class Version
-        VERSION='3.0.3'
+        VERSION='3.3.1'
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.3.1
 platform: ruby
 authors:
 - Michisuke-P
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2026-02-01 00:00:00.000000000 Z
 dependencies: []
 description: BayServer is one of the high-speed web servers. It operates as a single-threaded,
   asynchronous server, which makes it exceptionally fast. It also supports multi-core
@@ -20,8 +20,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.BAYKIT
 - README.md
-- lib/baykit/bayserver/agent/accept_handler.rb
-- lib/baykit/bayserver/agent/channel_listener.rb
 - lib/baykit/bayserver/agent/command_receiver.rb
 - lib/baykit/bayserver/agent/grand_agent.rb
 - lib/baykit/bayserver/agent/letters/accepted_letter.rb
@@ -38,13 +36,10 @@ files:
 - lib/baykit/bayserver/agent/multiplexer/job_multiplexer_base.rb
 - lib/baykit/bayserver/agent/multiplexer/multiplexer_base.rb
 - lib/baykit/bayserver/agent/multiplexer/plain_transporter.rb
-- lib/baykit/bayserver/agent/multiplexer/rudder_state.rb
 - lib/baykit/bayserver/agent/multiplexer/secure_transporter.rb
 - lib/baykit/bayserver/agent/multiplexer/spider_multiplexer.rb
 - lib/baykit/bayserver/agent/multiplexer/spin_multiplexer.rb
 - lib/baykit/bayserver/agent/multiplexer/taxi_multiplexer.rb
-- lib/baykit/bayserver/agent/multiplexer/transporter.rb
-- lib/baykit/bayserver/agent/multiplexer/write_unit.rb
 - lib/baykit/bayserver/agent/next_socket_action.rb
 - lib/baykit/bayserver/agent/non_blocking_handler.rb
 - lib/baykit/bayserver/agent/package.rb
@@ -53,11 +48,6 @@ files:
 - lib/baykit/bayserver/agent/signal/signal_sender.rb
 - lib/baykit/bayserver/agent/spin_handler.rb
 - lib/baykit/bayserver/agent/timer_handler.rb
-- lib/baykit/bayserver/agent/transporter/data_listener.rb
-- lib/baykit/bayserver/agent/transporter/package.rb
-- lib/baykit/bayserver/agent/transporter/spin_read_transporter.rb
-- lib/baykit/bayserver/agent/transporter/spin_write_transporter.rb
-- lib/baykit/bayserver/agent/transporter/transporter.rb
 - lib/baykit/bayserver/agent/upgrade_exception.rb
 - lib/baykit/bayserver/bay_dockers.rb
 - lib/baykit/bayserver/bay_exception.rb
@@ -80,12 +70,16 @@ files:
 - lib/baykit/bayserver/common/postpone.rb
 - lib/baykit/bayserver/common/read_only_ship.rb
 - lib/baykit/bayserver/common/recipient.rb
+- lib/baykit/bayserver/common/rudder_state.rb
+- lib/baykit/bayserver/common/rudder_state_store.rb
+- lib/baykit/bayserver/common/transporter.rb
 - lib/baykit/bayserver/common/vehicle.rb
 - lib/baykit/bayserver/common/vehicle_runner.rb
 - lib/baykit/bayserver/common/warp_data.rb
 - lib/baykit/bayserver/common/warp_handler.rb
 - lib/baykit/bayserver/common/warp_ship.rb
 - lib/baykit/bayserver/common/warp_ship_store.rb
+- lib/baykit/bayserver/common/write_unit.rb
 - lib/baykit/bayserver/config_exception.rb
 - lib/baykit/bayserver/constants.rb
 - lib/baykit/bayserver/docker/base/club_base.rb
@@ -101,7 +95,6 @@ files:
 - lib/baykit/bayserver/docker/built_in/built_in_secure_docker.rb
 - lib/baykit/bayserver/docker/built_in/built_in_town_docker.rb
 - lib/baykit/bayserver/docker/built_in/built_in_trouble_docker.rb
-- lib/baykit/bayserver/docker/built_in/log_boat.rb
 - lib/baykit/bayserver/docker/built_in/log_item.rb
 - lib/baykit/bayserver/docker/built_in/log_item_factory.rb
 - lib/baykit/bayserver/docker/built_in/log_items.rb
@@ -117,9 +110,12 @@ files:
 - lib/baykit/bayserver/docker/reroute.rb
 - lib/baykit/bayserver/docker/secure.rb
 - lib/baykit/bayserver/docker/send_file/directory_train.rb
+- lib/baykit/bayserver/docker/send_file/file_content.rb
 - lib/baykit/bayserver/docker/send_file/file_content_handler.rb
+- lib/baykit/bayserver/docker/send_file/file_store.rb
 - lib/baykit/bayserver/docker/send_file/send_file_docker.rb
 - lib/baykit/bayserver/docker/send_file/send_file_ship.rb
+- lib/baykit/bayserver/docker/send_file/wait_file_ship.rb
 - lib/baykit/bayserver/docker/town.rb
 - lib/baykit/bayserver/docker/trouble.rb
 - lib/baykit/bayserver/docker/warp.rb
@@ -142,6 +138,7 @@ files:
 - lib/baykit/bayserver/protocol/protocol_handler_store.rb
 - lib/baykit/bayserver/rudders/io_rudder.rb
 - lib/baykit/bayserver/rudders/rudder.rb
+- lib/baykit/bayserver/rudders/rudder_base.rb
 - lib/baykit/bayserver/ships/ship.rb
 - lib/baykit/bayserver/sink.rb
 - lib/baykit/bayserver/taxi/taxi.rb
@@ -151,7 +148,6 @@ files:
 - lib/baykit/bayserver/tours/read_file_taxi.rb
 - lib/baykit/bayserver/tours/req_content_handler.rb
 - lib/baykit/bayserver/tours/send_file_train.rb
-- lib/baykit/bayserver/tours/send_file_yacht.rb
 - lib/baykit/bayserver/tours/tour.rb
 - lib/baykit/bayserver/tours/tour_handler.rb
 - lib/baykit/bayserver/tours/tour_req.rb
@@ -180,9 +176,11 @@ files:
 - lib/baykit/bayserver/util/md5_password.rb
 - lib/baykit/bayserver/util/message.rb
 - lib/baykit/bayserver/util/mimes.rb
+- lib/baykit/bayserver/util/nio_selector.rb
 - lib/baykit/bayserver/util/object_factory.rb
 - lib/baykit/bayserver/util/object_store.rb
 - lib/baykit/bayserver/util/postman.rb
+- lib/baykit/bayserver/util/rb_selector.rb
 - lib/baykit/bayserver/util/reusable.rb
 - lib/baykit/bayserver/util/selector.rb
 - lib/baykit/bayserver/util/simple_buffer.rb
@@ -193,13 +191,11 @@ files:
 - lib/baykit/bayserver/util/url_encoder.rb
 - lib/baykit/bayserver/util/valve.rb
 - lib/baykit/bayserver/version.rb
-- lib/baykit/bayserver/watercraft/boat.rb
-- lib/baykit/bayserver/watercraft/yacht.rb
 homepage: https://baykit.yokohama
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,8 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: BayServer core module
 test_files: []

data/lib/baykit/bayserver/agent/accept_handler.rb

@@ -1,71 +0,0 @@
-require 'fcntl'
-
-require 'baykit/bayserver/util/selector'
-
-module Baykit
-  module BayServer
-    module Agent
-        class AcceptHandler
-          include Baykit::BayServer::Agent
-          include Baykit::BayServer::Util
-
-          attr :agent
-          attr :port_map
-
-          attr :is_shutdown
-          attr :ch_count
-
-          def initialize(agent, port_map)
-            @agent = agent
-            @port_map = port_map
-            @ch_count = 0
-            @is_shutdown = false
-          end
-
-          def on_acceptable(server_skt)
-          end
-
-          def on_closed()
-            @ch_count -= 1
-          end
-
-          def on_busy()
-            BayLog.debug("%s AcceptHandler:onBusy", @agent)
-            @port_map.keys().each do |ch|
-              @agent.selector.unregister(ch)
-            end
-          end
-
-          def on_free()
-            BayLog.debug("%s AcceptHandler:onFree isShutdown=%s", @agent, @is_shutdown)
-            if @is_shutdown
-              return
-            end
-
-            @port_map.keys().each do |ch|
-              @agent.selector.register(ch, Selector::OP_READ)
-            end
-          end
-
-          def server_socket?(skt)
-            return @port_map.key?(skt)
-          end
-
-          def close_all()
-            @port_map.keys.each do |skt|
-              BayLog.debug("%s Close server Socket: %s", @agent, skt)
-              skt.close()
-            end
-          end
-
-          def shutdown()
-            @is_shutdown = true
-            on_busy()
-            @agent.wakeup()
-          end
-
-        end
-    end
-  end
-end
-

data/lib/baykit/bayserver/agent/channel_listener.rb

@@ -1,35 +0,0 @@
-
-module Baykit
-  module BayServer
-    module Agent
-      module ChannelListener # interface
-
-        def on_readable(chk_ch)
-          raise NotImplementedError.new
-        end
-
-        def on_writable(chk_ch)
-          raise NotImplementedError.new
-        end
-
-        def on_connectable(chk_ch)
-          raise NotImplementedError.new
-        end
-
-        def on_error(chk_ch, e)
-          raise NotImplementedError.new
-        end
-
-        def on_closed(chk_ch)
-          raise NotImplementedError.new
-        end
-
-        def check_timeout(chk_ch, duration)
-          raise NotImplementedError.new
-        end
-
-      end
-    end
-  end
-end
-

data/lib/baykit/bayserver/agent/transporter/data_listener.rb

@@ -1,38 +0,0 @@
-module Baykit
-  module BayServer
-    module Agent
-      module Transporter
-        module DataListener  # interface
-
-          def notify_connect()
-            raise NotImplementedError.new
-          end
-
-          def notify_handshake_done(protocol)
-            raise NotImplementedError.new
-          end
-
-          def notify_read(buf)
-            raise NotImplementedError.new
-          end
-
-          def notify_eof()
-            raise NotImplementedError.new
-          end
-
-          def notify_protocol_error(err)
-            raise NotImplementedError.new
-          end
-
-          def notify_close()
-            raise NotImplementedError.new
-          end
-
-          def check_timeout(duration_sec)
-            raise NotImplementedError.new
-          end
-        end
-      end
-    end
-  end
-end

data/lib/baykit/bayserver/agent/transporter/spin_read_transporter.rb

@@ -1,111 +0,0 @@
-require 'baykit/bayserver/agent/spin_handler'
-require 'baykit/bayserver/util/string_util'
-require 'baykit/bayserver/util/valve'
-
-module Baykit
-  module BayServer
-    module Agent
-        module Transporter
-          class SpinReadTransporter
-            include Baykit::BayServer::Agent::SpinHandler::SpinListener # implements
-            include Baykit::BayServer::Util::Valve # implements
-            include Baykit::BayServer::Util
-
-            attr :spin_handler
-            attr :data_listener
-            attr :infile
-            attr :read_buf
-            attr :total_read
-            attr :file_len
-            attr :timeout_sec
-            attr :eof_checker
-            attr :is_closed
-
-            def initialize(buf_size)
-              @read_buf = StringUtil.alloc(buf_size)
-            end
-
-            def init(spin_hnd, lis, infile, limit, timeout_sec, eof_checker)
-              @spin_handler = spin_hnd
-              @data_listener = lis
-              @infile = infile
-              @file_len = limit
-              @total_read = 0
-              @timeout_sec = timeout_sec
-              @eof_checker = eof_checker
-              @is_closed = false
-            end
-
-            def to_s
-              data_listener.to_s()
-            end
-
-            ######################################################
-            # Implements Reusable
-            ######################################################
-
-            def reset()
-              @data_listener = nil
-              @infile = nil
-            end
-
-            ######################################################
-            # Implements SpinListener
-            ######################################################
-
-            def lap()
-              begin
-                @infile.sysread(@buf_size, @read_buf)
-
-                if @read_buf.length == 0
-                  return NextSocketAction::CONTINUE, true
-                end
-                @total_read += @read_buf.length
-
-                next_act = @yacht.notify_read(@read_buf)
-
-                if @total_read == @file_len
-                  @data_listener.notify_eof()
-                  close()
-                  return NextSocketAction::CLOSE, false
-                end
-
-                return next_act, false
-              rescue Exception => e
-                BayLog.error_e(e)
-                close()
-                return NextSocketAction::CLOSE, false
-              end
-            end
-
-            def check_timeout(duration_sec)
-              return duration_sec > @timeout_sec
-            end
-
-            def close()
-              if @infile != nil
-                @infile.close()
-              end
-              @data_listener.notify_close()
-              @is_closed = true
-            end
-
-            ######################################################
-            # Implements Valve
-            ######################################################
-
-            def open_valve()
-              @spin_handler.ask_to_callback(self)
-            end
-
-            ######################################################
-            # Other methods
-            ######################################################
-
-
-          end
-
-        end
-    end
-  end
-end