From 1c34d1ca067c025409a4eb6de2f26f4ac12550fc Mon Sep 17 00:00:00 2001 From: wurui Date: Wed, 10 Apr 2013 14:48:49 +0800 Subject: [PATCH] update websocket test code --- README.md | 6 ++++-- websocket.rb | 16 ---------------- websocket1.rb | 9 +++++++++ websocket2.rb | 17 +++++++++++++++++ websocket_old.rb | 11 ----------- 5 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 websocket.rb create mode 100644 websocket1.rb create mode 100644 websocket2.rb delete mode 100644 websocket_old.rb diff --git a/README.md b/README.md index d1cc47f..6ba344d 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,10 @@ ruby websocket connection test ###with em-websocket 0.5.0 - bundle exec ruby websocket.rb + bundle exec ruby websocket1.rb + bundle exec ruby websocket2.rb ###with em-websocket 0.3.8 - bundle exec ruby websocket_old.rb + bundle exec ruby websocket1.rb + bundle exec ruby websocket2.rb bundle exec ruby goliath_websocket.rb -e prod -sv -p 8080 diff --git a/websocket.rb b/websocket.rb deleted file mode 100644 index 15988b3..0000000 --- a/websocket.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'em-websocket' - -# only em-websocket 0.5.0 -EM.run { - EM::WebSocket.run(:host => "0.0.0.0", :port => 8080, :debug => false) do |ws| - ws.onopen { |handshake|puts "WebSocket opened #{{ - :path => handshake.path, - :query => handshake.query, - :origin => handshake.origin, - }}" - } - ws.onmessage { |msg| ws.send "Pong: #{msg}" } - ws.onclose { puts "WebSocket closed" } - ws.onerror { |e| puts "Error: #{e.message}" } - end -} diff --git a/websocket1.rb b/websocket1.rb new file mode 100644 index 0000000..932e940 --- /dev/null +++ b/websocket1.rb @@ -0,0 +1,9 @@ +require 'em-websocket' + +# Start WebSocket server, including starting eventmachine run loop +EM::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws| + ws.onopen { |handshake| puts "WebSocket opened" } + ws.onmessage { |msg| ws.send "Pong: #{msg}" } + ws.onclose { puts "WebSocket closed" } + ws.onerror { |e| puts "Error: #{e.message}" } +end \ No newline at end of file diff --git a/websocket2.rb b/websocket2.rb new file mode 100644 index 0000000..bbbb82c --- /dev/null +++ b/websocket2.rb @@ -0,0 +1,17 @@ +require 'em-websocket' + +EM.run { + EM.start_server('0.0.0.0', 8080, EM::WebSocket::Connection, :debug => false) do |ws| + # only em-websocket 0.5.0 support + # ws.onopen { |handshake|puts "WebSocket opened #{{ + # :path => handshake.path, + # :query => handshake.query, + # :origin => handshake.origin, + # }}" + # } + ws.onopen { puts "WS opening"} + ws.onmessage { |msg| ws.send "Pong: #{msg}" } + ws.onclose { puts "WebSocket closed" } + ws.onerror { |e| puts "Error: #{e.message}" } + end +} diff --git a/websocket_old.rb b/websocket_old.rb deleted file mode 100644 index fc9d2fe..0000000 --- a/websocket_old.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'em-websocket' - -# em-websocket 0.3.8 & 0.5.0 -EventMachine.run do - EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws| - ws.onopen { |handshake| puts "WebSocket opened" } - ws.onmessage { |msg| ws.send "Pong: #{msg}" } - ws.onclose { puts "WebSocket closed" } - ws.onerror { |e| puts "Error: #{e.message}" } - end -end \ No newline at end of file