falcon 0.34.5 → 0.35.0

data/lib/falcon/services.rb

@@ -18,15 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'service'
+require_relative 'service/generic'
 
 module Falcon
 	class Services
 		def initialize(configuration)
 			@named = {}
 			
-			configuration.each(:start) do |environment|
-				add(Service.new(environment))
+			configuration.each(:service) do |environment|
+				service = Service::Generic.wrap(environment)
+				
+				add(service)
 			end
 		end
 		
@@ -38,12 +40,37 @@ module Falcon
 			@named[service.name] = service
 		end
 		
-		def run(container = Async::Container.new, **options)
+		def start
 			@named.each do |name, service|
-				service.spawn(container)
+				Async.logger.debug(self) {"Starting #{name}..."}
+				service.start
+			end
+		end
+		
+		def setup(container)
+			@named.each do |name, service|
+				Async.logger.debug(self) {"Setup #{name} into #{container}..."}
+				service.setup(container)
 			end
 			
 			return container
 		end
+		
+		def stop
+			failed = false
+			
+			@named.each do |name, service|
+				Async.logger.debug(self) {"Stopping #{name}..."}
+				
+				begin
+					service.stop
+				rescue
+					failed = true
+					Async.logger.error(self, $!)
+				end
+			end
+			
+			return failed
+		end
 	end
 end

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.34.5"
+	VERSION = "0.35.0"
 end

data/lib/rack/handler/falcon.rb

@@ -3,6 +3,7 @@ require 'rack/handler'
 
 require_relative '../../falcon'
 
+require 'async/reactor'
 require 'async/io/host_endpoint'
 
 module Rack
@@ -26,7 +27,7 @@ module Rack
 				
 				server = ::Falcon::Server.new(app, endpoint, Async::HTTP::Protocol::HTTP1, SCHEME)
 				yield server if block_given?
-
+				
 				Async::Reactor.run do
 					server.run
 				end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.34.5
+  version: 0.35.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: process-metrics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +261,7 @@ files:
 - examples/csv/config.ru
 - examples/hello/config.ru
 - examples/hello/falcon.rb
+- examples/hello/preload.rb
 - examples/internet/config.ru
 - examples/memory/allocations.rb
 - examples/memory/config.ru
@@ -260,6 +275,8 @@ files:
 - examples/sinatra/Gemfile
 - examples/sinatra/Gemfile.lock
 - examples/sinatra/config.ru
+- examples/trailers/config.ru
+- examples/trailers/falcon.rb
 - falcon.gemspec
 - gems/rack1.gemfile
 - gems/rack3.gemfile
@@ -272,31 +289,40 @@ files:
 - lib/falcon/adapters/rewindable.rb
 - lib/falcon/command.rb
 - lib/falcon/command/host.rb
+- lib/falcon/command/paths.rb
+- lib/falcon/command/proxy.rb
+- lib/falcon/command/redirect.rb
 - lib/falcon/command/serve.rb
 - lib/falcon/command/supervisor.rb
+- lib/falcon/command/top.rb
 - lib/falcon/command/virtual.rb
 - lib/falcon/configuration.rb
-- lib/falcon/configurations/host.rb
-- lib/falcon/configurations/lets_encrypt_tls.rb
-- lib/falcon/configurations/proxy.rb
-- lib/falcon/configurations/rack.rb
-- lib/falcon/configurations/self_signed_tls.rb
-- lib/falcon/configurations/supervisor.rb
-- lib/falcon/configurations/tls.rb
+- lib/falcon/configuration/application.rb
+- lib/falcon/configuration/lets_encrypt_tls.rb
+- lib/falcon/configuration/proxy.rb
+- lib/falcon/configuration/rack.rb
+- lib/falcon/configuration/self_signed_tls.rb
+- lib/falcon/configuration/supervisor.rb
+- lib/falcon/configuration/tls.rb
+- lib/falcon/controller/host.rb
+- lib/falcon/controller/proxy.rb
+- lib/falcon/controller/redirect.rb
+- lib/falcon/controller/serve.rb
+- lib/falcon/controller/virtual.rb
 - lib/falcon/endpoint.rb
 - lib/falcon/extensions/openssl.rb
-- lib/falcon/host.rb
-- lib/falcon/hosts.rb
-- lib/falcon/proxy.rb
+- lib/falcon/middleware/proxy.rb
+- lib/falcon/middleware/redirect.rb
 - lib/falcon/proxy_endpoint.rb
-- lib/falcon/redirection.rb
 - lib/falcon/server.rb
-- lib/falcon/service.rb
+- lib/falcon/service/application.rb
+- lib/falcon/service/generic.rb
+- lib/falcon/service/supervisor.rb
 - lib/falcon/services.rb
-- lib/falcon/supervisor.rb
 - lib/falcon/verbose.rb
 - lib/falcon/version.rb
 - lib/rack/handler/falcon.rb
+- logo-square.afdesign
 - logo.afdesign
 - logo.svg
 - server.rb

data/lib/falcon/hosts.rb

@@ -1,135 +0,0 @@
-# Copyright, 2018, 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 'async/io/endpoint'
-
-require_relative 'host'
-require_relative 'proxy'
-require_relative 'redirection'
-
-require 'async/container'
-require 'async/container/controller'
-require 'async/http/endpoint'
-
-module Falcon
-	class Hosts
-		SERVER_CIPHERS = "EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5".freeze
-		
-		def initialize(configuration)
-			@named = {}
-			@server_context = nil
-			@server_endpoint = nil
-			
-			configuration.each(:authority) do |environment|
-				add(Host.new(environment))
-			end
-		end
-		
-		def each(&block)
-			@named.each_value(&block)
-		end
-		
-		def endpoint
-			@server_endpoint ||= Async::HTTP::Endpoint.parse(
-				'https://[::]',
-				ssl_context: self.ssl_context,
-				reuse_address: true
-			)
-		end
-		
-		def ssl_context
-			@server_context ||= OpenSSL::SSL::SSLContext.new.tap do |context|
-				context.servername_cb = Proc.new do |socket, hostname|
-					self.host_context(socket, hostname)
-				end
-				
-				context.session_id_context = "falcon"
-				
-				context.set_params(
-					ciphers: SERVER_CIPHERS,
-					verify_mode: OpenSSL::SSL::VERIFY_NONE,
-				)
-				
-				context.setup
-			end
-		end
-		
-		def host_context(socket, hostname)
-			if host = @named[hostname]
-				Async.logger.debug(self) {"Resolving #{hostname} -> #{host}"}
-				
-				socket.hostname = hostname
-				
-				return host.ssl_context
-			else
-				Async.logger.warn(self) {"Unable to resolve #{hostname}!"}
-				
-				return nil
-			end
-		end
-		
-		def add(host)
-			@named[host.authority] = host
-		end
-		
-		def proxy
-			Proxy.new(Falcon::BadRequest, @named)
-		end
-		
-		def redirection(secure_endpoint)
-			Redirection.new(Falcon::BadRequest, @named, secure_endpoint)
-		end
-		
-		def run(container = Async::Container.new, **options)
-			secure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_secure], ssl_context: self.ssl_context)
-			insecure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_insecure])
-			
-			secure_endpoint_bound = insecure_endpoint_bound = nil
-			
-			Async::Reactor.run do
-				secure_endpoint_bound = Async::IO::SharedEndpoint.bound(secure_endpoint)
-				insecure_endpoint_bound = Async::IO::SharedEndpoint.bound(insecure_endpoint)
-			end.wait
-			
-			container.run(name: "Falcon Proxy", restart: true) do |task, instance|
-				proxy = self.proxy
-				
-				proxy_server = Falcon::Server.new(proxy, secure_endpoint_bound, secure_endpoint.protocol, secure_endpoint.scheme)
-				
-				proxy_server.run
-			end
-			
-			container.run(name: "Falcon Redirector", restart: true) do |task, instance|
-				redirection = self.redirection(secure_endpoint)
-				
-				redirection_server = Falcon::Server.new(redirection, insecure_endpoint_bound, insecure_endpoint.protocol, insecure_endpoint.scheme)
-				
-				redirection_server.run
-			end
-			
-			container.attach do
-				secure_endpoint_bound.close
-				insecure_endpoint_bound.close
-			end
-			
-			return container
-		end
-	end
-end

data/lib/falcon/proxy.rb

@@ -1,141 +0,0 @@
-# Copyright, 2018, 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 'async/http/client'
-require 'protocol/http/headers'
-require 'protocol/http/middleware'
-
-module Falcon
-	module BadRequest
-		def self.call(request)
-			return Protocol::HTTP::Response[400, {}, []]
-		end
-		
-		def self.close
-		end
-	end
-	
-	class Proxy < Protocol::HTTP::Middleware
-		FORWARDED = 'forwarded'.freeze
-		X_FORWARDED_FOR = 'x-forwarded-for'.freeze
-		X_FORWARDED_PROTO = 'x-forwarded-proto'.freeze
-		
-		VIA = 'via'.freeze
-		CONNECTION = 'connection'.freeze
-		
-		HOP_HEADERS = [
-			'connection',
-			'keep-alive',
-			'public',
-			'proxy-authenticate',
-			'transfer-encoding',
-			'upgrade',
-		]
-		
-		def initialize(app, hosts)
-			super(app)
-			
-			@server_context = nil
-			
-			@hosts = hosts
-			@clients = {}
-			
-			@count = 0
-		end
-		
-		attr :count
-		
-		def close
-			@clients.each_value(&:close)
-			
-			super
-		end
-		
-		def connect(endpoint)
-			@clients[endpoint] ||= Async::HTTP::Client.new(endpoint)
-		end
-		
-		def lookup(request)
-			# Trailing dot and port is ignored/normalized.
-			if authority = request.authority&.sub(/(\.)?(:\d+)?$/, '')
-				return @hosts[authority]
-			end
-		end
-		
-		def prepare_headers(headers)
-			if connection = headers[CONNECTION]
-				headers.extract(connection)
-			end
-			
-			headers.extract(HOP_HEADERS)
-		end
-		
-		def prepare_request(request, host)
-			forwarded = []
-			
-			Async.logger.debug(self) do |buffer|
-				buffer.puts "Request authority: #{request.authority}"
-				buffer.puts "Host authority: #{host.authority}"
-				buffer.puts "Request: #{request.method} #{request.path} #{request.version}"
-				buffer.puts "Request headers: #{request.headers.inspect}"
-			end
-			
-			# The authority of the request must match the authority of the endpoint we are proxying to, otherwise SNI and other things won't work correctly.
-			request.authority = host.authority
-			
-			if address = request.remote_address
-				request.headers.add(X_FORWARDED_FOR, address.ip_address)
-				forwarded << "for=#{address.ip_address}"
-			end
-			
-			if scheme = request.scheme
-				request.headers.add(X_FORWARDED_PROTO, scheme)
-				forwarded << "proto=#{scheme}"
-			end
-			
-			unless forwarded.empty?
-				request.headers.add(FORWARDED, forwarded.join(';'))
-			end
-			
-			request.headers.add(VIA, "#{request.version} #{self.class}")
-			
-			self.prepare_headers(request.headers)
-			
-			return request
-		end
-		
-		def call(request)
-			if host = lookup(request)
-				@count += 1
-				
-				request = self.prepare_request(request, host)
-				
-				client = connect(host.endpoint)
-				
-				client.call(request)
-			else
-				super
-			end
-		rescue
-			Async.logger.error(self) {$!}
-			return Protocol::HTTP::Response[502, {'content-type' => 'text/plain'}, ["#{$!.inspect}: #{$!.backtrace.join("\n")}"]]
-		end
-	end
-end