WIP.

falcon.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async-http", "~> 0.57"
 	spec.add_dependency "async-http-cache", "~> 0.4.0"
 	spec.add_dependency "async-io", "~> 1.22"
-	spec.add_dependency "async-service", "~> 0.8.0"
+	spec.add_dependency "async-service", "~> 0.9.0"
 	spec.add_dependency "bundler"
 	spec.add_dependency "localhost", "~> 1.1"
 	spec.add_dependency "openssl", "~> 3.0"

lib/falcon/command/serve.rb

@@ -6,8 +6,9 @@
 
 require_relative '../server'
 require_relative '../endpoint'
+require_relative '../configuration'
 require_relative '../service/server'
-require_relative '../environment/rackup'
+require_relative '../environments/rackup'
 
 require 'async/container'
 require 'async/http/client'
@@ -53,7 +54,7 @@ def endpoint_options
 
 			def environment
 				Async::Service::Environment.new(Falcon::Service::Server::Environment).with(
-					Falcon::Environment::Rackup,
+					Falcon::Environments::Rackup,
 
 					root: Dir.pwd,
 

lib/falcon/command/virtual.rb

@@ -36,7 +36,7 @@ def environment
 					configuration_paths: self.paths,
 					bind_insecure: @options[:bind_insecure],
 					bind_secure: @options[:bind_secure],
-					timeout: @options[:timeout]
+					timeout: @options[:timeout],
 				)
 			end
 

lib/falcon/environments/rack.rb

@@ -3,24 +3,14 @@
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
 
-require 'rack/builder'
-require_relative '../server'
-require_relative '../environments'
+require_relative '../service/application'
+require_relative 'rackup'
 
 module Falcon
-	module Environment
+	module Environments
 		module Rack
-			def rackup_path
-				'config.ru'
-			end
-
-			def rack_app
-				::Rack::Builder.parse_file(rackup_path)
-			end
-
-			def middleware
-				::Falcon::Server.middleware(rack_app, verbose: verbose, cache: cache)
-			end
+			include Service::Application::Environment
+			include Rackup
 		end
 
 		LEGACY_ENVIRONMENTS[:rack] = Rack

lib/falcon/environments/rackup.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+
+require 'rack/builder'
+require_relative '../server'
+require_relative '../environments'
+
+module Falcon
+	module Environments
+		module Rackup
+			def rackup_path
+				'config.ru'
+			end
+
+			def rack_app
+				::Rack::Builder.parse_file(rackup_path)
+			end
+
+			def middleware
+				::Falcon::Server.middleware(rack_app, verbose: verbose, cache: cache)
+			end
+		end
+	end
+end

lib/falcon/service/application.rb

@@ -5,6 +5,7 @@
 # Copyright, 2020, by Daniel Evans.
 
 require_relative 'proxy'
+require_relative '../proxy_endpoint'
 
 require 'async/http/endpoint'
 require 'async/io/shared_endpoint'
@@ -72,26 +73,15 @@ def initialize(...)
 				@bound_endpoint = nil
 			end
 
-			# The middleware that will be served by this application.
-			# @returns [Protocol::HTTP::Middleware]
-			def middleware
-				# In a multi-threaded container, we don't want to modify the shared evaluator's cache, so we create a new evaluator:
-				@environment.evaluator.middleware
-			end
-
-			# Number of instances to start.
-			# @returns [Integer | nil]
-			def count
-			  @environment.evaluator.count
-			end
-
 			# Prepare the bound endpoint for the application instances.
 			# Invoke {preload!} to load shared resources into the parent process.
 			def start
-				Console.logger.info(self) {"Binding to #{self.endpoint}..."}
+				endpoint = @evaluator.endpoint
+
+				Console.logger.info(self) {"Binding to #{endpoint}..."}
 
 				@bound_endpoint = Async::Reactor.run do
-					Async::IO::SharedEndpoint.bound(self.endpoint)
+					Async::IO::SharedEndpoint.bound(endpoint)
 				end.wait
 
 				preload!

lib/falcon/service/server.rb

@@ -61,7 +61,6 @@ def self.included(target)
 			def initialize(...)
 				super
 
-				@endpoint = nil
 				@bound_endpoint = nil
 			end
 
@@ -82,10 +81,10 @@ def preload!
 
 			# Prepare the bound endpoint for the server.
 			def start
-				@endpoint ||= @evaluator.endpoint
+				endpoint = @evaluator.endpoint
 
 				Sync do
-					@bound_endpoint = @endpoint.bound
+					@bound_endpoint = endpoint.bound
 				end
 
 				preload!
@@ -122,8 +121,6 @@ def stop(...)
 					@bound_endpoint = nil
 				end
 
-				@endpoint = nil
-
 				super
 			end
 		end