comprodls-sdk 2.71.0-development → 2.72.0

package/lib/comprodls.js

@@ -83,8 +83,6 @@ function comproDLS(environment, realm, options) {
     try {
       config.DEFAULT_HOSTS = config.REALM_HOSTS[realm.toUpperCase()][environment.toUpperCase()];
       if(!config.DEFAULT_HOSTS){ throw 'Invalid Environment'; }
-
-      config.PUBNUB_ORIGINS = config.PUBNUB_ORIGINS[realm.toUpperCase()][environment.toUpperCase()];
     }
     catch (e){
       var realmObj = config.REALM_HOSTS[realm.toUpperCase()];

package/lib/config/index.js

@@ -350,7 +350,8 @@ exports.PUB_API_URLS = {
 
 exports.PUSHX_API_URLS = {
     grantByUserOrgId: '/orgs/{orgId}/grants',
-    grantByAccountId: '/accounts/{accountId}/grants'
+    grantByAccountId: '/accounts/{accountId}/grants',
+    getPushedEvents: '/accounts/{accountId}/pushed-events/channels'
 };
 
 exports.INTEGRATIONS_API_URLS = {
@@ -379,23 +380,3 @@ exports.RULES_API_URLS = {
   updateRuleDisplay: '/org/{orgId}/context/{context}/rule_type/{ruleType}/rules/{ruleId}/update-rule-display',
   getUserRule: '/org/{orgId}/context/{context}/rule_type/{ruleType}/users/{userId}/rules'
 };
-
-exports.PUBNUB_ORIGINS = {
-  ASGARD: {
-    THOR: {
-      CUSTOM: 'pushdlsthor.pubnubapi.com'
-    }
-  },
-  GLOBAL: {
-    PRODUCTION: {
-    },
-    PROD1: {}
-  },
-  CUP: {
-    QA: {},
-    REL: {},
-    HFX: {},
-    ALPHA: {},
-    PROD1: {}
-  }
-};

package/lib/services/pushX/index.js

@@ -26,6 +26,7 @@
 
 var q = require('q');
 var request = require('superagent');
+var Agent = require('agentkeepalive');
 
 var helpers = require('../../helpers');
 var pubnubClientWrapper = require('./pubnubClientWrapper');
@@ -36,6 +37,11 @@ var DLSError = helpers.errors.DLSError;
  **********************************/
 module.exports = pushX;
 
+var keepaliveAgent = new Agent({
+  timeout: 60000,
+  freeSocketTimeout: 30000
+});
+
 /*********************************
  * Public Function definitions
  **********************************/
@@ -46,14 +52,15 @@ function pushX() {
         "cleanup": _cleanup.bind(this, _pubnubClientWrapper),
         "grantByUserOrgId": grantByUserOrgId.bind(this),
         "grantByAccountId": grantByAccountId.bind(this),
-        "grantByAccountIdOnExtUserId": grantByAccountIdOnExtUserId.bind(this)
+        "grantByAccountIdOnExtUserId": grantByAccountIdOnExtUserId.bind(this),
+        "getPushedEvents": getPushedEvents.bind(this)
     };
 }
 
 /*********************************
  * Public Function definitions
  **********************************/
-
+// This is a dummy comment to test release.
 function _connect(pubnubCW, options) {
     var bpubnubV7 = true; // If pubnub v7 or higher in package.json, set it true
     if (bpubnubV7 && !options.userid) {
@@ -70,8 +77,7 @@ function _connect(pubnubCW, options) {
         'publishKey': options.publishKey,
         'subscribeKey': options.subscribeKey,
         'authKey': options.authKey,
-        'ssl': true,
-        'origin': this.config.PUBNUB_ORIGINS.CUSTOM
+        'ssl': true
       }
     });
 }
@@ -197,3 +203,49 @@ function grantByAccountIdOnExtUserId(options) {
     return dfd.promise;
 }
 
+/**
+ * @param {
+ *  *accountid: "string",
+ *  *channelName: "string",
+ *  *starttime: number,
+ *  *endtime: number
+ * } options
+ */
+function getPushedEvents(options) {
+  var self = this;
+  var dfd = q.defer();  // Initializing promise
+  var accountid = options.accountid,
+    channelname = options.channelname,
+    starttime = options.starttime,
+    endtime = options.endtime;
+
+  if (accountid && channelname && starttime && endtime) {
+    // Passed all validations, Construct API url
+    var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.getPushedEvents;
+    url = helpers.api.constructAPIUrl(url, { accountId: accountid });
+
+    // Setup request with URL and Params
+    var params = {channelname: channelname, starttime: starttime, endtime: endtime};
+    var requestAPI = request.get(url).query(params);
+    if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+
+    requestAPI
+      .agent(keepaliveAgent)
+      .end(function(error, response) {
+        if (error) {
+          error = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
+          dfd.reject(error);
+        } else {
+          dfd.resolve(response.body);
+        }
+    });
+  }
+  else {
+    var err = {};
+    err.message = err.description = 'Mandatory parameters [accountId, channelname,' +
+      ' starttime, endtime] not found in request options';
+    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
+    dfd.reject(err);
+  }
+  return dfd.promise;
+}

package/package.json

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