falcon 0.46.1 → 0.47.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab60da5c2573da0b0d2c0958898fb68dacf19a2e88e1fd9a563823e2baa7633e
-  data.tar.gz: 05cbda0911c79c6fe3c4abb6bd44be1d286f664bf57a61329588debfa337a01b
+  metadata.gz: afae07cb03f2c1966050a313f8a5be2cd26fde0ad9d3d1ab1ff3eb091271f29d
+  data.tar.gz: 53b781ad1cd3f49414eca991ac09efb281c96c7daa55d708c429d036e911d349
 SHA512:
-  metadata.gz: 6a2aa0bd1c6ff91a5f0a25570cf02c37207be7a468b8227f69a4db1224dde7abf25f4263a72369a22714426f8783b446f50b25655f0e9c4e6123b4b5496b7f25
-  data.tar.gz: 76c9579c200f77268264baafccaa2652272df607ce8bb5997a6be757809112971724028b3852bf2eced35c1c26600747949a17ffcb07c3ba7143086a84799084
+  metadata.gz: '088b7b78b93930ab04c21e978050f46830ee38931773f91ff8635b74f5c5fb9a7cdd7892c107f3540baa6d3bbf1ea93b21dd9931c6cf9e2835184a4ebc3dc4fe'
+  data.tar.gz: 99199297af5faf6cd5c7dcc3bb4f081781a4876f6c45ec8370596ca3e6d614ac79c56a3fd297df109434102baaea489711472e023c35e18f276cee8648df896d

data/lib/falcon/command/supervisor.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require 'samovar'
 require 'async'
 require 'json'
 
-require 'async/io/stream'
-require 'async/io/unix_endpoint'
+require 'io/endpoint/unix_endpoint'
+require 'io/stream'
 
 module Falcon
 	module Command
@@ -43,7 +43,7 @@ module Falcon
 					stream.puts({please: 'metrics'}.to_json, separator: "\0")
 					response = JSON.parse(stream.gets("\0"), symbolize_names: true)
 					
-					pp response
+					$stdout.puts response
 				end
 			end
 			
@@ -57,16 +57,14 @@ module Falcon
 			
 			# The endpoint the supervisor is bound to.
 			def endpoint
-				Async::IO::Endpoint.unix(@options[:path])
+				::IO::Endpoint.unix(@options[:path])
 			end
 			
 			# Connect to the supervisor and execute the requested command.
 			def call
-				Async do
+				Sync do
 					endpoint.connect do |socket|
-						stream = Async::IO::Stream.new(socket)
-						
-						@command.call(stream)
+						@command.call(IO::Stream(socket))
 					end
 				end
 			end

data/lib/falcon/environment/application.rb

@@ -41,7 +41,7 @@ module Falcon
 			end
 			
 			# The endpoint that will be used for communicating with the application server.
-			# @returns [Async::IO::Endpoint]
+			# @returns [::Falcon::ProxyEndpoint]
 			def endpoint
 				::Falcon::ProxyEndpoint.unix(ipc_path,
 					protocol: protocol,

data/lib/falcon/environment/proxy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require_relative 'server'
 require_relative '../tls'

data/lib/falcon/environment/rack.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2024, by Samuel Williams.
 
 require_relative 'application'
 require_relative 'rackup'

data/lib/falcon/environment/rackup.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require 'rack/builder'
 require_relative '../server'

data/lib/falcon/environment/server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require 'async/service/generic'
 require 'async/http/endpoint'

data/lib/falcon/environment/supervisor.rb

@@ -23,9 +23,9 @@ module Falcon
 			end
 			
 			# The endpoint the supervisor will bind to.
-			# @returns [Async::IO::Endpoint]
+			# @returns [::IO::Endpoint::Generic]
 			def endpoint
-				Async::IO::Endpoint.unix(ipc_path)
+				::IO::Endpoint.unix(ipc_path)
 			end
 			
 			# The service class to use for the supervisor.

data/lib/falcon/proxy_endpoint.rb

@@ -3,13 +3,13 @@
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
 
-require 'async/io/unix_endpoint'
+require 'io/endpoint/unix_endpoint'
 
 module Falcon
 	# An endpoint suitable for proxing requests, typically via a unix pipe.
-	class ProxyEndpoint < Async::IO::Endpoint
+	class ProxyEndpoint < ::IO::Endpoint::Generic
 		# Initialize the proxy endpoint.
-		# @parameter endpoint [Async::IO::Endpoint] The endpoint which will be used for connecting/binding.
+		# @parameter endpoint [::IO::Endpoint::Generic] The endpoint which will be used for connecting/binding.
 		def initialize(endpoint, **options)
 			super(**options)
 			
@@ -21,7 +21,7 @@ module Falcon
 		end
 		
 		# The actual endpoint for I/O.
-		# @attribute [Async::IO::Endpoint]
+		# @attribute [::IO::Endpoint::Generic]
 		attr :endpoint
 		
 		# The protocol to use for this connection.
@@ -69,7 +69,7 @@ module Falcon
 		# Create a proxy unix endpoint with the specific path.
 		# @returns [ProxyEndpoint]
 		def self.unix(path, **options)
-			self.new(::Async::IO::Endpoint.unix(path), **options)
+			self.new(::IO::Endpoint.unix(path), **options)
 		end
 	end
 end

data/lib/falcon/rackup/handler.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require 'rackup/handler'
+
+require_relative '../../falcon'
+
+require 'kernel/sync'
+require 'io/endpoint/host_endpoint'
+
+module Falcon
+	module Rackup
+		# The falcon adaptor for the `rackup` executable.
+		class Handler
+			# The default scheme.
+			SCHEME = "http"
+			
+			# Generate an endpoint for the given `rackup` options.
+			# @returns [::IO::Endpoint::HostEndpoint]
+			def self.endpoint_for(**options)
+				host = options[:Host] || 'localhost'
+				port = Integer(options[:Port] || 9292)
+				
+				return ::IO::Endpoint.tcp(host, port)
+			end
+			
+			# Run the specified app using the given options:
+			# @parameter app [Object] The rack middleware.
+			def self.run(app, **options)
+				app = ::Protocol::Rack::Adapter.new(app)
+				
+				Sync do |task|
+					endpoint = endpoint_for(**options)
+					server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
+					
+					server_task = server.run
+					
+					wrapper = self.new(server, task)
+					
+					yield wrapper if block_given?
+					
+					server_task.wait
+				ensure
+					server_task.stop
+					wrapper.close
+				end
+			end
+			
+			def initialize(server, task)
+				@server = server
+				@task = task
+				
+				@notification = Thread::Queue.new
+				
+				@waiter = @task.async(transient: true) do
+					@notification.pop
+					
+					@task&.stop
+					@task = nil
+				end
+			end
+			
+			def stop
+				@notification&.push(true)
+			end
+			
+			def close
+				@notification&.close
+				@notification = nil
+				
+				@waiter&.stop
+				@waiter = nil
+			end
+		end
+	end
+end

data/lib/falcon/service/server.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
-# Copyright, 2020, by Michael Adams.
+# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2020, by Daniel Evans.
 
 require 'async/service/generic'
 require 'async/http/endpoint'

data/lib/falcon/service/supervisor.rb

@@ -6,8 +6,6 @@
 require 'process/metrics'
 require 'json'
 
-require 'async/io/endpoint'
-require 'async/io/shared_endpoint'
 require 'async/service/generic'
 
 module Falcon
@@ -71,7 +69,7 @@ module Falcon
 				container.run(name: self.name, restart: true, count: 1) do |instance|
 					Async do
 						@bound_endpoint.accept do |peer|
-							stream = Async::IO::Stream.new(peer)
+							stream = ::IO::Stream.new(peer)
 							
 							while message = stream.gets("\0")
 								response = handle(JSON.parse(message, symbolize_names: true))

data/lib/falcon/service/virtual.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require 'async/service/generic'
 

data/lib/falcon/version.rb

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

data/lib/rack/handler/falcon.rb

@@ -1,84 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
-# Copyright, 2019, by Bryan Powell.
+# Copyright, 2023, by Samuel Williams.
 
 require 'rack/handler'
 
-require_relative '../../falcon'
-
-require 'kernel/sync'
-require 'async/io/host_endpoint'
-require 'async/io/notification'
+require_relative '../../falcon/rackup/handler'
 
 module Rack
 	module Handler
-		# The falcon adaptor for the `rackup` executable.
-		class Falcon
-			# The default scheme.
-			SCHEME = "http"
-			
-			# Generate an endpoint for the given `rackup` options.
-			# @returns [Async::IO::Endpoint]
-			def self.endpoint_for(**options)
-				host = options[:Host] || 'localhost'
-				port = Integer(options[:Port] || 9292)
-				
-				return Async::IO::Endpoint.tcp(host, port)
-			end
-			
-			# Run the specified app using the given options:
-			# @parameter app [Object] The rack middleware.
-			def self.run(app, **options)
-				app = ::Protocol::Rack::Adapter.new(app)
-						
-				Sync do |task|
-					endpoint = endpoint_for(**options)
-					server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
-
-					server_task = task.async do
-						server.run.each(&:wait)
-					end
-
-					wrapper = self.new(server, task)
-					
-					yield wrapper if block_given?
-
-					server_task.wait
-				ensure
-					server_task.stop
-					wrapper.close
-				end
-			end
-
-			def initialize(server, task)
-				@server = server
-				@task = task
-
-				@notification = Async::IO::Notification.new
-
-				@waiter = @task.async(transient: true) do
-					@notification.wait
-
-					@task&.stop
-					@task = nil
-				end
-			end
-
-			def stop
-				@notification&.signal
-			end
-
-			def close
-				@notification&.close
-				@notification = nil
-
-				@waiter&.stop
-				@waiter = nil
-			end
-		end
-
+		Falcon = ::Falcon::Rackup::Handler
 		register :falcon, Falcon
 	end
 end

data/lib/rackup/handler/falcon.rb

@@ -5,79 +5,11 @@
 
 require 'rackup/handler'
 
-require_relative '../../falcon'
-
-require 'kernel/sync'
-require 'async/io/host_endpoint'
-require 'async/io/notification'
+require_relative '../../falcon/rackup/handler'
 
 module Rackup
 	module Handler
-		# The falcon adaptor for the `rackup` executable.
-		class Falcon
-			# The default scheme.
-			SCHEME = "http"
-			
-			# Generate an endpoint for the given `rackup` options.
-			# @returns [Async::IO::Endpoint]
-			def self.endpoint_for(**options)
-				host = options[:Host] || 'localhost'
-				port = Integer(options[:Port] || 9292)
-				
-				return Async::IO::Endpoint.tcp(host, port)
-			end
-			
-			# Run the specified app using the given options:
-			# @parameter app [Object] The rack middleware.
-			def self.run(app, **options)
-				app = ::Protocol::Rack::Adapter.new(app)
-						
-				Sync do |task|
-					endpoint = endpoint_for(**options)
-					server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
-
-					server_task = task.async do
-						server.run.each(&:wait)
-					end
-
-					wrapper = self.new(server, task)
-					
-					yield wrapper if block_given?
-
-					server_task.wait
-				ensure
-					server_task.stop
-					wrapper.close
-				end
-			end
-
-			def initialize(server, task)
-				@server = server
-				@task = task
-
-				@notification = Async::IO::Notification.new
-
-				@waiter = @task.async(transient: true) do
-					@notification.wait
-
-					@task&.stop
-					@task = nil
-				end
-			end
-
-			def stop
-				@notification&.signal
-			end
-
-			def close
-				@notification&.close
-				@notification = nil
-
-				@waiter&.stop
-				@waiter = nil
-			end
-		end
-
+		Falcon = ::Falcon::Rackup::Handler
 		register :falcon, Falcon
 	end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.46.1
+  version: 0.47.1
 platform: ruby
 authors:
 - Samuel Williams
 - Janko Marohnić
 - Bryan Powell
+- Trevor Turk
 - Claudiu Garba
 - Kyle Tam
 - Mitsutaka Mimura
 - Sho Ito
-- Trevor Turk
 - Colby Swandale
 - Daniel Evans
 - Kent Gruber
@@ -57,7 +57,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -93,14 +93,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.66'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.66.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.66'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.66.2
 - !ruby/object:Gem::Dependency
   name: async-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +258,7 @@ files:
 - lib/falcon/middleware/redirect.rb
 - lib/falcon/middleware/verbose.rb
 - lib/falcon/proxy_endpoint.rb
+- lib/falcon/rackup/handler.rb
 - lib/falcon/railtie.rb
 - lib/falcon/server.rb
 - lib/falcon/service/server.rb
@@ -268,6 +275,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://socketry.github.io/falcon/
+  source_code_uri: https://github.com/socketry/falcon.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -276,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="