falcon 0.36.7 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf341f482ade4d35f1b63da2c7b937d85f69a07537e5073233f5e2aeb771bcd6
-  data.tar.gz: ab45bb5d32c5a6afd41d83069da778e085f03b87704f2d67301ceaa251725772
+  metadata.gz: c5a4201cd601d651d96edf8c9eee196033ce1e1d31a802d16619a986dd1bd077
+  data.tar.gz: 9b1c9d31622951486ea1d1db012074551cb18ed4ff785d8dbb37bfa1b75dc046
 SHA512:
-  metadata.gz: 1c8bdfbfc3d7056695eed090fc49bf07e21517a251c5e7185b7450db9bf6648dd8f6d8d5f6b32472feeea0aa6f6cd2d384cac4dc8bfd06b20e924e88ae2a08ca
-  data.tar.gz: 22b1c2729420fbb1190dde29b0774f39ac86d52e75f2b0a5769c7ebde1ddba1a71dcaaa44bee27b3200ad349a2026641050bfccbcafe6d860d4ea868f7bd862b
+  metadata.gz: 9f1cd7757afa92a27b7b9d021e2ff443144afef2c9b0e30bddad548b45e68b4519ab02f2293f6388a00f62af0e8efb865e51f1241b8cee9312f9187406cb86ed
+  data.tar.gz: a75c84be6f77e4e79aa6d572d1a95e7c90d310650324f8d60fbca4dcd679138e30e799b538184ff804bfeac6c351478e574f61670d4e1d568801166ce24ac2ea

data/lib/falcon/adapters/rack.rb

@@ -24,7 +24,6 @@ require 'rack'
 
 require_relative 'input'
 require_relative 'response'
-require_relative 'early_hints'
 
 require 'async/logger'
 
@@ -60,7 +59,10 @@ module Falcon
 			RACK_HIJACK = 'rack.hijack'
 			RACK_IS_HIJACK = 'rack.hijack?'
 			RACK_HIJACK_IO = 'rack.hijack_io'
-			RACK_EARLY_HINTS = "rack.early_hints"
+			
+			# Raised back up through the middleware when the underlying connection is hijacked.
+			class FullHijack < StandardError
+			end
 			
 			# Async::HTTP specific metadata:
 			
@@ -184,10 +186,6 @@ module Falcon
 				
 				self.unwrap_request(request, env)
 				
-				if request.push?
-					env[RACK_EARLY_HINTS] = EarlyHints.new(request)
-				end
-				
 				full_hijack = false
 				
 				if request.hijack?
@@ -208,7 +206,7 @@ module Falcon
 				
 				# If there was a full hijack:
 				if full_hijack
-					return nil
+					raise FullHijack, "The connection was hijacked."
 				else
 					return Response.wrap(status, headers, body, request)
 				end

data/lib/falcon/adapters/response.rb

@@ -92,10 +92,10 @@ module Falcon
 				protocol = meta['rack.protocol']
 				
 				# https://tools.ietf.org/html/rfc7231#section-7.4.2
-				headers.add('server', "falcon/#{Falcon::VERSION}")
+				# headers.add('server', "falcon/#{Falcon::VERSION}")
 				
 				# https://tools.ietf.org/html/rfc7231#section-7.1.1.2
-				headers.add('date', Time.now.httpdate)
+				# headers.add('date', Time.now.httpdate)
 				
 				return self.new(status, headers, body, protocol)
 			end

data/lib/falcon/command/host.rb

@@ -71,7 +71,15 @@ module Falcon
 					buffer.puts "- To reload: kill -HUP #{Process.pid}"
 				end
 				
-				Bundler.require(:preload)
+				begin
+					Bundler.require(:preload)
+				rescue Bundler::GemfileNotFound
+					# Ignore.
+				end
+				
+				if GC.respond_to?(:compact)
+					GC.compact
+				end
 				
 				self.controller.run
 			end

data/lib/falcon/command/serve.rb

@@ -145,7 +145,11 @@ module Falcon
 					load(full_path)
 				end
 				
-				Bundler.require(:preload)
+				begin
+					Bundler.require(:preload)
+				rescue Bundler::GemfileNotFound
+					# Ignore.
+				end
 				
 				if GC.respond_to?(:compact)
 					GC.compact

data/lib/falcon/command/virtual.rb

@@ -77,6 +77,8 @@ module Falcon
 					buffer.puts "- To reload all sites: kill -HUP #{Process.pid}"
 				end
 				
+				ENV['CONSOLE_LEVEL'] = 'debug'
+				
 				self.controller.run
 			end
 			

data/lib/falcon/controller/proxy.rb

@@ -112,6 +112,10 @@ module Falcon
 					if service.is_a?(Service::Proxy)
 						Async.logger.info(self) {"Proxying #{service.authority} to #{service.endpoint}"}
 						@hosts[service.authority] = service
+						
+						# Pre-cache the ssl contexts:
+						# It seems some OpenSSL objects don't like event-driven I/O.
+						service.ssl_context
 					end
 				end
 				

data/lib/falcon/controller/serve.rb

@@ -102,7 +102,7 @@ module Falcon
 							end
 						end
 						
-						server = Falcon::Server.new(app, @bound_endpoint, @endpoint.protocol, @endpoint.scheme)
+						server = Falcon::Server.new(app, @bound_endpoint, protocol: @endpoint.protocol, scheme: @endpoint.scheme)
 						
 						server.run
 						

data/lib/falcon/service/application.rb

@@ -90,7 +90,7 @@ module Falcon
 					Async(logger: logger) do |task|
 						Async.logger.info(self) {"Starting application server for #{self.root}..."}
 						
-						server = Server.new(self.middleware, @bound_endpoint, protocol, scheme)
+						server = Server.new(self.middleware, @bound_endpoint, protocol: protocol, scheme: scheme)
 						
 						server.run
 						

data/lib/falcon/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.36.7"
+	VERSION = "0.38.0"
 end

data/lib/rack/handler/falcon.rb

@@ -32,7 +32,7 @@ module Rack
 				app = ::Falcon::Adapters::Rack.new(app)
 				app = ::Falcon::Adapters::Rewindable.new(app)
 				
-				server = ::Falcon::Server.new(app, endpoint, Async::HTTP::Protocol::HTTP1, SCHEME)
+				server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
 				yield server if block_given?
 				
 				Async::Reactor.run do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.36.7
+  version: 0.38.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
   name: async-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,6 @@ files:
 - bin/falcon
 - bin/falcon-host
 - lib/falcon.rb
-- lib/falcon/adapters/early_hints.rb
 - lib/falcon/adapters/input.rb
 - lib/falcon/adapters/output.rb
 - lib/falcon/adapters/rack.rb

data/lib/falcon/adapters/early_hints.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-# 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 'protocol/http/middleware'
-
-module Falcon
-	module Adapters
-		# Provide an interface for advising the client to preload related resources.
-		class EarlyHints
-			PRELOAD = /<(?<path>.*?)>;.*?rel=preload/
-			
-			# Initialize the early hints interface.
-			#
-			# @parameter request [Protocol::HTTP::Request]
-			def initialize(request)
-				@request = request
-			end
-			
-			# Advise the request that the specified path should be preloaded.
-			# @parameter path [String]
-			# @parameter preload [Boolean] whether the client should preload the resource.
-			def push(path, preload: true, **options)
-				@request.push(path)
-			end
-			
-			# Extract link headers and invoke {push}.
-			def call(headers)
-				headers.each do |key, value|
-					if key.casecmp("link").zero? and match = PRELOAD.match(value)
-						@request.push(match[:path])
-					else
-						Async.logger.warn(@request) {"Unsure how to handle early hints header: #{key}"}
-					end
-				end
-			end
-		end
-	end
-end