pubnub - npm Package Compare versions

Comparing version 4.0.8 to 4.0.9

bower.json

 {
   "name": "pubnub",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "main": "dist/web/pubnub.min.js",
@@ -5,0 +5,0 @@ "license": "https://github.com/pubnub/javascript/blob/master/LICENSE",

CHANGELOG.md

 
+## [v4.0.9](https://github.com/pubnub/javascript/tree/v4.0.9)
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.0.8...v4.0.9)
+
+
+- ⭐channel / subscription items are populated in
+
+
+
+- ⭐constants for operation and category are exposed on global object
+
+
+
+## [v4.0.8](https://github.com/pubnub/javascript/tree/v4.0.8)
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.0.7...v4.0.8)
+
+
+- ⭐re-publish of v4.0.7
+
+
+
 ## [v4.0.7](https://github.com/pubnub/javascript/tree/v4.0.7)
@@ -3,0 +27,0 @@

lib/core/components/endpoint.js

@@ -15,3 +15,3 @@ 'use strict';
 
-  if (endpoint.getOperation() === 'PNTimeOperation' || endpoint.getOperation() === 'PNChannelGroupsOperation') {
+  if (endpoint.getOperation() === _operations2.default.PNTimeOperation || endpoint.getOperation() === _operations2.default.PNChannelGroupsOperation) {
     callback = arguments.length <= 2 ? undefined : arguments[2];
@@ -47,3 +47,3 @@ } else {
 
-  if (endpoint.getOperation() === 'PNAccessManagerGrant') {
+  if (endpoint.getOperation() === _operations2.default.PNAccessManagerGrant) {
     var signInput = config.subscribeKey + '\n' + config.publishKey + '\ngrant\n';
@@ -54,3 +54,3 @@ signInput += _utils2.default.signPamFromParams(outgoingParams);
 
-  if (endpoint.getOperation() === 'PNAccessManagerAudit') {
+  if (endpoint.getOperation() === _operations2.default.PNAccessManagerAudit) {
     var _signInput = config.subscribeKey + '\n' + config.publishKey + '\naudit\n';
@@ -88,3 +88,3 @@ _signInput += _utils2.default.signPamFromParams(outgoingParams);
 
-  if (endpoint.getOperation() === 'PNSubscribeOperation') {
+  if (endpoint.getOperation() === _operations2.default.PNSubscribeOperation) {
     return callInstance;
@@ -108,2 +108,6 @@ }
 
+var _operations = require('../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -110,0 +114,0 @@

lib/core/components/listener_manager.js

@@ -11,2 +11,8 @@ 'use strict';
 
+var _categories = require('../constants/categories');
+
+var _categories2 = _interopRequireDefault(_categories);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -67,3 +73,3 @@
       var networkStatus = {};
-      networkStatus.category = 'PNNetworkUpCategory';
+      networkStatus.category = _categories2.default.PNNetworkUpCategory;
       this.announceStatus(networkStatus);
@@ -75,3 +81,3 @@ }
       var networkStatus = {};
-      networkStatus.category = 'PNNetworkDownCategory';
+      networkStatus.category = _categories2.default.PNNetworkDownCategory;
       this.announceStatus(networkStatus);
@@ -78,0 +84,0 @@ }

lib/core/components/networking.js

@@ -21,2 +21,6 @@ 'use strict';
 
+var _categories = require('../constants/categories');
+
+var _categories2 = _interopRequireDefault(_categories);
+
 var _flow_interfaces = require('../flow_interfaces');
@@ -125,12 +129,12 @@
     value: function _detectErrorCategory(err) {
-      if (err.code === 'ENOTFOUND') return 'PNNetworkIssuesCategory';
-      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return 'PNNetworkIssuesCategory';
-      if (err.timeout) return 'PNTimeoutCategory';
+      if (err.code === 'ENOTFOUND') return _categories2.default.PNNetworkIssuesCategory;
+      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return _categories2.default.PNNetworkIssuesCategory;
+      if (err.timeout) return _categories2.default.PNTimeoutCategory;
 
       if (err.response) {
-        if (err.response.badRequest) return 'PNBadRequestCategory';
-        if (err.response.forbidden) return 'PNAccessDeniedCategory';
+        if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
+        if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;
       }
 
-      return 'PNUnknownCategory';
+      return _categories2.default.PNUnknownCategory;
     }
@@ -137,0 +141,0 @@ }, {

lib/core/components/subscription_manager.js

@@ -9,10 +9,2 @@ 'use strict';
 
-var _subscribe = require('../endpoints/subscribe');
-
-var _subscribe2 = _interopRequireDefault(_subscribe);
-
-var _time = require('../endpoints/time');
-
-var _time2 = _interopRequireDefault(_time);
-
 var _cryptography = require('../components/cryptography');
@@ -40,2 +32,6 @@
 
+var _categories = require('../constants/categories');
+
+var _categories2 = _interopRequireDefault(_categories);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -281,7 +277,7 @@
       if (status.error) {
-        if (status.category === 'PNTimeoutCategory') {
+        if (status.category === _categories2.default.PNTimeoutCategory) {
           this._startSubscribeLoop();
         }
 
-        if (status.category === 'PNNetworkIssuesCategory') {
+        if (status.category === _categories2.default.PNNetworkIssuesCategory) {
           this.disconnect();
@@ -292,3 +288,3 @@ this._reconnectionManager.onReconnection(function () {
             var reconnectedAnnounce = {
-              category: 'PNReconnectedCategory',
+              category: _categories2.default.PNReconnectedCategory,
               operation: status.operation
@@ -307,3 +303,3 @@ };
         var connectedAnnounce = {};
-        connectedAnnounce.category = 'PNConnectedCategory';
+        connectedAnnounce.category = _categories2.default.PNConnectedCategory;
         connectedAnnounce.operation = status.operation;
@@ -325,4 +321,17 @@ this._subscriptionStatusAnnounced = true;
           var announce = {};
+          announce.channel = null;
+          announce.subscription = null;
+
           announce.actualChannel = subscriptionMatch != null ? channel : null;
           announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+
+
+          if (channel) {
+            announce.channel = channel.substring(0, channel.lastIndexOf('-pnpres'));
+          }
+
+          if (subscriptionMatch) {
+            announce.subscription = subscriptionMatch.substring(0, subscriptionMatch.lastIndexOf('-pnpres'));
+          }
+
           announce.action = message.payload.action;
@@ -337,4 +346,11 @@ announce.state = message.payload.data;
           var _announce = {};
+          _announce.channel = null;
+          _announce.subscription = null;
+
           _announce.actualChannel = subscriptionMatch != null ? channel : null;
           _announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+
+
+          _announce.channel = channel;
+          _announce.subscription = subscriptionMatch;
           _announce.timetoken = publishMetaData.publishTimetoken;
@@ -341,0 +357,0 @@

lib/core/endpoints/access_manager/audit.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNAccessManagerAudit';
+  return _operations2.default.PNAccessManagerAudit;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/access_manager/grant.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNAccessManagerGrant';
+  return _operations2.default.PNAccessManagerGrant;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/channel_groups/add_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNAddChannelsToGroupOperation';
+  return _operations2.default.PNAddChannelsToGroupOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/channel_groups/delete_group.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNRemoveGroupOperation';
+  return _operations2.default.PNRemoveGroupOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/channel_groups/list_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNChannelsForGroupOperation';
+  return _operations2.default.PNChannelsForGroupOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/channel_groups/list_groups.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNChannelGroupsOperation';
+  return _operations2.default.PNChannelGroupsOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/channel_groups/remove_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNRemoveChannelsFromGroupOperation';
+  return _operations2.default.PNRemoveChannelsFromGroupOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/history.js

@@ -16,2 +16,8 @@ 'use strict';
 
+var _operations = require('../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function __processMessage(modules, message) {
@@ -31,3 +37,3 @@ var config = modules.config;
 function getOperation() {
-  return 'PNHistoryOperation';
+  return _operations2.default.PNHistoryOperation;
 }
@@ -34,0 +40,0 @@

lib/core/endpoints/presence/get_state.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNGetStateOperation';
+  return _operations2.default.PNGetStateOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/presence/heartbeat.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNHeartbeatOperation';
+  return _operations2.default.PNHeartbeatOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/presence/here_now.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNHereNowOperation';
+  return _operations2.default.PNHereNowOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/presence/leave.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNUnsubscribeOperation';
+  return _operations2.default.PNUnsubscribeOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/presence/set_state.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNSetStateOperation';
+  return _operations2.default.PNSetStateOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/presence/where_now.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNWhereNowOperation';
+  return _operations2.default.PNWhereNowOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/publish.js

@@ -22,2 +22,8 @@ 'use strict';
 
+var _operations = require('../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function prepareMessagePayload(modules, messagePayload) {
@@ -38,3 +44,3 @@ var crypto = modules.crypto;
 function getOperation() {
-  return 'PNPublishOperation';
+  return _operations2.default.PNPublishOperation;
 }
@@ -41,0 +47,0 @@

lib/core/endpoints/push/add_push_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return _operations2.default.PNPushNotificationEnabledChannelsOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/push/list_push_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return _operations2.default.PNPushNotificationEnabledChannelsOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/push/remove_device.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNRemoveAllPushNotificationsOperation';
+  return _operations2.default.PNRemoveAllPushNotificationsOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/push/remove_push_channels.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return _operations2.default.PNPushNotificationEnabledChannelsOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/subscribe.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNSubscribeOperation';
+  return _operations2.default.PNSubscribeOperation;
 }
@@ -20,0 +26,0 @@

lib/core/endpoints/time.js

@@ -16,4 +16,10 @@ 'use strict';
 
+var _operations = require('../constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function getOperation() {
-  return 'PNTimeOperation';
+  return _operations2.default.PNTimeOperation;
 }
@@ -20,0 +26,0 @@

lib/core/pubnub-common.js

@@ -125,2 +125,10 @@ 'use strict';
 
+var _operations = require('./constants/operations');
+
+var _operations2 = _interopRequireDefault(_operations);
+
+var _categories = require('./constants/categories');
+
+var _categories2 = _interopRequireDefault(_categories);
+
 var _flow_interfaces = require('./flow_interfaces');
@@ -162,2 +170,3 @@
       subscribeEndpoint: subscribeEndpoint,
+      crypto: modules.crypto,
       config: modules.config,
@@ -243,4 +252,6 @@ listenerManager: listenerManager
 
+_class.OPERATIONS = _operations2.default;
+_class.CATEGORIES = _categories2.default;
 exports.default = _class;
 module.exports = exports['default'];
 //# sourceMappingURL=pubnub-common.js.map

package.json

 {
   "name": "pubnub",
   "preferGlobal": false,
-  "version": "4.0.8",
+  "version": "4.0.9",
   "author": "PubNub <[e-mail]>",
@@ -44,3 +44,3 @@ "description": "Publish & Subscribe Real-time Messaging with PubNub",
     "eslint-config-airbnb": "9.0.1",
-    "eslint-plugin-flowtype": "2.3.1",
+    "eslint-plugin-flowtype": "2.11.4",
     "eslint-plugin-import": "^1.9.2",
@@ -47,0 +47,0 @@ "eslint-plugin-mocha": "3.0.0",

README.md

@@ -20,3 +20,3 @@ # PubNub JavaScript SDK (V4)
 ## CDN Links
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.0.8.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.0.8.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.0.9.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.0.9.js

src/core/components/endpoint.js

@@ -5,2 +5,3 @@ import { StatusAnnouncement } from '../flow_interfaces';
 import Config from './config';
+import operationConstants from '../constants/operations';
 
@@ -33,3 +34,3 @@ function createError(errorPayload: Object, type: string): Object {
 
-  if (endpoint.getOperation() === 'PNTimeOperation' || endpoint.getOperation() === 'PNChannelGroupsOperation') {
+  if (endpoint.getOperation() === operationConstants.PNTimeOperation || endpoint.getOperation() === operationConstants.PNChannelGroupsOperation) {
     callback = args[0];
@@ -66,3 +67,3 @@ } else {
   // encrypt the params
-  if (endpoint.getOperation() === 'PNAccessManagerGrant') {
+  if (endpoint.getOperation() === operationConstants.PNAccessManagerGrant) {
     let signInput = config.subscribeKey + '\n' + config.publishKey + '\ngrant\n';
@@ -73,3 +74,3 @@ signInput += utils.signPamFromParams(outgoingParams);
 
-  if (endpoint.getOperation() === 'PNAccessManagerAudit') {
+  if (endpoint.getOperation() === operationConstants.PNAccessManagerAudit) {
     let signInput = config.subscribeKey + '\n' + config.publishKey + '\naudit\n';
@@ -107,5 +108,5 @@ signInput += utils.signPamFromParams(outgoingParams);
 
-  if (endpoint.getOperation() === 'PNSubscribeOperation') {
+  if (endpoint.getOperation() === operationConstants.PNSubscribeOperation) {
     return callInstance;
   }
 }

src/core/components/listener_manager.js

 /* @flow */
 import { MessageAnnouncement, StatusAnnouncement, CallbackStruct, PresenceAnnouncement } from '../flow_interfaces';
+import categoryConstants from '../constants/categories';
 
@@ -50,3 +51,3 @@ export default class {
     let networkStatus: StatusAnnouncement = {};
-    networkStatus.category = 'PNNetworkUpCategory';
+    networkStatus.category = categoryConstants.PNNetworkUpCategory;
     this.announceStatus(networkStatus);
@@ -57,3 +58,3 @@ }
     let networkStatus: StatusAnnouncement = {};
-    networkStatus.category = 'PNNetworkDownCategory';
+    networkStatus.category = categoryConstants.PNNetworkDownCategory;
     this.announceStatus(networkStatus);
@@ -60,0 +61,0 @@ }

src/core/components/networking.js

@@ -7,2 +7,3 @@ /* @flow */
 import Config from './config.js';
+import categoryConstants from '../constants/categories';
 
@@ -124,12 +125,12 @@ import { EndpointDefinition, StatusAnnouncement } from '../flow_interfaces';
   _detectErrorCategory(err: Object): string {
-    if (err.code === 'ENOTFOUND') return 'PNNetworkIssuesCategory';
-    if (err.status === 0 || (err.hasOwnProperty('status') && typeof err.status === 'undefined')) return 'PNNetworkIssuesCategory';
-    if (err.timeout) return 'PNTimeoutCategory';
+    if (err.code === 'ENOTFOUND') return categoryConstants.PNNetworkIssuesCategory;
+    if (err.status === 0 || (err.hasOwnProperty('status') && typeof err.status === 'undefined')) return categoryConstants.PNNetworkIssuesCategory;
+    if (err.timeout) return categoryConstants.PNTimeoutCategory;
 
     if (err.response) {
-      if (err.response.badRequest) return 'PNBadRequestCategory';
-      if (err.response.forbidden) return 'PNAccessDeniedCategory';
+      if (err.response.badRequest) return categoryConstants.PNBadRequestCategory;
+      if (err.response.forbidden) return categoryConstants.PNAccessDeniedCategory;
     }
 
-    return 'PNUnknownCategory';
+    return categoryConstants.PNUnknownCategory;
   }
@@ -136,0 +137,0 @@

src/core/components/subscription_manager.js

@@ -1,4 +0,2 @@
-
-import SubscribeEndpoints from '../endpoints/subscribe';
-import TimeEndpoints from '../endpoints/time';
+/* @flow */
 import Crypto from '../components/cryptography';
@@ -10,2 +8,3 @@ import Config from '../components/config';
 import { MessageAnnouncement, SubscribeEnvelope, StatusAnnouncement, PresenceAnnouncement } from '../flow_interfaces';
+import categoryConstants from '../constants/categories';
 
@@ -31,4 +30,7 @@ type SubscribeArgs = {
 type SubscriptionManagerConsturct = {
-    subscribeEndpoints: SubscribeEndpoints,
-    timeEndpoints: TimeEndpoints,
+    leaveEndpoint: Function,
+    subscribeEndpoint: Function,
+    timeEndpoint: Function,
+    heartbeatEndpoint: Function,
+    setStateEndpoint: Function,
     config: Config,
@@ -60,5 +62,5 @@ crypto: Crypto,
 
-  _subscribeCall: Object;
+  _subscribeCall: ?Object;
+  _heartbeatTimer: ?number;
 
-  _heartbeatTimer: number;
   _subscriptionStatusAnnounced: boolean;
@@ -243,3 +245,3 @@
       // if we timeout from server, restart the loop.
-      if (status.category === 'PNTimeoutCategory') {
+      if (status.category === categoryConstants.PNTimeoutCategory) {
         this._startSubscribeLoop();
@@ -249,3 +251,3 @@ }
       // we lost internet connection, alert the reconnection manager and terminate all loops
-      if (status.category === 'PNNetworkIssuesCategory') {
+      if (status.category === categoryConstants.PNNetworkIssuesCategory) {
         this.disconnect();
@@ -256,3 +258,3 @@ this._reconnectionManager.onReconnection(() => {
           let reconnectedAnnounce: StatusAnnouncement = {
-            category: 'PNReconnectedCategory',
+            category: categoryConstants.PNReconnectedCategory,
             operation: status.operation
@@ -271,3 +273,3 @@ };
       let connectedAnnounce: StatusAnnouncement = {};
-      connectedAnnounce.category = 'PNConnectedCategory';
+      connectedAnnounce.category = categoryConstants.PNConnectedCategory;
       connectedAnnounce.operation = status.operation;
@@ -289,4 +291,18 @@ this._subscriptionStatusAnnounced = true;
         let announce: PresenceAnnouncement = {};
+        announce.channel = null;
+        announce.subscription = null;
+
+        // deprecated -->
         announce.actualChannel = (subscriptionMatch != null) ? channel : null;
         announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+        // <-- deprecated
+
+        if (channel) {
+          announce.channel = channel.substring(0, channel.lastIndexOf('-pnpres'));
+        }
+
+        if (subscriptionMatch) {
+          announce.subscription = subscriptionMatch.substring(0, subscriptionMatch.lastIndexOf('-pnpres'));
+        }
+
         announce.action = message.payload.action;
@@ -301,4 +317,12 @@ announce.state = message.payload.data;
         let announce: MessageAnnouncement = {};
+        announce.channel = null;
+        announce.subscription = null;
+
+        // deprecated -->
         announce.actualChannel = (subscriptionMatch != null) ? channel : null;
         announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+        // <-- deprecated
+
+        announce.channel = channel;
+        announce.subscription = subscriptionMatch;
         announce.timetoken = publishMetaData.publishTimetoken;
@@ -305,0 +329,0 @@

src/core/endpoints/access_manager/audit.js

 /* @flow */
 
 import { AuditArguments, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNAccessManagerAudit';
+  return operationConstants.PNAccessManagerAudit;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/access_manager/grant.js

 /* @flow */
 
 import { GrantArguments, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNAccessManagerGrant';
+  return operationConstants.PNAccessManagerGrant;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/channel_groups/add_channels.js

 /* @flow */
 
 import { AddChannelParams, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNAddChannelsToGroupOperation';
+  return operationConstants.PNAddChannelsToGroupOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/channel_groups/delete_group.js

 /* @flow */
 
 import { DeleteGroupParams, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNRemoveGroupOperation';
+  return operationConstants.PNRemoveGroupOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/channel_groups/list_channels.js

 /* @flow */
 
 import { ListChannelsParams, ListChannelsResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNChannelsForGroupOperation';
+  return operationConstants.PNChannelsForGroupOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/channel_groups/list_groups.js

 /* @flow */
 
 import { ListAllGroupsResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNChannelGroupsOperation';
+  return operationConstants.PNChannelGroupsOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/channel_groups/remove_channels.js

 /* @flow */
 
 import { RemoveChannelParams, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNRemoveChannelsFromGroupOperation';
+  return operationConstants.PNRemoveChannelsFromGroupOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/history.js

 /* @flow */
 
 import { FetchHistoryArguments, HistoryResponse, HistoryItem, ModulesInject } from '../flow_interfaces';
+import operationConstants from '../constants/operations';
 
@@ -17,3 +18,3 @@ function __processMessage(modules, message: Object): Object | null {
 export function getOperation(): string {
-  return 'PNHistoryOperation';
+  return operationConstants.PNHistoryOperation;
 }
@@ -20,0 +21,0 @@

src/core/endpoints/presence/get_state.js

 /* @flow */
 
 import { GetStateArguments, GetStateResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNGetStateOperation';
+  return operationConstants.PNGetStateOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/presence/heartbeat.js

 /* @flow */
 
 import { HeartbeatArguments, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNHeartbeatOperation';
+  return operationConstants.PNHeartbeatOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/presence/here_now.js

 /* @flow */
 
 import { HereNowArguments, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNHereNowOperation';
+  return operationConstants.PNHereNowOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/presence/leave.js

 /* @flow */
 
 import { LeaveArguments, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNUnsubscribeOperation';
+  return operationConstants.PNUnsubscribeOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/presence/set_state.js

 /* @flow */
 
 import { SetStateArguments, SetStateResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNSetStateOperation';
+  return operationConstants.PNSetStateOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/presence/where_now.js

 /* @flow */
 
 import { WhereNowArguments, WhereNowResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNWhereNowOperation';
+  return operationConstants.PNWhereNowOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/publish.js

 /* @flow */
 
 import { PublishResponse, PublishArguments, ModulesInject } from '../flow_interfaces';
+import operationConstants from '../constants/operations';
 
@@ -18,3 +19,3 @@ function prepareMessagePayload(modules, messagePayload) {
 export function getOperation(): string {
-  return 'PNPublishOperation';
+  return operationConstants.PNPublishOperation;
 }
@@ -21,0 +22,0 @@

src/core/endpoints/push/add_push_channels.js

 /* @flow */
 
 import { ModifyDeviceArgs, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return operationConstants.PNPushNotificationEnabledChannelsOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/push/list_push_channels.js

 /* @flow */
 
 import { ListChannelsArgs, ListChannelsResponse, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return operationConstants.PNPushNotificationEnabledChannelsOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/push/remove_device.js

 /* @flow */
 
 import { RemoveDeviceArgs, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNRemoveAllPushNotificationsOperation';
+  return operationConstants.PNRemoveAllPushNotificationsOperation;
 }
@@ -24,7 +25,7 @@
 
-export function getRequestTimeout({ config }: ModulesInject) {
+export function getRequestTimeout({ config }: ModulesInject): number {
   return config.getTransactionTimeout();
 }
 
-export function isAuthSupported() {
+export function isAuthSupported(): boolean {
   return true;
@@ -31,0 +32,0 @@ }

src/core/endpoints/push/remove_push_channels.js

 /* @flow */
 
 import { ModifyDeviceArgs, ModulesInject } from '../../flow_interfaces';
+import operationConstants from '../../constants/operations';
 
 export function getOperation(): string {
-  return 'PNPushNotificationEnabledChannelsOperation';
+  return operationConstants.PNPushNotificationEnabledChannelsOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/subscribe.js

 /* @flow */
 
 import { SubscribeArguments, PublishMetaData, SubscribeMetadata, SubscribeMessage, SubscribeEnvelope, ModulesInject } from '../flow_interfaces';
+import operationConstants from '../constants/operations';
 
 export function getOperation(): string {
-  return 'PNSubscribeOperation';
+  return operationConstants.PNSubscribeOperation;
 }
@@ -8,0 +9,0 @@

src/core/endpoints/time.js

 /* @flow */
 
 import { TimeResponse, ModulesInject } from '../flow_interfaces';
+import operationConstants from '../constants/operations';
 
 export function getOperation(): string {
-  return 'PNTimeOperation';
+  return operationConstants.PNTimeOperation;
 }
@@ -13,3 +14,3 @@
 
-export function getRequestTimeout({ config }: ModulesInject) {
+export function getRequestTimeout({ config }: ModulesInject): number {
   return config.getTransactionTimeout();
@@ -22,3 +23,3 @@ }
 
-export function isAuthSupported() {
+export function isAuthSupported(): boolean {
   return false;
@@ -25,0 +26,0 @@ }

src/core/flow_interfaces.js

@@ -115,4 +115,8 @@ /* eslint no-unused-vars: 0 */
 
-  subscribedChannel: string,
-  actualChannel: string,
+  subscribedChannel: string, // deprecated
+  actualChannel: string,     // deprecated
+
+  channel: string,
+  subscription: string,
+
   timetoken: number,
@@ -126,4 +130,8 @@ userMetadata: Object
 
-  subscribedChannel: string,
-  actualChannel: string,
+  subscribedChannel: string, // deprecated
+  actualChannel: string,     // deprecated
+
+  channel: string,
+  subscription: string,
+
   timetoken: number,
@@ -130,0 +138,0 @@ userMetadata: Object

src/core/pubnub-common.js

@@ -40,2 +40,4 @@ /* @flow */
 import packageJSON from '../../package.json';
+import OPERATIONS from './constants/operations';
+import CATEGORIES from './constants/categories';
 
@@ -114,2 +116,3 @@ import { InternalSetupStruct } from './flow_interfaces';
       subscribeEndpoint,
+      crypto: modules.crypto,
       config: modules.config,
@@ -192,2 +195,5 @@ listenerManager,
 
+  static OPERATIONS = OPERATIONS;
+  static CATEGORIES = CATEGORIES;
+
 }

test/integration/components/subscription_manager.test.js

@@ -10,3 +10,3 @@ /* global describe, beforeEach, it, before, afterEach, after */
 
-describe('#components/subscription_manger', () => {
+describe('#components/subscription_manager', () => {
   let pubnub;
@@ -64,2 +64,4 @@ let pubnubWithPassingHeartbeats;
               subscribedChannel: 'coolChan-bnel',
+              channel: 'coolChannel',
+              subscription: 'coolChan-bnel',
               timetoken: '14607577960925503',
@@ -73,2 +75,4 @@ },
               subscribedChannel: 'coolChan-bnel',
+              channel: 'coolChannel',
+              subscription: 'coolChan-bnel',
               timetoken: '14607577960925503',
@@ -82,2 +86,4 @@ },
               subscribedChannel: 'coolChan-bnel',
+              channel: 'coolChannel',
+              subscription: 'coolChan-bnel',
               timetoken: '14607577960925503',
@@ -103,2 +109,4 @@ }
         assert.deepEqual({
+          channel: 'coolChannel',
+          subscription: null,
           actualChannel: null,
@@ -131,2 +139,4 @@ occupancy: 1,
         assert.deepEqual({
+          channel: 'ch10',
+          subscription: null,
           actualChannel: null,
@@ -151,3 +161,3 @@ occupancy: 3,
       status(statusPayload) {
-        if (statusPayload.operation !== 'PNHeartbeatOperation') return;
+        if (statusPayload.operation !== PubNub.OPERATIONS.PNHeartbeatOperation) return;
         let statusWithoutError = _.omit(statusPayload, 'errorData');
@@ -173,3 +183,3 @@ assert.deepEqual({
       status(statusPayload) {
-        if (statusPayload.operation !== 'PNHeartbeatOperation') return;
+        if (statusPayload.operation !== PubNub.OPERATIONS.PNHeartbeatOperation) return;
         let statusWithoutError = _.omit(statusPayload, 'errorData');
@@ -198,3 +208,3 @@ assert.equal(scope.isDone(), true);
       status(statusPayload) {
-        if (statusPayload.operation !== 'PNHeartbeatOperation') return;
+        if (statusPayload.operation !== PubNub.OPERATIONS.PNHeartbeatOperation) return;
 
@@ -201,0 +211,0 @@ assert.equal(scope.isDone(), true);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1239979

increased by6.02%

Number of package files

143

increased by4.38%

Lines of code

12142

increased by3.24%

No dependency changes