bayserver-core 2.3.2 → 3.0.1

data/lib/baykit/bayserver/docker/built_in/built_in_secure_docker.rb

@@ -1,7 +1,8 @@
 require 'openssl'
 
 require 'baykit/bayserver/bcf/package'
-require 'baykit/bayserver/agent/transporter/secure_transporter'
+require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/multiplexer/secure_transporter'
 
 require 'baykit/bayserver/docker/secure'
 require 'baykit/bayserver/util/string_util'
@@ -14,7 +15,8 @@ module Baykit
           include Baykit::BayServer::Docker::Secure  # implements
 
           include Baykit::BayServer::Bcf
-          include Baykit::BayServer::Agent::Transporter
+          include Baykit::BayServer::Agent
+          include Baykit::BayServer::Agent::Multiplexer
           include Baykit::BayServer::Util
           include OpenSSL
 
@@ -109,8 +111,15 @@ module Baykit
             end
           end
 
-          def create_transporter(buf_size)
-            SecureTransporter.new(@sslctx, true, buf_size, @trace_ssl)
+          def new_transporter(agt_id, sip, buf_size)
+            agt = GrandAgent.get(agt_id)
+            return SecureTransporter.new(
+              agt.net_multiplexer,
+              sip,
+              true,
+              buf_size,
+              @trace_ssl,
+              @sslctx)
           end
 
           def reload_cert()

data/lib/baykit/bayserver/docker/city.rb

@@ -3,19 +3,33 @@ require 'baykit/bayserver/docker/docker'
 module Baykit
   module BayServer
     module Docker
-      module City
-        include Baykit::BayServer::Docker::Docker
-
-        #
-        # interface
-        #
-        #     String name();
-        #     List<Club> clubs();
-        #     List<Town> towns();
-        #     void enter(Tour tour) throws HttpException;
-        #     Trouble getTrouble();
-        #     void log(Tour tour);
-        #
+      module City # interface
+        include Baykit::BayServer::Docker::Docker # implements
+
+        def name
+          raise NotImplementedError.new
+        end
+
+        def clubs
+          raise NotImplementedError.new
+        end
+
+        def towns
+          raise NotImplementedError.new
+        end
+
+        def enter(tur)
+          raise NotImplementedError.new
+        end
+
+        def get_trouble
+          raise NotImplementedError.new
+        end
+
+        def log(tur)
+          raise NotImplementedError.new
+        end
+
       end
     end
   end

data/lib/baykit/bayserver/docker/club.rb

@@ -11,32 +11,32 @@ module Baykit
 
         # Get the file name part of club
         def file_name()
-          raise NotImplementedError.new()
+          raise NotImplementedError.new
         end
 
         # Get the ext (file extension part) of club
         def extension()
-          raise NotImplementedError.new()
+          raise NotImplementedError.new
         end
 
         # Check if file name matches this club
         def matches(fname)
-          raise NotImplementedError.new()
+          raise NotImplementedError.new
         end
 
         # Get charset of club
-        def charset()
-          raise NotImplementedError.new()
+        def charset
+          raise NotImplementedError.new
         end
 
         # Check if this club decodes PATH_INFO
-        def decode_path_info()
-          raise NotImplementedError.new()
+        def decode_path_info
+          raise NotImplementedError.new
         end
 
         #  Arrive
         def arrive(tur)
-          raise NotImplementedError.new()
+          raise NotImplementedError.new
         end
 
       end

data/lib/baykit/bayserver/docker/docker.rb

@@ -1,7 +1,15 @@
 module Baykit
   module BayServer
     module Docker
-      module Docker
+      module Docker # interface
+
+        def init(ini, parent)
+          raise NotImplementedError.new
+        end
+
+        def type()
+          raise NotImplementedError.new
+        end
       end
     end
   end

data/lib/baykit/bayserver/docker/harbor.rb

@@ -6,28 +6,190 @@ module Baykit
       module Harbor
         include Docker
 
-        FILE_SEND_METHOD_SELECT = 1
-        FILE_SEND_METHOD_SPIN = 2
-        FILE_SEND_METHOD_TAXI = 3
-
-        #
-        # interface
-        #
-        #     String charset();
-        #     Locale locale();
-        #     int shipAgents();
-        #     int trainRunners();
-        #     int maxShips();
-        #     Trouble getTrouble();
-        #     int socketTimeoutSec();
-        #     int keepTimeoutSec();
-        #     boolean traceHeader();
-        #     int tourBufferSize();
-        #     String redirectFile();
-        #     int bayPort();
-        #     boolean gzipComp();
-        #     AsyncFileMethod asyncFileMethod();
-        #
+        MULTIPLEXER_TYPE_SPIDER = 1
+        MULTIPLEXER_TYPE_SPIN = 2
+        MULTIPLEXER_TYPE_PIGEON = 3
+        MULTIPLEXER_TYPE_JOB = 4
+        MULTIPLEXER_TYPE_TAXI = 5
+        MULTIPLEXER_TYPE_TRAIN = 6
+
+        RECIPIENT_TYPE_SPIDER = 1
+        RECIPIENT_TYPE_PIPE = 2
+
+        # Default charset 
+        def charset
+          raise NotImplementedError.new
+        end
+
+        # Default locale
+        def locale
+          raise NotImplementedError.new
+        end
+
+        # Number of grand agents
+        def grand_agents
+          raise NotImplementedError.new
+        end
+
+        # Number of train runners
+        def train_runners
+          raise NotImplementedError.new
+        end
+
+        # Number of taxi runners
+        def taxi_runners
+          raise NotImplementedError.new
+        end
+
+        # Max count of ships
+        def max_ships
+          raise NotImplementedError.new
+        end
+
+        # Trouble docker
+        def trouble
+          raise NotImplementedError.new
+        end
+
+        # Socket timeout in seconds
+        def socket_timeout_sec
+          raise NotImplementedError.new
+        end
+
+        # Keep-Alive timeout in seconds
+        def keep_timeout_sec
+          raise NotImplementedError.new
+        end
+
+        # Trace req/res header flag
+        def trace_header
+          raise NotImplementedError.new
+        end
+
+        # Internal buffer size of Tour
+        def tour_buffer_size
+          raise NotImplementedError.new
+        end
+
+        # File name to redirect stdout/stderr
+        def redirect_file
+          raise NotImplementedError.new
+        end
+
+        # Port number of signal agent
+        def control_port
+          raise NotImplementedError.new
+        end
+
+        # Gzip compression flag
+        def gzip_comp
+          raise NotImplementedError.new
+        end
+
+        # Multiplexer of Network I/O
+        def net_multiplexer
+          raise NotImplementedError.new
+        end
+
+        # Multiplexer of File I/O
+        def file_multiplexer
+          raise NotImplementedError.new
+        end
+
+        # Multiplexer of Log output
+        def log_multiplexer
+          raise NotImplementedError.new
+        end
+
+        # Multiplexer of CGI input
+        def cgi_multiplexer
+          raise NotImplementedError.new
+        end
+
+        # Recipient
+        def recipient
+          raise NotImplementedError
+        end
+
+        # PID file name
+        def pid_file
+          raise NotImplementedError
+        end
+
+        # Multi core flag
+        def multi_core
+          raise NotImplementedError
+        end
+
+
+        def self.get_multiplexer_type_name(type)
+          case type
+          when MULTIPLEXER_TYPE_SPIDER
+            return "spider"
+          when MULTIPLEXER_TYPE_SPIN
+            return "spin"
+          when MULTIPLEXER_TYPE_PIGEON
+            return "pigeon"
+          when MULTIPLEXER_TYPE_JOB
+            return "job"
+          when MULTIPLEXER_TYPE_TAXI
+            return "taxi"
+          when MULTIPLEXER_TYPE_TRAIN
+            return "train"
+          else
+            return nil
+          end
+        end
+
+        def self.get_multiplexer_type(type)
+          if type != nil
+            type = type.downcase
+          end
+
+          case type
+          when "spider"
+            return MULTIPLEXER_TYPE_SPIDER
+          when "spin"
+            return MULTIPLEXER_TYPE_SPIN
+          when "pigeon"
+            return MULTIPLEXER_TYPE_PIGEON
+          when "job"
+            return MULTIPLEXER_TYPE_JOB
+          when "taxi"
+            return MULTIPLEXER_TYPE_TAXI
+          when "train"
+            return MULTIPLEXER_TYPE_TRAIN
+          else
+            raise ArgumentError
+          end
+        end
+
+        def self.get_recipient_type_name(type)
+          case type
+          when RECIPIENT_TYPE_SPIDER
+            return "spider"
+          when RECIPIENT_TYPE_PIPE
+            return "pipe"
+          else
+            return nil
+          end
+        end
+
+        def self.get_recipient_type(type)
+          if type != nil
+            type = type.downcase
+          end
+
+          case type
+          when "spider"
+            return RECIPIENT_TYPE_SPIDER
+          when "pipe"
+            return RECIPIENT_TYPE_PIPE
+          else
+            raise ArgumentError
+          end
+        end
+
       end
     end
   end

data/lib/baykit/bayserver/docker/permission.rb

@@ -6,12 +6,13 @@ module Baykit
       module Permission
         include Docker # implements
 
-        #
-        # interface
-        #
-        #     void checkAdmitted(SocketChannel ch) throws HttpException;
-        #     void checkAdmitted(Tour tour) throws HttpException;
-        # 
+        def socket_admitterd(rd)
+          raise NotImplementedError.new
+        end
+
+        def tour_admitted(tour)
+          raise NotImplementedError.new
+        end
       end
     end
   end

data/lib/baykit/bayserver/docker/port.rb

@@ -6,32 +6,60 @@ module Baykit
       module Port
         include Docker  # implements
 
+        def protocol
+          raise NotImplementedError.new
+        end
+
+        def host
+          raise NotImplementedError.new
+        end
+
+        def port
+          raise NotImplementedError.new
+        end
+
+        def socket_path
+          raise NotImplementedError.new
+        end
+
         def address()
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
-        def check_admitted(skt)
-          raise NotImplementedError()
+        def anchored
+          raise NotImplementedError.new
         end
 
-        def find_city(name)
-          raise NotImplementedError()
+        def secure
+          raise NotImplementedError.new
+        end
+
+        def timeout_sec
+          raise NotImplementedError.new
+        end
+
+        def additional_headers
+          raise NotImplementedError.new
+        end
+
+        def cities
+          raise NotImplementedError.new
         end
 
-        def new_transporter(agt, skt)
-          raise NotImplementedError()
+        def find_city(name)
+          raise NotImplementedError.new
         end
 
-        def check_admitted(skt)
-          raise NotImplementedError()
+        def on_connected(agent_id, rd)
+          raise NotImplementedError.new
         end
 
         def return_protocol_handler(agt, proto_hnd)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
 
         def return_ship(sip)
-          raise NotImplementedError()
+          raise NotImplementedError.new
         end
       end
     end

data/lib/baykit/bayserver/docker/secure.rb

@@ -6,15 +6,17 @@ module Baykit
       module Secure
         include Docker   # implements
 
-        #
-        # interface
-        #
-        #     void setAppProtocols(String[] protocols);
-        #
-        #     void reloadCert() throws Exception;
-        #
-        #     public Transporter createTransporter();
-        #
+        def set_app_protocols(protocols)
+          raise NotImplementedError.new
+        end
+
+        def reload_cert
+          raise NotImplementedError.new
+        end
+
+        def new_transporter(agt_id, sip)
+          raise NotImplementedError
+        end
       end
     end
   end

data/lib/baykit/bayserver/docker/send_file/file_content_handler.rb

@@ -1,5 +1,9 @@
 require 'baykit/bayserver/tours/req_content_handler'
 require 'baykit/bayserver/tours/tour'
+require 'baykit/bayserver/rudders/io_rudder'
+require 'baykit/bayserver/agent/multiplexer/plain_transporter'
+require 'baykit/bayserver/util/mimes'
+require 'baykit/bayserver/docker/send_file/send_file_ship'
 
 module Baykit
   module BayServer
@@ -7,7 +11,11 @@ module Baykit
       module SendFile
         class FileContentHandler
           include Baykit::BayServer::Tours::ReqContentHandler   # implements
+          include Baykit::BayServer::Agent
+          include Baykit::BayServer::Agent::Multiplexer
           include Baykit::BayServer::Tours
+          include Baykit::BayServer::Rudders
+          include Baykit::BayServer::Util
 
           attr :path
           attr :abortable
@@ -21,21 +29,108 @@ module Baykit
           # Implements ReqContentHandler
           ######################################################
 
-          def on_read_content(tur, buf, start, len)
+          def on_read_req_content(tur, buf, start, len, &lis)
             BayLog.debug("%s onReadReqContent(Ignore) len=%d", tur, len)
+            tur.req.consumed(tur.tour_id, len, &lis)
           end
 
-          def on_end_content(tur)
+          def on_end_req_content(tur)
             BayLog.debug("%s endReqContent", tur)
-            tur.res.send_file(Tour::TOUR_ID_NOCHECK, path, tur.res.charset, true)
+            send_file_async(tur, path, tur.res.charset)
             @abortable = false
           end
 
-          def on_abort(tur)
+          def on_abort_req(tur)
             BayLog.debug("%s onAbortReq aborted=%s", tur, abortable)
             return abortable
           end
 
+          ######################################################
+          # Sending file methods
+          ######################################################
+
+          def send_file_async(tur, file, charset)
+
+            if File.directory?(file)
+              raise HttpException.new HttpStatus::FORBIDDEN, file
+            elsif !File.exist?(file)
+              raise HttpException.new HttpStatus::NOT_FOUND, file
+            end
+
+            mime_type = nil
+
+            rname = File.basename(file)
+            pos = rname.rindex('.')
+            if pos
+              ext = rname[pos + 1 .. -1].downcase
+              mime_type = Mimes.type(ext)
+            end
+
+            if !mime_type
+              mime_type = "application/octet-stream"
+            end
+
+            if mime_type.start_with?("text/") && charset != nil
+              mime_type = mime_type + "; charset=" + charset
+            end
+
+            file_len = ::File.size(file)
+
+            tur.res.headers.set_content_type(mime_type)
+            tur.res.headers.set_content_length(file_len)
+
+            begin
+              tur.res.send_headers(Tour::TOUR_ID_NOCHECK)
+
+              bufsize = tur.ship.protocol_handler.max_res_packet_data_size
+              agt = GrandAgent.get(tur.ship.agent_id)
+
+              f = File.open(file, "rb")
+              rd = IORudder.new(f)
+
+              case(BayServer.harbor.file_multiplexer)
+
+              when Harbor::MULTIPLEXER_TYPE_SPIDER
+                mpx = agt.spider_multiplexer
+
+              when Harbor::MULTIPLEXER_TYPE_SPIN
+                mpx = agt.spin_multiplexer
+
+              when Harbor::MULTIPLEXER_TYPE_TAXI
+                mpx = agt.taxi_multiplexer
+
+              else
+                raise Sink.new
+              end
+
+              send_file_ship = SendFileShip.new
+              tp = PlainTransporter.new(
+                mpx,
+                send_file_ship,
+                true,
+                8195,
+                false)
+
+              send_file_ship.init(rd, tp, tur)
+              sid = send_file_ship.ship_id
+
+              tur.res.set_consume_listener do |len, resume|
+                if resume
+                  send_file_ship.resume_read(sid)
+                end
+              end
+
+              mpx.add_rudder_state(rd, RudderState.new(rd, tp))
+              mpx.req_read(rd)
+
+            rescue IOError => e
+              BayLog.error_e(e)
+              raise HttpException.new(HttpStatus::INTERNAL_SERVER_ERROR, file)
+            end
+
+          end
+
+
         end
       end
     end

data/lib/baykit/bayserver/docker/send_file/send_file_docker.rb

@@ -46,11 +46,15 @@ module Baykit
               end
 
               begin
-                rel_path = URLDecoder.decode(rel_path, tur.req.charset)
-              rescue Encoding::UndefinedConversionError => e
+                rel_path = CGI.unescape(rel_path)
+              rescue Encoding::CompatibilityError => e
                 BayLog.warn("%s Cannot decode request path: %s (encoding=%s)", tur, rel_path, tur.req.charset)
               end
 
+              if StringUtil.set?(tur.req.charset) && tur.req.charset != "UTF-8"
+                rel_path = rel_path.force_encoding(tur.req.charset).encode("UTF-8")
+              end
+
               real = "#{tur.town.location}/#{rel_path}"
 
               if File.directory?(real) && @list_files