RubyGems - falcon - Versions diffs - 0.34.5 → 0.35.0 - Mend

falcon 0.34.5 → 0.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

checksums.yaml +4 -4
data/.travis.yml +3 -2
data/Gemfile +2 -0
data/bin/falcon +1 -1
data/bin/falcon-host +1 -1
data/examples/beer/config.ru +25 -23
data/examples/beer/falcon.rb +2 -0
data/examples/hello/config.ru +1 -1
data/examples/hello/falcon.rb +14 -2
data/examples/hello/preload.rb +6 -0
data/examples/trailers/config.ru +33 -0
data/examples/trailers/falcon.rb +7 -0
data/falcon.gemspec +3 -1
data/lib/falcon.rb +0 -4
data/lib/falcon/adapters/response.rb +2 -2
data/lib/falcon/command.rb +3 -53
data/lib/falcon/command/host.rb +22 -39
data/lib/falcon/command/paths.rb +45 -0
data/lib/falcon/{host.rb → command/proxy.rb} +39 -45
data/lib/falcon/command/redirect.rb +72 -0
data/lib/falcon/command/serve.rb +28 -58
data/lib/falcon/command/supervisor.rb +5 -5
data/lib/falcon/command/top.rb +79 -0
data/lib/falcon/command/virtual.rb +18 -53
data/lib/falcon/configuration.rb +1 -1
data/lib/falcon/{configurations/host.rb → configuration/application.rb} +13 -11
data/lib/falcon/{configurations → configuration}/lets_encrypt_tls.rb +0 -0
data/lib/falcon/{configurations → configuration}/proxy.rb +2 -2
data/lib/falcon/{configurations → configuration}/rack.rb +2 -2
data/lib/falcon/{configurations → configuration}/self_signed_tls.rb +0 -0
data/lib/falcon/{configurations → configuration}/supervisor.rb +2 -2
data/lib/falcon/{configurations → configuration}/tls.rb +0 -0
data/lib/falcon/controller/host.rb +58 -0
data/lib/falcon/controller/proxy.rb +102 -0
data/lib/falcon/{service.rb → controller/redirect.rb} +37 -24
data/lib/falcon/controller/serve.rb +112 -0
data/lib/falcon/controller/virtual.rb +89 -0
data/lib/falcon/middleware/proxy.rb +143 -0
data/lib/falcon/{redirection.rb → middleware/redirect.rb} +31 -29
data/lib/falcon/proxy_endpoint.rb +1 -1
data/lib/falcon/service/application.rb +113 -0
data/lib/falcon/service/generic.rb +53 -0
data/lib/falcon/service/supervisor.rb +95 -0
data/lib/falcon/services.rb +32 -5
data/lib/falcon/version.rb +1 -1
data/lib/rack/handler/falcon.rb +2 -1
data/logo-square.afdesign +0 -0
metadata +43 -17
data/lib/falcon/hosts.rb +0 -135
data/lib/falcon/proxy.rb +0 -141
data/lib/falcon/supervisor.rb +0 -106

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f640e30a68a5dd3b923da93eafd29efde45370c6bad1c3cf92d0a43e11dd016
-  data.tar.gz: 23cc00d9299c5d0ae67f9fa12746fc263c003f300b9d598048b46faf6064476c
+  metadata.gz: 5c3bb4c2f18d6b7005093348a0a91bb477ce212a286fef49179f8b3ad9f429b7
+  data.tar.gz: 7571194deea1618ee129e8e70361758b3af7eb843ef68669a6c1adc839ae756e
 SHA512:
-  metadata.gz: 97e38f0048e75ca73ceb06c18a5bc80d66f8d9624216cd76a7fe7fac65444758f17dbffb28e10581d8c7b90a9e0c12ad6a17538efa4d994904699c135868c191
-  data.tar.gz: 0da2a193a2f63ea1f48b7d328ae51b5745777fb688799347caf4697dfea233b6c5a09fa42207464d326c4bf052336eb932ac051d1016c49fa64efbccf4e794a4
+  metadata.gz: 5b152cd97f1460687e7c6672347c96e66771fd66fabbd65d5220005c50b5f067aec3d05594e07389752d4e1ef7e2526b384a15b6d9b17b3449222e99909b186b
+  data.tar.gz: 6d91a871d7b11010d3b4be9e9119346e401491ce087a8e0ee353b3eb9942e301136f1da02b92b3f575a4cc8d6b8d33b6dccc1fac03d49561ad330a44030990db

data/.travis.yml CHANGED

@@ -24,12 +24,13 @@ matrix:
     - rvm: 2.6
       gemfile: gems/rack3.gemfile
     - rvm: 2.6
-      env: COVERAGE=Summary,Coveralls
+      env: COVERAGE=PartialSummary,Coveralls
+    - rvm: 2.7
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
-    - rvm: 2.6
+    - rvm: 2.7
       os: osx
   allow_failures:
     - rvm: truffleruby

data/Gemfile CHANGED

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 gemspec
+# gem "async-container", path: "../async-container"
 group :development do
 	gem 'ruby-prof', platform: :mri
 end

data/bin/falcon CHANGED

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require_relative '../lib/falcon'
+require_relative '../lib/falcon/command'
 begin
 	Falcon::Command.call

data/bin/falcon-host CHANGED

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require_relative '../lib/falcon'
+require_relative '../lib/falcon/command/host'
 begin
 	Falcon::Command::Host.call

data/examples/beer/config.ru CHANGED

@@ -23,31 +23,33 @@ run lambda {|env|
 	body.write("<!DOCTYPE html><html><head><title>#{count} Bottles of Beer</title></head><body>")
 	task.async do |task|
-		body.write(COMMENT)
-		count.downto(1) do |i|
-			task.annotate "bottles of beer #{i}"
+		begin
+			body.write(COMMENT)
-			Async.logger.info(body) {"#{bottles(i)} of beer on the wall..."}
-			body.write("<p>#{bottles(i)} of beer on the wall, ")
-			task.sleep(0.1)
-			body.write("#{bottles(i)} of beer, ")
-			task.sleep(0.1)
-			body.write("take one down and pass it around, ")
-			task.sleep(0.1)
-			body.write("#{bottles(i-1)} of beer on the wall.</p>")
-			task.sleep(0.1)
-			body.write("<script>var child; while (child = document.body.firstChild) child.remove();</script>")
+			count.downto(1) do |i|
+				task.annotate "bottles of beer #{i}"
+				Async.logger.info(body) {"#{bottles(i)} of beer on the wall..."}
+				body.write("<p>#{bottles(i)} of beer on the wall, ")
+				task.sleep(0.1)
+				body.write("#{bottles(i)} of beer, ")
+				task.sleep(0.1)
+				body.write("take one down and pass it around, ")
+				task.sleep(0.1)
+				body.write("#{bottles(i-1)} of beer on the wall.</p>")
+				task.sleep(0.1)
+				body.write("<script>var child; while (child = document.body.firstChild) child.remove();</script>")
+			end
+			code = File.read(__FILE__)
+			body.write("<h1>Source Code</h1>")
+			body.write("<pre><code>#{CGI.escapeHTML code}</code></pre>")
+			body.write("</body></html>")
+		rescue
+			puts "Remote end closed connection: #{$!}"
+		ensure
+			body.close
 		end
-		code = File.read(__FILE__)
-		body.write("<h1>Source Code</h1>")
-		body.write("<pre><code>#{CGI.escapeHTML code}</code></pre>")
-		body.write("</body></html>")
-	rescue
-		puts "Remote end closed connection: #{$!}"
-	ensure
-		body.close
 	end
 	[200, {'content-type' => 'text/html; charset=utf-8'}, body]

data/examples/beer/falcon.rb CHANGED

@@ -3,3 +3,5 @@
 load :rack, :self_signed_tls, :supervisor
 rack 'beer.localhost', :self_signed_tls
+supervisor

data/examples/hello/config.ru CHANGED

@@ -8,7 +8,7 @@ class RequestLogger
 	end
 	def call(env)
-		logger = Async.logger.with(level: :debug, name: "middleware")
+		logger = Async.logger.with(level: :debug)
 		Async(logger: logger) do
 			@app.call(env)

data/examples/hello/falcon.rb CHANGED

@@ -2,10 +2,22 @@
 load :rack, :self_signed_tls, :supervisor
-rack 'hello.localhost', :self_signed_tls
 supervisor
+rack 'hello.localhost', :self_signed_tls do
+	# scheme 'http'
+	# protocol {Async::HTTP::Protocol::HTTP1}
+	#
+	# endpoint do
+	# 	Async::HTTP::Endpoint.for(scheme, "localhost", port: 9292, protocol: protocol)
+	# end
+	append preload "preload.rb"
+	# Process will connect to supervisor to report statistics periodically, otherwise it would be killed.
+	# report :supervisor
+end
 # service 'jobs' do
 # 	shell ['rake', 'background:jobs:process']
 # end

data/examples/hello/preload.rb ADDED

@@ -0,0 +1,6 @@
+if GC.respond_to?(:compact)
+	Async.logger.warn(self, "Compacting the mainframe...")
+	GC.compact
+	Async.logger.warn(self, "Compacting done...")
+end

data/examples/trailers/config.ru ADDED

@@ -0,0 +1,33 @@
+#!/usr/bin/env falcon --verbose serve -c
+require 'async'
+class RequestLogger
+	def initialize(app)
+		@app = app
+	end
+	def call(env)
+		logger = Async.logger.with(level: :debug, name: "middleware")
+		Async(logger: logger) do
+			@app.call(env)
+		end.wait
+	end
+end
+use RequestLogger
+run lambda {|env|
+	start_time = Async::Clock.now
+	server_timing = ->{
+		"app;dur=#{Async::Clock.now - start_time}"
+	}
+	[
+		200,
+		[["trailers", "server-timing"], ["server-timing", server_timing]],
+		["Hello World"]
+	]
+}

data/examples/trailers/falcon.rb ADDED

@@ -0,0 +1,7 @@
+#!/usr/bin/env falcon-host
+load :rack, :self_signed_tls, :supervisor
+rack 'trailers.localhost', :self_signed_tls
+supervisor

data/falcon.gemspec CHANGED

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 1.13"
 	spec.add_dependency "async-io", "~> 1.22"
 	spec.add_dependency "async-http", "~> 0.50.0"
-	spec.add_dependency "async-container", "~> 0.14.0"
+	spec.add_dependency "async-container", "~> 0.16.0"
 	spec.add_dependency "rack", ">= 1.0"
@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'localhost', "~> 1.1"
 	spec.add_dependency 'build-environment', '~> 1.11'
+	spec.add_dependency 'process-metrics', '~> 0.1.0'
 	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.rb CHANGED

@@ -18,8 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require_relative "falcon/command"
 require_relative "falcon/server"
-require_relative 'falcon/hosts'
-require_relative 'falcon/proxy'

data/lib/falcon/adapters/response.rb CHANGED

@@ -20,7 +20,7 @@
 require_relative 'output'
 require_relative '../version'
-require_relative '../proxy'
+require_relative '../middleware/proxy'
 require 'async/http/body/hijack'
 require 'time'
@@ -28,7 +28,7 @@ require 'time'
 module Falcon
 	module Adapters
 		class Response < ::Protocol::HTTP::Response
-			IGNORE_HEADERS = Proxy::HOP_HEADERS
+			IGNORE_HEADERS = Middleware::Proxy::HOP_HEADERS
 			# Append a list of newline encoded headers.
 			def self.wrap_headers(fields)

data/lib/falcon/command.rb CHANGED

@@ -18,62 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require_relative 'command/serve'
-require_relative 'command/virtual'
-require_relative 'command/host'
-require_relative 'command/supervisor'
-require_relative 'version'
-require 'samovar'
+require_relative 'command/top'
 module Falcon
 	module Command
-		def self.call(*args)
-			Top.call(*args)
-		end
-		class Top < Samovar::Command
-			self.description = "An asynchronous HTTP server."
-			options do
-				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
-				option '-h/--help', "Print out help information."
-				option '-v/--version', "Print out the application version."
-			end
-			nested :command, {
-				'serve' => Serve,
-				'virtual' => Virtual,
-				'host' => Host,
-				'supervisor' => Supervisor
-			}, default: 'serve'
-			def verbose?
-				@options[:logging] == :verbose
-			end
-			def quiet?
-				@options[:logging] == :quiet
-			end
-			def call
-				if verbose?
-					Async.logger.debug!
-				elsif quiet?
-					Async.logger.warn!
-				else
-					Async.logger.info!
-				end
-				if @options[:version]
-					puts "#{self.name} v#{Falcon::VERSION}"
-				elsif @options[:help]
-					self.print_usage
-				else
-					@command.call
-				end
-			end
+		def self.call(*arguments)
+			Top.call(*arguments)
 		end
 	end
 end

data/lib/falcon/command/host.rb CHANGED

@@ -18,63 +18,46 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require_relative '../server'
-require_relative '../endpoint'
+require_relative '../controller/host'
 require_relative '../configuration'
-require_relative '../hosts'
-require_relative '../services'
-require 'async/container'
-require 'async/container/controller'
-require 'async/io/host_endpoint'
-require 'async/io/shared_endpoint'
-require 'async/io/ssl_endpoint'
 require 'samovar'
-require 'rack/builder'
-require 'rack/server'
 module Falcon
 	module Command
 		class Host < Samovar::Command
-			self.description = "Run a specific virtual host."
+			self.description = "Host the specified applications."
-			one :path, "A path specified if running from a script."
+			many :paths, "Service configuration paths.", default: ["falcon.rb"]
-			def assume_privileges(path)
-				stat = File.stat(path)
-				Process::GID.change_privilege(stat.gid)
-				Process::UID.change_privilege(stat.uid)
+			def container_class
+				Async::Container.best_container_class
 			end
-			def run(container, verbose = false)
+			def configuration(verbose = false)
 				configuration = Configuration.new(verbose)
-				configuration.load_file(@path)
-				Async.logger.info(self) {"Starting services described by #{@path}..."}
-				assume_privileges(@path)
-				hosts = Hosts.new(configuration)
-				hosts.each do |host|
-					host.run(container)
+				@paths.each do |path|
+					path = File.expand_path(path)
+					configuration.load_file(path)
 				end
-				services = Services.new(configuration)
-				services.each do |service|
-					service.run(container)
-				end
-				return container
+				return configuration
 			end
-			def call(container = Async::Container.new)
-				container = run(container, parent&.verbose?)
+			def controller
+				Controller::Host.new(self)
+			end
+			def call
+				Async.logger.info(self) do |buffer|
+					buffer.puts "Falcon Host v#{VERSION} taking flight!"
+					buffer.puts "- Configuration: #{@paths.join(', ')}"
+					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
+					buffer.puts "- To reload all sites: kill -HUP #{Process.pid}"
+				end
-				container.wait(true)
+				self.controller.run
 			end
 		end
 	end

data/lib/falcon/command/paths.rb ADDED

@@ -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_relative '../configuration'
+module Falcon
+	module Command
+		module Paths
+			def resolved_paths(&block)
+				@paths.collect do |path|
+					Dir.glob(path)
+				end.flatten.sort.uniq.each(&block)
+			end
+			def configuration
+				configuration = Configuration.new
+				self.resolved_paths.each do |path|
+					path = File.expand_path(path)
+					configuration.load_file(path)
+				end
+				return configuration
+			end
+		end
+	end
+end