async-websocket 0.12.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ed569bb920db994f1bbc777cb0edb7134a264bcbe1d4b50d20548b27694484
-  data.tar.gz: 1ffab71222838d000e0fbfdbeb83736058d8aae007679f55b0f05e2597acba6a
+  metadata.gz: 7fcb6bef4d1c45d2f65e17f4442583eb463ebfd2adf68af5af3925953d754345
+  data.tar.gz: bf3f59fd7d6f3b7ba4a72a27f034257592fe4a03644750bff59c4978ddf0e10e
 SHA512:
-  metadata.gz: 3f26b555da7f2e0c552e665d34799d51102224f32a3bf5a1b30526bd24751ddb2319cac54ca2292dd8fd11afacd05272ca97c9d28453edfc1e1dc9715b85f840
-  data.tar.gz: b18f15df6147da77f3dad4d1c0cbd656be2e17107c79c984fd276bd71bb0abe014c64cb28f46ce91f81755ae8790798d993be226b64cc8e95386092dff5210f4
+  metadata.gz: 10c0b9065b7759f022e91aadeb8508af310ddd5bbfa7d3bd2fd0a9379624ea9a70bb0b896bd16553f66ac8bf93416076d40d012832a9c0747f607fd43f993edf
+  data.tar.gz: 6508c0dfcf5aa6b14483204ca337298b790ad3713dd1b50e0e359a5527655797989d33cda9144eb66bb895b9b29f13128cf8ea8361b19b7ff59392c4e84ae3ab

data/lib/async/websocket/adapters/rack.rb

@@ -35,20 +35,26 @@ module Async
 				
 				def self.open(env, headers: [], protocols: [], handler: Connection, **options, &block)
 					if request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
+						env = nil
+						
 						# Select websocket sub-protocol:
 						if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
 							protocol = (requested_protocol & protocols).first
 						end
 						
 						response = Response.for(request, headers, protocol: protocol, **options) do |stream|
+							response = nil
+							
 							framer = Protocol::WebSocket::Framer.new(stream)
 							
 							connection = handler.call(framer, protocol)
+							
 							yield connection
 							
 							connection.close unless connection.closed?
 						end
 						
+						request = nil
 						headers = response.headers
 						
 						if protocol = response.protocol
@@ -57,7 +63,7 @@ module Async
 							])
 						end
 						
-						return [response.status, headers, response.body]
+						return [response.status, headers.to_h, response.body]
 					end
 				end
 			end

data/lib/async/websocket/client.rb

@@ -34,8 +34,9 @@ module Async
 		class Client < ::Protocol::HTTP::Middleware
 			include ::Protocol::WebSocket::Headers
 			
+			# @return [Client] a client which can be used to establish websocket connections to the given endpoint.
 			def self.open(endpoint, *args, &block)
-				client = self.new(HTTP::Client.new(endpoint, *args), mask: endpoint.secure?)
+				client = self.new(HTTP::Client.new(endpoint, *args), mask: true)
 				
 				return client unless block_given?
 				
@@ -46,9 +47,10 @@ module Async
 				end
 			end
 			
-			def self.connect(endpoint, *args, protocols: [], **options, &block)
-				self.open(endpoint, *args, **options) do |client|
-					connection = client.connect(endpoint.path, protocols: protocols)
+			# @return [Connection] an open websocket connection to the given endpoint.
+			def self.connect(endpoint, *args, **options, &block)
+				self.open(endpoint, *args) do |client|
+					connection = client.connect(endpoint.authority, endpoint.path, **options)
 					
 					return connection unless block_given?
 					
@@ -60,33 +62,53 @@ module Async
 				end
 			end
 			
-			def initialize(delegate, **options)
-				super(delegate)
+			def initialize(client, **options)
+				super(client)
 				
 				@options = options
 			end
 			
-			def connect(path, headers: [], handler: Connection, **options)
-				request = Request.new(nil, nil, path, headers, **options)
+			class Framer < ::Protocol::WebSocket::Framer
+				def initialize(pool, connection, stream)
+					super(stream)
+					@pool = pool
+					@connection = connection
+				end
+				
+				def close
+					super
+					
+					if @pool
+						@pool.release(@connection)
+						@pool = nil
+						@connection = nil
+					end
+				end
+			end
+			
+			def connect(authority, path, headers: nil, handler: Connection, **options, &block)
+				headers = ::Protocol::HTTP::Headers[headers]
+				request = Request.new(nil, authority, path, headers, **options)
+				
+				pool = @delegate.pool
+				connection = pool.acquire
 				
-				response = self.call(request)
+				response = request.call(connection)
 				
 				unless response.stream?
 					raise ProtocolError, "Failed to negotiate connection: #{response.status}"
 				end
 				
 				protocol = response.headers[SEC_WEBSOCKET_PROTOCOL]&.first
-				framer = Protocol::WebSocket::Framer.new(response.stream)
-				
-				connection = handler.call(framer, protocol, **@options)
+				stream = response.stream
+				response = nil
 				
-				return connection unless block_given?
+				framer = Framer.new(pool, connection, stream)
+				connection = nil
 				
-				begin
-					yield connection
-				ensure
-					connection.close
-				end
+				handler.call(framer, protocol, **@options, &block)
+			ensure
+				pool.release(connection) if connection
 			end
 		end
 	end

data/lib/async/websocket/connect_request.rb

@@ -24,6 +24,8 @@ require 'protocol/http/request'
 require 'protocol/http/headers'
 require 'protocol/websocket/headers'
 
+require 'async/http/body/stream'
+
 module Async
 	module WebSocket
 		# This is required for HTTP/1.x to upgrade the connection to the WebSocket protocol.
@@ -32,14 +34,19 @@ module Async
 			include ::Protocol::WebSocket::Headers
 			
 			class Wrapper
-				def initialize(body, response)
-					@body = body
+				def initialize(stream, response)
 					@response = response
-					@stream = nil
+					@body = @response.body
+					@stream = stream
 				end
 				
+				attr_accessor :response
+				
+				attr_accessor :body
+				attr_accessor :stream
+				
 				def stream?
-					@response.success?
+					@response.success? and @stream
 				end
 				
 				def status
@@ -54,35 +61,42 @@ module Async
 					true
 				end
 				
-				attr_accessor :body
-				
 				def protocol
 					@response.protocol
 				end
+			end
+			
+			class Hijack < Async::HTTP::Body::Readable
+				def initialize(request)
+					@request = request
+					@stream = nil
+				end
 				
-				def stream
-					@stream ||= Async::HTTP::Body::Stream.new(@response.body, @body)
+				attr :stream
+				
+				def call(stream)
+					@stream = stream
 				end
 			end
 			
-			def initialize(request, protocols: [], version: 13)
-				body = Async::HTTP::Body::Writable.new
+			def initialize(request, protocols: [], version: 13, &block)
+				body = Hijack.new(self)
 				
-				headers = []
+				headers = ::Protocol::HTTP::Headers[request.headers]
 				
-				headers << [SEC_WEBSOCKET_VERSION, version]
+				headers.add(SEC_WEBSOCKET_VERSION, String(version))
 				
 				if protocols.any?
-					headers << [SEC_WEBSOCKET_PROTOCOL, protocols.join(',')]
+					headers.add(SEC_WEBSOCKET_PROTOCOL, protocols.join(','))
 				end
 				
-				merged_headers = ::Protocol::HTTP::Headers::Merged.new(request.headers, headers)
-				
-				super(request.scheme, request.authority, ::Protocol::HTTP::Methods::CONNECT, request.path, nil, merged_headers, body, PROTOCOL)
+				super(request.scheme, request.authority, ::Protocol::HTTP::Methods::CONNECT, request.path, nil, headers, body, PROTOCOL)
 			end
 			
 			def call(connection)
-				Wrapper.new(@body, super)
+				response = super
+				
+				Wrapper.new(@body.stream, response)
 			end
 		end
 	end

data/lib/async/websocket/connect_response.rb

@@ -30,10 +30,10 @@ module Async
 			include ::Protocol::WebSocket::Headers
 			
 			def initialize(request, headers = nil, protocol: nil, &block)
-				headers = Protocol::HTTP::Headers::Merged.new(headers)
+				headers = ::Protocol::HTTP::Headers[headers]
 				
 				if protocol
-					headers << [[SEC_WEBSOCKET_PROTOCOL, protocol]]
+					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
 				end
 				
 				body = Async::HTTP::Body::Hijack.wrap(request, &block)

data/lib/async/websocket/connection.rb

@@ -32,12 +32,31 @@ module Async
 			include ::Protocol::WebSocket::Headers
 			
 			def self.call(framer, protocol = [], **options)
-				return self.new(framer, Array(protocol).first, **options)
+				instance = self.new(framer, Array(protocol).first, **options)
+				
+				return instance unless block_given?
+				
+				begin
+					yield instance
+				ensure
+					instance.close
+				end
 			end
 			
-			def initialize(framer, protocol = nil, **options)
+			def initialize(framer, protocol = nil, response: nil, **options)
 				super(framer, **options)
+				
 				@protocol = protocol
+				@response = response
+			end
+			
+			def close
+				super
+				
+				if @response
+					@response.finish
+					@response = nil
+				end
 			end
 			
 			attr :protocol

data/lib/async/websocket/request.rb

@@ -30,7 +30,7 @@ module Async
 				Array(request.protocol).include?(PROTOCOL)
 			end
 			
-			def initialize(scheme = nil, authority = nil, path = nil, headers = [], **options)
+			def initialize(scheme = nil, authority = nil, path = nil, headers = nil, **options, &block)
 				@scheme = scheme
 				@authority = authority
 				@path = path

data/lib/async/websocket/response.rb

@@ -27,7 +27,7 @@ module Async
 	module WebSocket
 		module Response
 			# Send the request to the given connection.
-			def self.for(request, headers = [], **options, &body)
+			def self.for(request, headers = nil, **options, &body)
 				if request.version =~ /http\/1/i
 					return UpgradeResponse.new(request, headers, **options, &body)
 				elsif request.version =~ /h2/i

data/lib/async/websocket/server.rb

@@ -49,6 +49,8 @@ module Async
 					# Select websocket sub-protocol:
 					protocol = select_protocol(request)
 					
+					# request.headers = nil
+					
 					Response.for(request, headers, protocol: protocol, **options) do |stream|
 						framer = Protocol::WebSocket::Framer.new(stream)
 						

data/lib/async/websocket/upgrade_request.rb

@@ -42,6 +42,8 @@ module Async
 					@stream = nil
 				end
 				
+				attr_accessor :response
+				
 				def stream?
 					@response.status == 101
 				end
@@ -71,21 +73,19 @@ module Async
 				end
 			end
 			
-			def initialize(request, protocols: [], version: 13)
+			def initialize(request, protocols: [], version: 13, &block)
 				@key = Nounce.generate_key
 				
-				headers = [
-					[SEC_WEBSOCKET_KEY, @key],
-					[SEC_WEBSOCKET_VERSION, version],
-				]
+				headers = ::Protocol::HTTP::Headers[request.headers]
+				
+				headers.add(SEC_WEBSOCKET_KEY, @key)
+				headers.add(SEC_WEBSOCKET_VERSION, String(version))
 				
 				if protocols.any?
-					headers << [SEC_WEBSOCKET_PROTOCOL, protocols.join(',')]
+					headers.add(SEC_WEBSOCKET_PROTOCOL, protocols.join(','))
 				end
 				
-				merged_headers = ::Protocol::HTTP::Headers::Merged.new(request.headers, headers)
-				
-				super(request.scheme, request.authority, ::Protocol::HTTP::Methods::GET, request.path, nil, merged_headers, nil, PROTOCOL)
+				super(request.scheme, request.authority, ::Protocol::HTTP::Methods::GET, request.path, nil, headers, nil, PROTOCOL)
 			end
 			
 			def call(connection)

data/lib/async/websocket/upgrade_response.rb

@@ -31,17 +31,17 @@ module Async
 			include ::Protocol::WebSocket::Headers
 			
 			def initialize(request, headers = nil, protocol: nil, &block)
-				headers = Protocol::HTTP::Headers::Merged.new(headers)
+				headers = ::Protocol::HTTP::Headers[headers]
 				
 				if accept_nounce = request.headers[SEC_WEBSOCKET_KEY]&.first
-					headers << [[SEC_WEBSOCKET_ACCEPT, Nounce.accept_digest(accept_nounce)]]
+					headers.add(SEC_WEBSOCKET_ACCEPT, Nounce.accept_digest(accept_nounce))
 					status = 101
 				else
 					status = 400
 				end
 				
 				if protocol
-					headers << [[SEC_WEBSOCKET_PROTOCOL, protocol]]
+					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
 				end
 				
 				body = Async::HTTP::Body::Hijack.wrap(request, &block)

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.12.2"
+		VERSION = "0.16.0"
 	end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
-  name: async-http
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: protocol-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: falcon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.32'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.32'
-- !ruby/object:Gem::Dependency
-  name: covered
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,61 +122,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
-- async-websocket.gemspec
-- examples/chat/client.rb
-- examples/chat/config.ru
-- examples/chat/multi-client.rb
-- examples/mud/client.rb
-- examples/mud/config.ru
-- examples/rack/client.rb
-- examples/rack/config.ru
-- examples/utopia/.bowerrc
-- examples/utopia/.gitignore
-- examples/utopia/.rspec
-- examples/utopia/Gemfile
-- examples/utopia/Guardfile
-- examples/utopia/README.md
-- examples/utopia/Rakefile
-- examples/utopia/config.ru
-- examples/utopia/config/README.md
-- examples/utopia/config/environment.rb
-- examples/utopia/lib/readme.txt
-- examples/utopia/pages/_heading.xnode
-- examples/utopia/pages/_page.xnode
-- examples/utopia/pages/client/client.js
-- examples/utopia/pages/client/index.xnode
-- examples/utopia/pages/errors/exception.xnode
-- examples/utopia/pages/errors/file-not-found.xnode
-- examples/utopia/pages/links.yaml
-- examples/utopia/pages/server/controller.rb
-- examples/utopia/public/_static/icon.png
-- examples/utopia/public/_static/site.css
-- examples/utopia/public/_static/utopia-background.svg
-- examples/utopia/public/_static/utopia.svg
-- examples/utopia/public/readme.txt
-- examples/utopia/spec/spec_helper.rb
-- examples/utopia/spec/website_context.rb
-- examples/utopia/spec/website_spec.rb
-- examples/utopia/tasks/bower.rake
-- examples/utopia/tasks/deploy.rake
-- examples/utopia/tasks/development.rake
-- examples/utopia/tasks/environment.rake
-- examples/utopia/tasks/log.rake
-- examples/utopia/tasks/static.rake
 - lib/async/websocket.rb
 - lib/async/websocket/adapters/rack.rb
 - lib/async/websocket/client.rb
@@ -205,20 +156,11 @@ files:
 - lib/async/websocket/upgrade_request.rb
 - lib/async/websocket/upgrade_response.rb
 - lib/async/websocket/version.rb
-- spec/async/websocket/adapters/rack/client.rb
-- spec/async/websocket/adapters/rack/config.ru
-- spec/async/websocket/adapters/rack_spec.rb
-- spec/async/websocket/client_spec.rb
-- spec/async/websocket/connection_spec.rb
-- spec/async/websocket/server_examples.rb
-- spec/async/websocket/server_spec.rb
-- spec/async/websocket/upgrade.rb
-- spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/socketry/async-websocket
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -233,17 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.
-test_files:
-- spec/async/websocket/adapters/rack/client.rb
-- spec/async/websocket/adapters/rack/config.ru
-- spec/async/websocket/adapters/rack_spec.rb
-- spec/async/websocket/client_spec.rb
-- spec/async/websocket/connection_spec.rb
-- spec/async/websocket/server_examples.rb
-- spec/async/websocket/server_spec.rb
-- spec/async/websocket/upgrade.rb
-- spec/spec_helper.rb
+test_files: []