async-http 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa49b687eb945cd14b93ae8f77eb75d0c225fe7b22fba5eb861e46893673388
-  data.tar.gz: e1f7785a689202683b11a84a01a6cc9a09ebefe52ebc77af935cb1e03f8fb171
+  metadata.gz: 29e346514b130a63e1de8fc367ff5f85ae00469e3c9e7b41790a78381efa5a41
+  data.tar.gz: 43b4568e84df9e1c2f836dece89bb569cbf777fe5bcf81f82850b1e36c8f4a0a
 SHA512:
-  metadata.gz: 5b64daffc3f2a30110f6b9d21d0db85917fb9c590f73cc8174fb9885821b92408d5abb904ae7574eefccd10fd6293ea74148416190f6b5dda6d15f751b9def36
-  data.tar.gz: c32f1e620e59f385c84f76be707f2373b69df262f3d6b70e172fe007e49a90d7a0f16ac9e8cb34839720b6b5978f35386cf48b7dc3d71dacf0ff350a02fa6ae4
+  metadata.gz: 37a89c1db15f3228c5d2cf45ae1c31e83d2532e1157fa5cb9eb61c79ccb6a008d1b21c4e6672ff6dc55fdcbd9138251c9be1df2ef6da73c50ec2ca6904c59643
+  data.tar.gz: 6d2a879574d21d1c7025a1e45458cc5350c9e0fb9b6d6ee08935fa6ca517b6af3343aefd946cd6be37687c665592e5eca0ae91cac71ba87f903403ea3f109746

data/examples/upload/client.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
+
+require 'async'
+require 'async/http/body/file'
+require 'async/http/body/delayed'
+require 'async/http/client'
+require 'async/http/url_endpoint'
+
+Async.run do
+	endpoint = Async::HTTP::URLEndpoint.parse("http://localhost:9222")
+	client = Async::HTTP::Client.new(endpoint, Async::HTTP::Protocol::HTTP2)
+	
+	headers = [
+		['accept', 'text/plain'],
+	]
+	
+	body = Async::HTTP::Body::Delayed.new(Async::HTTP::Body::File.open("data.txt", block_size: 32))
+	
+	response = client.post(endpoint.path, headers, body)
+	
+	puts response.status
+	
+	# response.read -> string
+	# response.each {|chunk| ...}
+	# response.close (forcefully ignore data)
+	# body = response.finish (read and buffer response)
+	# response.save("echo.txt")
+	
+	response.each do |chunk|
+		puts chunk.inspect
+	end
+	
+ensure
+	client.close if client
+end
+
+puts "Done."

data/examples/upload/data.txt

@@ -0,0 +1,41 @@
+The Parable of the Two Programmers
+
+Neil W. Rickert
+
+Once upon a time, unbeknownst to each other, the "Automated Accounting Applications Association" and the "Consolidated Computerized Capital Corporation" decided that they needed the identical program to perform a certain service.
+
+Automated hired a programmer-analyst, Alan, to solve their problem.
+
+Meanwhile, Consolidated decided to ask a newly-hired entry-level programmer, Charles, to tackle the job, to see if he was as good as he pretended.
+
+Alan, having had experience in difficult programming projects, decided to use the PQR structured design methodology. With this in mind he asked his department manager to assign another three programmers as a programming team. Then the team went to work, churning out preliminary reports and problem analyses.
+
+Back at Consolidated, Charles spent some time thinking about the problem. His fellow employees noticed that Charles often sat with his feet on the desk, drinking coffee. He was occasionally seen at his computer terminal, but his office mate could tell from the rhythmic striking of keys that he was actually playing Space Invaders.
+
+By now, the team at Automated was starting to write code. The programmers were spending about half their time writing and compiling code, and the rest of their time in conference, discussing the interfaces between the various modules.
+
+His office mate noticed that Charles had finally given up on Space Invaders. Instead he now divided his time between drinking coffee with his feet on the table, and scribbling on little scraps of paper. His scribbling didn't seem to be Tic-Tac-Toe, but it didn't exactly make much sense, either.
+
+Two months have gone by. The team at Automated finally releases an implementation timetable. In another two months they will have a test version of the program. Then a two month period of testing and enhancing should yield a completed version.
+
+The manager of Charles has by now tired of seeing him goof off. He decides to confront him. But as he walks into Charles' office, he is surprised to see Charles busy entering code at his terminal. He decides to postpone the confrontation, so makes some small talk and then leaves. However, he begins to keep a closer watch on Charles, so that when the opportunity presents itself he can confront him. Not looking forward to an unpleasant conversation, he is pleased to notice that Charles seems to be busy most of the time. He has even been seen to delay his lunch, and to stay after work two or three days a week.
+
+At the end of three months, Charles announces he has completed the project. He submits a 500-line program. The program appears to be clearly written, and when tested it does everything required in the specifications. In fact, it even has a few additional convenience features which might significantly improve the usability of the program. The program is put into test, and except for one quickly corrected oversight, performs well.
+
+The team at Automated has by now completed two of the four major modules required for their program. These modules are now undergoing testing while the other modules are completed.
+
+After another three weeks, Alan announces that the preliminary version is ready one week ahead of schedule. He supplies a list of the deficiencies that he expects to correct. The program is placed under test. The users find a number of bugs and deficiencies other than those listed. As Alan explains, this is no surprise. After all, this is a preliminary version in which bugs were expected.
+
+After about two more months, the team has completed its production version of the program. It consists of about 2,500 lines of code. When tested, it seems to satisfy most of the original specifications. It has omitted one or two features, and is very fussy about the format of its input data. However, the company decides to install the program. They can always train their data-entry staff to enter data in the strict format required. The program is handed over to some maintenance programmers to eventually incorporate the missing features.
+
+Sequel
+
+At first Charles' supervisor was impressed. But as he read through the source code, he realized that the project was really much simpler than he had originally thought. It now seemed apparent that this was not much of a challenge even for a beginning programmer.
+
+Charles did produce about five lines of code per day. This is perhaps a little above average. However, considering the simplicity of the program, it was nothing exceptional. Also, his supervisor remembered his two months of goofing off.
+
+At his next salary review Charles was given a raise which was about half the inflation over the period. He was not given a promotion. After about a year he became discouraged and left Consolidated.
+
+At Automated, Alan was complimented for completing his project on schedule. His supervisor looked over the program. Within a few minutes of thumbing through he saw that the company standards about structured programming were being observed. He quickly gave up attempting to read the program; however, it seemed quite incomprehensible. He realized by now that the project was really much more complex than he had originally assumed, and he congratulated Alan again on his achievement.
+
+The team had produced over three lines of code per programmer per day. This was about average, but considering the complexity of the problem, could be considered to be exceptional. Alan was given a hefty pay raise, and promoted to Systems Analyst as a reward for his achievement.

data/examples/upload/server.rb

@@ -0,0 +1,19 @@
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
+
+require 'async'
+require 'async/http/server'
+require 'async/http/url_endpoint'
+
+protocol = Async::HTTP::Protocol::HTTP2
+endpoint = Async::HTTP::URLEndpoint.parse('http://127.0.0.1:9222', reuse_port: true)
+
+Async.logger.level = Logger::DEBUG
+
+Async.run do
+	server = Async::HTTP::Server.for(endpoint, protocol) do |request|
+		Async::HTTP::Response[200, {}, request.body]
+	end
+	
+	server.run
+end

data/examples/upload/upload.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'async'
+require 'async/http/body/file'
+require 'async/http/internet'
+
+Async.run do
+	internet = Async::HTTP::Internet.new
+	
+	headers = [
+		['accept', 'text/plain'],
+	]
+	
+	body = Async::HTTP::Body::File.open("data.txt")
+	
+	response = internet.post("https://www.codeotaku.com/journal/2018-10/async-http-client-for-ruby/echo", headers, body)
+	
+	# response.read -> string
+	# response.each {|chunk| ...}
+	# response.close (forcefully ignore data)
+	# body = response.finish (read and buffer response)
+	response.save("echo.txt")
+	
+ensure
+	internet.close
+end

data/lib/async/http/body/delayed.rb

@@ -0,0 +1,41 @@
+# 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 'wrapper'
+
+module Async
+	module HTTP
+		module Body
+			class Delayed < Async::HTTP::Body::Wrapper
+				def initialize(body, delay = 0.01)
+					super(body)
+					
+					@delay = delay
+				end
+				
+				def read
+					Async::Task.current.sleep(@delay)
+					
+					return super
+				end
+			end
+		end
+	end
+end

data/lib/async/http/body/wrapper.rb

@@ -55,10 +55,6 @@ module Async
 				def read
 					@body.read
 				end
-				
-				def inspect
-					return @body.inspect
-				end
 			end
 		end
 	end

data/lib/async/http/protocol/http1/client.rb

@@ -40,6 +40,7 @@ module Async
 						# Once we start writing the body, we can't recover if the request fails. That's because the body might be generated dynamically, streaming, etc.
 						self.write_body(request.body)
 						
+						# This won't return the response until the entire body is written.
 						return Response.new(self, request)
 					rescue
 						# This will ensure that #reusable? returns false.

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

@@ -38,13 +38,17 @@ module Async
 					end
 					
 					def wait
-						@notification.wait
+						# If you call wait after the headers were already received, it should return immediately.
+						if @notification
+							@notification.wait
+						end
 						
 						if @exception
 							raise @exception
 						end
 					end
 					
+					# This should be invoked from the background reader, and notifies the task waiting for the headers that we are done.
 					def receive_headers(stream, headers, end_stream)
 						headers.each do |key, value|
 							if key == STATUS
@@ -61,7 +65,10 @@ module Async
 						end
 						
 						# We are ready for processing:
-						@notification.signal
+						if @notification
+							@notification.signal
+							@notification = nil
+						end
 					end
 					
 					def receive_data(stream, data, end_stream)

data/lib/async/http/protocol/http2/stream.rb

@@ -32,15 +32,20 @@ module Async
 						
 						@body = body
 						@remainder = nil
+						
+						@task = nil
 					end
 					
 					attr_accessor :delegate
 					attr :body
 					
-					def send_body(body)
-						@body = body
-						
-						window_updated
+					def send_body(body, task: Async::Task.current)
+						# TODO Might need to stop this task when body is cancelled.
+						@task = task.async do
+							@body = body
+							
+							window_updated
+						end
 					end
 					
 					def send_chunk

data/lib/async/http/server.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'async/io/endpoint'
+require 'async/io/stream'
 
 require_relative 'protocol'
 require_relative 'response'

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.34.1"
+		VERSION = "0.34.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -143,12 +143,17 @@ files:
 - examples/fetch/public/index.html
 - examples/fetch/public/stream.js
 - examples/request.rb
+- examples/upload/client.rb
+- examples/upload/data.txt
+- examples/upload/server.rb
+- examples/upload/upload.rb
 - lib/async/http.rb
 - lib/async/http/accept_encoding.rb
 - lib/async/http/body.rb
 - lib/async/http/body/buffered.rb
 - lib/async/http/body/chunked.rb
 - lib/async/http/body/deflate.rb
+- lib/async/http/body/delayed.rb
 - lib/async/http/body/file.rb
 - lib/async/http/body/fixed.rb
 - lib/async/http/body/inflate.rb