falcon 0.53.1 → 0.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac4157cc20ad67e564974b295ea6db45aad1a8dd9cdfe9840eb5356b783c772
-  data.tar.gz: '09ef6cf76f3878a3c02f6e6d8e10d1e652f24ce5f367ef3e032877e648a6b883'
+  metadata.gz: 2c3f4297ca318c67cd039cce9c7db0c6714751b0e476abdbc28b49882fbfe1a1
+  data.tar.gz: '02898c19485399ae53e9e85f741af7026ea70c3a28b9942fe6ab4f793cf780ca'
 SHA512:
-  metadata.gz: ae2b627082824ea3887c772d796b2297ea51f24d8b3d16de95f665786c34748480caacfd4b12d7d4ba083af7eb04ab5bb7aa3325e63edfc70b2a731e28ed44f5
-  data.tar.gz: 7f34151662bea324843c5ba4e5a79337843e24180412f244f1b55b68be4d138afadc014aceab7dd35cfb188176ad500eec28fb56364ae0b9fde584698ec40bce
+  metadata.gz: 39d37d7b59904727e9f33e8d18a8dd76bd971689cc67803ab601c06d56b62c34d2598f94902feee787066b48d99da914f8d5e7d61864cf1e27cfd96e4ed1d72a
+  data.tar.gz: e83c1d9d0431df6a71820662605f75fbc5143397f7deee487096646925a210c183a980e4f6a88194abf2d819d51e8572a03ee3fe1bbc69b422eb459771170ef5

data/lib/falcon/composite_server.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "async"
+
+module Falcon
+	# A composite server that manages multiple {Server} instances.
+	#
+	# This class coordinates running multiple server instances concurrently, allowing you to:
+	# - Serve different applications on different endpoints.
+	# - Use different configurations per server.
+	# - Access statistics for each named server.
+	# - Control all servers as a single unit.
+	#
+	# @example Create and run several applications.
+	# 	require 'falcon/composite_server'
+	# 	require 'falcon/server'
+	# 	
+	# 	# Create individual servers
+	# 	servers = {
+	# 	  "http" => Falcon::Server.new(app1, endpoint1),
+	# 	  "https" => Falcon::Server.new(app2, endpoint2)
+	# 	}
+	# 	
+	# 	# Create the composite server
+	# 	composite = Falcon::CompositeServer.new(servers)
+	# 	
+	# 	# Run all servers
+	# 	composite.run
+	class CompositeServer
+		# Initialize a composite server with the given server instances.
+		#
+		# @parameter servers [Hash(String, Falcon::Server)] A hash mapping server names to server instances.
+		def initialize(servers)
+			@servers = servers
+		end
+		
+		# The individual server instances mapped by name.
+		# @attribute [Hash(String, Falcon::Server)]
+		attr :servers
+		
+		# Run the composite server, starting all individual servers.
+		#
+		# This method should be called within an Async context. It will run all server instances concurrently.
+		#
+		# @returns [Async::Task] The task running the servers. Call `stop` on the returned task to stop all servers.
+		def run
+			Async do |task|
+				# Run each server - server.run creates its own Async block internally
+				@servers.each do |name, server|
+					server.run
+				end
+				
+				# Wait for all child tasks to complete
+				task.children.each(&:wait)
+			end
+		end
+		
+		# Generates a human-readable string representing statistics for all servers.
+		#
+		# @returns [String] A string representing the current statistics for each server.
+		def statistics_string
+			@servers.map do |name, server|
+				"#{name}: #{server.statistics_string}"
+			end.join(", ")
+		end
+		
+		# Get detailed statistics for each server.
+		#
+		# @returns [Hash(String, String)] A hash mapping server names to their statistics strings.
+		def detailed_statistics
+			@servers.transform_values(&:statistics_string)
+		end
+	end
+end

data/lib/falcon/service/server.rb

@@ -38,7 +38,7 @@ module Falcon
 			# @parameter evaluator [Environment::Evaluator] The environment evaluator.
 			# @returns [Falcon::Server] The server instance.
 			def run(instance, evaluator)
-				if evaluator.key?(:make_supervised_worker)
+				if evaluator.respond_to?(:make_supervised_worker)
 					Console.warn(self, "Async::Container::Supervisor is replaced by Async::Services::Supervisor, please update your service definition.")
 					
 					evaluator.make_supervised_worker(instance).run

data/lib/falcon/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2017-2025, by Samuel Williams.
 
 module Falcon
-	VERSION = "0.53.1"
+	VERSION = "0.54.1"
 end

data/lib/falcon.rb

@@ -5,6 +5,7 @@
 
 require_relative "falcon/version"
 require_relative "falcon/server"
+require_relative "falcon/composite_server"
 
 # Falcon, running on Rails, requires specific configuration:
 require_relative "falcon/railtie" if defined?(Rails::Railtie)

data/readme.md

@@ -47,6 +47,14 @@ 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.54.1
+
+  - Fix handling of old style supervisors from `Async::Container::Supervisor`.
+
+### v0.54.0
+
+  - Introduce `Falcon::CompositeServer` for hosting multiple server instances in a single worker.
+
 ### v0.52.4
 
   - Relax dependency on `async-container-supervisor` to allow `~> 0.6`.
@@ -87,33 +95,6 @@ During the `v0.44.0` release cycle, the workflows for testing older rack release
 
 Specifically, `protocol-rack` now provides `Protocol::Rack::Adapter.parse_file` to load Rack applications. Rack 2's `Rack::Builder.parse_file` returns both the application and a set of options (multi-value return). Rack 3 changed this to only return the application, as the prior multi-value return was confusing at best. This change allows `protocol-rack` to work with both versions of rack, and `falcon` adopts that interface.
 
-### Falcon Serve Options
-
-In addition, `falcon serve` provides two new options:
-
-1.  `--[no]-restart` which controls what happens when `async-container` instances crash. By default, `falcon serve` will restart the container when it crashes. This can be disabled with `--no-restart`.
-
-2.  `--graceful-stop [timeout]` which allows you to specify a timeout for graceful shutdown. This is useful when you want to stop the server, but allow existing connections to finish processing before the server stops. This feature is highly experimental and doesn't work correctly in all cases yet, but we are aiming to improve it.
-
-### Falcon Host
-
-`async-service` is a new gem that exposes a generic service interface on top of `async-container`. Previously, `falcon host` used `async-container` directly and `build-environment` for configuration. In order to allow for more generic service definitions and configuration, `async-service` now provides a similar interface to `build-environment` and exposes this in a way that can be used for services other tha falcon. This makes it simpler to integrate multiple services into a single application.
-
-The current configuration format uses definitions like this:
-
-``` ruby
-rack "hello.localhost", :self_signed_tls
-```
-
-This changes to:
-
-``` ruby
-service "hello.localhost" do
-	include Falcon::Environment::Rack
-	include Falcon::Environment::SelfSignedTLS
-end
-```
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v0.54.1
+
+  - Fix handling of old style supervisors from `Async::Container::Supervisor`.
+
+## v0.54.0
+
+  - Introduce `Falcon::CompositeServer` for hosting multiple server instances in a single worker.
+
 ## v0.52.4
 
   - Relax dependency on `async-container-supervisor` to allow `~> 0.6`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.53.1
+  version: 0.54.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -261,6 +261,7 @@ files:
 - lib/falcon/command/serve.rb
 - lib/falcon/command/top.rb
 - lib/falcon/command/virtual.rb
+- lib/falcon/composite_server.rb
 - lib/falcon/configuration.rb
 - lib/falcon/endpoint.rb
 - lib/falcon/environment.rb