spider-gazelle 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fb9d631f4b6388900685024833ffcc2ea4e27f
-  data.tar.gz: e0a966bb202f0981be2fbeafc239165423562779
+  metadata.gz: d64004e93ed47b0a816510fb7e1c2ef3fd587e1e
+  data.tar.gz: f3e23bff3cb16a0442ad6037872674d2dd3c7793
 SHA512:
-  metadata.gz: c6cb52ce7c34a05e486bba8f4a2cb9194fe65858c22eadf33f60bb8af64c9f5b0c091f73d098e5ff67050404cd2096cd073d34bab79693138e2487e7503dbd69
-  data.tar.gz: e2dedb5e93f053a641270dccecb9ef9e32628653f0f89c74dc5be0cb4bee56d76a5825f07acb34b65f51df6e1bbc96c8be1c16a83fd8954b567f655440d1c473
+  metadata.gz: 1fa29f7d4dc35e3c870fe7fe4c0fa7755a09c6caa2296619d1c2b227430869914bcd030d77819f1ddd9dbbf1e28be6a15767661582b498c02cc34f315681064b
+  data.tar.gz: 0354d77ffd7971b1918eb5db4c7a6385b5b4708ff37eef32968e1bedd0cffa2060799041fcdedeb8eb265f6fc4fd3e599d2a80bd6e124391d31b6e6803318f3f

data/lib/spider-gazelle/reactor.rb

@@ -14,7 +14,6 @@ module SpiderGazelle
             @thread = ::Libuv::Reactor.default
             @logger = Logger.instance
             @running = false
-            @shutdown = method(:shutdown)
             @shutdown_called = false
         end        
 
@@ -23,8 +22,8 @@ module SpiderGazelle
                 @thread.schedule { yield }
             else
                 @running = true
-                @thread.notifier method(:log)
-                @thread.on_program_interrupt @shutdown
+                @thread.notifier { |*args| log(*args) }
+                @thread.on_program_interrupt { shutdown }
                 @thread.run { yield }
             end
         end

data/lib/spider-gazelle/signaller.rb

@@ -89,8 +89,6 @@ module SpiderGazelle
 
         def connect_to_sg_master
             @pipe = @thread.pipe :ipc
-
-            process = method(:process_response)
             @pipe.connect(SIGNAL_SERVER) do |client|
                 @is_client = true
                 @is_connected = true
@@ -103,7 +101,12 @@ module SpiderGazelle
                     delimiter: "\x03"
                 })
 
-                client.progress process
+                # The client processes responses here
+                client.progress do |data, server|
+                    @parser.extract(data).each do |msg|
+                        Spider.instance.__send__(msg)
+                    end
+                end
                 client.start_read
                 @client_check.resolve(true)
             end
@@ -138,7 +141,6 @@ module SpiderGazelle
             rescue
             end
 
-            process = method(:process_request)
             @pipe.bind(SIGNAL_SERVER) do |client|
                 @logger.verbose { "Client <0x#{client.object_id.to_s(16)}> connection made" }
                 @validating[client.object_id] = SignalParser.new
@@ -159,12 +161,14 @@ module SpiderGazelle
                     end
                 end
 
-                client.progress process
+                client.progress do |data, client|
+                    process_request(data, client)
+                end
                 client.start_read
             end
 
             # catch server errors
-            @pipe.catch method(:panic!)
+            @pipe.catch { |error| panic! error }
             @pipe.finally { @is_connected = false }
 
             # start listening
@@ -208,12 +212,5 @@ module SpiderGazelle
                 end
             end
         end
-
-        # The client processes responses here
-        def process_response(data, server)
-            @parser.extract(data).each do |msg|
-                Spider.instance.__send__(msg)
-            end
-        end
     end
 end

data/lib/spider-gazelle/spider.rb

@@ -181,7 +181,7 @@ module SpiderGazelle
 
         def load_gazelle_thread(reactor, thread, mode, options, loading)
             # Log any unhandled errors
-            thread.notifier reactor.method(:log)
+            thread.notifier { |*args| reactor.log(*args) }
             # Give current requests 5 seconds to complete
             thread.on_program_interrupt do
                 timer = thread.timer {

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

@@ -19,12 +19,10 @@ module SpiderGazelle
                 @port = @options[:port]
                 @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)
+                @return_http1 = proc { |parser| @http1_cache << parser }
+                @return_http2 = proc { |parser| @http2_cache << parser }
                 @parser_count = 0
             end
 
@@ -78,7 +76,7 @@ module SpiderGazelle
             end
 
             def prepare_client_tls(client)
-                client.on_handshake @set_protocol
+                client.on_handshake { |client, version| set_protocol(client, version) }
                 client.start_tls(@tls)
 
                 client.start_read
@@ -93,7 +91,7 @@ module SpiderGazelle
                 end
 
                 parser.load(client, @app_port, @app, @tls)
-                client.progress do |data, _|
+                client.progress do |data|
                     parser.parse(data)
                 end
             end
@@ -109,19 +107,11 @@ module SpiderGazelle
                 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
 end

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

@@ -74,8 +74,6 @@ module SpiderGazelle
                 @thread = thread
                 @logger = logger
 
-                @queue_response = method :queue_response
-                @write_chunk = method :write_chunk
                 @gazelles = gazelles
 
                 # The parser state for this instance
@@ -91,9 +89,7 @@ module SpiderGazelle
 
             attr_reader   :parsing
 
-
-            def self.on_progress(data, socket); end
-            DUMMY_PROGRESS = self.method :on_progress
+            DUMMY_PROGRESS = proc {}
 
             def load(socket, port, app, tls)
                 @socket = socket
@@ -113,7 +109,7 @@ module SpiderGazelle
 
             def on_close
                 # Unlink the progress callback (prevent funny business)
-                @socket.progress DUMMY_PROGRESS
+                @socket.progress &DUMMY_PROGRESS
                 @socket.storage = nil
                 reset
                 @return_method.call(self)
@@ -189,7 +185,15 @@ module SpiderGazelle
                 @processing = @requests.shift
                 if @processing
                     request = @processing
-                    request.then @queue_response
+
+                    # queue response
+                    request.then do |response|
+                        @responses << response
+                        send_next_response unless @transmitting
+
+                        # Processing will be set to nil if the array is empty
+                        process_next
+                    end
 
                     @gazelles.next.schedule do
                         process_on_gazelle(request)
@@ -222,14 +226,6 @@ module SpiderGazelle
             # ----------------
             # Response Sending
             # ----------------
-            def queue_response(response)
-                @responses << response
-                send_next_response unless @transmitting
-
-                # Processing will be set to nil if the array is empty
-                process_next
-            end
-
             def send_next_response
                 request, result = @responses.shift
                 @transmitting = request
@@ -355,14 +351,17 @@ module SpiderGazelle
                     write_headers keep_alive, status, headers
 
                     # Stream the response (pass directly into @socket.write)
-                    body.each &@socket.method(:write)
+                    body.each { |data| @socket.write(data) }
                     @socket.shutdown if keep_alive == false
                 else
                     headers['Transfer-Encoding'] = 'chunked'
                     write_headers keep_alive, status, headers
 
                     # Stream the response
-                    body.each &@write_chunk
+                    body.each do |part|
+                        chunk = part.bytesize.to_s(16) << "\r\n" << part << "\r\n"
+                        @socket.write chunk
+                    end
 
                     @socket.write "0\r\n\r\n"
                     @socket.shutdown if keep_alive == false
@@ -390,11 +389,6 @@ module SpiderGazelle
                 @socket.write header
             end
 
-            def write_chunk(part)
-                chunk = part.bytesize.to_s(16) << "\r\n" << part << "\r\n"
-                @socket.write chunk
-            end
-
             HTTP_STATUS_CODES = Rack::Utils::HTTP_STATUS_CODES
             HTTP_STATUS_DEFAULT = proc { 'CUSTOM' }
             def fetch_code(status)

data/lib/spider-gazelle/upgrades/websocket.rb

@@ -21,15 +21,34 @@ class SpiderGazelle::Websocket < ::Libuv::Q::DeferredPromise
         @driver = ::WebSocket::Driver.rack self
 
         # Pass data from the socket to the driver
-        @socket.progress &method(:socket_read)
-        @socket.finally &method(:socket_close)
-
+        @socket.progress do |data|
+            begin
+                @driver.parse data
+            rescue Exception => e
+                # Prevent hanging sockets
+                @socket.close
+                raise e
+            end
+        end
+        @socket.finally do
+            if @shutdown_called.nil?
+                @defer.reject WebSocket::Driver::CloseEvent.new(1006, 'connection was closed unexpectedly')
+            end
+        end
 
         # Driver has indicated that it is closing
         # We'll close the socket after writing any remaining data
-        @driver.on :close, &method(:on_close)
-        @driver.on :message, &method(:on_message)
-        @driver.on :error, &method(:on_error)
+        @driver.on :close do |event|
+            @shutdown_called = true
+            @socket.shutdown
+            @defer.resolve event
+        end
+        @driver.on :message do |event|
+            @progress.call(event.data, self) unless @progress.nil?
+        end
+        @driver.on :error do |event|
+            @defer.reject event
+        end
     end
 
     # Write some text to the websocket connection
@@ -61,37 +80,4 @@ class SpiderGazelle::Websocket < ::Libuv::Q::DeferredPromise
         callback ||= blk
         @driver.on :open, &callback
     end
-
-    protected
-
-    def socket_read(data, tcp)
-        begin
-            @driver.parse data
-        rescue => e
-            # Prevent hanging sockets
-            @socket.close
-            raise e
-        end
-    end
-
-    def socket_close
-        if @shutdown_called.nil?
-            @defer.reject WebSocket::Driver::CloseEvent.new(1006, 'connection was closed unexpectedly')
-        end
-    end
-
-
-    def on_message(event)
-        @progress.call(event.data, self) unless @progress.nil?
-    end
-
-    def on_error(event)
-        @defer.reject event
-    end
-
-    def on_close(event)
-        @shutdown_called = true
-        @socket.shutdown
-        @defer.resolve event
-    end
 end

data/lib/spider-gazelle/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.1.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-parser