async-websocket 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc7cbd8769e7a5f2c98114c19e3e5b17b8e65b1d172e961b2efaca084b108dda
-  data.tar.gz: 25f69580b9e2f8839c2e3408bb926430eb720e9ec98ff483b4e69d9c3202f207
+  metadata.gz: 0fd37d5eb2b762f6f5d7bb8027d3d51c1a9300f63d6d38b5bd7aec5a373d1a0d
+  data.tar.gz: 0c8cf165cf58f920ac80534b08fef3146e08caa3676542bea72b6ae2b2fdbe9c
 SHA512:
-  metadata.gz: dee41300f15a14eab436499d4ffaf3ec6906bd23000b4f2d1d5db996d70d43aec64f63d4c444731888eed71ecb6258a3361db643b782c815b85e74a062e45e7e
-  data.tar.gz: 68228e3e5abb6ac3eab178ecaf4d7a2e4556d6baa99c088b4b0bab6788cef669d1fdd1dae54a512b042b586fe35f94b2031d0540aa7261d3c2af26cffc5eaad5
+  metadata.gz: e05aaeb2c9f4ce782bf99c57789d0e21d89a6fc262eae1141451c40c2d17776920117deae3f7c2864218a90ec5a5f7feb5ff4604460cb1cb5ee2ab783fac230d
+  data.tar.gz: 919c2aa1bafd05fe0e2283d201553fd546f9e734f7f4134c9adfd62ea9fb6ac714eace090d487b22fd3613dcd52d64eed6a225143a56687f9cecddea973e84db

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

@@ -0,0 +1,64 @@
+# frozen_string_literals: true
+#
+# 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 '../connection'
+require_relative '../response'
+
+module Async
+	module WebSocket
+		module Adapters
+			module HTTP
+				include ::Protocol::WebSocket::Headers
+				
+				def self.websocket?(request)
+					Array(request.protocol).include?(PROTOCOL)
+				end
+				
+				def self.open(request, headers: [], protocols: [], handler: Connection, **options, &block)
+					if Array(request.protocol).include?(PROTOCOL)
+						# 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|
+							# Once we get to this point, we no longer need to hold on to the response:
+							response = nil
+							
+							framer = Protocol::WebSocket::Framer.new(stream)
+							connection = handler.call(framer, protocol)
+							
+							yield connection
+							
+							connection.close unless connection.closed?
+						end
+						
+						# Once we get to this point, we no longer need to hold on to the request:
+						request = nil
+						
+						return response
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -20,8 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../connection'
-require_relative '../response'
+require_relative 'http'
 
 module Async
 	module WebSocket
@@ -33,37 +32,21 @@ module Async
 					request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
 				end
 				
-				def self.open(env, headers: [], protocols: [], handler: Connection, **options, &block)
-					if request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
+				def self.open(env, **options, &block)
+					if request = env['async.http.request']
 						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)
+						if response = HTTP.open(request, **options, &block)
+							headers = response.headers
 							
-							yield connection
+							if protocol = response.protocol
+								headers = Protocol::HTTP::Headers::Merged.new(headers, [
+									['rack.protocol', protocol]
+								])
+							end
 							
-							connection.close unless connection.closed?
+							return [response.status, headers.to_h, response.body]
 						end
-						
-						request = nil
-						headers = response.headers
-						
-						if protocol = response.protocol
-							headers = Protocol::HTTP::Headers::Merged.new(headers, [
-								['rack.protocol', protocol]
-							])
-						end
-						
-						return [response.status, headers, response.body]
 					end
 				end
 			end

data/{spec/async/websocket/upgrade.rb → lib/async/websocket/adapters/rails.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literals: true
+#
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,26 +20,25 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/websocket/adapters/rack'
+require_relative 'rack'
 
-class Upgrade
-	def initialize(app)
-		@app = app
-	end
-	
-	def call(env)
-		Async::WebSocket::Adapters::Rack.open(env, supported_protocols: ['ws']) do |connection|
-			read, write = IO.pipe
-			
-			Process.spawn("ls -lah", :out => write)
-			write.close
-			
-			read.each_line do |line|
-				connection.write({line: line})
+module Async
+	module WebSocket
+		module Adapters
+			module Rails
+				def self.open(request, **options, &block)
+					if response = Rack.open(request.env, **options, &block)
+						response[1]['rack.hijack'] = lambda do |stream|
+							response[2].call(stream)
+						end
+						
+						# Close the response to prevent Rails from... trying to render a view?
+						return ::ActionDispatch::Response.new(response[0], response[1], nil).tap(&:close)
+					end
+					
+					return ::ActionDispatch::Response.new(404, [], [])
+				end
 			end
-			
-			# Gracefully close the connection:
-			connection.close
-		end or @app.call(env)
+		end
 	end
 end

data/lib/async/websocket/client.rb

@@ -35,8 +35,8 @@ module Async
 			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?)
+			def self.open(endpoint, **options, &block)
+				client = self.new(HTTP::Client.new(endpoint, **options), mask: true)
 				
 				return client unless block_given?
 				
@@ -49,16 +49,16 @@ module Async
 			
 			# @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.path, **options)
+				client = self.open(endpoint, *args)
+				connection = client.connect(endpoint.authority, endpoint.path, **options)
 					
-					return connection unless block_given?
+				return connection unless block_given?
 					
-					begin
-						yield connection
-					ensure
-						connection.close
-					end
+				begin
+					yield connection
+				ensure
+					connection.close
+					client.close
 				end
 			end
 			
@@ -86,9 +86,9 @@ module Async
 				end
 			end
 			
-			def connect(path, headers: nil, handler: Connection, **options, &block)
+			def connect(authority, path, headers: nil, handler: Connection, **options, &block)
 				headers = ::Protocol::HTTP::Headers[headers]
-				request = Request.new(nil, nil, path, headers, **options)
+				request = Request.new(nil, authority, path, headers, **options)
 				
 				pool = @delegate.pool
 				connection = pool.acquire
@@ -100,9 +100,15 @@ module Async
 				end
 				
 				protocol = response.headers[SEC_WEBSOCKET_PROTOCOL]&.first
-				framer = Framer.new(pool, connection, response.stream)
+				stream = response.stream
+				response = nil
+				
+				framer = Framer.new(pool, connection, stream)
+				connection = nil
 				
 				handler.call(framer, protocol, **@options, &block)
+			ensure
+				pool.release(connection) if connection
 			end
 		end
 	end

data/lib/async/websocket/connect_request.rb

@@ -72,6 +72,10 @@ module Async
 					@stream = nil
 				end
 				
+				def stream?
+					true
+				end
+				
 				attr :stream
 				
 				def call(stream)

data/lib/async/websocket/connection.rb

@@ -45,6 +45,7 @@ module Async
 			
 			def initialize(framer, protocol = nil, response: nil, **options)
 				super(framer, **options)
+				
 				@protocol = protocol
 				@response = response
 			end

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.14.0"
+		VERSION = "0.19.0"
 	end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2021-06-05 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.54'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '0.54'
 - !ruby/object:Gem::Dependency
-  name: async-http
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        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.34'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.34'
-- !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: bake-bundler
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,64 +122,30 @@ 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
-- async-websocket.gemspec
-- examples/chat/.env
-- examples/chat/README.md
-- 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/http.rb
 - lib/async/websocket/adapters/rack.rb
+- lib/async/websocket/adapters/rails.rb
 - lib/async/websocket/client.rb
 - lib/async/websocket/connect_request.rb
 - lib/async/websocket/connect_response.rb
@@ -206,19 +158,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/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,16 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.0.dev
+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/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: []