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.7.0"
+	spec.add_dependency "async-service", "~> 0.8.0"
 	spec.add_dependency "bundler"
 	spec.add_dependency "localhost", "~> 1.1"
 	spec.add_dependency "openssl", "~> 3.0"

lib/falcon/command/serve.rb

@@ -6,7 +6,8 @@
 
 require_relative '../server'
 require_relative '../endpoint'
-require_relative '../service/rackup'
+require_relative '../service/server'
+require_relative '../environment/rackup'
 
 require 'async/container'
 require 'async/http/client'
@@ -51,7 +52,9 @@ def endpoint_options
 			end
 
 			def environment
-				Async::Service::Environment.new(Falcon::Service::Rackup::Environment).with(
+				Async::Service::Environment.new(Falcon::Service::Server::Environment).with(
+					Falcon::Environment::Rackup,
+
 					root: Dir.pwd,
 
 					verbose: self.parent&.verbose?,

lib/falcon/environments/rack.rb

@@ -3,11 +3,26 @@
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
 
-require_relative '../service/rackup'
+require 'rack/builder'
+require_relative '../server'
 require_relative '../environments'
 
 module Falcon
-	module Environments
-		LEGACY_ENVIRONMENTS[:rack] = Service::Rackup::Environment
+	module Environment
+		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
+		end
+
+		LEGACY_ENVIRONMENTS[:rack] = Rack
 	end
 end

lib/falcon/service/application.rb

@@ -13,7 +13,60 @@ module Falcon
 	module Service
 		# Implements an application server using an internal clear-text proxy.
 		class Application < Server
-			def initialize(environment)
+			module Environment
+				include Server::Environment
+
+				# The service class to use for the application.
+				# @returns [Class]
+				def service_class
+					::Falcon::Service::Application
+				end
+
+				# The middleware stack for the application.
+				# @returns [Protocol::HTTP::Middleware]
+				def middleware
+					::Protocol::HTTP::Middleware::HelloWorld
+				end
+
+				# The scheme to use to communicate with the application.
+				# @returns [String]
+				def scheme
+					'https'
+				end
+
+				# The protocol to use to communicate with the application.
+				#
+				# Typically one of {Async::HTTP::Protocol::HTTP1} or {Async::HTTP::Protocl::HTTP2}.
+				#
+				# @returns [Async::HTTP::Protocol]
+				def protocol
+					Async::HTTP::Protocol::HTTP2
+				end
+
+				# The IPC path to use for communication with the application.
+				# @returns [String]
+				def ipc_path
+					::File.expand_path("application.ipc", root)
+				end
+
+				# The endpoint that will be used for communicating with the application server.
+				# @returns [Async::IO::Endpoint]
+				def endpoint
+					::Falcon::ProxyEndpoint.unix(ipc_path,
+						protocol: protocol,
+						scheme: scheme,
+						authority: authority
+					)
+				end
+
+				# Number of instances to start.
+				# @returns [Integer | nil]
+				def count
+					nil
+				end
+			end
+
+			def initialize(...)
 				super
 
 				@bound_endpoint = nil

test/falcon/command/serve.rb

@@ -16,7 +16,7 @@
 
 	it "can listen on specified port" do
 		configuration = command.configuration
-		controller = Async::Service::Controller.new(configuration.services.to_a)
+		controller = configuration.controller
 
 		controller.start
 

test/falcon/command/top.rb

@@ -16,7 +16,7 @@
 			]
 
 			serve = top.command
-			controller = Async::Service::Controller.new(serve.configuration.services.to_a)
+			controller = serve.configuration.controller
 			controller.start
 
 			Async do

test/falcon/command/virtual.rb

@@ -29,7 +29,7 @@
 
 	def around
 		configuration = command.configuration
-		controller = Async::Service::Controller.new(configuration.services.to_a)
+		controller = configuration.controller
 
 		controller.start