comprodls-sdk 2.77.1 → 2.79.0

package/lib/services/pushX/index.js

@@ -80,7 +80,10 @@ function _connect(pubnubCW, options) {
       'publishKey': options.publishKey,
       'subscribeKey': options.subscribeKey,
       'ssl': true
-    }
+    },
+    'pollingEndpoint': options.pollingEndpoint,
+    'pollingIterations': options.pollingIterations || 10, // Default polling iterations is 10
+    'pollingInterval': options.pollingInterval || 1, // Default polling interval is 1 minute
   });
 }
 

package/lib/services/pushX/pubnubClientWrapper.js

@@ -1,4 +1,5 @@
 var pubNub = require("pubnub");
+var request = require('superagent');
 var EventEmitter = require("events").EventEmitter;
 var helpers = require('../../helpers');
 
@@ -21,6 +22,12 @@ module.exports = function () {
     var _globalSubscription = [];
     var _globalSubscriptionStatus = {};
     var bStatusSubscribed = false;
+    /** ID of the setTimeout - used for Polling events when PubNub fails */
+    var _setTimeoutIDForPolling;
+    /** Timestamp from when the events need to be fetched */
+    var _startTimestampForPolling;
+    /** Counter for polling */
+    var _pollingCounter;
     var bPollingInitiated = false;
 
     /** ###### END OF MODULE GLOBALS */
@@ -37,6 +44,9 @@ module.exports = function () {
         //Returning the adaptor (Plain Javascript object)
         return {
             "on": function (channelObj, handler) {
+                // If PubNub fails, we will fetch the events from this timestamp
+                _startTimestampForPolling = Date.now();
+
                 var pubNubChannel;
                 var channelContext = [];
 
@@ -65,6 +75,9 @@ module.exports = function () {
                     _eventEmitter.on(channelObj.channel, handler);
                     bStatusSubscribed = true;
                 }
+
+                // Clean up the old events
+                _checkOldBubbledEvents();
             },
             "getMySubscriptionStatus": __getMySubscriptionStatus
         };
@@ -143,9 +156,9 @@ module.exports = function () {
                 break;
             case "PNNetworkIssuesCategory":
                 if(status.operation === 'PNSubscribeOperation') {
-                    if(!options.accountId) {
+                    if(!options.accountId || !_userOptions.pollingEndpoint) {
                         error = {
-                            message: "Polling initiation error: Missing mandatory parameters to initiate polling operation - accountId",
+                            message: "Polling initiation error: Missing mandatory parameters to initiate polling operation - [accountId, pollingEndpoint]",
                             status: status.statusCode
                         };
                         error = new PUSHXError(helpers.errors.ERROR_CATEGORY.PUSHX, error);
@@ -160,6 +173,8 @@ module.exports = function () {
                          * The wrapper supports multiple channels, but the APP currently uses a single channel only.
                          * Polling will also limited to a single channel.
                          */
+                        _pollingCounter = 0;
+                        _pollForEvents();
                         bPollingInitiated = true;
                     }
                 }
@@ -211,6 +226,7 @@ module.exports = function () {
      * @returns PROMISE.
      */
     var __setup = function (userOptions) {
+
         var pubnubConfig = userOptions.pubnub;
         pubnubConfig.uuid = userOptions.userid;
         var accountId = userOptions.accountid;
@@ -252,6 +268,147 @@ module.exports = function () {
             bPollingInitiated = false;
         }
         _pubnubClient = undefined;
+
+        // Clear the Polling
+        if (_setTimeoutIDForPolling) {
+            clearTimeout(_setTimeoutIDForPolling);
+            // Setting the start time to now to clear the old events
+            _startTimestampForPolling = Date.now();
+            _checkOldBubbledEvents();
+            _setTimeoutIDForPolling = undefined;
+            _pollingCounter = undefined;
+            _startTimestampForPolling = undefined;
+        }
+    };
+
+    /**
+     * Polling function
+     */
+    var _pollForEvents = function () {
+        // Setup request params
+        var params = {
+            accountid: _userOptions.accountid,
+            channelname: _globalSubscription[0],
+            starttime: _startTimestampForPolling,
+            endtime: Date.now()
+        };
+        var requestAPI = request.get(_userOptions.pollingEndpoint).query(params);
+    
+        requestAPI
+            .end(function(error, response) {
+                
+                if (!error) {
+                    // Bubble the connected status
+                    if (_pollingCounter === 0) {
+                        // Set the status of the channel to subscribed
+                        if(_globalSubscriptionStatus[_globalSubscription[0]]) {
+                            _globalSubscriptionStatus[_globalSubscription[0]].status = 'subscribed';
+                        }
+
+                        var successObj = {
+                            category: 'PUSHX',
+                            type: 'CHANNEL_SUBSCRIPTION',
+                            status: 'SUCCESS',
+                            message: 'Success: Subscribed successfully.',
+                            httpcode: 200,
+                            data: {
+                                payload: {
+                                    channels: _globalSubscription
+                                },
+                                message: 'Success: Subscribed successfully.'
+                            }
+                        };
+                        _eventEmitter.emit('pushx_status', successObj);
+                    }
+
+                    // Bubble the received events
+                    _bubblePolledEvents(response.body);
+
+                    // Increase the counter
+                    _pollingCounter++;
+                }
+
+                // Polling will be done only for specific number of times
+                if (_pollingCounter > _userOptions.pollingIterations) {
+                    var error = {
+                        message: "Polling error: Polling limit exceeded",
+                        status: 429
+                    };
+                    error = new PUSHXError(helpers.errors.ERROR_CATEGORY.PUSHX, error);
+                    _eventEmitter.emit('pushx_status', error);
+                } else {
+                    // Set timeout for next poll
+                    _setTimeoutIDForPolling = setTimeout(_pollForEvents, _userOptions.pollingInterval * 60 * 1000);
+                }
+        });
+    };
+
+    /**
+     * Bubble the polled events to the FE APP
+     * @param {*} events - Events recieved from the polling endpoint 
+     */
+    var _bubblePolledEvents = function (events) {
+        // Load the old events from the session storage
+        var oldEventData = _checkOldBubbledEvents();
+
+        var oldEvents = oldEventData.events;
+        var sessionStorageKey = oldEventData.key;
+
+        for (var i = 0; i < events.entities.length; i++) {
+            var event = events.entities[i];
+            var eventId = event.pk + '_' + event.sk;
+
+            // Check if the event is already emitted
+            if (!oldEvents[eventId]) {
+                oldEvents[eventId] = event.context.start_time;
+
+                // Emit the event
+                _eventEmitter.emit(_globalSubscription[0], event);
+            }
+        }
+
+        // Save the bubbled events to session storage
+        sessionStorage.setItem(sessionStorageKey, JSON.stringify(oldEvents));
+    };
+
+    /**
+     * Check the old bubbled events and remove the events that are older than the start timestamp
+     * @returns {object} - Object containing the key and the events
+     */
+    var _checkOldBubbledEvents = function () {
+        var sessionStorageKey = 'comprodls.old_pushx_events.' + _userOptions.userid + '.' + _globalSubscription[0];
+        var oldEvents = sessionStorage.getItem(sessionStorageKey);
+
+        if (oldEvents) {
+            try {
+                oldEvents = JSON.parse(oldEvents);
+            } catch (e) {
+                oldEvents = {};
+            }
+
+            var oldEventIds = Object.keys(oldEvents);
+
+            // Remove the events that are older than the start timestamp
+            for (var i = 0; i < oldEventIds.length; i++) {
+                var oldEventId = oldEventIds[i];
+
+                if (oldEvents[oldEventId] < _startTimestampForPolling) {
+                    delete oldEvents[oldEventId];
+                }
+            }
+
+            // If the number of events has changed, save the events
+            if (oldEventIds.length !== Object.keys(oldEvents).length) {
+                sessionStorage.setItem(sessionStorageKey, JSON.stringify(oldEvents));
+            }
+        } else {
+            oldEvents = {};
+        }
+
+        return {
+            key: sessionStorageKey,
+            events: oldEvents
+        };
     };
 
     return { // Return public methods for the wrapper

package/lib/services/spaces/index.js

@@ -524,6 +524,7 @@ function provisionBulkSpaces(options) {
  *     *startdate: <epoch>,
  *     *enddate: <epoch>,
  *     description: 'string',
+ *     ext_class_title : 'string',
  *     ext_data: {},
  *     limits: {
  *       *los: 0,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "comprodls-sdk",
   "description": "comproDLS SDK for JavaScript",
-  "version": "2.77.1",
+  "version": "2.79.0",
   "author": {
     "name": "Compro Technologies Private Limited",
     "url": "http://www.comprotechnologies.com/"