falcon 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c80289856ac260e9a3e423465926308c76630cdb6d9d6940f147e2f643af638a
-  data.tar.gz: 0dc95d7527f64b6bc8ae6de7bfaa5f9eb5c36c26a40d6b4d318d2c63a354f4c2
+  metadata.gz: 75d7948a19515712232d9eb7318bbfb3f890da83e93769d7bd3c5f11ef8fd56b
+  data.tar.gz: bb70af1d70fa8d51efeeda865416d2eb284baf364cce93717dde95e5be415399
 SHA512:
-  metadata.gz: 8cde639a3858513ccdd80c8192d9158f75973375ecf2d66b468d18943da3e6f490cb9edaf3c94cb96b5494e140287c71545f41c806fbd4bba28e88f5f77ad43a
-  data.tar.gz: edb463f74426954aa1a71788060cdda534d4ce9ae147a4f42899f1251e669644ed5be5ab4e9e22d7f17f24158d4d9ffedc1659f38a4cbaa3c0d3695a41961fa6
+  metadata.gz: ecd5fd3744fc9f145cbd2dd754fb8e4082eb4066492658fb8941316ca90356cd0461438f7a44cef4b0497c5d0fe0a90dcb4135e461348900dad05d68ef23c31d
+  data.tar.gz: bbf427f717117d135480ca337bc376a949ea5ebb0df28aa02e4d1e6d6231e86aaf69b21c243e656042ecdfc66cb055e44a5308b94612f89b8ce24f3eaa6adf78

data/.gitignore

@@ -10,6 +10,5 @@
 /spec/reports/
 /tmp/
 
-# rspec failure tracking
 .rspec_status
 .covered.db

data/.travis.yml

@@ -7,6 +7,9 @@ addons:
     packages:
     - wrk
     - apache2-utils
+  homebrew:
+    packages:
+    - wrk
 
 after_success:
   - bundle exec rake benchmark:compare
@@ -21,11 +24,13 @@ matrix:
     - rvm: 2.6
       gemfile: gems/rack3.gemfile
     - rvm: 2.6
-      env: COVERAGE=BriefSummary,Coveralls
+      env: COVERAGE=Summary,Coveralls
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
+    - rvm: 2.6
+      os: osx
   allow_failures:
     - rvm: truffleruby
     - rvm: ruby-head

data/examples/beer/config.ru

@@ -1,7 +1,7 @@
 #!/usr/bin/env falcon --verbose serve -c
 
 require 'rack'
-require 'trenni'
+require 'cgi'
 
 def bottles(n)
 	n == 1 ? "#{n} bottle" : "#{n} bottles"
@@ -42,7 +42,7 @@ run lambda {|env|
 		
 		code = File.read(__FILE__)
 		body.write("<h1>Source Code</h1>")
-		body.write("<pre><code>#{Trenni::Markup.escape_string code}</code></pre>")
+		body.write("<pre><code>#{CGI.escapeHTML code}</code></pre>")
 		body.write("</body></html>")
 	rescue
 		puts "Remote end closed connection: #{$!}"

data/examples/beer/falcon.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env -S falcon host
 
-host 'beer.localhost', :rack, :self_signed do
-	root __dir__
-end
+load :rack, :self_signed_tls, :supervisor
+
+rack 'beer.localhost', :self_signed_tls

data/examples/benchmark/falcon.rb

@@ -1,3 +1,5 @@
 #!/usr/bin/env -S ./bin/falcon virtual
 
-host 'benchmark.local', :self_signed
+load :rack, :self_signed_tls, :supervisor
+
+rack 'benchmark.local', :self_signed_tls

data/examples/hello/falcon.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env -S falcon host
 
-host 'hello.localhost', :rack, :self_signed do
-	root __dir__
-end
+load :rack, :self_signed_tls, :supervisor
+
+rack 'hello.localhost', :self_signed_tls
 
 # service 'jobs' do
 # 	shell ['rake', 'background:jobs:process']

data/falcon.gemspec

@@ -28,9 +28,8 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency 'samovar', "~> 2.1"
 	spec.add_dependency 'localhost', "~> 1.1"
-	spec.add_dependency 'build-environment', '~> 1.6'
+	spec.add_dependency 'build-environment', '~> 1.11'
 	
-	spec.add_development_dependency "trenni"
 	spec.add_development_dependency "async-rspec", "~> 1.7"
 	spec.add_development_dependency "async-websocket", "~> 0.12.0"
 	spec.add_development_dependency "async-process", "~> 1.1"

data/lib/falcon/command.rb

@@ -21,11 +21,11 @@
 require_relative 'command/serve'
 require_relative 'command/virtual'
 require_relative 'command/host'
+require_relative 'command/supervisor'
 
 require_relative 'version'
 
 require 'samovar'
-require 'logger'
 
 module Falcon
 	module Command
@@ -46,6 +46,7 @@ module Falcon
 				'serve' => Serve,
 				'virtual' => Virtual,
 				'host' => Host,
+				'supervisor' => Supervisor
 			}, default: 'serve'
 			
 			def verbose?
@@ -58,11 +59,11 @@ module Falcon
 			
 			def call
 				if verbose?
-					Async.logger.level = Logger::DEBUG
+					Async.logger.debug!
 				elsif quiet?
-					Async.logger.level = Logger::WARN
+					Async.logger.warn!
 				else
-					Async.logger.level = Logger::INFO
+					Async.logger.info!
 				end
 				
 				if @options[:version]

data/lib/falcon/command/host.rb

@@ -20,8 +20,9 @@
 
 require_relative '../server'
 require_relative '../endpoint'
-require_relative '../hosts'
 require_relative '../configuration'
+require_relative '../hosts'
+require_relative '../services'
 
 require 'async/container'
 require 'async/container/controller'
@@ -57,16 +58,20 @@ module Falcon
 				
 				assume_privileges(@path)
 				
-				configuration.each do |environment|
-					Falcon::Host.new(environment).run(container)
+				hosts = Hosts.new(configuration)
+				hosts.each do |host|
+					host.run(container)
+				end
+				
+				services = Services.new(configuration)
+				services.each do |service|
+					service.run(container)
 				end
 				
 				return container
 			end
 			
-			def call
-				container = Async::Container::Forked.new
-				
+			def call(container = Async::Container.new)
 				container = run(container, parent.verbose?)
 				
 				container.wait(true)

data/lib/falcon/command/supervisor.rb

@@ -0,0 +1,74 @@
+# 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 'samovar'
+require 'async'
+require 'json'
+require 'async/io/unix_endpoint'
+
+module Falcon
+	module Command
+		class Supervisor < Samovar::Command
+			self.description = "Control and query a specific host."
+			
+			options do
+				option "--path <path>", "The control IPC path.", default: "supervisor.ipc"
+			end
+			
+			class Restart < Samovar::Command
+				self.description = "Restart the process group."
+				
+				def call(stream)
+					stream.puts({please: 'restart'}.to_json, separator: "\0")
+				end
+			end
+			
+			class Statistics < Samovar::Command
+				self.description = "Show statistics about the process group."
+				
+				def call(stream)
+					stream.puts({please: 'statistics'}.to_json, separator: "\0")
+					response = JSON.parse(stream.gets("\0"), symbolize_names: true)
+					
+					pp response
+				end
+			end
+			
+			nested :command, {
+				'restart' => Restart,
+				'statistics' => Statistics,
+			}, default: 'statistics'
+			
+			def endpoint
+				Async::IO::Endpoint.unix(@options[:path])
+			end
+			
+			def call
+				Async do
+					endpoint.connect do |socket|
+						stream = Async::IO::Stream.new(socket)
+						
+						@command.call(stream)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/falcon/command/virtual.rb

@@ -47,16 +47,34 @@ module Falcon
 			
 			many :paths
 			
+			def assume_privileges(path)
+				stat = File.stat(path)
+				
+				Process::GID.change_privilege(stat.gid)
+				Process::UID.change_privilege(stat.uid)
+			end
+			
+			def spawn(path, container)
+				container.spawn(name: self.name, restart: true) do |instance|
+					assume_privileges(path)
+					
+					instance.exec("bundle", "exec", path)
+				end
+			end
+			
 			def run(verbose = false)
 				configuration = Configuration.new(verbose)
+				container = Async::Container.new
 				
 				@paths.each do |path|
 					configuration.load_file(path)
+					spawn(path, container)
 				end
 				
 				hosts = Hosts.new(configuration)
+				hosts.run(container, **@options)
 				
-				return hosts.run(@options)
+				return container
 			end
 			
 			def call

data/lib/falcon/configuration.rb

@@ -19,185 +19,132 @@
 # THE SOFTWARE.
 
 require 'build/environment'
-require 'async/io/unix_endpoint'
 
 module Falcon
-	class ProxyEndpoint < Async::IO::Endpoint
-		def initialize(endpoint, **options)
-			super(**options)
-			
-			@endpoint = endpoint
-		end
-		
-		attr :endpoint
-		
-		def protocol
-			@options[:protocol]
-		end
-		
-		def scheme
-			@options[:scheme]
-		end
-		
-		def authority
-			@options[:authority]
+	class Configuration
+		def initialize(verbose = false)
+			@environments = {}
 		end
 		
-		def connect(&block)
-			@endpoint.connect(&block)
-		end
+		attr :environments
 		
-		def bind(&block)
-			@endpoint.bind(&block)
+		def each(key = :authority)
+			return to_enum(key) unless block_given?
+			
+			@environments.each do |name, environment|
+				environment = environment.flatten
+				
+				if environment.include?(key)
+					yield environment
+				end
+			end
 		end
 		
-		def each
-			return to_enum unless block_given?
+		def add(environment)
+			name = environment.name
 			
-			@endpoint.each do |endpoint|
-				yield self.class.new(endpoint, @options)
+			unless name
+				raise ArgumentError, "Environment name is nil #{environment.inspect}"
 			end
+			
+			environment = environment.flatten
+			
+			raise KeyError.new("#{name.inspect} is already set", key: name) if @environments.key?(name)
+			
+			@environments[name] = environment
 		end
 		
-		def self.unix(path, **options)
-			self.new(::Async::IO::Endpoint.unix(path), **options)
+		def load_file(path)
+			Loader.load_file(self, path)
 		end
-	end
-	
-	class Configuration
-		def initialize(verbose = false)
-			@environments = {}
-			@verbose = verbose
-			
-			add(:ssl) do
-				ssl_session_id {"falcon"}
+		
+		class Loader
+			def initialize(configuration, root = nil)
+				@loaded = {}
+				@configuration = configuration
+				@environments = {}
+				@root = root
 			end
 			
-			add(:host, :ssl) do
-				ssl_certificate_path {File.expand_path("ssl/certificate.pem", root)}
-				ssl_certificate {OpenSSL::X509::Certificate.new(File.read(ssl_certificate_path))}
-				
-				ssl_private_key_path {File.expand_path("ssl/private.key", root)}
-				ssl_private_key {OpenSSL::PKey::RSA.new(File.read(ssl_private_key_path))}
-				
-				ssl_context do
-					OpenSSL::SSL::SSLContext.new.tap do |context|
-						context.cert = ssl_certificate
-						context.key = ssl_private_key
-						
-						context.session_id_context = ssl_session_id
-						
-						context.set_params(
-							verify_mode: OpenSSL::SSL::VERIFY_NONE,
-						)
-						
-						context.setup
-					end
-				end
-			end
+			attr :path
+			attr :configuration
 			
-			add(:lets_encrypt, :ssl) do
-				lets_encrypt_root '/etc/letsencrypt/live'
-				ssl_certificate_path {File.join(lets_encrypt_root, authority, "fullchain.pem")}
-				ssl_private_key_path {File.join(lets_encrypt_root, authority, "privkey.pem")}
+			def self.load_file(configuration, path)
+				path = File.realpath(path)
+				root = File.dirname(path)
+				
+				loader = self.new(configuration, root)
+				
+				loader.instance_eval(File.read(path), path)
 			end
 			
-			add(:self_signed, :ssl) do
-				ssl_context do
-					contexts = Localhost::Authority.fetch(authority)
+			def load(*features)
+				features.each do |feature|
+					next if @loaded.include?(feature)
+					
+					relative_path = File.join(__dir__, "configurations", "#{feature}.rb")
+					
+					self.instance_eval(File.read(relative_path), relative_path)
 					
-					contexts.server_context.tap do |context|
-						context.alpn_select_cb = lambda do |protocols|
-							if protocols.include? "h2"
-								return "h2"
-							elsif protocols.include? "http/1.1"
-								return "http/1.1"
-							elsif protocols.include? "http/1.0"
-								return "http/1.0"
-							else
-								return nil
-							end
-						end
-						
-						context.session_id_context = "falcon"
-					end
+					@loaded[feature] = relative_path
 				end
 			end
 			
-			add(:proxy, :host) do
-				endpoint {::Async::HTTP::Endpoint.parse(url)}
-			end
-			
-			add(:rack, :host) do
-				config_path {::File.expand_path("config.ru", root)}
+			def add(name, *parents, &block)
+				raise KeyError.new("#{name} is already set", key: name) if @environments.key?(name)
 				
-				middleware do
-					::Falcon::Server.middleware(
-						::Rack::Builder.parse_file(config_path).first, verbose: verbose
-					)
-				end
+				environments = parents.map{|name| @environments.fetch(name)}
 				
-				authority 'localhost'
-				scheme 'https'
-				ipc_path {::File.expand_path("server.ipc", root)}
+				parent = Build::Environment.combine(*environments)
 				
-				endpoint {ProxyEndpoint.unix(ipc_path, protocol: Async::HTTP::Protocol::HTTP2, scheme: scheme, authority: authority)}
-				protocol {endpoint.protocol}
+				@environments[name] = merge(name, *parents, &block)
+			end
 				
-				bound_endpoint do
-					Async::Reactor.run do
-						Async::IO::SharedEndpoint.bound(endpoint)
-					end.wait
-				end
+			def host(name, *parents, &block)
+				environment = merge(name, :host, *parents, &block)
 				
-				server do
-					::Falcon::Server.new(middleware, bound_endpoint, protocol, scheme)
-				end
+				environment[:root] = @root
+				environment[:authority] = name
+				
+				@configuration.add(environment.flatten)
 			end
-		end
-		
-		attr :environments
-		
-		def add(name, *parents, &block)
-			raise KeyError.new("#{name} is already set", key: name) if @environments.key?(name)
-			
-			environments = parents.map{|name| @environments.fetch(name)}
-			
-			parent = Build::Environment.combine(*environments)
-			
-			@environments[name] = Build::Environment.new(parent, name: name, &block)
-		end
-		
-		def each
-			return to_enum unless block_given?
 			
-			@environments.each do |name, environment|
-				if environment.include?(:authority)
-					yield environment
-				end
-			end
-		end
-		
-		def host(name, *parents, &block)
-			add(name, :host, *parents, &block).tap do |environment|
+			def proxy(name, *parents, &block)
+				environment = merge(name, :proxy, *parents, &block)
+				
+				environment[:root] = @root
 				environment[:authority] = name
+				
+				@configuration.add(environment.flatten)
 			end
-		end
-		
-		def proxy(name, *parents, &block)
-			add(name, :proxy, *parents, &block).tap do |environment|
+			
+			def rack(name, *parents, &block)
+				environment = merge(name, :rack, *parents, &block)
+				
+				environment[:root] = @root
 				environment[:authority] = name
+				
+				@configuration.add(environment.flatten)
 			end
-		end
-		
-		def rack(name, *parents, &block)
-			add(name, :rack, *parents, &block).tap do |environment|
-				environment[:authority] = name
+			
+			def supervisor
+				name = File.join(@root, "supervisor")
+				environment = merge(name, :supervisor)
+				
+				environment[:root] = @root
+				
+				@configuration.add(environment.flatten)
+			end
+				
+			private
+			
+			def merge(name, *parents, &block)
+				environments = parents.map{|name| @environments.fetch(name)}
+				
+				parent = Build::Environment.combine(*environments)
+				
+				return Build::Environment.new(parent, name: name, &block)
 			end
-		end
-		
-		def load_file(path)
-			self.instance_eval(File.read(path), File.realpath(path))
 		end
 	end
 end

data/lib/falcon/configurations/host.rb

@@ -0,0 +1,44 @@
+# 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_relative '../proxy_endpoint'
+require_relative '../server'
+
+add(:host) do
+	middleware do
+		::Protocol::HTTP::Middleware::HelloWorld
+	end
+	
+	ipc_path {::File.expand_path("server.ipc", root)}
+	protocol {Async::HTTP::Protocol::HTTP2}
+	scheme 'https'
+	
+	endpoint {::Falcon::ProxyEndpoint.unix(ipc_path, protocol: protocol, scheme: scheme, authority: authority)}
+	
+	bound_endpoint do
+		Async::Reactor.run do
+			Async::IO::SharedEndpoint.bound(endpoint)
+		end.wait
+	end
+	
+	server do
+		::Falcon::Server.new(middleware, bound_endpoint, protocol, scheme)
+	end
+end

data/lib/falcon/configurations/lets_encrypt_tls.rb

@@ -0,0 +1,28 @@
+# 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.
+
+load(:tls)
+
+add(:lets_encrypt_tls, :tls) do
+	lets_encrypt_root '/etc/letsencrypt/live'
+	
+	ssl_certificate_path {File.join(lets_encrypt_root, authority, "fullchain.pem")}
+	ssl_private_key_path {File.join(lets_encrypt_root, authority, "privkey.pem")}
+end

data/lib/falcon/configurations/proxy.rb

@@ -0,0 +1,25 @@
+# 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.
+
+load(:host)
+
+add(:proxy, :host) do
+	endpoint {::Async::HTTP::Endpoint.parse(url)}
+end

data/lib/falcon/configurations/rack.rb

@@ -0,0 +1,31 @@
+# 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.
+
+load :host
+
+add(:rack, :host) do
+	config_path {::File.expand_path("config.ru", root)}
+	
+	middleware do
+		::Falcon::Server.middleware(
+			::Rack::Builder.parse_file(config_path).first, verbose: verbose
+		)
+	end
+end

data/lib/falcon/configurations/self_signed_tls.rb

@@ -0,0 +1,45 @@
+# 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 'localhost/authority'
+
+add(:self_signed_tls) do
+	ssl_session_id {"falcon"}
+	
+	ssl_context do
+		contexts = Localhost::Authority.fetch(authority)
+		
+		contexts.server_context.tap do |context|
+			context.alpn_select_cb = lambda do |protocols|
+				if protocols.include? "h2"
+					return "h2"
+				elsif protocols.include? "http/1.1"
+					return "http/1.1"
+				elsif protocols.include? "http/1.0"
+					return "http/1.0"
+				else
+					return nil
+				end
+			end
+			
+			context.session_id_context = ssl_session_id
+		end
+	end
+end

data/lib/falcon/configurations/supervisor.rb

@@ -0,0 +1,35 @@
+# 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_relative '../supervisor'
+
+add(:supervisor) do
+	start true
+	
+	name "supervisor"
+	
+	ipc_path {::File.expand_path("supervisor.ipc", root)}
+	
+	endpoint {Async::IO::Endpoint.unix(ipc_path)}
+	
+	service do
+		::Falcon::Supervisor.new(endpoint)
+	end
+end

data/lib/falcon/configurations/tls.rb

@@ -0,0 +1,44 @@
+# 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.
+
+add(:tls) do
+	ssl_session_id {"falcon"}
+	
+	ssl_certificate_path {File.expand_path("ssl/certificate.pem", root)}
+	ssl_certificate {OpenSSL::X509::Certificate.new(File.read(ssl_certificate_path))}
+	
+	ssl_private_key_path {File.expand_path("ssl/private.key", root)}
+	ssl_private_key {OpenSSL::PKey::RSA.new(File.read(ssl_private_key_path))}
+	
+	ssl_context do
+		OpenSSL::SSL::SSLContext.new.tap do |context|
+			context.cert = ssl_certificate
+			context.key = ssl_private_key
+			
+			context.session_id_context = ssl_session_id
+			
+			context.set_params(
+				verify_mode: OpenSSL::SSL::VERIFY_NONE,
+			)
+			
+			context.setup
+		end
+	end
+end

data/lib/falcon/host.rb

@@ -18,22 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/endpoint'
-
-require_relative 'proxy'
-require_relative 'redirection'
-
-require 'async/container'
-require 'async/container/controller'
-require 'async/http/endpoint'
+require_relative 'service'
 
 module Falcon
-	class Host
-		def initialize(environment)
-			@environment = environment.flatten
-			@evaluator = @environment.evaluator
-		end
-		
+	class Host < Service
 		def name
 			"Falcon Host for #{self.authority}"
 		end
@@ -62,29 +50,12 @@ module Falcon
 			"\#<#{self.class} #{@evaluator.authority}>"
 		end
 		
-		def assume_privileges(path)
-			stat = File.stat(path)
-			
-			Process::GID.change_privilege(stat.gid)
-			Process::UID.change_privilege(stat.uid)
-		end
-		
-		def spawn(container)
-			container.spawn(name: self.name, restart: true) do |instance|
-				path = File.join(self.root, "falcon.rb")
-				
-				assume_privileges(path)
-				
-				instance.exec("bundle", "exec", path)
-			end
-		end
-		
 		def run(container)
 			if @environment.include?(:server)
 				bound_endpoint = self.bound_endpoint
 				
 				container.run(name: self.name, restart: true) do |task, instance|
-					Async.logger.info(self) {"Starting application server..."}
+					Async.logger.info(self) {"Starting application server, binding to #{self.endpoint}..."}
 					
 					server = @evaluator.server
 					
@@ -92,6 +63,10 @@ module Falcon
 					
 					task.children.each(&:wait)
 				end
+				
+				container.attach do
+					bound_endpoint.close
+				end
 			end
 		end
 	end

data/lib/falcon/hosts.rb

@@ -38,13 +38,13 @@ module Falcon
 			@server_context = nil
 			@server_endpoint = nil
 			
-			configuration.each do |environment|
+			configuration.each(:authority) do |environment|
 				add(Host.new(environment))
 			end
 		end
 		
 		def each(&block)
-			@named.each(&block)
+			@named.each_value(&block)
 		end
 		
 		def endpoint
@@ -100,10 +100,6 @@ module Falcon
 		end
 		
 		def run(container = Async::Container.new, **options)
-			@named.each do |name, host|
-				host.spawn(container)
-			end
-			
 			secure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_secure], ssl_context: self.ssl_context)
 			insecure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_insecure])
 			

data/lib/falcon/proxy_endpoint.rb

@@ -0,0 +1,69 @@
+# 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/unix_endpoint'
+
+module Falcon
+	class ProxyEndpoint < Async::IO::Endpoint
+		def initialize(endpoint, **options)
+			super(**options)
+			
+			@endpoint = endpoint
+		end
+		
+		def to_s
+			"\#<#{self.class} endpoint=#{@endpoint}>"
+		end
+		
+		attr :endpoint
+		
+		def protocol
+			@options[:protocol]
+		end
+		
+		def scheme
+			@options[:scheme]
+		end
+		
+		def authority
+			@options[:authority]
+		end
+		
+		def connect(&block)
+			@endpoint.connect(&block)
+		end
+		
+		def bind(&block)
+			@endpoint.bind(&block)
+		end
+		
+		def each
+			return to_enum unless block_given?
+			
+			@endpoint.each do |endpoint|
+				yield self.class.new(endpoint, @options)
+			end
+		end
+		
+		def self.unix(path, **options)
+			self.new(::Async::IO::Endpoint.unix(path), **options)
+		end
+	end
+end

data/lib/falcon/service.rb

@@ -0,0 +1,53 @@
+# 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 'proxy'
+require_relative 'redirection'
+
+require 'async/container'
+require 'async/container/controller'
+require 'async/http/endpoint'
+
+module Falcon
+	class Service
+		def initialize(environment)
+			@environment = environment
+			@evaluator = @environment.evaluator
+		end
+		
+		def name
+			@evaluator.name
+		end
+		
+		def run(container)
+			container.run(name: self.name, count: 1, restart: true) do |task, instance|
+				Async.logger.info(self) {"Starting #{self.name}..."}
+				
+				if service = @evaluator.service
+					service.run
+				else
+					Async.logger.error(self) {"Could not determine how to start service: #{@environment.inspect}"}
+				end
+			end
+		end
+	end
+end

data/lib/falcon/services.rb

@@ -0,0 +1,49 @@
+# 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_relative 'service'
+
+module Falcon
+	class Services
+		def initialize(configuration)
+			@named = {}
+			
+			configuration.each(:start) do |environment|
+				add(Service.new(environment))
+			end
+		end
+		
+		def each(&block)
+			@named.each_value(&block)
+		end
+		
+		def add(service)
+			@named[service.name] = service
+		end
+		
+		def run(container = Async::Container.new, **options)
+			@named.each do |name, service|
+				service.spawn(container)
+			end
+			
+			return container
+		end
+	end
+end

data/lib/falcon/supervisor.rb

@@ -0,0 +1,106 @@
+# 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 'proxy'
+require_relative 'redirection'
+
+require 'async/container'
+require 'async/container/controller'
+require 'async/http/endpoint'
+
+module Falcon
+	class Supervisor
+		class Statistics
+			PS = "ps"
+			
+			def initialize(pgid: Process.ppid, ps: PS)
+				@ppid = pgid
+				@ps = ps
+			end
+			
+			# pid: Process Identifier
+			# pmem: Percentage Memory used.
+			# pcpu: Percentage Processor used.
+			# time: The process time used (executing on CPU).
+			# vsz: Virtual Size in kilobytes
+			# rss: Resident Set Size in kilobytes
+			# etime: The process elapsed time.
+			# command: The name of the process.
+			COLUMNS = "pid,pmem,pcpu,time,vsz,rss,etime,command"
+			
+			def capture
+				input, output = IO.pipe
+				
+				system(@ps, "--ppid", @ppid.to_s, "-o", COLUMNS, out: output, pgroup: true)
+				output.close
+				
+				header, *lines = input.readlines.map(&:strip)
+				
+				keys = header.split(/\s+/).map(&:downcase)
+				
+				processes = lines.map do |line|
+					keys.zip(line.split(/\s+/, keys.count)).to_h
+				end
+				
+				return processes
+			end
+		end
+		
+		def initialize(endpoint)
+			@endpoint = endpoint
+		end
+		
+		def restart(message)
+			signal = message[:signal] || :INT
+			
+			# Sepukku:
+			Process.kill(signal, -Process.getpgrp)
+		end
+		
+		def statistics(message)
+			statistics = Statistics.new
+			
+			statistics.capture
+		end
+		
+		def handle(message)
+			case message[:please]
+			when 'restart'
+				self.restart(message)
+			when 'statistics'
+				self.statistics(message)
+			end
+		end
+		
+		def run
+			Async.logger.info("Binding to #{@endpoint}")
+			@endpoint.accept do |peer|
+				stream = Async::IO::Stream.new(peer)
+				
+				while message = stream.gets("\0")
+					response = handle(JSON.parse(message, symbolize_names: true))
+					stream.puts(response.to_json, separator: "\0")
+				end
+			end
+		end
+	end
+end

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -114,28 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: trenni
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -280,14 +266,26 @@ files:
 - lib/falcon/command.rb
 - lib/falcon/command/host.rb
 - lib/falcon/command/serve.rb
+- lib/falcon/command/supervisor.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/endpoint.rb
 - lib/falcon/host.rb
 - lib/falcon/hosts.rb
 - lib/falcon/proxy.rb
+- lib/falcon/proxy_endpoint.rb
 - lib/falcon/redirection.rb
 - lib/falcon/server.rb
+- lib/falcon/service.rb
+- lib/falcon/services.rb
+- lib/falcon/supervisor.rb
 - lib/falcon/verbose.rb
 - lib/falcon/version.rb
 - lib/rack/handler/falcon.rb