spider-gazelle 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58fe4be1489a50a6ccaa2ddc2f49593a8141060
-  data.tar.gz: fa45ab4c055d22fa7feb9ab4307c9cd8c27b56d3
+  metadata.gz: 778791bf3b7c52fdfa82112ce9e1bf4b53df9223
+  data.tar.gz: 57b34f904238ae88fa5a2bb45c7110f366eaad1e
 SHA512:
-  metadata.gz: afa593ea2c53a7417ef75868e8d72b0b2a5786f715049f0dffc9260fe9abdb4d813f29746dcd35af104774139d0dbcee25ca41cf0bd8f75a1c4728f4a1f297d2
-  data.tar.gz: 48e07a08af8002346cda819620e0046d8c1c6669341d61a862b6490a32797f74dc29771ea4ea9852f11b4d040f07fe3d190ecdea7e6484b602ff7f109599a3a2
+  metadata.gz: 79445b4d863e03f59656d48f112ce565764cca4ebfb59ca915ad56de43342c54392b7fb71afe77894af4acc31952f12d4b3dcb1fe5505d9caac7f192507f1574
+  data.tar.gz: a20df55c3754354438a217350b2693067e23988722c0bbc0c3401d9bf23974fe702534c563a005743cb2ce34d60d956bf38c5ef085afaebfc7a1ca26686fe528

data/lib/spider-gazelle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'singleton'
 
@@ -10,22 +12,22 @@ require 'spider-gazelle/signaller'
 
 
 module SpiderGazelle
-    INTERNAL_PIPE_BACKLOG = 128
+    INTERNAL_PIPE_BACKLOG = 4096
 
     # Signaller is used to communicate:
     # * command line requests
     # * Startup and shutdown requests 
     # * Live updates (bindings passed by this pipe)
-    SIGNAL_SERVER = '/tmp/sg-signaller.pipe'.freeze
+    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.'.freeze
+    SPIDER_SERVER = '/tmp/sg-spider.pipe.'
+
 
     MODES = [:process, :thread, :no_ipc].freeze
-    APP_MODE = [:thread_pool, :fiber_pool, :libuv, :eventmachine, :celluloid]
 
 
     class LaunchControl
@@ -144,24 +146,24 @@ module SpiderGazelle
 
                 if running
                     if master[:spider]
-                        logger.verbose "Starting Spider".freeze
+                        logger.verbose "Starting Spider"
                         start_spider(signaller, logger, options)
                     elsif master[:gazelle]
-                        logger.verbose "Starting Gazelle".freeze
+                        logger.verbose "Starting Gazelle"
                         start_gazelle(signaller, logger, options)
                     else
-                        logger.verbose "Sending signal to SG Master".freeze
+                        logger.verbose "Sending signal to SG Master"
                         signal_master(reactor, signaller, logger, options)
                     end
 
                 elsif master[:debug]
-                    logger.verbose "SG is now running in debug mode".freeze
+                    logger.verbose "SG is now running in debug mode"
                 else
-                    logger.verbose "SG was not running, launching Spider".freeze
+                    logger.verbose "SG was not running, launching Spider"
                     launch_spider(@args)
                 end
             rescue => e
-                logger.verbose "Error performing requested operation".freeze
+                logger.verbose "Error performing requested operation"
                 logger.print_error(e)
                 shutdown
             end

data/lib/spider-gazelle/gazelle.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require "rack"            # Ruby webserver abstraction
-require "rack/lock_patch" # Serialize execution in development mode
 require 'spider-gazelle/gazelle/app_store'
 require 'spider-gazelle/gazelle/http1'
 
@@ -10,7 +11,7 @@ require "spider-gazelle/upgrades/websocket"
 
 module SpiderGazelle
     class Gazelle
-        SPACE = ' '.freeze
+        SPACE = ' '
 
         def initialize(thread, type)
             raise ArgumentError, "type must be one of #{MODES}" unless MODES.include?(type)
@@ -52,23 +53,13 @@ module SpiderGazelle
             socket = @pipe.check_pending
             return if socket.nil?
             process_connection(socket, data.to_i)
+        rescue => e
+            @logger.print_error(e)
         end
 
-        def shutdown(finished = nil)
-            # Wait for the requests to finish (give them 15 seconds)
-            # TODO::
-
+        def shutdown
+            # Wait for the requests to finish
             @logger.verbose { "Gazelle: #{@type} Pid: #{Process.pid} shutting down" }
-
-            # Then stop the current thread if we are in threaded mode
-            if @type == :thread
-                # In threaded mode the gazelle has the power
-                @thread.stop
-            else
-                # Both no_ipc and process need to know when the requests
-                # have completed to shutdown
-                finished.resolve(true)
-            end
         end
 
 
@@ -84,8 +75,8 @@ module SpiderGazelle
                 authenticate
             end
 
-            @pipe.catch do |error|
-                @logger.print_error(error)
+            @pipe.catch do |error, backtrace|
+                @logger.print_error(error, String.new, backtrace)
             end
 
             @pipe.finally do
@@ -93,7 +84,7 @@ module SpiderGazelle
                     Reactor.instance.shutdown
                 else
                     # Threaded mode
-                    shutdown
+                    connect_to_spider
                 end
             end
         end
@@ -141,7 +132,7 @@ module SpiderGazelle
         end
 
         def set_protocol(socket, version)
-            app, app_mode, port, tls = socket.storage
+            app, port, tls = socket.storage
 
             parser = if version == :h2
                 @http2_cache.pop || new_http2_parser
@@ -149,7 +140,7 @@ module SpiderGazelle
                 @http1_cache.pop || new_http1_parser
             end
 
-            parser.load(socket, port, app, app_mode, tls)
+            parser.load(socket, port, app, tls)
             socket.progress @on_progress
             socket.storage = parser
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module SpiderGazelle
@@ -15,10 +17,11 @@ module SpiderGazelle
                         return if @loaded[rackup]
 
                         app, opts = ::Rack::Builder.parse_file(rackup)
+                        app = Rack::Lint.new(app) if options[:lint]
                         tls = configure_tls(options)
                         port = tls ? 443 : 80
 
-                        val = [app, options[:app_mode], port, tls]
+                        val = [app, port.to_s, tls]
                         @apps << val
                         @loaded[rackup] = val
                     }
@@ -40,7 +43,7 @@ module SpiderGazelle
                     tls = configure_tls(options)
                     port = tls ? 443 : 80
 
-                    val = [app, options[:app_mode], port, tls]
+                    val = [app, port.to_s, tls]
                     @apps << val
                     @loaded[obj_id] = val
 
@@ -58,8 +61,8 @@ module SpiderGazelle
                 @apps[id.to_i]
             end
 
-            PROTOCOLS = ['h2'.freeze, 'http/1.1'.freeze].freeze
-            FALLBACK = 'http/1.1'.freeze
+            PROTOCOLS = ['h2', 'http/1.1'].freeze
+            FALLBACK = 'http/1.1'
             def self.configure_tls(opts)
                 return false unless opts[:tls]
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'http-parser'     # C based, fast, http parser
 require 'spider-gazelle/gazelle/request'
@@ -30,10 +31,10 @@ module SpiderGazelle
                     req.header.frozen? ? req.header = header : req.header << header
                 end
 
-                DASH       = '-'.freeze
-                UNDERSCORE = '_'.freeze
-                HTTP_META  = 'HTTP_'.freeze
-                COMMA      = ', '.freeze
+                DASH       = '-'
+                UNDERSCORE = '_'
+                HTTP_META  = 'HTTP_'
+                COMMA      = ', '
 
                 def on_header_value(parser, value)
                     req = @connection.parsing
@@ -49,7 +50,7 @@ module SpiderGazelle
                             req.env[header] << COMMA
                             req.env[header] << value
                         else
-                            req.env[header] = value
+                            req.env[header] = String.new(value)
                         end
                     end
                 end
@@ -78,18 +79,8 @@ module SpiderGazelle
                 @thread = thread
                 @logger = logger
 
-                @work_complete = proc { |request, result|
-                    if request.is_async && !request.hijacked
-                        if result.is_a?(Fixnum) && !request.defer.resolved?
-                            # TODO:: setup timeout for async response
-                        end
-                    else
-                        # Complete the current request
-                        request.defer.resolve(result)
-                    end
-                }
-
-                @queue_response = method(:queue_response)
+                @queue_response = method :queue_response
+                @write_chunk = method :write_chunk
 
                 # The parser state for this instance
                 @state = ::HttpParser::Parser.new_instance do |inst|
@@ -108,28 +99,13 @@ module SpiderGazelle
             def self.on_progress(data, socket); end
             DUMMY_PROGRESS = self.method :on_progress
 
-            HTTP = 'http'.freeze
-            HTTPS = 'https'.freeze
+            HTTP = 'http'
+            HTTPS = 'https'
 
-            def load(socket, port, app, app_mode, tls)
+            def load(socket, port, app, tls)
                 @socket = socket
                 @port = port
                 @app = app
-                @mode = app_mode
-
-                case @mode
-                when :thread_pool
-                    @exec = method :exec_on_thread_pool
-                when :fiber_pool
-                    # TODO:: Implement these modes
-                    @exec = method :critical_error
-                when :libuv
-                    @exec = method :critical_error
-                when :eventmachine
-                    @exec = method :critical_error
-                when :celluloid
-                    @exec = method :critical_error
-                end
 
                 @remote_ip = socket.peername[0]
                 @scheme = tls ? HTTPS : HTTP
@@ -182,15 +158,15 @@ module SpiderGazelle
             # Parser Callbacks
             # ----------------
             def start_parsing
-                @parsing = Request.new @thread, @app, @port, @remote_ip, @scheme
+                @parsing = Request.new @thread, @app, @port, @remote_ip, @scheme, @socket
             end
 
-            REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+            REQUEST_METHOD = 'REQUEST_METHOD'
             def headers_complete
                 @parsing.env[REQUEST_METHOD] = @state.http_method.to_s
             end
 
-            ASYNC = "async.callback".freeze
+            ASYNC = "async.callback"
             def finished_parsing
                 request = @parsing
                 @parsing = nil
@@ -205,52 +181,54 @@ module SpiderGazelle
                 # See: http://polycrystal.org/2012/04/15/asynchronous_responses_in_rack.html
                 # Process a response that was marked as async.
                 request.env[ASYNC] = proc { |data|
-                    @thread.schedule { request.defer.resolve(data) }
+                    @thread.schedule { request.defer.resolve([request, data]) }
                 }
                 request.upgrade = @state.upgrade?
                 @requests << request
-                process_next unless @processing
+
+                unless @processing
+                    ::Fiber.new { process_next }.resume
+                end
             end
 
             # ------------------
             # Request Processing
             # ------------------
+            EMPTY_RESPONSE = [''].freeze
             def process_next
                 @processing = @requests.shift
                 if @processing
-                    @exec.call
-                    @processing.then @queue_response
-                end
-            end
-
-            WORKER_ERROR = proc { |error|
-                Logger.instance.print_error error, 'critical error'
-                Reactor.instance.shutdown
-            }
-            def exec_on_thread_pool
-                request = @processing
-                promise = @thread.work { work(request) }
-                promise.then @work_complete
-                promise.catch WORKER_ERROR
-            end
+                    request = @processing
+                    begin
+                        result = begin
+                            request.execute!
+                        rescue StandardError => e
+                            @logger.print_error e, 'framework error'
+                            @processing.keep_alive = false
+                            [500, {}, EMPTY_RESPONSE]
+                        end
 
-            EMPTY_RESPONSE = [''.freeze].freeze
-            def work(request)
-                begin
-                    [request, request.execute!]
-                rescue StandardError => e
-                    @logger.print_error e, 'framework error'
-                    @processing.keep_alive = false
-                    [request, [500, {}, EMPTY_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
+                    end
                 end
             end
 
-
             # ----------------
             # Response Sending
             # ----------------
-            def queue_response(result)
-                @responses << [@processing, result]
+            def queue_response(response)
+                @responses << response
                 send_next_response unless @transmitting
 
                 # Processing will be set to nil if the array is empty
@@ -258,14 +236,14 @@ module SpiderGazelle
             end
 
 
-            HEAD = 'HEAD'.freeze
-            ETAG = 'ETag'.freeze
-            HTTP_ETAG = 'HTTP_ETAG'.freeze
-            CONTENT_LENGTH2 = 'Content-Length'.freeze
-            TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
-            CHUNKED = 'chunked'.freeze
-            ZERO = '0'.freeze
-            NOT_MODIFIED_304 = "HTTP/1.1 304 Not Modified\r\n".freeze
+            HEAD = 'HEAD'
+            ETAG = 'ETag'
+            HTTP_ETAG = 'HTTP_ETAG'
+            CONTENT_LENGTH2 = 'Content-Length'
+            TRANSFER_ENCODING = 'Transfer-Encoding'
+            CHUNKED = 'chunked'
+            ZERO = '0'
+            NOT_MODIFIED_304 = "HTTP/1.1 304 Not Modified\r\n"
 
             def send_next_response
                 request, result = @responses.shift
@@ -361,7 +339,7 @@ module SpiderGazelle
                         # Optimize the response
                         begin
                             if body.size < 2
-                                headers[CONTENT_LENGTH2] = body.size == 1 ? body[0].bytesize : ZERO
+                                headers[CONTENT_LENGTH2] = body.size == 1 ? body[0].bytesize.to_s : ZERO
                             end
                         rescue # just in case
                         end
@@ -381,7 +359,7 @@ module SpiderGazelle
                 end
             end
 
-            CLOSE_CHUNKED = "0\r\n\r\n".freeze
+            CLOSE_CHUNKED = "0\r\n\r\n"
             def write_response(request, status, headers, body)
                 keep_alive = request.keep_alive
 
@@ -397,7 +375,6 @@ module SpiderGazelle
                     write_headers keep_alive, status, headers
 
                     # Stream the response
-                    @write_chunk ||= method :write_chunk
                     body.each &@write_chunk
 
                     @socket.write CLOSE_CHUNKED
@@ -407,8 +384,8 @@ module SpiderGazelle
                 body.close if body.respond_to?(:close)
             end
 
-            COLON_SPACE = ': '.freeze
-            LINE_END = "\r\n".freeze
+            COLON_SPACE = ': '
+            LINE_END = "\r\n"
             def add_header(header, key, value)
                 header << key
                 header << COLON_SPACE
@@ -416,14 +393,14 @@ module SpiderGazelle
                 header << LINE_END
             end
 
-            CONNECTION = "Connection".freeze
-            NEWLINE = "\n".freeze
-            CLOSE = "close".freeze
-            RACK = "rack".freeze
+            CONNECTION = "Connection"
+            NEWLINE = "\n"
+            CLOSE = "close"
+            RACK = "rack"
             def write_headers(keep_alive, status, headers)
                 headers[CONNECTION] = CLOSE if keep_alive == false
 
-                header = "HTTP/1.1 #{status} #{fetch_code(status)}\r\n"
+                header = String.new("HTTP/1.1 #{status} #{fetch_code(status)}\r\n")
                 headers.each do |key, value|
                     next if key.start_with? RACK
                     value.to_s.split(NEWLINE).each {|val| add_header(header, key, val)}
@@ -439,7 +416,7 @@ module SpiderGazelle
             end
 
             HTTP_STATUS_CODES = Rack::Utils::HTTP_STATUS_CODES
-            HTTP_STATUS_DEFAULT = proc { 'CUSTOM'.freeze }
+            HTTP_STATUS_DEFAULT = proc { 'CUSTOM' }
             def fetch_code(status)
                 HTTP_STATUS_CODES.fetch(status, &HTTP_STATUS_DEFAULT)
             end
@@ -469,7 +446,7 @@ module SpiderGazelle
                 end
             end
 
-            ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 0\r\n\r\n".freeze
+            ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
             def send_parsing_error
                 @logger.info "Parsing error!"
                 @socket.stop_read
@@ -477,7 +454,7 @@ module SpiderGazelle
                 @socket.shutdown
             end
 
-            ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\nConnection: close\r\nContent-Length: 0\r\n\r\n".freeze
+            ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
             def send_internal_error
                 @logger.info "Internal error"
                 @socket.stop_read