spider-gazelle 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be341884962cab440eacc49473a1fe8727e74023
-  data.tar.gz: fac733a36868410a4733d2720faa79fb1435d3db
+  metadata.gz: d98f7022babe544f38425eacb223337cef347ade
+  data.tar.gz: d214d5a1192828a1d272f7955817f64f9829c7b9
 SHA512:
-  metadata.gz: edf7132a30603414e03d3fca0399851b02bd94dcedb6895ca6f30ca1323901e79ef163ca336b80f521aab52eb705b2e7e15214dd1f297d8a265d88c573668e73
-  data.tar.gz: e87a60598ea47211402366ca3c6d8fce2bdcb161998720ea7e03f17f311cd22fb3422005bcfd93bc2a45cb9168b3408efc8c752b9d6f6f8b0ce93f99305d4be4
+  metadata.gz: 659f91228f5efc1879874407ae54ea20c15df0b9129eb30f8d96b59b57c4979e2da5a4ff0b6686ecd701c4976b36903571156401c93b0c0384b218b08b249d5d
+  data.tar.gz: b4264bc65bad3ec4736f25d38b63e0e0ec3e37617b12f794936a9ed66f0081ef114d206856635e6778d991900c7edf9b6ae9d919baef132ff9407510a2ff28cb

data/lib/spider-gazelle.rb

@@ -20,14 +20,8 @@ module SpiderGazelle
     # * Live updates (bindings passed by this pipe)
     SIGNAL_SERVER = '/tmp/sg-signaller.pipe'
 
-    # Spider server is used to
-    # * Track gazelles
-    # * Signal shutdown as required
-    # * Pass sockets
-    SPIDER_SERVER = '/tmp/sg-spider.pipe.'
 
-
-    MODES = [:process, :thread, :no_ipc].freeze
+    MODES = [:thread, :inline].freeze
 
 
     class LaunchControl
@@ -103,18 +97,6 @@ module SpiderGazelle
         end
 
 
-
-        # ---------------------------------------
-        # GAZELLE LAUNCH CONTROL
-        # ---------------------------------------
-        def start_gazelle(signaller, logger, options)
-            logger.set_client signaller.pipe
-
-            require 'spider-gazelle/gazelle'
-            ::SpiderGazelle::Gazelle.new(logger.thread, :process).run!(options)
-        end
-
-
         # ---------------------------------------
         # TTY SIGNALLING CONTROL
         # ---------------------------------------
@@ -148,9 +130,6 @@ module SpiderGazelle
                     if master[:spider]
                         logger.verbose "Starting Spider"
                         start_spider(signaller, logger, options)
-                    elsif master[:gazelle]
-                        logger.verbose "Starting Gazelle"
-                        start_gazelle(signaller, logger, options)
                     else
                         logger.verbose "Sending signal to SG Master"
                         signal_master(reactor, signaller, logger, options)

data/lib/spider-gazelle/gazelle.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'rack' # Ruby webserver abstraction
-require 'spider-gazelle/gazelle/app_store'
-require 'spider-gazelle/gazelle/http1'
 
+require 'rack' # Ruby webserver abstraction
 
 # Reactor aware websocket implementation
 require "spider-gazelle/upgrades/websocket"
@@ -17,149 +15,31 @@ module SpiderGazelle
             @type = type
             @logger = Logger.instance
             @thread = thread
+            @thread.ref
+        end
 
-            @http1_cache = []
-            @http2_cache = []
-            @return_http1 = method(:return_http1)
-            @return_http2 = method(:return_http2)
-            @parser_count = 0
 
-            @on_progress   = method(:on_progress)
-            @set_protocol  = method(:set_protocol)
+        attr_reader :thread
 
-            # Register the gazelle with the signaller so we can shutdown elegantly
-            if @type == :process
-                Signaller.instance.gazelle = self
-            end
-        end
 
         def run!(options)
             @options = options
-            @logger.verbose { "Gazelle: #{@type} Pid: #{Process.pid} started" }
-
-            connect_to_spider unless @type == :no_ipc
+            @logger.verbose { "Gazelle: #{@type} started" }
 
-            load_required_applications
             self
         end
 
-        def new_app(options)
-            # TODO:: load this app into all of the gazelles dynamically
-        end
-
-        def new_connection(data, binding)
-            socket = @pipe.check_pending
-            return if socket.nil?
-            process_connection(socket, data.to_i)
-        rescue => e
-            @logger.print_error(e)
-        end
-
-        def shutdown
-            # Wait for the requests to finish
-            @logger.verbose { "Gazelle: #{@type} Pid: #{Process.pid} shutting down" }
-        end
-
-
-        protected
-
-
-        def connect_to_spider
-            @pipe = @thread.pipe :ipc
-            @pipe.connect(@options[0][:gazelle_ipc]) do |client|
-                client.progress method(:new_connection)
-                client.start_read
-
-                authenticate
-            end
-
-            @pipe.catch do |error, backtrace|
-                @logger.print_error(error, String.new, backtrace)
-            end
-
-            if @type == :process
-                @pipe.finally do
-                    Reactor.instance.shutdown
-                end
-            end
-        end
-
-        def authenticate
-            @pipe.write "#{@options[0][:gazelle]} #{@type}"
-        end
-
-        def load_required_applications
-            @options.each do |app|
-                if app[:rackup]
-                    AppStore.load(app[:rackup], app)
-                elsif app[:app]
-                    AppStore.add(app[:app], app)
-                end
-            end
-        end
-
-
-        # ---------------------
-        # Connection Management
-        # ---------------------
-        def process_connection(socket, app_id)
-            # Put application details in the socket storage as we negotiate protocols
-            details = AppStore.get(app_id)
-            socket.storage = details
-            tls = details[-1]
-
-            # Hook up the socket and kick off TLS if required
-            if tls
-                socket.on_handshake @set_protocol
-                socket.start_tls(tls)
-            else
-                set_protocol(socket, :http1)
-            end
-
-            socket.start_read
-            socket.enable_nodelay
-        end
-
-        def on_progress(data, socket)
-            # Storage contains the parser for this connection
-            parser = socket.storage
-            parser.parse(data)
-        end
-
-        def set_protocol(socket, version)
-            app, port, tls = socket.storage
-
-            parser = if version == :h2
-                @http2_cache.pop || new_http2_parser
-            else
-                @http1_cache.pop || new_http1_parser
+        def shutdown(defer)
+            @thread.schedule do
+                # TODO:: Wait for the requests to finish
+                @thread.unref
+                @logger.verbose { "Gazelle: #{@type} shutting down" }
+                @thread.stop
+                defer.resolve(true)
             end
-
-            parser.load(socket, port, app, tls)
-            socket.progress @on_progress
-            socket.storage = parser
-        end
-
-
-        def new_http1_parser
-            @h1_parser_obj ||= Http1::Callbacks.new
-
-            @parser_count += 1
-            Http1.new(@return_http1, @h1_parser_obj, @thread, @logger)
-        end
-
-        def return_http1(parser)
-            @http1_cache.push parser
         end
 
-        def new_http2_parser
-            raise NotImplementedError.new 'TODO:: Create HTTP2 parser class'
-            @parser_count += 1
-            Http2.new(@return_http2)
-        end
 
-        def return_http2(parser)
-            @http2_cache << parser
-        end
+        protected
     end
 end

data/lib/spider-gazelle/gazelle/request.rb

@@ -4,97 +4,99 @@ require 'stringio'
 require 'rack'            # Ruby webserver abstraction
 
 module SpiderGazelle
-    class Request < ::Libuv::Q::DeferredPromise
-
-        # TODO:: Add HTTP headers to the env and capitalise them and prefix them with HTTP_
-        #   convert - signs to underscores
-        PROTO_ENV = {
-            'rack.version' => ::Rack::VERSION,   # Should be an array of integers
-            'rack.errors' => $stderr,            # An error stream that supports: puts, write and flush
-            'rack.multithread' => true,          # can the app be simultaneously invoked by another thread?
-            'rack.multiprocess' => false,        # will the app be simultaneously be invoked in a separate process?
-            'rack.run_once' => false,            # this isn't CGI so will always be false
-            'SCRIPT_NAME' => ENV['SCRIPT_NAME'] || '',   #  The virtual path of the app base (empty if root)
-            'SERVER_PROTOCOL' => 'HTTP/1.1',
-
-            'GATEWAY_INTERFACE' => 'CGI/1.2',
-            'SERVER_SOFTWARE'   => 'SpiderGazelle'
-        }
-
-        attr_accessor :env, :url, :header, :body, :keep_alive, :upgrade
-        attr_reader :hijacked, :defer, :is_async
-
-
-        def initialize(thread, app, port, remote_ip, scheme, socket)
-            super(thread, thread.defer)
-
-            @socket = socket
-            @app = app
-            @body = String.new
-            @header = String.new
-            @url = String.new
-            @env = PROTO_ENV.dup
-            @env['SERVER_PORT'] = port
-            @env['REMOTE_ADDR'] = remote_ip
-            @env['rack.url_scheme'] = scheme
-        end
-        
-
-        def execute!
-            @env['CONTENT_LENGTH'] = @env.delete('HTTP_CONTENT_LENGTH') || @body.bytesize.to_s
-            @env['CONTENT_TYPE'] = @env.delete('HTTP_CONTENT_TYPE') || 'text/plain'
-            @env['REQUEST_URI'] = @url.freeze
-
-            # For Rack::Lint on 1.9, ensure that the encoding is always for spec
-            @body.force_encoding(Encoding::ASCII_8BIT)
-            @env['rack.input'] = StringIO.new @body
-
-            # Break the request into its components
-            query_start  = @url.index '?'
-            if query_start
-                path = @url[0...query_start].freeze
-                @env['PATH_INFO'] = path
-                @env['REQUEST_PATH'] = path
-                @env['QUERY_STRING'] = @url[query_start + 1..-1].freeze
-            else
-                @env['PATH_INFO'] = @url
-                @env['REQUEST_PATH'] = @url
-                @env['QUERY_STRING'] = ''
+    class Gazelle
+        class Request < ::Libuv::Q::DeferredPromise
+
+            # TODO:: Add HTTP headers to the env and capitalise them and prefix them with HTTP_
+            #   convert - signs to underscores
+            PROTO_ENV = {
+                'rack.version' => ::Rack::VERSION,   # Should be an array of integers
+                'rack.errors' => $stderr,            # An error stream that supports: puts, write and flush
+                'rack.multithread' => true,          # can the app be simultaneously invoked by another thread?
+                'rack.multiprocess' => false,        # will the app be simultaneously be invoked in a separate process?
+                'rack.run_once' => false,            # this isn't CGI so will always be false
+                'SCRIPT_NAME' => ENV['SCRIPT_NAME'] || '',   #  The virtual path of the app base (empty if root)
+                'SERVER_PROTOCOL' => 'HTTP/1.1',
+
+                'GATEWAY_INTERFACE' => 'CGI/1.2',
+                'SERVER_SOFTWARE'   => 'SpiderGazelle'
+            }
+
+            attr_accessor :env, :url, :header, :body, :keep_alive, :upgrade
+            attr_reader :hijacked, :defer, :is_async
+
+
+            def initialize(thread, app, port, remote_ip, scheme, socket)
+                super(thread, thread.defer)
+
+                @socket = socket
+                @app = app
+                @body = String.new
+                @header = String.new
+                @url = String.new
+                @env = PROTO_ENV.dup
+                @env['SERVER_PORT'] = port
+                @env['REMOTE_ADDR'] = remote_ip
+                @env['rack.url_scheme'] = scheme
             end
-
-            # Grab the host name from the request
-            if host = @env['HTTP_HOST']
-                if colon = host.index(':')
-                    @env['SERVER_NAME'] = host[0, colon]
-                    @env['SERVER_PORT'] = host[colon + 1, host.bytesize]
+            
+
+            def execute!
+                @env['CONTENT_LENGTH'] = @env.delete('HTTP_CONTENT_LENGTH') || @body.bytesize.to_s
+                @env['CONTENT_TYPE'] = @env.delete('HTTP_CONTENT_TYPE') || 'text/plain'
+                @env['REQUEST_URI'] = @url.freeze
+
+                # For Rack::Lint on 1.9, ensure that the encoding is always for spec
+                @body.force_encoding(Encoding::ASCII_8BIT)
+                @env['rack.input'] = StringIO.new @body
+
+                # Break the request into its components
+                query_start  = @url.index '?'
+                if query_start
+                    path = @url[0...query_start].freeze
+                    @env['PATH_INFO'] = path
+                    @env['REQUEST_PATH'] = path
+                    @env['QUERY_STRING'] = @url[query_start + 1..-1].freeze
                 else
-                    @env['SERVER_NAME'] = host
+                    @env['PATH_INFO'] = @url
+                    @env['REQUEST_PATH'] = @url
+                    @env['QUERY_STRING'] = ''
                 end
-            else
-                @env['SERVER_NAME'] = 'localhost'
-            end
-
-            if @upgrade == true && @env['HTTP_UPGRADE'] == 'h2c'
-                # TODO:: implement the upgrade process here
-            end
 
-            # Provide hijack options
-            @env['rack.hijack?'] = true
-            @env['rack.hijack'] = proc { @env['rack.hijack_io'] = @socket }
+                # Grab the host name from the request
+                if host = @env['HTTP_HOST']
+                    if colon = host.index(':')
+                        @env['SERVER_NAME'] = host[0, colon]
+                        @env['SERVER_PORT'] = host[colon + 1, host.bytesize]
+                    else
+                        @env['SERVER_NAME'] = host
+                    end
+                else
+                    @env['SERVER_NAME'] = 'localhost'
+                end
 
-            # Execute the request
-            # NOTE:: Catch was overloaded by Promise so this does the trick now
-            resp = ruby_catch(:async) { @app.call @env }
-            if resp.nil? || resp[0] == -1
-                @is_async = true
+                if @upgrade == true && @env['HTTP_UPGRADE'] == 'h2c'
+                    # TODO:: implement the upgrade process here
+                end
 
-                # close the body for deferred responses
-                unless resp.nil?
-                    body = resp[2]
-                    body.close if body.respond_to?(:close)
+                # Provide hijack options
+                @env['rack.hijack?'] = true
+                @env['rack.hijack'] = proc { @env['rack.hijack_io'] = @socket }
+
+                # Execute the request
+                # NOTE:: Catch was overloaded by Promise so this does the trick now
+                resp = ruby_catch(:async) { @app.call @env }
+                if resp.nil? || resp[0] == -1
+                    @is_async = true
+
+                    # close the body for deferred responses
+                    unless resp.nil?
+                        body = resp[2]
+                        body.close if body.respond_to?(:close)
+                    end
                 end
+                resp
             end
-            resp
         end
     end
 end

data/lib/spider-gazelle/options.rb

@@ -64,7 +64,7 @@ module SpiderGazelle
                     options[:lint] = true
                 end
 
-                opts.on "-m", "--mode MODE", MODES, "Either process, thread or no_ipc (default: thread)" do |arg|
+                opts.on "-m", "--mode MODE", MODES, "Either reactor, thread or inline (default: reactor)" do |arg|
                     options[:mode] = arg
                 end
 

data/lib/spider-gazelle/spider.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'spider-gazelle/spider/app_store'      # Manages the loaded applications
 require 'spider-gazelle/spider/binding'        # Holds a reference to a bound port
+require 'spider-gazelle/spider/http1'          # Parses and responds to HTTP1 requests
 require 'securerandom'
 
 
@@ -30,9 +32,8 @@ module SpiderGazelle
 
             # Gazelle pipe connection management
             @gazelles = {
-                # process: [],
                 # thread: [],
-                # no_ipc: gazelle_instance
+                # inline: gazelle_instance
             }
             @counts = {
                 # process: number
@@ -41,9 +42,7 @@ module SpiderGazelle
             @loading = {}     # mode => load defer
             @bindings = {}    # port => binding
             @iterators = {}   # mode => gazelle round robin iterator
-            @iterator_source = {}   # mode => gazelle pipe array (iterator source)
-
-            @password = SecureRandom.hex
+            @iterator_source = {}   # mode => gazelle thread array (iterator source)
 
             @running = true
             @loaded = false
@@ -64,7 +63,6 @@ module SpiderGazelle
 
         # Load gazelles and make the required bindings
         def ready
-            start_gazelle_server
             load_promise = load_applications
             load_promise.then do
                 # Check a shutdown request didn't occur as we were loading
@@ -116,82 +114,6 @@ module SpiderGazelle
         protected
 
 
-        # This starts the server the gazelles will be connecting to
-        def start_gazelle_server
-            @pipe_file = "#{SPIDER_SERVER}#{Process.pid}"
-            @logger.verbose { "Spider server starting on #{@pipe_file}" }
-
-            @pipe = @thread.pipe :ipc
-            begin
-                File.unlink @pipe_file
-            rescue
-            end
-
-            @shutdown = false
-            check = method(:check_credentials)
-            @pipe.bind(@pipe_file) do |client|
-                @logger.verbose { "Gazelle <0x#{client.object_id.to_s(16)}> connection made" }
-
-                # Shutdown if there is an error with any of the gazelles
-                client.catch do |error|
-                    begin
-                        @logger.print_error(error, "Gazelle <0x#{client.object_id.to_s(16)}> connection error")
-                    rescue
-                    end
-                end
-
-                # Client closed gracefully
-                client.finally do
-                    begin
-                        @logger.verbose { "Gazelle <0x#{client.object_id.to_s(16)}> disconnected" }
-                    rescue
-                    ensure
-                        @gazelles.delete client
-                        if !@shutdown
-                            @shutdown = true
-                            @signaller.general_failure
-                        end
-                    end
-                end
-
-                client.progress check
-                client.start_read
-            end
-
-            # catch server errors
-            @pipe.catch do |error|
-                @logger.print_error(error)
-                @signaller.general_failure
-            end
-
-            # start listening
-            @pipe.listen(INTERNAL_PIPE_BACKLOG)
-        end
-
-        def check_credentials(data, gazelle)
-            password, mode = data.split(' ', 2)
-            mode_sym = mode.to_sym
-
-            if password == @password && MODES.include?(mode_sym)
-                @gazelles[mode_sym] ||= []
-                gazelles = @gazelles[mode_sym]
-                gazelles << gazelle
-                @logger.verbose { "Gazelle <0x#{gazelle.object_id.to_s(16)}> connection was validated" }
-
-                # All the gazelles have loaded. Lets start processing requests
-                if gazelles.length == @counts[mode_sym]
-                    @logger.verbose { "#{mode.capitalize} gazelles are ready" }
-
-                    @iterator_source[mode_sym] = gazelles
-                    @iterators[mode_sym] = gazelles.cycle
-                    @loading[mode_sym].resolve(true)
-                end
-            else
-                @logger.warn "Gazelle <0x#{gazelle.object_id.to_s(16)}> connection closed due to bad credentials"
-                gazelle.close
-            end
-        end
-
         def load_applications
             loaded = []
             @logger.info "Environment: #{ENV['RACK_ENV']} on #{RUBY_ENGINE || 'ruby'} #{RUBY_VERSION}"
@@ -199,6 +121,7 @@ module SpiderGazelle
             # Load the different types of gazelles required
             @options.each do |app|
                 @logger.info "Loading: #{app[:rackup]}" if app[:rackup]
+                AppStore.load(app[:rackup], app)
 
                 mode = app[:mode]
                 loaded << load_gazelles(mode, app[:count], @options) unless @loading[mode]
@@ -209,65 +132,54 @@ module SpiderGazelle
             @thread.all(*loaded)
         end
 
-            
+
         def load_gazelles(mode, count, options)
             defer = @thread.defer
             @loading[mode] = defer
 
-            pass = options[0][:spider]
-
-            if mode == :no_ipc
-                # Provide the password to the gazelle instance
-                options[0][:gazelle] = @password
-
+            if mode == :inline
                 # Start the gazelle
                 require 'spider-gazelle/gazelle'
                 gaz = ::SpiderGazelle::Gazelle.new(@thread, mode).run!(options)
-                @gazelles[:no_ipc] = gaz
+                @gazelles[:inline] = gaz
 
                 # Setup the round robin
-                @iterator_source[mode] = gaz
-                @iterators[mode] = gaz
+                itr = [gaz]
+                @iterator_source[mode] = [gaz]
+                @iterators[mode] = [gaz.thread].cycle
+
                 defer.resolve(true)
             else
                 require 'thread'
 
-                # Provide the password to the gazelle instance
-                options[0][:gazelle] = @password
-                options[0][:gazelle_ipc] = @pipe_file
-
                 count = @counts[mode] = count || ::Libuv.cpu_count || 1
                 @logger.info "#{mode.to_s.capitalize} count: #{count}"
 
-                if mode == :thread
-                    require 'spider-gazelle/gazelle'
-                    reactor = Reactor.instance
-
-                    @threads = []
-                    count.times do
-                        thread = ::Libuv::Reactor.new
-                        @threads << thread
+                require 'spider-gazelle/gazelle'
+                reactor = Reactor.instance
 
-                        Thread.new { load_gazelle_thread(reactor, thread, mode, options) }
-                    end
-                else
-                    # Remove the spider option
-                    args = LaunchControl.instance.args - ['-s', pass]
+                @threads = []
+                loaded = []
+                count.times do
+                    loading = @thread.defer
+                    loaded << loading.promise
 
-                    # Build the command with the gazelle option
-                    args = [EXEC_NAME, '-g', @password, '-f', @pipe_file] + args
+                    thread = ::Libuv::Reactor.new
+                    @threads << thread
 
-                    @logger.verbose { "Launching #{count} gazelle processes" }
-                    count.times do
-                        Thread.new { launch_gazelle(args) }
-                    end
+                    Thread.new { load_gazelle_thread(reactor, thread, mode, options, loading) }
                 end
+
+                defer.resolve(@thread.all(*loaded).then { |gazelles|
+                    @iterator_source[mode] = gazelles
+                    @iterators[mode] = gazelles.map { |gaz| gaz.thread }.cycle
+                })
             end
 
             defer.promise
         end
 
-        def load_gazelle_thread(reactor, thread, mode, options)
+        def load_gazelle_thread(reactor, thread, mode, options, loading)
             # Log any unhandled errors
             thread.notifier reactor.method(:log)
             # Give current requests 5 seconds to complete
@@ -281,25 +193,11 @@ module SpiderGazelle
             end
             thread.run do |thread|
                 # Start the gazelle
-                ::SpiderGazelle::Gazelle.new(thread, :thread).run!(options)
-            end
-        end
-
-        def launch_gazelle(cmd)
-            # Wait for the process to close
-            result = system(*cmd)
-
-            # Kill the spider if a process exits unexpectedly
-            if @running
-                @thread.schedule do
-                    if result
-                        @logger.verbose "Gazelle process exited with exit status 0"
-                    else
-                        @logger.error "Gazelle process exited unexpectedly"
-                    end
-                     
-                    @signaller.general_failure
+                gaz = ::SpiderGazelle::Gazelle.new(thread, :thread)
+                thread.next_tick do
+                    loading.resolve(gaz)
                 end
+                gaz.run!(options)
             end
         end
 
@@ -307,12 +205,11 @@ module SpiderGazelle
             @bound = true
             @loaded = true
 
-            @options.each_index do |id|
-                options = @options[id]
+            @options.each do |options|
                 @logger.verbose { "Loading rackup #{options}" }
                 iterator = @iterators[options[:mode]]
 
-                binding = @bindings[options[:port]] = Binding.new(iterator, id.to_s, options)
+                binding = @bindings[options[:port]] = Binding.new(iterator, options)
                 binding.bind
             end
         end
@@ -344,17 +241,11 @@ module SpiderGazelle
             promises = []
 
             @iterator_source.each do |mode, gazelles|
-                if mode == :no_ipc
-                    # itr is a gazelle in no_ipc mode
+                # End communication with the gazelle threads
+                gazelles.each do |gazelle|
                     defer = @thread.defer
-                    gazelles.shutdown(defer)
+                    gazelle.shutdown(defer)
                     promises << defer.promise
-
-                else
-                    # End communication with the gazelle threads / processes
-                    gazelles.dup.each do |gazelle|
-                        promises << gazelle.close
-                    end
                 end
             end
 

data/lib/spider-gazelle/{gazelle → spider}/app_store.rb

@@ -3,7 +3,7 @@
 require 'thread'
 
 module SpiderGazelle
-    class Gazelle
+    class Spider
         module AppStore
             @apps = []
             @loaded = {}
@@ -21,7 +21,7 @@ module SpiderGazelle
                         tls = configure_tls(options)
                         port = tls ? 443 : 80
 
-                        val = [app, port.to_s, tls]
+                        val = [app, port, tls]
                         @apps << val
                         @loaded[rackup] = val
                     }

data/lib/spider-gazelle/spider/binding.rb

@@ -5,36 +5,45 @@ require 'thread'
 module SpiderGazelle
     class Spider
         class Binding
-            attr_reader :app_id
-            attr_accessor :tcp
+            attr_reader :tcp, :app, :app_port, :tls
 
 
-            def initialize(iterator, app_id, options)
-                if options[:mode] == :no_ipc
-                    @delegate = method(:direct_delegate)
-                    @gazelle = iterator
-                else
-                    @delegate = method(:delegate)
-                    @select_gazelle = iterator
-                end
-
+            def initialize(iterator, options)
                 @options = options
 
                 @logger = Logger.instance
                 @signaller = Signaller.instance
                 @thread = @signaller.thread
+                @iterator = iterator
 
                 @port = @options[:port]
-                @indicator = app_id.to_s.freeze
+                @app, @app_port, @tls = AppStore.lookup(options[:rackup])
+
+                @set_protocol  = method(:set_protocol)
+
+                @http1_cache = []
+                @http2_cache = []
+                @return_http1 = method(:return_http1)
+                @return_http2 = method(:return_http2)
+                @parser_count = 0
             end
 
             # Bind the application to the selected port
             def bind
                 # Bind the socket
                 @tcp = @thread.tcp
-                @tcp.bind @options[:host], @port, @delegate
-                @tcp.listen @options[:backlog]
                 @tcp.enable_simultaneous_accepts
+                
+                if @tls
+                    @tcp.bind @options[:host], @port do |client|
+                        prepare_client_tls client
+                    end
+                else
+                    @tcp.bind @options[:host], @port do |client|
+                        prepare_client client
+                    end
+                end
+                @tcp.listen 10000
 
                 @logger.info "Listening on tcp://#{@options[:host]}:#{@port}"
 
@@ -59,23 +68,59 @@ module SpiderGazelle
             protected
 
 
-            DELEGATE_ERR = proc { |error|
-                client.close
-                begin
-                    Logger.instance.print_error(error, "delegating socket to gazelle")
-                rescue
+            # ---------------------------
+            # Setup the client connection
+            # ---------------------------
+            def prepare_client(client)
+                set_protocol(client, :http1)
+                client.start_read
+                client.enable_nodelay
+            end
+
+            def prepare_client_tls(client)
+                client.on_handshake @set_protocol
+                client.start_tls(@tls)
+
+                client.start_read
+                client.enable_nodelay
+            end
+
+            def set_protocol(client, version)
+                parser = if version == :h2
+                    @http2_cache.pop || new_http2_parser
+                else
+                    @http1_cache.pop || new_http1_parser
                 end
-            }
-            def delegate(client, retries = 0)
-                promise = @select_gazelle.next.write2(client, @indicator, wait: :promise)
-                promise.then do
-                    client.close
+
+                parser.load(client, @app_port, @app, @tls)
+                client.progress do |data, _|
+                    parser.parse(data)
                 end
-                promise.catch DELEGATE_ERR
             end
 
-            def direct_delegate(client)
-                @gazelle.__send__(:process_connection, client, @indicator)
+
+            # ---------------------------------------
+            # Select a protocol to handle the request
+            # ---------------------------------------
+            def new_http1_parser
+                @h1_parser_obj ||= Http1::Callbacks.new
+
+                @parser_count += 1
+                Http1.new(@return_http1, @h1_parser_obj, @thread, @logger, @iterator)
+            end
+
+            def return_http1(parser)
+                @http1_cache.push parser
+            end
+
+            def new_http2_parser
+                raise NotImplementedError.new 'TODO:: Create HTTP2 parser class'
+                @parser_count += 1
+                Http2.new(@return_http2, @thread, @logger, @iterator)
+            end
+
+            def return_http2(parser)
+                @http2_cache << parser
             end
         end
     end

data/lib/spider-gazelle/{gazelle → spider}/http1.rb

@@ -5,7 +5,7 @@ require 'spider-gazelle/gazelle/request'
 
 
 module SpiderGazelle
-    class Gazelle
+    class Spider
         class Http1
             class Callbacks
                 def initialize
@@ -67,7 +67,7 @@ module SpiderGazelle
             Hijack = Struct.new :socket, :env
 
 
-            def initialize(return_method, callbacks, thread, logger)
+            def initialize(return_method, callbacks, thread, logger, gazelles)
                 # The HTTP parser callbacks object for this thread
                 @return_method = return_method
                 @callbacks = callbacks
@@ -76,6 +76,7 @@ module SpiderGazelle
 
                 @queue_response = method :queue_response
                 @write_chunk = method :write_chunk
+                @gazelles = gazelles
 
                 # The parser state for this instance
                 @state = ::HttpParser::Parser.new_instance do |inst|
@@ -150,7 +151,7 @@ module SpiderGazelle
             # Parser Callbacks
             # ----------------
             def start_parsing
-                @parsing = Request.new @thread, @app, @port, @remote_ip, @scheme, @socket
+                @parsing = Gazelle::Request.new @thread, @app, @port, @remote_ip, @scheme, @socket
             end
 
             def headers_complete
@@ -160,12 +161,14 @@ module SpiderGazelle
             def finished_parsing
                 request = @parsing
                 @parsing = nil
+                request.keep_alive = @state.keep_alive?
+                request.upgrade = @state.upgrade?
 
-                if !@state.keep_alive?
-                    request.keep_alive = false
-                    # We don't expect any more data
-                    @socket.stop_read
-                end
+                @thread.next_tick { after_parsing(request) }
+            end
+
+            def after_parsing(request)
+                @socket.stop_read unless request.keep_alive
 
                 # Process the async request in the same way as Mizuno
                 # See: http://polycrystal.org/2012/04/15/asynchronous_responses_in_rack.html
@@ -173,12 +176,9 @@ module SpiderGazelle
                 request.env['async.callback'] = proc { |data|
                     @thread.schedule { request.defer.resolve([request, data]) }
                 }
-                request.upgrade = @state.upgrade?
                 @requests << request
 
-                unless @processing
-                    ::Fiber.new { process_next }.resume
-                end
+                process_next unless @processing
             end
 
             # ------------------
@@ -189,29 +189,34 @@ module SpiderGazelle
                 @processing = @requests.shift
                 if @processing
                     request = @processing
-                    begin
-                        result = begin
-                            request.execute!
-                        rescue StandardError => e
-                            @logger.print_error e, 'framework error'
-                            @processing.keep_alive = false
-                            [500, {}, EMPTY_RESPONSE]
-                        end
+                    request.then @queue_response
 
-                        if request.is_async && !request.hijacked
-                            if result.nil? && !request.defer.resolved?
-                                # TODO:: setup timeout for async response
-                            end
-                        else
-                            # Complete the current request
-                            request.defer.resolve([request, result])
-                        end
-                        request.then @queue_response
-                    rescue Exception => error
-                        Logger.instance.print_error error, 'critical error'
-                        Reactor.instance.shutdown
+                    @gazelles.next.schedule do
+                        process_on_gazelle(request)
+                    end
+                end
+            end
+
+            def process_on_gazelle(request)
+                result = begin
+                    request.execute!
+                rescue StandardError => e
+                    Logger.instance.print_error e, 'framework error'
+                    request.keep_alive = false
+                    [500, {}, EMPTY_RESPONSE]
+                end
+
+                if request.is_async && !request.hijacked
+                    if result.nil? && !request.defer.resolved?
+                        # TODO:: setup timeout for async response
                     end
+                else
+                    # Complete the current request
+                    request.defer.resolve([request, result])
                 end
+            rescue Exception => error
+                Logger.instance.print_error error, 'critical error'
+                Reactor.instance.shutdown
             end
 
             # ----------------

data/lib/spider-gazelle/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module SpiderGazelle
-    VERSION = '3.0.4'
+    VERSION = '3.0.5'
     EXEC_NAME = 'sg'
 end

data/spec/http1_spec.rb

@@ -1,5 +1,5 @@
 require 'spider-gazelle'
-require 'spider-gazelle/gazelle/http1'
+require 'spider-gazelle/spider/http1'
 
 
 # TODO:: Mock logger
@@ -50,7 +50,7 @@ class MockLogger
     end
 end
 
-describe ::SpiderGazelle::Gazelle::Http1 do
+describe ::SpiderGazelle::Spider::Http1 do
     before :each do
         @shutdown_called = 0
         @close_called = 0
@@ -73,8 +73,8 @@ describe ::SpiderGazelle::Gazelle::Http1 do
             @returned = http1
         }
         @logger = MockLogger.new
-        @http1_callbacks ||= ::SpiderGazelle::Gazelle::Http1::Callbacks.new
-        @http1 = ::SpiderGazelle::Gazelle::Http1.new(@return, @http1_callbacks, @loop, @logger)
+        @http1_callbacks ||= ::SpiderGazelle::Spider::Http1::Callbacks.new
+        @http1 = ::SpiderGazelle::Spider::Http1.new(@return, @http1_callbacks, @loop, @logger, [@loop].cycle)
 
         @socket = MockSocket.new
         @socket.shutdown_cb = proc {

data/spider-gazelle.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     s.add_dependency 'http-2', '~> 0.8' # HTTP2 parsing and response management
 
     s.add_development_dependency 'rspec', '~> 3.5'  # Testing framework
-    s.add_development_dependency 'rake', '~> 11.2'  # Task runner
+    s.add_development_dependency 'rake', '~> 12'  # Task runner
     s.add_development_dependency 'yard', '~> 0.9'   # Comment based documentation generation
 
     s.files = Dir["{lib,bin}/**/*"] + %w(Rakefile spider-gazelle.gemspec README.md LICENSE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-parser
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -155,8 +155,6 @@ files:
 - lib/rack/handler/spider-gazelle.rb
 - lib/spider-gazelle.rb
 - lib/spider-gazelle/gazelle.rb
-- lib/spider-gazelle/gazelle/app_store.rb
-- lib/spider-gazelle/gazelle/http1.rb
 - lib/spider-gazelle/gazelle/request.rb
 - lib/spider-gazelle/logger.rb
 - lib/spider-gazelle/options.rb
@@ -164,7 +162,9 @@ files:
 - lib/spider-gazelle/signaller.rb
 - lib/spider-gazelle/signaller/signal_parser.rb
 - lib/spider-gazelle/spider.rb
+- lib/spider-gazelle/spider/app_store.rb
 - lib/spider-gazelle/spider/binding.rb
+- lib/spider-gazelle/spider/http1.rb
 - lib/spider-gazelle/upgrades/websocket.rb
 - lib/spider-gazelle/version.rb
 - spec/http1_spec.rb