falcon 0.40.0 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb44add9ea622a70918ed4b2287db8db8e233b143575dbefe86e4eeb93d6215f
-  data.tar.gz: a63f6a8d28ca6573f1b534ce8c27622ae5ec65046b986dbb3ed238d3ed147bcc
+  metadata.gz: 94f85c9e2ed95f6a43fda46cc07a986436ec7d874294b28288bcb004d269ea3c
+  data.tar.gz: f56850aab821d12cd73cdc1545ad2691bce81d1121ae543feb3d29f6e8ae28da
 SHA512:
-  metadata.gz: 6d56ce43c1d153a1a85cebdb4c09c1da0592b7cc8a68a4c7a6d1e1df18c548c7893fb56248dbcfba4c87fa8b0b4e0e27037c75cc79d6d9f3de97ea66ba285d2f
-  data.tar.gz: ef744900cbc8b88ddfe9b9a107f87cde89b9067d9f9c5c9e41dadf3ace45f72aaec5261940b2fcfee5aeb683213d5476046746305fbb1e279ec82a511266600d
+  metadata.gz: 047ac6d846d54362c8cc220f0264c60f9c951c557a61ca9c34636a93198acf04ab1b6e0b7ff10a684a8700f4b6a158dd57abf453cfa71bd5e9dee949eeedccdf
+  data.tar.gz: 425b8131c9cbbe18684492213351e480a42d8037fc198c234ce7cd19e5f3f61b5bf59145b8335e8508928ee766ddcbff8992925084c2f5dbd5cfe1f0207de03b

data/lib/falcon/extensions/openssl.rb

@@ -22,13 +22,15 @@
 
 require 'openssl/x509'
 
-module OpenSSL::X509
-	CERTIFICATE_PATTERN = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
-	
-	# An extension to load an array of certificates from a file at the given path.
-	def self.load_certificates(path)
-		File.read(path).scan(CERTIFICATE_PATTERN).collect do |text|
-			Certificate.new(text)
+module OpenSSL
+	module X509
+		CERTIFICATE_PATTERN = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
+		
+		# An extension to load an array of certificates from a file at the given path.
+		def self.load_certificates(path)
+			File.read(path).scan(CERTIFICATE_PATTERN).collect do |text|
+				Certificate.new(text)
+			end
 		end
 	end
 end

data/lib/falcon/services.rb

@@ -87,9 +87,9 @@ module Falcon
 				
 				begin
 					service.stop
-				rescue
+				rescue => error
 					failed = true
-					Console.logger.error(self, $!)
+					Console.logger.error(self, error)
 				end
 			end
 			

data/lib/falcon/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.40.0"
+	VERSION = "0.40.1"
 end

data/lib/rack/handler/falcon.rb

@@ -4,16 +4,16 @@ require 'rack/handler'
 
 require_relative '../../falcon'
 
-require 'async/reactor'
+require 'kernel/sync'
 require 'async/io/host_endpoint'
+require 'async/io/notification'
 
 module Rack
 	module Handler
 		# The falcon adaptor for the `rackup` executable.
-		module Falcon
+		class Falcon
 			# The default scheme.
 			SCHEME = "http"
-			NAME = :falcon
 			
 			# Generate an endpoint for the given `rackup` options.
 			# @returns [Async::IO::Endpoint]
@@ -27,20 +27,55 @@ module Rack
 			# Run the specified app using the given options:
 			# @parameter app [Object] The rack middleware.
 			def self.run(app, **options)
-				endpoint = endpoint_for(**options)
-				
 				app = ::Falcon::Adapters::Rack.new(app)
 				app = ::Falcon::Adapters::Rewindable.new(app)
-				
-				server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
-				yield server if block_given?
-				
-				Async::Reactor.run do
-					server.run
+						
+				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
-		
-		register Falcon::NAME, Falcon
+
+		register :falcon, Falcon
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.40.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -53,7 +53,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async