falcon 0.37.1 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83047a262d8025a52ecb7f3bf232c36f717ea646058492f93c5888c467fb6da
-  data.tar.gz: a8bb6889126af343d5227f4994ee7d1c7498c5b8537c58a254e2fae8195592d1
+  metadata.gz: 5ce7e0eb1b344a280ee69a568921c091ba8aed45f8b5d1346e5b2e49ae971a14
+  data.tar.gz: dc90db0f936efb3ba745659a8ed0d705e6f80265ed93dcc110e0cdd5c5280548
 SHA512:
-  metadata.gz: ec87c1b000c5a480758a265cbdd293b3baf16e02428c4c217669617462e9ac41d510b369b41609244b44248f5d86b54d164c7410312d2d962eee0df95456e4ac
-  data.tar.gz: 4cd538e294829195e22e52828b2e1362908e3b454ec510024a5db6b9b710713346c0bce91e6653313bead8f1c6a3d6b83ab39a16df60e4dc29b6baabc48276c7
+  metadata.gz: 54ed9701c649a1764d030cdf3e31dca114606d53cd647b275c9b77164173406b6641fcb12c474eb57e3aa84bfe1655a53a4d844cf95f43a603065a27b437f466
+  data.tar.gz: 1fe32ec2dd8708014f285ef81119ce49c0d3bb0872f1a64be5e786c4c8fca365065f9e46b33ad7abb9ef76bc4d24514eb6188fc025233afa5548d9f56a4dd9e0

data/bin/falcon

@@ -27,6 +27,6 @@ begin
 rescue Interrupt
 	# Ignore.
 rescue => error
-	Async.logger.error(Falcon::Command) {error}
+	Console.logger.error(Falcon::Command) {error}
 	exit! 1
 end

data/lib/falcon/adapters/rack.rb

@@ -25,7 +25,7 @@ require 'rack'
 require_relative 'input'
 require_relative 'response'
 
-require 'async/logger'
+require 'console'
 
 module Falcon
 	module Adapters
@@ -60,6 +60,10 @@ module Falcon
 			RACK_IS_HIJACK = 'rack.hijack?'
 			RACK_HIJACK_IO = 'rack.hijack_io'
 			
+			# Raised back up through the middleware when the underlying connection is hijacked.
+			class FullHijack < StandardError
+			end
+			
 			# Async::HTTP specific metadata:
 			
 			ASYNC_HTTP_REQUEST = "async.http.request"
@@ -70,13 +74,10 @@ module Falcon
 			
 			# Initialize the rack adaptor middleware.
 			# @parameter app [Object] The rack middleware.
-			# @parameter logger [Console::Logger] The logger to use.
-			def initialize(app, logger = Async.logger)
+			def initialize(app)
 				@app = app
 				
 				raise ArgumentError, "App must be callable!" unless @app.respond_to?(:call)
-				
-				@logger = logger
 			end
 			
 			# Unwrap raw HTTP headers into the CGI-style expected by Rack middleware.
@@ -146,7 +147,7 @@ module Falcon
 					
 					RACK_INPUT => Input.new(request.body),
 					RACK_ERRORS => $stderr,
-					RACK_LOGGER => Async.logger,
+					RACK_LOGGER => Console.logger,
 					
 					RACK_MULTITHREAD => true,
 					RACK_MULTIPROCESS => true,
@@ -202,12 +203,12 @@ 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
 			rescue => exception
-				@logger.error(self) {exception}
+				Console.logger.error(self) {exception}
 				
 				return failure_response(exception)
 			end

data/lib/falcon/adapters/response.rb

@@ -78,7 +78,7 @@ module Falcon
 					ignored = headers.extract(IGNORE_HEADERS)
 					
 					unless ignored.empty?
-						Async.logger.warn("Ignoring protocol-level headers: #{ignored.inspect}")
+						Console.logger.warn("Ignoring protocol-level headers: #{ignored.inspect}")
 					end
 					
 					body = Output.wrap(status, headers, body)
@@ -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

@@ -64,7 +64,7 @@ module Falcon
 			
 			# Prepare the environment and run the controller.
 			def call
-				Async.logger.info(self) do |buffer|
+				Console.logger.info(self) do |buffer|
 					buffer.puts "Falcon Host v#{VERSION} taking flight!"
 					buffer.puts "- Configuration: #{@paths.join(', ')}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"

data/lib/falcon/command/proxy.rb

@@ -66,7 +66,7 @@ module Falcon
 			
 			# Prepare the environment and run the controller.
 			def call
-				Async.logger.info(self) do |buffer|
+				Console.logger.info(self) do |buffer|
 					buffer.puts "Falcon Proxy v#{VERSION} taking flight!"
 					buffer.puts "- Binding to: #{@options[:bind]}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"

data/lib/falcon/command/redirect.rb

@@ -64,7 +64,7 @@ module Falcon
 			
 			# Prepare the environment and run the controller.
 			def call
-				Async.logger.info(self) do |buffer|
+				Console.logger.info(self) do |buffer|
 					buffer.puts "Falcon Redirect v#{VERSION} taking flight!"
 					buffer.puts "- Binding to: #{@options[:bind]}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"

data/lib/falcon/command/serve.rb

@@ -133,7 +133,7 @@ module Falcon
 			
 			# Prepare the environment and run the controller.
 			def call
-				Async.logger.info(self) do |buffer|
+				Console.logger.info(self) do |buffer|
 					buffer.puts "Falcon v#{VERSION} taking flight! Using #{self.container_class} #{self.container_options}."
 					buffer.puts "- Binding to: #{self.endpoint}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"

data/lib/falcon/command/virtual.rb

@@ -71,12 +71,14 @@ module Falcon
 			
 			# Prepare the environment and run the controller.
 			def call
-				Async.logger.info(self) do |buffer|
+				Console.logger.info(self) do |buffer|
 					buffer.puts "Falcon Virtual v#{VERSION} taking flight!"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
 					buffer.puts "- To reload all sites: kill -HUP #{Process.pid}"
 				end
 				
+				ENV['CONSOLE_LEVEL'] = 'debug'
+				
 				self.controller.run
 			end
 			

data/lib/falcon/configuration.rb

@@ -127,11 +127,20 @@ module Falcon
 				features.each do |feature|
 					next if @loaded.include?(feature)
 					
-					relative_path = File.join(__dir__, "environments", "#{feature}.rb")
-					
-					self.instance_eval(File.read(relative_path), relative_path)
-					
-					@loaded[feature] = relative_path
+					case feature
+					when Symbol
+						relative_path = File.join(__dir__, "environments", "#{feature}.rb")
+						
+						self.instance_eval(File.read(relative_path), relative_path)
+						
+						@loaded[feature] = relative_path
+					when Module
+						feature.load(self)
+						
+						@loaded[feature] = feature
+					else
+						raise LoadError, "Unsure about how to load #{feature}!"
+					end
 				end
 			end
 			

data/lib/falcon/controller/proxy.rb

@@ -60,13 +60,13 @@ module Falcon
 			# @parameter hostname [String] The negotiated hostname.
 			def host_context(socket, hostname)
 				if host = @hosts[hostname]
-					Async.logger.debug(self) {"Resolving #{hostname} -> #{host}"}
+					Console.logger.debug(self) {"Resolving #{hostname} -> #{host}"}
 					
 					socket.hostname = hostname
 					
 					return host.ssl_context
 				else
-					Async.logger.warn(self) {"Unable to resolve #{hostname}!"}
+					Console.logger.warn(self) {"Unable to resolve #{hostname}!"}
 					
 					return nil
 				end
@@ -110,8 +110,12 @@ module Falcon
 				
 				services.each do |service|
 					if service.is_a?(Service::Proxy)
-						Async.logger.info(self) {"Proxying #{service.authority} to #{service.endpoint}"}
+						Console.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

@@ -68,7 +68,7 @@ module Falcon
 					Async::IO::SharedEndpoint.bound(@endpoint)
 				end.wait
 				
-				Async.logger.info(self) { "Starting #{name} on #{@endpoint.to_url}" }
+				Console.logger.info(self) { "Starting #{name} on #{@endpoint.to_url}" }
 				
 				@debug_trap.ignore!
 				
@@ -90,13 +90,13 @@ module Falcon
 						
 						task.async do
 							if @debug_trap.install!
-								Async.logger.info(instance) do
+								Console.logger.info(instance) do
 									"- Per-process status: kill -USR1 #{Process.pid}"
 								end
 							end
 							
 							@debug_trap.trap do
-								Async.logger.info(self) do |buffer|
+								Console.logger.info(self) do |buffer|
 									task.reactor.print_hierarchy(buffer)
 								end
 							end

data/lib/falcon/environments/host.rb

@@ -0,0 +1,29 @@
+# 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.
+
+load(:application)
+
+# Inherits directly from {application}.
+#
+# @scope Falcon Environments
+# @name host
+environment(:host, :application)

data/lib/falcon/middleware/proxy.rb

@@ -112,7 +112,7 @@ module Falcon
 			def prepare_request(request, host)
 				forwarded = []
 				
-				Async.logger.debug(self) do |buffer|
+				Console.logger.debug(self) do |buffer|
 					buffer.puts "Request authority: #{request.authority}"
 					buffer.puts "Host authority: #{host.authority}"
 					buffer.puts "Request: #{request.method} #{request.path} #{request.version}"
@@ -158,7 +158,7 @@ module Falcon
 					super
 				end
 			rescue
-				Async.logger.error(self) {$!}
+				Console.logger.error(self) {$!}
 				return Protocol::HTTP::Response[502, {'content-type' => 'text/plain'}, ["#{$!.inspect}: #{$!.backtrace.join("\n")}"]]
 			end
 		end

data/lib/falcon/middleware/verbose.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/logger'
+require 'console'
 require 'async/http/statistics'
 
 module Falcon
@@ -30,7 +30,7 @@ module Falcon
 			# Initialize the verbose middleware.
 			# @parameter app [Protocol::HTTP::Middleware] The middleware to wrap.
 			# @parameter logger [Console::Logger] The logger to use.
-			def initialize(app, logger = Async.logger)
+			def initialize(app, logger = Console.logger)
 				super(app)
 				
 				@logger = logger

data/lib/falcon/service/application.rb

@@ -52,7 +52,7 @@ module Falcon
 			def preload!
 				if scripts = @evaluator.preload
 					scripts.each do |path|
-						Async.logger.info(self) {"Preloading #{path}..."}
+						Console.logger.info(self) {"Preloading #{path}..."}
 						full_path = File.expand_path(path, self.root)
 						load(full_path)
 					end
@@ -62,7 +62,7 @@ module Falcon
 			# Prepare the bound endpoint for the application instances.
 			# Invoke {preload!} to load shared resources into the parent process.
 			def start
-				Async.logger.info(self) {"Binding to #{self.endpoint}..."}
+				Console.logger.info(self) {"Binding to #{self.endpoint}..."}
 				
 				@bound_endpoint = Async::Reactor.run do
 					Async::IO::SharedEndpoint.bound(self.endpoint)
@@ -87,8 +87,8 @@ module Falcon
 				run_options[:count] = count unless count.nil?
 				
 				container.run(**run_options) do |instance|
-					Async(logger: logger) do |task|
-						Async.logger.info(self) {"Starting application server for #{self.root}..."}
+					Async do |task|
+						Console.logger.info(self) {"Starting application server for #{self.root}..."}
 						
 						server = Server.new(self.middleware, @bound_endpoint, protocol: protocol, scheme: scheme)
 						

data/lib/falcon/service/generic.rb

@@ -58,7 +58,7 @@ module Falcon
 			# The logger to use for this service.
 			# @returns [Console::Logger]
 			def logger
-				return Async.logger # .with(name: name)
+				return Console.logger # .with(name: name)
 			end
 			
 			# Start the service.

data/lib/falcon/service/supervisor.rb

@@ -74,7 +74,7 @@ module Falcon
 			
 			# Bind the supervisor to the specified endpoint.
 			def start
-				Async.logger.info(self) {"Binding to #{self.endpoint}..."}
+				Console.logger.info(self) {"Binding to #{self.endpoint}..."}
 				
 				@bound_endpoint = Async::Reactor.run do
 					Async::IO::SharedEndpoint.bound(self.endpoint)

data/lib/falcon/services.rb

@@ -61,7 +61,7 @@ module Falcon
 		# Start all named services.
 		def start
 			@named.each do |name, service|
-				Async.logger.debug(self) {"Starting #{name}..."}
+				Console.logger.debug(self) {"Starting #{name}..."}
 				service.start
 			end
 		end
@@ -71,7 +71,7 @@ module Falcon
 		# @parameter container [Async::Container::Generic]
 		def setup(container)
 			@named.each do |name, service|
-				Async.logger.debug(self) {"Setup #{name} into #{container}..."}
+				Console.logger.debug(self) {"Setup #{name} into #{container}..."}
 				service.setup(container)
 			end
 			
@@ -83,13 +83,13 @@ module Falcon
 			failed = false
 			
 			@named.each do |name, service|
-				Async.logger.debug(self) {"Stopping #{name}..."}
+				Console.logger.debug(self) {"Stopping #{name}..."}
 				
 				begin
 					service.stop
 				rescue
 					failed = true
-					Async.logger.error(self, $!)
+					Console.logger.error(self, $!)
 				end
 			end
 			

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.39.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.56.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.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
@@ -283,6 +283,7 @@ files:
 - lib/falcon/endpoint.rb
 - lib/falcon/environments.rb
 - lib/falcon/environments/application.rb
+- lib/falcon/environments/host.rb
 - lib/falcon/environments/lets_encrypt_tls.rb
 - lib/falcon/environments/proxy.rb
 - lib/falcon/environments/rack.rb
@@ -322,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.