bayserver-docker-terminal 3.0.3 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3645bf6dd47e096f0c0b5f58e92f134608b19605e7078d614b2f5c40edc6fe60
-  data.tar.gz: c1c3a274de354e6f059f5ea7cdc6aeca4ed4a75c6261a66f879ef75eba6fd522
+  metadata.gz: b29fc2210cde24c4e1429a6caa214bc51bb5fa42f1fe89867a10927f567133ae
+  data.tar.gz: 137951ca4d31d6ab9aefcdd00fbf9504ba7e745e8cf0b3900b92d4adf0d794a4
 SHA512:
-  metadata.gz: d5942354f190d978b617bb85453c1f9fefd4a78a862e3c1fe516cf46f88e9c5e36c449dd412774ca297f681198ea0895bec17bf8a5b2bf9d934b092667806661
-  data.tar.gz: 7afc208bf97ae4d2c0972017086ad6063697f1df67700e2449653386c4a3e9f538b094bf5eb3673328e9ba43cb37e47c38b4e9e1269ff51af4375c532788de99
+  metadata.gz: ddcabf4216f6d51052fe6c769c9276b75f3d897c9a69a51b2e00c90b9ea7df61f4421432bd1e82acbe06cf666578e9e13b56243161481ca14fbe4710e9e39e63
+  data.tar.gz: 7ee7ce088212ebb94139a764765db6d3d4952ae38ae63644eea91d964758dac6fd9dd469d72baee5c179164aec7d9b8b6ec5b846fc5e88398913c6be68a6d4c0

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

@@ -3,6 +3,7 @@ require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 require 'baykit/bayserver/rudders/io_rudder'
 require 'baykit/bayserver/docker/base/port_base'
 require 'baykit/bayserver/tours/content_consume_listener'
+require 'baykit/bayserver/common/rudder_state_store'
 
 require 'baykit/bayserver/docker/terminal/fully_hijackers_ship'
 require 'baykit/bayserver/docker/terminal/terminal_train'
@@ -18,6 +19,7 @@ module Baykit
           include Baykit::BayServer::Agent::Multiplexer
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Tours
+          include Baykit::BayServer::Common
 
           RACK_TERMINAL_PIPE = "rack.terminal.pipe"
           DEFAULT_POST_CACHE_THRESHOLD = 1024 * 128   # 128 KB
@@ -57,7 +59,7 @@ module Baykit
             require 'rack/handler/bayserver'
 
             if Rack::Handler::BayServer.app != nil
-              # rackup mode
+              # Application is already established on rackup mode
               @app = Rack::Handler::BayServer.app
             else
               if !StringUtil.set?(@config)
@@ -69,12 +71,55 @@ module Baykit
                 @environment = "deployment"
               end
               options = {
-                :server => "terminal",
-                :config => @config,
-                :environment => @environment,
-                :docker => self,
+                server: "terminal",        # Server/handler name (used by rack or rackup)
+                config: @config,           # Path to config.ru
+                environment: @environment, # Rack environment (development, production, etc.)
+                docker: self,              # Custom option passed to the server
               }
-              Rack::Server.start options
+
+              # Rack 3.x moved Server/Handler to the `rackup` gem.
+              begin
+                require "rackup"           # Rack 3.x (or environments with rackup installed)
+                require "rackup/handler/terminal"
+                use_rackup = true
+              rescue LoadError
+                require "rack"
+                require "rack/server"     # Rack 2.x
+                use_rackup = false
+              end
+
+              if !use_rackup
+                # Rack 2.x: start server via Rack::Server
+                Rack::Server.start(options)
+              else
+                # Rack 3.x: start server via rackup
+
+                opts = options.dup
+
+                # Extract server/handler name (e.g. "puma", "webrick", "bayserver")
+                server_name = opts.delete(:server) || 'bayserver'
+
+                # Extract config.ru path
+                config_file = opts.delete(:config)
+
+                # Load Rack application and options from config.ru
+                app, config_opts = Rack::Builder.parse_file(config_file)
+                if config_opts == nil
+                  config_opts = {}
+                end
+
+                # Merge options from config.ru with runtime options
+                opts = config_opts.merge(opts)
+
+                # Set default port if not specified
+                opts[:Port] ||= 9292
+
+                # Resolve handler via rackup
+                handler =Rackup::Handler.get(server_name.to_s)
+
+                # Run the Rack application using the selected handler
+                handler.run(app, **opts)
+              end
             end
 
             @available = true
@@ -202,7 +247,9 @@ module Baykit
                 end
               end
 
-              mpx.add_rudder_state(rd_read, RudderState.new(rd_read, tp))
+              st = RudderStateStore.get_store(tur.ship.agent_id).rent
+              st.init(rd_read, tp)
+              mpx.add_rudder_state(rd_read, st)
               mpx.req_read(rd_read)
 
               w_pipe

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

@@ -25,6 +25,7 @@ module Baykit
           include Baykit::BayServer::Util
           include Baykit::BayServer::Train
           include Baykit::BayServer::Tours
+          include Baykit::BayServer::Common
 
           attr :terminal_docker
           attr :tour
@@ -131,7 +132,9 @@ module Baykit
                     end
                   end
 
-                  mpx.add_rudder_state(rd_read, RudderState.new(rd_read, tp))
+                  st = RudderStateStore.get_store(@tour.ship.agent_id).rent
+                  st.init(rd_read, tp)
+                  mpx.add_rudder_state(rd_read, st)
                   mpx.req_read(rd_read)
 
                   hijack.call pip[1]

data/lib/rack/handler/bayserver.rb

@@ -1,4 +1,3 @@
-require 'rack/handler'
 require 'baykit/bayserver/bayserver'
 require 'baykit/bayserver/util/string_util'
 
@@ -52,15 +51,26 @@ EOF
           ::File.write(bserv_plan, plan_str)
         end
 
-        Baykit::BayServer::BayServer.init bserv_home, bserv_plan
+        Baykit::BayServer::BayServer.get_home bserv_home
+        Baykit::BayServer::BayServer.get_plan bserv_plan
+        Baykit::BayServer::BayServer.get_lib
+        Baykit::BayServer::BayServer.init
         Baykit::BayServer::BayServer.start
       end
 
     end
 
+    if Rack::Handler.respond_to?(:register)
+      # use register method for Rack 1.x
+      Rack::Handler.register(:bayserver, Rack::Handler::BayServer)
+    else
+      # use Handler for Rack 2.0
+      unless defined?(Rack::Handler::HANDLERS)
+        # HANDLERS 定数が未定義の場合は作成する
+        Rack::Handler.const_set(:HANDLERS, {})
+      end
+      Rack::Handler::HANDLERS[:bayserver] = __FILE__
+    end
 
-
-
-    register :bayserver, BayServer
   end
 end

data/lib/rack/handler/terminal.rb

@@ -1,4 +1,11 @@
-require 'rack/handler'
+# Rack 2.x handler (Rack::Handler)
+begin
+  require "rack/handler"
+rescue LoadError
+  # Rack 3.x: Rack::Handler is not available. Provide a no-op here and rely on rackup handler.
+  return
+end
+
 
 
 module Rack

data/lib/rackup/handler/terminal.rb

@@ -0,0 +1,16 @@
+require "rackup"
+
+
+module Rackup
+  module Handler
+    module Terminal
+
+      def self.run(app, **options)
+        dkr = options[:docker]
+        dkr.app = app
+      end
+    end
+  end
+end
+
+Rackup::Handler.register :terminal, Rackup::Handler::Terminal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-docker-terminal
 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:
 - !ruby/object:Gem::Dependency
   name: bayserver-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.3.1
 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
   processors, harnessing the full potential of the CPU's capabilities.
@@ -40,11 +40,12 @@ files:
 - lib/baykit/bayserver/docker/terminal/terminal_train.rb
 - lib/rack/handler/bayserver.rb
 - lib/rack/handler/terminal.rb
+- lib/rackup/handler/terminal.rb
 homepage: https://baykit.yokohama
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -59,8 +60,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: Terminal docker of BayServer
 test_files: []