async-websocket 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4a0133507e63cd2fcedbf71f231eef6b331cae9529992956372290ad943060
-  data.tar.gz: 22d2f1802dca3fd0e371ae36b9a51250d3ed6f233c6ef4b52b997d674d3de5ac
+  metadata.gz: ee54a400cc9103d9fb64852edc368fed4c0f288d5e78b72656375a3dfb4c28ed
+  data.tar.gz: f58fdc2b051e0ae052b6b4ee1e68b0f31c70fc720d30733365669f719a178adc
 SHA512:
-  metadata.gz: a2c5191f686f762160be7d906b740a23edeba37b4a58597070fcf206d1e7930f284426bdbb5b22312653de9b70cfed645aa797872b63dbb028ae92c131b52e7f
-  data.tar.gz: 74798b94270e22827a6762cb35d79bdb48265da513e99c85329e23ff6d6ad2d424558ce177f467d3a24b95ad98034b9d4502dc2a063f9ab2581d6dd9b601f5a5
+  metadata.gz: b9a06b567caeb24653854e41f0a483ea8fd0408da607bea334a558d2d508f7b13e60563e5dfb987978b8ce18797af01470c807e91887e621c5a5bb2a653b8dd0
+  data.tar.gz: '033085a398cfa0cf26fd972bcb035a46a07385a9d34949f07339357afe66620629d33082038f56930909dd3462627763512fc79a9120e3236fb7bda9aba190e7'

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2021-2023, by Samuel Williams.
+# Copyright, 2023, by Emily Love Mills.
 
 require_relative 'rack'
 
@@ -13,7 +14,7 @@ module Async
 					if response = Rack.open(request.env, **options, &block)
 						::Rack::Response[*response]
 					else
-						::ActionDispatch::Response.new(404, [], [])
+						::ActionDispatch::Response.new(404)
 					end
 				end
 			end

data/lib/async/websocket/client.rb

@@ -4,6 +4,7 @@
 # Copyright, 2015-2023, by Samuel Williams.
 # Copyright, 2019, by Bryan Powell.
 # Copyright, 2019, by Janko Marohnić.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'request'
 require_relative 'connection'
@@ -90,14 +91,14 @@ module Async
 				end
 			end
 			
-			def connect(authority, path, headers: nil, handler: Connection, extensions: ::Protocol::WebSocket::Extensions::Client.default, **options, &block)
+			def connect(authority, path, scheme: @delegate.scheme, headers: nil, handler: Connection, extensions: ::Protocol::WebSocket::Extensions::Client.default, **options, &block)
 				headers = ::Protocol::HTTP::Headers[headers]
 				
 				extensions&.offer do |extension|
 					headers.add(SEC_WEBSOCKET_EXTENSIONS, extension.join("; "))
 				end
 				
-				request = Request.new(nil, authority, path, headers, **options)
+				request = Request.new(scheme, authority, path, headers, **options)
 				
 				pool = @delegate.pool
 				connection = pool.acquire

data/lib/async/websocket/connect_request.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'protocol/http/request'
 require 'protocol/http/headers'
@@ -12,7 +13,7 @@ require 'async/variable'
 
 module Async
 	module WebSocket
-		# This is required for HTTP/1.x to upgrade the connection to the WebSocket protocol.
+		# This is required for HTTP/2 to establish a connection using the WebSocket protocol.
 		# See https://tools.ietf.org/html/rfc8441 for more details.
 		class ConnectRequest < ::Protocol::HTTP::Request
 			include ::Protocol::WebSocket::Headers

data/lib/async/websocket/upgrade_request.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'protocol/http/middleware'
 require 'protocol/http/request'
@@ -16,13 +17,15 @@ require_relative 'error'
 module Async
 	module WebSocket
 		# This is required for HTTP/1.x to upgrade the connection to the WebSocket protocol.
+		# See https://tools.ietf.org/html/rfc6455
 		class UpgradeRequest < ::Protocol::HTTP::Request
 			include ::Protocol::WebSocket::Headers
 			
 			class Wrapper
-				def initialize(response)
+				def initialize(response, verified:)
 					@response = response
 					@stream = nil
+					@verified = verified
 				end
 				
 				def close
@@ -32,7 +35,7 @@ module Async
 				attr_accessor :response
 				
 				def stream?
-					@response.status == 101
+					@response.status == 101 && @verified
 				end
 				
 				def status
@@ -73,8 +76,9 @@ module Async
 						raise ProtocolError, "Invalid accept digest, expected #{expected_accept_digest.inspect}, got #{accept_digest.inspect}!"
 					end
 				end
+				verified = accept_digest && Array(response.protocol) == %w(websocket) && response.headers['connection']&.include?('upgrade')
 				
-				return Wrapper.new(response)
+				return Wrapper.new(response, verified: verified)
 			end
 		end
 	end

data/lib/async/websocket/upgrade_response.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'async/http/body/hijack'
 require 'protocol/http/response'
@@ -18,7 +19,6 @@ 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)

data/lib/async/websocket/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2022, by Samuel Williams.
+# Copyright, 2018-2023, by Samuel Williams.
 
 module Async
 	module WebSocket
-		VERSION = "0.25.1"
+		VERSION = "0.26.0"
 	end
 end

data/lib/async/websocket.rb

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

data/license.md

@@ -9,6 +9,9 @@ Copyright, 2020-2021, by Olle Jonsson.
 Copyright, 2020, by Juan Antonio Martín Lucas.  
 Copyright, 2021, by Gleb Sinyavskiy.  
 Copyright, 2021, by Aurora Nockert.  
+Copyright, 2023, by Peter Runich.  
+Copyright, 2023, by Thomas Morgan.  
+Copyright, 2023, by Emily Love Mills.  
 
 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

@@ -6,14 +6,26 @@ An asynchronous websocket client/server implementation for [HTTP/1](https://tool
 
 ## Usage
 
-Please see the [project documentation](https://socketry.github.io/async-websocket/) or serve it locally using `bake utopia:project:serve`.
+Please see the [project documentation](https://socketry.github.io/async-websocket/) for more details.
+
+  - [Getting Started](https://socketry.github.io/async-websocket/guides/getting-started/index) - This guide shows you how to implement a basic client and server.
+
+  - [Rails Integration](https://socketry.github.io/async-websocket/guides/rails-integration/index) - This guide explains how to use `async-websocket` with `falcon`.
 
 ## Contributing
 
 We welcome contributions to this project.
 
-1.  Fork it
-2.  Create your feature branch (`git checkout -b my-new-feature`)
-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
+1.  Fork it.
+2.  Create your feature branch (`git checkout -b my-new-feature`).
+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.
+
+### Developer Certificate of Origin
+
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+
+### Contributor Covenant
+
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.

metadata

@@ -1,18 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Samuel Williams
 - destructobeam
 - Olle Jonsson
+- Thomas Morgan
 - Aurora Nockert
 - Bryan Powell
+- Emily Love Mills
 - Gleb Sinyavskiy
 - Janko Marohnić
 - Juan Antonio Martín Lucas
 - Michel Boaventura
+- Peter Runich
 autorequire:
 bindir: bin
 cert_chain:
@@ -45,7 +48,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -103,62 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: sus-fixtures-async-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.3
 description:
 email:
 executables: []
@@ -185,7 +132,9 @@ files:
 homepage: https://github.com/socketry/async-websocket
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://socketry.github.io/async-websocket/
+  funding_uri: https://github.com/sponsors/ioquatix
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -194,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.