falcon 0.52.3 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0eb04a60a0e8100f830405fc1a55fa3cc1a31f8b8ad76922aba21c8bfc6796
-  data.tar.gz: 9491638bdf672c83ad490af7e192dabc903d5743061fa4fa95228f8fe195e772
+  metadata.gz: 7a29bc2c8b56a674c1dd385f9655d454d0c792ee1c09c512cfc2019c265c3f17
+  data.tar.gz: 3a195cf6d478834756980f39ccc580d879b0b38a6272837aa51322dad8bd0cc4
 SHA512:
-  metadata.gz: d4068f413136896989dabcf1642040a2dfc118176968aa91b249cfecf055801823df0f40912b774008c99ac2e2a87b178e842d54368458c0d6595ad8dcc36f6c
-  data.tar.gz: 1078328b527bfd6ec35041dfbd9e542d0b0a2c0018850bdf447ad6160d190ee9ad876d64b222b4dec571b8f56f2550c26a171190e0c8f060fd4a959b236089d0
+  metadata.gz: 7e9ec3a6e57f6768125efb73f99fbed1918f94665ba1635b89706fd5ca14ab074c4bcfa090f7dc290f2732142f27d94afff597a239ffcc36ce02b24278ff3a4f
+  data.tar.gz: e01aae910c60cb9bacf01949c784cedce9ecd4bd5b23c47544a0da0d347fce01a9394d9f0232abec1ed90e4f5de4a924bcf7d97c3ee81b4d569bb609292d3546

data/context/websockets.md

@@ -9,7 +9,7 @@ Falcon supports WebSockets using the [async-websocket gem](https://github.com/so
 ~~~ruby
 # config.ru
 
-require "async/websocket/adapter/rack"
+require "async/websocket/adapters/rack"
 
 run do |env|
 	Async::WebSocket::Adapters::Rack.open(env, protocols: ['ws']) do |connection|

data/lib/falcon/command/serve.rb

@@ -64,7 +64,6 @@ module Falcon
 			def environment
 				Async::Service::Environment.new(Falcon::Environment::Server).with(
 					Falcon::Environment::Rackup,
-					
 					root: Dir.pwd,
 					
 					verbose: self.parent&.verbose?,

data/lib/falcon/configuration.rb

@@ -73,7 +73,7 @@ module Falcon
 					merge(:supervisor, name: name, root: @root, &block)
 				)
 			end
-				
+			
 			private
 			
 			# Build a new environment with the specified name and the given parents.

data/lib/falcon/environment/server.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2025, by Samuel Williams.
 
-require "async/service/generic"
+require "async/service/managed_environment"
 require "async/http/endpoint"
 
 require_relative "../service/server"
@@ -13,6 +13,8 @@ module Falcon
 	module Environment
 		# Provides an environment for hosting a web application that uses a Falcon server.
 		module Server
+			include Async::Service::ManagedEnvironment
+			
 			# The service class to use for the proxy.
 			# @returns [Class]
 			def service_class
@@ -25,21 +27,6 @@ module Falcon
 				self.name
 			end
 			
-			# Number of instances to start. By default (when nil), uses `Etc.nprocessors`.
-			# @returns [Integer | nil]
-			def count
-				nil
-			end
-			
-			# Options to use when creating the container.
-			def container_options
-				{
-					restart: true,
-					count: self.count,
-					health_check_timeout: 30,
-				}.compact
-			end
-			
 			# The host that this server will receive connections for.
 			def url
 				"http://[::]:9292"
@@ -80,13 +67,6 @@ module Falcon
 				::Async::HTTP::Endpoint.parse(url)
 			end
 			
-			# Any scripts to preload before starting the server.
-			#
-			# @returns [Array(String)] The list of scripts to preload.
-			def preload
-				[]
-			end
-			
 			# Make a server instance using the given endpoint. The endpoint may be a bound endpoint, so we take care to specify the protocol and scheme as per the original endpoint.
 			#
 			# @parameter endpoint [IO::Endpoint] The endpoint to bind to.

data/lib/falcon/environment/virtual.rb

@@ -56,10 +56,10 @@ module Falcon
 			# # 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

data/lib/falcon/service/server.rb

@@ -4,7 +4,7 @@
 # Copyright, 2019-2025, by Samuel Williams.
 # Copyright, 2020, by Daniel Evans.
 
-require "async/service/generic"
+require "async/service/managed_service"
 require "async/container/supervisor/supervised"
 require "async/http/endpoint"
 
@@ -12,28 +12,13 @@ require_relative "../server"
 
 module Falcon
 	module Service
-		class Server < Async::Service::Generic
+		class Server < Async::Service::ManagedService
 			def initialize(...)
 				super
 				
 				@bound_endpoint = nil
 			end
 			
-			# Preload any resources specified by the environment.
-			def preload!
-				root = @evaluator.root
-				
-				if scripts = @evaluator.preload
-					scripts = Array(scripts)
-					
-					scripts.each do |path|
-						Console.logger.info(self) {"Preloading #{path}..."}
-						full_path = File.expand_path(path, root)
-						load(full_path)
-					end
-				end
-			end
-			
 			# Prepare the bound endpoint for the server.
 			def start
 				@endpoint = @evaluator.endpoint
@@ -42,47 +27,42 @@ module Falcon
 					@bound_endpoint = @endpoint.bound
 				end
 				
-				preload!
-				
 				Console.logger.info(self) {"Starting #{self.name} on #{@endpoint}"}
 				
 				super
 			end
 			
-			# Setup the container with the application instance.
-			# @parameter container [Async::Container::Generic]
-			def setup(container)
-				container_options = @evaluator.container_options
-				health_check_timeout = container_options[:health_check_timeout]
+			# Run the service logic.
+			#
+			# @parameter instance [Object] The container instance.
+			# @parameter evaluator [Environment::Evaluator] The environment evaluator.
+			# @returns [Falcon::Server] The server instance.
+			def run(instance, evaluator)
+				if evaluator.key?(: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
+				end
+				
+				server = evaluator.make_server(@bound_endpoint)
 				
-				container.run(name: self.name, **container_options) do |instance|
-					evaluator = @environment.evaluator
+				Async do |task|
+					server.run
 					
-					Async do |task|
-						if @environment.implements?(Async::Container::Supervisor::Supervised)
-							evaluator.make_supervised_worker(instance).run
-						end
-						
-						server = evaluator.make_server(@bound_endpoint)
-						
-						server.run
-						
-						instance.ready!
-						
-						if health_check_timeout
-							Async(transient: true) do
-								while true
-									# We only update this if the health check is enabled. Maybe we should always update it?
-									instance.name = "#{self.name} (#{server.statistics_string} L=#{Fiber.scheduler.load.round(3)})"
-									sleep(health_check_timeout / 2)
-									instance.ready!
-								end
-							end
-						end
-						
-						task.children.each(&:wait)
-					end
+					task.children.each(&:wait)
 				end
+				
+				server
+			end
+			
+			# Format the process title with server statistics.
+			#
+			# @parameter evaluator [Environment::Evaluator] The environment evaluator.
+			# @parameter server [Falcon::Server] The server instance.
+			# @returns [String] The formatted process title.
+			private def format_title(evaluator, server)
+				load = Fiber.scheduler.load.round(3)
+				"#{evaluator.name} (#{server.statistics_string} L=#{load})"
 			end
 			
 			# Close the bound endpoint.

data/lib/falcon/version.rb

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

data/license.md

@@ -27,6 +27,7 @@ Copyright, 2024, by Stefan Buhrmester.
 Copyright, 2024, by Ismael Celis.  
 Copyright, 2025, by Pierre Montelle.  
 Copyright, 2025, by Jared Smith.  
+Copyright, 2025, by Yoji Shidara.  
 
 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

@@ -47,6 +47,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.52.4
+
+  - Relax dependency on `async-container-supervisor` to allow `~> 0.6`.
+
 ### v0.52.0
 
   - Modernized codebase and dropped support for Ruby v3.1.
@@ -98,13 +102,13 @@ In addition, `falcon serve` provides two new options:
 The current configuration format uses definitions like this:
 
 ``` ruby
-rack 'hello.localhost', :self_signed_tls
+rack "hello.localhost", :self_signed_tls
 ```
 
 This changes to:
 
 ``` ruby
-service 'hello.localhost' do
+service "hello.localhost" do
 	include Falcon::Environment::Rack
 	include Falcon::Environment::SelfSignedTLS
 end

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.52.4
+
+  - Relax dependency on `async-container-supervisor` to allow `~> 0.6`.
+
 ## v0.52.0
 
   - Modernized codebase and dropped support for Ruby v3.1.
@@ -106,13 +110,13 @@ In addition, `falcon serve` provides two new options:
 The current configuration format uses definitions like this:
 
 ``` ruby
-rack 'hello.localhost', :self_signed_tls
+rack "hello.localhost", :self_signed_tls
 ```
 
 This changes to:
 
 ``` ruby
-service 'hello.localhost' do
+service "hello.localhost" do
 	include Falcon::Environment::Rack
 	include Falcon::Environment::SelfSignedTLS
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.52.3
+  version: 0.53.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -31,6 +31,7 @@ authors:
 - Stefan Buhrmester
 - Tad Thorley
 - Tasos Latsas
+- Yoji Shidara
 bindir: bin
 cert_chain:
 - |
@@ -98,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement