async-websocket 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c110468d58034b4bbdd08e4d39482bf24cf99207dba5f5fa478251c8751f3dbe
-  data.tar.gz: cd992b36fb505345834c51ae31523e35e9058d846bd1b4a85ddf43143eebc17a
+  metadata.gz: bab8ffe6c4116453e8cf34e3b5efa75bbfc2b13323e11faa1de9c09874ade462
+  data.tar.gz: 35c3ee491b842ab6cfd9636b922deb2e099fbb7988043c715b106b19247de283
 SHA512:
-  metadata.gz: 36c2509873572672d504f0de96785840b52d3993b3cc7febca16d9f08ed85f7e3e73c4995380aea74de3a2d431f4db772ed4c1b4bc268c698fea7ecf7445cf01
-  data.tar.gz: d226a93fa0f972789b5e1f9d842fe0ec1dcffefff3b846b2e977555fc29cafa23ffe2c20782f28d39dbdea6d67bccce5fc00120e0829fe0876019f08963c39ba
+  metadata.gz: 3438df6dc250dcde07b786e8ddbc5821385db0dd8559887c514e0030dbdd6a9d5c99cbaaf29bf36f9ab4747b8a364cbca007375f7e3d48a963da235aa1774052
+  data.tar.gz: af3f2899183dd62ad36e3d74ed27796dc95eafdc6b6bf9680c8f35b81a7eb63c40a5c8bdfaee067a961066cefade12730ba6780aa06f2e8ec2d8fc1d600f8161

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in utopia-websocket.gemspec
 gemspec
 
 group :test do

data/async-websocket.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async-io"
 	
 	spec.add_development_dependency "async-rspec"
-	spec.add_development_dependency "falcon", "~> 0.15.0"
+	spec.add_development_dependency "falcon", "~> 0.17.0"
 	
 	spec.add_development_dependency "bundler", "~> 1.6"
 	spec.add_development_dependency "rspec", "~> 3.6"

data/examples/chat/config.ru

@@ -2,16 +2,47 @@
 
 require 'async/websocket/server'
 
-$connections = []
+require 'async/actor'
+require 'set'
+
+bus = Async::Actor::Bus::Redis.new
+
+class Room
+	def initialize
+		@connections = Set.new
+	end
+	
+	def connect connection
+		@connections << connection
+	end
+	
+	def disconnect connection
+		@connections.delete(connection)
+	end
+	
+	def each(&block)
+		@connections.each(&block)
+	end
+end
+
+bus.supervise(:room) do
+	Room.new
+end
 
 run lambda {|env|
+	room = bus[:room]
+	
 	Async::WebSocket::Server.open(env) do |connection|
-		$connections << connection
-		
-		while message = connection.next_message
-			$connections.each do |connection|
-				connection.send_message(message)
+		begin
+			room.connect(connection)
+			
+			while message = connection.next_message
+				room.each do |connection|
+					connection.send_message(message)
+				end
 			end
+		rescue
+			room.disconnect(connection)
 		end
 	end
 	

data/lib/async/websocket/connection.rb

@@ -95,6 +95,7 @@ module Async
 			
 			def close
 				@driver.close
+				@socket.close
 			end
 		end
 	end

data/lib/async/websocket/server.rb

@@ -35,21 +35,28 @@ module Async
 			attr :env
 			attr :url
 			
+			HIJACK_RESPONSE = [-1, {}, []].freeze
+			
 			def self.open(env)
 				if ::WebSocket::Driver.websocket?(env)
+					return nil unless env['rack.hijack?']
+					
 					# https://github.com/rack/rack/blob/master/SPEC#L89-L93
-					peer = env['rack.hijack'].call
+					peer = Async::IO.try_convert(
+						env['rack.hijack'].call
+					)
 					
 					connection = self.new(env, peer)
 					
-					if block_given?
-						begin
-							yield(connection) || true
-						ensure
-							connection.close
-						end
-					else
-						return connection
+					return connection unless block_given?
+					
+					begin
+						yield(connection)
+						
+						return HIJACK_RESPONSE
+					ensure
+						connection.close
+						peer.close
 					end
 				end
 			end

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.5.0"
+		VERSION = "0.6.0"
 	end
 end

data/spec/async/websocket/connection_spec.rb

@@ -25,12 +25,12 @@ require 'rack/test'
 require 'falcon/server'
 require 'falcon/adapters/rack'
 
-RSpec.describe Async::WebSocket::Connection do
+RSpec.describe Async::WebSocket::Connection, timeout: 5 do
 	include_context Async::RSpec::Reactor
 	
 	let(:server_address) {Async::IO::Endpoint.tcp('0.0.0.0', 9000)}
 	let(:app) {Rack::Builder.parse_file(File.expand_path('../connection_spec.ru', __FILE__)).first}
-	let(:server) {Falcon::Server.new(Falcon::Adapters::Rack.new(app), server_address)}
+	let(:server) {Falcon::Server.new(Falcon::Server.middleware(app, verbose: true), server_address)}
 
 	it "should connect to the websocket server" do
 		server_task = reactor.async do

data/spec/async/websocket/connection_spec.ru

@@ -7,15 +7,16 @@ class Upgrade
 	end
 	
 	def call(env)
-		Async::WebSocket::Server.open(env) do |server|
+		result = Async::WebSocket::Server.open(env) do |server|
 			read, write = IO.pipe
 			
 			Process.spawn("ls -lah", :out => write)
 			write.close
 			
 			read.each_line do |line|
-				server.driver.text(line)
+				server.send_text(line)
 			end
+			
 		end or @app.call(env)
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement