falcon 0.22.3 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ad61202855a3d1a3e2137b03a7aab80a77537f86b381e9c9194f98f1a834d0
-  data.tar.gz: ee94ebd2cacdaeea91eab74dde099c82170069b29a25423a6879120287e40299
+  metadata.gz: e0e70db57599ceb24ef8ba959ccf4e9d7c43c774e5bafec0e08956d98362dc31
+  data.tar.gz: 742ea2d7f69b142c9e05cc4f9f2dca3d372c3b41f0b3e4d0733923b7e50853e8
 SHA512:
-  metadata.gz: f51b62cd4c1b46fbeafe76347e1050e64a9a6885a39a13e21080cc412a776335d930c42a4f13a176aa92d912f5e48e1fefd8b22321bb974374be1b90337e63c2
-  data.tar.gz: 18989ca95db8bf6f384d9c60bb9cd359302ba30b7c15c0e2f0a56480521993512ba268a8152cd14fb7d17e4f31ddfd39f502babdc1d1c0ffb495d50be39ec890
+  metadata.gz: f140e5df2529863dc8ad27cdd16cc6fa7d24e13db1d95f545e09b4e49255762b44cf5f497402be4461570277d6a7d76afda7d9291a397aeae99177743b74f8e7
+  data.tar.gz: e951345f66cfaad7e3e3d82e818cc7079f4156b60a03f1e1ee717ebffab8ac8c2585c317061836fd90346cef0d5103510e5a091209750446a6d061c5468fc799

data/.travis.yml

@@ -27,11 +27,9 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
-    - rvm: rbx-3
   allow_failures:
     - rvm: truffleruby
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: truffleruby
-    - rvm: rbx-3
     - gemfile: gems/rack3.gemfile

data/falcon.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency("http-protocol", "~> 0.12")
+	spec.add_dependency("http-protocol", "~> 0.15")
 	
 	spec.add_dependency("async", "~> 1.13")
 	spec.add_dependency("async-io", "~> 1.18")
-	spec.add_dependency("async-http", "~> 0.37.2")
+	spec.add_dependency("async-http", "~> 0.38.0")
 	spec.add_dependency("async-container", "~> 0.9.0")
 	
 	spec.add_dependency("rack", ">= 1.0")
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_development_dependency "async-process", "~> 1.1"
 	
-	spec.add_development_dependency "covered"
+	spec.add_development_dependency "covered", "~> 0.10"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"

data/lib/falcon/adapters/push.rb

@@ -0,0 +1,59 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'async/http/middleware'
+
+module Falcon
+	module Adapters
+		# Interprets link headers to implement server push.
+		# https://tools.ietf.org/html/rfc8288
+		class Push < Async::HTTP::Middleware
+			PRELOAD = /<(?<path>.*?)>;.*?rel=preload/
+			
+			def self.early_hints(headers)
+				headers.each do |key, value|
+					if key.casecmp("link").zero? and match = PRELOAD.match(value)
+						yield match[:path]
+					else
+						Async.logger.warn(request) {"Unsure how to handle early hints header: #{key}"}
+					end
+				end
+			end
+			
+			def call(request)
+				response = super
+				
+				Async.logger.debug(self) {response}
+				
+				if request.push?
+					Async.logger.debug(self) {response.headers['link']}
+					
+					response.headers['link']&.each do |link|
+						if match = link.match(PRELOAD)
+							request.push(match[:path])
+						end
+					end
+				end
+				
+				return response
+			end
+		end
+	end
+end

data/lib/falcon/adapters/rack.rb

@@ -55,6 +55,9 @@ module Falcon
 			RACK_HIJACK = 'rack.hijack'.freeze
 			RACK_IS_HIJACK = 'rack.hijack?'.freeze
 			RACK_HIJACK_IO = 'rack.hijack_io'.freeze
+			RACK_EARLY_HINTS = "rack.early_hints".freeze
+			
+			ASYNC_HTTP_REQUEST = "async.http.request".freeze
 			
 			# Header constants
 			HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'.freeze
@@ -120,6 +123,8 @@ module Falcon
 				env = {
 					RACK_VERSION => [2, 0, 0],
 					
+					ASYNC_HTTP_REQUEST => request,
+					
 					RACK_INPUT => Input.new(request.body),
 					RACK_ERRORS => $stderr,
 					RACK_LOGGER => Async.logger,
@@ -155,6 +160,14 @@ module Falcon
 				
 				self.unwrap_request(request, env)
 				
+				if request.push?
+					env[RACK_EARLY_HINTS] = lambda do |headers|
+						Falcon::Adapters::Push.early_hints(headers) do |path|
+							request.push(path)
+						end
+					end
+				end
+				
 				if request.hijack?
 					env[RACK_IS_HIJACK] = true
 					

data/lib/falcon/server.rb

@@ -26,6 +26,7 @@ require 'async/http/content_encoding'
 require_relative 'verbose'
 require_relative 'adapters/rewindable'
 require_relative 'adapters/rack'
+require_relative 'adapters/push'
 
 module Falcon
 	class Server < Async::HTTP::Server

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.22.3"
+	VERSION = "0.23.0"
 end

data/tasks/benchmark.rake

@@ -1,6 +1,21 @@
 
 namespace :benchmark do
-	task :compare do
+	task :hello do
+		@config_path = File.expand_path("../examples/hello/config.ru", __dir__)
+		@request_path = "/"
+	end
+
+	task :small do
+		@config_path = File.expand_path("../examples/benchmark/config.ru", __dir__)
+		@request_path = "/small"
+	end
+
+	task :big do
+		@config_path ||= File.expand_path("../examples/benchmark/config.ru", __dir__)
+		@request_path ||= "/big"
+	end
+
+	task :compare => :big do
 		require 'etc'
 		
 		require 'async/reactor'
@@ -10,8 +25,7 @@ namespace :benchmark do
 		require 'async/http/url_endpoint'
 		
 		host = "http://127.0.0.1:9292"
-		config_path = File.expand_path("../examples/benchmark/config.ru", __dir__)
-		
+
 		threads = Etc.nprocessors
 		
 		perf = ["perf", "record", "-F", "max", "-a", "--"]
@@ -20,7 +34,8 @@ namespace :benchmark do
 			# ["puma", "--bind", host.gsub("http", "tcp")],
 			["puma", "--workers", threads.to_s, "--bind", host.gsub("http", "tcp")],
 			# ["rbspy", "record", "--", "falcon", "serve", "--threaded", "--bind", host, "--config"]
-			["falcon", "serve", "--bind", host, "--config"]
+			["falcon", "serve", "--bind", host, "--config"],
+			# ["falcon", "serve", "--reuse-port", "--bind", host, "--config"],
 		]
 		
 		Async.logger.info!
@@ -37,7 +52,7 @@ namespace :benchmark do
 					
 					server_task = task.async do
 						$stderr.puts "Starting #{command.first}"
-						server_status = Async::Process.spawn(*command, config_path)
+						server_status = Async::Process.spawn(*command, @config_path)
 					end
 					
 					begin
@@ -47,7 +62,7 @@ namespace :benchmark do
 						
 						socket = endpoint.connect
 						
-						request = Async::HTTP::Request.new("http", "localhost", "GET", "/big")
+						request = Async::HTTP::Request.new("http", "localhost", "GET", @request_path)
 						stream = Async::IO::Stream.new(socket)
 						protocol = Async::HTTP::Protocol::HTTP1.client(stream)
 						
@@ -76,7 +91,7 @@ namespace :benchmark do
 						
 						# Async::Process.spawn("ab", "-n", "2000", "#{host}/small")
 						
-						Async::Process.spawn("wrk", "-c", c.to_s, "-t", (n+1).to_s, "-d", "2", "#{host}/big")
+						Async::Process.spawn("wrk", "-c", c.to_s, "-t", (n+1).to_s, "-d", "2", "#{host}#{@request_path}")
 					end
 				ensure
 					server_task.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.23.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,7 @@ files:
 - lib/falcon.rb
 - lib/falcon/adapters/input.rb
 - lib/falcon/adapters/output.rb
+- lib/falcon/adapters/push.rb
 - lib/falcon/adapters/rack.rb
 - lib/falcon/adapters/response.rb
 - lib/falcon/adapters/rewindable.rb