bayserver-core 2.3.2 → 3.0.0

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

@@ -3,14 +3,13 @@ module Baykit
     module Util
       class IpMatcher
         attr :match_all
-        attr :net_addr
-        attr :mask_addr
+        attr :cidr_ip
 
         def initialize(ip_desc)
           @match_all = (ip_desc == "*")
 
           if !@match_all
-            parse_ip(ip_desc)
+            parse_cidr(ip_desc)
           end
         end
 
@@ -19,48 +18,19 @@ module Baykit
           if @match_all
             return true
           else
-            if ip.ipv4? != @mask_addr.ipv4?
-              # IPv4 and IPv6 don't match each other
-              return false
-            end
-
-            if ip & @mask_addr != @net_addr
-              return false
-            end
-
-            return true
+            return @cidr_ip.include?(ip)
           end
         end
 
-        def get_ip_addr(ip)
-          return IPAddr.new(ip)
-        end
-
         private
-        def parse_ip(ip_desc)
-          items = ip_desc.split("/")
-          if items.length == 0
-            raise RuntimeError.new(BayMessage.get(:CFG_INVALID_IP_DESC, ip_desc))
-          end
-
-          ip = items[0]
-          if items.length == 1
-            mask = "255.255.255.255"
-          else
-            mask = items[1]
-          end
-
-          ip_addr = get_ip_addr(ip)
-          @mask_addr = get_ip_addr(mask)
-
-          if ip_addr.ipv4? != @mask_addr.ipv4?
-            raise RuntimeError.new(BayMessage.get(:CFG_IPV4_AND_IPV6_ARE_MIXED, ip_desc))
+        def parse_cidr(cidr)
+          begin
+            @cidr_ip = IPAddr.new(cidr)
+          rescue => e
+            BayLog.error_e(e)
+            raise RuntimeError.new(BayMessage.get(:CFG_INVALID_IP_DESC, cidr))
           end
-
-          @net_addr = ip_addr & @mask_addr
         end
-
-
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Baykit
           if StringUtil.set?(lang)
             begin
               language = lang[0, 2]
-              country = lang[4, 2]
+              country = lang[3, 2]
               return Locale.new(language, country)
             rescue => e
               BayLog.error_e(e)

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

@@ -18,6 +18,10 @@ module Baykit
         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
           if op & OP_READ != 0
             register_read(ch, @channels)
           end
@@ -27,11 +31,18 @@ module Baykit
         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)
         end
 
         def modify(ch, op)
+          if  not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
+            raise ArgumentError
+          end
           if op & OP_READ != 0
             register_read(ch, @channels)
           else
@@ -46,10 +57,16 @@ module Baykit
         end
 
         def get_op(ch)
+          if not ((ch.kind_of? IO) || (ch.kind_of? OpenSSL::SSL::SSLSocket))
+            raise ArgumentError
+          end
           return @channels[ch]
         end
 
-        def select(timeout = 0)
+        def select(timeout_sec = nil)
+          if timeout_sec == nil
+            timeout_sec = 0
+          end
           except_list = []
 
           read_list = []
@@ -64,16 +81,18 @@ module Baykit
               end
             end
           end
-          selected_read_list, selected_write_list = Kernel.select(read_list, write_list, except_list, timeout)
+          #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
+          if selected_read_list != nil
             selected_read_list.each do |ch|
               register_read(ch, result)
             end
           end
 
-          if selected_write_list
+          if selected_write_list != nil
             selected_write_list.each do |ch|
               register_write(ch, result)
             end
@@ -82,7 +101,7 @@ module Baykit
           return result
         end
 
-        def count()
+        def count
           @lock.synchronize do
             return @channels.length
           end

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

@@ -30,7 +30,7 @@ module Baykit
             Process.waitpid(pid)
             return true
           rescue NotImplementedError => e
-            if BayLog.debug_mode?
+            if BayLog.debug_mode
               BayLog.warn("fork() failed: %s ", e)
               #BayLog.warn_e(e)
             end
@@ -45,7 +45,7 @@ module Baykit
               n = select([f], [], [], 10)
               return true
             rescue IOError => e
-              if BayLog.debug_mode?
+              if BayLog.debug_mode
                 BayLog.warn("select() failed: %s", e)
                 #BayLog.warn_e(e)
               end
@@ -61,7 +61,7 @@ module Baykit
               f.read_nonblock(1)
               return true
             rescue SystemCallError => e
-              if BayLog.debug_mode?
+              if BayLog.debug_mode
                 BayLog.warn("read_nonblock() failed: %s", e)
                 #BayLog.warn_e(e)
               end
@@ -77,7 +77,7 @@ module Baykit
                 f.write_nonblock(1)
                 return true
               rescue SystemCallError => e
-                if BayLog.debug_mode?
+                if BayLog.debug_mode
                   BayLog.warn("write_nonblock() failed: %s", e)
                   #BayLog.warn_e(e)
                 end
@@ -94,7 +94,7 @@ module Baykit
               n = select([r], [w], [], 10)
               return true
             rescue IOError => e
-              if BayLog.debug_mode?
+              if BayLog.debug_mode
                 BayLog.warn("select() failed: %s", e)
                 #BayLog.warn_e(e)
               end
@@ -111,7 +111,7 @@ module Baykit
               r.read_nonblock(1)
               return true
             rescue SystemCallError => e
-              if BayLog.debug_mode?
+              if BayLog.debug_mode
                 BayLog.warn("read_nonblock() failed: %s", e)
                 #BayLog.warn_e(e)
               end

data/lib/baykit/bayserver/version.rb

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
       class Version
-        VERSION='2.3.2'
+        VERSION='3.0.0'
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-11-15 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
@@ -24,8 +24,20 @@ files:
 - 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/grand_agent_monitor.rb
+- lib/baykit/bayserver/agent/letter.rb
 - lib/baykit/bayserver/agent/lifecycle_listener.rb
+- lib/baykit/bayserver/agent/monitor/grand_agent_monitor.rb
+- lib/baykit/bayserver/agent/multiplexer/job_multiplexer.rb
+- 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
@@ -36,8 +48,6 @@ files:
 - 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/plain_transporter.rb
-- lib/baykit/bayserver/agent/transporter/secure_transporter.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
@@ -54,16 +64,29 @@ files:
 - lib/baykit/bayserver/bcf/bcf_parser.rb
 - lib/baykit/bayserver/bcf/package.rb
 - lib/baykit/bayserver/bcf/parse_exception.rb
+- lib/baykit/bayserver/common/cities.rb
+- lib/baykit/bayserver/common/groups.rb
+- lib/baykit/bayserver/common/inbound_handler.rb
+- lib/baykit/bayserver/common/inbound_ship.rb
+- lib/baykit/bayserver/common/inbound_ship_store.rb
+- lib/baykit/bayserver/common/multiplexer.rb
+- lib/baykit/bayserver/common/postpone.rb
+- lib/baykit/bayserver/common/read_only_ship.rb
+- lib/baykit/bayserver/common/recipient.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/config_exception.rb
 - lib/baykit/bayserver/constants.rb
 - lib/baykit/bayserver/docker/base/club_base.rb
 - lib/baykit/bayserver/docker/base/docker_base.rb
 - lib/baykit/bayserver/docker/base/inbound_data_listener.rb
-- lib/baykit/bayserver/docker/base/inbound_handler.rb
-- lib/baykit/bayserver/docker/base/inbound_ship.rb
-- lib/baykit/bayserver/docker/base/inbound_ship_store.rb
 - lib/baykit/bayserver/docker/base/port_base.rb
 - lib/baykit/bayserver/docker/base/reroute_base.rb
+- lib/baykit/bayserver/docker/base/warp_base.rb
 - lib/baykit/bayserver/docker/built_in/built_in_city_docker.rb
 - lib/baykit/bayserver/docker/built_in/built_in_harbor_docker.rb
 - lib/baykit/bayserver/docker/built_in/built_in_log_docker.rb
@@ -89,15 +112,10 @@ files:
 - lib/baykit/bayserver/docker/send_file/directory_train.rb
 - lib/baykit/bayserver/docker/send_file/file_content_handler.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/town.rb
 - lib/baykit/bayserver/docker/trouble.rb
-- lib/baykit/bayserver/docker/warp/package.rb
-- lib/baykit/bayserver/docker/warp/warp_data.rb
-- lib/baykit/bayserver/docker/warp/warp_data_listener.rb
-- lib/baykit/bayserver/docker/warp/warp_docker.rb
-- lib/baykit/bayserver/docker/warp/warp_handler.rb
-- lib/baykit/bayserver/docker/warp/warp_ship.rb
-- lib/baykit/bayserver/docker/warp/warp_ship_store.rb
+- lib/baykit/bayserver/docker/warp.rb
 - lib/baykit/bayserver/http_exception.rb
 - lib/baykit/bayserver/mem_usage.rb
 - lib/baykit/bayserver/protocol/command.rb
@@ -115,6 +133,9 @@ files:
 - lib/baykit/bayserver/protocol/protocol_handler.rb
 - lib/baykit/bayserver/protocol/protocol_handler_factory.rb
 - lib/baykit/bayserver/protocol/protocol_handler_store.rb
+- lib/baykit/bayserver/rudders/io_rudder.rb
+- lib/baykit/bayserver/rudders/rudder.rb
+- lib/baykit/bayserver/ships/ship.rb
 - lib/baykit/bayserver/sink.rb
 - lib/baykit/bayserver/taxi/taxi.rb
 - lib/baykit/bayserver/taxi/taxi_runner.rb
@@ -125,6 +146,7 @@ files:
 - 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
 - lib/baykit/bayserver/tours/tour_res.rb
 - lib/baykit/bayserver/tours/tour_store.rb
@@ -134,12 +156,10 @@ files:
 - lib/baykit/bayserver/util/byte_buffer.rb
 - lib/baykit/bayserver/util/cgi_util.rb
 - lib/baykit/bayserver/util/char_util.rb
-- lib/baykit/bayserver/util/cities.rb
 - lib/baykit/bayserver/util/class_util.rb
 - lib/baykit/bayserver/util/counter.rb
 - lib/baykit/bayserver/util/data_consume_listener.rb
 - lib/baykit/bayserver/util/executor_service.rb
-- lib/baykit/bayserver/util/groups.rb
 - lib/baykit/bayserver/util/gzip_compressor.rb
 - lib/baykit/bayserver/util/headers.rb
 - lib/baykit/bayserver/util/host_matcher.rb
@@ -167,7 +187,6 @@ files:
 - lib/baykit/bayserver/util/valve.rb
 - lib/baykit/bayserver/version.rb
 - lib/baykit/bayserver/watercraft/boat.rb
-- lib/baykit/bayserver/watercraft/ship.rb
 - lib/baykit/bayserver/watercraft/yacht.rb
 homepage: https://baykit.yokohama
 licenses:

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

@@ -1,231 +0,0 @@
-require 'fcntl'
-require 'baykit/bayserver/agent/grand_agent'
-require 'baykit/bayserver/util/io_util'
-
-module Baykit
-  module BayServer
-    module Agent
-      class GrandAgentMonitor
-        include Baykit::BayServer::Util
-
-        class << self
-          attr :num_agents
-          attr :cur_id
-          attr :anchored_port_map
-          attr :monitors
-          attr :finale
-        end
-
-        @num_agents = 0
-        @cur_id = 0
-        @anchored_port_map = []
-        @monitors = {}
-        @finale = false
-
-        attr :agent_id
-        attr :anchorable
-        attr :communication_channel
-        attr :child_pid
-
-        def initialize(agt_id, anchorable, com_channel, child_pid)
-          @agent_id = agt_id
-          @anchorable = anchorable
-          @communication_channel = com_channel
-          @child_pid = child_pid
-        end
-
-        def to_s()
-          return "Monitor##{@agent_id}"
-        end
-
-        def on_readable()
-          begin
-            res = IOUtil.read_int32(@communication_channel)
-            if res == nil || res == GrandAgent::CMD_CLOSE
-              BayLog.debug("%s read Close", self)
-              close()
-              agent_aborted()
-            else
-              BayLog.debug("%s read OK: %d", self, res)
-            end
-          rescue IO::WaitReadable
-            #BayLog.debug("%s no data", self)
-          end
-        end
-
-        def shutdown()
-          BayLog.debug("%s send shutdown command", self)
-          send(GrandAgent::CMD_SHUTDOWN)
-        end
-
-        def abort()
-          BayLog.debug("%s Send abort command", self)
-          send(GrandAgent::CMD_ABORT)
-        end
-
-        def reload_cert()
-          BayLog.debug("%s Send reload command", self)
-          send(GrandAgent::CMD_RELOAD_CERT)
-        end
-
-        def print_usage()
-          BayLog.debug("%s Send mem_usage command", self)
-          send(GrandAgent::CMD_MEM_USAGE)
-          sleep(0.5)  # Lazy implementation
-        end
-
-        def send(cmd)
-          BayLog.debug("%s send command %s ch=%s", self, cmd, @communication_channel)
-          IOUtil.write_int32(@communication_channel, cmd)
-        end
-
-        def close()
-          @communication_channel.close()
-        end
-
-        def agent_aborted()
-          BayLog.info(BayMessage.get(:MSG_GRAND_AGENT_SHUTDOWN, @agent_id))
-
-          if @child_pid != nil
-            begin
-              Process.kill("TERM", @child_pid)
-            rescue => e
-              BayLog.debug_e(e, "Error on killing process")
-            end
-            Process.wait(@child_pid)
-          end
-          GrandAgentMonitor.monitors.delete(@agent_id)
-
-          if not GrandAgentMonitor.finale
-            if GrandAgentMonitor.monitors.length < GrandAgentMonitor.num_agents
-              begin
-                if !BayServer.harbor.multi_core
-                  GrandAgent.add(-1, @anchorable)
-                end
-                GrandAgentMonitor.add(@anchorable)
-              rescue => e
-                BayLog.error_e(e)
-              end
-            end
-          end
-        end
-
-        ########################################
-        # Class methods
-        ########################################
-
-        def self.init(num_agents, anchored_port_map)
-          @num_agents = num_agents
-          @anchored_port_map = anchored_port_map
-          @num_agents.times do
-            add(true)
-          end
-        end
-
-        def self.add(anchoroable)
-          @cur_id = @cur_id + 1
-          agt_id = @cur_id
-          if agt_id > 100
-            BayLog.error("Too many agents started")
-            exit(1)
-          end
-
-          if BayServer.harbor.multi_core
-            new_argv = BayServer.commandline_args.dup
-            new_argv.insert(0, "ruby")
-            new_argv << "-agentid=" + agt_id.to_s
-
-            ports = ""
-
-            no_close_io = {}  # Port list not to close on spawned
-            @anchored_port_map.each_key do |ch|
-              no_close_io[ch] = ch
-              if ports != ""
-                ports +=","
-              end
-              ports += ch.fileno.to_s
-            end
-            new_argv << "-ports=" + ports
-
-            server = TCPServer.open("localhost", 0)
-            #BayLog.info("port=%d", server.local_address.ip_port)
-            new_argv << "-monitor_port=" + server.local_address.ip_port.to_s
-
-            if SysUtil.run_on_windows()
-              child = spawn(ENV, new_argv.join(" "))
-            else
-              child = spawn(ENV, new_argv.join(" "), no_close_io)
-            end
-
-            BayLog.debug("Process spawned cmd=%s pid=%d", new_argv, child)
-
-            client_socket = server.accept()
-            server.close()
-
-          else
-
-            if SysUtil::run_on_windows()
-              pair = Socket.socketpair(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-            else
-              pair = Socket.socketpair(Socket::AF_UNIX, Socket::SOCK_STREAM, 0)
-            end
-
-            client_socket = pair[0]
-            GrandAgent.add(agt_id, anchoroable)
-
-            # Agents run on single core (thread mode)
-            Thread.new() do
-              agt = GrandAgent.get(agt_id)
-              agt.run_command_receiver(pair[1])
-              agt.run()
-            end
-
-            child = nil
-
-          end
-
-          @monitors[agt_id] =
-            GrandAgentMonitor.new(
-              agt_id,
-              anchoroable,
-              client_socket,
-              child)
-        end
-
-        def self.reload_cert_all()
-          @monitors.values.each { |mon| mon.reload_cert() }
-        end
-
-        def self.restart_all()
-          old_monitors = @monitors.dup()
-
-          #@agent_count.times {add()}
-
-          old_monitors.values.each { |mon| mon.shutdown() }
-        end
-
-        def self.shutdown_all()
-          @finale = true
-          @monitors.dup().values.each do |mon|
-            mon.shutdown()
-          end
-        end
-
-        def self.abort_all()
-          @finale = true
-          @monitors.dup().values.each do |mon|
-            mon.abort()
-          end
-          exit(1)
-        end
-
-        def self.print_usage_all()
-          @monitors.values.each do |mon|
-            mon.print_usage()
-          end
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,55 +0,0 @@
-require 'baykit/bayserver/agent/transporter/transporter'
-require 'baykit/bayserver/protocol/protocol_exception'
-require 'baykit/bayserver/agent/next_socket_action'
-
-module Baykit
-  module BayServer
-    module Agent
-        module Transporter
-          class PlainTransporter < Baykit::BayServer::Agent::Transporter::Transporter
-            include Baykit::BayServer::Agent
-            include Baykit::BayServer::Protocol
-            include Baykit::BayServer::Util
-
-            def initialize(server_mode, bufsiz, write_only = false)
-              super(server_mode, bufsiz, false, write_only)
-            end
-
-            def init(nb_hnd, ch, lis)
-              super
-              @handshaked = true  # plain socket doesn't need to handshake
-            end
-
-            def to_s
-              return "tp[#{@data_listener}]"
-            end
-
-            ######################################################
-            # Implements Transporter
-            ######################################################
-
-            def secure()
-              return false
-            end
-
-            def handshake_nonblock
-              raise Sink.new("needless to handshake")
-            end
-
-            def read_nonblock()
-              #@ch.sysread(@capacity, @read_buf)
-              @ch.read_nonblock(@capacity, @read_buf)
-              return nil # client address (for UDP)
-            end
-
-            def write_nonblock(buf, adr)
-              #return @ch.syswrite(buf)
-              return @ch.write_nonblock(buf)
-            end
-          end
-        end
-    end
-  end
-end
-
-