bpmn-elements 6.0.1 → 7.0.0

package/dist/src/eventDefinitions/SignalEventDefinition.js

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

@@ -7,34 +7,32 @@ exports.default = TerminateEventDefinition;
 
 var _messageHelper = require("../messageHelper");
 
-function TerminateEventDefinition(activity, eventDefinition = {}) {
+function TerminateEventDefinition(activity, eventDefinition) {
   const {
     id,
     broker,
     environment
   } = activity;
   const {
-    type = 'terminateeventdefinition'
+    type = 'TerminateEventDefinition'
   } = eventDefinition;
-  const {
-    debug
-  } = environment.Logger(type.toLowerCase());
-  const source = {
-    id,
-    type,
-    execute
-  };
-  return source;
+  this.id = id;
+  this.type = type;
+  this.activity = activity;
+  this.broker = broker;
+  this.logger = environment.Logger(type.toLowerCase());
+}
 
-  function execute(executeMessage) {
-    const content = (0, _messageHelper.cloneContent)(executeMessage.content);
-    const terminateContent = (0, _messageHelper.cloneContent)(content);
-    terminateContent.parent = (0, _messageHelper.shiftParent)(terminateContent.parent);
-    terminateContent.state = 'terminate';
-    debug(`<${content.executionId} (${content.id})> terminate`);
-    broker.publish('event', 'process.terminate', terminateContent, {
-      type: 'terminate'
-    });
-    broker.publish('execution', 'execute.completed', content);
-  }
-}
+TerminateEventDefinition.prototype.execute = function execute(executeMessage) {
+  const executeContent = executeMessage.content;
+  const throwContent = (0, _messageHelper.cloneContent)(executeContent, {
+    state: 'terminate'
+  });
+  throwContent.parent = (0, _messageHelper.shiftParent)(executeContent.parent);
+  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', (0, _messageHelper.cloneContent)(executeContent));
+};