Merge pull request #503 from pusher/7.0.1

prepare release 7.0.1
pusher · Nov 2, 2020 · c429373 · c429373
2 parents 62edcb1 + 77735d2
commit c429373
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.1 (2020-11-02)
+
+[FIXED] Channels no longer get stuck in the `subscriptionPending` state
+after a failed request to an auth endpoint. [Fixes Issue
+255](https://github.com/pusher/pusher-js/issues/255)
+
 ## 7.0.0 (2020-07-30)
 
 [UPDATED] Type signatures for authorizer callback. Previously the authorizer

diff --git a/dist/node/pusher.js b/dist/node/pusher.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.1
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -7447,7 +7447,7 @@ function safeJSONStringify(source) {
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.1",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -8515,6 +8515,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -10712,7 +10713,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

diff --git a/dist/react-native/pusher.js b/dist/react-native/pusher.js
diff --git a/dist/web/pusher-with-encryption.js b/dist/web/pusher-with-encryption.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.1
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -2994,7 +2994,7 @@ var ScriptReceivers = new ScriptReceiverFactory('_pusher_script_', 'Pusher.Scrip
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.1",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -4734,6 +4734,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -6933,7 +6934,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

diff --git a/dist/web/pusher-with-encryption.min.js b/dist/web/pusher-with-encryption.min.js
diff --git a/dist/web/pusher.js b/dist/web/pusher.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.1
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -592,7 +592,7 @@ var ScriptReceivers = new ScriptReceiverFactory('_pusher_script_', 'Pusher.Scrip
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.1",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -2332,6 +2332,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -4531,7 +4532,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

diff --git a/dist/web/pusher.min.js b/dist/web/pusher.min.js
diff --git a/dist/worker/pusher-with-encryption.worker.js b/dist/worker/pusher-with-encryption.worker.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.1
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -3289,7 +3289,7 @@ function safeJSONStringify(source) {
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.1",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -4357,6 +4357,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -6536,7 +6537,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

diff --git a/dist/worker/pusher-with-encryption.worker.min.js b/dist/worker/pusher-with-encryption.worker.min.js
diff --git a/dist/worker/pusher.worker.js b/dist/worker/pusher.worker.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.1
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -887,7 +887,7 @@ function safeJSONStringify(source) {
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.1",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -1955,6 +1955,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -4134,7 +4135,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

diff --git a/dist/worker/pusher.worker.min.js b/dist/worker/pusher.worker.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pusher-js",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Pusher Channels JavaScript library for browsers, React Native, NodeJS and web workers",
   "main": "dist/node/pusher.js",
   "browser": "dist/web/pusher.js",