notification-processor 4.16.1 → 4.18.0

package/lib/observers/monitoringCenter.observer.js

@@ -24,8 +24,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     function MonitoringCenterObserver(_ref) {
       var sender = _ref.sender,
           clientId = _ref.clientId,
-          app = _ref.app,
-          job = _ref.job,
+          app1 = _ref.app,
+          job1 = _ref.job,
           _ref$propertiesToOmit = _ref.propertiesToOmit,
           propertiesToOmit = _ref$propertiesToOmit === undefined ? "auth" : _ref$propertiesToOmit,
           _ref$connection = _ref.connection,
@@ -39,8 +39,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       this.uploadTrackingFile = this.uploadTrackingFile.bind(this);
       this.sender = sender;
       this.clientId = clientId;
-      this.app = app;
-      this.job = job;
+      this.app = app1;
+      this.job = job1;
       this.propertiesToOmit = propertiesToOmit;
       this.deliveryStream = deliveryStream;
       this.firehose = new AWS.Firehose({ accessKeyId: accessKeyId, secretAccessKey: secretAccessKey, region: region });
@@ -85,17 +85,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               Data: JSON.stringify(record)
             }
           };
-          debug("Uploading file " + record.event + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
+          debug("Uploading file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
           __uploadToFirehose = function __uploadToFirehose() {
             return _this2.uploadToFirehose(uploadParams);
           };
           return retry(__uploadToFirehose, {
             throw_original: true
           }).tap(function () {
-            return debug("Uploaded file " + record.event + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
+            return debug("Uploaded file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
           }).catch(function (e) {
             // We'll do nothing with this error
-            return debug("Error uploading file " + record.event + " to firehose delivery stream " + uploadParams.DeliveryStreamName + " %o", e);
+            return debug("Error uploading file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName + " %o", e);
           });
         });
       }
@@ -104,30 +104,36 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       value: function _mapper(id, notification, err, eventType) {
         var _this3 = this;
 
-        var ref, theRequest;
-        if (!(notification != null ? (ref = notification.message) != null ? ref.EventId : void 0 : void 0)) {
-          return Promise.resolve({});
-        }
-        theRequest = _.get(err, "detail.request") || _.get(err, "cause.detail.request");
-        return Promise.props({
-          resource: Promise.method(this.sender.resource)(notification),
-          user: Promise.method(this.sender.user)(notification)
-        }).then(function (_ref3) {
-          var resource = _ref3.resource,
-              user = _ref3.user;
-
-          var now, ref1, ref2;
+        return Promise.method(this.sender.monitoringCenterFields.bind(this.sender))(notification).then(function (_ref3) {
+          var eventType = _ref3.eventType,
+              resource = _ref3.resource,
+              companyId = _ref3.companyId,
+              userId = _ref3.userId,
+              externalReference = _ref3.externalReference,
+              userExternalReference = _ref3.userExternalReference,
+              eventId = _ref3.eventId,
+              eventTimestamp = _ref3.eventTimestamp,
+              parentEventId = _ref3.parentEventId,
+              app = _ref3.app,
+              job = _ref3.job;
+
+          var now, theRequest;
+          if (!eventId) {
+            return Promise.resolve({});
+          }
+          theRequest = _.get(err, "detail.request") || _.get(err, "cause.detail.request");
           now = new Date();
           return {
             id: id,
             executionId: id,
-            app: parseInt(_this3.clientId),
-            type: "service-bus",
-            company: "" + user,
-            user: null, //TODO: Chequear si podemos completar esto
-            event: notification != null ? (ref1 = notification.message) != null ? ref1.EventId : void 0 : void 0,
-            parent: (notification != null ? (ref2 = notification.message) != null ? ref2.ParentEventId : void 0 : void 0) || null,
-            externalreference: null,
+            app: app || parseInt(_this3.clientId) || null,
+            type: eventType,
+            company: companyId,
+            user: userId,
+            event: eventId,
+            parent: parentEventId,
+            externalreference: externalReference,
+            userexternalreference: userExternalReference,
             timestamp: now.getTime(),
             date: now.toISOString(),
             year: moment(now).format('YYYY'),
@@ -140,15 +146,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               app: _this3.app,
               error: _.omit(err, ["detail.request", "cause.detail.request"]),
               request: _.omit(theRequest, _.castArray(_this3.propertiesToOmit).concat("auth")),
-              type: _.get(err, "type", "unknown_error"),
+              type: err && _.get(err, "type", "unknown"),
               tags: _.get(err, "tags", [])
             }),
             status: eventType,
             resource: resource,
-            integration: _this3.app + "|" + _this3.job,
+            integration: _this3.app + "|" + (job || _this3.job),
             // Generic app fields
-            event_timestamp: null, //TODO
-            output_message: null, //TODO
+            event_timestamp: eventTimestamp || now.getTime(),
+            output_message: _.get(err, "type"),
             user_settings_version: null, //TODO
             env_version: null, //TODO
             code_version: null //TODO

package/lib/processors/job/index.js

@@ -2,13 +2,13 @@
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var JobProcessor, RequestProcessor, _;
+  var JobProcessor, RequestAsyncProcessor, _;
 
   _ = require("lodash");
 
   JobProcessor = require("./job.processor");
 
-  RequestProcessor = require("../request.async.processor");
+  RequestAsyncProcessor = require("../request.async.processor");
 
   module.exports = function (_ref) {
     var apiUrl = _ref.apiUrl,
@@ -19,7 +19,7 @@
 
     var jobProcesor;
     jobProcesor = new JobProcessor({
-      processor: RequestProcessor({
+      processor: RequestAsyncProcessor({
         apiUrl: apiUrl,
         fullResponse: true
       }),

package/lib/processors/job/notification.api.js

@@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var DEFAULT_NOTIFICATIONS_API_ASYNC_URL, HOUR, NOTIFICATIONS_API_JOBS_CACHE_TTL, NOTIFICATIONS_API_MASTER_TOKEN, NOTIFICATIONS_API_STOPPED_JOB_CACHE_TTL, NodeCache, NotificationsApi, Promise, _, jobsCache, requestPromise, retry, stoppedJobsCache;
+  var DEFAULT_NOTIFICATIONS_API_ASYNC_URL, DEFAULT_NOTIFICATIONS_API_URL, HOUR, NOTIFICATIONS_API_JOBS_CACHE_TTL, NOTIFICATIONS_API_MASTER_TOKEN, NOTIFICATIONS_API_STOPPED_JOB_CACHE_TTL, NodeCache, NotificationsApi, Promise, _, jobsCache, requestPromise, retry, stoppedJobsCache;
 
   _ = require("lodash");
 
@@ -26,6 +26,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
   DEFAULT_NOTIFICATIONS_API_ASYNC_URL = process.env.DEFAULT_NOTIFICATIONS_API_ASYNC_URL || "https://apps.producteca.com/aws/notifications-api-async";
 
+  DEFAULT_NOTIFICATIONS_API_URL = process.env.NOTIFICATIONS_API_URL || "https://apps.producteca.com/notifications-api/api";
+
   HOUR = 60 * 60;
 
   //Para minimizar las requests a notifications-api, cachea unos segundos el estado del job
@@ -40,9 +42,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
   NotificationsApi = function () {
     function NotificationsApi(_ref) {
-      var notificationApiUrl = _ref.notificationApiUrl,
-          token = _ref.token,
-          jobId = _ref.jobId,
+      var _ref$notificationApiU = _ref.notificationApiUrl,
+          notificationApiUrl = _ref$notificationApiU === undefined ? DEFAULT_NOTIFICATIONS_API_URL : _ref$notificationApiU,
+          token1 = _ref.token,
+          jobId1 = _ref.jobId,
           _ref$notificationApiA = _ref.notificationApiAsyncUrl,
           notificationApiAsyncUrl = _ref$notificationApiA === undefined ? DEFAULT_NOTIFICATIONS_API_ASYNC_URL : _ref$notificationApiA;
 
@@ -52,15 +55,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       this.success = this.success.bind(this);
       this.fail = this.fail.bind(this);
       this.jobIsStopped = this.jobIsStopped.bind(this);
+      this.jobName = this.jobName.bind(this);
       this._jobIsStopped = this._jobIsStopped.bind(this);
+      this.fetchJob = this.fetchJob.bind(this);
       this._fetchJob = this._fetchJob.bind(this);
       this._doFetchJob = this._doFetchJob.bind(this);
       this._retryViaAsyncOrIgnore = this._retryViaAsyncOrIgnore.bind(this);
       this._makeRequest = this._makeRequest.bind(this);
       this._shouldUseCachedValue = this._shouldUseCachedValue.bind(this);
       this.notificationApiUrl = notificationApiUrl;
-      this.token = token;
-      this.jobId = jobId;
+      this.token = token1;
+      this.jobId = jobId1;
       this.notificationApiAsyncUrl = notificationApiAsyncUrl;
       if (_.startsWith(this.token, 'Basic') && !_.isEmpty(NOTIFICATIONS_API_MASTER_TOKEN)) {
         companyId = _.first(Buffer.from(_.get(this.token.split(" "), "1"), 'base64').toString().split(":"));
@@ -133,39 +138,50 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           }
         });
       }
+    }, {
+      key: "jobName",
+      value: function jobName(jobId, token) {
+        return this._fetchJob(jobId, token).then(function (job) {
+          return job.name;
+        });
+      }
     }, {
       key: "_jobIsStopped",
-      value: function _jobIsStopped() {
-        return this._fetchJob().then(function (job) {
+      value: function _jobIsStopped(jobId, token) {
+        return this._fetchJob(jobId, token).then(function (job) {
           return job.stopped;
         });
       }
+    }, {
+      key: "fetchJob",
+      value: function fetchJob(aJobId, aToken) {
+        return this._fetchJob(aJobId, aToken);
+      }
     }, {
       key: "_fetchJob",
-      value: function _fetchJob() {
-        var _this4 = this;
-
-        var cachedJob;
-        cachedJob = jobsCache.get(this.jobId);
+      value: function _fetchJob(aJobId, aToken) {
+        var cachedJob, jobId;
+        jobId = aJobId || this.jobId;
+        cachedJob = jobsCache.get(jobId);
         if (this._shouldUseCachedValue(cachedJob)) {
           return Promise.resolve(cachedJob);
         }
-        return this._doFetchJob().tap(function (job) {
-          return jobsCache.set(_this4.jobId, job);
+        return this._doFetchJob(jobId, aToken).tap(function (job) {
+          return jobsCache.set(jobId, job);
         });
       }
     }, {
       key: "_doFetchJob",
-      value: function _doFetchJob() {
-        var _this5 = this;
+      value: function _doFetchJob(jobId, token) {
+        var _this4 = this;
 
         var __fetchJob;
         __fetchJob = function __fetchJob() {
           return requestPromise({
-            url: _this5.notificationApiUrl + "/jobs/" + _this5.jobId,
+            url: _this4.notificationApiUrl + "/jobs/" + (jobId || _this4.jobId),
             method: "GET",
             headers: {
-              authorization: _this5.token
+              authorization: token || _this4.token
             },
             json: true
           }).promise();

package/lib/processors/maxRetries.processor.js

@@ -22,10 +22,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
     _createClass(MaxRetriesProcessor, [{
       key: "process",
-      value: function process(notification, context) {
+      value: function process(notification, context, executionId) {
         var _this = this;
 
-        return this.processor(notification, context).tap(function (it) {
+        return this.processor(notification, context, executionId).tap(function (it) {
           return _this._onSuccess_(notification, it);
         }).catch(function (err) {
           if (_this._shouldRetry_(notification, err)) {

package/lib/processors/request.async.processor.js

@@ -18,17 +18,21 @@
   };
 
   builderRequest = function builderRequest(apiUrl, fullResponse) {
-    return function (_ref2) {
+    return function (_ref2, context, executionId) {
       var message = _ref2.message;
 
-      var Body, HeadersForRequest, Method, Resource, headers, json, url;
+      var Body, HeadersForRequest, JobId, Method, Resource, headers, json, url;
       Resource = message.Resource;
       Method = message.Method;
       Body = message.Body;
       HeadersForRequest = message.HeadersForRequest;
+      JobId = message.JobId;
 
       json = (Body != null ? Body.length : void 0) > 0 ? JSON.parse(Body) : true;
       headers = _normalizeHeaders(HeadersForRequest);
+      if (JobId) {
+        headers['x-producteca-event-id'] = JobId + "/" + executionId;
+      }
       url = headers.Domain || apiUrl;
       return {
         url: "" + url + Resource,

package/lib/senders/async.producteca.sender.js

@@ -4,38 +4,55 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var OAuthApi, Promise, _, _companyId;
+  var NotificationsApi, OAuthApi, Promise, _, _companyId, _companyIdFromBasicToken, _headerValue, notificationsApi, retry, uuid;
 
   _ = require("lodash");
 
   OAuthApi = require("../services/oAuthApi");
 
+  NotificationsApi = require("../processors/job/notification.api");
+
   Promise = require("bluebird");
 
-  _companyId = function _companyId(method, token) {
+  retry = require("bluebird-retry");
+
+  uuid = require("uuid/v4");
+
+  notificationsApi = new NotificationsApi({});
+
+  _companyIdFromBasicToken = function _companyIdFromBasicToken(token) {
     var decoded;
-    if (method !== "Basic") {
-      return new OAuthApi(token).companyId();
-    }
     decoded = Buffer.from(token, "base64").toString();
     return _.split(decoded, ":")[0];
   };
 
+  _companyId = function _companyId(method, token) {
+    if (method !== "Basic") {
+      return new OAuthApi(token).scopes().get("companyId");
+    }
+    return _companyIdFromBasicToken(token);
+  };
+
+  _headerValue = function _headerValue(headers, key, defaultValue) {
+    var header;
+    header = _.find(headers, {
+      Key: key
+    });
+    return _.get(header, "Value", defaultValue);
+  };
+
   module.exports = {
     user: function user(_ref) {
       var HeadersForRequest = _ref.message.HeadersForRequest;
 
-      var auth, method, token;
-      auth = _.find(HeadersForRequest, {
-        Key: "Authorization"
-      });
+      var method, token;
 
-      var _$get$split = _.get(auth, "Value", "").split(" ");
+      var _headerValue$split = _headerValue(HeadersForRequest, "Authorization", "").split(" ");
 
-      var _$get$split2 = _slicedToArray(_$get$split, 2);
+      var _headerValue$split2 = _slicedToArray(_headerValue$split, 2);
 
-      method = _$get$split2[0];
-      token = _$get$split2[1];
+      method = _headerValue$split2[0];
+      token = _headerValue$split2[1];
 
       return _companyId(method, token);
     },
@@ -47,6 +64,74 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
       } else {
         return _.get(message, "Resource");
       }
+    },
+    monitoringCenterFields: function monitoringCenterFields(notification) {
+      var _this = this;
+
+      var __job, __scopes, fullToken, method, token;
+      fullToken = _headerValue(notification.message.HeadersForRequest, "Authorization", "");
+
+      var _fullToken$split = fullToken.split(" ");
+
+      var _fullToken$split2 = _slicedToArray(_fullToken$split, 2);
+
+      method = _fullToken$split2[0];
+      token = _fullToken$split2[1];
+
+      __scopes = function __scopes() {
+        if (_(method.toLowerCase()).includes("bearer")) {
+          return retry(function () {
+            return new OAuthApi(token).scopes();
+          });
+        }
+        return Promise.resolve({
+          id: null,
+          appId: null,
+          companyId: _companyIdFromBasicToken(token)
+        });
+      };
+      __job = function __job() {
+        if (notification.message.JobId && fullToken) {
+          return notificationsApi.fetchJob(notification.message.JobId, fullToken).catchReturn().then(function (it) {
+            return it || {};
+          });
+        } else {
+          return Promise.resolve({});
+        }
+      };
+      return Promise.props({
+        scopes: __scopes(),
+        job: __job()
+      }).then(function (_ref3) {
+        var _ref3$scopes = _ref3.scopes,
+            id = _ref3$scopes.id,
+            companyId = _ref3$scopes.companyId,
+            appId = _ref3$scopes.appId,
+            _ref3$job = _ref3.job,
+            name = _ref3$job.name,
+            creationDate = _ref3$job.creationDate;
+
+        var eventId, jobCreationDate, messageInsertionTime, ref, ref1, ref2;
+        eventId = notification.message.JobId || _headerValue(notification.message.HeadersForRequest, "x-producteca-event-id", null) || _headerValue(notification.message.HeadersForRequest, "X-producteca-event-id", null) || (notification != null ? (ref = notification.meta) != null ? ref.messageId : void 0 : void 0) || uuid();
+        if (creationDate) {
+          jobCreationDate = new Date(creationDate).getTime();
+        }
+        if (notification != null ? (ref1 = notification.meta) != null ? ref1.insertionTime : void 0 : void 0) {
+          messageInsertionTime = new Date(notification != null ? (ref2 = notification.meta) != null ? ref2.insertionTime : void 0 : void 0).getTime();
+        }
+        return Promise.props({
+          eventType: 'http',
+          resource: _this.resource(notification),
+          companyId: companyId,
+          userId: id,
+          app: parseInt(appId),
+          job: name,
+          externalReference: null,
+          eventId: eventId,
+          eventTimestamp: jobCreationDate || messageInsertionTime,
+          parentEventId: null
+        });
+      });
     }
   };
 }).call(undefined);

package/lib/senders/meli.sender.js

@@ -2,6 +2,14 @@
 
 // Generated by CoffeeScript 2.7.0
 (function () {
+  var Promise, UserIdTranslator, uuid;
+
+  uuid = require("uuid/v4");
+
+  Promise = require("bluebird");
+
+  UserIdTranslator = require("../services/userIdTranslator");
+
   module.exports = {
     user: function user(_ref) {
       var user_id = _ref.message.user_id;
@@ -12,6 +20,27 @@
       var _resource = _ref2.message.resource;
 
       return _resource;
+    },
+    monitoringCenterFields: function monitoringCenterFields(notification) {
+      var _this = this;
+
+      return new UserIdTranslator().translate(this.user(notification)).then(function (_ref3) {
+        var app = _ref3.app,
+            companyId = _ref3.companyId;
+
+        var ref, ref1, ref2;
+        return Promise.props({
+          eventType: 'http',
+          resource: null,
+          app: app,
+          companyId: companyId,
+          userId: null,
+          externalReference: _this.resource(notification),
+          eventId: (notification != null ? (ref = notification.message) != null ? ref._id : void 0 : void 0) || uuid(),
+          eventTimestamp: (notification != null ? (ref1 = notification.meta) != null ? ref1.insertionTime : void 0 : void 0) ? new Date(notification != null ? (ref2 = notification.meta) != null ? ref2.insertionTime : void 0 : void 0).getTime() : void 0,
+          parentEventId: null
+        });
+      });
     }
   };
 }).call(undefined);

package/lib/senders/producteca.sender.js

@@ -2,6 +2,10 @@
 
 // Generated by CoffeeScript 2.7.0
 (function () {
+  var Promise;
+
+  Promise = require("bluebird");
+
   module.exports = {
     user: function user(_ref) {
       var CompanyId = _ref.message.CompanyId;
@@ -12,6 +16,19 @@
       var ResourceId = _ref2.message.ResourceId;
 
       return ResourceId;
+    },
+    monitoringCenterFields: function monitoringCenterFields(notification) {
+      var ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7;
+      return Promise.props({
+        eventType: 'service-bus',
+        resource: this.resource(notification),
+        companyId: this.user(notification),
+        userId: (notification != null ? (ref = notification.message) != null ? ref.UserId : void 0 : void 0) || (notification != null ? (ref1 = notification.message) != null ? ref1.User : void 0 : void 0),
+        externalReference: null,
+        eventId: notification != null ? (ref2 = notification.message) != null ? ref2.EventId : void 0 : void 0,
+        eventTimestamp: (notification != null ? (ref3 = notification.meta) != null ? ref3.insertionTime : void 0 : void 0) || (notification != null ? (ref4 = notification.message) != null ? ref4.Sent : void 0 : void 0) ? new Date((notification != null ? (ref5 = notification.meta) != null ? ref5.insertionTime : void 0 : void 0) || (notification != null ? (ref6 = notification.message) != null ? ref6.Sent : void 0 : void 0)).getTime() : void 0,
+        parentEventId: notification != null ? (ref7 = notification.message) != null ? ref7.ParentEventId : void 0 : void 0
+      });
     }
   };
 }).call(undefined);

package/lib/services/oAuthApi.js

@@ -6,32 +6,55 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var AuthApi, OAUTH_API_URL, request;
+  var NodeCache, OAUTH_API_URL, OAuthApi, Promise, request, translatedCache;
 
   request = require("request-promise");
 
-  OAUTH_API_URL = process.env.OAUTH_API_URL || "https://apps.producteca.com/oauth";
+  Promise = require("bluebird");
 
-  module.exports = AuthApi = function () {
-    function AuthApi(accessToken) {
-      _classCallCheck(this, AuthApi);
+  NodeCache = require("node-cache");
 
-      this.companyId = this.companyId.bind(this);
-      this._me = this._me.bind(this);
+  translatedCache = new NodeCache({
+    stdTTL: 0,
+    checkperiod: 0
+  });
+
+  OAUTH_API_URL = process.env.OAUTH_API_URL || "https://apps.producteca.com/oauth"; //TODO: Revisar que esta variable este seteada en todos lados con la interna, seguramente no
+
+  module.exports = OAuthApi = function () {
+    function OAuthApi(accessToken) {
+      _classCallCheck(this, OAuthApi);
+
+      this.scopes = this.scopes.bind(this);
+      this._scopes = this._scopes.bind(this);
       this._doRequest = this._doRequest.bind(this);
       this.accessToken = accessToken;
     }
 
-    _createClass(AuthApi, [{
-      key: "companyId",
-      value: function companyId() {
-        return this._me().get("id");
+    _createClass(OAuthApi, [{
+      key: "scopes",
+      value: function scopes() {
+        var _this = this;
+
+        var cachedValue;
+        cachedValue = translatedCache.get(this.accessToken);
+        if (cachedValue) {
+          return Promise.resolve(cachedValue);
+        }
+        return this._scopes().tap(function (_ref) {
+          var id = _ref.id,
+              companyId = _ref.companyId,
+              appId = _ref.appId;
+
+          return translatedCache.set(_this.accessToken, { id: id, companyId: companyId, appId: appId });
+        });
       }
     }, {
-      key: "_me",
-      value: function _me() {
-        return this._doRequest("get", "/users/me", {
-          access_token: this.accessToken
+      key: "_scopes",
+      value: function _scopes() {
+        return this._doRequest("get", "/scopes", {
+          access_token: this.accessToken,
+          fromNotificationProcessor: true
         });
       }
     }, {
@@ -49,6 +72,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       }
     }]);
 
-    return AuthApi;
+    return OAuthApi;
   }();
 }).call(undefined);