Shouldn't retry on bad access denied and bad request (#454)

fix(retry): shouldn't retry on bad access denied and bad request

Fixed issue because of which client retried for both bad request and access denied.

refactor(subscription): add channels and groups to connected status

Add current list of channels and groups to connected status.

Author: parfeon

.pubnub.yml

@@ -1,5 +1,12 @@
 ---
 changelog:
+  - date: 2025-04-22
+    version: v9.5.2
+    changes:
+      - type: bug
+        text: "Fixed issue because of which client retried for both bad request and access denied."
+      - type: improvement
+        text: "Add current list of channels and groups to connected status."
   - date: 2025-04-15
     version: v9.5.1
     changes:
@@ -1229,7 +1236,7 @@ supported-platforms:
       - 'Ubuntu 14.04 and up'
       - 'Windows 7 and up'
     version: 'Pubnub Javascript for Node'
-version: '9.5.1'
+version: '9.5.2'
 sdks:
   - full-name: PubNub Javascript SDK
     short-name: Javascript
@@ -1245,7 +1252,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/archive/refs/tags/v9.5.1.zip
+            location: https://github.com/pubnub/javascript/archive/refs/tags/v9.5.2.zip
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'
@@ -1916,7 +1923,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/releases/download/v9.5.1/pubnub.9.5.1.js
+            location: https://github.com/pubnub/javascript/releases/download/v9.5.2/pubnub.9.5.2.js
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'

CHANGELOG.md

@@ -1,3 +1,12 @@
+## v9.5.2
+April 22 2025
+
+#### Fixed
+- Fixed issue because of which client retried for both bad request and access denied.
+
+#### Modified
+- Add current list of channels and groups to connected status.
+
 ## v9.5.1
 April 15 2025
 

README.md

@@ -27,8 +27,8 @@ Watch [Getting Started with PubNub JS SDK](https://app.dashcam.io/replay/64ee0d2
      npm install pubnub
      ```
    * or download one of our builds from our CDN: 
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.9.5.1.js
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.9.5.1.min.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.9.5.2.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.9.5.2.min.js
 
 2. Configure your keys:
 

dist/web/pubnub.js

@@ -144,7 +144,7 @@ const makeConfiguration = (base, setupCryptoModule) => {
             return base.PubNubFile;
         },
         get version() {
-            return '9.5.1';
+            return '9.5.2';
         },
         getVersion() {
             return this.version;

dist/web/pubnub.min.js

@@ -203,9 +203,13 @@ exports.RetryPolicy = RetryPolicy;
  * @internal
  */
 const isRetriableRequest = (req, res, errorCategory, retryAttempt, maximumRetry, excluded) => {
-    if (errorCategory && errorCategory === categories_1.default.PNCancelledCategory)
-        return false;
-    else if (isExcludedRequest(req, excluded))
+    if (errorCategory) {
+        if (errorCategory === categories_1.default.PNCancelledCategory ||
+            errorCategory === categories_1.default.PNBadRequestCategory ||
+            errorCategory === categories_1.default.PNAccessDeniedCategory)
+            return false;
+    }
+    if (isExcludedRequest(req, excluded))
         return false;
     else if (retryAttempt > maximumRetry)
         return false;

lib/core/components/configuration.js

@@ -636,11 +636,11 @@ class PubNubCore {
                 this.subscriptionManager.disconnect();
             }
             else if (this.eventEngine)
-                this.eventEngine.dispose();
-            if (process.env.PRESENCE_MODULE !== 'disabled') {
-                if (this.presenceEventEngine)
-                    this.presenceEventEngine.dispose();
-            }
+                this.eventEngine.unsubscribeAll(isOffline);
+        }
+        if (process.env.PRESENCE_MODULE !== 'disabled') {
+            if (this.presenceEventEngine)
+                this.presenceEventEngine.leaveAll(isOffline);
         }
     }
     /**
@@ -1417,11 +1417,11 @@ class PubNubCore {
      *
      * @param parameters - List of channels and groups where `leave` event should be sent.
      */
-    leaveAll(parameters) {
+    leaveAll(parameters = {}) {
         if (process.env.PRESENCE_MODULE !== 'disabled') {
             if (this.presenceEventEngine)
-                this.presenceEventEngine.leaveAll();
-            else
+                this.presenceEventEngine.leaveAll(parameters.isOffline);
+            else if (!parameters.isOffline)
                 this.makeUnsubscribe({ channels: parameters.channels, channelGroups: parameters.groups }, () => { });
         }
         else

lib/core/components/retryPolicy.js

@@ -14,9 +14,10 @@ const core_1 = require("./core");
  *
  * @internal
  */
-exports.subscriptionChange = (0, core_1.createEvent)('SUBSCRIPTION_CHANGED', (channels, groups) => ({
+exports.subscriptionChange = (0, core_1.createEvent)('SUBSCRIPTION_CHANGED', (channels, groups, isOffline) => ({
     channels,
     groups,
+    isOffline,
 }));
 /**
  * Subscription loop restore.

lib/core/pubnub-common.js

@@ -114,7 +114,7 @@ class EventEngine {
             }
         }
     }
-    unsubscribeAll() {
+    unsubscribeAll(isOffline) {
         const channelGroups = this.getSubscribedChannels();
         const channels = this.getSubscribedChannels();
         this.channels = [];
@@ -124,9 +124,9 @@ class EventEngine {
                 delete this.dependencies.presenceState[objectName];
             });
         }
-        this.engine.transition(events.subscriptionChange(this.channels.slice(0), this.groups.slice(0)));
+        this.engine.transition(events.subscriptionChange(this.channels.slice(0), this.groups.slice(0), isOffline));
         if (this.dependencies.leaveAll)
-            this.dependencies.leaveAll({ channels, groups: channelGroups });
+            this.dependencies.leaveAll({ channels, groups: channelGroups, isOffline });
     }
     reconnect({ timetoken, region }) {
         const channelGroups = this.getSubscribedChannels();

lib/event-engine/events.js

@@ -57,7 +57,7 @@ exports.left = (0, core_1.createEvent)('LEFT', (channels, groups) => ({
  *
  * @internal
  */
-exports.leftAll = (0, core_1.createEvent)('LEFT_ALL', () => ({}));
+exports.leftAll = (0, core_1.createEvent)('LEFT_ALL', (isOffline) => ({ isOffline }));
 /**
  * Presence heartbeat success event.
  *

lib/event-engine/index.js

@@ -77,8 +77,8 @@ class PresenceEventEngine {
         }
         this.engine.transition(events.left(channels !== null && channels !== void 0 ? channels : [], groups !== null && groups !== void 0 ? groups : []));
     }
-    leaveAll() {
-        this.engine.transition(events.leftAll());
+    leaveAll(isOffline) {
+        this.engine.transition(events.leftAll(isOffline));
     }
     reconnect() {
         this.engine.transition(events.reconnect());

lib/event-engine/presence/events.js

@@ -37,4 +37,6 @@ exports.HeartbeatCooldownState.on(events_1.left.type, (context, event) => heartb
 exports.HeartbeatCooldownState.on(events_1.disconnect.type, (context, event) => heartbeat_stopped_1.HeartbeatStoppedState.with({ channels: context.channels, groups: context.groups }, [
     ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
 ]));
-exports.HeartbeatCooldownState.on(events_1.leftAll.type, (context, _) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [(0, effects_1.leave)(context.channels, context.groups)]));
+exports.HeartbeatCooldownState.on(events_1.leftAll.type, (context, event) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [
+    ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
+]));

lib/event-engine/presence/presence.js

@@ -36,4 +36,6 @@ exports.HeartbeatFailedState.on(events_1.reconnect.type, (context, _) => heartbe
 exports.HeartbeatFailedState.on(events_1.disconnect.type, (context, event) => heartbeat_stopped_1.HeartbeatStoppedState.with({ channels: context.channels, groups: context.groups }, [
     ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
 ]));
-exports.HeartbeatFailedState.on(events_1.leftAll.type, (context, _) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [(0, effects_1.leave)(context.channels, context.groups)]));
+exports.HeartbeatFailedState.on(events_1.leftAll.type, (context, event) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [
+    ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
+]));

lib/event-engine/presence/states/heartbeat_cooldown.js

@@ -42,4 +42,6 @@ exports.HeartbeatingState.on(events_1.heartbeatFailure.type, (context, event) =>
 exports.HeartbeatingState.on(events_1.disconnect.type, (context, event) => heartbeat_stopped_1.HeartbeatStoppedState.with({ channels: context.channels, groups: context.groups }, [
     ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
 ]));
-exports.HeartbeatingState.on(events_1.leftAll.type, (context, _) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [(0, effects_1.leave)(context.channels, context.groups)]));
+exports.HeartbeatingState.on(events_1.leftAll.type, (context, event) => heartbeat_inactive_1.HeartbeatInactiveState.with(undefined, [
+    ...(!event.payload.isOffline ? [(0, effects_1.leave)(context.channels, context.groups)] : []),
+]));

lib/event-engine/presence/states/heartbeat_failed.js

@@ -19,14 +19,20 @@ const unsubscribed_1 = require("./unsubscribed");
  * @internal
  */
 exports.HandshakeFailedState = new state_1.State('HANDSHAKE_FAILED');
-exports.HandshakeFailedState.on(events_1.subscriptionChange.type, (context, { payload }) => handshaking_1.HandshakingState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor }));
+exports.HandshakeFailedState.on(events_1.subscriptionChange.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return handshaking_1.HandshakingState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor });
+});
 exports.HandshakeFailedState.on(events_1.reconnect.type, (context, { payload }) => handshaking_1.HandshakingState.with({
     channels: context.channels,
     groups: context.groups,
     cursor: payload.cursor || context.cursor,
 }));
 exports.HandshakeFailedState.on(events_1.restore.type, (context, { payload }) => {
     var _a, _b;
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
     return handshaking_1.HandshakingState.with({
         channels: payload.channels,
         groups: payload.groups,

lib/event-engine/presence/states/heartbeating.js

@@ -19,10 +19,16 @@ const unsubscribed_1 = require("./unsubscribed");
  * @internal
  */
 exports.HandshakeStoppedState = new state_1.State('HANDSHAKE_STOPPED');
-exports.HandshakeStoppedState.on(events_1.subscriptionChange.type, (context, { payload }) => exports.HandshakeStoppedState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor }));
+exports.HandshakeStoppedState.on(events_1.subscriptionChange.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return exports.HandshakeStoppedState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor });
+});
 exports.HandshakeStoppedState.on(events_1.reconnect.type, (context, { payload }) => handshaking_1.HandshakingState.with(Object.assign(Object.assign({}, context), { cursor: payload.cursor || context.cursor })));
 exports.HandshakeStoppedState.on(events_1.restore.type, (context, { payload }) => {
     var _a;
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
     return exports.HandshakeStoppedState.with({
         channels: payload.channels,
         groups: payload.groups,

lib/event-engine/states/handshake_failed.js

@@ -36,15 +36,22 @@ exports.HandshakingState.on(events_1.subscriptionChange.type, (context, { payloa
     return exports.HandshakingState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor });
 });
 exports.HandshakingState.on(events_1.handshakeSuccess.type, (context, { payload }) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return receiving_1.ReceivingState.with({
         channels: context.channels,
         groups: context.groups,
         cursor: {
             timetoken: !!((_a = context.cursor) === null || _a === void 0 ? void 0 : _a.timetoken) ? (_b = context.cursor) === null || _b === void 0 ? void 0 : _b.timetoken : payload.timetoken,
             region: payload.region,
         },
-    }, [(0, effects_1.emitStatus)({ category: categories_1.default.PNConnectedCategory })]);
+    }, [
+        (0, effects_1.emitStatus)({
+            category: categories_1.default.PNConnectedCategory,
+            affectedChannels: context.channels.slice(0),
+            affectedChannelGroups: context.groups.slice(0),
+            currentTimetoken: !!((_c = context.cursor) === null || _c === void 0 ? void 0 : _c.timetoken) ? (_d = context.cursor) === null || _d === void 0 ? void 0 : _d.timetoken : payload.timetoken,
+        }),
+    ]);
 });
 exports.HandshakingState.on(events_1.handshakeFailure.type, (context, event) => {
     var _a;
@@ -71,6 +78,8 @@ exports.HandshakingState.on(events_1.disconnect.type, (context, event) => {
 });
 exports.HandshakingState.on(events_1.restore.type, (context, { payload }) => {
     var _a;
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
     return exports.HandshakingState.with({
         channels: payload.channels,
         groups: payload.groups,

lib/event-engine/states/handshake_stopped.js

@@ -30,10 +30,18 @@ exports.ReceiveFailedState.on(events_1.reconnect.type, (context, { payload }) =>
         },
     });
 });
-exports.ReceiveFailedState.on(events_1.subscriptionChange.type, (context, { payload }) => handshaking_1.HandshakingState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor }));
-exports.ReceiveFailedState.on(events_1.restore.type, (context, { payload }) => handshaking_1.HandshakingState.with({
-    channels: payload.channels,
-    groups: payload.groups,
-    cursor: { timetoken: payload.cursor.timetoken, region: payload.cursor.region || context.cursor.region },
-}));
+exports.ReceiveFailedState.on(events_1.subscriptionChange.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return handshaking_1.HandshakingState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor });
+});
+exports.ReceiveFailedState.on(events_1.restore.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return handshaking_1.HandshakingState.with({
+        channels: payload.channels,
+        groups: payload.groups,
+        cursor: { timetoken: payload.cursor.timetoken, region: payload.cursor.region || context.cursor.region },
+    });
+});
 exports.ReceiveFailedState.on(events_1.unsubscribeAll.type, (_) => unsubscribed_1.UnsubscribedState.with(undefined));

lib/event-engine/states/handshaking.js

@@ -19,12 +19,20 @@ const unsubscribed_1 = require("./unsubscribed");
  * @internal
  */
 exports.ReceiveStoppedState = new state_1.State('RECEIVE_STOPPED');
-exports.ReceiveStoppedState.on(events_1.subscriptionChange.type, (context, { payload }) => exports.ReceiveStoppedState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor }));
-exports.ReceiveStoppedState.on(events_1.restore.type, (context, { payload }) => exports.ReceiveStoppedState.with({
-    channels: payload.channels,
-    groups: payload.groups,
-    cursor: { timetoken: payload.cursor.timetoken, region: payload.cursor.region || context.cursor.region },
-}));
+exports.ReceiveStoppedState.on(events_1.subscriptionChange.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return exports.ReceiveStoppedState.with({ channels: payload.channels, groups: payload.groups, cursor: context.cursor });
+});
+exports.ReceiveStoppedState.on(events_1.restore.type, (context, { payload }) => {
+    if (payload.channels.length === 0 && payload.groups.length === 0)
+        return unsubscribed_1.UnsubscribedState.with(undefined);
+    return exports.ReceiveStoppedState.with({
+        channels: payload.channels,
+        groups: payload.groups,
+        cursor: { timetoken: payload.cursor.timetoken, region: payload.cursor.region || context.cursor.region },
+    });
+});
 exports.ReceiveStoppedState.on(events_1.reconnect.type, (context, { payload }) => {
     var _a;
     return handshaking_1.HandshakingState.with({