falcon 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f728c3a72089d8f91c140943d4699efd7d6c3ad8e051d98d39c09afb0b419ec
-  data.tar.gz: 0fa4c83bf6f5758856b2d0a85c900bfc0137e0836b27cd2f5746910106e03d19
+  metadata.gz: a9163a32adea87fe689f8a9b00a1b31bfde1a01686c74456b3051975d5be8bf7
+  data.tar.gz: d623a98e678f74dc3e077efd42f5857c4b63d1840b3489be5438727f6d4120f6
 SHA512:
-  metadata.gz: 5424db201eeaae4b30d96e2f665c196e71cc110dd824532e6de38f082242b9d60c97fb92a9e764449b01af3b78e79627a6608cfc798ba1c83970d5b067a7492c
-  data.tar.gz: 1c894b71e6aca8e280b8031dc0ca4b8609f30a05724264aaba64cee7e1a819a92d8775fa145900b63304dd2b14d1386fb003773445cd3f2aae68933a33c110bb
+  metadata.gz: 19340fbf6cd77a877900a70efaeb9c7847570e327e4bf732c2d05e4a05b83d2e1f34da906d82a2668c1c8fbde388da058b3d4f764af9ac6d41814e390b37d320
+  data.tar.gz: 624adfe16a0ce38e41fc9eb837039774e496689ce9de19b594fa372c0b99b467c6d73b505249e12c9515f03dbeda298bef46aff456c0ad04440811aab9b54fe9

data/Gemfile

@@ -1,8 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in async-io.gemspec
 gemspec
 
+group :development do
+	gem 'ruby-prof'
+end
+
 group :test do
 	gem 'simplecov'
 	gem 'coveralls', require: false

data/falcon.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency("async-io", "~> 1.6")
-	spec.add_dependency("async-http", "~> 0.19.0")
-	spec.add_dependency("async-container", "~> 0.4.0")
+	spec.add_dependency("async-io", "~> 1.9")
+	spec.add_dependency("async-http", "~> 0.21.0")
+	spec.add_dependency("async-container", "~> 0.5.0")
 	
 	spec.add_dependency("rack", ">= 1.0")
 	

data/lib/falcon.rb

@@ -20,3 +20,6 @@
 
 require_relative "falcon/command"
 require_relative "falcon/server"
+
+require_relative 'falcon/hosts'
+require_relative 'falcon/proxy'

data/lib/falcon/command/serve.rb

@@ -24,6 +24,8 @@ require_relative '../adapters/rack'
 
 require 'async/container'
 require 'async/io/trap'
+require 'async/io/host_endpoint'
+require 'async/io/shared_endpoint'
 
 require 'samovar'
 
@@ -73,7 +75,13 @@ module Falcon
 			def run(verbose)
 				app, options = load_app(verbose)
 				
-				endpoint = Async::IO::Endpoint.parse(@options[:bind], reuse_port: true)
+				endpoint = nil
+				
+				Async::Reactor.run do
+					endpoint = Async::IO::SharedEndpoint.bound(
+						Async::IO::Endpoint.parse(@options[:bind], reuse_port: true)
+					)
+				end
 				
 				Async.logger.info "Falcon taking flight! Binding to #{endpoint} [#{container_class} with concurrency: #{@options[:concurrency]}]"
 				

data/lib/falcon/hosts.rb

@@ -0,0 +1,124 @@
+# 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'
+
+module Falcon
+	class Host
+		def initialize
+			@app = nil
+			@endpoint = nil
+			@ssl_certificate = nil
+			@ssl_key = nil
+		end
+		
+		attr_accessor :app
+		
+		attr_accessor :endpoint
+		
+		attr_accessor :ssl_certificate
+		attr_accessor :ssl_key
+		
+		def ssl_certificate_path= path
+			@ssl_certificate = OpenSSL::X509::Certificate.new(File.read(path))
+		end
+		
+		def ssl_key_path= path
+			@ssl_key = OpenSSL::PKey::RSA.new(File.read(path))
+		end
+		
+		def ssl_context
+			if @ssl_key
+				OpenSSL::SSL::SSLContext.new.tap do |context|
+					context.cert = @ssl_certificate
+					context.key = @ssl_key
+					
+					context.set_params
+				end
+			end
+		end
+		
+		def start
+			if app = self.app
+				Async::Container::Forked.new do
+					server = Falcon::Server.new(app, self.server_endpoint)
+					
+					server.run
+				end
+			end
+		end
+	end
+	
+	class Hosts
+		DEFAULT_ALPN_PROTOCOLS = ['h2', 'http/1.1'].freeze
+		
+		def initialize
+			@named = {}
+			@server_context = nil
+			@server_endpoint = nil
+		end
+		
+		def each(&block)
+			@named.each(&block)
+		end
+		
+		def endpoint
+			@server_endpoint ||= Async::HTTP::URLEndpoint.parse(
+				'https://0.0.0.0',
+				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.alpn_protocols = DEFAULT_ALPN_PROTOCOLS
+				
+				context.set_params
+			end
+		end
+		
+		def host_context(socket, hostname)
+			if host = @named[hostname]
+				socket.hostname = hostname
+				
+				return host.ssl_context
+			end
+		end
+		
+		def add(name, host = Host.new, &block)
+			host = Host.new
+			
+			yield host if block_given?
+			
+			@named[name] = host.freeze
+		end
+		
+		def client_endpoints
+			Hash[
+				@named.collect{|name, host| [name, host.endpoint]}
+			]
+		end
+	end
+end

data/lib/falcon/proxy.rb

@@ -0,0 +1,76 @@
+# 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'
+
+module Falcon
+	module BadRequest
+		def self.call(request, *)
+			return Async::HTTP::Response[400, {}, []]
+		end
+		
+		def self.close
+		end
+	end
+	
+	class Proxy < Async::HTTP::Middleware
+		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 call(request, *)
+			if endpoint = lookup(request)
+				@count += 1
+				
+				client = connect(endpoint)
+				
+				client.call(request)
+			else
+				super
+			end
+		end
+	end
+end

data/lib/falcon/verbose.rb

@@ -32,8 +32,8 @@ module Falcon
 		def annotate(request, peer: nil, address: nil)
 			task = Async::Task.current
 			
-			# @logger.debug "#{request.method} #{request.path} #{request.version} from #{address.inspect}"
-			# @logger.debug request.headers.inspect
+			@logger.debug(request.authority) {"#{request.method} #{request.path} #{request.version} from #{address.inspect}"}
+			@logger.debug(request.authority) {request.headers.inspect}
 			
 			task.annotate("#{request.method} #{request.path} from #{address.inspect}")
 		end
@@ -46,9 +46,9 @@ module Falcon
 			response = super
 			
 			statistics.wrap(response) do |statistics, error|
-				@logger.info "#{request.method} #{request.path} #{request.version} -> #{response.status}; #{statistics.inspect}"
+				@logger.info(request.authority) {"#{request.method} #{request.path} #{request.version} -> #{response.status}; #{statistics.inspect}"}
 				# @logger.info response.headers.inspect
-				@logger.error "#{error.class}: #{error.message}" if error
+				@logger.error(request.authority) {"#{error.class}: #{error.message}"} if error
 			end
 			
 			return response

data/lib/falcon/version.rb

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

data/lib/rack/handler/falcon.rb

@@ -3,6 +3,8 @@ require 'rack/handler'
 
 require_relative '../../falcon'
 
+require 'async/io/host_endpoint'
+
 module Rack
 	module Handler
 		module Falcon

data/server.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << File.expand_path('lib', __dir__)
+
+require 'falcon'
+require 'async/http/url_endpoint'
+require 'async/container/controller'
+require 'async/container/forked'
+
+require 'async/clock'
+
+Async.logger.level = Logger::INFO
+
+hosts = Falcon::Hosts.new
+
+hosts.add('map.local') do |host|
+	host.endpoint = Async::HTTP::URLEndpoint.parse('http://hana.local:8123')
+	
+	# host.ssl_certificate_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/fullchain.pem'
+	# host.ssl_key_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/privkey.pem'
+end
+
+hosts.add('chick.local') do |host|
+	host.endpoint = Async::HTTP::URLEndpoint.parse('http://hana.local:8765')
+	
+	# host.ssl_certificate_path = '/etc/letsencrypt/live/chick.nz/fullchain.pem'
+	# host.ssl_key_path = '/etc/letsencrypt/live/chick.nz/privkey.pem'
+end
+
+controller = Async::Container::Controller.new
+
+hosts.each do |name, host|
+	if container = host.start
+		controller << container
+	end
+end
+
+#proxy = Falcon::Verbose.new(
+	proxy = Falcon::Proxy.new(Falcon::BadRequest, hosts.client_endpoints)
+#)
+
+debug_trap = Async::IO::Trap.new(:USR1)
+
+require 'ruby-prof'
+
+#controller << Async::Container::Forked.new do
+	Process.setproctitle("Falcon Proxy")
+	
+	server = Falcon::Server.new(proxy, Async::HTTP::URLEndpoint.parse(
+		'http://0.0.0.0:4433',
+		reuse_address: true
+	))
+	
+	# profile the code
+	profile = RubyProf::Profile.new(merge_fibers: true)
+	
+	# begin
+	# 	profile.start
+		
+		Async::Reactor.run do |task|
+			task.async do
+				debug_trap.install!
+				$stderr.puts "Send `kill -USR1 #{Process.pid}` for detailed status :)"
+				
+				debug_trap.trap do
+					task.reactor.print_hierarchy($stderr)
+					# Async.logger.level = Logger::DEBUG
+				end
+			end
+			
+			task.async do |task|
+				start_time = Async::Clock.now
+				
+				while true
+					task.sleep(600)
+					duration = Async::Clock.now - start_time
+					puts "Handled #{proxy.count} requests; #{(proxy.count.to_f / duration.to_f).round(1)} requests per second."
+				end
+			end
+			
+			server.run
+		end
+	# ensure
+	# 	profile.stop
+	# 
+	# 	# print a flat profile to text
+	# 	printer = RubyProf::FlatPrinter.new(profile)
+	# 	printer.print($stdout)
+	# end
+#end
+
+#Process.setproctitle("Falcon Controller")
+#controller.wait

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -162,10 +162,13 @@ files:
 - lib/falcon/adapters/rack.rb
 - lib/falcon/command.rb
 - lib/falcon/command/serve.rb
+- lib/falcon/hosts.rb
+- lib/falcon/proxy.rb
 - lib/falcon/server.rb
 - lib/falcon/verbose.rb
 - lib/falcon/version.rb
 - lib/rack/handler/falcon.rb
+- server.rb
 homepage: https://github.com/socketry/falcon
 licenses: []
 metadata: {}