bpmn-elements 6.0.0 → 8.0.0

package/dist/src/activity/Activity.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = Activity;
+exports.default = void 0;
 
 var _ActivityExecution = _interopRequireDefault(require("./ActivityExecution"));
 
@@ -23,35 +23,49 @@ var _Errors = require("../error/Errors");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kActivityDef = Symbol.for('activityDefinition');
+const kBpmnIo = Symbol.for('bpmnIo');
+const kConsuming = Symbol.for('consuming');
+const kCounters = Symbol.for('counters');
+const kEventDefinitions = Symbol.for('eventDefinitions');
+const kExec = Symbol.for('exec');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kExtensions = Symbol.for('extensions');
+const kFlags = Symbol.for('flags');
+const kFlows = Symbol.for('flows');
+const kFormatter = Symbol.for('formatter');
+const kMessageHandlers = Symbol.for('messageHandlers');
+const kStateMessage = Symbol.for('stateMessage');
+var _default = Activity;
+exports.default = _default;
+
 function Activity(Behaviour, activityDef, context) {
   const {
     id,
     type = 'activity',
     name,
-    parent: originalParent = {},
-    behaviour = {},
-    isParallelGateway,
-    isSubProcess,
-    triggeredByEvent,
-    isThrowing,
-    isTransaction
+    behaviour = {}
   } = activityDef;
-  const isForCompensation = behaviour.isForCompensation;
-  const parent = (0, _messageHelper.cloneParent)(originalParent);
-  const {
-    environment,
-    getInboundSequenceFlows,
-    getOutboundSequenceFlows,
-    getInboundAssociations
-  } = context;
-  const logger = environment.Logger(type.toLowerCase());
-  const {
-    step
-  } = environment.settings;
   const {
     attachedTo: attachedToRef,
     eventDefinitions
   } = behaviour;
+  this[kActivityDef] = activityDef;
+  this.id = id;
+  this.type = type;
+  this.name = name;
+  this.behaviour = { ...behaviour,
+    eventDefinitions
+  };
+  this.Behaviour = Behaviour;
+  this.parent = activityDef.parent ? (0, _messageHelper.cloneParent)(activityDef.parent) : {};
+  this.logger = context.environment.Logger(type.toLowerCase());
+  this.environment = context.environment;
+  this.context = context;
+  this[kCounters] = {
+    taken: 0,
+    discarded: 0
+  };
   let attachedToActivity, attachedTo;
 
   if (attachedToRef) {
@@ -59,118 +73,67 @@ function Activity(Behaviour, activityDef, context) {
     attachedToActivity = context.getActivityById(attachedToRef.id);
   }
 
-  const inboundSequenceFlows = getInboundSequenceFlows(id) || [];
-  const outboundSequenceFlows = getOutboundSequenceFlows(id) || [];
-  const inboundAssociations = getInboundAssociations(id) || [];
-  const isStart = inboundSequenceFlows.length === 0 && !attachedTo && !triggeredByEvent && !isForCompensation;
-  const isEnd = outboundSequenceFlows.length === 0;
-  const isParallelJoin = inboundSequenceFlows.length > 1 && isParallelGateway;
-  const isMultiInstance = !!behaviour.loopCharacteristics;
-  let execution,
-      initExecutionId,
-      executionId,
-      stateMessage,
-      status,
-      stopped = false,
-      executeMessage,
-      consumingRunQ;
-  const inboundTriggers = attachedToActivity ? [attachedToActivity] : inboundSequenceFlows.slice();
-  const inboundJoinFlows = [];
-  let counters = {
-    taken: 0,
-    discarded: 0
-  };
-  const activityApi = {
-    id,
-    type,
-    name,
-    isEnd,
-    isStart,
-    isSubProcess,
-    isThrowing,
-    isForCompensation,
-    triggeredByEvent,
-    parent: (0, _messageHelper.cloneParent)(parent),
-    behaviour: { ...behaviour,
-      eventDefinitions
-    },
-    attachedTo: attachedToActivity,
-    environment,
-    inbound: inboundSequenceFlows,
-    outbound: outboundSequenceFlows,
-
-    get counters() {
-      return { ...counters
-      };
-    },
-
-    get executionId() {
-      return executionId;
-    },
-
-    get status() {
-      return status;
-    },
-
-    get stopped() {
-      return stopped;
-    },
-
-    get isRunning() {
-      if (!consumingRunQ) return false;
-      return !!status;
-    },
-
-    Behaviour,
-    activate,
-    deactivate,
-    evaluateOutbound,
-    logger,
-    discard,
-    getApi,
-    getActivityById,
-    getState,
-    init,
-    recover,
-    resume,
-    run,
-    shake,
-    stop,
-    next: step && next
-  };
   const {
     broker,
     on,
     once,
     waitFor,
     emitFatal
-  } = (0, _EventBroker.ActivityBroker)(activityApi);
-  activityApi.on = on;
-  activityApi.once = once;
-  activityApi.waitFor = waitFor;
-  activityApi.emitFatal = emitFatal;
-  const runQ = broker.getQueue('run-q');
-  const executionQ = broker.getQueue('execution-q');
-  const inboundQ = broker.assertQueue('inbound-q', {
+  } = (0, _EventBroker.ActivityBroker)(this);
+  this.broker = broker;
+  this.on = on;
+  this.once = once;
+  this.waitFor = waitFor;
+  this.emitFatal = emitFatal;
+  const inboundSequenceFlows = context.getInboundSequenceFlows(id);
+  const inboundAssociations = context.getInboundAssociations(id);
+  const inboundTriggers = attachedToActivity ? [attachedToActivity] : inboundSequenceFlows.slice();
+  const outboundSequenceFlows = context.getOutboundSequenceFlows(id);
+  const flows = this[kFlows] = {
+    inboundSequenceFlows,
+    inboundAssociations,
+    inboundJoinFlows: [],
+    inboundTriggers,
+    outboundSequenceFlows,
+    outboundEvaluator: new OutboundEvaluator(this, outboundSequenceFlows)
+  };
+  const isForCompensation = !!behaviour.isForCompensation;
+  const isParallelJoin = activityDef.isParallelGateway && flows.inboundSequenceFlows.length > 1;
+  this[kFlags] = {
+    isEnd: flows.outboundSequenceFlows.length === 0,
+    isStart: flows.inboundSequenceFlows.length === 0 && !attachedTo && !behaviour.triggeredByEvent && !isForCompensation,
+    isSubProcess: activityDef.isSubProcess,
+    isMultiInstance: !!behaviour.loopCharacteristics,
+    isForCompensation,
+    attachedTo,
+    isTransaction: activityDef.isTransaction,
+    isParallelJoin,
+    isThrowing: activityDef.isThrowing
+  };
+  this[kExec] = {};
+  this[kMessageHandlers] = {
+    onInbound: isParallelJoin ? this._onJoinInbound.bind(this) : this._onInbound.bind(this),
+    onRunMessage: this._onRunMessage.bind(this),
+    onApiMessage: this._onApiMessage.bind(this),
+    onExecutionMessage: this._onExecutionMessage.bind(this)
+  };
+
+  const onInboundEvent = this._onInboundEvent.bind(this);
+
+  broker.assertQueue('inbound-q', {
     durable: true,
     autoDelete: false
   });
-  const formatRunQ = broker.getQueue('format-run-q');
-  const formatter = (0, _MessageFormatter.Formatter)({
-    id,
-    broker,
-    logger
-  }, formatRunQ);
 
   if (isForCompensation) {
-    inboundAssociations.forEach(trigger => {
+    for (const trigger of inboundAssociations) {
       trigger.broker.subscribeTmp('event', '#', onInboundEvent, {
         noAck: true,
         consumerTag: `_inbound-${id}`
       });
-    });
+    }
   } else {
-    inboundTriggers.forEach(trigger => {
+    for (const trigger of inboundTriggers) {
       if (trigger.isSequenceFlow) trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, {
         noAck: true,
         consumerTag: `_inbound-${id}`
@@ -178,969 +141,1196 @@ function Activity(Behaviour, activityDef, context) {
         noAck: true,
         consumerTag: `_inbound-${id}`
       });
-    });
+    }
   }
 
-  Object.defineProperty(activityApi, 'broker', {
-    enumerable: true,
-    get: () => broker
-  });
-  Object.defineProperty(activityApi, 'execution', {
-    enumerable: true,
-    get: () => execution
-  });
-  const bpmnIo = (0, _BpmnIO.default)(activityApi, context);
-  const loaedEventDefinitions = eventDefinitions && eventDefinitions.map(ed => ed.Behaviour(activityApi, ed, context));
-  Object.defineProperty(activityApi, 'eventDefinitions', {
-    enumerable: true,
-    get: () => loaedEventDefinitions
-  });
-  const extensions = context.loadExtensions(activityApi);
-  Object.defineProperty(activityApi, 'extensions', {
-    enumerable: true,
-    get: () => extensions
-  });
-  return activityApi;
+  this[kEventDefinitions] = eventDefinitions && eventDefinitions.map(ed => new ed.Behaviour(this, ed, this.context));
+}
 
-  function init(initContent) {
-    initExecutionId = initExecutionId || (0, _shared.getUniqueId)(id);
-    logger.debug(`<${id}> initialized with executionId <${initExecutionId}>`);
-    publishEvent('init', createMessage({ ...initContent,
-      executionId: initExecutionId
-    }));
+const proto = Activity.prototype;
+Object.defineProperty(proto, 'counters', {
+  enumerable: true,
+
+  get() {
+    return { ...this[kCounters]
+    };
   }
 
-  function run(runContent) {
-    if (activityApi.isRunning) throw new Error(`activity <${id}> is already running`);
-    executionId = initExecutionId || (0, _shared.getUniqueId)(id);
-    initExecutionId = undefined;
-    consumeApi();
-    const content = createMessage({ ...runContent,
-      executionId
-    });
-    broker.publish('run', 'run.enter', content);
-    broker.publish('run', 'run.start', (0, _messageHelper.cloneContent)(content));
-    consumeRunQ();
+});
+Object.defineProperty(proto, 'execution', {
+  enumerable: true,
+
+  get() {
+    return this[kExec].execution;
   }
 
-  function createMessage(override = {}) {
-    const result = { ...override,
-      id,
-      type,
-      ...(name ? {
-        name
-      } : undefined),
-      ...(status ? {
-        status
-      } : undefined),
-      parent: (0, _messageHelper.cloneParent)(parent)
-    };
-    const flags = {
-      isEnd,
-      isStart,
-      isSubProcess,
-      isMultiInstance,
-      isForCompensation,
-      attachedTo,
-      isTransaction
-    };
+});
+Object.defineProperty(proto, 'executionId', {
+  enumerable: true,
 
-    for (const flag in flags) {
-      if (flags[flag]) result[flag] = flags[flag];
-    }
+  get() {
+    return this[kExec].executionId;
+  }
 
-    return result;
+});
+Object.defineProperty(proto, 'bpmnIo', {
+  enumerable: true,
+
+  get() {
+    if (kBpmnIo in this) return this[kBpmnIo];
+    const bpmnIo = this[kBpmnIo] = new _BpmnIO.default(this, this.context);
+    return bpmnIo;
   }
 
-  function recover(state) {
-    if (activityApi.isRunning) throw new Error(`cannot recover running activity <${id}>`);
-    if (!state) return;
-    stopped = state.stopped;
-    status = state.status;
-    executionId = state.executionId;
-    counters = { ...counters,
-      ...state.counters
-    };
+});
+Object.defineProperty(proto, 'extensions', {
+  enumerable: true,
 
-    if (state.execution) {
-      execution = (0, _ActivityExecution.default)(activityApi, context).recover(state.execution);
-    }
+  get() {
+    if (kExtensions in this) return this[kExtensions];
+    const extensions = this[kExtensions] = this.context.loadExtensions(this);
+    return extensions;
+  }
 
-    broker.recover(state.broker);
-    return activityApi;
+});
+Object.defineProperty(proto, 'formatter', {
+  enumerable: true,
+
+  get() {
+    let formatter = this[kFormatter];
+    if (formatter) return formatter;
+    const broker = this.broker;
+    formatter = this[kFormatter] = new _MessageFormatter.Formatter({
+      id: this.id,
+      broker,
+      logger: this.logger
+    }, broker.getQueue('format-run-q'));
+    return formatter;
   }
 
-  function resume() {
-    if (consumingRunQ) {
-      throw new Error(`cannot resume running activity <${id}>`);
-    }
+});
+Object.defineProperty(proto, 'isRunning', {
+  enumerable: true,
 
-    if (!status) return activate();
-    stopped = false;
-    consumeApi();
-    const content = createMessage({
-      executionId
-    });
-    broker.publish('run', 'run.resume', content, {
-      persistent: false
-    });
-    consumeRunQ();
+  get() {
+    if (!this[kConsuming]) return false;
+    return !!this.status;
   }
 
-  function discard(discardContent) {
-    if (!status) return runDiscard(discardContent);
-    if (execution && !execution.completed) return execution.discard();
-    deactivateRunConsumers();
-    runQ.purge();
-    broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(stateMessage.content));
-    consumeRunQ();
+});
+Object.defineProperty(proto, 'outbound', {
+  enumerable: true,
+
+  get() {
+    return this[kFlows].outboundSequenceFlows;
   }
 
-  function discardRun() {
-    if (!status) return;
-    if (execution && !execution.completed) return;
+});
+Object.defineProperty(proto, 'inbound', {
+  enumerable: true,
+
+  get() {
+    return this[kFlows].inboundSequenceFlows;
+  }
 
-    switch (status) {
-      case 'executing':
-      case 'error':
-      case 'discarded':
-        return;
-    }
+});
+Object.defineProperty(proto, 'isEnd', {
+  enumerable: true,
 
-    deactivateRunConsumers();
-    if (extensions) extensions.deactivate();
-    runQ.purge();
-    broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(stateMessage.content));
-    consumeRunQ();
+  get() {
+    return this[kFlags].isEnd;
   }
 
-  function runDiscard(discardContent = {}) {
-    executionId = initExecutionId || (0, _shared.getUniqueId)(id);
-    consumeApi();
-    initExecutionId = undefined;
-    const content = createMessage({ ...discardContent,
-      executionId
-    });
-    broker.publish('run', 'run.discard', content);
-    consumeRunQ();
+});
+Object.defineProperty(proto, 'isStart', {
+  enumerable: true,
+
+  get() {
+    return this[kFlags].isStart;
   }
 
-  function stop() {
-    if (!consumingRunQ) return;
-    return getApi().stop();
+});
+Object.defineProperty(proto, 'isSubProcess', {
+  enumerable: true,
+
+  get() {
+    return this[kFlags].isSubProcess;
   }
 
-  function onStop(message) {
-    const running = consumingRunQ;
-    stopped = true;
-    consumingRunQ = false;
-    broker.cancel('_activity-run');
-    broker.cancel('_activity-api');
-    broker.cancel('_activity-execution');
-    broker.cancel('_run-on-inbound');
-    broker.cancel('_format-consumer');
-
-    if (running) {
-      if (extensions) extensions.deactivate(message || createMessage());
-      publishEvent('stop');
-    }
+});
+Object.defineProperty(proto, 'isMultiInstance', {
+  enumerable: true,
+
+  get() {
+    return this[kFlags].isMultiInstance;
   }
 
-  function activate() {
-    if (isForCompensation) return;
-    return consumeInbound();
+});
+Object.defineProperty(proto, 'isThrowing', {
+  enumerable: true,
+
+  get() {
+    return this[kFlags].isThrowing;
   }
 
-  function deactivate() {
-    broker.cancel('_run-on-inbound');
-    broker.cancel('_format-consumer');
+});
+Object.defineProperty(proto, 'isForCompensation', {
+  enumerable: true,
+
+  get() {
+    return this[kFlags].isForCompensation;
   }
 
-  function consumeRunQ() {
-    if (consumingRunQ) return;
-    consumingRunQ = true;
-    runQ.assertConsumer(onRunMessage, {
-      exclusive: true,
-      consumerTag: '_activity-run'
-    });
+});
+Object.defineProperty(proto, 'triggeredByEvent', {
+  enumerable: true,
+
+  get() {
+    return this[kActivityDef].triggeredByEvent;
   }
 
-  function consumeApi() {
-    if (!executionId) return;
-    broker.cancel('_activity-api');
-    broker.subscribeTmp('api', `activity.*.${executionId}`, onApiMessage, {
-      noAck: true,
-      consumerTag: '_activity-api',
-      priority: 100
-    });
+});
+Object.defineProperty(proto, 'attachedTo', {
+  enumerable: true,
+
+  get() {
+    const attachedToId = this[kFlags].attachedTo;
+    if (!attachedToId) return null;
+    return this.getActivityById(attachedToId);
   }
 
-  function consumeInbound() {
-    if (status) return;
+});
+Object.defineProperty(proto, 'eventDefinitions', {
+  enumerable: true,
 
-    if (isParallelJoin) {
-      return inboundQ.consume(onJoinInbound, {
-        consumerTag: '_run-on-inbound',
-        prefetch: 1000
-      });
-    }
+  get() {
+    return this[kEventDefinitions];
+  }
 
-    return inboundQ.consume(onInbound, {
-      consumerTag: '_run-on-inbound'
-    });
+});
+
+proto.activate = function activate() {
+  if (this[kFlags].isForCompensation) return;
+  return this._consumeInbound();
+};
+
+proto.deactivate = function deactivate() {
+  const broker = this.broker;
+  broker.cancel('_run-on-inbound');
+  broker.cancel('_format-consumer');
+};
+
+proto.init = function init(initContent) {
+  const id = this.id;
+  const exec = this[kExec];
+  const executionId = exec.initExecutionId = exec.initExecutionId || (0, _shared.getUniqueId)(id);
+  this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
+
+  this._publishEvent('init', this._createMessage({ ...initContent,
+    executionId
+  }));
+};
+
+proto.run = function run(runContent) {
+  const id = this.id;
+  if (this.isRunning) throw new Error(`activity <${id}> is already running`);
+  const exec = this[kExec];
+  const executionId = exec.executionId = exec.initExecutionId || (0, _shared.getUniqueId)(id);
+  exec.initExecutionId = null;
+
+  this._consumeApi();
+
+  const content = this._createMessage({ ...runContent,
+    executionId
+  });
+
+  const broker = this.broker;
+  broker.publish('run', 'run.enter', content);
+  broker.publish('run', 'run.start', (0, _messageHelper.cloneContent)(content));
+
+  this._consumeRunQ();
+};
+
+proto.recover = function recover(state) {
+  if (this.isRunning) throw new Error(`cannot recover running activity <${this.id}>`);
+  if (!state) return;
+  this.stopped = state.stopped;
+  this.status = state.status;
+  const exec = this[kExec];
+  exec.executionId = state.executionId;
+  this[kCounters] = { ...this[kCounters],
+    ...state.counters
+  };
+
+  if (state.execution) {
+    exec.execution = new _ActivityExecution.default(this, this.context).recover(state.execution);
   }
 
-  function deactivateRunConsumers() {
-    broker.cancel('_activity-api');
-    broker.cancel('_activity-run');
-    broker.cancel('_activity-execution');
-    consumingRunQ = false;
+  this.broker.recover(state.broker);
+  return this;
+};
+
+proto.resume = function resume() {
+  if (this[kConsuming]) {
+    throw new Error(`cannot resume running activity <${this.id}>`);
   }
 
-  function onInboundEvent(routingKey, message) {
-    const {
-      fields,
-      content,
-      properties
-    } = message;
-
-    switch (routingKey) {
-      case 'activity.enter':
-      case 'activity.discard':
-        {
-          if (content.id === attachedToActivity.id) {
-            inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
-          }
-
-          break;
-        }
+  if (!this.status) return this.activate();
+  this.stopped = false;
 
-      case 'flow.shake':
-        {
-          shakeOutbound(message);
-          break;
-        }
+  this._consumeApi();
 
-      case 'association.take':
-      case 'flow.take':
-      case 'flow.discard':
-        inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
-        break;
+  const content = this._createMessage();
 
-      case 'association.discard':
-        {
-          logger.debug(`<${id}> compensation discarded`);
-          inboundQ.purge();
-          break;
-        }
+  this.broker.publish('run', 'run.resume', content, {
+    persistent: false
+  });
 
-      case 'association.complete':
-        {
-          if (!isForCompensation) break;
-          inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
-          const compensationId = `${(0, _shared.brokerSafeId)(id)}_${(0, _shared.brokerSafeId)(content.sequenceId)}`;
-          publishEvent('compensation.start', createMessage({
-            executionId: compensationId,
-            placeholder: true
-          }));
-          logger.debug(`<${id}> start compensation with id <${compensationId}>`);
-          consumeInbound();
-          break;
-        }
-    }
+  this._consumeRunQ();
+};
+
+proto.discard = function discard(discardContent) {
+  if (!this.status) return this._runDiscard(discardContent);
+  const execution = this[kExec].execution;
+  if (execution && !execution.completed) return execution.discard();
+
+  this._deactivateRunConsumers();
+
+  const broker = this.broker;
+  broker.getQueue('run-q').purge();
+  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(this[kStateMessage].content));
+
+  this._consumeRunQ();
+};
+
+proto.stop = function stop() {
+  if (!this[kConsuming]) return;
+  return this.getApi().stop();
+};
+
+proto.next = function next() {
+  if (!this.environment.settings.step) return;
+  const stateMessage = this[kStateMessage];
+  if (!stateMessage) return;
+  if (this.status === 'executing') return false;
+  if (this.status === 'formatting') return false;
+  const current = stateMessage;
+  stateMessage.ack();
+  return current;
+};
+
+proto.shake = function shake() {
+  this._shakeOutbound({
+    content: this._createMessage()
+  });
+};
+
+proto.evaluateOutbound = function evaluateOutbound(fromMessage, discardRestAtTake, callback) {
+  return this[kFlows].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
+};
+
+proto.getState = function getState() {
+  const msg = this._createMessage();
+
+  const exec = this[kExec];
+  return { ...msg,
+    executionId: exec.executionId,
+    stopped: this.stopped,
+    behaviour: { ...this.behaviour
+    },
+    counters: this.counters,
+    broker: this.broker.getState(true),
+    execution: exec.execution && exec.execution.getState()
+  };
+};
+
+proto.getApi = function getApi(message) {
+  const execution = this[kExec].execution;
+  if (execution && !execution.completed) return execution.getApi(message);
+  return (0, _Api.ActivityApi)(this.broker, message || this[kStateMessage]);
+};
+
+proto.getActivityById = function getActivityById(elementId) {
+  return this.context.getActivityById(elementId);
+};
+
+proto._runDiscard = function runDiscard(discardContent) {
+  const exec = this[kExec];
+  const executionId = exec.executionId = exec.initExecutionId || (0, _shared.getUniqueId)(this.id);
+  exec.initExecutionId = null;
+
+  this._consumeApi();
+
+  const content = this._createMessage({ ...discardContent,
+    executionId
+  });
+
+  this.broker.publish('run', 'run.discard', content);
+
+  this._consumeRunQ();
+};
+
+proto._discardRun = function discardRun() {
+  const status = this.status;
+  if (!status) return;
+  const execution = this[kExec].execution;
+  if (execution && !execution.completed) return;
+
+  switch (status) {
+    case 'executing':
+    case 'error':
+    case 'discarded':
+      return;
   }
 
-  function onInbound(routingKey, message) {
-    message.ack();
-    broker.cancel('_run-on-inbound');
-    const content = message.content;
-    const inbound = [(0, _messageHelper.cloneContent)(content)];
-
-    switch (routingKey) {
-      case 'association.take':
-      case 'flow.take':
-      case 'activity.enter':
-        run({
-          message: content.message,
-          inbound
-        });
-        break;
+  this._deactivateRunConsumers();
 
-      case 'flow.discard':
-      case 'activity.discard':
-        {
-          let discardSequence;
-          if (content.discardSequence) discardSequence = content.discardSequence.slice();
-          runDiscard({
-            inbound,
-            discardSequence
-          });
-          break;
-        }
+  if (this.extensions) this.extensions.deactivate();
+  const broker = this.broker;
+  broker.getQueue('run-q').purge();
+  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(this[kStateMessage].content));
 
-      case 'association.complete':
-        {
-          broker.cancel('_run-on-inbound');
-          const compensationId = `${(0, _shared.brokerSafeId)(id)}_${(0, _shared.brokerSafeId)(content.sequenceId)}`;
-          logger.debug(`<${id}> completed compensation with id <${compensationId}>`);
-          publishEvent('compensation.end', createMessage({
-            executionId: compensationId
-          }));
-          break;
-        }
-    }
+  this._consumeRunQ();
+};
+
+proto._shakeOutbound = function shakeOutbound(sourceMessage) {
+  const message = (0, _messageHelper.cloneMessage)(sourceMessage);
+  message.content.sequence = message.content.sequence || [];
+  message.content.sequence.push({
+    id: this.id,
+    type: this.type
+  });
+  const broker = this.broker;
+  this.broker.publish('api', 'activity.shake.start', message.content, {
+    persistent: false,
+    type: 'shake'
+  });
+
+  if (this[kFlags].isEnd) {
+    return broker.publish('event', 'activity.shake.end', message.content, {
+      persistent: false,
+      type: 'shake'
+    });
   }
 
-  function onJoinInbound(routingKey, message) {
-    const {
-      content
-    } = message;
-    const idx = inboundJoinFlows.findIndex(msg => msg.content.id === content.id);
-    inboundJoinFlows.push(message);
-    if (idx > -1) return;
-    const allTouched = inboundJoinFlows.length >= inboundTriggers.length;
-
-    if (!allTouched) {
-      const remaining = inboundSequenceFlows.filter((inb, i, list) => list.indexOf(inb) === i).length - inboundJoinFlows.length;
-      return logger.debug(`<${id}> inbound ${message.content.action} from <${message.content.id}>, ${remaining} remaining`);
-    }
+  for (const flow of this[kFlows].outboundSequenceFlows) flow.shake(message);
+};
+
+proto._consumeInbound = function consumeInbound() {
+  if (this.status) return;
+  const inboundQ = this.broker.getQueue('inbound-q');
 
-    const evaluatedInbound = inboundJoinFlows.splice(0);
-    let taken;
-    const inbound = evaluatedInbound.map(im => {
-      if (im.fields.routingKey === 'flow.take') taken = true;
-      im.ack();
-      return (0, _messageHelper.cloneContent)(im.content);
+  if (this[kFlags].isParallelJoin) {
+    return inboundQ.consume(this[kMessageHandlers].onInbound, {
+      consumerTag: '_run-on-inbound',
+      prefetch: 1000
     });
-    const discardSequence = !taken && evaluatedInbound.reduce((result, im) => {
-      if (!im.content.discardSequence) return result;
-      im.content.discardSequence.forEach(sourceId => {
-        if (result.indexOf(sourceId) === -1) result.push(sourceId);
+  }
+
+  return inboundQ.consume(this[kMessageHandlers].onInbound, {
+    consumerTag: '_run-on-inbound'
+  });
+};
+
+proto._onInbound = function onInbound(routingKey, message) {
+  message.ack();
+  const id = this.id;
+  const broker = this.broker;
+  broker.cancel('_run-on-inbound');
+  const content = message.content;
+  const inbound = [(0, _messageHelper.cloneContent)(content)];
+
+  switch (routingKey) {
+    case 'association.take':
+    case 'flow.take':
+    case 'activity.enter':
+      return this.run({
+        message: content.message,
+        inbound
       });
-      return result;
-    }, []);
-    broker.cancel('_run-on-inbound');
-    if (!taken) return runDiscard({
-      inbound,
-      discardSequence
-    });
-    return run({
-      inbound
-    });
+
+    case 'flow.discard':
+    case 'activity.discard':
+      {
+        let discardSequence;
+        if (content.discardSequence) discardSequence = content.discardSequence.slice();
+        return this._runDiscard({
+          inbound,
+          discardSequence
+        });
+      }
+
+    case 'association.complete':
+      {
+        broker.cancel('_run-on-inbound');
+        const compensationId = `${(0, _shared.brokerSafeId)(id)}_${(0, _shared.brokerSafeId)(content.sequenceId)}`;
+        this.logger.debug(`<${id}> completed compensation with id <${compensationId}>`);
+        return this._publishEvent('compensation.end', this._createMessage({
+          executionId: compensationId
+        }));
+      }
+  }
+};
+
+proto._onJoinInbound = function onJoinInbound(routingKey, message) {
+  const {
+    content
+  } = message;
+  const {
+    inboundSequenceFlows,
+    inboundJoinFlows,
+    inboundTriggers
+  } = this[kFlows];
+  const idx = inboundJoinFlows.findIndex(msg => msg.content.id === content.id);
+  inboundJoinFlows.push(message);
+  if (idx > -1) return;
+  const allTouched = inboundJoinFlows.length >= inboundTriggers.length;
+
+  if (!allTouched) {
+    const remaining = inboundSequenceFlows.filter((inb, i, list) => list.indexOf(inb) === i).length - inboundJoinFlows.length;
+    return this.logger.debug(`<${this.id}> inbound ${message.content.action} from <${message.content.id}>, ${remaining} remaining`);
   }
 
-  function onRunMessage(routingKey, message, messageProperties) {
-    switch (routingKey) {
-      case 'run.outbound.discard':
-      case 'run.outbound.take':
-      case 'run.next':
-        return continueRunMessage(routingKey, message, messageProperties);
+  const evaluatedInbound = inboundJoinFlows.splice(0);
+  let taken;
+  const inbound = evaluatedInbound.map(im => {
+    if (im.fields.routingKey === 'flow.take') taken = true;
+    im.ack();
+    return (0, _messageHelper.cloneContent)(im.content);
+  });
+  const discardSequence = !taken && evaluatedInbound.reduce((result, im) => {
+    if (!im.content.discardSequence) return result;
 
-      case 'run.resume':
-        {
-          return onResumeMessage();
-        }
+    for (const sourceId of im.content.discardSequence) {
+      if (result.indexOf(sourceId) === -1) result.push(sourceId);
     }
 
-    const preStatus = status;
-    status = 'formatting';
-    return formatter(message, (err, formattedContent, formatted) => {
-      if (err) return emitFatal(err, message.content);
-      if (formatted) message.content = formattedContent;
-      status = preStatus;
-      continueRunMessage(routingKey, message, messageProperties);
-    });
+    return result;
+  }, []);
+  this.broker.cancel('_run-on-inbound');
+  if (!taken) return this._runDiscard({
+    inbound,
+    discardSequence
+  });
+  return this.run({
+    inbound
+  });
+};
+
+proto._onInboundEvent = function onInboundEvent(routingKey, message) {
+  const {
+    fields,
+    content,
+    properties
+  } = message;
+  const id = this.id;
+  const inboundQ = this.broker.getQueue('inbound-q');
+
+  switch (routingKey) {
+    case 'activity.enter':
+    case 'activity.discard':
+      {
+        if (content.id === this[kFlags].attachedTo) {
+          inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
+        }
 
-    function onResumeMessage() {
-      message.ack();
-      const {
-        fields
-      } = stateMessage;
-
-      switch (fields.routingKey) {
-        case 'run.enter':
-        case 'run.start':
-        case 'run.discarded':
-        case 'run.end':
-        case 'run.leave':
-          break;
-
-        default:
-          return;
+        break;
       }
 
-      if (!fields.redelivered) return;
-      logger.debug(`<${id}> resume from ${message.content.status}`);
-      return broker.publish('run', fields.routingKey, (0, _messageHelper.cloneContent)(stateMessage.content), stateMessage.properties);
-    }
+    case 'flow.shake':
+      {
+        return this._shakeOutbound(message);
+      }
+
+    case 'association.take':
+    case 'flow.take':
+    case 'flow.discard':
+      return inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
+
+    case 'association.discard':
+      {
+        this.logger.debug(`<${id}> compensation discarded`);
+        return inboundQ.purge();
+      }
+
+    case 'association.complete':
+      {
+        if (!this[kFlags].isForCompensation) break;
+        inboundQ.queueMessage(fields, (0, _messageHelper.cloneContent)(content), properties);
+        const compensationId = `${(0, _shared.brokerSafeId)(id)}_${(0, _shared.brokerSafeId)(content.sequenceId)}`;
+
+        this._publishEvent('compensation.start', this._createMessage({
+          executionId: compensationId,
+          placeholder: true
+        }));
+
+        this.logger.debug(`<${id}> start compensation with id <${compensationId}>`);
+        return this._consumeInbound();
+      }
+  }
+};
+
+proto._consumeRunQ = function consumeRunQ() {
+  if (this[kConsuming]) return;
+  this[kConsuming] = true;
+  this.broker.getQueue('run-q').assertConsumer(this[kMessageHandlers].onRunMessage, {
+    exclusive: true,
+    consumerTag: '_activity-run'
+  });
+};
+
+proto._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
+  switch (routingKey) {
+    case 'run.outbound.discard':
+    case 'run.outbound.take':
+    case 'run.next':
+      return this._continueRunMessage(routingKey, message, messageProperties);
+
+    case 'run.resume':
+      {
+        return this._onResumeMessage(message);
+      }
   }
 
-  function continueRunMessage(routingKey, message) {
-    const {
-      fields,
-      content: originalContent,
-      ack
-    } = message;
-    const isRedelivered = fields.redelivered;
-    const content = (0, _messageHelper.cloneContent)(originalContent);
-    const {
-      correlationId
-    } = message.properties;
-    stateMessage = message;
-
-    switch (routingKey) {
-      case 'run.enter':
-        {
-          logger.debug(`<${id}> enter`, isRedelivered ? 'redelivered' : '');
-          status = 'entered';
-
-          if (!isRedelivered) {
-            execution = undefined;
-          }
-
-          if (extensions) extensions.activate((0, _messageHelper.cloneMessage)(message), activityApi);
-          if (bpmnIo) bpmnIo.activate(message);
-          if (!isRedelivered) publishEvent('enter', content, {
-            correlationId
-          });
-          break;
-        }
+  const preStatus = this.status;
+  this.status = 'formatting';
+  return this.formatter.format(message, (err, formattedContent, formatted) => {
+    if (err) return this.emitFatal(err, message.content);
+    if (formatted) message.content = formattedContent;
+    this.status = preStatus;
 
-      case 'run.discard':
-        {
-          logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
-          status = 'discard';
-          execution = undefined;
-          if (extensions) extensions.activate((0, _messageHelper.cloneMessage)(message), activityApi);
-          if (bpmnIo) bpmnIo.activate(message);
-
-          if (!isRedelivered) {
-            broker.publish('run', 'run.discarded', content, {
-              correlationId
-            });
-            publishEvent('discard', content);
-          }
-
-          break;
+    this._continueRunMessage(routingKey, message, messageProperties);
+  });
+};
+
+proto._continueRunMessage = function continueRunMessage(routingKey, message) {
+  const isRedelivered = message.fields.redelivered;
+  const content = (0, _messageHelper.cloneContent)(message.content);
+  const correlationId = message.properties.correlationId;
+  const id = this.id;
+  const step = this.environment.settings.step;
+  this[kStateMessage] = message;
+
+  switch (routingKey) {
+    case 'run.enter':
+      {
+        this.logger.debug(`<${id}> enter`, isRedelivered ? 'redelivered' : '');
+        this.status = 'entered';
+
+        if (!isRedelivered) {
+          this[kExec].execution = null;
         }
 
-      case 'run.start':
-        {
-          logger.debug(`<${id}> start`, isRedelivered ? 'redelivered' : '');
-          status = 'started';
-
-          if (!isRedelivered) {
-            broker.publish('run', 'run.execute', content, {
-              correlationId
-            });
-            publishEvent('start', content, {
-              correlationId
-            });
-          }
-
-          break;
-        }
+        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message), this);
+        if (this.bpmnIo) this.bpmnIo.activate(message);
+        if (!isRedelivered) this._publishEvent('enter', content, {
+          correlationId
+        });
+        break;
+      }
 
-      case 'run.execute.passthrough':
-        {
-          if (!isRedelivered && execution) {
-            executeMessage = message;
-            return execution.passthrough(message);
-          }
-        }
+    case 'run.discard':
+      {
+        this.logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
+        this.status = 'discard';
+        this[kExec].execution = null;
+        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message), this);
+        if (this.bpmnIo) this.bpmnIo.activate(message);
 
-      case 'run.execute':
-        {
-          status = 'executing';
-          executeMessage = message;
-          executionQ.assertConsumer(onExecutionMessage, {
-            exclusive: true,
-            consumerTag: '_activity-execution'
+        if (!isRedelivered) {
+          this.broker.publish('run', 'run.discarded', content, {
+            correlationId
           });
-          execution = execution || (0, _ActivityExecution.default)(activityApi, context);
-
-          if (isRedelivered) {
-            return resumeExtensions(message, (err, formattedContent) => {
-              if (err) return emitFatal(err, message.content);
-              if (formattedContent) message.content = formattedContent;
-              status = 'executing';
-              return execution.execute(message);
-            });
-          }
-
-          return execution.execute(message);
+
+          this._publishEvent('discard', content);
         }
 
-      case 'run.end':
-        {
-          if (status === 'end') break;
-          counters.taken++;
-          status = 'end';
-          if (isRedelivered) break;
-          return doRunLeave(false, () => {
-            publishEvent('end', content, {
-              correlationId
-            });
-            if (!step) ack();
+        break;
+      }
+
+    case 'run.start':
+      {
+        this.logger.debug(`<${id}> start`, isRedelivered ? 'redelivered' : '');
+        this.status = 'started';
+
+        if (!isRedelivered) {
+          this.broker.publish('run', 'run.execute', content, {
+            correlationId
           });
-        }
 
-      case 'run.error':
-        {
-          publishEvent('error', (0, _messageHelper.cloneContent)(content, {
-            error: fields.redelivered ? (0, _Errors.makeErrorFromMessage)(message) : content.error
-          }), {
+          this._publishEvent('start', content, {
             correlationId
           });
-          break;
         }
 
-      case 'run.discarded':
-        {
-          logger.debug(`<${executionId} (${id})> discarded`);
-          counters.discarded++;
-          status = 'discarded';
-          content.outbound = undefined;
-
-          if (!isRedelivered) {
-            return doRunLeave(true, () => {
-              if (!step) ack();
-            });
-          }
+        break;
+      }
 
-          break;
-        }
+    case 'run.execute.passthrough':
+      {
+        const execution = this.execution;
 
-      case 'run.outbound.take':
-        {
-          const flow = getOutboundSequenceFlowById(content.flow.id);
-          ack();
-          return flow.take(content.flow);
+        if (!isRedelivered && execution) {
+          this[kExecuteMessage] = message;
+          return execution.passthrough(message);
         }
+      }
 
-      case 'run.outbound.discard':
-        {
-          const flow = getOutboundSequenceFlowById(content.flow.id);
-          ack();
-          return flow.discard(content.flow);
+    case 'run.execute':
+      {
+        this.status = 'executing';
+        this[kExecuteMessage] = message;
+        this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {
+          exclusive: true,
+          consumerTag: '_activity-execution'
+        });
+        const exec = this[kExec];
+        if (!exec.execution) exec.execution = new _ActivityExecution.default(this, this.context);
+
+        if (isRedelivered) {
+          return this._resumeExtensions(message, (err, formattedContent) => {
+            if (err) return this.emitFatal(err, message.content);
+            if (formattedContent) message.content = formattedContent;
+            this.status = 'executing';
+            return exec.execution.execute(message);
+          });
         }
 
-      case 'run.leave':
-        {
-          status = undefined;
-          if (bpmnIo) bpmnIo.deactivate(message);
-          if (extensions) extensions.deactivate(message);
-
-          if (!isRedelivered) {
-            broker.publish('run', 'run.next', (0, _messageHelper.cloneContent)(content), {
-              persistent: false
-            });
-            publishEvent('leave', content, {
-              correlationId
-            });
-          }
-
-          break;
-        }
+        return exec.execution.execute(message);
+      }
 
-      case 'run.next':
-        consumeInbound();
-        break;
-    }
+    case 'run.end':
+      {
+        if (this.status === 'end') break;
+        this[kCounters].taken++;
+        this.status = 'end';
+        if (isRedelivered) break;
+        return this._doRunLeave(message, false, () => {
+          this._publishEvent('end', content, {
+            correlationId
+          });
 
-    if (!step) ack();
+          if (!step) message.ack();
+        });
+      }
 
-    function doRunLeave(isDiscarded, onOutbound) {
-      if (content.ignoreOutbound) {
-        broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content), {
+    case 'run.error':
+      {
+        this._publishEvent('error', { ...content,
+          error: isRedelivered ? (0, _Errors.makeErrorFromMessage)(message) : content.error
+        }, {
           correlationId
         });
-        if (onOutbound) onOutbound();
-        return;
+
+        break;
       }
 
-      return doOutbound((0, _messageHelper.cloneMessage)(message), isDiscarded, (err, outbound) => {
-        if (err) {
-          return publishEvent('error', (0, _messageHelper.cloneContent)(content, {
-            error: err
-          }), {
-            correlationId
+    case 'run.discarded':
+      {
+        this.logger.debug(`<${content.executionId} (${id})> discarded`);
+        this[kCounters].discarded++;
+        this.status = 'discarded';
+        content.outbound = undefined;
+
+        if (!isRedelivered) {
+          return this._doRunLeave(message, true, () => {
+            if (!step) message.ack();
           });
         }
 
-        broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content, { ...(outbound.length ? {
-            outbound
-          } : undefined)
-        }), {
-          correlationId
-        });
-        if (onOutbound) onOutbound();
-      });
-    }
-  }
+        break;
+      }
 
-  function resumeExtensions(message, callback) {
-    if (!extensions && !bpmnIo) return callback();
-    if (extensions) extensions.activate((0, _messageHelper.cloneMessage)(message), activityApi);
-    if (bpmnIo) bpmnIo.activate((0, _messageHelper.cloneMessage)(message));
-    status = 'formatting';
-    return formatter(message, (err, formattedContent, formatted) => {
-      if (err) return callback(err);
-      return callback(null, formatted && formattedContent);
-    });
-  }
+    case 'run.outbound.take':
+      {
+        const flow = this._getOutboundSequenceFlowById(content.flow.id);
 
-  function getOutboundSequenceFlowById(flowId) {
-    return outboundSequenceFlows.find(flow => flow.id === flowId);
-  }
+        message.ack();
+        return flow.take(content.flow);
+      }
+
+    case 'run.outbound.discard':
+      {
+        const flow = this._getOutboundSequenceFlowById(content.flow.id);
 
-  function onExecutionMessage(routingKey, message) {
-    const content = (0, _messageHelper.cloneContent)({ ...executeMessage.content,
-      ...message.content,
-      executionId: executeMessage.content.executionId,
-      parent: { ...parent
+        message.ack();
+        return flow.discard(content.flow);
       }
-    });
-    const {
-      correlationId
-    } = message.properties;
-    publishEvent(routingKey, content, message.properties);
-
-    switch (routingKey) {
-      case 'execution.outbound.take':
-        {
-          return doOutbound((0, _messageHelper.cloneMessage)(message), false, (err, outbound) => {
-            message.ack();
-            if (err) return emitFatal(err, content);
-            broker.publish('run', 'run.execute.passthrough', (0, _messageHelper.cloneContent)(content, {
-              outbound
-            }));
-            return ackRunExecuteMessage();
-          });
-        }
 
-      case 'execution.error':
-        {
-          status = 'error';
-          broker.publish('run', 'run.error', content, {
-            correlationId
+    case 'run.leave':
+      {
+        this.status = undefined;
+        if (this.bpmnIo) this.bpmnIo.deactivate(message);
+        if (this.extensions) this.extensions.deactivate(message);
+
+        if (!isRedelivered) {
+          this.broker.publish('run', 'run.next', content, {
+            persistent: false
           });
-          broker.publish('run', 'run.discarded', content, {
+
+          this._publishEvent('leave', content, {
             correlationId
           });
-          break;
         }
 
-      case 'execution.discard':
-        status = 'discarded';
-        broker.publish('run', 'run.discarded', content, {
-          correlationId
-        });
         break;
+      }
 
-      default:
-        {
-          status = 'executed';
-          broker.publish('run', 'run.end', content, {
-            correlationId
-          });
-        }
-    }
-
-    message.ack();
-    ackRunExecuteMessage();
+    case 'run.next':
+      this._consumeInbound();
 
-    function ackRunExecuteMessage() {
-      if (step) return;
-      if (!executeMessage) return;
-      const ackMessage = executeMessage;
-      executeMessage = null;
-      ackMessage.ack();
-    }
+      break;
   }
 
-  function onApiMessage(routingKey, message) {
-    const messageType = message.properties.type;
+  if (!step) message.ack();
+};
 
-    switch (messageType) {
-      case 'discard':
-        {
-          discardRun(message);
-          break;
-        }
+proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
+  const executeMessage = this[kExecuteMessage];
+  const content = (0, _messageHelper.cloneContent)({ ...executeMessage.content,
+    ...message.content,
+    executionId: executeMessage.content.executionId,
+    parent: { ...this.parent
+    }
+  });
+  const {
+    correlationId
+  } = message.properties;
 
-      case 'stop':
-        {
-          onStop(message);
-          break;
-        }
+  this._publishEvent(routingKey, content, message.properties);
 
-      case 'shake':
-        {
-          shakeOutbound(message);
-          break;
-        }
-    }
-  }
+  const broker = this.broker;
 
-  function shake() {
-    shakeOutbound({
-      content: createMessage()
-    });
-  }
+  switch (routingKey) {
+    case 'execution.outbound.take':
+      {
+        return this._doOutbound(message, false, (err, outbound) => {
+          message.ack();
+          if (err) return this.emitFatal(err, content);
+          broker.publish('run', 'run.execute.passthrough', (0, _messageHelper.cloneContent)(content, {
+            outbound
+          }));
+          return this._ackRunExecuteMessage();
+        });
+      }
 
-  function shakeOutbound(sourceMessage) {
-    const message = (0, _messageHelper.cloneMessage)(sourceMessage);
-    message.content.sequence = message.content.sequence || [];
-    message.content.sequence.push({
-      id,
-      type
-    });
-    broker.publish('api', 'activity.shake.start', message.content, {
-      persistent: false,
-      type: 'shake'
-    });
+    case 'execution.error':
+      {
+        this.status = 'error';
+        broker.publish('run', 'run.error', content, {
+          correlationId
+        });
+        broker.publish('run', 'run.discarded', content, {
+          correlationId
+        });
+        break;
+      }
 
-    if (isEnd) {
-      return broker.publish('event', 'activity.shake.end', message.content, {
-        persistent: false,
-        type: 'shake'
+    case 'execution.discard':
+      this.status = 'discarded';
+      broker.publish('run', 'run.discarded', content, {
+        correlationId
       });
-    }
+      break;
 
-    outboundSequenceFlows.forEach(f => f.shake(message));
+    default:
+      {
+        this.status = 'executed';
+        broker.publish('run', 'run.end', content, {
+          correlationId
+        });
+      }
   }
 
-  function publishEvent(state, content, messageProperties = {}) {
-    if (!state) return;
-    if (!content) content = createMessage();
-    broker.publish('event', `activity.${state}`, { ...content,
-      state
-    }, { ...messageProperties,
-      type: state,
-      mandatory: state === 'error',
-      persistent: 'persistent' in messageProperties ? messageProperties.persistent : state !== 'stop'
-    });
-  }
+  message.ack();
 
-  function doOutbound(fromMessage, isDiscarded, callback) {
-    if (!outboundSequenceFlows.length) return callback(null, []);
-    const fromContent = fromMessage.content;
-    let discardSequence = fromContent.discardSequence;
+  this._ackRunExecuteMessage();
+};
 
-    if (isDiscarded && !discardSequence && attachedTo && fromContent.inbound && fromContent.inbound[0]) {
-      discardSequence = [fromContent.inbound[0].id];
-    }
+proto._ackRunExecuteMessage = function ackRunExecuteMessage() {
+  if (this.environment.settings.step) return;
+  const executeMessage = this[kExecuteMessage];
+  this[kExecuteMessage] = null;
+  executeMessage.ack();
+};
 
-    let outboundFlows;
+proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
+  const {
+    content,
+    properties
+  } = message;
+  const correlationId = properties.correlationId;
 
-    if (isDiscarded) {
-      outboundFlows = outboundSequenceFlows.map(flow => formatFlowAction(flow, {
-        action: 'discard'
-      }));
-    } else if (fromContent.outbound && fromContent.outbound.length) {
-      outboundFlows = outboundSequenceFlows.map(flow => formatFlowAction(flow, fromContent.outbound.filter(f => f.id === flow.id).pop()));
-    }
+  if (content.ignoreOutbound) {
+    this.broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content), {
+      correlationId
+    });
+    return onOutbound();
+  }
 
-    if (outboundFlows) {
-      doRunOutbound(outboundFlows);
-      return callback(null, outboundFlows);
+  return this._doOutbound((0, _messageHelper.cloneMessage)(message), isDiscarded, (err, outbound) => {
+    if (err) {
+      return this._publishEvent('error', { ...content,
+        error: err
+      }, {
+        correlationId
+      });
     }
 
-    return evaluateOutbound(fromMessage, fromContent.outboundTakeOne, (err, evaluatedOutbound) => {
-      if (err) return callback(new _Errors.ActivityError(err.message, fromMessage, err));
-      const outbound = doRunOutbound(evaluatedOutbound);
-      return callback(null, outbound);
+    this.broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content, { ...(outbound.length ? {
+        outbound
+      } : undefined)
+    }), {
+      correlationId
     });
+    onOutbound();
+  });
+};
 
-    function doRunOutbound(outboundList) {
-      return outboundList.map(outboundFlow => {
-        const {
-          id: flowId,
-          action
-        } = outboundFlow;
-        broker.publish('run', 'run.outbound.' + action, (0, _messageHelper.cloneContent)(fromContent, {
-          flow: { ...outboundFlow,
-            sequenceId: (0, _shared.getUniqueId)(`${flowId}_${action}`),
-            ...(discardSequence ? {
-              discardSequence: discardSequence.slice()
-            } : undefined)
-          }
-        }));
-        return outboundFlow;
-      });
-    }
+proto._doOutbound = function doOutbound(fromMessage, isDiscarded, callback) {
+  const outboundSequenceFlows = this[kFlows].outboundSequenceFlows;
+  if (!outboundSequenceFlows.length) return callback(null, []);
+  const fromContent = fromMessage.content;
+  let discardSequence = fromContent.discardSequence;
+
+  if (isDiscarded && !discardSequence && this[kFlags].attachedTo && fromContent.inbound && fromContent.inbound[0]) {
+    discardSequence = [fromContent.inbound[0].id];
   }
 
-  function formatFlowAction(flow, options) {
-    if (!options) options = {
+  let outboundFlows;
+
+  if (isDiscarded) {
+    outboundFlows = outboundSequenceFlows.map(flow => formatFlowAction(flow, {
       action: 'discard'
-    };
-    const action = options.action;
-    const message = options.message;
-    return { ...options,
-      id: flow.id,
-      action,
-      ...(flow.isDefault ? {
-        isDefault: true
-      } : undefined),
-      ...(message !== undefined ? {
-        message
-      } : undefined)
-    };
+    }));
+  } else if (fromContent.outbound && fromContent.outbound.length) {
+    outboundFlows = outboundSequenceFlows.map(flow => formatFlowAction(flow, fromContent.outbound.filter(f => f.id === flow.id).pop()));
   }
 
-  function evaluateOutbound(fromMessage, discardRestAtTake, callback) {
-    let conditionMet;
-    const outbound = {};
-    if (!outboundSequenceFlows.length) return completed();
-    const content = fromMessage.content;
-    const message = content.message;
-    const evaluateFlows = outboundSequenceFlows.slice();
-    const defaultFlowIdx = outboundSequenceFlows.findIndex(({
-      isDefault
-    }) => isDefault);
-
-    if (defaultFlowIdx > -1) {
-      evaluateFlows.splice(defaultFlowIdx, 1);
-      evaluateFlows.push(outboundSequenceFlows[defaultFlowIdx]);
-    }
+  if (outboundFlows) {
+    this._doRunOutbound(outboundFlows, fromContent, discardSequence);
 
-    let takenCount = 0;
-    broker.subscribeTmp('execution', 'evaluate.flow.#', (routingKey, {
-      content: evalContent,
-      ack
-    }) => {
-      const {
-        id: flowId,
-        action
-      } = evalContent;
-
-      if (action === 'take') {
-        takenCount++;
-        conditionMet = true;
-      }
+    return callback(null, outboundFlows);
+  }
 
-      outbound[flowId] = evalContent;
+  return this.evaluateOutbound(fromMessage, fromContent.outboundTakeOne, (err, evaluatedOutbound) => {
+    if (err) return callback(new _Errors.ActivityError(err.message, fromMessage, err));
 
-      if ('result' in evalContent) {
-        logger.debug(`<${content.executionId} (${id})> flow <${flowId}> evaluated to: ${evalContent.result}`);
+    const outbound = this._doRunOutbound(evaluatedOutbound, fromContent, discardSequence);
+
+    return callback(null, outbound);
+  });
+};
+
+proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequence) {
+  for (const outboundFlow of outboundList) {
+    const {
+      id: flowId,
+      action
+    } = outboundFlow;
+    this.broker.publish('run', 'run.outbound.' + action, (0, _messageHelper.cloneContent)(content, {
+      flow: { ...outboundFlow,
+        sequenceId: (0, _shared.getUniqueId)(`${flowId}_${action}`),
+        ...(discardSequence ? {
+          discardSequence: discardSequence.slice()
+        } : undefined)
       }
+    }));
+  }
 
-      let nextFlow = evaluateFlows.shift();
-      if (!nextFlow) return completed();
+  return outboundList;
+};
 
-      if (discardRestAtTake && conditionMet) {
-        do {
-          outbound[nextFlow.id] = formatFlowAction(nextFlow, {
-            action: 'discard'
-          });
-        } while (nextFlow = evaluateFlows.shift());
+proto._onResumeMessage = function onResumeMessage(message) {
+  message.ack();
+  const stateMessage = this[kStateMessage];
+  const {
+    fields
+  } = stateMessage;
+
+  switch (fields.routingKey) {
+    case 'run.enter':
+    case 'run.start':
+    case 'run.discarded':
+    case 'run.end':
+    case 'run.leave':
+      break;
+
+    default:
+      return;
+  }
+
+  if (!fields.redelivered) return;
+  this.logger.debug(`<${this.id}> resume from ${message.content.status}`);
+  return this.broker.publish('run', fields.routingKey, (0, _messageHelper.cloneContent)(stateMessage.content), stateMessage.properties);
+};
+
+proto._publishEvent = function publishEvent(state, content, properties = {}) {
+  this.broker.publish('event', `activity.${state}`, (0, _messageHelper.cloneContent)(content, {
+    state
+  }), { ...properties,
+    type: state,
+    mandatory: state === 'error',
+    persistent: 'persistent' in properties ? properties.persistent : state !== 'stop'
+  });
+};
+
+proto._onStop = function onStop(message) {
+  const running = this[kConsuming];
+  this.stopped = true;
+  this[kConsuming] = false;
+  const broker = this.broker;
+  broker.cancel('_activity-run');
+  broker.cancel('_activity-api');
+  broker.cancel('_activity-execution');
+  broker.cancel('_run-on-inbound');
+  broker.cancel('_format-consumer');
+
+  if (running) {
+    if (this.extensions) this.extensions.deactivate(message || this._createMessage());
+
+    this._publishEvent('stop', this._createMessage());
+  }
+};
+
+proto._consumeApi = function consumeApi() {
+  const executionId = this[kExec].executionId;
+  if (!executionId) return;
+  const broker = this.broker;
+  broker.cancel('_activity-api');
+  broker.subscribeTmp('api', `activity.*.${executionId}`, this[kMessageHandlers].onApiMessage, {
+    noAck: true,
+    consumerTag: '_activity-api',
+    priority: 100
+  });
+};
 
-        return completed();
+proto._onApiMessage = function onApiMessage(routingKey, message) {
+  switch (message.properties.type) {
+    case 'discard':
+      {
+        return this._discardRun(message);
       }
 
-      if (conditionMet && nextFlow.isDefault) {
-        outbound[nextFlow.id] = formatFlowAction(nextFlow, {
-          action: 'discard'
-        });
-        return completed();
+    case 'stop':
+      {
+        return this._onStop(message);
       }
 
-      ack();
-      evaluateSequenceFlows(nextFlow);
-    }, {
-      consumerTag: `_flow-evaluation-${executionId}`
-    });
-    return evaluateSequenceFlows(evaluateFlows.shift());
+    case 'shake':
+      {
+        return this._shakeOutbound(message);
+      }
+  }
+};
+
+proto._createMessage = function createMessage(override) {
+  const name = this.name,
+        status = this.status,
+        parent = this.parent;
+  const result = { ...override,
+    id: this.id,
+    type: this.type,
+    ...(name ? {
+      name
+    } : undefined),
+    ...(status ? {
+      status
+    } : undefined),
+    ...(parent ? {
+      parent: (0, _messageHelper.cloneParent)(parent)
+    } : undefined)
+  };
 
-    function completed(err) {
-      broker.cancel(`_flow-evaluation-${executionId}`);
-      if (err) return callback(err);
+  for (const [flag, value] of Object.entries(this[kFlags])) {
+    if (value) result[flag] = value;
+  }
 
-      if (!takenCount) {
-        const nonTakenError = new _Errors.ActivityError(`<${id}> no conditional flow taken`, fromMessage);
-        logger.error(`<${id}>`, nonTakenError);
-        return callback(nonTakenError);
-      }
+  return result;
+};
+
+proto._getOutboundSequenceFlowById = function getOutboundSequenceFlowById(flowId) {
+  return this[kFlows].outboundSequenceFlows.find(flow => flow.id === flowId);
+};
+
+proto._resumeExtensions = function resumeExtensions(message, callback) {
+  const extensions = this.extensions,
+        bpmnIo = this.bpmnIo;
+  if (!extensions && !bpmnIo) return callback();
+  if (extensions) extensions.activate((0, _messageHelper.cloneMessage)(message), this);
+  if (bpmnIo) bpmnIo.activate((0, _messageHelper.cloneMessage)(message), this);
+  this.status = 'formatting';
+  return this.formatter.format(message, (err, formattedContent, formatted) => {
+    if (err) return callback(err);
+    return callback(null, formatted && formattedContent);
+  });
+};
+
+proto._deactivateRunConsumers = function _deactivateRunConsumers() {
+  const broker = this.broker;
+  broker.cancel('_activity-api');
+  broker.cancel('_activity-run');
+  broker.cancel('_activity-execution');
+  this[kConsuming] = false;
+};
+
+function OutboundEvaluator(activity, outboundFlows) {
+  this.activity = activity;
+  this.broker = activity.broker;
+  const flows = this.outboundFlows = outboundFlows.slice();
+  const defaultFlowIdx = flows.findIndex(({
+    isDefault
+  }) => isDefault);
+
+  if (defaultFlowIdx > -1) {
+    const [defaultFlow] = flows.splice(defaultFlowIdx, 1);
+    flows.push(defaultFlow);
+  }
 
-      const outboundList = Object.keys(outbound).reduce((result, flowId) => {
-        const flow = outbound[flowId];
-        result.push({ ...flow,
-          ...(message !== undefined ? {
-            message
-          } : undefined)
-        });
-        return result;
-      }, []);
-      return callback(null, outboundList);
-    }
+  this.defaultFlowIdx = outboundFlows.findIndex(({
+    isDefault
+  }) => isDefault);
+  this._onEvaluated = this.onEvaluated.bind(this);
+  this.evaluateArgs = {};
+}
+
+OutboundEvaluator.prototype.evaluate = function evaluate(fromMessage, discardRestAtTake, callback) {
+  const outboundFlows = this.outboundFlows;
+  const args = this.evaluateArgs = {
+    fromMessage,
+    evaluationId: fromMessage.content.executionId,
+    discardRestAtTake,
+    callback,
+    conditionMet: false,
+    result: {},
+    takenCount: 0
+  };
+  if (!outboundFlows.length) return this.completed();
+  const flows = args.flows = outboundFlows.slice();
+  this.broker.subscribeTmp('execution', 'evaluate.flow.#', this._onEvaluated, {
+    consumerTag: `_flow-evaluation-${args.evaluationId}`
+  });
+  return this.evaluateFlow(flows.shift());
+};
 
-    function evaluateSequenceFlows(flow) {
-      if (!flow) return completed();
+OutboundEvaluator.prototype.onEvaluated = function onEvaluated(routingKey, message) {
+  const content = message.content;
+  const {
+    id: flowId,
+    action,
+    evaluationId
+  } = message.content;
+  const args = this.evaluateArgs;
+
+  if (action === 'take') {
+    args.takenCount++;
+    args.conditionMet = true;
+  }
 
-      if (flow.isDefault) {
-        return broker.publish('execution', 'evaluate.flow.take', formatFlowAction(flow, {
-          action: 'take'
-        }), {
-          persistent: false
-        });
-      }
+  args.result[flowId] = content;
 
-      const flowCondition = flow.getCondition();
+  if ('result' in content) {
+    this.activity.logger.debug(`<${evaluationId} (${this.activity.id})> flow <${flowId}> evaluated to: ${!!content.result}`);
+  }
 
-      if (!flowCondition) {
-        return broker.publish('execution', 'evaluate.flow.take', formatFlowAction(flow, {
-          action: 'take'
-        }), {
-          persistent: false
-        });
-      }
+  let nextFlow = args.flows.shift();
+  if (!nextFlow) return this.completed();
 
-      flowCondition.execute((0, _messageHelper.cloneMessage)(fromMessage), (err, result) => {
-        if (err) return completed(err);
-        const action = result ? 'take' : 'discard';
-        return broker.publish('execution', 'evaluate.flow.' + action, formatFlowAction(flow, {
-          action,
-          result
-        }), {
-          persistent: false
-        });
+  if (args.discardRestAtTake && args.conditionMet) {
+    do {
+      args.result[nextFlow.id] = formatFlowAction(nextFlow, {
+        action: 'discard'
       });
-    }
+    } while (nextFlow = args.flows.shift());
+
+    return this.completed();
   }
 
-  function getActivityById(elementId) {
-    return context.getActivityById(elementId);
+  if (args.conditionMet && nextFlow.isDefault) {
+    args.result[nextFlow.id] = formatFlowAction(nextFlow, {
+      action: 'discard'
+    });
+    return this.completed();
   }
 
-  function getState() {
-    const msg = createMessage();
-    return { ...msg,
-      status,
-      executionId,
-      stopped,
-      behaviour: { ...behaviour
-      },
-      counters: { ...counters
-      },
-      broker: broker.getState(true),
-      execution: execution && execution.getState()
-    };
+  message.ack();
+  this.evaluateFlow(nextFlow);
+};
+
+OutboundEvaluator.prototype.evaluateFlow = function evaluateFlow(flow) {
+  const broker = this.broker;
+
+  if (flow.isDefault) {
+    return broker.publish('execution', 'evaluate.flow.take', formatFlowAction(flow, {
+      action: 'take'
+    }), {
+      persistent: false
+    });
   }
 
-  function next() {
-    if (!step) return;
-    if (!stateMessage) return;
-    if (status === 'executing') return false;
-    if (status === 'formatting') return false;
-    const current = stateMessage;
-    stateMessage.ack();
-    return current;
+  const flowCondition = flow.getCondition();
+
+  if (!flowCondition) {
+    return broker.publish('execution', 'evaluate.flow.take', formatFlowAction(flow, {
+      action: 'take'
+    }), {
+      persistent: false
+    });
   }
 
-  function getApi(message) {
-    if (execution && !execution.completed) return execution.getApi(message);
-    return (0, _Api.ActivityApi)(broker, message || stateMessage);
+  const {
+    fromMessage,
+    evaluationId
+  } = this.evaluateArgs;
+  flowCondition.execute((0, _messageHelper.cloneMessage)(fromMessage), (err, result) => {
+    if (err) return this.completed(err);
+    const action = result ? 'take' : 'discard';
+    return broker.publish('execution', 'evaluate.flow.' + action, formatFlowAction(flow, {
+      action,
+      result,
+      evaluationId
+    }), {
+      persistent: false
+    });
+  });
+};
+
+OutboundEvaluator.prototype.completed = function completed(err) {
+  const {
+    callback,
+    evaluationId,
+    fromMessage,
+    result,
+    takenCount
+  } = this.evaluateArgs;
+  this.broker.cancel(`_flow-evaluation-${evaluationId}`);
+  if (err) return callback(err);
+
+  if (!takenCount && this.outboundFlows.length) {
+    const nonTakenError = new _Errors.ActivityError(`<${this.activity.id}> no conditional flow taken`, fromMessage);
+    return callback(nonTakenError);
   }
+
+  const message = fromMessage.content.message;
+  const evaluationResult = [];
+
+  for (const flow of Object.values(result)) {
+    evaluationResult.push({ ...flow,
+      ...(message !== undefined ? {
+        message
+      } : undefined)
+    });
+  }
+
+  return callback(null, evaluationResult);
+};
+
+function formatFlowAction(flow, options) {
+  return { ...options,
+    id: flow.id,
+    action: options.action,
+    ...(flow.isDefault ? {
+      isDefault: true
+    } : undefined)
+  };
 }