falcon 0.47.2 → 0.47.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964ee00911ef7e2c1f0c702a2d62a64bdcc4185c667baf3aefb5d9b0b1424c4c
-  data.tar.gz: 435e4811db0ff426a620015e6ed0eebb5cc67cb7e1f52c74cbb9f76e3b0ce301
+  metadata.gz: f6c82a0a990f36224ab1ed3f2ae66d9d6593c261de28241d9cc9fb41145f65d0
+  data.tar.gz: 71295d17ef57d18739c328c0a7c16598a1cf836abb9457766f04460d05971bfc
 SHA512:
-  metadata.gz: 3b0091c2d9ba147d0a5a2852714efd6232b035bd1ac9aa7c031fd7e0363f3a10adbc5ea03d0c2dd78a2e7b2d12331039046a129d88d2d75420c0befe31b47d87
-  data.tar.gz: e18b35bcffa86c56d29b31bd28cd7823362b7d88279ef2028bd00e615fe63de446ecac0789987d53d9c1989d32725e84777b58b268ec24756354654d853db004
+  metadata.gz: 0f9992178910ed2606435d193c6a372a0436364f13490fb9bb9fe1ca6d709909514a375131c8d970d62e0a3000e96cce45903dfff748e4210b29261635b6939b
+  data.tar.gz: d02f57c73f46e29824eaaba95d6d908221c0f2b62b2fc92a3596342f15e504737ef972e127f68c93c8d14b94ee4af947f875d929e39ed780d07e704f44bcd646

data/lib/falcon/command/virtual.rb

@@ -3,8 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../service/virtual'
-require_relative 'paths'
+require_relative '../environment/virtual'
 
 require 'samovar'
 
@@ -31,7 +30,7 @@ module Falcon
 			many :paths
 			
 			def environment
-				Async::Service::Environment.new(Falcon::Service::Virtual::Environment).with(
+				Async::Service::Environment.new(Falcon::Environment::Virtual).with(
 					verbose: self.parent&.verbose?,
 					configuration_paths: self.paths,
 					bind_insecure: @options[:bind_insecure],

data/lib/falcon/environment/configured.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+module Falcon
+	module Environment
+		# This module provides a common interface for configuring the Falcon application.
+		# @todo Reuse this for proxy and redirect services.
+		module Configured
+			# All the falcon application configuration paths.
+			# @returns [Array(String)] Paths to the falcon application configuration files.
+			def configuration_paths
+				["/srv/http/*/falcon.rb"]
+			end
+			
+			# All the falcon application configuration paths, with wildcards expanded.
+			def resolved_configuration_paths
+				configuration_paths.flat_map do |path|
+					Dir.glob(path)
+				end.uniq
+			end
+			
+			def configuration
+				::Async::Service::Configuration.load(resolved_configuration_paths)
+			end
+		end
+	end
+end

data/lib/falcon/environment/virtual.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require_relative 'configured'
+
+require_relative '../service/virtual'
+
+module Falcon
+	module Environment
+		module Virtual
+			include Configured
+			
+			# The service class to use for the virtual host.
+			# @returns [Class]
+			def service_class
+				Service::Virtual
+			end
+			
+			def name
+				service_class.name
+			end
+			
+			# The URI to bind the `HTTPS` -> `falcon host` proxy.
+			def bind_secure
+				"https://[::]:443"
+			end
+			
+			# The URI to bind the `HTTP` -> `HTTPS` redirector.
+			def bind_insecure
+				"http://[::]:80"
+			end
+			
+			# The connection timeout to use for incoming connections.
+			def timeout
+				10.0
+			end
+			
+			# The path to the falcon executable from this gem.
+			# @returns [String]
+			def falcon_path
+				File.expand_path("../../../bin/falcon", __dir__)
+			end
+			
+			# # The insecure endpoint for connecting to the {Redirect} instance.
+			# def insecure_endpoint(**options)
+			# 	Async::HTTP::Endpoint.parse(bind_insecure, **options)
+			# end
+			
+			# # The secure endpoint for connecting to the {Proxy} instance.
+			# def secure_endpoint(**options)
+			# 	Async::HTTP::Endpoint.parse(bind_secure, **options)
+			# end
+			
+			# # An endpoint suitable for connecting to the specified hostname.
+			# def host_endpoint(hostname, **options)
+			# 	endpoint = secure_endpoint(**options)
+				
+			# 	url = URI.parse(bind_secure)
+			# 	url.hostname = hostname
+				
+			# 	return Async::HTTP::Endpoint.new(url, hostname: endpoint.hostname)
+			# end
+		end
+	end
+end

data/lib/falcon/service/virtual.rb

@@ -12,67 +12,6 @@ module Falcon
 		#
 		# A virtual host is an application bound to a specific authority (essentially a hostname). The virtual controller manages multiple hosts and allows a single server to host multiple applications easily.
 		class Virtual < Async::Service::Generic
-			module Environment
-				# The service class to use for the virtual host.
-				# @returns [Class]
-				def service_class
-					Virtual
-				end
-				
-				def name
-					service_class.name
-				end
-				
-				# All the falcon application configuration paths.
-				# @returns [Array(String)] Paths to the falcon application configuration files.
-				def configuration_paths
-					["/srv/http/*/falcon.rb"]
-				end
-				
-				def configuration
-					::Async::Service::Configuration.load(configuration_paths)
-				end
-				
-				# The URI to bind the `HTTPS` -> `falcon host` proxy.
-				def bind_secure
-					"https://[::]:443"
-				end
-				
-				# The URI to bind the `HTTP` -> `HTTPS` redirector.
-				def bind_insecure
-					"http://[::]:80"
-				end
-				
-				# The connection timeout to use for incoming connections.
-				def timeout
-					10.0
-				end
-				
-				# # The insecure endpoint for connecting to the {Redirect} instance.
-				# def insecure_endpoint(**options)
-				# 	Async::HTTP::Endpoint.parse(bind_insecure, **options)
-				# end
-				
-				# # The secure endpoint for connecting to the {Proxy} instance.
-				# def secure_endpoint(**options)
-				# 	Async::HTTP::Endpoint.parse(bind_secure, **options)
-				# end
-				
-				# # An endpoint suitable for connecting to the specified hostname.
-				# def host_endpoint(hostname, **options)
-				# 	endpoint = secure_endpoint(**options)
-					
-				# 	url = URI.parse(bind_secure)
-				# 	url.hostname = hostname
-					
-				# 	return Async::HTTP::Endpoint.new(url, hostname: endpoint.hostname)
-				# end
-			end
-			
-			def self.included(target)
-				target.include(Environnment)
-			end
-			
 			# Drop privileges according to the user and group of the specified path.
 			# @parameter path [String] The path to the application directory.
 			def assume_privileges(path)
@@ -102,12 +41,6 @@ module Falcon
 				end
 			end
 			
-			# The path to the falcon executable from this gem.
-			# @returns [String]
-			def falcon_path
-				File.expand_path("../../../bin/falcon", __dir__)
-			end
-			
 			# Setup the container with {Redirect} and {Proxy} child processes.
 			# These processes are gracefully restarted if they are already running.
 			# @parameter container [Async::Container::Generic]
@@ -122,8 +55,11 @@ module Falcon
 				
 				container.reload do
 					evaluator = @environment.evaluator
+					falcon_path = evaluator.falcon_path
+					
+					Console.info(self, "Loading configurations from:", evaluator.resolved_configuration_paths)
 					
-					evaluator.configuration_paths.each do |path|
+					evaluator.resolved_configuration_paths.each do |path|
 						path = File.expand_path(path)
 						root = File.dirname(path)
 						

data/lib/falcon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.47.2
+  version: 0.47.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -245,6 +245,7 @@ files:
 - lib/falcon/endpoint.rb
 - lib/falcon/environment.rb
 - lib/falcon/environment/application.rb
+- lib/falcon/environment/configured.rb
 - lib/falcon/environment/lets_encrypt_tls.rb
 - lib/falcon/environment/proxy.rb
 - lib/falcon/environment/rack.rb
@@ -254,6 +255,7 @@ files:
 - lib/falcon/environment/server.rb
 - lib/falcon/environment/supervisor.rb
 - lib/falcon/environment/tls.rb
+- lib/falcon/environment/virtual.rb
 - lib/falcon/middleware/proxy.rb
 - lib/falcon/middleware/redirect.rb
 - lib/falcon/middleware/verbose.rb