async-websocket 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7085740fa3b6603dca33b7c3418b328e49e48c0dbd0a87fbbeca022d01bdf58b
-  data.tar.gz: 564d3e010cd045962248196897deef0560f601d560e7fa30a9f34dbdcb8226bc
+  metadata.gz: df82f3dd1772a40330282c7e81f48c7eebf4ec60b46dde2967ed205e45505183
+  data.tar.gz: 2a1bedaeb9fdd84c179505c14ea55cc4ab092b6084b3e9788a0ef54486cec9fa
 SHA512:
-  metadata.gz: 1f99a5885889b5f020e47d5aa82341aafa3d838cb8f189caa95a6aec80b5175a5f486be9ef0ec1cb3bc75d2c867e88737f0dbf3c7f7585cd21259afb4a0f9e73
-  data.tar.gz: f0d64ead515fbbd534b453c8acc5d3d0f02b3a413f6740f931b66e14573a78f8576039206ab5acf33681b44f6b2d42c27e8d98cc1ba3aa5e64fc4c76ac323c9b
+  metadata.gz: d466463ab823a6d305386c27659d32f79437b59e9a12b10402d27322011241cd3b60a96051ca16c1491e3ca023d5a6810429e74deeaf4d8ec117fab2e4bb7c48
+  data.tar.gz: 18be04929807a7852183fa1b87dac0c4dd012ef7b86cf1f14a1ce53a3e801f86580151b584389378e7db30fde04e15a9e8f258854209c9fa265094b85413c896

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
-# Copyright, 2021, by Aurora.
+# Copyright, 2021-2023, by Samuel Williams.
+# Copyright, 2021, by Aurora Nockert.
 
 require_relative '../connection'
 require_relative '../response'
@@ -35,7 +35,6 @@ module Async
 						end
 						
 						response = Response.for(request, headers, protocol: protocol, **options) do |stream|
-							
 							framer = Protocol::WebSocket::Framer.new(stream)
 							connection = handler.call(framer, protocol, extensions)
 							

data/lib/async/websocket/client.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2015-2023, by Samuel Williams.
+# Copyright, 2019, by Bryan Powell.
+# Copyright, 2019, by Janko Marohnić.
 
 require_relative 'request'
 require_relative 'connection'
@@ -12,6 +14,8 @@ require 'protocol/http/middleware'
 
 require 'async/http/client'
 
+require 'delegate'
+
 module Async
 	module WebSocket
 		# This is a basic synchronous websocket client:
@@ -31,13 +35,29 @@ module Async
 				end
 			end
 			
+			class ClientCloseDecorator < SimpleDelegator
+				def initialize(client, connection)
+					@client = client
+					super(connection)
+				end
+				
+				def close
+					super
+					
+					if @client
+						@client.close
+						@client = nil
+					end
+				end
+			end
+			
 			# @return [Connection] an open websocket connection to the given endpoint.
 			def self.connect(endpoint, *arguments, **options, &block)
 				client = self.open(endpoint, *arguments)
 				connection = client.connect(endpoint.authority, endpoint.path, **options)
-					
-				return connection unless block_given?
-					
+				
+				return ClientCloseDecorator.new(client, connection) unless block_given?
+				
 				begin
 					yield connection
 				ensure
@@ -85,6 +105,8 @@ module Async
 				response = request.call(connection)
 				
 				unless response.stream?
+					response.close
+					
 					raise ProtocolError, "Failed to negotiate connection: #{response.status}"
 				end
 				
@@ -102,7 +124,7 @@ module Async
 				response = nil
 				stream = nil
 				
-				connction = handler.call(framer, protocol, extensions, **@options, &block)
+				return handler.call(framer, protocol, extensions, **@options, &block)
 			ensure
 				pool.release(connection) if connection
 			end

data/lib/async/websocket/connect_request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/request'
 require 'protocol/http/headers'
@@ -20,13 +20,14 @@ module Async
 			class Wrapper
 				def initialize(stream, response)
 					@response = response
-					@body = @response.body
 					@stream = stream
 				end
 				
-				attr_accessor :response
+				def close
+					@response.close
+				end
 				
-				attr_accessor :body
+				attr_accessor :response
 				attr_accessor :stream
 				
 				def stream?
@@ -40,14 +41,6 @@ module Async
 				def headers
 					@response.headers
 				end
-				
-				def body?
-					true
-				end
-				
-				def protocol
-					@response.protocol
-				end
 			end
 			
 			class Hijack < Protocol::HTTP::Body::Readable

data/lib/async/websocket/connect_response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/response'
 require 'async/http/body/hijack'
@@ -18,8 +18,9 @@ module Async
 				if protocol
 					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
 				end
-
+				
 				body = Async::HTTP::Body::Hijack.wrap(request, &block)
+				
 				super(request.version, 200, headers, body)
 			end
 		end

data/lib/async/websocket/connection.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2019, by Janko Marohnić.
 
 require 'protocol/websocket/connection'
 require 'protocol/websocket/headers'
@@ -30,31 +31,17 @@ module Async
 				end
 			end
 			
-			def initialize(framer, protocol = nil, response: nil, **options)
+			def initialize(framer, protocol = nil, **options)
 				super(framer, **options)
 				
 				@protocol = protocol
-				@response = response
 			end
 			
 			def reusable?
 				false
 			end
 			
-			def close
-				super
-				
-				if @response
-					@response.finish
-					@response = nil
-				end
-			end
-			
 			attr :protocol
-			
-			def call
-				self.close
-			end
 		end
 	end
 end

data/lib/async/websocket/error.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/websocket/error'
 
@@ -9,5 +9,11 @@ module Async
 	module WebSocket
 		class ProtocolError < ::Protocol::WebSocket::ProtocolError
 		end
+		
+		class Error < ::Protocol::WebSocket::Error
+		end
+		
+		class UnsupportedVersionError < Error
+		end
 	end
 end

data/lib/async/websocket/request.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'connect_request'
 require_relative 'upgrade_request'
+require_relative 'error'
 
 module Async
 	module WebSocket
@@ -26,6 +27,10 @@ module Async
 				@body = nil
 			end
 			
+			def protocol
+				PROTOCOL
+			end
+			
 			attr_accessor :scheme
 			attr_accessor :authority
 			attr_accessor :path
@@ -41,7 +46,7 @@ module Async
 					return ConnectRequest.new(self, **@options).call(connection)
 				end
 				
-				raise HTTP::Error, "Unsupported HTTP version: #{connection.version}!"
+				raise UnsupportedVersionError, "Unsupported HTTP version: #{connection.version}!"
 			end
 			
 			def idempotent?
@@ -49,7 +54,8 @@ module Async
 			end
 			
 			def to_s
-				"\#<#{self.class} #{@scheme}://#{@authority}: #{@path}>"
+				uri = "#{@scheme}://#{@authority}#{@path}"
+				"\#<#{self.class} uri=#{uri.inspect}>"
 			end
 		end
 	end

data/lib/async/websocket/response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'upgrade_response'
 require_relative 'connect_response'
@@ -19,7 +19,7 @@ module Async
 					return ConnectResponse.new(request, headers, **options, &body)
 				end
 				
-				raise ProtocolError, "Unsupported HTTP version: #{request.version}!"
+				raise UnsupportedVersionError, "Unsupported HTTP version: #{request.version}!"
 			end
 		end
 	end

data/lib/async/websocket/server.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2019, by destructobeam.
 
 require_relative 'connection'
 require_relative 'response'
@@ -13,37 +14,15 @@ module Async
 		class Server < ::Protocol::HTTP::Middleware
 			include ::Protocol::WebSocket::Headers
 			
-			def initialize(delegate, protocols: [], handler: Connection)
+			def initialize(delegate, **options, &block)
 				super(delegate)
 				
-				@protocols = protocols
-				@handler = handler
-			end
-			
-			def select_protocol(request)
-				if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
-					return (requested_protocol & @protocols).first
-				end
-			end
-			
-			def response(request)
+				@options = options
+				@block = block
 			end
 			
 			def call(request)
-				if request.protocol == PROTOCOL
-					# 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)
-						
-						yield handler.call(framer, protocol)
-					end
-				else
-					super
-				end
+				Async::WebSocket::Adapters::HTTP.open(request, **@options, &@block) or super
 			end
 		end
 	end

data/lib/async/websocket/upgrade_request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/middleware'
 require 'protocol/http/request'
@@ -25,6 +25,10 @@ module Async
 					@stream = nil
 				end
 				
+				def close
+					@response.close
+				end
+				
 				attr_accessor :response
 				
 				def stream?
@@ -39,18 +43,6 @@ module Async
 					@response.headers
 				end
 				
-				def body?
-					false
-				end
-				
-				def body
-					nil
-				end
-				
-				def protocol
-					@response.protocol
-				end
-				
 				def stream
 					@stream ||= @response.hijack!
 				end

data/lib/async/websocket/upgrade_response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'async/http/body/hijack'
 require 'protocol/http/response'
@@ -19,16 +19,17 @@ module Async
 				if accept_nounce = request.headers[SEC_WEBSOCKET_KEY]&.first
 					headers.add(SEC_WEBSOCKET_ACCEPT, Nounce.accept_digest(accept_nounce))
 					status = 101
+					
+					if protocol
+						headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
+					end
+					
+					body = Async::HTTP::Body::Hijack.wrap(request, &block)
+					
+					super(request.version, 101, headers, body, PROTOCOL)
 				else
-					status = 400
+					super(request.version, 400, headers)
 				end
-				
-				if protocol
-					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
-				end
-				
-				body = Async::HTTP::Body::Hijack.wrap(request, &block)
-				super(request.version, status, headers, body, PROTOCOL)
 			end
 		end
 	end

data/lib/async/websocket/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.22.1"
+		VERSION = "0.23.0"
 	end
 end

data/lib/async/websocket.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2015-2022, by Samuel Williams.
 
 require_relative 'websocket/version'
 require_relative 'websocket/server'

data/license.md

@@ -1,10 +1,14 @@
 # MIT License
 
-Copyright, 2015-2022, by Samuel Williams.  
+Copyright, 2015-2023, by Samuel Williams.  
+Copyright, 2019, by Bryan Powell.  
 Copyright, 2019, by destructobeam.  
+Copyright, 2019, by Michel Boaventura.  
+Copyright, 2019, by Janko Marohnić.  
+Copyright, 2020-2021, by Olle Jonsson.  
+Copyright, 2020, by Juan Antonio Martín Lucas.  
 Copyright, 2021, by Gleb Sinyavskiy.  
-Copyright, 2021, by Aurora.  
-Copyright, 2021, by Olle Jonsson.  
+Copyright, 2021, by Aurora Nockert.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -17,27 +17,3 @@ We welcome contributions to this project.
 3.  Commit your changes (`git commit -am 'Add some feature'`)
 4.  Push to the branch (`git push origin my-new-feature`)
 5.  Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2015, 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.

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Samuel Williams
 - destructobeam
 - Olle Jonsson
-- Aurora
+- Aurora Nockert
 - Bryan Powell
 - Gleb Sinyavskiy
 - Janko Marohnić
+- Juan Antonio Martín Lucas
 - Michel Boaventura
-- jaml
 autorequire:
 bindir: bin
 cert_chain:
@@ -45,7 +45,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -137,14 +137,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: sus-fixtures-async-http
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.