async-websocket 0.10.0 → 0.11.0

data/spec/async/websocket/client_spec.rb

@@ -19,18 +19,30 @@
 # THE SOFTWARE.
 
 require "async/websocket/client"
+require "async/websocket/response"
 
 RSpec.describe Async::WebSocket::Client do
-	context "headers:" do
+	describe '#connect' do
 		let(:headers) {[
 			["Foo", "Bar"],
 			["Baz", "Qux"]
 		]}
 		
-		subject {described_class.new(nil, headers: headers)}
+		let(:client) {double}
+		let(:stream) {double}
+		
+		subject {described_class.new(client)}
+		let(:response) {Protocol::HTTP::Response.new(nil, 101, "Switching Protocols", {}, nil, Protocol::WebSocket::Headers::PROTOCOL)}
 		
 		it "sets client request headers" do
-			expect(subject.request_headers.to_h).to include(headers.to_h)
+			expect(response).to receive(:stream?).and_return(true)
+			expect(response).to receive(:stream).and_return(stream)
+			
+			expect(client).to receive(:call) do |request|
+				expect(request.headers.to_h).to include("Foo", "Baz")
+			end.and_return(response)
+			
+			subject.connect("/server", headers: headers)
 		end
 	end
 end

data/spec/async/websocket/server_examples.rb

@@ -0,0 +1,77 @@
+# 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 'async/websocket/client'
+require 'async/websocket/server'
+
+require 'async/http/client'
+require 'async/http/server'
+require 'async/http/endpoint'
+
+RSpec.shared_context Async::WebSocket::Server do
+	include_context Async::RSpec::Reactor
+	
+	let(:protocol) {described_class}
+	let(:endpoint) {Async::HTTP::Endpoint.parse('http://127.0.0.1:8008', reuse_port: true)}
+	
+	let!(:client) {Async::WebSocket::Client.open(endpoint, protocol)}
+	
+	let!(:server_task) do
+		reactor.async do
+			server.run
+		end
+	end
+	
+	after(:each) do
+		Async.logger.debug(client, "Closing client...")
+		client.close
+		Async.logger.debug(server_task, "Closing server...")
+		server_task.stop
+	end
+	
+	let(:handler) {Async::WebSocket::Connection}
+	let(:headers) {Array.new}
+	
+	let(:server) do
+		Async::HTTP::Server.for(endpoint, protocol) do |request|
+			if Async::WebSocket::Request.websocket?(request)
+				Async::WebSocket::Response.for(request, headers) do |stream|
+					framer = Protocol::WebSocket::Framer.new(stream)
+					
+					connection = handler.call(framer)
+					
+					connection.close
+				end
+			else
+				Protocol::HTTP::Response[404, {}, []]
+			end
+		end
+	end
+	
+	it "can establish connection" do
+		connection = client.connect("/server")
+		
+		expect(connection.read).to be_nil
+		expect(connection).to be_closed
+		
+		Async.logger.debug(connection, "Closing connection...")
+		connection.close
+	end
+end

data/spec/async/websocket/server_spec.rb

@@ -0,0 +1,31 @@
+# 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 "server_examples"
+
+require "async/http/protocol/http1"
+
+RSpec.describe Async::HTTP::Protocol::HTTP1 do
+	include_context Async::WebSocket::Server
+end
+
+RSpec.describe Async::HTTP::Protocol::HTTP2 do
+	include_context Async::WebSocket::Server
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
-  name: protocol-http1
+  name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: protocol-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -190,17 +190,26 @@ files:
 - 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
+- lib/async/websocket/connect_request.rb
+- lib/async/websocket/connect_response.rb
 - lib/async/websocket/connection.rb
 - lib/async/websocket/error.rb
+- lib/async/websocket/proxy.rb
+- lib/async/websocket/request.rb
+- lib/async/websocket/response.rb
 - lib/async/websocket/server.rb
-- lib/async/websocket/server/rack.rb
+- 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/rack/client.rb
-- spec/async/websocket/server/rack/config.ru
-- spec/async/websocket/server/rack_spec.rb
+- spec/async/websocket/server_examples.rb
+- spec/async/websocket/server_spec.rb
 - spec/async/websocket/upgrade.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -222,15 +231,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.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/rack/client.rb
-- spec/async/websocket/server/rack/config.ru
-- spec/async/websocket/server/rack_spec.rb
+- spec/async/websocket/server_examples.rb
+- spec/async/websocket/server_spec.rb
 - spec/async/websocket/upgrade.rb
 - spec/spec_helper.rb

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

@@ -1,104 +0,0 @@
-# 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 'protocol/websocket/digest'
-
-require_relative '../connection'
-
-module Async
-	module WebSocket
-		module Server
-			class Rack
-				def self.websocket?(env)
-					env['HTTP_UPGRADE'] == "websocket"
-				end
-				
-				def self.open(env, **options, &block)
-					# Is hijack supported:
-					return nil unless env['rack.hijack?']
-					
-					return nil unless websocket?(env)
-					
-					server = self.new(env, **options)
-					
-					if server.supported?
-						return server.response(&block)
-					else
-						return nil
-					end
-				end
-				
-				def initialize(env, supported_protocols: [], connect: Connection)
-					# scheme = env['rack.url_scheme'] == 'https' ? 'wss' : 'ws'
-					# @url = "#{scheme}://#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
-					@key = env['HTTP_SEC_WEBSOCKET_KEY']
-					@version = Integer(env['HTTP_SEC_WEBSOCKET_VERSION'])
-					
-					@protocol = negotiate_protocol(env, supported_protocols)
-					
-					@connect = connect
-				end
-				
-				def negotiate_protocol(env, supported_protocols)
-					if supported_protocols and client_protocols = env['HTTP_SEC_WEBSOCKET_PROTOCOL']
-						return (supported_protocols & client_protocols.split(/\s*,\s/)).first
-					end
-				end
-				
-				attr :protocol
-				
-				def supported?
-					@key and @version == 13
-				end
-				
-				def make_connection(stream)
-					framer = Protocol::WebSocket::Framer.new(stream)
-					
-					return @connect.call(framer, @protocol)
-				end
-				
-				def response_headers
-					headers = [
-						['connection', 'upgrade'],
-						['upgrade', 'websocket'],
-						['sec-websocket-accept', ::Protocol::WebSocket.accept_digest(@key)],
-					]
-					
-					if @protocol
-						headers << ['sec-websocket-protocol', @protocol]
-					end
-					
-					return headers
-				end
-				
-				def response(&block)
-					headers = [
-						['rack.hijack', ->(stream){block.call(make_connection(stream))}]
-					]
-					
-					# https://stackoverflow.com/questions/13545453/http-response-code-when-requested-websocket-subprotocol-isnt-supported-recogniz
-					return [101, response_headers + headers, nil]
-				end
-			end
-		end
-	end
-end