action_cable_client 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4085894ce47fa6d116953ecdaf16770f7849cb27
-  data.tar.gz: 654c166304ca757a36fd0c4d3755ee132fdbe497
+  metadata.gz: ce107c85e351970c2f8f0b4dec9608c75d78384c
+  data.tar.gz: cff39593ed8b01083d87c438617e3a8d073559db
 SHA512:
-  metadata.gz: 368ca003b9182f912b7b81b3b4d5715d33c33cb047f16d3b6ae29a38a722e13494f60837e1aa05c7608a8628311aa585c2769407664557a735e14af4513430d8
-  data.tar.gz: c99816b5ede4d23cf3442b00bf9eb7feadf26a0a3c811c63c65ca8e48ecd1997858a8cedfda6376c6de17882e986003f08b791610a9a48cd0b77b83ace70d077
+  metadata.gz: 8fa7c5702425a8494356236f444f10403a8f5bd21ae4029b3d3965c08e5f344830ab83dc05573b2ad32c29012820a215aac6383c26c8d61a542f33f6995311d7
+  data.tar.gz: c1f15938485dbe86c96abff5e0b922a4c270400f76d7202cc87e194e6513da934f9f5f467f6778edd960b982f8e22c4f0aa2c19427c3cfa48f4a4917eaeb9827

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.2
+
+* [#24](https://github.com/NullVoxPopuli/action_cable_client/pull/24) Fix bug where action cable client is too fast for the server and doesn't wait for the server's welcome message before initiating a channel subscription (@wpp)
+
 ## 2.0.1
 
 **General**

data/lib/action_cable_client.rb

@@ -22,7 +22,7 @@ class ActionCableClient
   attr_reader :_message_factory
   # The queue should store entries in the format:
   # [ action, data ]
-  attr_accessor :message_queue, :_subscribed, :_subscribed_callaback, :_pinged_callback
+  attr_accessor :message_queue, :_subscribed, :_subscribed_callback, :_pinged_callback, :_connected_callback
 
   def_delegator :_websocket_client, :onerror, :errored
   def_delegator :_websocket_client, :send, :send_msg
@@ -91,7 +91,7 @@ class ActionCableClient
   #     # do things after the client is connected to the server
   #   end
   def connected
-    _websocket_client.onopen do
+    self._connected_callback = Proc.new do
       subscribe
       yield
     end
@@ -111,7 +111,7 @@ class ActionCableClient
   #     # do things after successful subscription confirmation
   #   end
   def subscribed(&block)
-    self._subscribed_callaback = block
+    self._subscribed_callback = block
   end
 
   # @return [Boolean] is the client subscribed to the channel?
@@ -147,6 +147,8 @@ class ActionCableClient
 
     if is_ping?(json)
       _pinged_callback&.call(json)
+    elsif is_welcome?(json)
+      _connected_callback&.call(json)
     elsif !subscribed?
       check_for_subscribe_confirmation(json)
     else
@@ -162,7 +164,7 @@ class ActionCableClient
     return unless  Message::TYPE_CONFIRM_SUBSCRIPTION == message_type
 
     self._subscribed = true
-    _subscribed_callaback&.call
+    _subscribed_callback&.call
   end
 
   # {"identifier" => "_ping","message" => 1460201942}
@@ -172,6 +174,12 @@ class ActionCableClient
     Message::IDENTIFIER_PING == message_identifier
   end
 
+  # {"type" => "welcome"}
+  def is_welcome?(message)
+    message_identifier = message[Message::TYPE_KEY]
+    Message::IDENTIFIER_WELCOME == message_identifier
+  end
+
   def subscribe
     msg = _message_factory.create(Commands::SUBSCRIBE)
     send_msg(msg.to_json)

data/lib/action_cable_client/message.rb

@@ -4,6 +4,7 @@ class ActionCableClient
   class Message
     IDENTIFIER_KEY = 'identifier'
     IDENTIFIER_PING = 'ping'
+    IDENTIFIER_WELCOME = 'welcome'
     # Type is never sent, but is received
     # TODO: find a better place for this constant
     TYPE_KEY = 'type'

data/lib/action_cable_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActionCableClient
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_cable_client
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -117,5 +117,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: ActionCableClient-2.0.1
+summary: ActionCableClient-2.0.2
 test_files: []