bpmn-elements 8.2.2 → 8.2.4

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+# 8.2.3
+
+- fix resumed boundary event initialized twice even if it's completed
+- fix process lingering completed activities after resume
+
 # 8.2.2
 
 - mitigate possible stack overflow error by not acking message before publishing a new one. Fix after fix #31

package/dist/src/EventBroker.js

@@ -15,7 +15,13 @@ function ActivityBroker(activity) {
   return executionBroker;
 }
 function ProcessBroker(owner) {
-  return ExecutionBroker(owner, 'process');
+  const executionBroker = ExecutionBroker(owner, 'process');
+  executionBroker.broker.assertQueue('api-q', {
+    durable: false,
+    autoDelete: false
+  });
+  executionBroker.broker.bindQueue('api-q', 'api', '#');
+  return executionBroker;
 }
 function DefinitionBroker(owner, onBrokerReturn) {
   return ExecutionBroker(owner, 'definition', onBrokerReturn);

package/dist/src/activity/Activity.js

@@ -497,13 +497,16 @@ proto._onJoinInbound = function onJoinInbound(routingKey, message) {
     im.ack();
     return (0, _messageHelper.cloneContent)(im.content);
   });
-  const discardSequence = !taken && evaluatedInbound.reduce((result, im) => {
-    if (!im.content.discardSequence) return result;
-    for (const sourceId of im.content.discardSequence) {
-      if (result.indexOf(sourceId) === -1) result.push(sourceId);
+  let discardSequence;
+  if (!taken) {
+    discardSequence = [];
+    for (const im of evaluatedInbound) {
+      if (!im.content.discardSequence) continue;
+      for (const sourceId of im.content.discardSequence) {
+        if (discardSequence.indexOf(sourceId) === -1) discardSequence.push(sourceId);
+      }
     }
-    return result;
-  }, []);
+  }
   this.broker.cancel('_run-on-inbound');
   if (!taken) return this._runDiscard({
     inbound,

package/dist/src/definition/DefinitionExecution.js

@@ -165,7 +165,7 @@ proto.recover = function recover(state) {
     } else {
       bp = this.getProcessById(bpid);
     }
-    if (!bp) return;
+    if (!bp) continue;
     ids.push(bpid);
     bp.recover(bpState);
     running.push(bp);

package/dist/src/eventDefinitions/EventDefinitionExecution.js

@@ -114,7 +114,8 @@ proto._complete = function complete(message) {
   this._debug(executionId, `event definition ${type} completed, index ${index}`);
   const completeContent = (0, _messageHelper.cloneContent)(message.content, {
     executionId: this[kExecuteMessage].content.executionId,
-    isRootScope: true
+    isRootScope: true,
+    isDefinitionScope: undefined
   });
   completeContent.parent = (0, _messageHelper.shiftParent)(parent);
   this.broker.publish('execution', this.completedRoutingKey, completeContent, {

package/dist/src/events/BoundaryEvent.js

@@ -49,9 +49,13 @@ proto.execute = function execute(executeMessage) {
     executionId
   } = executeMessage.content;
   const eventDefinitionExecution = this[kExecution];
-  if (isRootScope) {
+  if (isRootScope && executeMessage.content.id === this.id) {
     this[kExecuteMessage] = executeMessage;
     const broker = this.broker;
+    if (executeMessage.fields.routingKey === 'execute.bound.completed') {
+      this._stop();
+      return broker.publish('execution', 'execute.completed', executeMessage.content, executeMessage.properties);
+    }
     const consumerTag = `_bound-listener-${executionId}`;
     this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
       noAck: true,
@@ -99,6 +103,7 @@ proto._onCompleted = function onCompleted(_, {
   if (!this.cancelActivity && !content.cancelActivity) {
     this._stop();
     return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
+      isDefinitionScope: false,
       cancelActivity: false
     }));
   }

package/dist/src/process/ProcessExecution.js

@@ -130,23 +130,21 @@ proto.resume = function resume() {
     consumerTag: `_process-activity-${this.executionId}`
   });
   if (this[kCompleted]) return;
-  switch (this.status) {
-    case 'init':
-      return this._start();
-    case 'executing':
-      {
-        if (!postponed.length) return this._complete('completed');
-        break;
-      }
-  }
-  for (const {
-    content
-  } of postponed.slice()) {
-    const activity = this.getActivityById(content.id);
+  const status = this.status;
+  if (status === 'init') return this._start();
+  for (const msg of postponed.slice()) {
+    const activity = this.getActivityById(msg.content.id);
     if (!activity) continue;
-    if (content.placeholder) continue;
+    if (msg.content.placeholder) continue;
+    if (!activity.status) {
+      this._popPostponed(msg.content);
+      msg.ack();
+      continue;
+    }
     activity.resume();
   }
+  if (this[kCompleted]) return;
+  if (!postponed.length && status === 'executing') return this._complete('completed');
 };
 proto.recover = function recover(state) {
   if (!state) return this;
@@ -230,14 +228,14 @@ proto.stop = function stop() {
   this.getApi().stop();
 };
 proto.getPostponed = function getPostponed(filterFn) {
-  return this[kElements].postponed.slice().reduce((result, msg) => {
+  const result = [];
+  for (const msg of this[kElements].postponed.slice()) {
     const api = this._getChildApi(msg);
-    if (api) {
-      if (filterFn && !filterFn(api)) return result;
-      result.push(api);
-    }
-    return result;
-  }, []);
+    if (!api) continue;
+    if (filterFn && !filterFn(api)) continue;
+    result.push(api);
+  }
+  return result;
 };
 proto.discard = function discard() {
   this[kStatus] = 'discard';
@@ -339,11 +337,19 @@ proto._activate = function activate() {
     onMessageFlowEvent,
     onActivityEvent
   } = this[kMessageHandlers];
-  this.broker.subscribeTmp('api', '#', onApiMessage, {
-    noAck: true,
-    consumerTag: `_process-api-consumer-${this.executionId}`,
-    priority: 200
-  });
+  if (!this.isSubProcess) {
+    this.broker.consume('api-q', onApiMessage, {
+      noAck: true,
+      consumerTag: `_process-api-consumer-${this.executionId}`,
+      priority: 200
+    });
+  } else {
+    this.broker.subscribeTmp('api', '#', onApiMessage, {
+      noAck: true,
+      consumerTag: `_process-api-consumer-${this.executionId}`,
+      priority: 200
+    });
+  }
   const {
     outboundMessageFlows,
     flows,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "8.2.2",
+  "version": "8.2.4",
   "description": "Executable workflow elements based on BPMN 2.0",
   "main": "dist/index.js",
   "module": "index.js",
@@ -47,16 +47,16 @@
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
     "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.18.9",
     "bpmn-moddle": "^7.1.2",
     "camunda-bpmn-moddle": "^6.1.2",
     "chai": "^4.3.7",
-    "chronokinesis": "^3.0.0",
+    "chronokinesis": "^4.0.1",
     "debug": "^4.3.4",
-    "eslint": "^8.27.0",
-    "got": "^11.8.5",
+    "eslint": "^8.29.0",
+    "got": "^11.8.6",
     "mocha": "^10.1.0",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^2.1.0",

package/src/EventBroker.js

@@ -15,7 +15,10 @@ function ActivityBroker(activity) {
 }
 
 function ProcessBroker(owner) {
-  return ExecutionBroker(owner, 'process');
+  const executionBroker = ExecutionBroker(owner, 'process');
+  executionBroker.broker.assertQueue('api-q', {durable: false, autoDelete: false});
+  executionBroker.broker.bindQueue('api-q', 'api', '#');
+  return executionBroker;
 }
 
 function DefinitionBroker(owner, onBrokerReturn) {

package/src/activity/Activity.js

@@ -499,13 +499,16 @@ proto._onJoinInbound = function onJoinInbound(routingKey, message) {
     return cloneContent(im.content);
   });
 
-  const discardSequence = !taken && evaluatedInbound.reduce((result, im) => {
-    if (!im.content.discardSequence) return result;
-    for (const sourceId of im.content.discardSequence) {
-      if (result.indexOf(sourceId) === -1) result.push(sourceId);
+  let discardSequence;
+  if (!taken) {
+    discardSequence = [];
+    for (const im of evaluatedInbound) {
+      if (!im.content.discardSequence) continue;
+      for (const sourceId of im.content.discardSequence) {
+        if (discardSequence.indexOf(sourceId) === -1) discardSequence.push(sourceId);
+      }
     }
-    return result;
-  }, []);
+  }
 
   this.broker.cancel('_run-on-inbound');
 

package/src/definition/DefinitionExecution.js

@@ -179,7 +179,7 @@ proto.recover = function recover(state) {
     } else {
       bp = this.getProcessById(bpid);
     }
-    if (!bp) return;
+    if (!bp) continue;
 
     ids.push(bpid);
     bp.recover(bpState);

package/src/eventDefinitions/EventDefinitionExecution.js

@@ -120,6 +120,7 @@ proto._complete = function complete(message) {
   const completeContent = cloneContent(message.content, {
     executionId: this[kExecuteMessage].content.executionId,
     isRootScope: true,
+    isDefinitionScope: undefined,
   });
   completeContent.parent = shiftParent(parent);
 

package/src/events/BoundaryEvent.js

@@ -46,10 +46,15 @@ proto.execute = function execute(executeMessage) {
   const {isRootScope, executionId} = executeMessage.content;
 
   const eventDefinitionExecution = this[kExecution];
-  if (isRootScope) {
+  if (isRootScope && executeMessage.content.id === this.id) {
     this[kExecuteMessage] = executeMessage;
 
     const broker = this.broker;
+    if (executeMessage.fields.routingKey === 'execute.bound.completed') {
+      this._stop();
+      return broker.publish('execution', 'execute.completed', executeMessage.content, executeMessage.properties);
+    }
+
     const consumerTag = `_bound-listener-${executionId}`;
     this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
       noAck: true,
@@ -95,7 +100,7 @@ proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
 proto._onCompleted = function onCompleted(_, {content}) {
   if (!this.cancelActivity && !content.cancelActivity) {
     this._stop();
-    return this.broker.publish('execution', 'execute.completed', cloneContent(content, {cancelActivity: false}));
+    return this.broker.publish('execution', 'execute.completed', cloneContent(content, {isDefinitionScope: false, cancelActivity: false}));
   }
 
   this[kCompleteContent] = content;

package/src/process/ProcessExecution.js

@@ -138,21 +138,24 @@ proto.resume = function resume() {
 
   if (this[kCompleted]) return;
 
-  switch (this.status) {
-    case 'init':
-      return this._start();
-    case 'executing': {
-      if (!postponed.length) return this._complete('completed');
-      break;
-    }
-  }
+  const status = this.status;
+  if (status === 'init') return this._start();
 
-  for (const {content} of postponed.slice()) {
-    const activity = this.getActivityById(content.id);
+  for (const msg of postponed.slice()) {
+    const activity = this.getActivityById(msg.content.id);
     if (!activity) continue;
-    if (content.placeholder) continue;
+    if (msg.content.placeholder) continue;
+    if (!activity.status) {
+      this._popPostponed(msg.content);
+      msg.ack();
+      continue;
+    }
     activity.resume();
   }
+
+  if (this[kCompleted]) return;
+
+  if (!postponed.length && status === 'executing') return this._complete('completed');
 };
 
 proto.recover = function recover(state) {
@@ -241,14 +244,14 @@ proto.stop = function stop() {
 };
 
 proto.getPostponed = function getPostponed(filterFn) {
-  return this[kElements].postponed.slice().reduce((result, msg) => {
+  const result = [];
+  for (const msg of this[kElements].postponed.slice()) {
     const api = this._getChildApi(msg);
-    if (api) {
-      if (filterFn && !filterFn(api)) return result;
-      result.push(api);
-    }
-    return result;
-  }, []);
+    if (!api) continue;
+    if (filterFn && !filterFn(api)) continue;
+    result.push(api);
+  }
+  return result;
 };
 
 proto.discard = function discard() {
@@ -344,11 +347,19 @@ proto._start = function start() {
 proto._activate = function activate() {
   const {onApiMessage, onMessageFlowEvent, onActivityEvent} = this[kMessageHandlers];
 
-  this.broker.subscribeTmp('api', '#', onApiMessage, {
-    noAck: true,
-    consumerTag: `_process-api-consumer-${this.executionId}`,
-    priority: 200,
-  });
+  if (!this.isSubProcess) {
+    this.broker.consume('api-q', onApiMessage, {
+      noAck: true,
+      consumerTag: `_process-api-consumer-${this.executionId}`,
+      priority: 200,
+    });
+  } else {
+    this.broker.subscribeTmp('api', '#', onApiMessage, {
+      noAck: true,
+      consumerTag: `_process-api-consumer-${this.executionId}`,
+      priority: 200,
+    });
+  }
 
   const {outboundMessageFlows, flows, associations, startActivities, triggeredByEvent, children} = this[kElements];