hotwire-livereload 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c9e1c7f17f98e067a076d8dfc624d03aa1a7a64784da9fdde0b59f211bebe5
-  data.tar.gz: 3fa02e7e5a7592c61be7db173ff945f9d2f6da2e29ba4a777072702619b54473
+  metadata.gz: 04b3a325fa089d62215f26cf3fbac951e3ac91d0b03af7aed02fa2a49075969e
+  data.tar.gz: 24e7339a71da29f35b1930f95f18f0c035aa0221b411fe4a58f27d10384dbb76
 SHA512:
-  metadata.gz: 760b3adbb7ef2bc0231f8e90f7ec3b5bfabbc2c01965518d1c69ab9885b0974cbdf0551d1f44e72a498917c55f790947fbad61ec1267973ac139ff85704c2a2f
-  data.tar.gz: 449e13ba3578d4fcc8e41e4939abecd29ee1a9673cdeaa7a0da24090c31de249868ae7c6541ed37c181cc4a4a23a40c6ee04f83b6922b65be3d9b0d92131d44c
+  metadata.gz: 01e7cc071040c5fbafa3fac11adcdfff171695a82c6d6d90db06c8d2010032beb4172ae667b029512737c0afb79c005bcd2e54084661ff662bbae28157087a68
+  data.tar.gz: 41e86aa960b2796d65aa26e1d8034a819e5ecdfea578b5995e275f713d666f9b4ffd6a9c6337a6bf17834394ac194382aa2ddf9ff74843fb0f7644ed20bfd2fa

data/app/assets/javascripts/hotwire-livereload.js

@@ -396,19 +396,19 @@
             this.subscriptions = subscriptions;
             this.pendingSubscriptions = [];
           }
-          SubscriptionGuarantor2.prototype.guarantee = function guarantee(subscription) {
-            if (this.pendingSubscriptions.indexOf(subscription) == -1) {
-              logger.log("SubscriptionGuarantor guaranteeing " + subscription.identifier);
-              this.pendingSubscriptions.push(subscription);
+          SubscriptionGuarantor2.prototype.guarantee = function guarantee(subscription2) {
+            if (this.pendingSubscriptions.indexOf(subscription2) == -1) {
+              logger.log("SubscriptionGuarantor guaranteeing " + subscription2.identifier);
+              this.pendingSubscriptions.push(subscription2);
             } else {
-              logger.log("SubscriptionGuarantor already guaranteeing " + subscription.identifier);
+              logger.log("SubscriptionGuarantor already guaranteeing " + subscription2.identifier);
             }
             this.startGuaranteeing();
           };
-          SubscriptionGuarantor2.prototype.forget = function forget(subscription) {
-            logger.log("SubscriptionGuarantor forgetting " + subscription.identifier);
+          SubscriptionGuarantor2.prototype.forget = function forget(subscription2) {
+            logger.log("SubscriptionGuarantor forgetting " + subscription2.identifier);
             this.pendingSubscriptions = this.pendingSubscriptions.filter(function(s) {
-              return s !== subscription;
+              return s !== subscription2;
             });
           };
           SubscriptionGuarantor2.prototype.startGuaranteeing = function startGuaranteeing() {
@@ -422,9 +422,9 @@
             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);
+                _this.pendingSubscriptions.map(function(subscription2) {
+                  logger.log("SubscriptionGuarantor resubscribing " + subscription2.identifier);
+                  _this.subscriptions.subscribe(subscription2);
                 });
               }
             }, 500);
@@ -443,37 +443,37 @@
             var params = (typeof channel === "undefined" ? "undefined" : _typeof(channel)) === "object" ? channel : {
               channel
             };
-            var subscription = new Subscription(this.consumer, params, mixin);
-            return this.add(subscription);
+            var subscription2 = new Subscription(this.consumer, params, mixin);
+            return this.add(subscription2);
           };
-          Subscriptions2.prototype.add = function add(subscription) {
-            this.subscriptions.push(subscription);
+          Subscriptions2.prototype.add = function add(subscription2) {
+            this.subscriptions.push(subscription2);
             this.consumer.ensureActiveConnection();
-            this.notify(subscription, "initialized");
-            this.subscribe(subscription);
-            return subscription;
-          };
-          Subscriptions2.prototype.remove = function remove2(subscription) {
-            this.forget(subscription);
-            if (!this.findAll(subscription.identifier).length) {
-              this.sendCommand(subscription, "unsubscribe");
+            this.notify(subscription2, "initialized");
+            this.subscribe(subscription2);
+            return subscription2;
+          };
+          Subscriptions2.prototype.remove = function remove2(subscription2) {
+            this.forget(subscription2);
+            if (!this.findAll(subscription2.identifier).length) {
+              this.sendCommand(subscription2, "unsubscribe");
             }
-            return subscription;
+            return subscription2;
           };
           Subscriptions2.prototype.reject = function reject(identifier) {
             var _this = this;
-            return this.findAll(identifier).map(function(subscription) {
-              _this.forget(subscription);
-              _this.notify(subscription, "rejected");
-              return subscription;
+            return this.findAll(identifier).map(function(subscription2) {
+              _this.forget(subscription2);
+              _this.notify(subscription2, "rejected");
+              return subscription2;
             });
           };
-          Subscriptions2.prototype.forget = function forget(subscription) {
-            this.guarantor.forget(subscription);
+          Subscriptions2.prototype.forget = function forget(subscription2) {
+            this.guarantor.forget(subscription2);
             this.subscriptions = this.subscriptions.filter(function(s) {
-              return s !== subscription;
+              return s !== subscription2;
             });
-            return subscription;
+            return subscription2;
           };
           Subscriptions2.prototype.findAll = function findAll(identifier) {
             return this.subscriptions.filter(function(s) {
@@ -482,8 +482,8 @@
           };
           Subscriptions2.prototype.reload = function reload() {
             var _this2 = this;
-            return this.subscriptions.map(function(subscription) {
-              return _this2.subscribe(subscription);
+            return this.subscriptions.map(function(subscription2) {
+              return _this2.subscribe(subscription2);
             });
           };
           Subscriptions2.prototype.notifyAll = function notifyAll(callbackName) {
@@ -491,38 +491,38 @@
             for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               args[_key - 1] = arguments[_key];
             }
-            return this.subscriptions.map(function(subscription) {
-              return _this3.notify.apply(_this3, [subscription, callbackName].concat(args));
+            return this.subscriptions.map(function(subscription2) {
+              return _this3.notify.apply(_this3, [subscription2, callbackName].concat(args));
             });
           };
-          Subscriptions2.prototype.notify = function notify(subscription, callbackName) {
+          Subscriptions2.prototype.notify = function notify(subscription2, callbackName) {
             for (var _len2 = arguments.length, args = Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
               args[_key2 - 2] = arguments[_key2];
             }
             var subscriptions = void 0;
-            if (typeof subscription === "string") {
-              subscriptions = this.findAll(subscription);
+            if (typeof subscription2 === "string") {
+              subscriptions = this.findAll(subscription2);
             } else {
-              subscriptions = [subscription];
+              subscriptions = [subscription2];
             }
-            return subscriptions.map(function(subscription2) {
-              return typeof subscription2[callbackName] === "function" ? subscription2[callbackName].apply(subscription2, args) : void 0;
+            return subscriptions.map(function(subscription3) {
+              return typeof subscription3[callbackName] === "function" ? subscription3[callbackName].apply(subscription3, args) : void 0;
             });
           };
-          Subscriptions2.prototype.subscribe = function subscribe(subscription) {
-            if (this.sendCommand(subscription, "subscribe")) {
-              this.guarantor.guarantee(subscription);
+          Subscriptions2.prototype.subscribe = function subscribe(subscription2) {
+            if (this.sendCommand(subscription2, "subscribe")) {
+              this.guarantor.guarantee(subscription2);
             }
           };
           Subscriptions2.prototype.confirmSubscription = function confirmSubscription(identifier) {
             var _this4 = this;
             logger.log("Subscription confirmed " + identifier);
-            this.findAll(identifier).map(function(subscription) {
-              return _this4.guarantor.forget(subscription);
+            this.findAll(identifier).map(function(subscription2) {
+              return _this4.guarantor.forget(subscription2);
             });
           };
-          Subscriptions2.prototype.sendCommand = function sendCommand(subscription, command) {
-            var identifier = subscription.identifier;
+          Subscriptions2.prototype.sendCommand = function sendCommand(subscription2, command) {
+            var identifier = subscription2.identifier;
             return this.consumer.send({
               command,
               identifier
@@ -704,7 +704,8 @@
 
   // app/javascript/hotwire-livereload.js
   var consumer = (0, import_actioncable.createConsumer)();
-  consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
+  var subscription = null;
+  var createSubscription = () => consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
     received: hotwire_livereload_received_default,
     connected() {
       console.log("[Hotwire::Livereload] Websocket connected");
@@ -713,8 +714,14 @@
       console.log("[Hotwire::Livereload] Websocket disconnected");
     }
   });
+  subscription = createSubscription();
   document.addEventListener("turbo:load", () => {
     hotwire_livereload_scroll_position_default.restore();
     hotwire_livereload_scroll_position_default.remove();
+    if (subscription) {
+      consumer.subscriptions.remove(subscription);
+      subscription = null;
+    }
+    subscription = createSubscription();
   });
 })();

data/app/javascript/hotwire-livereload.js

@@ -3,7 +3,9 @@ import received from "./lib/hotwire-livereload-received"
 import scrollPosition from "./lib/hotwire-livereload-scroll-position"
 
 const consumer = createConsumer()
-consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
+let subscription = null
+
+const createSubscription = () => consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
   received,
 
   connected() {
@@ -15,8 +17,16 @@ consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
   },
 })
 
+subscription = createSubscription()
+
 document.addEventListener("turbo:load", () => {
   scrollPosition.restore()
   scrollPosition.remove()
+
+  if (subscription) {
+    consumer.subscriptions.remove(subscription)
+    subscription = null
+  }
+  subscription = createSubscription()
 })
 

data/lib/hotwire/livereload/version.rb

@@ -1,5 +1,5 @@
 module Hotwire
   module Livereload
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire-livereload
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Kirill Platonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties