bpmn-elements 8.0.1 → 8.1.0

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+# 8.1.0
+
+- support non-interrupting BoundaryEvent with ISO8601 repeating interval timeCycle
+
 # 8.0.1
 
 ## Fix

package/dist/src/activity/Activity.js

@@ -543,6 +543,7 @@ proto._onInbound = function onInbound(routingKey, message) {
   switch (routingKey) {
     case 'association.take':
     case 'flow.take':
+    case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
@@ -976,9 +977,9 @@ proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
       });
     }
 
-    this.broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content, { ...(outbound.length ? {
+    this.broker.publish('run', 'run.leave', (0, _messageHelper.cloneContent)(content, { ...(outbound.length && {
         outbound
-      } : undefined)
+      })
     }), {
       correlationId
     });
@@ -1030,9 +1031,9 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
     this.broker.publish('run', 'run.outbound.' + action, (0, _messageHelper.cloneContent)(content, {
       flow: { ...outboundFlow,
         sequenceId: (0, _shared.getUniqueId)(`${flowId}_${action}`),
-        ...(discardSequence ? {
+        ...(discardSequence && {
           discardSequence: discardSequence.slice()
-        } : undefined)
+        })
       }
     }));
   }
@@ -1130,15 +1131,15 @@ proto._createMessage = function createMessage(override) {
   const result = { ...override,
     id: this.id,
     type: this.type,
-    ...(name ? {
+    ...(name && {
       name
-    } : undefined),
-    ...(status ? {
+    }),
+    ...(status && {
       status
-    } : undefined),
-    ...(parent ? {
+    }),
+    ...(parent && {
       parent: (0, _messageHelper.cloneParent)(parent)
-    } : undefined)
+    })
   };
 
   for (const [flag, value] of Object.entries(this[kFlags])) {
@@ -1315,9 +1316,9 @@ OutboundEvaluator.prototype.completed = function completed(err) {
 
   for (const flow of Object.values(result)) {
     evaluationResult.push({ ...flow,
-      ...(message !== undefined ? {
+      ...(message !== undefined && {
         message
-      } : undefined)
+      })
     });
   }
 
@@ -1328,8 +1329,8 @@ function formatFlowAction(flow, options) {
   return { ...options,
     id: flow.id,
     action: options.action,
-    ...(flow.isDefault ? {
+    ...(flow.isDefault && {
       isDefault: true
-    } : undefined)
+    })
   };
 }

package/dist/src/activity/ActivityExecution.js

@@ -414,9 +414,9 @@ proto._debug = function debug(logMessage, executionId) {
 };
 
 function getExecuteMessage(message) {
-  const result = (0, _messageHelper.cloneMessage)(message, { ...(message.fields.redelivered ? {
+  const result = (0, _messageHelper.cloneMessage)(message, { ...(message.fields.redelivered && {
       isRecovered: true
-    } : undefined),
+    }),
     ignoreIfExecuting: undefined
   });
   return result;

package/dist/src/activity/Message.js

@@ -30,9 +30,9 @@ function Message(messageDef, context) {
       id,
       type,
       messageType: 'message',
-      ...(name ? {
+      ...(name && {
         name: environment.resolveExpression(name, executionMessage)
-      } : undefined),
+      }),
       parent: { ...parent
       }
     };

package/dist/src/activity/Signal.js

@@ -30,9 +30,9 @@ function Signal(signalDef, context) {
       id,
       type,
       messageType: 'signal',
-      ...(name ? {
+      ...(name && {
         name: environment.resolveExpression(name, executionMessage)
-      } : undefined),
+      }),
       parent: { ...parent
       }
     };

package/dist/src/eventDefinitions/TimerEventDefinition.js

@@ -12,6 +12,7 @@ var _iso8601Duration = require("iso8601-duration");
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
+const repeatPattern = /^\s*R(\d+)\//;
 
 function TimerEventDefinition(activity, eventDefinition) {
   const type = this.type = eventDefinition.type || 'TimerEventDefinition';
@@ -77,9 +78,9 @@ proto.execute = function execute(executeMessage) {
   const resolvedTimer = this._getTimers(executeMessage);
 
   const timerContent = this[kTimerContent] = (0, _messageHelper.cloneContent)(content, { ...resolvedTimer,
-    ...(isResumed ? {
+    ...(isResumed && {
       isResumed
-    } : undefined),
+    }),
     startedAt,
     state: 'timer'
   });
@@ -129,6 +130,14 @@ proto._completed = function completed(completeContent, options) {
   };
   const broker = this.broker;
   broker.publish('event', 'activity.timeout', (0, _messageHelper.cloneContent)(timerContent, content), options);
+
+  if (timerContent.repeat > 1) {
+    const repeat = timerContent.repeat - 1;
+    broker.publish('execution', 'execute.repeat', (0, _messageHelper.cloneContent)(timerContent, { ...content,
+      repeat
+    }), options);
+  }
+
   broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(timerContent, content), options);
 };
 
@@ -171,9 +180,9 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 
         return this._completed({
           state: 'cancel',
-          ...(message.content.message ? {
+          ...(message.content.message && {
             message: message.content.message
-          } : undefined)
+          })
         }, {
           correlationId
         });
@@ -213,39 +222,48 @@ proto._stop = function stop() {
 proto._getTimers = function getTimers(executeMessage) {
   const content = executeMessage.content;
   const now = Date.now();
-  const result = { ...('expireAt' in content ? {
+  const result = { ...('expireAt' in content && {
       expireAt: new Date(content.expireAt)
-    } : undefined)
+    })
   };
 
   for (const t of ['timeDuration', 'timeDate', 'timeCycle']) {
     if (t in content) result[t] = content[t];else if (t in this) result[t] = this.environment.resolveExpression(this[t], executeMessage);else continue;
-    let expireAtDate;
-
-    if (t === 'timeDuration') {
-      const durationStr = result[t];
-
-      if (durationStr) {
-        const delay = this._getDurationInMilliseconds(durationStr);
-
-        if (delay !== undefined) expireAtDate = new Date(now + delay);
-      } else {
-        expireAtDate = new Date(now);
-      }
-    } else if (t === 'timeDate') {
-      const dateStr = result[t];
-
-      if (dateStr) {
-        const ms = Date.parse(dateStr);
-
-        if (!isNaN(ms)) {
-          expireAtDate = new Date(ms);
-        } else {
-          this._warn(`invalid timeDate >${dateStr}<`);
-        }
-      } else {
-        expireAtDate = new Date(now);
+    let expireAtDate, repeat;
+    const timerStr = result[t];
+
+    if (timerStr) {
+      switch (t) {
+        case 'timeCycle':
+          {
+            const mRepeat = timerStr.match(repeatPattern);
+            if (mRepeat && mRepeat.length) repeat = parseInt(mRepeat[1]);
+          }
+
+        case 'timeDuration':
+          {
+            const delay = this._getDurationInMilliseconds(timerStr);
+
+            if (delay !== undefined) expireAtDate = new Date(now + delay);
+            break;
+          }
+
+        case 'timeDate':
+          {
+            const dateStr = result[t];
+            const ms = Date.parse(dateStr);
+
+            if (!isNaN(ms)) {
+              expireAtDate = new Date(ms);
+            } else {
+              this._warn(`invalid timeDate >${dateStr}<`);
+            }
+
+            break;
+          }
       }
+    } else {
+      expireAtDate = new Date(now);
     }
 
     if (!expireAtDate) continue;
@@ -253,6 +271,7 @@ proto._getTimers = function getTimers(executeMessage) {
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
       result.timerType = t;
       result.expireAt = expireAtDate;
+      if (repeat) result.repeat = repeat;
     }
   }
 
@@ -264,6 +283,10 @@ proto._getTimers = function getTimers(executeMessage) {
     result.timeout = 0;
   }
 
+  if (content.inbound && 'repeat' in content.inbound[0]) {
+    result.repeat = content.inbound[0].repeat;
+  }
+
   return result;
 };
 
@@ -271,7 +294,7 @@ proto._getDurationInMilliseconds = function getDurationInMilliseconds(duration)
   try {
     return (0, _iso8601Duration.toSeconds)((0, _iso8601Duration.parse)(duration)) * 1000;
   } catch (err) {
-    this._warn(`failed to parse timeDuration >${duration}<: ${err.message}`);
+    this._warn(`failed to parse ${this.timerType} >${duration}<: ${err.message}`);
   }
 };
 

package/dist/src/events/BoundaryEvent.js

@@ -66,14 +66,6 @@ proto.execute = function execute(executeMessage) {
   if (isRootScope) {
     this[kExecuteMessage] = executeMessage;
     const broker = this.broker;
-
-    if (eventDefinitionExecution && !this.environment.settings.strict) {
-      broker.subscribeTmp('execution', 'execute.expect', this._onExpectMessage.bind(this), {
-        noAck: true,
-        consumerTag: '_expect-tag'
-      });
-    }
-
     const consumerTag = `_bound-listener-${executionId}`;
     this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
       noAck: true,
@@ -81,14 +73,23 @@ proto.execute = function execute(executeMessage) {
       priority: 300
     });
     this[kAttachedTags].push(consumerTag);
-    broker.subscribeOnce('execution', 'execute.detach', this._onDetachMessage.bind(this), {
-      consumerTag: '_detach-tag'
-    });
     broker.subscribeOnce('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
       consumerTag: `_api-${executionId}`
     });
-    broker.subscribeOnce('execution', 'execute.bound.completed', this._onCompleted.bind(this), {
-      consumerTag: `_execution-completed-${executionId}`
+    const execQ = broker.assertQueue(`_bound-execution-${executionId}`, {
+      durable: false,
+      autoDelete: true
+    });
+    broker.bindQueue(execQ.name, 'execution', 'execute.detach');
+    broker.bindQueue(execQ.name, 'execution', 'execute.bound.completed');
+    broker.bindQueue(execQ.name, 'execution', 'execute.repeat');
+
+    if (eventDefinitionExecution && !this.environment.settings.strict) {
+      broker.bindQueue(execQ.name, 'execution', 'execute.expect');
+    }
+
+    execQ.consume(this._onExecutionMessage.bind(this), {
+      consumerTag: '_execution-tag'
     });
   }
 
@@ -97,19 +98,37 @@ proto.execute = function execute(executeMessage) {
   }
 };
 
+proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
+  message.ack();
+
+  switch (routingKey) {
+    case 'execute.detach':
+      return this._onDetachMessage(routingKey, message);
+
+    case 'execute.bound.completed':
+      return this._onCompleted(routingKey, message);
+
+    case 'execute.repeat':
+      return this._onRepeatMessage(routingKey, message);
+
+    case 'execute.expect':
+      return this._onExpectMessage(routingKey, message);
+  }
+};
+
 proto._onCompleted = function onCompleted(_, {
   content
 }) {
   if (!this.cancelActivity && !content.cancelActivity) {
     this._stop();
 
-    return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content));
+    return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
+      cancelActivity: false
+    }));
   }
 
   this[kCompleteContent] = content;
-  const {
-    inbound
-  } = this[kExecuteMessage].content;
+  const inbound = this[kExecuteMessage].content.inbound;
   const attachedToContent = inbound && inbound[0];
   const attachedTo = this.attachedTo;
   this.activity.logger.debug(`<${this.executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`);
@@ -199,6 +218,17 @@ proto._onApiMessage = function onApiMessage(_, message) {
   }
 };
 
+proto._onRepeatMessage = function onRepeatMessage(_, message) {
+  if (this.cancelActivity) return;
+  const executeMessage = this[kExecuteMessage];
+  const repeat = message.content.repeat;
+  this.broker.getQueue('inbound-q').queueMessage({
+    routingKey: 'activity.restart'
+  }, (0, _messageHelper.cloneContent)(executeMessage.content.inbound[0], {
+    repeat
+  }));
+};
+
 proto._stop = function stop(detach) {
   const attachedTo = this.attachedTo,
         broker = this.broker,
@@ -208,8 +238,7 @@ proto._stop = function stop(detach) {
 
   for (const shovelName of this[kShovels].splice(0)) attachedTo.broker.closeShovel(shovelName);
 
-  broker.cancel('_expect-tag');
-  broker.cancel('_detach-tag');
+  broker.cancel('_execution-tag');
   broker.cancel(`_execution-completed-${executionId}`);
   if (detach) return;
   broker.cancel(`_api-${executionId}`);

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "bpmn-elements",
-  "version": "8.0.1",
+  "version": "8.1.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "main": "dist/index.js",
   "module": "index.js",
+  "sideEffects": false,
   "scripts": {
     "test": "mocha -R dot",
     "posttest": "npm run dist && eslint . --cache",
@@ -11,9 +12,7 @@
     "cov:html": "nyc mocha -R dot && nyc report --reporter=html",
     "test:lcov": "nyc mocha -R dot && nyc report --reporter lcov && npm run posttest",
     "dist": "babel index.js -d dist && babel src -d dist/src",
-    "predist": "node -e \"fs.rmdirSync('./dist/src', {recursive: true});\"",
-    "test-md": "node scripts/test-markdown ./API.md && node scripts/test-markdown ./docs/Examples.md",
-    "toc": "node scripts/generate-api-toc ./API.md,./docs/Examples.md,./docs/Form.md"
+    "predist": "node -e \"fs.rmdirSync('./dist/src', {recursive: true});\""
   },
   "repository": {
     "type": "git",
@@ -47,10 +46,10 @@
   ],
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.5",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/register": "^7.17.7",
+    "@babel/cli": "^7.18.6",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@babel/register": "^7.18.6",
     "bpmn-moddle": "^7.1.2",
     "camunda-bpmn-moddle": "^6.1.2",
     "chai": "^4.3.6",
@@ -61,7 +60,7 @@
     "mocha": "^9.2.2",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^2.1.0",
-    "nock": "^13.2.6",
+    "nock": "^13.2.8",
     "nyc": "^15.1.0"
   },
   "dependencies": {

package/src/activity/Activity.js

@@ -452,6 +452,7 @@ proto._onInbound = function onInbound(routingKey, message) {
   switch (routingKey) {
     case 'association.take':
     case 'flow.take':
+    case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
@@ -788,7 +789,7 @@ proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
     }
 
     this.broker.publish('run', 'run.leave', cloneContent(content, {
-      ...(outbound.length ? {outbound} : undefined),
+      ...(outbound.length && {outbound}),
     }), {correlationId});
 
     onOutbound();
@@ -832,7 +833,7 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
       flow: {
         ...outboundFlow,
         sequenceId: getUniqueId(`${flowId}_${action}`),
-        ...(discardSequence ? {discardSequence: discardSequence.slice()} : undefined),
+        ...(discardSequence && {discardSequence: discardSequence.slice()}),
       },
     }));
   }
@@ -919,9 +920,9 @@ proto._createMessage = function createMessage(override) {
     ...override,
     id: this.id,
     type: this.type,
-    ...(name ? {name} : undefined),
-    ...(status ? {status} : undefined),
-    ...(parent ? {parent: cloneParent(parent)} : undefined),
+    ...(name && {name}),
+    ...(status && {status}),
+    ...(parent && {parent: cloneParent(parent)}),
   };
 
   for (const [flag, value] of Object.entries(this[kFlags])) {
@@ -1070,7 +1071,7 @@ OutboundEvaluator.prototype.completed = function completed(err) {
   for (const flow of Object.values(result)) {
     evaluationResult.push({
       ...flow,
-      ...(message !== undefined ? {message} : undefined),
+      ...(message !== undefined && {message}),
     });
   }
 
@@ -1082,6 +1083,6 @@ function formatFlowAction(flow, options) {
     ...options,
     id: flow.id,
     action: options.action,
-    ...(flow.isDefault ? {isDefault: true} : undefined),
+    ...(flow.isDefault && {isDefault: true}),
   };
 }

package/src/activity/ActivityExecution.js

@@ -345,7 +345,7 @@ proto._debug = function debug(logMessage, executionId) {
 
 function getExecuteMessage(message) {
   const result = cloneMessage(message, {
-    ...(message.fields.redelivered ? {isRecovered: true} : undefined),
+    ...(message.fields.redelivered && {isRecovered: true}),
     ignoreIfExecuting: undefined,
   });
   return result;

package/src/activity/Message.js

@@ -16,7 +16,7 @@ export default function Message(messageDef, context) {
       id,
       type,
       messageType: 'message',
-      ...(name ? {name: environment.resolveExpression(name, executionMessage)} : undefined),
+      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
       parent: {...parent},
     };
   }

package/src/activity/Signal.js

@@ -16,7 +16,7 @@ export default function Signal(signalDef, context) {
       id,
       type,
       messageType: 'signal',
-      ...(name ? {name: environment.resolveExpression(name, executionMessage)} : undefined),
+      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
       parent: {...parent},
     };
   }

package/src/eventDefinitions/TimerEventDefinition.js

@@ -4,6 +4,7 @@ import {toSeconds, parse} from 'iso8601-duration';
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
+const repeatPattern = /^\s*R(\d+)\//;
 
 export default function TimerEventDefinition(activity, eventDefinition) {
   const type = this.type = eventDefinition.type || 'TimerEventDefinition';
@@ -63,7 +64,7 @@ proto.execute = function execute(executeMessage) {
   const resolvedTimer = this._getTimers(executeMessage);
   const timerContent = this[kTimerContent] = cloneContent(content, {
     ...resolvedTimer,
-    ...(isResumed ? {isResumed} : undefined),
+    ...(isResumed && {isResumed}),
     startedAt,
     state: 'timer',
   });
@@ -112,6 +113,12 @@ proto._completed = function completed(completeContent, options) {
 
   const broker = this.broker;
   broker.publish('event', 'activity.timeout', cloneContent(timerContent, content), options);
+
+  if (timerContent.repeat > 1) {
+    const repeat = timerContent.repeat - 1;
+    broker.publish('execution', 'execute.repeat', cloneContent(timerContent, {...content, repeat}), options);
+  }
+
   broker.publish('execution', 'execute.completed', cloneContent(timerContent, content), options);
 };
 
@@ -146,7 +153,7 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
       this._stop();
       return this._completed({
         state: 'cancel',
-        ...(message.content.message ? {message: message.content.message} : undefined),
+        ...(message.content.message && {message: message.content.message}),
       }, {correlationId});
     }
     case 'stop': {
@@ -175,7 +182,7 @@ proto._getTimers = function getTimers(executeMessage) {
 
   const now = Date.now();
   const result = {
-    ...('expireAt' in content ? {expireAt: new Date(content.expireAt)} : undefined),
+    ...('expireAt' in content && {expireAt: new Date(content.expireAt)}),
   };
 
   for (const t of ['timeDuration', 'timeDate', 'timeCycle']) {
@@ -183,33 +190,39 @@ proto._getTimers = function getTimers(executeMessage) {
     else if (t in this) result[t] = this.environment.resolveExpression(this[t], executeMessage);
     else continue;
 
-    let expireAtDate;
-    if (t === 'timeDuration') {
-      const durationStr = result[t];
-      if (durationStr) {
-        const delay = this._getDurationInMilliseconds(durationStr);
-        if (delay !== undefined) expireAtDate = new Date(now + delay);
-      } else {
-        expireAtDate = new Date(now);
-      }
-    } else if (t === 'timeDate') {
-      const dateStr = result[t];
-      if (dateStr) {
-        const ms = Date.parse(dateStr);
-        if (!isNaN(ms)) {
-          expireAtDate = new Date(ms);
-        } else {
-          this._warn(`invalid timeDate >${dateStr}<`);
+    let expireAtDate, repeat;
+    const timerStr = result[t];
+    if (timerStr) {
+      switch (t) {
+        case 'timeCycle': {
+          const mRepeat = timerStr.match(repeatPattern);
+          if (mRepeat && mRepeat.length) repeat = parseInt(mRepeat[1]);
+        }
+        case 'timeDuration': {
+          const delay = this._getDurationInMilliseconds(timerStr);
+          if (delay !== undefined) expireAtDate = new Date(now + delay);
+          break;
+        }
+        case 'timeDate': {
+          const dateStr = result[t];
+          const ms = Date.parse(dateStr);
+          if (!isNaN(ms)) {
+            expireAtDate = new Date(ms);
+          } else {
+            this._warn(`invalid timeDate >${dateStr}<`);
+          }
+          break;
         }
-      } else {
-        expireAtDate = new Date(now);
       }
+    } else {
+      expireAtDate = new Date(now);
     }
 
     if (!expireAtDate) continue;
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
       result.timerType = t;
       result.expireAt = expireAtDate;
+      if (repeat) result.repeat = repeat;
     }
   }
 
@@ -221,6 +234,10 @@ proto._getTimers = function getTimers(executeMessage) {
     result.timeout = 0;
   }
 
+  if (content.inbound && 'repeat' in content.inbound[0]) {
+    result.repeat = content.inbound[0].repeat;
+  }
+
   return result;
 };
 
@@ -228,7 +245,7 @@ proto._getDurationInMilliseconds = function getDurationInMilliseconds(duration)
   try {
     return toSeconds(parse(duration)) * 1000;
   } catch (err) {
-    this._warn(`failed to parse timeDuration >${duration}<: ${err.message}`);
+    this._warn(`failed to parse ${this.timerType} >${duration}<: ${err.message}`);
   }
 };
 

package/src/events/BoundaryEvent.js

@@ -50,13 +50,6 @@ proto.execute = function execute(executeMessage) {
     this[kExecuteMessage] = executeMessage;
 
     const broker = this.broker;
-    if (eventDefinitionExecution && !this.environment.settings.strict) {
-      broker.subscribeTmp('execution', 'execute.expect', this._onExpectMessage.bind(this), {
-        noAck: true,
-        consumerTag: '_expect-tag',
-      });
-    }
-
     const consumerTag = `_bound-listener-${executionId}`;
     this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
       noAck: true,
@@ -65,15 +58,19 @@ proto.execute = function execute(executeMessage) {
     });
     this[kAttachedTags].push(consumerTag);
 
-    broker.subscribeOnce('execution', 'execute.detach', this._onDetachMessage.bind(this), {
-      consumerTag: '_detach-tag',
-    });
     broker.subscribeOnce('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
       consumerTag: `_api-${executionId}`,
     });
-    broker.subscribeOnce('execution', 'execute.bound.completed', this._onCompleted.bind(this), {
-      consumerTag: `_execution-completed-${executionId}`,
-    });
+
+    const execQ = broker.assertQueue(`_bound-execution-${executionId}`, {durable: false, autoDelete: true});
+    broker.bindQueue(execQ.name, 'execution', 'execute.detach');
+    broker.bindQueue(execQ.name, 'execution', 'execute.bound.completed');
+    broker.bindQueue(execQ.name, 'execution', 'execute.repeat');
+    if (eventDefinitionExecution && !this.environment.settings.strict) {
+      broker.bindQueue(execQ.name, 'execution', 'execute.expect');
+    }
+
+    execQ.consume(this._onExecutionMessage.bind(this), {consumerTag: '_execution-tag'});
   }
 
   if (eventDefinitionExecution) {
@@ -81,15 +78,29 @@ proto.execute = function execute(executeMessage) {
   }
 };
 
+proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
+  message.ack();
+  switch (routingKey) {
+    case 'execute.detach':
+      return this._onDetachMessage(routingKey, message);
+    case 'execute.bound.completed':
+      return this._onCompleted(routingKey, message);
+    case 'execute.repeat':
+      return this._onRepeatMessage(routingKey, message);
+    case 'execute.expect':
+      return this._onExpectMessage(routingKey, message);
+  }
+};
+
 proto._onCompleted = function onCompleted(_, {content}) {
   if (!this.cancelActivity && !content.cancelActivity) {
     this._stop();
-    return this.broker.publish('execution', 'execute.completed', cloneContent(content));
+    return this.broker.publish('execution', 'execute.completed', cloneContent(content, {cancelActivity: false}));
   }
 
   this[kCompleteContent] = content;
 
-  const {inbound} = this[kExecuteMessage].content;
+  const inbound = this[kExecuteMessage].content.inbound;
   const attachedToContent = inbound && inbound[0];
   const attachedTo = this.attachedTo;
   this.activity.logger.debug(`<${this.executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`);
@@ -160,13 +171,19 @@ proto._onApiMessage = function onApiMessage(_, message) {
   }
 };
 
+proto._onRepeatMessage = function onRepeatMessage(_, message) {
+  if (this.cancelActivity) return;
+  const executeMessage = this[kExecuteMessage];
+  const repeat = message.content.repeat;
+  this.broker.getQueue('inbound-q').queueMessage({routingKey: 'activity.restart'}, cloneContent(executeMessage.content.inbound[0], {repeat}));
+};
+
 proto._stop = function stop(detach) {
   const attachedTo = this.attachedTo, broker = this.broker, executionId = this.executionId;
   for (const tag of this[kAttachedTags].splice(0)) attachedTo.broker.cancel(tag);
   for (const shovelName of this[kShovels].splice(0)) attachedTo.broker.closeShovel(shovelName);
 
-  broker.cancel('_expect-tag');
-  broker.cancel('_detach-tag');
+  broker.cancel('_execution-tag');
   broker.cancel(`_execution-completed-${executionId}`);
 
   if (detach) return;