Merge pull request rails#51503 from Shopify/record-ping-on-every-actioncable-message

Author: byroot

actioncable/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Record ping on every actioncable message
+
+    Previously only `ping` and `welcome` message types were keeping connection active.
+    Now every Action Cable message updates `pingedAt` value preventing connection from being marked as stale.
+
+    *yauhenininjia*
+
 *   Add two new assertion methods for ActionCable test cases: `assert_has_no_stream`
     and `assert_has_no_stream_for`. These methods can be used to assert that a
     stream has been stopped, e.g. via `stop_stream` or `stop_stream_for`. They complement

actioncable/app/assets/javascripts/action_cable.js

@@ -128,6 +128,7 @@ Connection.prototype.events = {
   message(event) {
     if (!this.isProtocolSupported()) { return }
     const {identifier, message, reason, reconnect, type} = JSON.parse(event.data)
+    this.monitor.recordMessage()
     switch (type) {
       case message_types.welcome:
         if (this.triedToReconnect()) {
@@ -139,7 +140,7 @@ Connection.prototype.events = {
         logger.log(`Disconnecting. Reason: ${reason}`)
         return this.close({allowReconnect: reconnect})
       case message_types.ping:
-        return this.monitor.recordPing()
+        return null
       case message_types.confirmation:
         this.subscriptions.confirmSubscription(identifier)
         if (this.reconnectAttempted) {

actioncable/app/assets/javascripts/actioncable.esm.js

@@ -37,13 +37,12 @@ class ConnectionMonitor {
     return this.startedAt && !this.stoppedAt
   }
 
-  recordPing() {
+  recordMessage() {
     this.pingedAt = now()
   }
 
   recordConnect() {
     this.reconnectAttempts = 0
-    this.recordPing()
     delete this.disconnectedAt
     logger.log("ConnectionMonitor recorded connect")
   }