async-websocket 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8954f1e1bb06c1e4188f6b248f2c78ee7b79ced5
-  data.tar.gz: 3dc3b81c1c475d07cab9281ace55bc7c4ec265f1
+SHA256:
+  metadata.gz: '0158791283f1da9ef7fe755bd019899508f3d647fc9f18984e2b7ef77a3074db'
+  data.tar.gz: 22b4fcb061a87637d7c108e465e65ae3388379850a85f1f65e8661f7d1867b1c
 SHA512:
-  metadata.gz: d452579efb8559353825d4e4771112ed5a25cc0d0abac7e3f508431a2c65795250767dddc824d1c9cd297e0e1bbff20d9d5ccc5d119be50657cb6386ce717b7e
-  data.tar.gz: 67d57f3cb2202e527ddd35493700612db4e166692cc7f880f2dbcaa908766bb4c711a47b0c3fa281fb463f89280c40486c54680be0179c3538957ed014a9f69b
+  metadata.gz: b6ec6a61a6b1c63545739a2dec75455a1a9a68addde791deb339f4190246e5469875f13e8fa84f45505d579073668d45dd4bdc28c833fba3f5164a8f21a4afd7
+  data.tar.gz: f37bf0833c8c894fc5d0f71248abf4c1cac83bf4a4f6b70676d6f044217ba9ac2ccb6edc60ead20dfa53c6c8c47e872eb0db559e0c2229faf6e85f03c139c049

data/chat/client.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require 'async/reactor'
+require 'async/io/stream'
+require 'async/http/url_endpoint'
+require 'async/websocket/client'
+
+URL = ARGV.pop
+USER = ARGV.pop
+
+Async::Reactor.run do |task|
+	endpoint = Async::HTTP::URLEndpoint.parse(URL)
+	
+	endpoint.connect do |socket|
+		connection = Async::WebSocket::Client.new(socket, URL)
+		
+		connection.send_message({
+			user: USER,
+			status: "connected",
+		})
+		
+		task.async do
+			stdin = Async::IO::Stream.new(
+				Async::IO::Generic.new($stdin)
+			)
+			
+			puts "Waiting for input..."
+			while line = stdin.read_until("\n")
+				puts "Sending text: #{line}"
+				connection.send_message({
+					user: USER,
+					text: line,
+				})
+			end
+		end
+		
+		while message = connection.next_message
+			puts "Message from server: #{message.inspect}"
+		end
+	end
+end

data/chat/config.ru

@@ -0,0 +1,21 @@
+#!/usr/bin/env falcon serve --concurrency 1 -c
+
+require 'async/websocket/server'
+
+Message = Struct.new(:user, :contents, :created_at)
+
+$connections = []
+
+run lambda {|env|
+	Async::WebSocket::Server.open(env) do |connection|
+		$connections << connection
+		
+		while message = connection.next_message
+			$connections.each do |connection|
+				connection.send_message(message)
+			end
+		end
+	end
+	
+	[200, {}, ["Hello World"]]
+}

data/lib/async/websocket.rb

@@ -19,67 +19,5 @@
 # THE SOFTWARE.
 
 require_relative 'websocket/version'
-require 'websocket/driver'
-
-module Async
-	def self.WebSocket?(env)
-		::WebSocket::Driver.websocket?(env)
-	end
-	
-	module WebSocket
-		class Connection
-			READ_BUFFER_SIZE = 1024*8
-			
-			attr_reader :env, :url
-			
-			def initialize(env, io)
-				@env = env
-				@io = io
-				
-				scheme = Rack::Request.new(env).ssl? ? 'wss:' : 'ws:'
-				@url = "#{scheme}//#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
-				
-				@driver = ::WebSocket::Driver.rack(self)
-				@running = false
-			end
-			
-			def write(string)
-				@io.write(string)
-			end
-			
-			def read
-				@driver.parse(@io.read(READ_BUFFER_SIZE))
-			end
-			
-			def run(&handler)
-				@running = true
-				
-				@driver.on(:close) do
-					@running = false
-				end
-				
-				@driver.on(:open) do
-					yield @driver if block_given?
-				end
-				
-				@driver.start
-				
-				while @running
-					self.read
-				end
-			end
-		end
-		
-		def self.open(env)
-			if ::WebSocket::Driver.websocket?(env)
-				env['rack.hijack'].call
-				
-				connection = Connection.new(env, env['rack.hijack_io'])
-				
-				connection.run do |driver|
-					yield driver
-				end
-			end
-		end
-	end
-end
+require_relative 'websocket/server'
+require_relative 'websocket/client'

data/lib/async/websocket/client.rb

@@ -18,71 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'websocket/driver'
-require 'json'
+require_relative 'connection'
 
 module Async
 	module WebSocket
 		# This is a basic synchronous websocket client:
-		class Client
-			EVENTS = [:open, :message, :close]
-			
-			def initialize(socket, url: "ws://.")
-				@socket = socket
+		class Client < Connection
+			def initialize(socket, url = "ws://.")
 				@url = url
 				
-				@driver = ::WebSocket::Driver.client(self)
-				
-				@queue = []
-				
-				@driver.on(:error) do |error|
-					raise error
-				end
-				
-				EVENTS.each do |event|
-					@driver.on(event) do |data|
-						@queue.push(data)
-					end
-				end
-				
-				@driver.start
-			end
-			
-			attr :driver
-			attr :url
-			
-			def next_event
-				while @queue.empty?
-					data = @socket.read(1024)
-					
-					if data and !data.empty?
-						@driver.parse(data)
-					else
-						return nil
-					end
-				end
-				
-				@queue.shift
-			rescue EOFError
-				return nil
-			end
-			
-			def next_message
-				while event = next_event
-					if event.is_a? ::WebSocket::Driver::MessageEvent
-						return JSON.parse(event.data)
-					elsif event.is_a? ::WebSocket::Driver::CloseEvent
-						return nil
-					end
-				end
-			end
-			
-			def write(data)
-				@socket.write(data)
-			end
-			
-			def close
-				@driver.close
+				super socket, ::WebSocket::Driver.client(self)
 			end
 		end
 	end

data/lib/async/websocket/connection.rb

@@ -0,0 +1,91 @@
+# 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.
+
+require 'websocket/driver'
+require 'json'
+
+module Async
+	module WebSocket
+		# This is a basic synchronous websocket client:
+		class Connection
+			EVENTS = [:open, :message, :close]
+			
+			def initialize(socket, driver)
+				@socket = socket
+				@driver = driver
+				
+				@queue = []
+				
+				@driver.on(:error) do |error|
+					raise error
+				end
+				
+				EVENTS.each do |event|
+					@driver.on(event) do |data|
+						@queue.push(data)
+					end
+				end
+				
+				@driver.start
+			end
+			
+			attr :driver
+			attr :url
+			
+			def next_event
+				while @queue.empty?
+					data = @socket.read(1024)
+					
+					if data and !data.empty?
+						@driver.parse(data)
+					else
+						return nil
+					end
+				end
+				
+				@queue.shift
+			rescue EOFError
+				return nil
+			end
+			
+			def next_message
+				while event = next_event
+					if event.is_a? ::WebSocket::Driver::MessageEvent
+						return JSON.parse(event.data)
+					elsif event.is_a? ::WebSocket::Driver::CloseEvent
+						return nil
+					end
+				end
+			end
+			
+			def send_message(message)
+				@driver.text(JSON.dump(message))
+			end
+			
+			def write(data)
+				@socket.write(data)
+			end
+			
+			def close
+				@driver.close
+			end
+		end
+	end
+end

data/lib/async/websocket/server.rb

@@ -0,0 +1,57 @@
+# 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.
+
+require_relative 'connection'
+
+module Async
+	module WebSocket
+		class Server < Connection
+			def initialize(env, socket)
+				scheme = env['rack.url_scheme'] == 'https' ? 'wss' : 'ws'
+				@url = "#{scheme}://#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
+				
+				@env = env
+				
+				super socket, ::WebSocket::Driver.rack(self)
+			end
+			
+			attr :env
+			attr :url
+			
+			def self.open(env)
+				if ::WebSocket::Driver.websocket?(env)
+					env['rack.hijack'].call
+					
+					connection = self.new(env, env['rack.hijack_io'])
+					
+					if block_given?
+						begin
+							yield(connection) || true
+						ensure
+							connection.close
+						end
+					else
+						return connection
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.2.0"
+		VERSION = "0.3.0"
 	end
 end

data/spec/async/websocket/connection_spec.rb

@@ -26,12 +26,13 @@ require 'falcon/server'
 
 RSpec.describe Async::WebSocket::Connection 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(app, [server_address])}
 
 	it "should connect to the websocket server" do
-		server_task = Async::Reactor.run do
+		server_task = reactor.async do
 			server.run
 		end
 		

data/spec/async/websocket/connection_spec.ru

@@ -1,5 +1,5 @@
 
-require 'async/websocket'
+require 'async/websocket/server'
 
 class Upgrade
 	def initialize(app)
@@ -7,22 +7,16 @@ class Upgrade
 	end
 	
 	def call(env)
-		if Async::WebSocket?(env)
-			Async::WebSocket.open(env) do |connection|
-				read, write = IO.pipe
-				
-				Process.spawn("ls -lah", :out => write)
-				write.close
-				
-				read.each_line do |line|
-					connection.text(line)
-				end
-				
-				connection.close
+		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)
 			end
-		else
-			@app.call(env)
-		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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -122,8 +122,12 @@ files:
 - README.md
 - Rakefile
 - async-websocket.gemspec
+- chat/client.rb
+- chat/config.ru
 - lib/async/websocket.rb
 - lib/async/websocket/client.rb
+- lib/async/websocket/connection.rb
+- lib/async/websocket/server.rb
 - lib/async/websocket/version.rb
 - spec/async/websocket/connection_spec.rb
 - spec/async/websocket/connection_spec.ru
@@ -148,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.