From 82a1bf268d289cd647f681ce5c92c6b1efedd816 Mon Sep 17 00:00:00 2001
From: Javan Makhmali <javan@javan.us>
Date: Thu, 3 Mar 2016 17:33:56 -0500
Subject: [PATCH] Establish WebSocket connection when first subscription is
 created. Fixes #24026

* More intention revealing than connecting on the first call to Connection#send
* Fixes that calls to Connection#send would attempt to open a connection when the WebSocket's state is CONNECTING
---
 .../javascripts/action_cable/connection.coffee      | 13 +++++--------
 .../assets/javascripts/action_cable/consumer.coffee |  4 ++++
 .../javascripts/action_cable/subscriptions.coffee   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/actioncable/app/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee
index 25793ea3d3..9be5cdf5fb 100644
--- a/actioncable/app/assets/javascripts/action_cable/connection.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee
@@ -8,9 +8,6 @@ class ActionCable.Connection
   constructor: (@consumer) ->
 
   send: (data) ->
-    unless @isOpen()
-      @open()
-
     if @isOpen()
       @webSocket.send(JSON.stringify(data))
       true
@@ -18,7 +15,7 @@ class ActionCable.Connection
       false
 
   open: =>
-    if @isAlive()
+    if @isActive()
       ActionCable.log("Attemped to open WebSocket, but existing socket is #{@getState()}")
       throw new Error("Existing connection must be closed before opening")
     else
@@ -33,7 +30,7 @@ class ActionCable.Connection
 
   reopen: ->
     ActionCable.log("Reopening WebSocket, current state is #{@getState()}")
-    if @isAlive()
+    if @isActive()
       try
         @close()
       catch error
@@ -47,10 +44,10 @@ class ActionCable.Connection
   isOpen: ->
     @isState("open")
 
-  # Private
+  isActive: ->
+    @isState("open", "connecting")
 
-  isAlive: ->
-    @webSocket? and not @isState("closing", "closed")
+  # Private
 
   isState: (states...) ->
     @getState() in states
diff --git a/actioncable/app/assets/javascripts/action_cable/consumer.coffee b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
index 717c0641a9..3d93d40b99 100644
--- a/actioncable/app/assets/javascripts/action_cable/consumer.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/consumer.coffee
@@ -23,3 +23,7 @@ class ActionCable.Consumer
 
   send: (data) ->
     @connection.send(data)
+
+  ensureActiveConnection: ->
+    unless @connection.isActive()
+      @connection.open()
diff --git a/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
index 2443bca14a..9d93b462a7 100644
--- a/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/subscriptions.coffee
@@ -19,6 +19,7 @@ class ActionCable.Subscriptions
 
   add: (subscription) ->
     @subscriptions.push(subscription)
+    @consumer.ensureActiveConnection()
     @notify(subscription, "initialized")
     @sendCommand(subscription, "subscribe")
 
@@ -59,4 +60,3 @@ class ActionCable.Subscriptions
   sendCommand: (subscription, command) ->
     {identifier} = subscription
     @consumer.send({command, identifier})
-