bpmn-elements 6.0.1 → 7.0.0

package/dist/src/eventDefinitions/EscalationEventDefinition.js

@@ -13,169 +13,203 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const completedSymbol = Symbol.for('completed');
+const messageQSymbol = Symbol.for('messageQ');
+const executeMessageSymbol = Symbol.for('executeMessage');
+const referenceElementSymbol = Symbol.for('referenceElement');
+const referenceInfoSymbol = Symbol.for('reference');
+
 function EscalationEventDefinition(activity, eventDefinition) {
   const {
     id,
     broker,
     environment,
-    isThrowing,
-    getActivityById
+    isThrowing
   } = activity;
   const {
     type,
     behaviour = {}
   } = eventDefinition;
-  const {
-    debug
-  } = environment.Logger(type.toLowerCase());
-  const reference = behaviour.escalationRef || {
-    name: 'anonymous'
-  };
-  const referenceElement = reference.id && getActivityById(reference.id);
-  const escalationId = referenceElement ? referenceElement.id : 'anonymous';
-  const escalationQueueName = `escalate-${(0, _shared.brokerSafeId)(id)}-${(0, _shared.brokerSafeId)(escalationId)}-q`;
-  if (!isThrowing) setupCatch();
-  const source = {
-    id,
-    type,
-    reference: { ...reference,
-      referenceType: 'escalate'
-    },
-    execute: isThrowing ? executeThrow : executeCatch
+  this.id = id;
+  this.type = type;
+  const reference = this.reference = {
+    name: 'anonymous',
+    ...behaviour.escalationRef,
+    referenceType: 'escalate'
   };
-  return source;
-
-  function executeCatch(executeMessage) {
-    let completed;
-    const messageContent = (0, _messageHelper.cloneContent)(executeMessage.content);
-    const {
-      executionId,
-      parent
-    } = messageContent;
-    const parentExecutionId = parent && parent.executionId;
-    const {
-      message: referenceMessage,
-      description
-    } = resolveMessage(executeMessage);
-    broker.consume(escalationQueueName, onEscalationApiMessage, {
-      noAck: true,
-      consumerTag: `_onescalate-${executionId}`
-    });
-    if (completed) return;
-    broker.subscribeTmp('api', `activity.#.${executionId}`, onApiMessage, {
-      noAck: true,
-      consumerTag: `_api-${executionId}`
+  this.isThrowing = isThrowing;
+  this.activity = activity;
+  this.broker = broker;
+  this.logger = environment.Logger(type.toLowerCase());
+  const referenceElement = this[referenceElementSymbol] = reference.id && activity.getActivityById(reference.id);
+
+  if (!isThrowing) {
+    this[completedSymbol] = false;
+    const referenceId = referenceElement ? referenceElement.id : 'anonymous';
+    const messageQueueName = `${reference.referenceType}-${(0, _shared.brokerSafeId)(id)}-${(0, _shared.brokerSafeId)(referenceId)}-q`;
+    this[messageQSymbol] = broker.assertQueue(messageQueueName, {
+      autoDelete: false,
+      durable: true
     });
-    if (completed) return stop();
-    debug(`<${executionId} (${id})> expect ${description}`);
-    broker.publish('event', 'activity.wait', { ...messageContent,
-      executionId: parentExecutionId,
-      parent: (0, _messageHelper.shiftParent)(parent),
-      escalation: { ...referenceMessage
-      }
+    broker.bindQueue(messageQueueName, 'api', `*.${reference.referenceType}.#`, {
+      durable: true,
+      priority: 400
     });
+  }
+}
+
+const proto = EscalationEventDefinition.prototype;
+Object.defineProperty(proto, 'executionId', {
+  get() {
+    const message = this[executeMessageSymbol];
+    return message && message.content.executionId;
+  }
+
+});
+
+proto.execute = function execute(executeMessage) {
+  return this.isThrowing ? this.executeThrow(executeMessage) : this.executeCatch(executeMessage);
+};
 
-    function onEscalationApiMessage(routingKey, message) {
-      if ((0, _getPropertyValue.default)(message, 'content.message.id') !== referenceMessage.id) return;
-      const output = message.content.message;
-      completed = true;
-      stop();
-      debug(`<${executionId} (${id})> caught ${description}`);
-      broker.publish('event', 'activity.catch', { ...messageContent,
-        message: { ...output
-        },
-        executionId: parentExecutionId,
-        parent: (0, _messageHelper.shiftParent)(executeMessage.content.parent)
-      }, {
-        type: 'catch'
-      });
-      return broker.publish('execution', 'execute.completed', { ...messageContent,
-        output,
-        state: 'catch'
-      });
+proto.executeCatch = function executeCatch(executeMessage) {
+  this[executeMessageSymbol] = executeMessage;
+  this[completedSymbol] = false;
+  const executeContent = executeMessage.content;
+  const {
+    executionId,
+    parent
+  } = executeContent;
+
+  const info = this[referenceInfoSymbol] = this._getReferenceInfo(executeMessage);
+
+  const broker = this.broker;
+  this[messageQSymbol].consume(this._onCatchMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_onescalate-${executionId}`
+  });
+  if (this[completedSymbol]) return;
+  broker.subscribeTmp('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-${executionId}`
+  });
+
+  this._debug(`expect ${info.description}`);
+
+  const waitContent = (0, _messageHelper.cloneContent)(executeContent, {
+    executionId: parent.executionId,
+    parent: (0, _messageHelper.shiftParent)(parent),
+    escalation: { ...info.message
     }
+  });
+  waitContent.parent = (0, _messageHelper.shiftParent)(parent);
+  broker.publish('event', 'activity.wait', waitContent);
+};
 
-    function onApiMessage(routingKey, message) {
-      const messageType = message.properties.type;
-
-      switch (messageType) {
-        case 'escalate':
-          {
-            return onEscalationApiMessage(routingKey, message);
-          }
-
-        case 'discard':
-          {
-            completed = true;
-            stop();
-            return broker.publish('execution', 'execute.discard', { ...messageContent
-            });
-          }
-
-        case 'stop':
-          {
-            stop();
-            break;
-          }
+proto.executeThrow = function executeThrow(executeMessage) {
+  const executeContent = executeMessage.content;
+  const {
+    executionId,
+    parent
+  } = executeContent;
+
+  const info = this._getReferenceInfo(executeMessage);
+
+  this.logger.debug(`<${executionId} (${this.activity.id})> escalate ${info.description}`);
+  const broker = this.broker;
+  const throwContent = (0, _messageHelper.cloneContent)(executeContent, {
+    executionId: parent.executionId,
+    message: info.message,
+    state: 'throw'
+  });
+  throwContent.parent = (0, _messageHelper.shiftParent)(parent);
+  broker.publish('event', 'activity.escalate', throwContent, {
+    type: 'escalate',
+    delegate: true
+  });
+  return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeContent));
+};
+
+proto._onCatchMessage = function onCatchMessage(routingKey, message) {
+  const info = this[referenceInfoSymbol];
+  if ((0, _getPropertyValue.default)(message, 'content.message.id') !== info.message.id) return;
+  const output = message.content.message;
+  this[completedSymbol] = true;
+
+  this._stop();
+
+  this._debug(`caught ${info.description}`);
+
+  const executeContent = this[executeMessageSymbol].content;
+  const {
+    parent,
+    ...content
+  } = executeContent;
+  const catchContent = (0, _messageHelper.cloneContent)(content, {
+    message: { ...output
+    },
+    executionId: parent.executionId
+  });
+  catchContent.parent = (0, _messageHelper.shiftParent)(parent);
+  const broker = this.broker;
+  broker.publish('event', 'activity.catch', catchContent, {
+    type: 'catch'
+  });
+  return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeContent, {
+    output,
+    state: 'catch'
+  }));
+};
+
+proto._onApiMessage = function onApiMessage(routingKey, message) {
+  switch (message.properties.type) {
+    case 'escalate':
+      {
+        return this._onCatchMessage(routingKey, message);
       }
-    }
 
-    function stop() {
-      broker.cancel(`_api-${executionId}`);
-      broker.cancel(`_onescalate-${executionId}`);
-    }
-  }
+    case 'discard':
+      {
+        this[completedSymbol] = true;
 
-  function executeThrow(executeMessage) {
-    const messageContent = (0, _messageHelper.cloneContent)(executeMessage.content);
-    const {
-      executionId,
-      parent
-    } = messageContent;
-    const parentExecutionId = parent && parent.executionId;
-    const {
-      message: referenceMessage,
-      description
-    } = resolveMessage(executeMessage);
-    debug(`<${executionId} (${id})> escalate ${description}`);
-    broker.publish('event', 'activity.escalate', { ...(0, _messageHelper.cloneContent)(messageContent),
-      executionId: parentExecutionId,
-      parent: (0, _messageHelper.shiftParent)(parent),
-      message: { ...referenceMessage
-      },
-      state: 'throw'
-    }, {
-      type: 'escalate',
-      delegate: true
-    });
-    return broker.publish('execution', 'execute.completed', { ...messageContent
-    });
+        this._stop();
+
+        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content));
+      }
+
+    case 'stop':
+      {
+        this._stop();
+
+        break;
+      }
   }
+};
 
-  function resolveMessage(message) {
-    if (!referenceElement) {
-      return {
-        message: { ...reference
-        },
-        description: 'anonymous escalation'
-      };
-    }
+proto._stop = function stop() {
+  const broker = this.broker,
+        executionId = this.executionId;
+  broker.cancel(`_api-${executionId}`);
+  broker.cancel(`_onescalate-${executionId}`);
+};
 
-    const result = {
-      message: referenceElement.resolve(message)
+proto._getReferenceInfo = function getReferenceInfo(message) {
+  const referenceElement = this[referenceElementSymbol];
+
+  if (!referenceElement) {
+    return {
+      message: { ...this.reference
+      },
+      description: 'anonymous escalation'
     };
-    result.description = `${result.message.name} <${result.message.id}>`;
-    return result;
   }
 
-  function setupCatch() {
-    broker.assertQueue(escalationQueueName, {
-      autoDelete: false,
-      durable: true
-    });
-    broker.bindQueue(escalationQueueName, 'api', '*.escalate.#', {
-      durable: true,
-      priority: 400
-    });
-  }
-}
+  const result = {
+    message: referenceElement.resolve(message)
+  };
+  result.description = `${result.message.name} <${result.message.id}>`;
+  return result;
+};
+
+proto._debug = function debug(msg) {
+  this.logger.debug(`<${this.executionId} (${this.activity.id})> ${msg}`);
+};

package/dist/src/eventDefinitions/EventDefinitionExecution.js

@@ -7,137 +7,165 @@ exports.default = EventDefinitionExecution;
 
 var _messageHelper = require("../messageHelper");
 
+const completedSymbol = Symbol.for('completed');
+const executeMessageSymbol = Symbol.for('executeMessage');
+const stoppedSymbol = Symbol.for('stopped');
+
 function EventDefinitionExecution(activity, eventDefinitions, completedRoutingKey = 'execute.completed') {
-  const {
-    id,
-    broker,
-    logger
-  } = activity;
-  const executeConsumerTag = '_eventdefinition-execution-execute-tag';
-  const apiConsumerTag = '_eventdefinition-execution-api-tag';
-  let parentExecutionContent,
-      parent,
-      completed = false,
-      stopped = false;
-  return {
-    execute,
-
-    get completed() {
-      return completed;
-    }
-
-  };
-
-  function execute(executeMessage) {
-    const executeContent = executeMessage.content;
-    const isRedelivered = executeMessage.fields.redelivered;
-    const {
-      isRootScope,
-      isDefinitionScope,
-      executionId: messageExecutionId
-    } = executeContent;
-    if (isDefinitionScope) return executeDefinition();
-    let parentExecutionId;
-
-    if (isRootScope) {
-      parentExecutionId = messageExecutionId;
-      parentExecutionContent = executeContent;
-      broker.subscribeTmp('execution', 'execute.#', onExecuteMessage, {
-        noAck: true,
-        consumerTag: executeConsumerTag,
-        priority: 300
-      });
-      broker.subscribeTmp('api', `activity.*.${parentExecutionId}`, onApiMessage, {
-        noAck: true,
-        consumerTag: apiConsumerTag,
-        priority: 300
-      });
-      parent = (0, _messageHelper.unshiftParent)(parentExecutionContent.parent, parentExecutionContent);
-      broker.publish('execution', 'execute.update', { ...(0, _messageHelper.cloneContent)(parentExecutionContent),
-        preventComplete: true
-      });
-    }
-
-    if (isRedelivered) return;
-
-    for (let index = 0; index < eventDefinitions.length; ++index) {
-      if (completed) break;
-      if (stopped) break;
-      const ed = eventDefinitions[index];
-      const executionId = `${messageExecutionId}_${index}`;
-      logger.debug(`<${messageExecutionId} (${id})> start event definition ${ed.type}, index ${index}`);
-      broker.publish('execution', 'execute.start', { ...(0, _messageHelper.cloneContent)(parentExecutionContent),
-        isRootScope: undefined,
-        type: ed.type,
-        executionId,
-        isDefinitionScope: true,
-        index,
-        parent
-      });
-    }
-
-    function onApiMessage(_, message) {
-      const messageType = message.properties.type;
-
-      switch (messageType) {
-        case 'stop':
-          stopped = true;
-
-        case 'discard':
-          return stop();
-      }
-    }
-
-    function onExecuteMessage(routingKey, message) {
-      const {
-        correlationId
-      } = message.properties;
-
-      switch (routingKey) {
-        case 'execute.completed':
-          {
-            stop();
-            if (message.content.isDefinitionScope) return complete();
-            break;
-          }
-
-        case 'execute.discard':
-          {
-            if (message.content.isDefinitionScope) {
-              logger.debug(`<${message.content.executionId} (${id})> event definition ${message.content.type} discarded, index ${message.content.index}`);
-              break;
-            }
-
-            stop();
-            logger.debug(`<${message.content.executionId} (${id})> event definition parent execution discarded`);
-            break;
-          }
+  this.id = activity.id;
+  this.activity = activity;
+  this.broker = activity.broker;
+  this.eventDefinitions = eventDefinitions;
+  this.completedRoutingKey = completedRoutingKey;
+  this[completedSymbol] = false;
+  this[stoppedSymbol] = false;
+  this[executeMessageSymbol] = null;
+}
+
+const proto = EventDefinitionExecution.prototype;
+Object.defineProperty(proto, 'completed', {
+  enumerable: true,
+
+  get() {
+    return this[completedSymbol];
+  }
+
+});
+Object.defineProperty(proto, 'stopped', {
+  enumerable: true,
+
+  get() {
+    return this[stoppedSymbol];
+  }
+
+});
+
+proto.execute = function execute(executeMessage) {
+  const content = executeMessage.content;
+  if (content.isDefinitionScope) return this._executeDefinition(executeMessage);
+  if (!content.isRootScope) return;
+  const broker = this.broker;
+  this[executeMessageSymbol] = executeMessage;
+  const executionId = content.executionId;
+  broker.subscribeTmp('execution', 'execute.#', this._onExecuteMessage.bind(this), {
+    noAck: true,
+    consumerTag: '_eventdefinition-execution-execute-tag',
+    priority: 300
+  });
+  broker.subscribeTmp('api', `activity.*.${executionId}`, this._onApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: '_eventdefinition-execution-api-tag',
+    priority: 300
+  });
+  broker.publish('execution', 'execute.update', (0, _messageHelper.cloneContent)(content, {
+    preventComplete: true
+  }));
+  if (executeMessage.fields.redelivered) return;
+  const parent = (0, _messageHelper.unshiftParent)(content.parent, content);
+  const eventDefinitions = this.eventDefinitions;
+
+  for (let index = 0; index < eventDefinitions.length; ++index) {
+    if (this[completedSymbol]) break;
+    if (this[stoppedSymbol]) break;
+    const ed = eventDefinitions[index];
+    const edExecutionId = `${executionId}_${index}`;
+
+    this._debug(executionId, `start event definition ${ed.type}, index ${index}`);
+
+    const edContent = (0, _messageHelper.cloneContent)(content, {
+      isRootScope: undefined,
+      type: ed.type,
+      executionId: edExecutionId,
+      isDefinitionScope: true,
+      index
+    });
+    edContent.parent = (0, _messageHelper.cloneParent)(parent);
+    broker.publish('execution', 'execute.start', edContent);
+  }
+};
+
+proto._onApiMessage = function onApiMessage(_, message) {
+  const messageType = message.properties.type;
+
+  switch (messageType) {
+    case 'stop':
+    case 'discard':
+      return this._stop();
+  }
+};
+
+proto._onExecuteMessage = function onExecuteMessage(routingKey, message) {
+  switch (routingKey) {
+    case 'execute.completed':
+      {
+        this._stop();
+
+        if (message.content.isDefinitionScope) return this._complete(message);
+        break;
       }
 
-      function complete() {
-        const content = (0, _messageHelper.cloneContent)(message.content);
-        completed = true;
-        logger.debug(`<${content.executionId} (${id})> event definition ${content.type} completed, index ${content.index}`);
-        broker.publish('execution', completedRoutingKey, { ...(0, _messageHelper.cloneContent)(content),
-          executionId: parentExecutionId,
-          isRootScope: true,
-          parent: (0, _messageHelper.shiftParent)(content.parent)
-        }, {
-          correlationId
-        });
+    case 'execute.discard':
+      {
+        const {
+          executionId,
+          isDefinitionScope
+        } = message.content;
+
+        if (isDefinitionScope) {
+          this._debug(executionId, `event definition ${message.content.type} discarded, index ${message.content.index}`);
+
+          break;
+        }
+
+        this._stop();
+
+        this._debug(executionId, 'event definition parent execution discarded');
+
+        break;
       }
-    }
-
-    function executeDefinition() {
-      const ed = eventDefinitions[executeContent.index];
-      if (!ed) return logger.warn(`<${messageExecutionId} (${id})> found no event definition on index ${executeContent.index}`);
-      logger.debug(`<${messageExecutionId} (${id})> execute event definition ${ed.type}, index ${executeContent.index}`);
-      ed.execute(executeMessage);
-    }
-
-    function stop() {
-      broker.cancel(executeConsumerTag);
-      broker.cancel(apiConsumerTag);
-    }
   }
-}
+};
+
+proto._complete = function complete(message) {
+  const {
+    executionId,
+    type,
+    index,
+    parent
+  } = message.content;
+  this[completedSymbol] = true;
+
+  this._debug(executionId, `event definition ${type} completed, index ${index}`);
+
+  const completeContent = (0, _messageHelper.cloneContent)(message.content, {
+    executionId: this[executeMessageSymbol].content.executionId,
+    isRootScope: true
+  });
+  completeContent.parent = (0, _messageHelper.shiftParent)(parent);
+  this.broker.publish('execution', this.completedRoutingKey, completeContent, {
+    correlationId: message.properties.correlationId
+  });
+};
+
+proto._executeDefinition = function executeDefinition(message) {
+  const {
+    executionId,
+    index
+  } = message.content;
+  const ed = this.eventDefinitions[index];
+  if (!ed) return this.activity.logger.warn(`<${executionId} (${this.id})> found no event definition on index ${index}`);
+
+  this._debug(executionId, `execute event definition ${ed.type}, index ${index}`);
+
+  ed.execute(message);
+};
+
+proto._stop = function stop() {
+  this[stoppedSymbol] = true;
+  this.broker.cancel('_eventdefinition-execution-execute-tag');
+  this.broker.cancel('_eventdefinition-execution-api-tag');
+};
+
+proto._debug = function debug(executionId, msg) {
+  this.activity.logger.debug(`<${executionId} (${this.id})> ${msg}`);
+};