bpmn-elements 8.1.0 → 8.2.0

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+# 8.2.0
+
+- fix resume when activity has formatting status, extensions were not re-activated
+- fix InputOutputSpecification output now passed as dataOutput instead of dataInput, as it should
+- refactor Extensions loading, bpmn io is now pushed to the end of the extensions list
+
 # 8.1.0
 
 - support non-interrupting BoundaryEvent with ISO8601 repeating interval timeCycle

package/dist/src/Context.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Context;
 
+var _BpmnIO = _interopRequireDefault(require("./io/BpmnIO"));
+
 var _Environment = _interopRequireDefault(require("./Environment"));
 
 var _ExtensionsMapper = _interopRequireDefault(require("./ExtensionsMapper"));
@@ -31,7 +33,7 @@ function ContextInstance(definitionContext, environment) {
   this.sid = sid;
   this.definitionContext = definitionContext;
   this.environment = environment;
-  this.extensionsMapper = (0, _ExtensionsMapper.default)(this);
+  this.extensionsMapper = new _ExtensionsMapper.default(this);
   this.refs = {
     activityRefs: {},
     associationRefs: [],
@@ -204,5 +206,9 @@ proto.getStartActivities = function getStartActivities(filterOptions, scopeId) {
 };
 
 proto.loadExtensions = function loadExtensions(activity) {
-  return this.extensionsMapper.get(activity);
+  const io = new _BpmnIO.default(activity, this);
+  const extensions = this.extensionsMapper.get(activity);
+  if (io.hasIo) extensions.extensions.push(io);
+  if (!extensions.extensions.length) return;
+  return extensions;
 };

package/dist/src/ExtensionsMapper.js

@@ -4,50 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ExtensionsMapper;
+const kActivated = Symbol.for('activated');
 
 function ExtensionsMapper(context) {
-  const {
-    extensions: envExtensions
-  } = context.environment;
-  const extensions = getExtensions();
-  return {
-    get
-  };
-
-  function get(activity) {
-    const activityExtensions = extensions.reduce(applyExtension, []);
-    return {
-      activate,
-      deactivate
-    };
-
-    function applyExtension(result, Extension) {
-      const extension = Extension(activity, context);
-      if (extension) result.push(extension);
-      return result;
-    }
-
-    function activate(message) {
-      for (const extension of activityExtensions) extension.activate(message);
-    }
-
-    function deactivate(message) {
-      for (const extension of activityExtensions) extension.deactivate(message);
-    }
-  }
+  this.context = context;
+}
 
-  function getExtensions() {
-    const result = [];
-    if (!envExtensions) return result;
+ExtensionsMapper.prototype.get = function get(activity) {
+  return new Extensions(activity, this.context, this._getExtensions());
+};
 
-    for (const key in envExtensions) {
-      const extension = envExtensions[key];
+ExtensionsMapper.prototype._getExtensions = function getExtensions() {
+  let extensions;
+  if (!(extensions = this.context.environment.extensions)) return [];
+  return Object.values(extensions);
+};
 
-      if (extension) {
-        result.push(extension);
-      }
-    }
+function Extensions(activity, context, extensions) {
+  const result = this.extensions = [];
 
-    return result;
+  for (const Extension of extensions) {
+    const extension = Extension(activity, context);
+    if (extension) result.push(extension);
   }
-}
+
+  this[kActivated] = false;
+}
+
+Object.defineProperty(Extensions.prototype, 'count', {
+  get() {
+    return this.extensions.length;
+  }
+
+});
+
+Extensions.prototype.activate = function activate(message) {
+  if (this[kActivated]) return;
+  this[kActivated] = true;
+
+  for (const extension of this.extensions) extension.activate(message);
+};
+
+Extensions.prototype.deactivate = function deactivate(message) {
+  if (!this[kActivated]) return;
+  this[kActivated] = false;
+
+  for (const extension of this.extensions) extension.deactivate(message);
+};

package/dist/src/activity/Activity.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _ActivityExecution = _interopRequireDefault(require("./ActivityExecution"));
 
-var _BpmnIO = _interopRequireDefault(require("../io/BpmnIO"));
-
 var _shared = require("../shared");
 
 var _Api = require("../Api");
@@ -24,7 +22,6 @@ var _Errors = require("../error/Errors");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const kActivityDef = Symbol.for('activityDefinition');
-const kBpmnIo = Symbol.for('bpmnIo');
 const kConsuming = Symbol.for('consuming');
 const kCounters = Symbol.for('counters');
 const kEventDefinitions = Symbol.for('eventDefinitions');
@@ -145,6 +142,7 @@ function Activity(Behaviour, activityDef, context) {
   }
 
   this[kEventDefinitions] = eventDefinitions && eventDefinitions.map(ed => new ed.Behaviour(this, ed, this.context));
+  this[kExtensions] = context.loadExtensions(this);
 }
 
 const proto = Activity.prototype;
@@ -173,23 +171,20 @@ Object.defineProperty(proto, 'executionId', {
   }
 
 });
-Object.defineProperty(proto, 'bpmnIo', {
+Object.defineProperty(proto, 'extensions', {
   enumerable: true,
 
   get() {
-    if (kBpmnIo in this) return this[kBpmnIo];
-    const bpmnIo = this[kBpmnIo] = new _BpmnIO.default(this, this.context);
-    return bpmnIo;
+    return this[kExtensions];
   }
 
 });
-Object.defineProperty(proto, 'extensions', {
+Object.defineProperty(proto, 'bpmnIo', {
   enumerable: true,
 
   get() {
-    if (kExtensions in this) return this[kExtensions];
-    const extensions = this[kExtensions] = this.context.loadExtensions(this);
-    return extensions;
+    const extensions = this[kExtensions];
+    return extensions && extensions.extensions.find(e => e.type === 'bpmnio');
   }
 
 });
@@ -485,10 +480,11 @@ proto._discardRun = function discardRun() {
 
   this._deactivateRunConsumers();
 
-  if (this.extensions) this.extensions.deactivate();
+  const message = this[kStateMessage];
+  if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(this[kStateMessage].content));
+  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(message.content));
 
   this._consumeRunQ();
 };
@@ -720,13 +716,13 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
 
         if (!isRedelivered) {
           this[kExec].execution = null;
+          if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
+
+          this._publishEvent('enter', content, {
+            correlationId
+          });
         }
 
-        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message), this);
-        if (this.bpmnIo) this.bpmnIo.activate(message);
-        if (!isRedelivered) this._publishEvent('enter', content, {
-          correlationId
-        });
         break;
       }
 
@@ -735,8 +731,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
         this.logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
         this.status = 'discard';
         this[kExec].execution = null;
-        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message), this);
-        if (this.bpmnIo) this.bpmnIo.activate(message);
+        if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
 
         if (!isRedelivered) {
           this.broker.publish('run', 'run.discarded', content, {
@@ -781,28 +776,20 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       {
         this.status = 'executing';
         this[kExecuteMessage] = message;
+        const exec = this[kExec];
+        if (isRedelivered && this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
+        if (!exec.execution) exec.execution = new _ActivityExecution.default(this, this.context);
         this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {
           exclusive: true,
           consumerTag: '_activity-execution'
         });
-        const exec = this[kExec];
-        if (!exec.execution) exec.execution = new _ActivityExecution.default(this, this.context);
-
-        if (isRedelivered) {
-          return this._resumeExtensions(message, (err, formattedContent) => {
-            if (err) return this.emitFatal(err, message.content);
-            if (formattedContent) message.content = formattedContent;
-            this.status = 'executing';
-            return exec.execution.execute(message);
-          });
-        }
-
         return exec.execution.execute(message);
       }
 
     case 'run.end':
       {
-        if (this.status === 'end') break;
+        this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
+        if (isRedelivered) break;
         this[kCounters].taken++;
         this.status = 'end';
         return this._doRunLeave(message, false, () => {
@@ -860,8 +847,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     case 'run.leave':
       {
         this.status = undefined;
-        if (this.bpmnIo) this.bpmnIo.deactivate(message);
-        if (this.extensions) this.extensions.deactivate(message);
+        if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
 
         if (!isRedelivered) {
           this.broker.publish('run', 'run.next', content, {
@@ -1044,9 +1030,8 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
 proto._onResumeMessage = function onResumeMessage(message) {
   message.ack();
   const stateMessage = this[kStateMessage];
-  const {
-    fields
-  } = stateMessage;
+  const fields = stateMessage.fields;
+  if (!fields.redelivered) return;
 
   switch (fields.routingKey) {
     case 'run.enter':
@@ -1060,7 +1045,7 @@ proto._onResumeMessage = function onResumeMessage(message) {
       return;
   }
 
-  if (!fields.redelivered) return;
+  if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(stateMessage));
   this.logger.debug(`<${this.id}> resume from ${message.content.status}`);
   return this.broker.publish('run', fields.routingKey, (0, _messageHelper.cloneContent)(stateMessage.content), stateMessage.properties);
 };
@@ -1087,7 +1072,7 @@ proto._onStop = function onStop(message) {
   broker.cancel('_format-consumer');
 
   if (running) {
-    if (this.extensions) this.extensions.deactivate(message || this._createMessage());
+    if (this.extensions) this.extensions.deactivate(message ? (0, _messageHelper.cloneMessage)(message) : this._createMessage());
 
     this._publishEvent('stop', this._createMessage());
   }
@@ -1153,19 +1138,6 @@ proto._getOutboundSequenceFlowById = function getOutboundSequenceFlowById(flowId
   return this[kFlows].outboundSequenceFlows.find(flow => flow.id === flowId);
 };
 
-proto._resumeExtensions = function resumeExtensions(message, callback) {
-  const extensions = this.extensions,
-        bpmnIo = this.bpmnIo;
-  if (!extensions && !bpmnIo) return callback();
-  if (extensions) extensions.activate((0, _messageHelper.cloneMessage)(message), this);
-  if (bpmnIo) bpmnIo.activate((0, _messageHelper.cloneMessage)(message), this);
-  this.status = 'formatting';
-  return this.formatter.format(message, (err, formattedContent, formatted) => {
-    if (err) return callback(err);
-    return callback(null, formatted && formattedContent);
-  });
-};
-
 proto._deactivateRunConsumers = function _deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_activity-api');

package/dist/src/io/BpmnIO.js

@@ -8,6 +8,7 @@ exports.default = BpmnIO;
 function BpmnIO(activity, context) {
   this.activity = activity;
   this.context = context;
+  this.type = 'bpmnio';
   const {
     ioSpecification: ioSpecificationDef,
     properties: propertiesDef
@@ -16,6 +17,13 @@ function BpmnIO(activity, context) {
   this.properties = propertiesDef && new propertiesDef.Behaviour(activity, propertiesDef, context);
 }
 
+Object.defineProperty(BpmnIO.prototype, 'hasIo', {
+  get() {
+    return this.specification || this.properties;
+  }
+
+});
+
 BpmnIO.prototype.activate = function activate(message) {
   const properties = this.properties,
         specification = this.specification;

package/dist/src/io/InputOutputSpecification.js

@@ -29,8 +29,17 @@ function IoSpecification(activity, ioSpecificationDef, context) {
 
 const proto = IoSpecification.prototype;
 
-proto.activate = function activate() {
+proto.activate = function activate(message) {
   if (this[kConsuming]) return;
+
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onFormatEnter();
+  }
+
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.end') {
+    this._onFormatComplete(message);
+  }
+
   this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {
     noAck: true
   });
@@ -177,10 +186,11 @@ proto._onFormatComplete = function formatOnComplete(message) {
   const endRoutingKey = `run.onend.${safeType}.end`;
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
-    ioSpecification: {
-      dataInputs: sources.map(input => {
-        return { ...input
-        };
+    ioSpecification: { ...(messageInputs && {
+        dataInputs: messageInputs.map(input => {
+          return { ...input
+          };
+        })
       }),
       dataOutputs: this._getDataOutputs(dataOutputs)
     }
@@ -189,9 +199,13 @@ proto._onFormatComplete = function formatOnComplete(message) {
     for (const response of responses) sources[response.index].value = response.value;
 
     broker.publish('format', endRoutingKey, {
-      ioSpecification: {
-        dataInputs: sources,
-        dataOutputs: this._getDataOutputs(dataOutputs)
+      ioSpecification: { ...(messageInputs && {
+          dataInputs: messageInputs.map(input => {
+            return { ...input
+            };
+          })
+        }),
+        dataOutputs: sources
       }
     });
   });

package/dist/src/io/Properties.js

@@ -87,6 +87,10 @@ const proto = Properties.prototype;
 proto.activate = function activate(message) {
   if (this[kConsuming]) return;
 
+  if (message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onActivityEvent('activity.enter', message);
+  }
+
   if (message.fields.redelivered && message.content.properties) {
     this._onActivityEvent('activity.extension.resume', message);
   }
@@ -101,16 +105,13 @@ proto.deactivate = function deactivate() {
 };
 
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {
-  if (routingKey === 'activity.enter') {
-    return this._formatOnEnter(message);
-  }
-
-  if (routingKey === 'activity.extension.resume') {
-    return this._formatOnEnter(message);
-  }
+  switch (routingKey) {
+    case 'activity.enter':
+    case 'activity.extension.resume':
+      return this._formatOnEnter(message);
 
-  if (routingKey === 'activity.execution.completed') {
-    return this._formatOnComplete(message);
+    case 'activity.execution.completed':
+      return this._formatOnComplete(message);
   }
 };
 

package/dist/src/tasks/ServiceTask.js

@@ -70,11 +70,7 @@ proto.execute = function execute(executeMessage) {
 
 proto.getService = function getService(message) {
   let Service = this.activity.behaviour.Service;
-
-  if (!Service) {
-    Service = this.environment.settings.enableDummyService ? DummyService : null;
-  }
-
+  if (!Service && this.environment.settings.enableDummyService) Service = DummyService;
   return Service && new Service(this.activity, (0, _messageHelper.cloneMessage)(message));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "main": "dist/index.js",
   "module": "index.js",
@@ -46,9 +46,9 @@
   ],
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.18.6",
-    "@babel/core": "^7.18.6",
-    "@babel/preset-env": "^7.18.6",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.19.3",
+    "@babel/preset-env": "^7.19.3",
     "@babel/register": "^7.18.6",
     "bpmn-moddle": "^7.1.2",
     "camunda-bpmn-moddle": "^6.1.2",

package/src/Context.js

@@ -1,3 +1,4 @@
+import BpmnIO from './io/BpmnIO';
 import Environment from './Environment';
 import ExtensionsMapper from './ExtensionsMapper';
 import {getUniqueId} from './shared';
@@ -16,7 +17,7 @@ function ContextInstance(definitionContext, environment) {
   this.sid = sid;
   this.definitionContext = definitionContext;
   this.environment = environment;
-  this.extensionsMapper = ExtensionsMapper(this);
+  this.extensionsMapper = new ExtensionsMapper(this);
   this.refs = {
     activityRefs: {},
     associationRefs: [],
@@ -196,6 +197,10 @@ proto.getStartActivities = function getStartActivities(filterOptions, scopeId) {
 };
 
 proto.loadExtensions = function loadExtensions(activity) {
-  return this.extensionsMapper.get(activity);
+  const io = new BpmnIO(activity, this);
+  const extensions = this.extensionsMapper.get(activity);
+  if (io.hasIo) extensions.extensions.push(io);
+  if (!extensions.extensions.length) return;
+  return extensions;
 };
 

package/src/ExtensionsMapper.js

@@ -1,42 +1,42 @@
-export default function ExtensionsMapper(context) {
-  const {extensions: envExtensions} = context.environment;
-  const extensions = getExtensions();
+const kActivated = Symbol.for('activated');
 
-  return {
-    get,
-  };
+export default function ExtensionsMapper(context) {
+  this.context = context;
+}
 
-  function get(activity) {
-    const activityExtensions = extensions.reduce(applyExtension, []);
-    return {
-      activate,
-      deactivate,
-    };
+ExtensionsMapper.prototype.get = function get(activity) {
+  return new Extensions(activity, this.context, this._getExtensions());
+};
 
-    function applyExtension(result, Extension) {
-      const extension = Extension(activity, context);
-      if (extension) result.push(extension);
-      return result;
-    }
+ExtensionsMapper.prototype._getExtensions = function getExtensions() {
+  let extensions;
+  if (!(extensions = this.context.environment.extensions)) return [];
+  return Object.values(extensions);
+};
 
-    function activate(message) {
-      for (const extension of activityExtensions) extension.activate(message);
-    }
-    function deactivate(message) {
-      for (const extension of activityExtensions) extension.deactivate(message);
-    }
+function Extensions(activity, context, extensions) {
+  const result = this.extensions = [];
+  for (const Extension of extensions) {
+    const extension = Extension(activity, context);
+    if (extension) result.push(extension);
   }
+  this[kActivated] = false;
+}
 
-  function getExtensions() {
-    const result = [];
-    if (!envExtensions) return result;
+Object.defineProperty(Extensions.prototype, 'count', {
+  get() {
+    return this.extensions.length;
+  },
+});
 
-    for (const key in envExtensions) {
-      const extension = envExtensions[key];
-      if (extension) {
-        result.push(extension);
-      }
-    }
-    return result;
-  }
-}
+Extensions.prototype.activate = function activate(message) {
+  if (this[kActivated]) return;
+  this[kActivated] = true;
+  for (const extension of this.extensions) extension.activate(message);
+};
+
+Extensions.prototype.deactivate = function deactivate(message) {
+  if (!this[kActivated]) return;
+  this[kActivated] = false;
+  for (const extension of this.extensions) extension.deactivate(message);
+};

package/src/activity/Activity.js

@@ -1,5 +1,4 @@
 import ActivityExecution from './ActivityExecution';
-import BpmnIO from '../io/BpmnIO';
 import {brokerSafeId, getUniqueId} from '../shared';
 import {ActivityApi} from '../Api';
 import {ActivityBroker} from '../EventBroker';
@@ -8,7 +7,6 @@ import {cloneContent, cloneParent, cloneMessage} from '../messageHelper';
 import {makeErrorFromMessage, ActivityError} from '../error/Errors';
 
 const kActivityDef = Symbol.for('activityDefinition');
-const kBpmnIo = Symbol.for('bpmnIo');
 const kConsuming = Symbol.for('consuming');
 const kCounters = Symbol.for('counters');
 const kEventDefinitions = Symbol.for('eventDefinitions');
@@ -105,6 +103,7 @@ function Activity(Behaviour, activityDef, context) {
   }
 
   this[kEventDefinitions] = eventDefinitions && eventDefinitions.map((ed) => new ed.Behaviour(this, ed, this.context));
+  this[kExtensions] = context.loadExtensions(this);
 }
 
 const proto = Activity.prototype;
@@ -130,21 +129,18 @@ Object.defineProperty(proto, 'executionId', {
   },
 });
 
-Object.defineProperty(proto, 'bpmnIo', {
+Object.defineProperty(proto, 'extensions', {
   enumerable: true,
   get() {
-    if (kBpmnIo in this) return this[kBpmnIo];
-    const bpmnIo = this[kBpmnIo] = new BpmnIO(this, this.context);
-    return bpmnIo;
+    return this[kExtensions];
   },
 });
 
-Object.defineProperty(proto, 'extensions', {
+Object.defineProperty(proto, 'bpmnIo', {
   enumerable: true,
   get() {
-    if (kExtensions in this) return this[kExtensions];
-    const extensions = this[kExtensions] = this.context.loadExtensions(this);
-    return extensions;
+    const extensions = this[kExtensions];
+    return extensions && extensions.extensions.find(e => e.type === 'bpmnio');
   },
 });
 
@@ -408,10 +404,12 @@ proto._discardRun = function discardRun() {
   }
 
   this._deactivateRunConsumers();
-  if (this.extensions) this.extensions.deactivate();
+
+  const message = this[kStateMessage];
+  if (this.extensions) this.extensions.deactivate(cloneMessage(message));
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', cloneContent(this[kStateMessage].content));
+  broker.publish('run', 'run.discard', cloneContent(message.content));
   this._consumeRunQ();
 };
 
@@ -601,12 +599,9 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'entered';
       if (!isRedelivered) {
         this[kExec].execution = null;
+        if (this.extensions) this.extensions.activate(cloneMessage(message));
+        this._publishEvent('enter', content, {correlationId});
       }
-
-      if (this.extensions) this.extensions.activate(cloneMessage(message), this);
-      if (this.bpmnIo) this.bpmnIo.activate(message);
-
-      if (!isRedelivered) this._publishEvent('enter', content, {correlationId});
       break;
     }
     case 'run.discard': {
@@ -615,8 +610,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'discard';
       this[kExec].execution = null;
 
-      if (this.extensions) this.extensions.activate(cloneMessage(message), this);
-      if (this.bpmnIo) this.bpmnIo.activate(message);
+      if (this.extensions) this.extensions.activate(cloneMessage(message));
 
       if (!isRedelivered) {
         this.broker.publish('run', 'run.discarded', content, {correlationId});
@@ -631,7 +625,6 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
         this.broker.publish('run', 'run.execute', content, {correlationId});
         this._publishEvent('start', content, {correlationId});
       }
-
       break;
     }
     case 'run.execute.passthrough': {
@@ -645,23 +638,15 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'executing';
       this[kExecuteMessage] = message;
 
-      this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
       const exec = this[kExec];
+      if (isRedelivered && this.extensions) this.extensions.activate(cloneMessage(message));
       if (!exec.execution) exec.execution = new ActivityExecution(this, this.context);
-
-      if (isRedelivered) {
-        return this._resumeExtensions(message, (err, formattedContent) => {
-          if (err) return this.emitFatal(err, message.content);
-          if (formattedContent) message.content = formattedContent;
-          this.status = 'executing';
-          return exec.execution.execute(message);
-        });
-      }
-
+      this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
       return exec.execution.execute(message);
     }
     case 'run.end': {
-      if (this.status === 'end') break;
+      this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
+      if (isRedelivered) break;
 
       this[kCounters].taken++;
 
@@ -707,8 +692,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     case 'run.leave': {
       this.status = undefined;
 
-      if (this.bpmnIo) this.bpmnIo.deactivate(message);
-      if (this.extensions) this.extensions.deactivate(message);
+      if (this.extensions) this.extensions.deactivate(cloneMessage(message));
 
       if (!isRedelivered) {
         this.broker.publish('run', 'run.next', content, {persistent: false});
@@ -844,7 +828,8 @@ proto._onResumeMessage = function onResumeMessage(message) {
   message.ack();
 
   const stateMessage = this[kStateMessage];
-  const {fields} = stateMessage;
+  const fields = stateMessage.fields;
+  if (!fields.redelivered) return;
 
   switch (fields.routingKey) {
     case 'run.enter':
@@ -857,7 +842,7 @@ proto._onResumeMessage = function onResumeMessage(message) {
       return;
   }
 
-  if (!fields.redelivered) return;
+  if (this.extensions) this.extensions.activate(cloneMessage(stateMessage));
 
   this.logger.debug(`<${this.id}> resume from ${message.content.status}`);
 
@@ -887,7 +872,7 @@ proto._onStop = function onStop(message) {
   broker.cancel('_format-consumer');
 
   if (running) {
-    if (this.extensions) this.extensions.deactivate(message || this._createMessage());
+    if (this.extensions) this.extensions.deactivate(message ? cloneMessage(message) : this._createMessage());
     this._publishEvent('stop', this._createMessage());
   }
 };
@@ -936,20 +921,6 @@ proto._getOutboundSequenceFlowById = function getOutboundSequenceFlowById(flowId
   return this[kFlows].outboundSequenceFlows.find((flow) => flow.id === flowId);
 };
 
-proto._resumeExtensions = function resumeExtensions(message, callback) {
-  const extensions = this.extensions, bpmnIo = this.bpmnIo;
-  if (!extensions && !bpmnIo) return callback();
-
-  if (extensions) extensions.activate(cloneMessage(message), this);
-  if (bpmnIo) bpmnIo.activate(cloneMessage(message), this);
-
-  this.status = 'formatting';
-  return this.formatter.format(message, (err, formattedContent, formatted) => {
-    if (err) return callback(err);
-    return callback(null, formatted && formattedContent);
-  });
-};
-
 proto._deactivateRunConsumers = function _deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_activity-api');

package/src/io/BpmnIO.js

@@ -1,6 +1,7 @@
 export default function BpmnIO(activity, context) {
   this.activity = activity;
   this.context = context;
+  this.type = 'bpmnio';
 
   const {
     ioSpecification: ioSpecificationDef,
@@ -11,6 +12,12 @@ export default function BpmnIO(activity, context) {
   this.properties = propertiesDef && new propertiesDef.Behaviour(activity, propertiesDef, context);
 }
 
+Object.defineProperty(BpmnIO.prototype, 'hasIo', {
+  get() {
+    return this.specification || this.properties;
+  },
+});
+
 BpmnIO.prototype.activate = function activate(message) {
   const properties = this.properties, specification = this.specification;
   if (properties) properties.activate(message);

package/src/io/EnvironmentDataObject.js

@@ -9,6 +9,7 @@ export default function EnvironmentDataObject(dataObjectDef, {environment}) {
 }
 
 EnvironmentDataObject.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
+
   const environment = this.environment;
   const value = environment.variables._data && environment.variables._data[this.id];
   const content = this._createContent(value);

package/src/io/InputOutputSpecification.js

@@ -15,8 +15,14 @@ export default function IoSpecification(activity, ioSpecificationDef, context) {
 
 const proto = IoSpecification.prototype;
 
-proto.activate = function activate() {
+proto.activate = function activate(message) {
   if (this[kConsuming]) return;
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onFormatEnter();
+  }
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.end') {
+    this._onFormatComplete(message);
+  }
   this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {noAck: true});
 };
 
@@ -107,6 +113,7 @@ proto._onFormatComplete = function formatOnComplete(message) {
   const broker = this.broker;
   const context = this.context;
 
+
   const {dataObjects, sources} = dataOutputs.reduce((result, ioSource, index) => {
     const {value} = messageOutputs.find((output) => output.id === ioSource.id) || {};
     const source = {
@@ -117,7 +124,6 @@ proto._onFormatComplete = function formatOnComplete(message) {
     };
     result.sources.push(source);
 
-
     const dataObjectId = getPropertyValue(ioSource, 'behaviour.association.target.dataObject.id');
     if (!dataObjectId) return result;
     const dataObject = context.getDataObjectById(dataObjectId);
@@ -143,8 +149,10 @@ proto._onFormatComplete = function formatOnComplete(message) {
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
     ioSpecification: {
-      dataInputs: sources.map((input) => {
-        return {...input};
+      ...(messageInputs && {
+        dataInputs: messageInputs.map((input) => {
+          return {...input};
+        }),
       }),
       dataOutputs: this._getDataOutputs(dataOutputs),
     },
@@ -155,8 +163,12 @@ proto._onFormatComplete = function formatOnComplete(message) {
 
     broker.publish('format', endRoutingKey, {
       ioSpecification: {
-        dataInputs: sources,
-        dataOutputs: this._getDataOutputs(dataOutputs),
+        ...(messageInputs && {
+          dataInputs: messageInputs.map((input) => {
+            return {...input};
+          }),
+        }),
+        dataOutputs: sources,
       },
     });
   });

package/src/io/Properties.js

@@ -13,7 +13,6 @@ export default function Properties(activity, propertiesDef, context) {
     dataOutputObjects: [],
   };
 
-
   for (const {id, ...def} of propertiesDef.values) {
     const source = {
       id,
@@ -62,6 +61,9 @@ const proto = Properties.prototype;
 
 proto.activate = function activate(message) {
   if (this[kConsuming]) return;
+  if (message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onActivityEvent('activity.enter', message);
+  }
 
   if (message.fields.redelivered && message.content.properties) {
     this._onActivityEvent('activity.extension.resume', message);
@@ -75,16 +77,12 @@ proto.deactivate = function deactivate() {
 };
 
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {
-  if (routingKey === 'activity.enter') {
-    return this._formatOnEnter(message);
-  }
-
-  if (routingKey === 'activity.extension.resume') {
-    return this._formatOnEnter(message);
-  }
-
-  if (routingKey === 'activity.execution.completed') {
-    return this._formatOnComplete(message);
+  switch (routingKey) {
+    case 'activity.enter':
+    case 'activity.extension.resume':
+      return this._formatOnEnter(message);
+    case 'activity.execution.completed':
+      return this._formatOnComplete(message);
   }
 };
 

package/src/tasks/ServiceTask.js

@@ -46,9 +46,7 @@ proto.execute = function execute(executeMessage) {
 
 proto.getService = function getService(message) {
   let Service = this.activity.behaviour.Service;
-  if (!Service) {
-    Service = this.environment.settings.enableDummyService ? DummyService : null;
-  }
+  if (!Service && this.environment.settings.enableDummyService) Service = DummyService;
   return Service && new Service(this.activity, cloneMessage(message));
 };