[#1] Upd websocket-ruby version (added subprotocols support)

palkan · Feb 4, 2017 · eed9f5a · eed9f5a
1 parent f59bea9
commit eed9f5a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change log
 
-## master
+## 0.4.1 (2017-02-04)
+
+- Use `websocket-ruby` with subprotocols support ([@palkan][])
+
+## 0.4.0 (2017-01-29)
 
 - Initial version. ([@palkan][])
 

diff --git a/examples/sinatra/Gemfile b/examples/sinatra/Gemfile
@@ -9,8 +9,8 @@ gem 'puma'
 gem 'pry-byebug'
 
 # litecable deps
-gem "anyway_config", "~>0.5.0"
-gem "websocket"
+gem "anyway_config", "~> 0.5.0"
+gem "websocket", "~> 1.2.4"
 
 # anycable
 gem "anycable", "~> 0.4.2"
diff --git a/lib/lite_cable/connection/subscriptions.rb b/lib/lite_cable/connection/subscriptions.rb
@@ -56,7 +56,7 @@ def execute_command(data)
         when "unsubscribe" then remove(data["identifier"])
         when "message"     then perform_action(data["identifier"], data["data"])
         else
-          raise UnknownCommandError
+          raise UnknownCommandError, "Command not found #{command}"
         end
       end
 

diff --git a/lib/lite_cable/server/client_socket/base.rb b/lib/lite_cable/server/client_socket/base.rb
@@ -113,6 +113,8 @@ def close_socket
           frame = WebSocket::Frame::Outgoing::Server.new(version: version, type: :close, code: 1000)
           @socket.write(frame.to_s) if frame.supported?
           @socket.close
+        rescue IOError, Errno::EPIPE, Errno::ETIMEDOUT # rubocop:disable Lint/HandleExceptions
+          # already closed
         end
 
         def keepalive

diff --git a/lib/lite_cable/server/middleware.rb b/lib/lite_cable/server/middleware.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module LiteCable
   module Server
-    require "lite_cable/server/websocket_ext/protocols"
     # Rack middleware to hijack the socket
     class Middleware
       class HijackNotAvailable < RuntimeError; end
@@ -30,10 +29,11 @@ def call(env)
       private
 
       def send_handshake(env)
-        handshake = WebSocket::Handshake::Server.new
-        handshake.from_rack env
-        handshake.protocols LiteCable::INTERNAL[:protocols]
+        handshake = WebSocket::Handshake::Server.new(
+          protocols: LiteCable::INTERNAL[:protocols]
+        )
 
+        handshake.from_rack env
         env['rack.hijack_io'].write handshake.to_s
         handshake
       end

diff --git a/lib/lite_cable/server/websocket_ext/protocols.rb b/lib/lite_cable/server/websocket_ext/protocols.rb
diff --git a/lib/lite_cable/version.rb b/lib/lite_cable/version.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module LiteCable
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
diff --git a/litecable.gemspec b/litecable.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "anyway_config", "~>0.5.0"
 
   spec.add_development_dependency "rack", "~> 2.0"
-  spec.add_development_dependency "websocket", "~> 1.2.0"
+  spec.add_development_dependency "websocket", "~> 1.2.4"
   spec.add_development_dependency "websocket-client-simple", "~> 0.3.0"
   spec.add_development_dependency "concurrent-ruby", "~> 1.0.0"
   spec.add_development_dependency "puma", "~> 3.6.0"

diff --git a/spec/integrations/server_spec.rb b/spec/integrations/server_spec.rb
@@ -70,7 +70,7 @@ def bulk(data)
 
   let(:cookies) { "user=john" }
   let(:path) { "/?sid=123" }
-  let(:client) { @client = SyncClient.new("ws://127.0.0.1:3099#{path}", cookies) }
+  let(:client) { @client = SyncClient.new("ws://127.0.0.1:3099#{path}", cookies: cookies) }
   let(:logs) { ServerTest.logs }
 
   after { logs.clear }
@@ -127,7 +127,7 @@ def bulk(data)
   end
 
   describe "broadcasts" do
-    let(:client2) { @client2 = SyncClient.new("ws://127.0.0.1:3099/?sid=234", "user=alice") }
+    let(:client2) { @client2 = SyncClient.new("ws://127.0.0.1:3099/?sid=234", cookies: "user=alice") }
 
     let(:clients) { [client, client2] }
 

diff --git a/spec/support/sync_client.rb b/spec/support/sync_client.rb
@@ -11,15 +11,20 @@ class SyncClient
 
   attr_reader :pings
 
-  def initialize(url, cookies = '')
+  def initialize(url, cookies: '')
     messages = @messages = Queue.new
     closed = @closed = Concurrent::Event.new
     has_messages = @has_messages = Concurrent::Semaphore.new(0)
     pings = @pings = Concurrent::AtomicFixnum.new(0)
 
     open = Concurrent::Promise.new
 
-    @ws = WebSocket::Client::Simple.connect(url, headers: { 'COOKIE' => cookies }) do |ws|
+    @ws = WebSocket::Client::Simple.connect(
+      url,
+      headers: {
+        'COOKIE' => cookies
+      }
+    ) do |ws|
       ws.on(:error) do |event|
         event = RuntimeError.new(event.message) unless event.is_a?(Exception)