bpmn-elements 14.1.0 → 15.0.1

package/src/activity/Activity.js

@@ -71,7 +71,7 @@ function Activity(Behaviour, activityDef, context) {
   const flows = (this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
-    inboundJoinFlows: [],
+    inboundJoinFlows: new Set(),
     inboundTriggers,
     outboundSequenceFlows,
     outboundEvaluator: new OutboundEvaluator(this, outboundSequenceFlows),
@@ -90,7 +90,7 @@ function Activity(Behaviour, activityDef, context) {
     isThrowing: activityDef.isThrowing,
     lane: activityDef.lane && activityDef.lane.id,
   };
-  this[kExec] = {};
+  this[kExec] = new Map();
 
   this[kMessageHandlers] = {
     onInbound: isParallelJoin ? this._onJoinInbound.bind(this) : this._onInbound.bind(this),
@@ -113,12 +113,12 @@ Object.defineProperties(Activity.prototype, {
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     },
   },
   executionId: {
     get() {
-      return this[kExec].executionId;
+      return this[kExec].get('executionId');
     },
   },
   extensions: {
@@ -250,7 +250,8 @@ Activity.prototype.deactivate = function deactivate() {
 Activity.prototype.init = function init(initContent) {
   const id = this.id;
   const exec = this[kExec];
-  const executionId = (exec.initExecutionId = exec.initExecutionId || getUniqueId(id));
+  const executionId = exec.has('initExecutionId') ? exec.get('initExecutionId') : getUniqueId(id);
+  exec.set('initExecutionId', executionId);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({ ...initContent, executionId }));
 };
@@ -260,8 +261,9 @@ Activity.prototype.run = function run(runContent) {
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
 
   const exec = this[kExec];
-  const executionId = (exec.executionId = exec.initExecutionId || getUniqueId(id));
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || getUniqueId(id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
 
   this._consumeApi();
 
@@ -278,6 +280,8 @@ Activity.prototype.run = function run(runContent) {
 Activity.prototype.getState = function getState() {
   const status = this.status;
   const exec = this[kExec];
+  const execution = exec.get('execution');
+  const executionId = exec.get('executionId');
   const brokerState = this.broker.getState(true);
   if (!brokerState && this.environment.settings.disableTrackState) return;
 
@@ -285,11 +289,11 @@ Activity.prototype.getState = function getState() {
     id: this.id,
     type: this.type,
     ...(status && { status }),
-    executionId: exec.executionId,
+    executionId,
     stopped: this.stopped,
     counters: this.counters,
     broker: brokerState,
-    execution: exec.execution && exec.execution.getState(),
+    ...(execution && { execution: execution.getState() }),
   };
 };
 
@@ -300,12 +304,12 @@ Activity.prototype.recover = function recover(state) {
   this.stopped = state.stopped;
   this.status = state.status;
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
 
   this[kCounters] = { ...this[kCounters], ...state.counters };
 
   if (state.execution) {
-    exec.execution = new ActivityExecution(this, this.context).recover(state.execution);
+    exec.set('execution', new ActivityExecution(this, this.context).recover(state.execution));
   }
 
   this.broker.recover(state.broker);
@@ -332,7 +336,7 @@ Activity.prototype.resume = function resume() {
 
 Activity.prototype.discard = function discard(discardContent) {
   if (!this.status) return this._runDiscard(discardContent);
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return execution.discard();
 
   this._deactivateRunConsumers();
@@ -347,11 +351,13 @@ Activity.prototype.addInboundListeners = function addInboundListeners() {
   const onInboundEvent = this._onInboundEvent.bind(this);
   const triggerConsumerTag = `_inbound-${this.id}`;
   for (const trigger of this[kFlows].inboundTriggers) {
-    if (trigger.isSequenceFlow)
+    if (trigger.isSequenceFlow) {
       trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
-    else if (this.isForCompensation)
+    } else if (this.isForCompensation) {
       trigger.broker.subscribeTmp('event', 'association.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
-    else trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
+    } else {
+      trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
+    }
   }
 };
 
@@ -387,7 +393,7 @@ Activity.prototype.evaluateOutbound = function evaluateOutbound(fromMessage, dis
 };
 
 Activity.prototype.getApi = function getApi(message) {
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return execution.getApi(message);
   return ActivityApi(this.broker, message || this[kStateMessage]);
 };
@@ -398,8 +404,9 @@ Activity.prototype.getActivityById = function getActivityById(elementId) {
 
 Activity.prototype._runDiscard = function runDiscard(discardContent) {
   const exec = this[kExec];
-  const executionId = (exec.executionId = exec.initExecutionId || getUniqueId(this.id));
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || getUniqueId(this.id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
 
   this._consumeApi();
 
@@ -414,7 +421,7 @@ Activity.prototype._discardRun = function discardRun() {
   const status = this.status;
   if (!status) return;
 
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return;
 
   switch (status) {
@@ -495,42 +502,50 @@ Activity.prototype._onInbound = function onInbound(routingKey, message) {
 
 Activity.prototype._onJoinInbound = function onJoinInbound(routingKey, message) {
   const { content } = message;
-  const { inboundSequenceFlows, inboundJoinFlows, inboundTriggers } = this[kFlows];
-  const idx = inboundJoinFlows.findIndex((msg) => msg.content.id === content.id);
+  const { inboundJoinFlows, inboundTriggers } = this[kFlows];
+  let alreadyTouched = false;
+
+  const touched = new Set();
+
+  let taken;
+  for (const msg of inboundJoinFlows) {
+    const flowId = msg.content.id;
+    touched.add(flowId);
+    if (flowId === content.id) {
+      alreadyTouched = true;
+    }
+  }
 
-  inboundJoinFlows.push(message);
+  inboundJoinFlows.add(message);
 
-  if (idx > -1) return;
+  if (alreadyTouched) return;
 
-  const allTouched = inboundJoinFlows.length >= inboundTriggers.length;
-  if (!allTouched) {
-    const remaining = inboundSequenceFlows.filter((inb, i, list) => list.indexOf(inb) === i).length - inboundJoinFlows.length;
+  const remaining = inboundTriggers.length - touched.size - 1;
+  if (remaining) {
     return this.logger.debug(`<${this.id}> inbound ${message.content.action} from <${message.content.id}>, ${remaining} remaining`);
   }
 
-  const evaluatedInbound = inboundJoinFlows.splice(0);
-
-  let taken;
-  const inbound = evaluatedInbound.map((im) => {
+  const inbound = [];
+  for (const im of inboundJoinFlows) {
     if (im.fields.routingKey === 'flow.take') taken = true;
     im.ack();
-    return cloneContent(im.content);
-  });
+    inbound.push(cloneContent(im.content));
+  }
 
-  let discardSequence;
+  const discardSequence = new Set();
   if (!taken) {
-    discardSequence = [];
-    for (const im of evaluatedInbound) {
+    for (const im of inboundJoinFlows) {
       if (!im.content.discardSequence) continue;
       for (const sourceId of im.content.discardSequence) {
-        if (discardSequence.indexOf(sourceId) === -1) discardSequence.push(sourceId);
+        discardSequence.add(sourceId);
       }
     }
   }
 
+  inboundJoinFlows.clear();
   this.broker.cancel('_run-on-inbound');
 
-  if (!taken) return this._runDiscard({ inbound, discardSequence });
+  if (!taken) return this._runDiscard({ inbound, discardSequence: [...discardSequence] });
   return this.run({ inbound });
 };
 
@@ -604,7 +619,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
 
       this.status = 'entered';
       if (!isRedelivered) {
-        this[kExec].execution = null;
+        this[kExec].delete('execution');
         if (this.extensions) this.extensions.activate(cloneMessage(message));
         this._publishEvent('enter', content, { correlationId });
       }
@@ -614,7 +629,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
       this.logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
 
       this.status = 'discard';
-      this[kExec].execution = null;
+      this[kExec].delete('execution');
 
       if (this.extensions) this.extensions.activate(cloneMessage(message));
 
@@ -647,11 +662,11 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
 
       const exec = this[kExec];
       if (isRedelivered && this.extensions) this.extensions.activate(cloneMessage(message));
-      if (!exec.execution) exec.execution = new ActivityExecution(this, this.context);
+      if (!exec.has('execution')) exec.set('execution', new ActivityExecution(this, this.context));
       this.broker
         .getQueue('execution-q')
         .assertConsumer(this[kMessageHandlers].onExecutionMessage, { exclusive: true, consumerTag: '_activity-execution' });
-      return exec.execution.execute(message);
+      return exec.get('execution').execute(message);
     }
     case 'run.end': {
       this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
@@ -902,7 +917,7 @@ Activity.prototype._onStop = function onStop(message) {
 };
 
 Activity.prototype._consumeApi = function consumeApi() {
-  const executionId = this[kExec].executionId;
+  const executionId = this[kExec].get('executionId');
   if (!executionId) return;
   const broker = this.broker;
   broker.cancel('_activity-api');

package/src/activity/ActivityExecution.js

@@ -14,7 +14,7 @@ function ActivityExecution(activity, context) {
   this.context = context;
   this.id = activity.id;
   this.broker = activity.broker;
-  this[kPostponed] = [];
+  this[kPostponed] = new Set();
   this[kCompleted] = false;
   this[kExecuteQ] = this.broker.assertQueue('execute-q', { durable: true, autoDelete: false });
 
@@ -43,7 +43,7 @@ ActivityExecution.prototype.execute = function execute(executeMessage) {
   }));
 
   if (executeMessage.fields.redelivered) {
-    this[kPostponed].splice(0);
+    this[kPostponed].clear();
     this._debug('resume execution');
 
     if (!this.source) this.source = new this.activity.Behaviour(this.activity, this.context);
@@ -108,11 +108,12 @@ ActivityExecution.prototype.getApi = function getApi(apiMessage) {
   const api = ActivityApi(self.broker, apiMessage);
 
   api.getExecuting = function getExecuting() {
-    return self[kPostponed].reduce((result, msg) => {
-      if (msg.content.executionId === apiMessage.content.executionId) return result;
+    const result = [];
+    for (const msg of self[kPostponed]) {
+      if (msg.content.executionId === apiMessage.content.executionId) continue;
       result.push(self.getApi(msg));
-      return result;
-    }, []);
+    }
+    return result;
   };
 
   return api;
@@ -124,7 +125,10 @@ ActivityExecution.prototype.passthrough = function passthrough(executeMessage) {
 };
 
 ActivityExecution.prototype.getPostponed = function getPostponed() {
-  let apis = this[kPostponed].map((msg) => this.getApi(msg));
+  let apis = [];
+  for (const msg of this[kPostponed]) {
+    apis.push(this.getApi(msg));
+  }
   if (!this.activity.isSubProcess || !this.source) return apis;
   apis = apis.concat(this.source.getPostponed());
   return apis;
@@ -139,7 +143,7 @@ ActivityExecution.prototype.getState = function getState() {
 };
 
 ActivityExecution.prototype.recover = function recover(state) {
-  this[kPostponed].splice(0);
+  this[kPostponed].clear();
 
   if (!state) return this;
   if ('completed' in state) this[kCompleted] = state.completed;
@@ -174,7 +178,7 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
 
   switch (routingKey) {
     case 'execute.resume.execution': {
-      if (!this[kPostponed].length) return this.broker.publish('execution', 'execute.start', cloneContent(this[kExecuteMessage].content));
+      if (!this[kPostponed].size) return this.broker.publish('execution', 'execute.start', cloneContent(this[kExecuteMessage].content));
       break;
     }
     case 'execute.cancel':
@@ -215,22 +219,27 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
 ActivityExecution.prototype._onStateChangeMessage = function onStateChangeMessage(message) {
   const { ignoreIfExecuting, executionId } = message.content;
   const postponed = this[kPostponed];
-  const idx = postponed.findIndex((msg) => msg.content.executionId === executionId);
+
   let previousMsg;
-  if (idx > -1) {
+  for (const msg of postponed) {
+    if (msg.content.executionId === executionId) previousMsg = msg;
+  }
+
+  if (previousMsg) {
     if (ignoreIfExecuting) {
       message.ack();
       return false;
     }
 
-    previousMsg = postponed.splice(idx, 1, message)[0];
+    postponed.delete(previousMsg);
+    postponed.add(message);
     previousMsg.ack();
 
+    return true;
+  } else {
+    postponed.add(message);
     return true;
   }
-
-  postponed.push(message);
-  return true;
 };
 
 ActivityExecution.prototype._onExecutionCompleted = function onExecutionCompleted(message) {
@@ -242,8 +251,11 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   if (!isRootScope) {
     this._debug('completed sub execution');
     if (!keep) message.ack();
-    if (postponed.length === 1 && postponed[0].content.isRootScope && !postponed[0].content.preventComplete) {
-      return this.broker.publish('execution', 'execute.completed', cloneContent(postponed[0].content));
+    if (postponed.size === 1) {
+      const onlyMessage = postponed.values().next().value;
+      if (onlyMessage.content.isRootScope && !onlyMessage.content.preventComplete) {
+        return this.broker.publish('execution', 'execute.completed', cloneContent(onlyMessage.content));
+      }
     }
     return;
   }
@@ -256,7 +268,7 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   this.deactivate();
 
   const subApis = this.getPostponed();
-  postponed.splice(0);
+  postponed.clear();
   for (const api of subApis) api.discard();
 
   this._publishExecutionCompleted('completed', { ...postponedMsg.content, ...message.content }, message.properties.correlationId);
@@ -271,8 +283,11 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   const correlationId = message.properties.correlationId;
   if (!error && !isRootScope) {
     message.ack();
-    if (postponed.length === 1 && postponed[0].content.isRootScope) {
-      return this.broker.publish('execution', 'execute.discard', postponed[0].content, { correlationId });
+    if (postponed.size === 1) {
+      const onlyMessage = postponed.values().next().value;
+      if (onlyMessage.content.isRootScope) {
+        return this.broker.publish('execution', 'execute.discard', onlyMessage.content, { correlationId });
+      }
     }
     return;
   }
@@ -282,7 +297,7 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   this.deactivate();
 
   const subApis = this.getPostponed();
-  postponed.splice(0);
+  postponed.clear();
   for (const api of subApis) api.discard();
 
   this._publishExecutionCompleted(discardType, cloneContent(message.content), correlationId);
@@ -310,11 +325,13 @@ ActivityExecution.prototype._ackPostponed = function ackPostponed(completeMessag
   const { executionId: eid } = completeMessage.content;
 
   const postponed = this[kPostponed];
-  const idx = postponed.findIndex(({ content: c }) => c.executionId === eid);
-  if (idx === -1) return;
-  const [msg] = postponed.splice(idx, 1);
-  msg.ack();
-  return msg;
+  for (const msg of postponed) {
+    if (msg.content.executionId === eid) {
+      postponed.delete(msg);
+      msg.ack();
+      return msg;
+    }
+  }
 };
 
 ActivityExecution.prototype._onParentApiMessage = function onParentApiMessage(routingKey, message) {

package/src/definition/Definition.js

@@ -41,7 +41,7 @@ export function Definition(context, options) {
   };
 
   this[kStopped] = false;
-  this[kExec] = {};
+  this[kExec] = new Map();
 
   const onBrokerReturn = this._onBrokerReturnFn.bind(this);
   this[kMessageHandlers] = {
@@ -71,12 +71,12 @@ Object.defineProperties(Definition.prototype, {
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     },
   },
   executionId: {
     get() {
-      return this[kExec].executionId;
+      return this[kExec].get('executionId');
     },
   },
   isRunning: {
@@ -97,7 +97,8 @@ Object.defineProperties(Definition.prototype, {
   },
   activityStatus: {
     get() {
-      return (this[kExec].execution && this[kExec].execution.activityStatus) || 'idle';
+      const execution = this[kExec].get('execution');
+      return (execution && execution.activityStatus) || 'idle';
     },
   },
 });
@@ -115,7 +116,8 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   }
 
   const exec = this[kExec];
-  exec.executionId = getUniqueId(this.id);
+  const executionId = getUniqueId(this.id);
+  exec.set('executionId', executionId);
   const content = this._createMessage({ ...runOptions });
 
   const broker = this.broker;
@@ -123,7 +125,7 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   broker.publish('run', 'run.start', cloneContent(content));
   broker.publish('run', 'run.execute', cloneContent(content));
 
-  this.logger.debug(`<${this.executionId} (${this.id})> run`);
+  this.logger.debug(`<${executionId} (${this.id})> run`);
 
   this._activateRunConsumers();
 
@@ -171,7 +173,7 @@ Definition.prototype.recover = function recover(state) {
   this[kStatus] = state.status;
 
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   if (state.counters) {
     this[kCounters] = { ...this[kCounters], ...state.counters };
   }
@@ -179,7 +181,7 @@ Definition.prototype.recover = function recover(state) {
   this.environment.recover(state.environment);
 
   if (state.execution) {
-    exec.execution = new DefinitionExecution(this, this.context).recover(state.execution);
+    exec.set('execution', new DefinitionExecution(this, this.context).recover(state.execution));
   }
 
   this.broker.recover(state.broker);
@@ -350,7 +352,7 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
       this[kStatus] = 'entered';
       if (fields.redelivered) break;
 
-      exec.execution = undefined;
+      exec.delete('execution');
       this._publishEvent('enter', content);
       break;
     }
@@ -363,7 +365,8 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
     case 'run.execute': {
       this[kStatus] = 'executing';
       const executeMessage = cloneMessage(message);
-      if (fields.redelivered && !exec.execution) {
+      let execution = exec.get('execution');
+      if (fields.redelivered && !execution) {
         executeMessage.fields.redelivered = undefined;
       }
       this[kExecuteMessage] = message;
@@ -372,13 +375,16 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
         consumerTag: '_definition-execution',
       });
 
-      exec.execution = exec.execution || new DefinitionExecution(this, this.context);
+      if (!execution) {
+        execution = new DefinitionExecution(this, this.context);
+        exec.set('execution', execution);
+      }
 
       if (executeMessage.fields.redelivered) {
         this._publishEvent('resume', content);
       }
 
-      return exec.execution.execute(executeMessage);
+      return execution.execute(executeMessage);
     }
     case 'run.end': {
       if (this[kStatus] === 'end') break;
@@ -502,7 +508,7 @@ Definition.prototype._onBrokerReturnFn = function onBrokerReturn(message) {
 };
 
 Definition.prototype._reset = function reset() {
-  this[kExec].executionId = undefined;
+  this[kExec].delete('executionId');
   this._deactivateRunConsumers();
   this.broker.purgeQueue('run-q');
   this.broker.purgeQueue('execution-q');