actioncable 6.0.6.1 → 6.1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882be1e6676b7ce91097561f41e964e5f0d2e1d35c38e157c9d5c86dc4b3d008
-  data.tar.gz: fcf2c1e56a948ab0d57d70aeaf6ae041bdb860d98dcd3a9e93017746211579e5
+  metadata.gz: 9eb88c84ff926e7ab47c12d491e78798b891fdf57095d1379866c15cbad83106
+  data.tar.gz: fbb54a006e030cfd1dd711f3e317942aaaae92a853cef920417852a48b7ecbb7
 SHA512:
-  metadata.gz: ec8b14e09d3d322f5ecd792bba2f2cc3febff0c84acf0759fc9640922a5f19fb9d190e86016eacd565dc214f0c7b3f605d7cc99f97699c707af7e13bff760399
-  data.tar.gz: e17602b825c53a4a7ab78b087a31c5a076c3ca642b37f9c3bdd55cff6c7b95533b892314bb518aadada934f26affd2d1fdb597d56ff8b652a60a01c632f8e434
+  metadata.gz: eee59b19157d761dad768c8f14195d85ffee31920c19edbf4ed16ceee23827a8365b1ba85057695042bae685191aff6f7d9b4de8994b3a6115711e3bd4391e66
+  data.tar.gz: b5a73ade374018bd881461d9ea287707bedfa08cb72b7d256cd32f2de84ba56390c86a996a3335502a75bca53bfbe2c7c04c70fb5519f9c4774cb0a09eb10320

data/CHANGELOG.md

@@ -1,299 +1,180 @@
-## Rails 6.0.6.1 (January 17, 2023) ##
+## Rails 6.1.7.6 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.6 (September 09, 2022) ##
+## Rails 6.1.7.5 (August 22, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5.1 (July 12, 2022) ##
+## Rails 6.1.7.4 (June 26, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.5 (May 09, 2022) ##
+## Rails 6.1.7.3 (March 13, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.8 (April 26, 2022) ##
+## Rails 6.1.7.2 (January 24, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.7 (March 08, 2022) ##
+## Rails 6.1.7.1 (January 17, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.6 (February 11, 2022) ##
+## Rails 6.1.7 (September 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.5 (February 11, 2022) ##
+## Rails 6.1.6.1 (July 12, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.4 (December 15, 2021) ##
+## Rails 6.1.6 (May 09, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.3 (December 14, 2021) ##
+## Rails 6.1.5.1 (April 26, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.4.2 (December 14, 2021) ##
-
-*   No changes.
+## Rails 6.1.5 (March 09, 2022) ##
 
+*   The Action Cable client now ensures successful channel subscriptions:
 
-## Rails 6.0.4.1 (August 19, 2021) ##
-
-*   No changes.
+    * The client maintains a set of pending subscriptions until either
+      the server confirms the subscription or the channel is torn down.
+    * Rectifies the race condition where an unsubscribe is rapidly followed
+      by a subscribe (on the same channel identifier) and the requests are
+      handled out of order by the ActionCable server, thereby ignoring the
+      subscribe command.
 
+    *Daniel Spinosa*
 
-## Rails 6.0.4 (June 15, 2021) ##
+*   Truncate broadcast logging messages.
 
-*   No changes.
+    *J Smith*
 
 
-## Rails 6.0.3.7 (May 05, 2021) ##
+## Rails 6.1.4.7 (March 08, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.6 (May 04, 2021) ##
+## Rails 6.1.4.6 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.6 (March 26, 2021) ##
+## Rails 6.1.4.5 (February 11, 2022) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.5 (February 10, 2021) ##
+## Rails 6.1.4.4 (December 15, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.4 (October 07, 2020) ##
+## Rails 6.1.4.3 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.3 (September 09, 2020) ##
+## Rails 6.1.4.2 (December 14, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.2 (June 17, 2020) ##
+## Rails 6.1.4.1 (August 19, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.3.1 (May 18, 2020) ##
-
-*   No changes.
+## Rails 6.1.4 (June 24, 2021) ##
 
+*   Fix `ArgumentError` with ruby 3.0 on `RemoteConnection#disconnect`.
 
-## Rails 6.0.3 (May 06, 2020) ##
+    *Vladislav*
 
-*   No changes.
 
-
-## Rails 6.0.2.2 (March 19, 2020) ##
+## Rails 6.1.3.2 (May 05, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2.1 (December 18, 2019) ##
+## Rails 6.1.3.1 (March 26, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.2 (December 13, 2019) ##
+## Rails 6.1.3 (February 17, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.1 (November 5, 2019) ##
+## Rails 6.1.2.1 (February 10, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.0 (August 16, 2019) ##
+## Rails 6.1.2 (February 09, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.0.rc2 (July 22, 2019) ##
+## Rails 6.1.1 (January 07, 2021) ##
 
 *   No changes.
 
 
-## Rails 6.0.0.rc1 (April 24, 2019) ##
-
-*   No changes.
-
-
-## Rails 6.0.0.beta3 (March 11, 2019) ##
-
-*   No changes.
+## Rails 6.1.0 (December 09, 2020) ##
 
+*   `ActionCable::Connection::Base` now allows intercepting unhandled exceptions
+    with `rescue_from` before they are logged, which is useful for error reporting
+    tools and other integrations.
 
-## Rails 6.0.0.beta2 (February 25, 2019) ##
+    *Justin Talbott*
 
-*   PostgreSQL subscription adapters now support `channel_prefix` option in cable.yml
+*   Add `ActionCable::Channel#stream_or_reject_for` to stream if record is present, otherwise reject the connection
 
-    Avoids channel name collisions when multiple apps use the same database for Action Cable.
-
-    *Vladimir Dementyev*
-
-*   Allow passing custom configuration to `ActionCable::Server::Base`.
-
-    You can now create a standalone Action Cable server with a custom configuration
-    (e.g. to run it in isolation from the default one):
-
-    ```ruby
-    config = ActionCable::Server::Configuration.new
-    config.cable = { adapter: "redis", channel_prefix: "custom_" }
-
-    CUSTOM_CABLE = ActionCable::Server::Base.new(config: config)
-    ```
-
-    Then you can mount it in the `routes.rb` file:
-
-    ```ruby
-    Rails.application.routes.draw do
-      mount CUSTOM_CABLE => "/custom_cable"
-      # ...
-    end
-    ```
-
-    *Vladimir Dementyev*
-
-*   Add `:action_cable_connection` and `:action_cable_channel` load hooks.
-
-    You can use them to extend `ActionCable::Connection::Base` and `ActionCable::Channel::Base`
-    functionality:
-
-    ```ruby
-    ActiveSupport.on_load(:action_cable_channel) do
-      # do something in the context of ActionCable::Channel::Base
-    end
-    ```
+    *Atul Bhosale*
 
-    *Vladimir Dementyev*
+*   Add `ActionCable::Channel#stop_stream_from` and `#stop_stream_for` to unsubscribe from a specific stream.
 
-*   Add `Channel::Base#broadcast_to`.
+    *Zhang Kang*
 
-    You can now call `broadcast_to` within a channel action, which equals to
-    the `self.class.broadcast_to`.
+*   Add PostgreSQL subscription connection identificator.
 
-    *Vladimir Dementyev*
+    Now you can distinguish Action Cable PostgreSQL subscription connections among others.
+    Also, you can set custom `id` in `cable.yml` configuration.
 
-*   Make `Channel::Base.broadcasting_for` a public API.
-
-    You can use `.broadcasting_for` to generate a unique stream identifier within
-    a channel for the specified target (e.g. Active Record model):
-
-    ```ruby
-    ChatChannel.broadcasting_for(model) # => "chat:<model.to_gid_param>"
-    ```
-
-    *Vladimir Dementyev*
-
-
-## Rails 6.0.0.beta1 (January 18, 2019) ##
-
-*   [Rename npm package](https://github.com/rails/rails/pull/34905) from
-    [`actioncable`](https://www.npmjs.com/package/actioncable) to
-    [`@rails/actioncable`](https://www.npmjs.com/package/@rails/actioncable).
-
-    *Javan Makhmali*
-
-*   Merge [`action-cable-testing`](https://github.com/palkan/action-cable-testing) to Rails.
-
-    *Vladimir Dementyev*
-
-*   The JavaScript WebSocket client will no longer try to reconnect
-    when you call `reject_unauthorized_connection` on the connection.
-
-    *Mick Staugaard*
-
-*   `ActionCable.Connection#getState` now references the configurable
-    `ActionCable.adapters.WebSocket` property rather than the `WebSocket` global
-    variable, matching the behavior of `ActionCable.Connection#open`.
-
-    *Richard Macklin*
-
-*   The ActionCable javascript package has been converted from CoffeeScript
-    to ES2015, and we now publish the source code in the npm distribution.
-
-    This allows ActionCable users to depend on the javascript source code
-    rather than the compiled code, which can produce smaller javascript bundles.
-
-    This change includes some breaking changes to optional parts of the
-    ActionCable javascript API:
-
-    - Configuration of the WebSocket adapter and logger adapter have been moved
-      from properties of `ActionCable` to properties of `ActionCable.adapters`.
-      If you are currently configuring these adapters you will need to make
-      these changes when upgrading:
-
-      ```diff
-      -    ActionCable.WebSocket = MyWebSocket
-      +    ActionCable.adapters.WebSocket = MyWebSocket
-      ```
-      ```diff
-      -    ActionCable.logger = myLogger
-      +    ActionCable.adapters.logger = myLogger
-      ```
-
-    - The `ActionCable.startDebugging()` and `ActionCable.stopDebugging()`
-      methods have been removed and replaced with the property
-      `ActionCable.logger.enabled`. If you are currently using these methods you
-      will need to make these changes when upgrading:
-
-      ```diff
-      -    ActionCable.startDebugging()
-      +    ActionCable.logger.enabled = true
-      ```
-      ```diff
-      -    ActionCable.stopDebugging()
-      +    ActionCable.logger.enabled = false
-      ```
-
-    *Richard Macklin*
-
-*   Add `id` option to redis adapter so now you can distinguish
-    ActionCable's redis connections among others. Also, you can set
-    custom id in options.
-
-    Before:
-    ```
-    $ redis-cli client list
-    id=669 addr=127.0.0.1:46442 fd=8 name= age=18 ...
-    ```
-
-    After:
-    ```
-    $ redis-cli client list
-    id=673 addr=127.0.0.1:46516 fd=8 name=ActionCable-PID-19413 age=2 ...
+    ```sql
+    SELECT application_name FROM pg_stat_activity;
+    /*
+        application_name
+    ------------------------
+    psql
+    ActionCable-PID-42
+    (2 rows)
+    */
     ```
 
-    *Ilia Kasianenko*
+    *Sergey Ponomarev*
 
-*   Rails 6 requires Ruby 2.5.0 or newer.
+*   Subscription confirmations and rejections are now logged at the `DEBUG` level instead of `INFO`.
 
-    *Jeremy Daer*, *Kasper Timm Hansen*
+    *DHH*
 
 
-Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actioncable/CHANGELOG.md) for previous changes.
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actioncable/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019 Basecamp, LLC
+Copyright (c) 2015-2022 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/action_cable.js

@@ -135,7 +135,7 @@
       if (document.visibilityState === "visible") {
         setTimeout(function() {
           if (_this2.connectionIsStale() || !_this2.connection.isOpen()) {
-            logger.log("ConnectionMonitor reopening stale connection on visibilitychange. visbilityState = " + document.visibilityState);
+            logger.log("ConnectionMonitor reopening stale connection on visibilitychange. visibilityState = " + document.visibilityState);
             _this2.connection.reopen();
           }
         }, 200);
@@ -291,6 +291,7 @@
         return this.monitor.recordPing();
 
        case message_types.confirmation:
+        this.subscriptions.confirmSubscription(identifier);
         return this.subscriptions.notify(identifier, "connected");
 
        case message_types.rejection:
@@ -360,10 +361,52 @@
     };
     return Subscription;
   }();
+  var SubscriptionGuarantor = function() {
+    function SubscriptionGuarantor(subscriptions) {
+      classCallCheck(this, SubscriptionGuarantor);
+      this.subscriptions = subscriptions;
+      this.pendingSubscriptions = [];
+    }
+    SubscriptionGuarantor.prototype.guarantee = function guarantee(subscription) {
+      if (this.pendingSubscriptions.indexOf(subscription) == -1) {
+        logger.log("SubscriptionGuarantor guaranteeing " + subscription.identifier);
+        this.pendingSubscriptions.push(subscription);
+      } else {
+        logger.log("SubscriptionGuarantor already guaranteeing " + subscription.identifier);
+      }
+      this.startGuaranteeing();
+    };
+    SubscriptionGuarantor.prototype.forget = function forget(subscription) {
+      logger.log("SubscriptionGuarantor forgetting " + subscription.identifier);
+      this.pendingSubscriptions = this.pendingSubscriptions.filter(function(s) {
+        return s !== subscription;
+      });
+    };
+    SubscriptionGuarantor.prototype.startGuaranteeing = function startGuaranteeing() {
+      this.stopGuaranteeing();
+      this.retrySubscribing();
+    };
+    SubscriptionGuarantor.prototype.stopGuaranteeing = function stopGuaranteeing() {
+      clearTimeout(this.retryTimeout);
+    };
+    SubscriptionGuarantor.prototype.retrySubscribing = function retrySubscribing() {
+      var _this = this;
+      this.retryTimeout = setTimeout(function() {
+        if (_this.subscriptions && typeof _this.subscriptions.subscribe === "function") {
+          _this.pendingSubscriptions.map(function(subscription) {
+            logger.log("SubscriptionGuarantor resubscribing " + subscription.identifier);
+            _this.subscriptions.subscribe(subscription);
+          });
+        }
+      }, 500);
+    };
+    return SubscriptionGuarantor;
+  }();
   var Subscriptions = function() {
     function Subscriptions(consumer) {
       classCallCheck(this, Subscriptions);
       this.consumer = consumer;
+      this.guarantor = new SubscriptionGuarantor(this);
       this.subscriptions = [];
     }
     Subscriptions.prototype.create = function create(channelName, mixin) {
@@ -378,7 +421,7 @@
       this.subscriptions.push(subscription);
       this.consumer.ensureActiveConnection();
       this.notify(subscription, "initialized");
-      this.sendCommand(subscription, "subscribe");
+      this.subscribe(subscription);
       return subscription;
     };
     Subscriptions.prototype.remove = function remove(subscription) {
@@ -397,6 +440,7 @@
       });
     };
     Subscriptions.prototype.forget = function forget(subscription) {
+      this.guarantor.forget(subscription);
       this.subscriptions = this.subscriptions.filter(function(s) {
         return s !== subscription;
       });
@@ -410,7 +454,7 @@
     Subscriptions.prototype.reload = function reload() {
       var _this2 = this;
       return this.subscriptions.map(function(subscription) {
-        return _this2.sendCommand(subscription, "subscribe");
+        return _this2.subscribe(subscription);
       });
     };
     Subscriptions.prototype.notifyAll = function notifyAll(callbackName) {
@@ -436,6 +480,18 @@
         return typeof subscription[callbackName] === "function" ? subscription[callbackName].apply(subscription, args) : undefined;
       });
     };
+    Subscriptions.prototype.subscribe = function subscribe(subscription) {
+      if (this.sendCommand(subscription, "subscribe")) {
+        this.guarantor.guarantee(subscription);
+      }
+    };
+    Subscriptions.prototype.confirmSubscription = function confirmSubscription(identifier) {
+      var _this4 = this;
+      logger.log("Subscription confirmed " + identifier);
+      this.findAll(identifier).map(function(subscription) {
+        return _this4.guarantor.forget(subscription);
+      });
+    };
     Subscriptions.prototype.sendCommand = function sendCommand(subscription, command) {
       var identifier = subscription.identifier;
       return this.consumer.send({
@@ -506,6 +562,7 @@
   exports.INTERNAL = INTERNAL;
   exports.Subscription = Subscription;
   exports.Subscriptions = Subscriptions;
+  exports.SubscriptionGuarantor = SubscriptionGuarantor;
   exports.adapters = adapters;
   exports.createWebSocketURL = createWebSocketURL;
   exports.logger = logger;

data/lib/action_cable/channel/base.rb

@@ -194,7 +194,7 @@ module ActionCable
       end
 
       private
-        # Called once a consumer has become a subscriber of the channel. Usually the place to setup any streams
+        # Called once a consumer has become a subscriber of the channel. Usually the place to set up any streams
         # you want this channel to be sending to the subscriber.
         def subscribed # :doc:
           # Override in subclasses
@@ -283,7 +283,7 @@ module ActionCable
 
         def transmit_subscription_confirmation
           unless subscription_confirmation_sent?
-            logger.info "#{self.class.name} is transmitting the subscription confirmation"
+            logger.debug "#{self.class.name} is transmitting the subscription confirmation"
 
             ActiveSupport::Notifications.instrument("transmit_subscription_confirmation.action_cable", channel_class: self.class.name) do
               connection.transmit identifier: @identifier, type: ActionCable::INTERNAL[:message_types][:confirmation]
@@ -298,7 +298,7 @@ module ActionCable
         end
 
         def transmit_subscription_rejection
-          logger.info "#{self.class.name} is transmitting the subscription rejection"
+          logger.debug "#{self.class.name} is transmitting the subscription rejection"
 
           ActiveSupport::Notifications.instrument("transmit_subscription_rejection.action_cable", channel_class: self.class.name) do
             connection.transmit identifier: @identifier, type: ActionCable::INTERNAL[:message_types][:rejection]

data/lib/action_cable/channel/naming.rb

@@ -14,7 +14,7 @@ module ActionCable
         #   Chats::AppearancesChannel.channel_name # => 'chats:appearances'
         #   FooChats::BarAppearancesChannel.channel_name # => 'foo_chats:bar_appearances'
         def channel_name
-          @channel_name ||= name.sub(/Channel$/, "").gsub("::", ":").underscore
+          @channel_name ||= name.delete_suffix("Channel").gsub("::", ":").underscore
         end
       end
 

data/lib/action_cable/channel/streams.rb

@@ -25,7 +25,7 @@ module ActionCable
     #
     # An example broadcasting for this channel looks like so:
     #
-    #   ActionCable.server.broadcast "comments_for_45", author: 'DHH', content: 'Rails is just swell'
+    #   ActionCable.server.broadcast "comments_for_45", { author: 'DHH', content: 'Rails is just swell' }
     #
     # If you have a stream that is related to a model, then the broadcasting used can be generated from the model and channel.
     # The following example would subscribe to a broadcasting like <tt>comments:Z2lkOi8vVGVzdEFwcC9Qb3N0LzE</tt>.
@@ -82,7 +82,7 @@ module ActionCable
         # Build a stream handler by wrapping the user-provided callback with
         # a decoder or defaulting to a JSON-decoding retransmitter.
         handler = worker_pool_stream_handler(broadcasting, callback || block, coder: coder)
-        streams << [ broadcasting, handler ]
+        streams[broadcasting] = handler
 
         connection.server.event_loop.post do
           pubsub.subscribe(broadcasting, handler, lambda do
@@ -102,6 +102,20 @@ module ActionCable
         stream_from(broadcasting_for(model), callback || block, coder: coder)
       end
 
+      # Unsubscribes streams from the named <tt>broadcasting</tt>.
+      def stop_stream_from(broadcasting)
+        callback = streams.delete(broadcasting)
+        if callback
+          pubsub.unsubscribe(broadcasting, callback)
+          logger.info "#{self.class.name} stopped streaming from #{broadcasting}"
+        end
+      end
+
+      # Unsubscribes streams for the <tt>model</tt>.
+      def stop_stream_for(model)
+        stop_stream_from(broadcasting_for(model))
+      end
+
       # Unsubscribes all streams associated with this channel from the pubsub queue.
       def stop_all_streams
         streams.each do |broadcasting, callback|
@@ -110,11 +124,23 @@ module ActionCable
         end.clear
       end
 
+      # Calls stream_for if record is present, otherwise calls reject.
+      # This method is intended to be called when you're looking
+      # for a record based on a parameter, if its found it will start
+      # streaming. If the record is nil then it will reject the connection.
+      def stream_or_reject_for(record)
+        if record
+          stream_for record
+        else
+          reject
+        end
+      end
+
       private
         delegate :pubsub, to: :connection
 
         def streams
-          @_streams ||= []
+          @_streams ||= {}
         end
 
         # Always wrap the outermost handler to invoke the user handler on the

data/lib/action_cable/channel/test_case.rb

@@ -15,9 +15,9 @@ module ActionCable
       end
     end
 
-    # Stub `stream_from` to track streams for the channel.
-    # Add public aliases for `subscription_confirmation_sent?` and
-    # `subscription_rejected?`.
+    # Stub +stream_from+ to track streams for the channel.
+    # Add public aliases for +subscription_confirmation_sent?+ and
+    # +subscription_rejected?+.
     module ChannelStub
       def confirmed?
         subscription_confirmation_sent?
@@ -123,7 +123,7 @@ module ActionCable
     # <b>connection</b>::
     #      An ActionCable::Channel::ConnectionStub, representing the current HTTP connection.
     # <b>subscription</b>::
-    #      An instance of the current channel, created when you call `subscribe`.
+    #      An instance of the current channel, created when you call +subscribe+.
     # <b>transmissions</b>::
     #      A list of all messages that have been transmitted into the channel.
     #
@@ -159,7 +159,7 @@ module ActionCable
     #  def test_speak
     #    subscribe room_id: rooms(:chat).id
     #
-    #    assert_broadcasts_on(rooms(:chat), text: "Hello, Rails!") do
+    #    assert_broadcast_on(rooms(:chat), text: "Hello, Rails!") do
     #      perform :speak, message: "Hello, Rails!"
     #    end
     #  end
@@ -209,7 +209,7 @@ module ActionCable
           end
         end
 
-        # Setup test connection with the specified identifiers:
+        # Set up test connection with the specified identifiers:
         #
         #   class ApplicationCable < ActionCable::Connection::Base
         #     identified_by :user, :token

data/lib/action_cable/connection/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "action_dispatch"
+require "active_support/rescuable"
 
 module ActionCable
   module Connection
@@ -46,6 +47,7 @@ module ActionCable
       include Identification
       include InternalChannel
       include Authorization
+      include ActiveSupport::Rescuable
 
       attr_reader :server, :env, :subscriptions, :logger, :worker_pool, :protocol
       delegate :event_loop, :pubsub, to: :server

data/lib/action_cable/connection/subscriptions.rb

@@ -21,6 +21,7 @@ module ActionCable
           logger.error "Received unrecognized command in #{data.inspect}"
         end
       rescue Exception => e
+        @connection.rescue_with_handler(e)
         logger.error "Could not execute command from (#{data.inspect}) [#{e.class} - #{e.message}]: #{e.backtrace.first(5).join(" | ")}"
       end
 

data/lib/action_cable/connection/test_case.rb

@@ -85,7 +85,7 @@ module ActionCable
     #     end
     #   end
     #
-    # +connect+ accepts additional information the HTTP request with the
+    # +connect+ accepts additional information about the HTTP request with the
     # +params+, +headers+, +session+ and Rack +env+ options.
     #
     #   def test_connect_with_headers_and_query_string
@@ -101,7 +101,7 @@ module ActionCable
     #     assert_equal "1", connection.user.id
     #   end
     #
-    # You can also setup the correct cookies before the connection request:
+    # You can also set up the correct cookies before the connection request:
     #
     #   def test_connect_with_cookies
     #     # Plain cookies:

data/lib/action_cable/engine.rb

@@ -30,7 +30,7 @@ module ActionCable
 
       ActiveSupport.on_load(:action_cable) do
         if (config_path = Pathname.new(app.config.paths["config/cable"].first)).exist?
-          self.cable = Rails.application.config_for(config_path).with_indifferent_access
+          self.cable = Rails.application.config_for(config_path).to_h.with_indifferent_access
         end
 
         previous_connection_class = connection_class

data/lib/action_cable/gem_version.rb

@@ -8,9 +8,9 @@ module ActionCable
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
-    TINY  = 6
-    PRE   = "1"
+    MINOR = 1
+    TINY  = 7
+    PRE   = "6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/helpers/action_cable_helper.rb

@@ -12,11 +12,11 @@ module ActionCable
       #   </head>
       #
       # This is then used by Action Cable to determine the URL of your WebSocket server.
-      # Your CoffeeScript can then connect to the server without needing to specify the
+      # Your JavaScript can then connect to the server without needing to specify the
       # URL directly:
       #
-      #   #= require cable
-      #   @App = {}
+      #   window.Cable = require("@rails/actioncable")
+      #   window.App = {}
       #   App.cable = Cable.createConsumer()
       #
       # Make sure to specify the correct server location in each of your environment

data/lib/action_cable/remote_connections.rb

@@ -45,7 +45,7 @@ module ActionCable
 
         # Uses the internal channel to disconnect the connection.
         def disconnect
-          server.broadcast internal_channel, type: "disconnect"
+          server.broadcast internal_channel, { type: "disconnect" }
         end
 
         # Returns all the identifiers that were applied to this connection.

data/lib/action_cable/server/base.rb

@@ -27,7 +27,7 @@ module ActionCable
         @remote_connections = @event_loop = @worker_pool = @pubsub = nil
       end
 
-      # Called by Rack to setup the server.
+      # Called by Rack to set up the server.
       def call(env)
         setup_heartbeat_timer
         config.connection_class.call.new(self, env).process

data/lib/action_cable/server/broadcasting.rb

@@ -40,7 +40,7 @@ module ActionCable
           end
 
           def broadcast(message)
-            server.logger.debug "[ActionCable] Broadcasting to #{broadcasting}: #{message.inspect}"
+            server.logger.debug { "[ActionCable] Broadcasting to #{broadcasting}: #{message.inspect.truncate(300)}" }
 
             payload = { broadcasting: broadcasting, message: message, coder: coder }
             ActiveSupport::Notifications.instrument("broadcast.action_cable", payload) do

data/lib/action_cable/server/worker.rb

@@ -2,6 +2,7 @@
 
 require "active_support/callbacks"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
+require "action_cable/server/worker/active_record_connection_management"
 require "concurrent"
 
 module ActionCable

data/lib/action_cable/server.rb

@@ -11,7 +11,6 @@ module ActionCable
       autoload :Configuration
 
       autoload :Worker
-      autoload :ActiveRecordConnectionManagement, "action_cable/server/worker/active_record_connection_management"
     end
   end
 end

data/lib/action_cable/subscription_adapter/base.rb

@@ -25,6 +25,10 @@ module ActionCable
       def shutdown
         raise NotImplementedError
       end
+
+      def identifier
+        @server.config.cable[:id] ||= "ActionCable-PID-#{$$}"
+      end
     end
   end
 end

data/lib/action_cable/subscription_adapter/postgresql.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem "pg", ">= 0.18", "< 2.0"
+gem "pg", "~> 1.1"
 require "pg"
 require "thread"
 require "digest/sha1"
@@ -42,6 +42,7 @@ module ActionCable
         pg_conn = ar_conn.raw_connection
 
         verify!(pg_conn)
+        pg_conn.exec("SET application_name = #{pg_conn.escape_identifier(identifier)}")
         yield pg_conn
       ensure
         ar_conn.disconnect!

data/lib/action_cable/subscription_adapter/redis.rb

@@ -15,7 +15,6 @@ module ActionCable
       # Overwrite this factory method for Redis connections if you want to use a different Redis library than the redis gem.
       # This is needed, for example, when using Makara proxies for distributed Redis.
       cattr_accessor :redis_connector, default: ->(config) do
-        config[:id] ||= "ActionCable-PID-#{$$}"
         ::Redis.new(config.except(:adapter, :channel_prefix))
       end
 
@@ -57,7 +56,7 @@ module ActionCable
         end
 
         def redis_connection
-          self.class.redis_connector.call(@server.config.cable)
+          self.class.redis_connector.call(@server.config.cable.merge(id: identifier))
         end
 
         class Listener < SubscriberMap

data/lib/action_cable/test_helper.rb

@@ -42,10 +42,10 @@ module ActionCable
     #     end
     #   end
     #
-    def assert_broadcasts(stream, number)
+    def assert_broadcasts(stream, number, &block)
       if block_given?
         original_count = broadcasts_size(stream)
-        yield
+        assert_nothing_raised(&block)
         new_count = broadcasts_size(stream)
         actual_count = new_count - original_count
       else
@@ -94,7 +94,7 @@ module ActionCable
     #     end
     #   end
     #
-    def assert_broadcast_on(stream, data)
+    def assert_broadcast_on(stream, data, &block)
       # Encode to JSON and back–we want to use this value to compare
       # with decoded JSON.
       # Comparing JSON strings doesn't work due to the order if the keys.
@@ -106,7 +106,7 @@ module ActionCable
         old_messages = new_messages
         clear_messages(stream)
 
-        yield
+        assert_nothing_raised(&block)
         new_messages = broadcasts(stream)
         clear_messages(stream)
 

data/lib/action_cable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2015-2019 Basecamp, LLC
+# Copyright (c) 2015-2022 Basecamp, LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/rails/generators/channel/USAGE

@@ -1,11 +1,11 @@
 Description:
 ============
-    Stubs out a new cable channel for the server (in Ruby) and client (in JavaScript).
+    Generates a new cable channel for the server (in Ruby) and client (in JavaScript).
     Pass the channel name, either CamelCased or under_scored, and an optional list of channel actions as arguments.
 
 Example:
 ========
-    rails generate channel Chat speak
+    bin/rails generate channel Chat speak
 
     creates a Chat channel class, test and JavaScript asset:
         Channel:    app/channels/chat_channel.rb

data/lib/rails/generators/channel/templates/javascript/consumer.js.tt

@@ -1,5 +1,5 @@
 // Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+// You can generate new channels where WebSocket features live using the `bin/rails generate channel` command.
 
 import { createConsumer } from "@rails/actioncable"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 6.0.6.1
+  version: 6.1.7.6
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,22 +9,36 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -126,10 +140,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.6.1/actioncable/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.6.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.7.6/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.6.1/actioncable
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.6/actioncable
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: WebSocket framework for Rails.