actioncable 6.1.4.6 → 6.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c141940773b01a61c68adacae9fc33c09d90694e0519de3fbaeca61eb07521
-  data.tar.gz: ff4ee14e917b0f8e96196651440aba18528cf7b63d45c7e46f03b22c7ff137ae
+  metadata.gz: cf0106e58c85e7bc28b439fc0fc3c67183cfe3c56d0ff4ad82c7817797fd3c7b
+  data.tar.gz: 70b1815da3188506d03a7a690c4cf8cc0576e2cf256baa2f7ca4acc56a155101
 SHA512:
-  metadata.gz: b8044b7470675ae12a3db247a5f7d6876915b814cc4b19bb7971f0a2ddff08f57c8338c1f96436b9d0a75daf17bf34452570697a052e21139930c2a814336c5a
-  data.tar.gz: d46915afa3438a5f3c860c9bbe1944a67650d25d13fa9234bc269297760875c8d464dd4f644ed85866810bdbecb586faf26b47ba813d14fc1a95a158c572cbc6
+  metadata.gz: f3ecc4c1bb13bc948079806967d02ccae16b23fa3f08c3f7d86b154d8586a3ecab7a00dddb610c9708fd3bb07d0d9a982e0f93f899b855f5b400b0ac284c68de
+  data.tar.gz: 6590ab76341e2f229703e3ef9e86ded781b25e0bd43940bb5b0da64f70db60297954aac066df4f3b3f545cf39dec9359b819a283c6d9d6f173fc4d214ecfd8ff

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+## Rails 6.1.5.1 (April 26, 2022) ##
+
+*   No changes.
+
+
+## Rails 6.1.5 (March 09, 2022) ##
+
+*   The Action Cable client now ensures successful channel subscriptions:
+
+    * 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*
+
+*   Truncate broadcast logging messages.
+
+    *J Smith*
+
+
+## Rails 6.1.4.7 (March 08, 2022) ##
+
+*   No changes.
+
+
 ## Rails 6.1.4.6 (February 11, 2022) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2020 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

@@ -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/gem_version.rb

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

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.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2015-2020 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 6.1.4.6
+  version: 6.1.5.1
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.6
+        version: 6.1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.6
+        version: 6.1.5.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.6
+        version: 6.1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.6
+        version: 6.1.5.1
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -140,10 +140,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.6/actioncable/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.6/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.5.1/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.5.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.6/actioncable
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.5.1/actioncable
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: WebSocket framework for Rails.