bpmn-elements 16.2.0 → 16.2.2

package/src/process/ProcessExecution.js

@@ -34,8 +34,8 @@ function ProcessExecution(parentActivity, context) {
     associations: context.getAssociations(id),
     flows: context.getSequenceFlows(id),
     outboundMessageFlows: context.getMessageFlows(id),
-    startActivities: [],
-    triggeredByEvent: [],
+    startActivities: new Set(),
+    triggeredByEvent: new Set(),
     detachedActivities: new Set(),
     startSequences: {},
   };
@@ -126,7 +126,7 @@ ProcessExecution.prototype.resume = function resume() {
 
   const { startActivities, detachedActivities, postponed } = this[kElements];
 
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
 
@@ -185,7 +185,7 @@ ProcessExecution.prototype.getState = function getState() {
     }, []),
     ...(flows.length && { flows: flowStates }),
     ...(outboundMessageFlows.length && {
-      messageFlows: outboundMessageFlows.length && outboundMessageFlows.map((f) => f.getState()).filter(Boolean),
+      messageFlows: outboundMessageFlows.map((f) => f.getState()).filter(Boolean),
     }),
     ...(associations.length && { associations: associations.map((f) => f.getState()).filter(Boolean) }),
   };
@@ -370,7 +370,7 @@ ProcessExecution.prototype._start = function start() {
   this.broker.publish(this._exchangeName, 'execute.start', cloneContent(executeContent));
 
   const { startActivities, postponed, detachedActivities } = this[kElements];
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
 
@@ -430,8 +430,8 @@ ProcessExecution.prototype._activate = function activate() {
     });
   }
 
-  startActivities.splice(0);
-  triggeredByEvent.splice(0);
+  startActivities.clear();
+  triggeredByEvent.clear();
 
   for (const activity of children) {
     if (activity.placeholder) continue;
@@ -441,8 +441,8 @@ ProcessExecution.prototype._activate = function activate() {
       consumerTag: '_process-activity-consumer',
       priority: 200,
     });
-    if (activity.isStart) startActivities.push(activity);
-    if (activity.triggeredByEvent) triggeredByEvent.push(activity);
+    if (activity.isStart) startActivities.add(activity);
+    if (activity.triggeredByEvent) triggeredByEvent.add(activity);
   }
 
   this[kActivated] = true;
@@ -483,14 +483,14 @@ ProcessExecution.prototype._onDelegateEvent = function onDelegateEvent(message)
   let delegate = true;
 
   const content = message.content;
-  if (content.message && content.message.id) {
+  if (content.message?.id) {
     this._debug(`delegate ${eventType} event with id <${content.message.id}>`);
   } else {
     this._debug(`delegate ${eventType} anonymous event`);
   }
 
   for (const activity of this[kElements].triggeredByEvent) {
-    if (activity.getStartActivities({ referenceId: content.message && content.message.id, referenceType: eventType }).length) {
+    if (activity.getStartActivities({ referenceId: content.message?.id, referenceType: eventType }).length) {
       delegate = false;
       activity.run(content.message);
     }
@@ -607,7 +607,7 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
     case 'activity.error': {
       let eventCaughtBy;
       for (const msg of this[kElements].postponed) {
-        if (msg.fields.routingKey === 'activity.catch' && msg.content.source && msg.content.source.executionId === content.executionId) {
+        if (msg.fields.routingKey === 'activity.catch' && msg.content.source?.executionId === content.executionId) {
           eventCaughtBy = msg;
           break;
         }
@@ -693,7 +693,7 @@ ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message
     );
   }
 
-  if (isEnd && startActivities.length) {
+  if (isEnd && startActivities.size) {
     const startSequences = this[kElements].startSequences;
     for (const msg of postponed) {
       const postponedId = msg.content.id;

package/src/tasks/CallActivity.js

@@ -8,7 +8,6 @@ export default function CallActivity(activityDef, context) {
 
 export function CallActivityBehaviour(activity) {
   const { id, type, behaviour = {} } = activity;
-
   this.id = id;
   this.type = type;
   this.calledElement = behaviour.calledElement;
@@ -60,7 +59,11 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
   );
   broker.subscribeTmp('api', '#.signal.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
     noAck: true,
-    consumerTag: `_api-delegated-${executionId}`,
+    consumerTag: `_api-delegated-signal-${executionId}`,
+  });
+  broker.subscribeTmp('api', '#.cancel.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
+    noAck: true,
+    consumerTag: `_api-delegated-cancel-${executionId}`,
   });
 
   broker.publish(
@@ -176,5 +179,6 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
 CallActivityBehaviour.prototype._stop = function stop(executionId) {
   const broker = this.broker;
   broker.cancel(`_api-${executionId}`);
-  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-delegated-signal-${executionId}`);
+  broker.cancel(`_api-delegated-cancel-${executionId}`);
 };

package/src/tasks/ServiceTask.js

@@ -73,7 +73,7 @@ ServiceTaskBehaviour.prototype._onApiMessage = function onApiMessage(executeMess
       const executionId = executeMessage.content.executionId;
       broker.cancel(`_api-${executionId}`);
       const service = this.service;
-      if (service && service.stop) service.stop(message);
+      if (service?.stop) service.stop(message);
       return this.activity.logger.debug(`<${executionId} (${this.id})> stopped`);
     }
   }