bpmn-elements 18.0.1 → 18.0.3

package/dist/activity/Activity.js

@@ -97,8 +97,9 @@ function Activity(Behaviour, activityDef, context) {
     outboundSequenceFlows,
     outboundEvaluator: new _outboundEvaluator.OutboundEvaluator(this, outboundSequenceFlows)
   };
+  const isThrowingLink = activityDef.isThrowing && activityDef.linkNames?.length;
   this[K_FLAGS] = {
-    isEnd: !outboundSequenceFlows.length,
+    isEnd: !outboundSequenceFlows.length && !isThrowingLink,
     isStart: !hasInboundTrigger && !behaviour.triggeredByEvent && !activityDef.isCatching,
     isSubProcess: activityDef.isSubProcess,
     isMultiInstance: !!behaviour.loopCharacteristics,
@@ -268,7 +269,7 @@ Object.defineProperties(Activity.prototype, {
   },
   initialized: {
     get() {
-      return !!this[K_EXEC]?.get('initExecutionId');
+      return this[K_EXEC].get('initialized') > 0;
     }
   }
 });
@@ -280,7 +281,23 @@ Object.defineProperties(Activity.prototype, {
 Activity.prototype.activate = function activate() {
   if (this[_constants.K_ACTIVATED]) return;
   this[_constants.K_ACTIVATED] = true;
-  return this.addInboundListeners() && this._consumeInbound();
+  this.addInboundListeners();
+  return this.consumeInbound();
+};
+
+/**
+ * Assert the inbound queue consumer when the activity has a trigger or is initialized.
+ * Idempotent: asserting the consumer again while one is active is a no-op.
+ * @returns {void}
+ */
+Activity.prototype.consumeInbound = function consumeInbound() {
+  if (!this[_constants.K_ACTIVATED]) return;
+  if (this.status) return;
+  if (!this._getInboundTriggers().length && !this.initialized) return;
+  const onInbound = this[_constants.K_MESSAGE_HANDLERS].onInbound;
+  return this.broker.getQueue('inbound-q').assertConsumer(onInbound, {
+    consumerTag: '_run-on-inbound'
+  });
 };
 
 /** @internal */
@@ -326,17 +343,28 @@ Activity.prototype.deactivate = function deactivate() {
 /**
  * Initialise activity executionId and emit init event without starting the run.
  * @param {Record<string, any>} [initContent] Optional content merged into the init message
+ * @param {import('smqp').MessageProperties} [properties] Optional message properties merged into the init message properties
  */
-Activity.prototype.init = function init(initContent) {
+Activity.prototype.init = function init(initContent, properties) {
   const id = this.id;
   const exec = this[K_EXEC];
-  const executionId = exec.has('initExecutionId') ? exec.get('initExecutionId') : (0, _shared.getUniqueId)(id);
-  exec.set('initExecutionId', executionId);
+  exec.set('initialized', (exec.get('initialized') || 0) + 1);
+  const executionId = (0, _shared.getUniqueId)(id);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({
     ...initContent,
     executionId
   }));
+  this.broker.getQueue('inbound-q').queueMessage({
+    routingKey: 'activity.init'
+  }, {
+    ...initContent,
+    id,
+    executionId
+  }, {
+    persistent: false,
+    ...properties
+  });
 };
 
 /**
@@ -347,13 +375,15 @@ Activity.prototype.init = function init(initContent) {
 Activity.prototype.run = function run(runContent) {
   const id = this.id;
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
-  const exec = this[K_EXEC];
-  const executionId = exec.get('initExecutionId') || (0, _shared.getUniqueId)(id);
-  exec.set('executionId', executionId);
-  exec.delete('initExecutionId');
+  const {
+    initExecutionId,
+    ...runMessage
+  } = runContent || {};
+  const executionId = runMessage?.id === id && initExecutionId ? initExecutionId : (0, _shared.getUniqueId)(id);
+  this[K_EXEC].set('executionId', executionId);
   this._consumeApi();
   const content = this._createMessage({
-    ...runContent,
+    ...runMessage,
     executionId
   });
   const broker = this.broker;
@@ -558,10 +588,8 @@ Activity.prototype.getActivityById = function getActivityById(elementId) {
 
 /** @internal */
 Activity.prototype._runDiscard = function runDiscard(discardContent) {
-  const exec = this[K_EXEC];
-  const executionId = exec.get('initExecutionId') || (0, _shared.getUniqueId)(this.id);
-  exec.set('executionId', executionId);
-  exec.delete('initExecutionId');
+  const executionId = (0, _shared.getUniqueId)(this.id);
+  this[K_EXEC].set('executionId', executionId);
   this._consumeApi();
   const content = this._createMessage({
     ...discardContent,
@@ -613,7 +641,7 @@ Activity.prototype._onShakeMessage = function _onShakeMessage(sourceMessage) {
       id: this.id,
       type: this.type
     });
-    return this.broker.publish('event', 'activity.shake.join', message.content, {
+    return this.broker.publish('event', 'activity.shake.converge', message.content, {
       persistent: false,
       type: 'shake'
     });
@@ -674,43 +702,38 @@ Activity.prototype._shakeOutbound = function shakeOutbound(sourceMessage) {
   for (const t of targets.values()) t.shake(message);
 };
 
-/** @internal */
-Activity.prototype._consumeInbound = function consumeInbound() {
-  if (!this[_constants.K_ACTIVATED]) return;
-  if (this.status || !this._getInboundTriggers().length) return;
-  const inboundQ = this.broker.getQueue('inbound-q');
-  const onInbound = this[_constants.K_MESSAGE_HANDLERS].onInbound;
-  return inboundQ.assertConsumer(onInbound, {
-    consumerTag: '_run-on-inbound'
-  });
-};
-
 /** @internal */
 Activity.prototype._onInbound = function onInbound(routingKey, message) {
   message.ack();
   const broker = this.broker;
   broker.cancel('_run-on-inbound');
   const content = message.content;
-  const inbound = [(0, _messageHelper.cloneContent)(content)];
   switch (routingKey) {
-    case 'activity.relink':
-      if (content.executionId) this[K_EXEC].set('initExecutionId', content.executionId);
-      return this.run({
-        message: content.message,
-        inbound
-      });
+    case 'activity.init':
+      {
+        const exec = this[K_EXEC];
+        exec.set('initialized', (exec.get('initialized') || 0) - 1);
+        return this.run({
+          initExecutionId: content.executionId,
+          id: content.id,
+          message: content.message,
+          ...(content.inbound?.length && {
+            inbound: content.inbound
+          })
+        });
+      }
     case 'association.take':
     case 'flow.take':
     case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
-        inbound
+        inbound: [(0, _messageHelper.cloneContent)(content)]
       });
     case 'activity.discard':
       {
         return this._runDiscard({
-          inbound
+          inbound: [(0, _messageHelper.cloneContent)(content)]
         });
       }
   }
@@ -740,26 +763,9 @@ Activity.prototype._onInboundEvent = function onInboundEvent(routingKey, message
       {
         const linkName = content.message?.linkName;
         if (!this[K_FLAGS].linkNames?.includes(linkName)) break;
-        const executionId = (0, _shared.getUniqueId)(this.id);
-        this.broker.publish('event', 'activity.enter', (0, _messageHelper.cloneContent)(content, {
-          id: this.id,
-          type: this.type,
-          executionId,
-          state: 'enter',
-          message: {
-            ...content.message
-          }
-        }));
-        inboundQ.queueMessage({
-          routingKey: 'activity.relink'
-        }, (0, _messageHelper.cloneContent)(content, {
-          id: this.id,
-          executionId,
-          message: {
-            ...content.message
-          }
-        }), properties);
-        return;
+        return this.init({
+          inbound: [(0, _messageHelper.cloneContent)(content)]
+        });
       }
     case 'association.take':
     case 'flow.take':
@@ -942,7 +948,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
     case 'run.next':
       message.ack();
       this._pauseRunQ();
-      return this._consumeInbound();
+      return this.consumeInbound();
   }
   if (!step) message.ack();
 };

package/dist/events/BoundaryEvent.js

@@ -44,9 +44,9 @@ Object.defineProperty(BoundaryEventBehaviour.prototype, 'executionId', {
   }
 });
 Object.defineProperty(BoundaryEventBehaviour.prototype, 'cancelActivity', {
+  /** @returns {boolean} */
   get() {
-    const behaviour = this.activity.behaviour || {};
-    return 'cancelActivity' in behaviour ? behaviour.cancelActivity : true;
+    return this.activity.behaviour?.cancelActivity ?? true;
   }
 });
 

package/dist/gateways/ParallelGateway.js

@@ -76,11 +76,15 @@ function ParallelGatewayBehaviour(activity) {
   this.type = activity.type;
   this.activity = activity;
   this.broker = activity.broker;
+  /**
+   * Inbound taken sequence flow sequences
+   * @type {Set<import('#types').ElementMessageContent}
+   */
   this.inbound = new Set();
-  this.isConverging = true;
   this[_constants.K_EXECUTE_MESSAGE] = undefined;
 }
 Object.defineProperty(ParallelGatewayBehaviour.prototype, 'executionId', {
+  /** @returns {string | undefined} */
   get() {
     return this[_constants.K_EXECUTE_MESSAGE]?.content.executionId;
   }
@@ -110,6 +114,12 @@ ParallelGatewayBehaviour.prototype.execute = function execute(executeMessage) {
     }
   }
 };
+
+/**
+ * Setup peer monitor
+ * @param {import('#types').ElementBrokerMessage} executeMessage
+ * @returns {void}
+ */
 ParallelGatewayBehaviour.prototype.setup = function setup(executeMessage) {
   const peerIds = new Set([...this.activity[K_PEERS].values()].map(v => [...v]).flat());
   this[_constants.K_TARGETS] = new Map([...peerIds].map(pid => [pid, this.activity.getActivityById(pid)]));
@@ -142,9 +152,7 @@ ParallelGatewayBehaviour.prototype.setup = function setup(executeMessage) {
     exclusive: true,
     prefetch: 10000
   });
-  if (this.isConverging) {
-    this.broker.publish('event', 'activity.converge', (0, _messageHelper.cloneContent)(executeContent));
-  }
+  this.broker.publish('event', 'activity.converge', (0, _messageHelper.cloneContent)(executeContent));
   return this.broker.publish('execution', 'execute.start', (0, _messageHelper.cloneContent)(executeMessage.content, {
     preventComplete: true,
     state: STATE_SETUP
@@ -179,17 +187,19 @@ ParallelGatewayBehaviour.prototype._stop = function stop() {
   this.broker.cancel('_parallel-execution-peer-enter-tag');
   this.peerMonitor.stop();
 };
+
+/**
+ * Peer monitor
+ * @param {import('#types').Activity} activity parallel gateway activity
+ * @param {Map<string, import('#types').Activity} targets parallel gateway peer target activities
+ */
 function PeerMonitor(activity, targets) {
   this.activity = activity;
   this.id = activity.id;
   this.broker = activity.broker;
-  this.running = 0;
-  this.index = 0;
-  this.discarded = 0;
   this.running = new Map();
   this.watching = new Map();
   this.targets = targets;
-  this.touched = new Set();
   this.inbound = [];
 }
 Object.defineProperty(PeerMonitor.prototype, 'isRunning', {
@@ -197,6 +207,12 @@ Object.defineProperty(PeerMonitor.prototype, 'isRunning', {
     return this.running.size > 0;
   }
 });
+
+/**
+ * Execute peer monitor
+ * @param {import('#types').ElementBrokerMessage} executeMessage
+ * @returns {number} number of running peers
+ */
 PeerMonitor.prototype.execute = function execute(executeMessage) {
   const message = (0, _messageHelper.cloneMessage)(executeMessage);
   const inbound = message.content.inbound.pop();
@@ -208,12 +224,16 @@ PeerMonitor.prototype.execute = function execute(executeMessage) {
     state: STATE_MONTITORING,
     preventComplete: true
   });
-  this.touched.add(inbound.sourceId);
   for (const target of this.targets.values()) {
     this.monitor(target);
   }
   return this.running.size;
 };
+
+/**
+ * Monitor peer activity
+ * @param {import('#types').Activity} peerActivity
+ */
 PeerMonitor.prototype.monitor = function monitor(peerActivity) {
   if (this.watching.has(peerActivity.id)) return;
   this.activity.logger.debug(`<${this.id}> monitor <${peerActivity.id}> with status: ${peerActivity.status}`);

package/dist/process/Process.js

@@ -8,10 +8,12 @@ var _ProcessExecution = require("./ProcessExecution.js");
 var _shared = require("../shared.js");
 var _Api = require("../Api.js");
 var _EventBroker = require("../EventBroker.js");
+var _MessageFormatter = require("../MessageFormatter.js");
 var _messageHelper = require("../messageHelper.js");
 var _Errors = require("../error/Errors.js");
 var _constants = require("../constants.js");
 const K_LANES = Symbol.for('lanes');
+const K_FORMATTER = Symbol.for('formatter');
 
 /**
  * Owns one `<bpmn:process>`. Wraps the structural definition and orchestrates flow traversal,
@@ -49,12 +51,14 @@ function Process(processDef, context) {
     broker,
     on,
     once,
-    waitFor
+    waitFor,
+    emitFatal
   } = (0, _EventBroker.ProcessBroker)(this);
   this.broker = broker;
   this.on = on;
   this.once = once;
   this.waitFor = waitFor;
+  this.emitFatal = emitFatal;
   this[_constants.K_MESSAGE_HANDLERS] = {
     onApiMessage: this._onApiMessage.bind(this),
     onRunMessage: this._onRunMessage.bind(this),
@@ -84,6 +88,14 @@ Object.defineProperties(Process.prototype, {
       return this[_constants.K_EXTENSIONS];
     }
   },
+  formatter: {
+    get() {
+      let formatter = this[K_FORMATTER];
+      if (formatter) return formatter;
+      formatter = this[K_FORMATTER] = new _MessageFormatter.Formatter(this);
+      return formatter;
+    }
+  },
   stopped: {
     get() {
       return this[_constants.K_STOPPED];
@@ -292,14 +304,28 @@ Process.prototype._deactivateRunConsumers = function deactivateRunConsumers() {
 };
 
 /** @internal */
-Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
+Process.prototype._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
+  if (routingKey === 'run.resume') {
+    return this._onResumeMessage(message);
+  }
+  const preStatus = this[_constants.K_STATUS];
+  this[_constants.K_STATUS] = 'formatting';
+  return this.formatter.format(message, (err, formattedContent, formatted) => {
+    this[_constants.K_STATUS] = preStatus;
+    if (err) {
+      return this.emitFatal(err, message.content);
+    }
+    if (formatted) message.content = formattedContent;
+    this._continueRunMessage(routingKey, message, messageProperties);
+  });
+};
+
+/** @internal */
+Process.prototype._continueRunMessage = function continueRunMessage(routingKey, message) {
   const {
     content,
     fields
   } = message;
-  if (routingKey === 'run.resume') {
-    return this._onResumeMessage(message);
-  }
   this[_constants.K_STATE_MESSAGE] = message;
   switch (routingKey) {
     case 'run.enter':
@@ -308,6 +334,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
         this[_constants.K_STATUS] = 'entered';
         if (fields.redelivered) break;
         this[_constants.K_EXECUTION].delete('execution');
+        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
         this._publishEvent('enter', content);
         break;
       }
@@ -322,6 +349,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
       {
         const exec = this[_constants.K_EXECUTION];
         this[_constants.K_STATUS] = 'executing';
+        if (fields.redelivered && this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
         const executeMessage = (0, _messageHelper.cloneMessage)(message);
         let execution = exec.get('execution');
         if (fields.redelivered && !execution) {
@@ -366,6 +394,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
     case 'run.leave':
       {
         this[_constants.K_STATUS] = undefined;
+        if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
         message.ack();
         this._deactivateRunConsumers();
         const {
@@ -394,6 +423,7 @@ Process.prototype._onResumeMessage = function onResumeMessage(message) {
       return;
   }
   if (!stateMessage.fields.redelivered) return;
+  if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(stateMessage));
   this._debug(`resume from ${this.status}`);
   return this.broker.publish('run', stateMessage.fields.routingKey, (0, _messageHelper.cloneContent)(stateMessage.content), stateMessage.properties);
 };
@@ -530,6 +560,7 @@ Process.prototype._onApiMessage = function onApiMessage(routingKey, message) {
 Process.prototype._onStop = function onStop() {
   this[_constants.K_STOPPED] = true;
   this._deactivateRunConsumers();
+  if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(this[_constants.K_STATE_MESSAGE]));
   return this._publishEvent('stop');
 };
 

package/dist/process/ProcessExecution.js

@@ -391,7 +391,7 @@ ProcessExecution.prototype._start = function start() {
   this._shakeOnStart();
   for (const a of startActivities) a.init();
   this[_constants.K_STATUS] = 'executing';
-  for (const a of startActivities) a.run();
+  for (const a of startActivities) a.consumeInbound();
   if (!startActivities.size) {
     for (const a of this[K_ELEMENTS].triggeredByEvent) {
       if (a.isCatching && !a.isRunning) a.run();
@@ -556,7 +556,7 @@ ProcessExecution.prototype._shakeElements = function shakeElements(fromId) {
   }) => {
     if (content.parent.id !== this.id) return;
     switch (routingKey) {
-      case 'activity.shake.join':
+      case 'activity.shake.converge':
         {
           const join = convergingGateways.get(content.join);
           if (!join) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",

package/src/activity/Activity.js

@@ -91,8 +91,10 @@ export function Activity(Behaviour, activityDef, context) {
     outboundEvaluator: new OutboundEvaluator(this, outboundSequenceFlows),
   };
 
+  const isThrowingLink = activityDef.isThrowing && activityDef.linkNames?.length;
+
   this[K_FLAGS] = {
-    isEnd: !outboundSequenceFlows.length,
+    isEnd: !outboundSequenceFlows.length && !isThrowingLink,
     isStart: !hasInboundTrigger && !behaviour.triggeredByEvent && !activityDef.isCatching,
     isSubProcess: activityDef.isSubProcess,
     isMultiInstance: !!behaviour.loopCharacteristics,
@@ -262,7 +264,7 @@ Object.defineProperties(Activity.prototype, {
   },
   initialized: {
     get() {
-      return !!this[K_EXEC]?.get('initExecutionId');
+      return this[K_EXEC].get('initialized') > 0;
     },
   },
 });
@@ -274,7 +276,25 @@ Object.defineProperties(Activity.prototype, {
 Activity.prototype.activate = function activate() {
   if (this[K_ACTIVATED]) return;
   this[K_ACTIVATED] = true;
-  return this.addInboundListeners() && this._consumeInbound();
+  this.addInboundListeners();
+  return this.consumeInbound();
+};
+
+/**
+ * Assert the inbound queue consumer when the activity has a trigger or is initialized.
+ * Idempotent: asserting the consumer again while one is active is a no-op.
+ * @returns {void}
+ */
+Activity.prototype.consumeInbound = function consumeInbound() {
+  if (!this[K_ACTIVATED]) return;
+
+  if (this.status) return;
+
+  if (!this._getInboundTriggers().length && !this.initialized) return;
+
+  const onInbound = this[K_MESSAGE_HANDLERS].onInbound;
+
+  return this.broker.getQueue('inbound-q').assertConsumer(onInbound, { consumerTag: '_run-on-inbound' });
 };
 
 /** @internal */
@@ -319,14 +339,18 @@ Activity.prototype.deactivate = function deactivate() {
 /**
  * Initialise activity executionId and emit init event without starting the run.
  * @param {Record<string, any>} [initContent] Optional content merged into the init message
+ * @param {import('smqp').MessageProperties} [properties] Optional message properties merged into the init message properties
  */
-Activity.prototype.init = function init(initContent) {
+Activity.prototype.init = function init(initContent, properties) {
   const id = this.id;
   const exec = this[K_EXEC];
-  const executionId = exec.has('initExecutionId') ? exec.get('initExecutionId') : getUniqueId(id);
-  exec.set('initExecutionId', executionId);
+  exec.set('initialized', (exec.get('initialized') || 0) + 1);
+  const executionId = getUniqueId(id);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({ ...initContent, executionId }));
+  this.broker
+    .getQueue('inbound-q')
+    .queueMessage({ routingKey: 'activity.init' }, { ...initContent, id, executionId }, { persistent: false, ...properties });
 };
 
 /**
@@ -338,14 +362,13 @@ Activity.prototype.run = function run(runContent) {
   const id = this.id;
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
 
-  const exec = this[K_EXEC];
-  const executionId = exec.get('initExecutionId') || getUniqueId(id);
-  exec.set('executionId', executionId);
-  exec.delete('initExecutionId');
+  const { initExecutionId, ...runMessage } = runContent || {};
+  const executionId = runMessage?.id === id && initExecutionId ? initExecutionId : getUniqueId(id);
+  this[K_EXEC].set('executionId', executionId);
 
   this._consumeApi();
 
-  const content = this._createMessage({ ...runContent, executionId });
+  const content = this._createMessage({ ...runMessage, executionId });
   const broker = this.broker;
 
   broker.publish('run', 'run.enter', content);
@@ -541,10 +564,8 @@ Activity.prototype.getActivityById = function getActivityById(elementId) {
 
 /** @internal */
 Activity.prototype._runDiscard = function runDiscard(discardContent) {
-  const exec = this[K_EXEC];
-  const executionId = exec.get('initExecutionId') || getUniqueId(this.id);
-  exec.set('executionId', executionId);
-  exec.delete('initExecutionId');
+  const executionId = getUniqueId(this.id);
+  this[K_EXEC].set('executionId', executionId);
 
   this._consumeApi();
 
@@ -594,7 +615,7 @@ Activity.prototype._onShakeMessage = function _onShakeMessage(sourceMessage) {
   if (this[K_FLAGS].isParallelGateway) {
     const message = cloneMessage(sourceMessage, { join: this.id });
     message.content.sequence.push({ id: this.id, type: this.type });
-    return this.broker.publish('event', 'activity.shake.join', message.content, {
+    return this.broker.publish('event', 'activity.shake.converge', message.content, {
       persistent: false,
       type: 'shake',
     });
@@ -641,18 +662,6 @@ Activity.prototype._shakeOutbound = function shakeOutbound(sourceMessage) {
   for (const t of targets.values()) t.shake(message);
 };
 
-/** @internal */
-Activity.prototype._consumeInbound = function consumeInbound() {
-  if (!this[K_ACTIVATED]) return;
-
-  if (this.status || !this._getInboundTriggers().length) return;
-
-  const inboundQ = this.broker.getQueue('inbound-q');
-  const onInbound = this[K_MESSAGE_HANDLERS].onInbound;
-
-  return inboundQ.assertConsumer(onInbound, { consumerTag: '_run-on-inbound' });
-};
-
 /** @internal */
 Activity.prototype._onInbound = function onInbound(routingKey, message) {
   message.ack();
@@ -660,25 +669,28 @@ Activity.prototype._onInbound = function onInbound(routingKey, message) {
   broker.cancel('_run-on-inbound');
 
   const content = message.content;
-  const inbound = [cloneContent(content)];
 
   switch (routingKey) {
-    case 'activity.relink':
-      if (content.executionId) this[K_EXEC].set('initExecutionId', content.executionId);
+    case 'activity.init': {
+      const exec = this[K_EXEC];
+      exec.set('initialized', (exec.get('initialized') || 0) - 1);
       return this.run({
+        initExecutionId: content.executionId,
+        id: content.id,
         message: content.message,
-        inbound,
+        ...(content.inbound?.length && { inbound: content.inbound }),
       });
+    }
     case 'association.take':
     case 'flow.take':
     case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
-        inbound,
+        inbound: [cloneContent(content)],
       });
     case 'activity.discard': {
-      return this._runDiscard({ inbound });
+      return this._runDiscard({ inbound: [cloneContent(content)] });
     }
   }
 };
@@ -702,18 +714,7 @@ Activity.prototype._onInboundEvent = function onInboundEvent(routingKey, message
     case 'activity.link': {
       const linkName = content.message?.linkName;
       if (!this[K_FLAGS].linkNames?.includes(linkName)) break;
-      const executionId = getUniqueId(this.id);
-      this.broker.publish(
-        'event',
-        'activity.enter',
-        cloneContent(content, { id: this.id, type: this.type, executionId, state: 'enter', message: { ...content.message } })
-      );
-      inboundQ.queueMessage(
-        { routingKey: 'activity.relink' },
-        cloneContent(content, { id: this.id, executionId, message: { ...content.message } }),
-        properties
-      );
-      return;
+      return this.init({ inbound: [cloneContent(content)] });
     }
     case 'association.take':
     case 'flow.take':
@@ -890,7 +891,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
     case 'run.next':
       message.ack();
       this._pauseRunQ();
-      return this._consumeInbound();
+      return this.consumeInbound();
   }
 
   if (!step) message.ack();

package/src/events/BoundaryEvent.js

@@ -41,9 +41,9 @@ Object.defineProperty(BoundaryEventBehaviour.prototype, 'executionId', {
 });
 
 Object.defineProperty(BoundaryEventBehaviour.prototype, 'cancelActivity', {
+  /** @returns {boolean} */
   get() {
-    const behaviour = this.activity.behaviour || {};
-    return 'cancelActivity' in behaviour ? behaviour.cancelActivity : true;
+    return this.activity.behaviour?.cancelActivity ?? true;
   },
 });
 

package/src/gateways/ParallelGateway.js

@@ -74,13 +74,17 @@ export function ParallelGatewayBehaviour(activity) {
   this.type = activity.type;
   this.activity = activity;
   this.broker = activity.broker;
+  /**
+   * Inbound taken sequence flow sequences
+   * @type {Set<import('#types').ElementMessageContent}
+   */
   this.inbound = new Set();
 
-  this.isConverging = true;
   this[K_EXECUTE_MESSAGE] = undefined;
 }
 
 Object.defineProperty(ParallelGatewayBehaviour.prototype, 'executionId', {
+  /** @returns {string | undefined} */
   get() {
     return this[K_EXECUTE_MESSAGE]?.content.executionId;
   },
@@ -112,6 +116,11 @@ ParallelGatewayBehaviour.prototype.execute = function execute(executeMessage) {
   }
 };
 
+/**
+ * Setup peer monitor
+ * @param {import('#types').ElementBrokerMessage} executeMessage
+ * @returns {void}
+ */
 ParallelGatewayBehaviour.prototype.setup = function setup(executeMessage) {
   const peerIds = new Set([...this.activity[K_PEERS].values()].map((v) => [...v]).flat());
   this[K_TARGETS] = new Map([...peerIds].map((pid) => [pid, this.activity.getActivityById(pid)]));
@@ -152,9 +161,7 @@ ParallelGatewayBehaviour.prototype.setup = function setup(executeMessage) {
     { consumerTag: '_converging-inbound', exclusive: true, prefetch: 10000 }
   );
 
-  if (this.isConverging) {
-    this.broker.publish('event', 'activity.converge', cloneContent(executeContent));
-  }
+  this.broker.publish('event', 'activity.converge', cloneContent(executeContent));
 
   return this.broker.publish(
     'execution',
@@ -197,17 +204,18 @@ ParallelGatewayBehaviour.prototype._stop = function stop() {
   this.peerMonitor.stop();
 };
 
+/**
+ * Peer monitor
+ * @param {import('#types').Activity} activity parallel gateway activity
+ * @param {Map<string, import('#types').Activity} targets parallel gateway peer target activities
+ */
 function PeerMonitor(activity, targets) {
   this.activity = activity;
   this.id = activity.id;
   this.broker = activity.broker;
-  this.running = 0;
-  this.index = 0;
-  this.discarded = 0;
   this.running = new Map();
   this.watching = new Map();
   this.targets = targets;
-  this.touched = new Set();
   this.inbound = [];
 }
 
@@ -217,6 +225,11 @@ Object.defineProperty(PeerMonitor.prototype, 'isRunning', {
   },
 });
 
+/**
+ * Execute peer monitor
+ * @param {import('#types').ElementBrokerMessage} executeMessage
+ * @returns {number} number of running peers
+ */
 PeerMonitor.prototype.execute = function execute(executeMessage) {
   const message = cloneMessage(executeMessage);
   const inbound = message.content.inbound.pop();
@@ -231,8 +244,6 @@ PeerMonitor.prototype.execute = function execute(executeMessage) {
     preventComplete: true,
   });
 
-  this.touched.add(inbound.sourceId);
-
   for (const target of this.targets.values()) {
     this.monitor(target);
   }
@@ -240,6 +251,10 @@ PeerMonitor.prototype.execute = function execute(executeMessage) {
   return this.running.size;
 };
 
+/**
+ * Monitor peer activity
+ * @param {import('#types').Activity} peerActivity
+ */
 PeerMonitor.prototype.monitor = function monitor(peerActivity) {
   if (this.watching.has(peerActivity.id)) return;
 

package/src/process/Process.js

@@ -2,6 +2,7 @@ import { ProcessExecution } from './ProcessExecution.js';
 import { getUniqueId } from '../shared.js';
 import { ProcessApi } from '../Api.js';
 import { ProcessBroker } from '../EventBroker.js';
+import { Formatter } from '../MessageFormatter.js';
 import { cloneMessage, cloneContent, cloneParent } from '../messageHelper.js';
 import { makeErrorFromMessage } from '../error/Errors.js';
 import {
@@ -17,6 +18,7 @@ import {
 } from '../constants.js';
 
 const K_LANES = Symbol.for('lanes');
+const K_FORMATTER = Symbol.for('formatter');
 
 /**
  * Owns one `<bpmn:process>`. Wraps the structural definition and orchestrates flow traversal,
@@ -47,11 +49,12 @@ export function Process(processDef, context) {
   this[K_STATUS] = undefined;
   this[K_STOPPED] = false;
 
-  const { broker, on, once, waitFor } = ProcessBroker(this);
+  const { broker, on, once, waitFor, emitFatal } = ProcessBroker(this);
   this.broker = broker;
   this.on = on;
   this.once = once;
   this.waitFor = waitFor;
+  this.emitFatal = emitFatal;
 
   this[K_MESSAGE_HANDLERS] = {
     onApiMessage: this._onApiMessage.bind(this),
@@ -83,6 +86,14 @@ Object.defineProperties(Process.prototype, {
       return this[K_EXTENSIONS];
     },
   },
+  formatter: {
+    get() {
+      let formatter = this[K_FORMATTER];
+      if (formatter) return formatter;
+      formatter = this[K_FORMATTER] = new Formatter(this);
+      return formatter;
+    },
+  },
   stopped: {
     get() {
       return this[K_STOPPED];
@@ -278,13 +289,28 @@ Process.prototype._deactivateRunConsumers = function deactivateRunConsumers() {
 };
 
 /** @internal */
-Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
-  const { content, fields } = message;
-
+Process.prototype._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
   if (routingKey === 'run.resume') {
     return this._onResumeMessage(message);
   }
 
+  const preStatus = this[K_STATUS];
+  this[K_STATUS] = 'formatting';
+
+  return this.formatter.format(message, (err, formattedContent, formatted) => {
+    this[K_STATUS] = preStatus;
+    if (err) {
+      return this.emitFatal(err, message.content);
+    }
+    if (formatted) message.content = formattedContent;
+    this._continueRunMessage(routingKey, message, messageProperties);
+  });
+};
+
+/** @internal */
+Process.prototype._continueRunMessage = function continueRunMessage(routingKey, message) {
+  const { content, fields } = message;
+
   this[K_STATE_MESSAGE] = message;
 
   switch (routingKey) {
@@ -295,6 +321,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
       if (fields.redelivered) break;
 
       this[K_EXECUTION].delete('execution');
+      if (this.extensions) this.extensions.activate(cloneMessage(message));
       this._publishEvent('enter', content);
 
       break;
@@ -308,6 +335,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
     case 'run.execute': {
       const exec = this[K_EXECUTION];
       this[K_STATUS] = 'executing';
+      if (fields.redelivered && this.extensions) this.extensions.activate(cloneMessage(message));
       const executeMessage = cloneMessage(message);
       let execution = exec.get('execution');
       if (fields.redelivered && !execution) {
@@ -360,6 +388,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
     }
     case 'run.leave': {
       this[K_STATUS] = undefined;
+      if (this.extensions) this.extensions.deactivate(cloneMessage(message));
       message.ack();
       this._deactivateRunConsumers();
       const { output, ...rest } = content;
@@ -389,6 +418,8 @@ Process.prototype._onResumeMessage = function onResumeMessage(message) {
 
   if (!stateMessage.fields.redelivered) return;
 
+  if (this.extensions) this.extensions.activate(cloneMessage(stateMessage));
+
   this._debug(`resume from ${this.status}`);
 
   return this.broker.publish('run', stateMessage.fields.routingKey, cloneContent(stateMessage.content), stateMessage.properties);
@@ -518,6 +549,7 @@ Process.prototype._onApiMessage = function onApiMessage(routingKey, message) {
 Process.prototype._onStop = function onStop() {
   this[K_STOPPED] = true;
   this._deactivateRunConsumers();
+  if (this.extensions) this.extensions.deactivate(cloneMessage(this[K_STATE_MESSAGE]));
   return this._publishEvent('stop');
 };
 

package/src/process/ProcessExecution.js

@@ -400,7 +400,7 @@ ProcessExecution.prototype._start = function start() {
 
   for (const a of startActivities) a.init();
   this[K_STATUS] = 'executing';
-  for (const a of startActivities) a.run();
+  for (const a of startActivities) a.consumeInbound();
 
   if (!startActivities.size) {
     for (const a of this[K_ELEMENTS].triggeredByEvent) {
@@ -571,7 +571,7 @@ ProcessExecution.prototype._shakeElements = function shakeElements(fromId) {
       if (content.parent.id !== this.id) return;
 
       switch (routingKey) {
-        case 'activity.shake.join': {
+        case 'activity.shake.converge': {
           const join = convergingGateways.get(content.join);
           if (!join) {
             convergingGateways.set(content.join, content);

package/types/index.d.ts

@@ -261,6 +261,8 @@ declare module 'bpmn-elements' {
   export enum ProcessStatusValue {
 	/** ProcessExecution constructed, not yet started */
 	Init = 'init',
+	/** Formatting next run message */
+	Formatting = 'formatting',
 	/** Process run entered */
 	Entered = 'entered',
 	/** Process run started */
@@ -580,6 +582,11 @@ declare module 'bpmn-elements' {
 		 * Subscribe to inbound flows and start consuming the inbound queue.
 		 * */
 		activate(): void;
+		/**
+		 * Assert the inbound queue consumer when the activity has a trigger or is initialized.
+		 * Idempotent: asserting the consumer again while one is active is a no-op.
+		 * */
+		consumeInbound(): void;
 		/**
 		 * Cancel inbound subscriptions and any pending run/format consumers.
 		 */
@@ -587,8 +594,9 @@ declare module 'bpmn-elements' {
 		/**
 		 * Initialise activity executionId and emit init event without starting the run.
 		 * @param initContent Optional content merged into the init message
+		 * @param properties Optional message properties merged into the init message properties
 		 */
-		init(initContent?: Record<string, any>): void;
+		init(initContent?: Record<string, any>, properties?: import("smqp").MessageProperties): void;
 		/**
 		 * Start running the activity by publishing run.enter and run.start.
 		 * @param runContent Optional content merged into the run message
@@ -1452,6 +1460,7 @@ declare module 'bpmn-elements' {
 			[x: string]: any;
 		}) => import("smqp").Consumer;
 		waitFor: (eventName: string, onMessage?: ((routingKey: string, message: ElementBrokerMessage, owner: Process) => boolean) | undefined) => Promise<IApi<Process>>;
+		emitFatal: (error: Error, content?: Record<string, any>) => void;
 		logger: ILogger;
 		/**
 		 * Allocate an executionId and emit init event without starting the run.
@@ -1950,7 +1959,7 @@ declare module 'bpmn-elements' {
 		environment: Environment;
 		broker: ElementBroker<Activity>;
 		get executionId(): string | undefined;
-		get cancelActivity(): any;
+		get cancelActivity(): boolean;
 		
 		execute(executeMessage: ElementBrokerMessage): void;
 	}
@@ -2106,29 +2115,48 @@ declare module 'bpmn-elements' {
 		type: string;
 		activity: Activity;
 		broker: ElementBroker<Activity>;
-		inbound: Set<any>;
-		isConverging: boolean;
-		get executionId(): any;
+		/**
+		 * Inbound taken sequence flow sequences
+		 * */
+		inbound: Set<ElementMessageContent>;
+		get executionId(): string | undefined;
 		
 		execute(executeMessage: ElementBrokerMessage): void;
-		setup(executeMessage: any): number | undefined;
+		/**
+		 * Setup peer monitor
+		 * */
+		setup(executeMessage: ElementBrokerMessage): void;
 		peerMonitor: PeerMonitor | undefined;
 	}
+	/**
+	 * Peer monitor
+	 * @param activity parallel gateway activity
+	 * @param targets parallel gateway peer target activities
+	 */
 		class PeerMonitor {
-		constructor(activity: any, targets: any);
-		activity: any;
-		id: any;
-		broker: any;
+		/**
+		 * Peer monitor
+		 * @param activity parallel gateway activity
+		 * @param targets parallel gateway peer target activities
+		 */
+		constructor(activity: Activity, targets: Map<string, Activity>);
+		activity: Activity;
+		id: string | undefined;
+		broker: ElementBroker<Activity>;
 		running: Map<any, any>;
-		index: number;
-		discarded: number;
 		watching: Map<any, any>;
-		targets: any;
-		touched: Set<any>;
+		targets: Map<string, Activity>;
 		inbound: any[];
 		get isRunning(): boolean;
-		execute(executeMessage: any): number;
-		monitor(peerActivity: any): void;
+		/**
+		 * Execute peer monitor
+		 * @returns number of running peers
+		 */
+		execute(executeMessage: ElementBrokerMessage): number;
+		/**
+		 * Monitor peer activity
+		 * */
+		monitor(peerActivity: Activity): void;
 		stop(): void;
 	}
 	/**

package/types/interfaces.d.ts

@@ -359,6 +359,8 @@ export type DefinitionStatus = DefinitionStatusValue | `${DefinitionStatusValue}
 export const enum ProcessStatusValue {
   /** ProcessExecution constructed, not yet started */
   Init = 'init',
+  /** Formatting next run message */
+  Formatting = 'formatting',
   /** Process run entered */
   Entered = 'entered',
   /** Process run started */