bpmn-elements 6.0.1 → 7.0.0

package/src/eventDefinitions/SignalEventDefinition.js

@@ -2,136 +2,192 @@ import getPropertyValue from '../getPropertyValue';
 import {brokerSafeId} from '../shared';
 import {cloneContent, shiftParent} from '../messageHelper';
 
+const completedSymbol = Symbol.for('completed');
+const messageQSymbol = Symbol.for('messageQ');
+const executeMessageSymbol = Symbol.for('executeMessage');
+const referenceElementSymbol = Symbol.for('referenceElement');
+const referenceInfoSymbol = Symbol.for('referenceInfo');
+
 export default function SignalEventDefinition(activity, eventDefinition) {
-  const {id, broker, environment, isStart, isThrowing, getActivityById} = activity;
+  const {id, broker, environment, isStart, isThrowing} = activity;
   const {type, behaviour = {}} = eventDefinition;
-  const {debug} = environment.Logger(type.toLowerCase());
-  const reference = behaviour.signalRef || {name: 'anonymous'};
-  const referenceElement = reference.id && getActivityById(reference.id);
-  const signalId = referenceElement ? referenceElement.id : 'anonymous';
-  const signalQueueName = `signal-${brokerSafeId(id)}-${brokerSafeId(signalId)}-q`;
 
-  if (!isThrowing && isStart) setupCatch();
+  this.id = id;
+  this.type = type;
 
-  const source = {
-    id,
-    type,
-    reference: {...reference, referenceType: 'signal'},
-    execute: isThrowing ? executeThrow : executeCatch,
+  const reference = this.reference = {
+    name: 'anonymous',
+    ...behaviour.signalRef,
+    referenceType: 'signal',
   };
 
-  return source;
+  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 && isStart) {
+    this[completedSymbol] = false;
+    const referenceId = referenceElement ? referenceElement.id : 'anonymous';
+    const messageQueueName = `${reference.referenceType}-${brokerSafeId(id)}-${brokerSafeId(referenceId)}-q`;
+    this[messageQSymbol] = broker.assertQueue(messageQueueName, {autoDelete: false, durable: true});
+    broker.bindQueue(messageQueueName, 'api', `*.${reference.referenceType}.#`, {durable: true});
+  }
+}
 
-  function executeCatch(executeMessage) {
-    let completed;
+const proto = SignalEventDefinition.prototype;
 
-    const messageContent = cloneContent(executeMessage.content);
-    const {executionId, parent} = messageContent;
-    const parentExecutionId = parent && parent.executionId;
+Object.defineProperty(proto, 'executionId', {
+  get() {
+    const message = this[executeMessageSymbol];
+    return message && message.content.executionId;
+  },
+});
 
-    const {message: referenceMessage, description} = resolveMessage(executeMessage);
-    if (isStart) broker.consume(signalQueueName, onCatchSignal, {noAck: true, consumerTag: `_api-signal-${executionId}`});
+proto.execute = function execute(executeMessage) {
+  return this.isThrowing ? this.executeThrow(executeMessage) : this.executeCatch(executeMessage);
+};
 
-    if (completed) return;
+proto.executeCatch = function executeCatch(executeMessage) {
+  this[executeMessageSymbol] = executeMessage;
+  this[completedSymbol] = false;
 
-    broker.subscribeTmp('api', `activity.#.${parentExecutionId}`, onApiMessage, {noAck: true, consumerTag: `_api-parent-${parentExecutionId}`});
-    broker.subscribeTmp('api', `activity.#.${executionId}`, onApiMessage, {noAck: true, consumerTag: `_api-${executionId}`});
-    broker.subscribeTmp('api', '#.signal.*', onCatchSignal, {noAck: true, consumerTag: `_api-delegated-${executionId}`});
+  const executeContent = executeMessage.content;
+  const {executionId, parent} = executeContent;
+  const parentExecutionId = parent && parent.executionId;
 
-    debug(`<${executionId} (${id})> expect ${description}`);
+  const info = this[referenceInfoSymbol] = this._getReferenceInfo(executeMessage);
+  const broker = this.broker;
 
-    broker.publish('event', 'activity.wait', {
-      ...messageContent,
-      executionId: parentExecutionId,
-      parent: shiftParent(parent),
-      signal: {...referenceMessage},
+  const onCatchMessage = this._onCatchMessage.bind(this);
+  if (this.activity.isStart) {
+    this[messageQSymbol].consume(onCatchMessage, {
+      noAck: true,
+      consumerTag: `_api-signal-${executionId}`,
     });
+    if (this[completedSymbol]) return;
+  }
 
-    function onCatchSignal(routingKey, message) {
-      if (getPropertyValue(message, 'content.message.id') !== referenceMessage.id) return;
-      completed = true;
-      stop();
+  const onApiMessage = this._onApiMessage.bind(this);
+  broker.subscribeTmp('api', `activity.#.${parentExecutionId}`, onApiMessage, {
+    noAck: true,
+    consumerTag: `_api-parent-${executionId}`,
+  });
+  broker.subscribeTmp('api', `activity.#.${executionId}`, onApiMessage, {
+    noAck: true,
+    consumerTag: `_api-${executionId}`,
+  });
+  broker.subscribeTmp('api', '#.signal.*', onCatchMessage, {
+    noAck: true,
+    consumerTag: `_api-delegated-${executionId}`,
+  });
+
+  this._debug(`expect ${info.description}`);
+
+  const waitContent = cloneContent(executeContent, {
+    executionId: parent.executionId,
+    signal: {...info.message},
+  });
+  waitContent.parent = shiftParent(parent);
+
+  broker.publish('event', 'activity.wait', waitContent);
+};
+
+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})> throw ${info.description}`);
+
+  const throwContent = cloneContent(executeContent, {
+    executionId: parent.executionId,
+    message: {...executeContent.input, ...info.message},
+    state: 'throw',
+  });
+  throwContent.parent = shiftParent(parent);
+
+  const broker = this.broker;
+  broker.publish('event', 'activity.signal', throwContent, {type: 'signal'});
+
+  return broker.publish('execution', 'execute.completed', cloneContent(executeContent));
+};
+
+proto._onCatchMessage = function onCatchMessage(routingKey, message) {
+  const info = this[referenceInfoSymbol];
+  if (getPropertyValue(message, 'content.message.id') !== info.message.id) return;
+  this[completedSymbol] = true;
+  this._stop();
+
+  const {type, correlationId} = message.properties;
+  this.broker.publish('event', 'activity.consumed', cloneContent(this[executeMessageSymbol].content, {
+    message: { ...message.content.message},
+  }), {
+    correlationId,
+    type,
+  });
 
-      const {type: messageType, correlationId} = message.properties;
-      broker.publish('event', 'activity.consumed', cloneContent(messageContent, {message: {...message.content.message}}), {correlationId, type: messageType});
+  return this._complete(message.content.message, message.properties);
+};
 
-      return complete(message.content.message, message.properties);
-    }
+proto._onApiMessage = function onApiMessage(routingKey, message) {
+  const {type, correlationId} = message.properties;
 
-    function onApiMessage(routingKey, message) {
-      const {type: messageType, correlationId} = message.properties;
-
-      switch (messageType) {
-        case 'signal': {
-          return complete(message.content.message, {correlationId});
-        }
-        case 'discard': {
-          completed = true;
-          stop();
-          return broker.publish('execution', 'execute.discard', {...messageContent}, {correlationId});
-        }
-        case 'stop': {
-          stop();
-          break;
-        }
-      }
+  switch (type) {
+    case 'signal': {
+      return this._complete(message.content.message, {correlationId});
     }
-
-    function complete(output, options) {
-      completed = true;
-      stop();
-      debug(`<${executionId} (${id})> signaled with`, description);
-      return broker.publish('execution', 'execute.completed', {...messageContent, output, state: 'signal'}, options);
+    case 'discard': {
+      this[completedSymbol] = true;
+      this._stop();
+      return this.broker.publish('execution', 'execute.discard', cloneContent(this[executeMessageSymbol].content), {correlationId});
     }
-
-    function stop() {
-      broker.cancel(`_api-signal-${executionId}`);
-      broker.cancel(`_api-parent-${parentExecutionId}`);
-      broker.cancel(`_api-${executionId}`);
-      broker.cancel(`_api-delegated-${executionId}`);
-      if (isStart) broker.purgeQueue(signalQueueName);
+    case 'stop': {
+      this._stop();
+      break;
     }
   }
-
-  function executeThrow(executeMessage) {
-    const messageContent = cloneContent(executeMessage.content);
-    const {executionId, parent} = messageContent;
-    const parentExecutionId = parent && parent.executionId;
-
-    const {message: referenceMessage, description} = resolveMessage(executeMessage);
-
-    debug(`<${executionId} (${id})> throw ${description}`);
-
-    broker.publish('event', 'activity.signal', {
-      ...cloneContent(messageContent),
-      executionId: parentExecutionId,
-      parent: shiftParent(parent),
-      message: {...messageContent.input, ...referenceMessage},
-      state: 'throw',
-    }, {type: 'signal'});
-
-    return broker.publish('execution', 'execute.completed', messageContent);
+};
+
+proto._complete = function complete(output, options) {
+  this[completedSymbol] = true;
+  this._stop();
+  this._debug(`signaled with ${this[referenceInfoSymbol].description}`);
+  return this.broker.publish('execution', 'execute.completed', cloneContent(this[executeMessageSymbol].content, {
+    output,
+    state: 'signal',
+  }), options);
+};
+
+proto._stop = function stop() {
+  const broker = this.broker, executionId = this.executionId;
+  broker.cancel(`_api-signal-${executionId}`);
+  broker.cancel(`_api-parent-${executionId}`);
+  broker.cancel(`_api-${executionId}`);
+  broker.cancel(`_api-delegated-${executionId}`);
+  if (this.activity.isStart) this[messageQSymbol].purge();
+};
+
+proto._getReferenceInfo = function getReferenceInfo(message) {
+  const referenceElement = this[referenceElementSymbol];
+  if (!referenceElement) {
+    return {
+      message: {...this.reference},
+      description: 'anonymous signal',
+    };
   }
 
-  function resolveMessage(message) {
-    if (!referenceElement) {
-      return {
-        message: {...reference},
-        description: 'anonymous signal',
-      };
-    }
-
-    const result = {
-      message: referenceElement.resolve(message),
-    };
+  const result = {
+    message: referenceElement.resolve(message),
+  };
 
-    result.description = `${result.message.name} <${result.message.id}>`;
+  result.description = `${result.message.name} <${result.message.id}>`;
 
-    return result;
-  }
+  return result;
+};
 
-  function setupCatch() {
-    broker.assertQueue(signalQueueName, {autoDelete: false, durable: true});
-    broker.bindQueue(signalQueueName, 'api', '*.signal.#', {durable: true});
-  }
-}
+proto._debug = function debug(msg) {
+  this.logger.debug(`<${this.executionId} (${this.activity.id})> ${msg}`);
+};

package/src/eventDefinitions/TerminateEventDefinition.js

@@ -1,26 +1,26 @@
 import {cloneContent, shiftParent} from '../messageHelper';
 
-export default function TerminateEventDefinition(activity, eventDefinition = {}) {
+export default function TerminateEventDefinition(activity, eventDefinition) {
   const {id, broker, environment} = activity;
-  const {type = 'terminateeventdefinition'} = eventDefinition;
-  const {debug} = environment.Logger(type.toLowerCase());
+  const {type = 'TerminateEventDefinition'} = eventDefinition;
 
-  const source = {
-    id,
-    type,
-    execute,
-  };
+  this.id = id;
+  this.type = type;
+  this.activity = activity;
+  this.broker = broker;
+  this.logger = environment.Logger(type.toLowerCase());
+}
 
-  return source;
+TerminateEventDefinition.prototype.execute = function execute(executeMessage) {
+  const executeContent = executeMessage.content;
 
-  function execute(executeMessage) {
-    const content = cloneContent(executeMessage.content);
-    const terminateContent = cloneContent(content);
-    terminateContent.parent = shiftParent(terminateContent.parent);
-    terminateContent.state = 'terminate';
+  const throwContent = cloneContent(executeContent, {
+    state: 'terminate',
+  });
+  throwContent.parent = shiftParent(executeContent.parent);
 
-    debug(`<${content.executionId} (${content.id})> terminate`);
-    broker.publish('event', 'process.terminate', terminateContent, {type: 'terminate'});
-    broker.publish('execution', 'execute.completed', content);
-  }
-}
+  this.logger.debug(`<${executeContent.executionId} (${executeContent.id})> terminate`);
+  const broker = this.broker;
+  broker.publish('event', 'process.terminate', throwContent, {type: 'terminate'});
+  broker.publish('execution', 'execute.completed', cloneContent(executeContent));
+};