async-http 0.0.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83321e752ca55286b8558d3135b5af2f367d8191
-  data.tar.gz: aef2d3a44c36bd25e9bb8f389138b78f2b056ed6
+  metadata.gz: e71a596dc1dee6c4eab53691aa115ca3131f7af6
+  data.tar.gz: 46ed7eb01476eb5e2296a81f4e3dccb9c6c42eba
 SHA512:
-  metadata.gz: 7777ced365d9b9d2fe40eea4944bec10c2b2cdc119d86f8e59aac047eb30b30a07ca1a1ae31e67e4f4e8984c08c55b1637954c4e5be6c2fb365af8b3676d786a
-  data.tar.gz: a70e8f5f7198c6928227f2f3234fd3a59e30ba90510fee9d09dc64dbe919f6207fa37323eeca936d5cf737a9b4e75f619340ddc2e8f75e315b48e7b574532ed4
+  metadata.gz: 4c978a492a58171e6fb5009af835aabf11ee44d9b1ca27dc4a003782210b51ced1d83fe9f1aef6fb916660fe92a63c009eb70db6a0a6af0381b93116447d7f5c
+  data.tar.gz: aa00d677dfb29f8ff334ee6d664e42c37cc8b31b75483bda223842f9245f94e91a2a1a56c54c30292fdc71bae4184250dbe605fb44532ce6f1a0f35fe0933521

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ext/http-parser"]
+	path = ext/http-parser
+	url = https://github.com/nodejs/http-parser

data/.rspec

@@ -1,4 +1,3 @@
---color
 --format documentation
 --warnings
 --require spec_helper

data/.travis.yml

@@ -2,18 +2,17 @@ language: ruby
 sudo: false
 dist: trusty
 cache: bundler
-addons:
-  apt:
-    packages:
-    - bind9
 rvm:
+  - 2.0
   - 2.1
   - 2.2
   - 2.3
   - 2.4
-  - ruby-head
   - jruby-head
+  - ruby-head
+  - rbx-3
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head
+    - rvm: rbx-3

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in async-http.gemspec
+# Specify your gem's dependencies in async-io.gemspec
 gemspec
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -1,11 +1,16 @@
 # Async::HTTP
 
-Asynchornous HTTP Client/Server. Currently unimplemented.
+A multi-process, multi-fiber HTTP client/server built on top of [async] and [async-io]. Each request is run within a light weight fiber and can block on up-stream requests without stalling the entire server process.
+
+*This code is a proof-of-concept and not intended (yet) for production use.* The entire stack requires more scrutiny both in terms of performance and security.
 
 [![Build Status](https://secure.travis-ci.org/socketry/async-http.svg)](http://travis-ci.org/socketry/async-http)
 [![Code Climate](https://codeclimate.com/github/socketry/async-http.svg)](https://codeclimate.com/github/socketry/async-http)
 [![Coverage Status](https://coveralls.io/repos/socketry/async-http/badge.svg)](https://coveralls.io/r/socketry/async-http)
 
+[async]: https://github.com/socketry/async
+[async-io]: https://github.com/socketry/async-io
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,7 +29,112 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Here is a basic example of a client/server running in the same reactor:
+
+```ruby
+require 'async/http/server'
+require 'async/http/client'
+require 'async/reactor'
+
+server_addresses = [
+	Async::IO::Address.tcp('127.0.0.1', 9294, reuse_port: true)
+]
+
+app = lambda do |env|
+	[200, {}, ["Hello World"]]
+end
+
+server = Async::HTTP::Server.new(server_addresses, app)
+client = Async::HTTP::Client.new(server_addresses)
+	
+Async::Reactor.run do |task|
+	server_task = task.async do
+		server.run
+	end
+	
+	response = client.get("/", {})
+	puts response.body
+	
+	server_task.stop
+end
+```
+
+## Performance
+
+On a 4-core 8-thread i7, running `ab` which uses discrete (non-keep-alive) connections:
+
+```
+$ ab -c 8 -t 10 http://127.0.0.1:9294/
+This is ApacheBench, Version 2.3 <$Revision: 1757674 $>
+Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
+Licensed to The Apache Software Foundation, http://www.apache.org/
+
+Benchmarking 127.0.0.1 (be patient)
+Completed 5000 requests
+Completed 10000 requests
+Completed 15000 requests
+Completed 20000 requests
+Completed 25000 requests
+Completed 30000 requests
+Completed 35000 requests
+Completed 40000 requests
+Completed 45000 requests
+Completed 50000 requests
+Finished 50000 requests
+
+
+Server Software:        
+Server Hostname:        127.0.0.1
+Server Port:            9294
+
+Document Path:          /
+Document Length:        13 bytes
+
+Concurrency Level:      8
+Time taken for tests:   1.869 seconds
+Complete requests:      50000
+Failed requests:        0
+Total transferred:      2450000 bytes
+HTML transferred:       650000 bytes
+Requests per second:    26755.55 [#/sec] (mean)
+Time per request:       0.299 [ms] (mean)
+Time per request:       0.037 [ms] (mean, across all concurrent requests)
+Transfer rate:          1280.29 [Kbytes/sec] received
+
+Connection Times (ms)
+              min  mean[+/-sd] median   max
+Connect:        0    0   0.0      0       0
+Processing:     0    0   0.2      0       6
+Waiting:        0    0   0.2      0       6
+Total:          0    0   0.2      0       6
+
+Percentage of the requests served within a certain time (ms)
+  50%      0
+  66%      0
+  75%      0
+  80%      0
+  90%      0
+  95%      1
+  98%      1
+  99%      1
+ 100%      6 (longest request)
+```
+
+On a 4-core 8-thread i7, running `wrk`, which uses 8 keep-alive connections:
+
+```
+$ wrk -c 8 -d 10 -t 8 http://127.0.0.1:9294/
+Running 10s test @ http://127.0.0.1:9294/
+  8 threads and 8 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency   217.69us    0.99ms  23.21ms   97.39%
+    Req/Sec    12.18k     1.58k   17.67k    83.21%
+  974480 requests in 10.10s, 60.41MB read
+Requests/sec:  96485.00
+Transfer/sec:      5.98MB
+```
+
+According to these results, the cost of handling connections is quite high, while general throughput seems pretty decent.
 
 ## Contributing
 

data/Rakefile

@@ -4,3 +4,68 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:test)
 
 task :default => :test
+
+task :server do
+	require 'async/reactor'
+	require 'async/http/server'
+	
+	app = lambda do |env|
+		[200, {}, ["Hello World"]]
+	end
+
+	server = Async::HTTP::Server.new([
+		Async::IO::Address.tcp('127.0.0.1', 9294, reuse_port: true)
+	], app)
+
+	Async::Reactor.run do
+		server.run
+	end
+end
+
+task :client do
+	require 'async/reactor'
+	require 'async/http/client'
+	
+	client = Async::HTTP::Client.new([
+		Async::IO::Address.tcp('127.0.0.1', 9294, reuse_port: true)
+	])
+	
+	Async::Reactor.run do
+		response = client.get("/")
+		
+		puts response.inspect
+	end
+end
+
+task :wrk do
+	require 'async/reactor'
+	require 'async/http/server'
+	
+	app = lambda do |env|
+		[200, {}, ["Hello World"]]
+	end
+
+	server = Async::HTTP::Server.new([
+		Async::IO::Address.tcp('127.0.0.1', 9294, reuse_port: true)
+	], app)
+
+	process_count = Etc.nprocessors
+
+	pids = process_count.times.collect do
+		fork do
+			Async::Reactor.run do
+				server.run
+			end
+		end
+	end
+
+	url = "http://127.0.0.1:9294/"
+	
+	connections = process_count
+	system("wrk", "-c", connections.to_s, "-d", "2", "-t", connections.to_s, url)
+
+	pids.each do |pid|
+		Process.kill(:KILL, pid)
+		Process.wait pid
+	end
+end

data/async-http.gemspec

@@ -2,23 +2,25 @@
 require_relative 'lib/async/http/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "async-http"
-  spec.version       = Async::HTTP::VERSION
-  spec.authors       = ["Samuel Williams"]
-  spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.name          = "async-http"
+	spec.version       = Async::HTTP::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
 
-  spec.summary       = ""
-  spec.homepage      = "https://github.com/socketry/async-http"
+	spec.summary       = ""
+	spec.homepage      = "https://github.com/socketry/async-http"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+	spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+		f.match(%r{^(test|spec|features)/})
+	end
+	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	spec.require_paths = ["lib"]
 
-  spec.add_dependency("async-io", "~> 0.1")
+	spec.add_dependency("async-io", "~> 0.4")
 	
-	spec.add_development_dependency "async-rspec", "~> 1.0"
+	spec.add_dependency('samovar', "~> 1.3")
+	
+	spec.add_development_dependency "async-rspec", "~> 1.1"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.6"

data/lib/async/http.rb

@@ -19,9 +19,3 @@
 # THE SOFTWARE.
 
 require "async/http/version"
-
-module Async
-	module HTTP
-		# Your code goes here...
-	end
-end

data/lib/async/http/client.rb

@@ -0,0 +1,59 @@
+# Copyright, 2017, 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/address'
+
+require_relative 'protocol'
+
+module Async
+	module HTTP
+		class Client
+			def initialize(addresses, protocol_class = Protocol::HTTP11)
+				@addresses = addresses
+				
+				@protocol_class = protocol_class
+			end
+			
+			GET = 'GET'.freeze
+			
+			def get(path, headers = {})
+				connect do |protocol|
+					protocol.send_request(GET, path, headers)
+				end
+			end
+			
+			private
+			
+			def connect
+				Async::IO::Address.each(@addresses) do |address|
+					# puts "Connecting to #{address} on process #{Process.pid}"
+					
+					address.connect do |peer|
+						stream = Async::IO::Stream.new(peer)
+						
+						# We only yield for first successful connection.
+						
+						return yield @protocol_class.new(stream)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol.rb

@@ -0,0 +1,21 @@
+# Copyright, 2017, 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 'protocol/http1x'

data/lib/async/http/protocol/http10.rb

@@ -0,0 +1,70 @@
+# Copyright, 2017, 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 'http11'
+
+require_relative 'request'
+require_relative 'response'
+
+module Async
+	module HTTP
+		module Protocol
+			# Implements basic HTTP/1.1 request/response.
+			class HTTP10 < HTTP11
+				VERSION = "HTTP/1.0".freeze
+				
+				def version
+					VERSION
+				end
+				
+				def keep_alive?(headers)
+					headers[HTTP_CONNECTION] == KEEP_ALIVE
+				end
+				
+				# Server loop.
+				def receive_requests
+					while request = Request.new(*self.read_request)
+						status, headers, body = yield request
+						
+						write_response(request.version, status, headers, body)
+						
+						break unless keep_alive?(request.headers) && keep_alive?(headers)
+					end
+				end
+				
+				def write_body(body, chunked = true)
+					buffer = String.new
+					body.each{|chunk| buffer << chunk}
+						
+					@stream.write("Content-Length: #{buffer.bytesize}\r\n\r\n")
+					@stream.write(buffer)
+				end
+				
+				def read_body(headers)
+					if content_length = headers[HTTP_CONTENT_LENGTH]
+						return @stream.read(Integer(content_length))
+					# elsif !keep_alive?(headers)
+					# 	return @stream.read
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http11.rb

@@ -0,0 +1,182 @@
+# Copyright, 2017, 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/protocol/line'
+
+require_relative 'request'
+require_relative 'response'
+
+module Async
+	module HTTP
+		module Protocol
+			# Implements basic HTTP/1.1 request/response.
+			class HTTP11 < Async::IO::Protocol::Line
+				HTTP_CONTENT_LENGTH = 'HTTP_CONTENT_LENGTH'.freeze
+				HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'.freeze
+				
+				CRLF = "\r\n".freeze
+				
+				def initialize(stream)
+					super(stream, CRLF)
+				end
+				
+				HTTP_CONNECTION = 'HTTP_CONNECTION'.freeze
+				KEEP_ALIVE = 'keep-alive'.freeze
+				CLOSE = 'close'.freeze
+				
+				VERSION = "HTTP/1.1".freeze
+				
+				def version
+					VERSION
+				end
+				
+				def keep_alive?(headers)
+					headers[HTTP_CONNECTION] != CLOSE
+				end
+				
+				# Server loop.
+				def receive_requests
+					while request = Request.new(*read_request)
+						status, headers, body = yield request
+						
+						write_response(request.version, status, headers, body)
+						
+						break unless keep_alive?(request.headers) && keep_alive?(headers)
+					end
+					
+				rescue EOFError, Errno::ECONNRESET
+					return nil
+				end
+				
+				# Client request.
+				def send_request(method, path, headers, body = [])
+					write_request(method, path, version, headers, body)
+					
+					return Response.new(*read_response)
+				
+				rescue EOFError
+					return nil
+				end
+				
+				def write_request(method, path, version, headers, body)
+					@stream.write("#{method} #{path} #{version}\r\n")
+					write_headers(headers)
+					write_body(body)
+					
+					@stream.flush
+					
+					return true
+				end
+				
+				def read_response
+					version, status, reason = read_line.split(/\s+/, 3)
+					headers = read_headers
+					body = read_body(headers)
+					
+					return version, Integer(status), reason, headers, body
+				end
+				
+				def read_request
+					method, path, version = read_line.split(/\s+/, 3)
+					headers = read_headers
+					body = read_body(headers)
+					
+					return method, path, version, headers, body
+				end
+				
+				def write_response(version, status, headers, body)
+					@stream.write("#{version} #{status}\r\n")
+					write_headers(headers)
+					write_body(body)
+					
+					@stream.flush
+					
+					return true
+				end
+				
+				protected
+				
+				def write_headers(headers)
+					headers.each do |name, value|
+						@stream.write("#{name}: #{value}\r\n")
+					end
+				end
+				
+				def read_headers(headers = {})
+					# Parsing headers:
+					each_line do |line|
+						if line =~ /^([a-zA-Z\-]+):\s*(.+?)\s*$/
+							headers["HTTP_#{$1.tr('-', '_').upcase}"] = $2
+						else
+							break
+						end
+					end
+					
+					return headers
+				end
+				
+				def write_body(body, chunked = true)
+					if chunked
+						@stream.write("Transfer-Encoding: chunked\r\n\r\n")
+						
+						body.each do |chunk|
+							next if chunk.size == 0
+							
+							@stream.write("#{chunk.bytesize.to_s(16).upcase}\r\n")
+							@stream.write(chunk)
+							@stream.write(CRLF)
+						end
+						
+						@stream.write("0\r\n\r\n")
+					else
+						buffer = String.new
+						body.each{|chunk| buffer << chunk}
+						
+						@stream.write("Content-Length: #{chunk.bytesize}\r\n\r\n")
+						@stream.write(chunk)
+					end
+				end
+				
+				def read_body(headers)
+					if headers[HTTP_TRANSFER_ENCODING] == 'chunked'
+						buffer = Async::IO::BinaryString.new
+						
+						while true
+							size = read_line.to_i(16)
+							
+							if size == 0
+								read_line
+								break
+							end
+							
+							buffer << @stream.read(size)
+							
+							read_line # Consume the trailing CRLF
+						end
+						
+						return buffer
+					elsif content_length = headers[HTTP_CONTENT_LENGTH]
+						return @stream.read(Integer(content_length))
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http1x.rb

@@ -0,0 +1,65 @@
+# Copyright, 2017, 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 'http10'
+require_relative 'http11'
+
+module Async
+	module HTTP
+		module Protocol
+			# A server that supports both HTTP1.0 and HTTP1.1 semantics by detecting the version of the request.
+			class HTTP1x < Async::IO::Protocol::Line
+				HANDLERS = {
+					"HTTP/1.0" => HTTP10,
+					"HTTP/1.1" => HTTP11,
+				}
+				
+				def initialize(stream, handlers: HANDLERS)
+					super(stream, HTTP11::CRLF)
+					
+					@handlers = handlers
+					
+					@handler = nil
+				end
+				
+				def create_handler(version)
+					if klass = @handlers[version]
+						klass.new(@stream)
+					else
+						raise RuntimeError, "Unsupported protocol version #{version}"
+					end
+				end
+				
+				def receive_requests(&block)
+					method, path, version = self.peek_line.split(/\s+/, 3)
+					
+					create_handler(version).receive_requests(&block)
+					
+				rescue EOFError, Errno::ECONNRESET
+					return nil
+				end
+				
+				def send_request(request, &block)
+					create_handler(request.version).send_request(request, &block)
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/request.rb

@@ -0,0 +1,31 @@
+# Copyright, 2017, 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.
+
+module Async
+	module HTTP
+		module Protocol
+			class Request < Struct.new(:method, :path, :version, :headers, :body)
+				def read
+					@body
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/response.rb

@@ -0,0 +1,43 @@
+# Copyright, 2017, 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.
+
+module Async
+	module HTTP
+		module Protocol
+			class Response < Struct.new(:version, :status, :reason, :headers, :body)
+				def continue?
+					status == 100
+				end
+				
+				def success?
+					status >= 200 && status < 300
+				end
+				
+				def redirection?
+					status >= 300 && status < 400
+				end
+				
+				def failure?
+					status >= 400 && status < 600
+				end
+			end
+		end
+	end
+end

data/lib/async/http/server.rb

@@ -17,3 +17,48 @@
 # 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/address'
+
+require_relative 'protocol'
+
+module Async
+	module HTTP
+		class Server
+			def initialize(addresses, protocol_class = Protocol::HTTP1x)
+				@addresses = addresses
+				@protocol_class = protocol_class
+			end
+			
+			def handle_request(request, peer, address)
+				[200, {}, []]
+			end
+			
+			def run
+				Async::IO::Address.each(@addresses) do |address|
+					# puts "Binding to #{address} on process #{Process.pid}"
+					
+					address.accept do |peer|
+						stream = Async::IO::Stream.new(peer)
+						
+						protocol = @protocol_class.new(stream)
+						
+						# puts "Opening session on child pid #{Process.pid}"
+						
+						hijack = catch(:hijack) do
+							protocol.receive_requests do |request|
+								handle_request(request, peer, address)
+							end
+						end
+
+						if hijack
+							hijack.call
+						end
+
+						# puts "Closing session"
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.0.0"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: samovar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,15 +102,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - async-http.gemspec
-- bin/console
-- bin/setup
 - lib/async/http.rb
+- lib/async/http/client.rb
+- lib/async/http/protocol.rb
+- lib/async/http/protocol/http10.rb
+- lib/async/http/protocol/http11.rb
+- lib/async/http/protocol/http1x.rb
+- lib/async/http/protocol/request.rb
+- lib/async/http/protocol/response.rb
 - lib/async/http/server.rb
 - lib/async/http/version.rb
 homepage: https://github.com/socketry/async-http

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "async/http"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here