falcon 0.48.3 → 0.48.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7402cf048a80de8e1c357956b59f0f2838ac727a8982e08a6f55724b74bf77da
-  data.tar.gz: 1e068e76060caf2dc6812e99a49e2559f6c2d0c36b9da6629fc43c25b434b6fd
+  metadata.gz: 8ef2381f9e160ea759eb3514031d4503c04f757b0678b5d7ad3342392a55bc5b
+  data.tar.gz: 688e89fbbf7b410fa3be7bb9d570e2d6047b750bae36237a17b6837766eefbd7
 SHA512:
-  metadata.gz: 3e36ef9ebb0e04a9cd5fb7acf4f6a0e3c4347cafe24a87a5c4768f6a4ad5a18623419fbc87130fd60f3aa318a2c00a40e8b87ca4199087a7780274b08178d4a6
-  data.tar.gz: d12353d67f5f3f5ffcb931496996cc6beab8f00fa1e5363a712829963426b52e7379a5084e1133cca498ee720824c59e698a8366cee4e21f2ceaed95a668d796
+  metadata.gz: 7d183d3ea35bebecc7df5c360c20cda41fcf1e6b126f287d4dd9387d8911d0a24ef7b20221945efa9acd7451d9e9b053bef326bd9a53a0e55756fc283d427402
+  data.tar.gz: d9261f7e20b4d95d6519e1c70a70c34f0f243207ea72bbe8b9d340414b00ba73542229cc5c5d2a0054cef624fa0f1ff413bbb3580a27d610cbf46587459c43b0

data/bake/falcon/supervisor.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
 def restart
-	require_relative '../../lib/falcon/command/supervisor'
+	require_relative "../../lib/falcon/command/supervisor"
 	
 	Falcon::Command::Supervisor["restart"].call
 end

data/bin/falcon

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../lib/falcon/command'
+require_relative "../lib/falcon/command"
 
 begin
 	Falcon::Command.call

data/bin/falcon-host

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../lib/falcon/command/host'
+require_relative "../lib/falcon/command/host"
 
 begin
 	Falcon::Command::Host.call

data/lib/falcon/command/host.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative 'paths'
-require_relative '../version'
+require_relative "paths"
+require_relative "../version"
 
-require 'samovar'
-require 'async/service/controller'
+require "samovar"
+require "async/service/controller"
 
 module Falcon
 	module Command

data/lib/falcon/command/paths.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../configuration'
+require_relative "../configuration"
 
 module Falcon
 	module Command

data/lib/falcon/command/proxy.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../environment/proxy'
-require_relative 'paths'
+require_relative "../environment/proxy"
+require_relative "paths"
 
-require 'samovar'
+require "samovar"
 
 module Falcon
 	module Command
@@ -19,9 +19,9 @@ module Falcon
 			# The command line options.
 			# @attribute [Samovar::Options]
 			options do
-				option '--bind <address>', "Bind to the given hostname/address", default: "https://[::]:443"
+				option "--bind <address>", "Bind to the given hostname/address", default: "https://[::]:443"
 				
-				option '-t/--timeout <duration>', "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
+				option "-t/--timeout <duration>", "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
 			end
 			
 			# One or more paths to the configuration files.

data/lib/falcon/command/redirect.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../environment/redirect'
-require_relative 'paths'
+require_relative "../environment/redirect"
+require_relative "paths"
 
-require 'samovar'
+require "samovar"
 
 module Falcon
 	module Command
@@ -16,10 +16,10 @@ module Falcon
 			# The command line options.
 			# @attribute [Samovar::Options]
 			options do
-				option '--bind <address>', "Bind to the given hostname/address", default: "http://[::]:80"
-				option '--redirect <address>', "Redirect using this address as a template.", default: "https://[::]:443"
+				option "--bind <address>", "Bind to the given hostname/address", default: "http://[::]:80"
+				option "--redirect <address>", "Redirect using this address as a template.", default: "https://[::]:443"
 				
-				option '-t/--timeout <duration>', "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
+				option "-t/--timeout <duration>", "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
 			end
 			
 			# One or more paths to the configuration files.

data/lib/falcon/command/serve.rb

@@ -4,15 +4,15 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2018, by Mitsutaka Mimura.
 
-require_relative '../server'
-require_relative '../endpoint'
-require_relative '../configuration'
-require_relative '../service/server'
-require_relative '../environment/rackup'
+require_relative "../server"
+require_relative "../endpoint"
+require_relative "../configuration"
+require_relative "../service/server"
+require_relative "../environment/rackup"
 
-require 'async/container'
-require 'async/http/client'
-require 'samovar'
+require "async/container"
+require "async/http/client"
+require "samovar"
 
 module Falcon
 	module Command
@@ -25,26 +25,26 @@ module Falcon
 			# The command line options.
 			# @attribute [Samovar::Options]
 			options do
-				option '-b/--bind <address>', "Bind to the given hostname/address.", default: "https://localhost:9292"
+				option "-b/--bind <address>", "Bind to the given hostname/address.", default: "https://localhost:9292"
 				
-				option '-p/--port <number>', "Override the specified port.", type: Integer
-				option '-h/--hostname <hostname>', "Specify the hostname which would be used for certificates, etc."
-				option '-t/--timeout <duration>', "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
+				option "-p/--port <number>", "Override the specified port.", type: Integer
+				option "-h/--hostname <hostname>", "Specify the hostname which would be used for certificates, etc."
+				option "-t/--timeout <duration>", "Specify the maximum time to wait for non-blocking operations.", type: Float, default: nil
 				
-				option '-c/--config <path>', "Rackup configuration file to load.", default: 'config.ru'
-				option '--preload <path>', "Preload the specified path before creating containers."
+				option "-c/--config <path>", "Rackup configuration file to load.", default: "config.ru"
+				option "--preload <path>", "Preload the specified path before creating containers."
 				
-				option '--cache', "Enable the response cache."
+				option "--cache", "Enable the response cache."
 				
-				option '--forked | --threaded | --hybrid', "Select a specific parallelism model.", key: :container, default: :forked
+				option "--forked | --threaded | --hybrid", "Select a specific parallelism model.", key: :container, default: :forked
 				
-				option '-n/--count <count>', "Number of instances to start.", default: Async::Container.processor_count, type: Integer
+				option "-n/--count <count>", "Number of instances to start.", default: Async::Container.processor_count, type: Integer
 				
-				option '--forks <count>', "Number of forks (hybrid only).", type: Integer
-				option '--threads <count>', "Number of threads (hybrid only).", type: Integer
+				option "--forks <count>", "Number of forks (hybrid only).", type: Integer
+				option "--threads <count>", "Number of threads (hybrid only).", type: Integer
 				
-				option '--[no]-restart', "Enable/disable automatic restart.", default: true
-				option '--graceful-stop <timeout>', "Duration to wait for graceful stop.", type: Float, default: 1.0
+				option "--[no]-restart", "Enable/disable automatic restart.", default: true
+				option "--graceful-stop <timeout>", "Duration to wait for graceful stop.", type: Float, default: 1.0
 			end
 			
 			def container_options

data/lib/falcon/command/supervisor.rb

@@ -3,12 +3,12 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'samovar'
-require 'async'
-require 'json'
+require "samovar"
+require "async"
+require "json"
 
-require 'io/endpoint/unix_endpoint'
-require 'io/stream'
+require "io/endpoint/unix_endpoint"
+require "io/stream"
 
 module Falcon
 	module Command
@@ -30,7 +30,7 @@ module Falcon
 				
 				# Send the restart message to the supervisor.
 				def call(stream)
-					stream.puts({please: 'restart'}.to_json, separator: "\0")
+					stream.puts({please: "restart"}.to_json, separator: "\0")
 				end
 			end
 			
@@ -40,7 +40,7 @@ module Falcon
 				
 				# Send the metrics message to the supervisor and print the results.
 				def call(stream)
-					stream.puts({please: 'metrics'}.to_json, separator: "\0", chomp: true)
+					stream.puts({please: "metrics"}.to_json, separator: "\0", chomp: true)
 					response = JSON.parse(stream.read_until("\0"), symbolize_names: true)
 					
 					$stdout.puts response
@@ -51,9 +51,9 @@ module Falcon
 			# @name nested
 			# @attribute [Command]
 			nested :command, {
-				'restart' => Restart,
-				'metrics' => Metrics,
-			}, default: 'metrics'
+				"restart" => Restart,
+				"metrics" => Metrics,
+			}, default: "metrics"
 			
 			# The endpoint the supervisor is bound to.
 			def endpoint

data/lib/falcon/command/top.rb

@@ -3,16 +3,16 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative 'serve'
-require_relative 'host'
-require_relative 'virtual'
-require_relative 'proxy'
-require_relative 'redirect'
-require_relative 'supervisor'
+require_relative "serve"
+require_relative "host"
+require_relative "virtual"
+require_relative "proxy"
+require_relative "redirect"
+require_relative "supervisor"
 
-require_relative '../version'
+require_relative "../version"
 
-require 'samovar'
+require "samovar"
 
 module Falcon
 	module Command
@@ -23,23 +23,23 @@ module Falcon
 			# The command line options.
 			# @attribute [Samovar::Options]
 			options do
-				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
-				option '-h/--help', "Print out help information."
-				option '-v/--version', "Print out the application version."
-				option '-e/--encoding', "Specify the default external encoding of the server.", default: "UTF-8"
+				option "--verbose | --quiet", "Verbosity of output for debugging.", key: :logging
+				option "-h/--help", "Print out help information."
+				option "-v/--version", "Print out the application version."
+				option "-e/--encoding", "Specify the default external encoding of the server.", default: "UTF-8"
 			end
 			
 			# The nested command to execute.
 			# @name nested
 			# @attribute [Command]
 			nested :command, {
-				'serve' => Serve,
-				'host' => Host,
-				'virtual' => Virtual,
-				'proxy' => Proxy,
-				'redirect' => Redirect,
-				'supervisor' => Supervisor,
-			}, default: 'serve'
+				"serve" => Serve,
+				"host" => Host,
+				"virtual" => Virtual,
+				"proxy" => Proxy,
+				"redirect" => Redirect,
+				"supervisor" => Supervisor,
+			}, default: "serve"
 			
 			# Whether verbose logging is enabled.
 			# @returns [Boolean]

data/lib/falcon/command/virtual.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require 'async/service'
+require "async/service"
 
-require_relative '../environment/virtual'
+require_relative "../environment/virtual"
 
-require 'samovar'
+require "samovar"
 
 module Falcon
 	module Command
@@ -20,10 +20,10 @@ module Falcon
 			# The command line options.
 			# @attribute [Samovar::Options]
 			options do
-				option '--bind-insecure <address>', "Bind redirection to the given hostname/address", default: "http://[::]:80"
-				option '--bind-secure <address>', "Bind proxy to the given hostname/address", default: "https://[::]:443"
+				option "--bind-insecure <address>", "Bind redirection to the given hostname/address", default: "http://[::]:80"
+				option "--bind-secure <address>", "Bind proxy to the given hostname/address", default: "https://[::]:443"
 				
-				option '-t/--timeout <duration>', "Specify the maximum time to wait for non-blocking operations.", type: Float, default: 30
+				option "-t/--timeout <duration>", "Specify the maximum time to wait for non-blocking operations.", type: Float, default: 30
 			end
 			
 			# One or more paths to the configuration files.

data/lib/falcon/command.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 # Copyright, 2018, by Mitsutaka Mimura.
 
-require_relative 'command/top'
+require_relative "command/top"
 
 module Falcon
 	module Command

data/lib/falcon/configuration.rb

@@ -4,7 +4,7 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2019, by Sho Ito.
 
-require 'async/service'
+require "async/service"
 
 module Falcon
 	# Manages environments which describes how to host a specific application.

data/lib/falcon/endpoint.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
-require 'async/http/endpoint'
-require 'localhost/authority'
+require "async/http/endpoint"
+require "localhost/authority"
 
 module Falcon
 	# An HTTP-specific endpoint which adds localhost TLS.

data/lib/falcon/environment/application.rb

@@ -4,8 +4,8 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Daniel Evans.
 
-require_relative 'server'
-require_relative '../proxy_endpoint'
+require_relative "server"
+require_relative "../proxy_endpoint"
 
 module Falcon
 	module Environment
@@ -22,7 +22,7 @@ module Falcon
 			# The scheme to use to communicate with the application.
 			# @returns [String]
 			def scheme
-				'https'
+				"https"
 			end
 			
 			# The protocol to use to communicate with the application.

data/lib/falcon/environment/lets_encrypt_tls.rb

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative 'tls'
-require_relative '../environment'
+require_relative "tls"
+require_relative "../environment"
 
 module Falcon
 	module Environment
@@ -13,7 +13,7 @@ module Falcon
 			# The Lets Encrypt certificate store path.
 			# @parameter [String]
 			def lets_encrypt_root
-				'/etc/letsencrypt/live'
+				"/etc/letsencrypt/live"
 			end
 			
 			# The public certificate path.

data/lib/falcon/environment/proxy.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative 'server'
-require_relative '../tls'
-require_relative '../middleware/proxy'
-require_relative '../environment'
+require_relative "server"
+require_relative "../tls"
+require_relative "../middleware/proxy"
+require_relative "../environment"
 
 module Falcon
 	module Environment
@@ -43,7 +43,7 @@ module Falcon
 						Console.info(self) {"Proxying #{self.url} to #{evaluator.authority} using #{evaluator.endpoint}"}
 						hosts[evaluator.authority] = evaluator
 						
-						if RUBY_VERSION < '3.1'
+						if RUBY_VERSION < "3.1"
 							# Ensure the SSL context is set up before forking - it's buggy on Ruby < 3.1:
 							evaluator.ssl_context
 						end

data/lib/falcon/environment/rack.rb

@@ -3,9 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative 'application'
-require_relative 'rackup'
-require_relative '../environment'
+require_relative "application"
+require_relative "rackup"
+require_relative "../environment"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/rackup.rb

@@ -3,15 +3,15 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require 'rack/builder'
-require_relative '../server'
+require "rack/builder"
+require_relative "../server"
 
 module Falcon
 	module Environment
 		# Provides an environment for hosting loading a Rackup `config.ru` file.
 		module Rackup
 			def rackup_path
-				File.expand_path('config.ru', root)
+				File.expand_path("config.ru", root)
 			end
 			
 			def rack_app

data/lib/falcon/environment/redirect.rb

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require_relative 'server'
-require_relative '../middleware/redirect'
+require_relative "server"
+require_relative "../middleware/redirect"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/self_signed_tls.rb

@@ -3,9 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'localhost/authority'
-require_relative 'tls'
-require_relative '../environment'
+require "localhost/authority"
+require_relative "tls"
+require_relative "../environment"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/server.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require 'async/service/generic'
-require 'async/http/endpoint'
+require "async/service/generic"
+require "async/http/endpoint"
 
-require_relative '../service/server'
-require_relative '../server'
+require_relative "../service/server"
+require_relative "../server"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/supervisor.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative '../service/supervisor'
-require_relative '../environment'
+require_relative "../service/supervisor"
+require_relative "../environment"
 
-require 'io/endpoint/unix_endpoint'
+require "io/endpoint/unix_endpoint"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/tls.rb

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative '../tls'
-require_relative '../environment'
+require_relative "../tls"
+require_relative "../environment"
 
 module Falcon
 	module Environment

data/lib/falcon/environment/virtual.rb

@@ -3,9 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative 'configured'
+require_relative "configured"
 
-require_relative '../service/virtual'
+require_relative "../service/virtual"
 
 module Falcon
 	module Environment

data/lib/falcon/middleware/proxy.rb

@@ -3,12 +3,12 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require 'async/http/client'
-require 'protocol/http/headers'
-require 'protocol/http/middleware'
+require "async/http/client"
+require "protocol/http/headers"
+require "protocol/http/middleware"
 
-require 'console/event/failure'
-require 'traces/provider'
+require "console/event/failure"
+require "traces/provider"
 
 module Falcon
 	module Middleware
@@ -25,21 +25,21 @@ module Falcon
 		# A HTTP middleware for proxying requests to a given set of hosts.
 		# Typically used for implementing virtual servers.
 		class Proxy < Protocol::HTTP::Middleware
-			FORWARDED = 'forwarded'
-			X_FORWARDED_FOR = 'x-forwarded-for'
-			X_FORWARDED_PROTO = 'x-forwarded-proto'
+			FORWARDED = "forwarded"
+			X_FORWARDED_FOR = "x-forwarded-for"
+			X_FORWARDED_PROTO = "x-forwarded-proto"
 			
-			VIA = 'via'
-			CONNECTION = 'connection'
+			VIA = "via"
+			CONNECTION = "connection"
 			
 			# HTTP hop headers which *should* not be passed through the proxy.
 			HOP_HEADERS = [
-				'connection',
-				'keep-alive',
-				'public',
-				'proxy-authenticate',
-				'transfer-encoding',
-				'upgrade',
+				"connection",
+				"keep-alive",
+				"public",
+				"proxy-authenticate",
+				"transfer-encoding",
+				"upgrade",
 			]
 			
 			# Initialize the proxy middleware.
@@ -78,7 +78,7 @@ module Falcon
 			# @returns [Service::Proxy]
 			def lookup(request)
 				# Trailing dot and port is ignored/normalized.
-				if authority = request.authority&.sub(/(\.)?(:\d+)?$/, '')
+				if authority = request.authority&.sub(/(\.)?(:\d+)?$/, "")
 					return @hosts[authority]
 				end
 			end
@@ -119,7 +119,7 @@ module Falcon
 				end
 				
 				unless forwarded.empty?
-					request.headers.add(FORWARDED, forwarded.join(';'))
+					request.headers.add(FORWARDED, forwarded.join(";"))
 				end
 				
 				request.headers.add(VIA, "#{request.version} #{self.class}")
@@ -145,16 +145,19 @@ module Falcon
 				end
 			rescue => error
 				Console::Event::Failure.for(error).emit(self)
-				return Protocol::HTTP::Response[502, {'content-type' => 'text/plain'}, [error.class.name]]
+				return Protocol::HTTP::Response[502, {"content-type" => "text/plain"}, [error.class.name]]
 			end
 			
 			Traces::Provider(self) do
 				def call(request)
 					attributes = {
 						"authority" => request.authority,
+						"method" => request.method,
+						"path" => request.path,
+						"version" => request.version,
 					}
 					
-					Traces.trace('falcon.middleware.proxy.call', attributes: attributes) do
+					Traces.trace("falcon.middleware.proxy.call", attributes: attributes) do
 						super
 					end
 				end

data/lib/falcon/middleware/redirect.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require 'async/http/client'
+require "async/http/client"
 
 module Falcon
 	module Middleware
@@ -35,7 +35,7 @@ module Falcon
 			# @parameter request [Protocol::HTTP::Request]
 			def lookup(request)
 				# Trailing dot and port is ignored/normalized.
-				if authority = request.authority&.sub(/(\.)?(:\d+)?$/, '')
+				if authority = request.authority&.sub(/(\.)?(:\d+)?$/, "")
 					return @hosts[authority]
 				end
 			end
@@ -50,7 +50,9 @@ module Falcon
 						location = "#{@endpoint.scheme}://#{host.authority}:#{@endpoint.port}#{request.path}"
 					end
 					
-					return Protocol::HTTP::Response[301, [['location', location]], []]
+					Console.info(self, "Redirecting incoming request...", request: request, location: location)
+					
+					return Protocol::HTTP::Response[301, [["location", location]], []]
 				else
 					super
 				end
@@ -58,7 +60,7 @@ module Falcon
 			
 			Traces::Provider(self) do
 				def call(request)
-					Traces.trace('falcon.middleware.redirect.call', attributes: {authority: request.authority}) do
+					Traces.trace("falcon.middleware.redirect.call", attributes: {authority: request.authority}) do
 						super
 					end
 				end

data/lib/falcon/middleware/validate.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+module Falcon
+	module Middleware
+		# A HTTP middleware for validating incoming requests.
+		class Validate < Protocol::HTTP::Middleware
+			# Initialize the validate middleware.
+			# @parameter app [Protocol::HTTP::Middleware] The middleware to wrap.
+			def initialize(app)
+				super(app)
+			end
+			
+			# Validate the incoming request.
+			def call(request)
+				unless request.path.start_with?("/")
+					return Protocol::HTTP::Response[400, {}, ["Invalid request path!"]]
+				end
+				
+				return super
+			end
+		end
+	end
+end

data/lib/falcon/middleware/verbose.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
-require 'console'
-require 'async/http/statistics'
+require "console"
+require "async/http/statistics"
 
 module Falcon
 	module Middleware
@@ -13,7 +13,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 = Console.logger)
+			def initialize(app, logger = Console)
 				super(app)
 				
 				@logger = logger
@@ -24,7 +24,7 @@ module Falcon
 				task = Async::Task.current
 				address = request.remote_address
 				
-				@logger.info(request) {"Headers: #{request.headers.to_h} from #{address.inspect}"}
+				@logger.info(request, "-> #{request.method} #{request.path}", headers: request.headers.to_h, address: address.inspect)
 				
 				task.annotate("#{request.method} #{request.path} from #{address.inspect}")
 			end
@@ -37,10 +37,8 @@ module Falcon
 				
 				response = super
 				
-				statistics.wrap(response) do |statistics, error|
-					@logger.info(request) {"Responding with: #{response.status} #{response.headers.to_h}; #{statistics.inspect}"}
-					
-					@logger.error(request) {"#{error.class}: #{error.message}"} if error
+				statistics.wrap(response) do |body, error|
+					@logger.info(request, "<- #{request.method} #{request.path}", headers: response.headers.to_h, status: response.status, body: body.inspect, error: error)
 				end
 				
 				return response

data/lib/falcon/proxy_endpoint.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'io/endpoint/unix_endpoint'
+require "io/endpoint/unix_endpoint"
 
 module Falcon
 	# An endpoint suitable for proxing requests, typically via a unix pipe.

data/lib/falcon/rackup/handler.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
 
-require 'rackup/handler'
+require_relative "../../falcon"
 
-require_relative '../../falcon'
-
-require 'kernel/sync'
-require 'io/endpoint/host_endpoint'
+require "kernel/sync"
+require "io/endpoint/host_endpoint"
 
 module Falcon
 	module Rackup
@@ -25,7 +23,7 @@ module Falcon
 			# Generate an endpoint for the given `rackup` options.
 			# @returns [::IO::Endpoint::HostEndpoint]
 			def self.endpoint_for(**options)
-				host = options[:Host] || 'localhost'
+				host = options[:Host] || "localhost"
 				port = Integer(options[:Port] || 9292)
 				
 				return ::IO::Endpoint.tcp(host, port)

data/lib/falcon/server.rb

@@ -1,38 +1,43 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
-require 'async/http/server'
+require "async/http/server"
 
-require 'protocol/http/middleware/builder'
-require 'protocol/http/content_encoding'
+require "protocol/http/middleware/builder"
+require "protocol/http/content_encoding"
 
-require 'async/http/cache'
-
-require_relative 'middleware/verbose'
-require 'protocol/rack'
+require "async/http/cache"
+require_relative "middleware/verbose"
+require_relative "middleware/validate"
+require "protocol/rack"
 
 module Falcon
 	# A server listening on a specific endpoint, hosting a specific middleware.
 	class Server < Async::HTTP::Server
 		# Wrap a rack application into a middleware suitable the server.
 		# @parameter rack_app [Proc | Object] A rack application/middleware.
-		# @parameter verbose [Boolean] Whether to add the {Verbose} middleware.
+		# @parameter validate [Boolean] Whether to add the {Middleware::Validate} middleware.
+		# @parameter verbose [Boolean] Whether to add the {Middleware::Verbose} middleware.
 		# @parameter cache [Boolean] Whether to add the {Async::HTTP::Cache} middleware.
-		def self.middleware(rack_app, verbose: false, cache: true)
+		def self.middleware(rack_app, verbose: false, validate: true, cache: true)
 			::Protocol::HTTP::Middleware.build do
 				if verbose
 					use Middleware::Verbose
 				end
 				
+				if validate
+					use Middleware::Validate
+				end
+				
 				if cache
 					use Async::HTTP::Cache::General
 				end
 				
 				use ::Protocol::HTTP::ContentEncoding
-				use ::Protocol::Rack::Adapter
 				
+				use ::Protocol::Rack::Adapter
 				run rack_app
 			end
 		end

data/lib/falcon/service/server.rb

@@ -4,10 +4,10 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Daniel Evans.
 
-require 'async/service/generic'
-require 'async/http/endpoint'
+require "async/service/generic"
+require "async/http/endpoint"
 
-require_relative '../server'
+require_relative "../server"
 
 module Falcon
 	module Service

data/lib/falcon/service/supervisor.rb

@@ -3,13 +3,13 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'process/metrics'
-require 'json'
+require "process/metrics"
+require "json"
 
-require 'async/service/generic'
+require "async/service/generic"
 
-require 'io/endpoint/bound_endpoint'
-require 'io/stream'
+require "io/endpoint/bound_endpoint"
+require "io/stream"
 
 module Falcon
 	module Service
@@ -50,9 +50,9 @@ module Falcon
 			# @parameter message [Hash] The decoded message.
 			def handle(message)
 				case message[:please]
-				when 'restart'
+				when "restart"
 					self.do_restart(message)
-				when 'metrics'
+				when "metrics"
 					self.do_metrics(message)
 				end
 			end

data/lib/falcon/service/virtual.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require 'async/service/generic'
+require "async/service/generic"
 
 module Falcon
 	module Service
@@ -18,14 +18,14 @@ module Falcon
 			def assume_privileges(path)
 				# Process.exec / Process.spawn don't replace the environment but instead update it, so we need to clear out any existing BUNDLE_ variables using `nil` values, which will cause them to be removed from the child environment:
 				env = ENV.to_h do |key, value|
-					if key.start_with?('BUNDLE_')
+					if key.start_with?("BUNDLE_")
 						[key, nil]
 					else
 						[key, value]
 					end
 				end
 				
-				env['PWD'] = File.dirname(path)
+				env["PWD"] = File.dirname(path)
 				
 				stat = File.stat(path)
 				
@@ -33,7 +33,7 @@ module Falcon
 				Process::UID.change_privilege(stat.uid)
 				
 				home = Etc.getpwuid(stat.uid).dir
-				env['HOME'] = home
+				env["HOME"] = home
 				
 				return env
 			end

data/lib/falcon/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2017-2024, by Samuel Williams.
 
 module Falcon
-	VERSION = "0.48.3"
+	VERSION = "0.48.5"
 end

data/lib/rack/handler/falcon.rb

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2024, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 # Copyright, 2019, by Bryan Powell.
 
-require 'rack/handler'
+require "rack/handler"
 
-require_relative '../../falcon/rackup/handler'
+require_relative "../../falcon/rackup/handler"
+
+# Generally speaking, you should not require this file directly, or assume the existance of the `Rack::Handler::Falcon` constant. Instead, use `Rack::Handler.get(:falcon)` to load and access the handler.
 
 module Rack
 	module Handler
-		Falcon = ::Falcon::Rackup::Handler
-		register :falcon, Falcon
+		# Rack (v2) expects the constant to be in the `Rack::Handler` namespace, so we define a new handler class in the `Rack::Handler` namespace that inherits from `Falcon::Rackup::Handler`.
+		class Falcon < ::Falcon::Rackup::Handler
+		end
+		
+		# Rack (v2) expects a string for the handler constant name. `Falcon.to_s` returns a more human friendly name, so we explicitly pass `Falcon.name` to `register` to ensure Rack can find the handler using the registered name.
+		register :falcon, Falcon.name
 	end
 end

data/lib/rackup/handler/falcon.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require 'rackup/handler'
+require "rackup/handler"
 
-require_relative '../../falcon/rackup/handler'
+require_relative "../../falcon/rackup/handler"
+
+# Generally speaking, you should not require this file directly, or assume the existance of the `Rackup::Handler::Falcon` constant. Instead, use `Rackup::Handler.get(:falcon)` to load and access the handler.
 
 module Rackup
 	module Handler
-		Falcon = ::Falcon::Rackup::Handler
+		# Sinatra (and possibly others) try to extract the name using the final part of the class path, so we define a new class in the `Rack::Handler` namespace that inherits from `Falcon::Rackup::Handler`, that follows that convention.
+		class Falcon < ::Falcon::Rackup::Handler
+		end
+		
+		# Rack (v3) expects a class for the handler constant, so we explicitly pass `Falcon` to `register` to ensure Rack can find the handler using the registered name.
 		register :falcon, Falcon
 	end
 end

data/license.md

@@ -1,16 +1,18 @@
 # MIT License
 
-Copyright, 2017-2024, by Samuel Williams.  
+Copyright, 2017-2025, by Samuel Williams.  
 Copyright, 2018, by Kent Gruber.  
 Copyright, 2018, by Janko Marohnić.  
 Copyright, 2018, by Tad Thorley.  
 Copyright, 2018, by Mitsutaka Mimura.  
 Copyright, 2018, by Kyle Tam.  
 Copyright, 2018, by Claudiu Garba.  
+Copyright, 2018, by Martin Hrdlicka.  
 Copyright, 2019, by Bryan Powell.  
 Copyright, 2019, by Sh Lin.  
 Copyright, 2019, by Sho Ito.  
 Copyright, 2019, by Colby Swandale.  
+Copyright, 2019-2024, by dependabot[bot].  
 Copyright, 2020, by Daniel Evans.  
 Copyright, 2020, by Mikel Kew.  
 Copyright, 2020, by Michael Adams.  
@@ -20,9 +22,9 @@ Copyright, 2023, by Nick Janetakis.
 Copyright, 2024, by Peter Schrammel.  
 Copyright, 2024, by Santiago Bartesaghi.  
 Copyright, 2024, by Trevor Turk.  
-Copyright, 2024, by dependabot[bot].  
 Copyright, 2024, by Adam Daniels.  
 Copyright, 2024, by Stefan Buhrmester.  
+Copyright, 2024, by Ismael Celis.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -45,6 +45,10 @@ Please see the [project documentation](https://socketry.github.io/falcon/) for m
 
 Please see the [project releases](https://socketry.github.io/falcon/releases/index) for all releases.
 
+### v0.48.4
+
+  - Improve compatibility of rackup handler w.r.t. sinatra.
+
 ### v0.47.8
 
   - Fix Falcon Supervisor implementation: due to invalid code, it was unable to start.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.48.4
+
+  - Improve compatibility of rackup handler w.r.t. sinatra.
+
 ## v0.47.8
 
   - Fix Falcon Supervisor implementation: due to invalid code, it was unable to start.

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.48.3
+  version: 0.48.5
 platform: ruby
 authors:
 - Samuel Williams
+- dependabot[bot]
 - Janko Marohnić
 - Bryan Powell
 - Trevor Turk
@@ -16,7 +17,9 @@ authors:
 - Adam Daniels
 - Colby Swandale
 - Daniel Evans
+- Ismael Celis
 - Kent Gruber
+- Martin Hrdlicka
 - Michael Adams
 - Mikel Kew
 - Nick Janetakis
@@ -26,8 +29,6 @@ authors:
 - Stefan Buhrmester
 - Tad Thorley
 - Tasos Latsas
-- dependabot[bot]
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -59,7 +60,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -174,33 +175,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: protocol-http
+  name: process-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: process-metrics
+  name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: protocol-rack
   requirement: !ruby/object:Gem::Requirement
@@ -229,8 +230,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-description:
-email:
 executables:
 - falcon
 - falcon-host
@@ -268,6 +267,7 @@ files:
 - lib/falcon/environment/virtual.rb
 - lib/falcon/middleware/proxy.rb
 - lib/falcon/middleware/redirect.rb
+- lib/falcon/middleware/validate.rb
 - lib/falcon/middleware/verbose.rb
 - lib/falcon/proxy_endpoint.rb
 - lib/falcon/rackup/handler.rb
@@ -289,7 +289,6 @@ licenses:
 metadata:
   documentation_uri: https://socketry.github.io/falcon/
   source_code_uri: https://github.com/socketry/falcon.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.
 test_files: []