falcon 0.36.5 → 0.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f107eaf9cd170b5a399f5ad13222504f99e061292be94aab8720b7efa70c8b
-  data.tar.gz: 9787ecd87ba56f416b24abb02f55f16f7c3de3f3c89090c7724c63030995d8f7
+  metadata.gz: '09f68bf38932459e8910a73127f36a45c0d078343ddef8aebe11dbcb763ae8f6'
+  data.tar.gz: e2d295f7010e11a46beacda059ddcd93f3213b6d5b2a7975fec13f944f4d74cd
 SHA512:
-  metadata.gz: '034873da8c3ca3e809bc3144879ab46521b63d279fc3622501b0ab6348d24a36428fa5d6285455091d8eb542ad5ae39b4b42a594efb6052b5b4632aed75d103b'
-  data.tar.gz: b7e68e1c275ee07ee752228ad04a90ea0da0a658f467030a4e849fc3c0661f78f706ea4243460da12cfe2e7610233d59c5ff0d91f0b5092e767d3f452f372567
+  metadata.gz: 105b697d684f3824b4be897cb47f881cb2d4f678031bd206acd1f890d973afc81b550ca19aec3cc9b02d082a5218d1964d3d852ac35409c417d6325438a4bcc0
+  data.tar.gz: 6aee908ade5635f2d9693abcc07b3a59c83affdd7e10c683a8c87c435e40c9c4b8ee87da5764456409b87937f32ec788c434c9247e6f9abe2178312ff6000233

data/lib/falcon/adapters/rack.rb

@@ -24,7 +24,6 @@ require 'rack'
 
 require_relative 'input'
 require_relative 'response'
-require_relative 'early_hints'
 
 require 'async/logger'
 
@@ -60,7 +59,6 @@ module Falcon
 			RACK_HIJACK = 'rack.hijack'
 			RACK_IS_HIJACK = 'rack.hijack?'
 			RACK_HIJACK_IO = 'rack.hijack_io'
-			RACK_EARLY_HINTS = "rack.early_hints"
 			
 			# Async::HTTP specific metadata:
 			
@@ -175,8 +173,8 @@ module Falcon
 					RACK_URL_SCHEME => request.scheme,
 					
 					# I'm not sure what sane defaults should be here:
-					SERVER_NAME => server_name || '',
-					SERVER_PORT => server_port || '',
+					SERVER_NAME => server_name,
+					SERVER_PORT => server_port,
 					
 					# We support both request and response hijack.
 					RACK_IS_HIJACK => true,
@@ -184,10 +182,6 @@ module Falcon
 				
 				self.unwrap_request(request, env)
 				
-				if request.push?
-					env[RACK_EARLY_HINTS] = EarlyHints.new(request)
-				end
-				
 				full_hijack = false
 				
 				if request.hijack?

data/lib/falcon/adapters/response.rb

@@ -92,10 +92,10 @@ module Falcon
 				protocol = meta['rack.protocol']
 				
 				# https://tools.ietf.org/html/rfc7231#section-7.4.2
-				headers.add('server', "falcon/#{Falcon::VERSION}")
+				# headers.add('server', "falcon/#{Falcon::VERSION}")
 				
 				# https://tools.ietf.org/html/rfc7231#section-7.1.1.2
-				headers.add('date', Time.now.httpdate)
+				# headers.add('date', Time.now.httpdate)
 				
 				return self.new(status, headers, body, protocol)
 			end

data/lib/falcon/command/host.rb

@@ -71,7 +71,15 @@ module Falcon
 					buffer.puts "- To reload: kill -HUP #{Process.pid}"
 				end
 				
-				Bundler.require(:preload)
+				begin
+					Bundler.require(:preload)
+				rescue Bundler::GemfileNotFound
+					# Ignore.
+				end
+				
+				if GC.respond_to?(:compact)
+					GC.compact
+				end
 				
 				self.controller.run
 			end

data/lib/falcon/command/serve.rb

@@ -145,7 +145,11 @@ module Falcon
 					load(full_path)
 				end
 				
-				Bundler.require(:preload)
+				begin
+					Bundler.require(:preload)
+				rescue Bundler::GemfileNotFound
+					# Ignore.
+				end
 				
 				if GC.respond_to?(:compact)
 					GC.compact

data/lib/falcon/controller/serve.rb

@@ -68,6 +68,8 @@ module Falcon
 					Async::IO::SharedEndpoint.bound(@endpoint)
 				end.wait
 				
+				Async.logger.info(self) { "Starting #{name} on #{@endpoint.to_url}" }
+				
 				@debug_trap.ignore!
 				
 				super
@@ -100,7 +102,7 @@ module Falcon
 							end
 						end
 						
-						server = Falcon::Server.new(app, @bound_endpoint, @endpoint.protocol, @endpoint.scheme)
+						server = Falcon::Server.new(app, @bound_endpoint, protocol: @endpoint.protocol, scheme: @endpoint.scheme)
 						
 						server.run
 						

data/lib/falcon/environments/application.rb

@@ -65,4 +65,8 @@ environment(:application) do
 	# The service class to use for the application.
 	# @attribute [Class]
 	service ::Falcon::Service::Application
-end
+	
+	# Number of instances to start.
+	# @attribute [Integer | nil]
+	count nil
+end

data/lib/falcon/service/application.rb

@@ -42,6 +42,12 @@ module Falcon
 				@environment.evaluator.middleware
 			end
 			
+			# Number of instances to start.
+			# @returns [Integer | nil]
+			def count
+			  @environment.evaluator.count
+			end
+			
 			# Preload any resources specified by the environment.
 			def preload!
 				if scripts = @evaluator.preload
@@ -73,11 +79,18 @@ module Falcon
 				protocol = self.protocol
 				scheme = self.scheme
 				
-				container.run(name: self.name, restart: true) do |instance|
+				run_options = {
+					name: self.name,
+					restart: true,
+				}
+				
+				run_options[:count] = count unless count.nil?
+				
+				container.run(**run_options) do |instance|
 					Async(logger: logger) do |task|
 						Async.logger.info(self) {"Starting application server for #{self.root}..."}
 						
-						server = Server.new(self.middleware, @bound_endpoint, protocol, scheme)
+						server = Server.new(self.middleware, @bound_endpoint, protocol: protocol, scheme: scheme)
 						
 						server.run
 						

data/lib/falcon/version.rb

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

data/lib/rack/handler/falcon.rb

@@ -32,7 +32,7 @@ module Rack
 				app = ::Falcon::Adapters::Rack.new(app)
 				app = ::Falcon::Adapters::Rewindable.new(app)
 				
-				server = ::Falcon::Server.new(app, endpoint, Async::HTTP::Protocol::HTTP1, SCHEME)
+				server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
 				yield server if block_given?
 				
 				Async::Reactor.run do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.36.5
+  version: 0.37.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -25,89 +25,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: async-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: async-container
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.22'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: build-environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: samovar
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: localhost
   requirement: !ruby/object:Gem::Requirement
@@ -123,91 +123,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: build-environment
+  name: process-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: process-metrics
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: async-rspec
+  name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '2.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: async-websocket
+  name: async-process
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: async-process
+  name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bake
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -250,7 +250,6 @@ dependencies:
         version: '3.6'
 description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - falcon
 - falcon-host
@@ -261,7 +260,6 @@ files:
 - bin/falcon
 - bin/falcon-host
 - lib/falcon.rb
-- lib/falcon/adapters/early_hints.rb
 - lib/falcon/adapters/input.rb
 - lib/falcon/adapters/output.rb
 - lib/falcon/adapters/rack.rb
@@ -306,7 +304,8 @@ files:
 - lib/falcon/version.rb
 - lib/rack/handler/falcon.rb
 homepage: https://github.com/socketry/falcon
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -314,7 +313,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement

data/lib/falcon/adapters/early_hints.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'protocol/http/middleware'
-
-module Falcon
-	module Adapters
-		# Provide an interface for advising the client to preload related resources.
-		class EarlyHints
-			PRELOAD = /<(?<path>.*?)>;.*?rel=preload/
-			
-			# Initialize the early hints interface.
-			#
-			# @parameter request [Protocol::HTTP::Request]
-			def initialize(request)
-				@request = request
-			end
-			
-			# Advise the request that the specified path should be preloaded.
-			# @parameter path [String]
-			# @parameter preload [Boolean] whether the client should preload the resource.
-			def push(path, preload: true, **options)
-				@request.push(path)
-			end
-			
-			# Extract link headers and invoke {push}.
-			def call(headers)
-				headers.each do |key, value|
-					if key.casecmp("link").zero? and match = PRELOAD.match(value)
-						@request.push(match[:path])
-					else
-						Async.logger.warn(@request) {"Unsure how to handle early hints header: #{key}"}
-					end
-				end
-			end
-		end
-	end
-end