bpmn-elements 13.2.0 → 14.0.0

package/dist/activity/Activity.js

@@ -14,6 +14,7 @@ var _Errors = require("../error/Errors.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const kActivityDef = Symbol.for('activityDefinition');
 const kConsuming = Symbol.for('consuming');
+const kConsumingRunQ = Symbol.for('run queue consumer');
 const kCounters = Symbol.for('counters');
 const kEventDefinitions = Symbol.for('eventDefinitions');
 const kExec = Symbol.for('exec');
@@ -113,6 +114,8 @@ function Activity(Behaviour, activityDef, context) {
   };
   this[kEventDefinitions] = eventDefinitions && eventDefinitions.map(ed => new ed.Behaviour(this, ed, this.context));
   this[kExtensions] = context.loadExtensions(this);
+  this[kConsuming] = false;
+  this[kConsumingRunQ] = undefined;
 }
 Object.defineProperties(Activity.prototype, {
   counters: {
@@ -239,6 +242,7 @@ Object.defineProperties(Activity.prototype, {
   }
 });
 Activity.prototype.activate = function activate() {
+  if (this[kActivated]) return;
   this[kActivated] = true;
   this.addInboundListeners();
   return this._consumeInbound();
@@ -274,6 +278,7 @@ Activity.prototype.run = function run(runContent) {
   const broker = this.broker;
   broker.publish('run', 'run.enter', content);
   broker.publish('run', 'run.start', (0, _messageHelper.cloneContent)(content));
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 Activity.prototype.getState = function getState() {
@@ -322,6 +327,7 @@ Activity.prototype.resume = function resume() {
   this.broker.publish('run', 'run.resume', content, {
     persistent: false
   });
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 Activity.prototype.discard = function discard(discardContent) {
@@ -332,6 +338,7 @@ Activity.prototype.discard = function discard(discardContent) {
   const broker = this.broker;
   broker.getQueue('run-q').purge();
   broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(this[kStateMessage].content));
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 Activity.prototype.addInboundListeners = function addInboundListeners() {
@@ -396,6 +403,7 @@ Activity.prototype._runDiscard = function runDiscard(discardContent) {
     executionId
   });
   this.broker.publish('run', 'run.discard', content);
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 Activity.prototype._discardRun = function discardRun() {
@@ -404,17 +412,19 @@ Activity.prototype._discardRun = function discardRun() {
   const execution = this[kExec].execution;
   if (execution && !execution.completed) return;
   switch (status) {
+    case 'end':
     case 'executing':
     case 'error':
     case 'discarded':
       return;
   }
   this._deactivateRunConsumers();
-  const message = this[kStateMessage];
-  if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
+  const stateMessage = this[kStateMessage];
+  if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(stateMessage));
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(message.content));
+  broker.publish('run', 'run.discard', (0, _messageHelper.cloneContent)(stateMessage.content));
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 Activity.prototype._shakeOutbound = function shakeOutbound(sourceMessage) {
@@ -441,13 +451,14 @@ Activity.prototype._consumeInbound = function consumeInbound() {
   if (!this[kActivated]) return;
   if (this.status) return;
   const inboundQ = this.broker.getQueue('inbound-q');
+  const onInbound = this[kMessageHandlers].onInbound;
   if (this[kFlags].isParallelJoin) {
-    return inboundQ.consume(this[kMessageHandlers].onInbound, {
+    return inboundQ.consume(onInbound, {
       consumerTag: '_run-on-inbound',
       prefetch: 1000
     });
   }
-  return inboundQ.consume(this[kMessageHandlers].onInbound, {
+  return inboundQ.consume(onInbound, {
     consumerTag: '_run-on-inbound'
   });
 };
@@ -548,13 +559,17 @@ Activity.prototype._onInboundEvent = function onInboundEvent(routingKey, message
   }
 };
 Activity.prototype._consumeRunQ = function consumeRunQ() {
-  if (this[kConsuming]) return;
-  this[kConsuming] = true;
+  this[kConsumingRunQ] = true;
   this.broker.getQueue('run-q').assertConsumer(this[kMessageHandlers].onRunMessage, {
     exclusive: true,
     consumerTag: '_activity-run'
   });
 };
+Activity.prototype._pauseRunQ = function pauseRunQ() {
+  if (!this[kConsumingRunQ]) return;
+  this[kConsumingRunQ] = false;
+  this.broker.cancel('_activity-run');
+};
 Activity.prototype._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
   switch (routingKey) {
     case 'run.outbound.discard':
@@ -709,8 +724,9 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
         break;
       }
     case 'run.next':
-      this._consumeInbound();
-      break;
+      message.ack();
+      this._pauseRunQ();
+      return this._consumeInbound();
   }
   if (!step) message.ack();
 };
@@ -877,8 +893,7 @@ Activity.prototype._publishEvent = function publishEvent(state, content, propert
   }), {
     ...properties,
     type: state,
-    mandatory: state === 'error',
-    persistent: 'persistent' in properties ? properties.persistent : state !== 'stop'
+    mandatory: state === 'error'
   });
 };
 Activity.prototype._onStop = function onStop(message) {
@@ -886,14 +901,16 @@ Activity.prototype._onStop = function onStop(message) {
   this.stopped = true;
   this[kConsuming] = false;
   const broker = this.broker;
-  broker.cancel('_activity-run');
+  this._pauseRunQ();
   broker.cancel('_activity-api');
   broker.cancel('_activity-execution');
   broker.cancel('_run-on-inbound');
   broker.cancel('_format-consumer');
+  if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
   if (running) {
-    if (this.extensions) this.extensions.deactivate((0, _messageHelper.cloneMessage)(message));
-    this._publishEvent('stop', this._createMessage());
+    this._publishEvent('stop', this._createMessage(), {
+      persistent: false
+    });
   }
 };
 Activity.prototype._consumeApi = function consumeApi() {
@@ -952,7 +969,7 @@ Activity.prototype._getOutboundSequenceFlowById = function getOutboundSequenceFl
 Activity.prototype._deactivateRunConsumers = function _deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_activity-api');
-  broker.cancel('_activity-run');
+  this._pauseRunQ();
   broker.cancel('_activity-execution');
   this[kConsuming] = false;
 };

package/dist/error/Errors.js

@@ -23,7 +23,12 @@ class ActivityError extends Error {
   }
 }
 exports.ActivityError = ActivityError;
-class RunError extends ActivityError {}
+class RunError extends ActivityError {
+  constructor(...args) {
+    super(...args);
+    this.type = 'RunError';
+  }
+}
 exports.RunError = RunError;
 class BpmnError extends Error {
   constructor(description, behaviour = {}, sourceMessage, inner) {

package/dist/eventDefinitions/TimerEventDefinition.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = TimerEventDefinition;
 var _messageHelper = require("../messageHelper.js");
-var _isoDuration = require("../iso-duration.js");
+var _piso = require("@0dep/piso");
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
+const timerTypes = ['timeDuration', 'timeDate', 'timeCycle'];
 function TimerEventDefinition(activity, eventDefinition) {
   const type = this.type = eventDefinition.type || 'TimerEventDefinition';
   this.activity = activity;
@@ -81,7 +82,6 @@ TimerEventDefinition.prototype.execute = function execute(executeMessage) {
   broker.publish('execution', 'execute.timer', (0, _messageHelper.cloneContent)(timerContent));
   broker.publish('event', 'activity.timer', (0, _messageHelper.cloneContent)(timerContent));
   if (this.stopped) return;
-  if (timerContent.timeout === undefined) return this._debug(`waiting for ${timerContent.timerType || 'signal'}`);
   if (timerContent.timeout <= 0) return this._completed();
   const timers = this.environment.timers.register(timerContent);
   const delay = timerContent.timeout;
@@ -191,25 +191,21 @@ TimerEventDefinition.prototype._stop = function stop() {
 };
 TimerEventDefinition.prototype.parse = function parse(timerType, value) {
   let repeat, delay, expireAt;
+  const now = new Date();
   switch (timerType) {
     case 'timeCycle':
     case 'timeDuration':
       {
-        const parsed = (0, _isoDuration.parse)(value);
+        const parsed = new _piso.ISOInterval(value).parse();
         if (parsed.repeat) repeat = parsed.repeat;
-        delay = (0, _isoDuration.toSeconds)(parsed) * 1000;
-        expireAt = new Date(Date.now() + delay);
+        expireAt = parsed.getExpireAt(now, now);
+        delay = expireAt.getTime() - now.getTime();
         break;
       }
     case 'timeDate':
       {
-        const ms = Date.parse(value);
-        if (!isNaN(ms)) {
-          expireAt = new Date(ms);
-          delay = Date.now() - expireAt;
-        } else {
-          throw new TypeError(`invalid timeDate >${value}<`);
-        }
+        expireAt = (0, _piso.getDate)(value);
+        delay = now.getTime() - expireAt;
         break;
       }
   }
@@ -226,28 +222,22 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
       expireAt: new Date(content.expireAt)
     })
   };
-  let parseErr;
-  for (const t of ['timeDuration', 'timeDate', 'timeCycle']) {
-    if (t in content) result[t] = content[t];else if (t in this) result[t] = this.environment.resolveExpression(this[t], executeMessage);else continue;
+  for (const timerType of timerTypes) {
+    if (timerType in content) result[timerType] = content[timerType];else if (timerType in this) result[timerType] = this.environment.resolveExpression(this[timerType], executeMessage);else continue;
     let expireAtDate, repeat;
-    const timerStr = result[t];
+    const timerStr = result[timerType];
     if (timerStr) {
-      try {
-        const {
-          repeat: parsedRepeat,
-          expireAt: parsedExpireAt
-        } = this.parse(t, timerStr);
-        repeat = parsedRepeat;
-        expireAtDate = parsedExpireAt;
-      } catch (err) {
-        parseErr = err;
-      }
+      const {
+        repeat: parsedRepeat,
+        expireAt: parsedExpireAt
+      } = this.parse(timerType, timerStr);
+      repeat = parsedRepeat;
+      expireAtDate = parsedExpireAt;
     } else {
       expireAtDate = new Date();
     }
-    if (!expireAtDate) continue;
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
-      result.timerType = t;
+      result.timerType = timerType;
       result.expireAt = expireAtDate;
       result.repeat = repeat;
     }
@@ -259,9 +249,6 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
   } else if (!Object.keys(result).length) {
     result.timeout = 0;
   }
-  if (!('timeout' in result) && parseErr) {
-    this.logger.warn(`<${this.activity.id}> failed to parse timer: ${parseErr.message}`);
-  }
   if (content.inbound && 'repeat' in content.inbound[0]) {
     result.repeat = content.inbound[0].repeat;
   }

package/dist/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "Activity", {
     return _Activity.default;
   }
 });
+Object.defineProperty(exports, "ActivityError", {
+  enumerable: true,
+  get: function () {
+    return _Errors.ActivityError;
+  }
+});
 Object.defineProperty(exports, "Association", {
   enumerable: true,
   get: function () {
@@ -147,7 +153,6 @@ Object.defineProperty(exports, "Group", {
     return _Dummy.default;
   }
 });
-exports.ISODuration = void 0;
 Object.defineProperty(exports, "InclusiveGateway", {
   enumerable: true,
   get: function () {
@@ -238,6 +243,12 @@ Object.defineProperty(exports, "ReceiveTask", {
     return _ReceiveTask.default;
   }
 });
+Object.defineProperty(exports, "RunError", {
+  enumerable: true,
+  get: function () {
+    return _Errors.RunError;
+  }
+});
 Object.defineProperty(exports, "ScriptTask", {
   enumerable: true,
   get: function () {
@@ -396,8 +407,5 @@ var _TerminateEventDefinition = _interopRequireDefault(require("./eventDefinitio
 var _TimerEventDefinition = _interopRequireDefault(require("./eventDefinitions/TimerEventDefinition.js"));
 var _Transaction = _interopRequireDefault(require("./tasks/Transaction.js"));
 var _Timers = require("./Timers.js");
-var ISODuration = _interopRequireWildcard(require("./iso-duration.js"));
-exports.ISODuration = ISODuration;
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _Errors = require("./error/Errors.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "13.2.0",
+  "version": "14.0.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -86,6 +86,7 @@
     "prettier": "^3.2.5"
   },
   "dependencies": {
-    "smqp": "^8.2.2"
+    "@0dep/piso": "^0.1.3",
+    "smqp": "^8.2.4"
   }
 }

package/src/activity/Activity.js

@@ -8,6 +8,7 @@ import { makeErrorFromMessage, ActivityError } from '../error/Errors.js';
 
 const kActivityDef = Symbol.for('activityDefinition');
 const kConsuming = Symbol.for('consuming');
+const kConsumingRunQ = Symbol.for('run queue consumer');
 const kCounters = Symbol.for('counters');
 const kEventDefinitions = Symbol.for('eventDefinitions');
 const kExec = Symbol.for('exec');
@@ -100,6 +101,8 @@ function Activity(Behaviour, activityDef, context) {
 
   this[kEventDefinitions] = eventDefinitions && eventDefinitions.map((ed) => new ed.Behaviour(this, ed, this.context));
   this[kExtensions] = context.loadExtensions(this);
+  this[kConsuming] = false;
+  this[kConsumingRunQ] = undefined;
 }
 
 Object.defineProperties(Activity.prototype, {
@@ -230,6 +233,7 @@ Object.defineProperties(Activity.prototype, {
 });
 
 Activity.prototype.activate = function activate() {
+  if (this[kActivated]) return;
   this[kActivated] = true;
   this.addInboundListeners();
   return this._consumeInbound();
@@ -267,6 +271,7 @@ Activity.prototype.run = function run(runContent) {
   broker.publish('run', 'run.enter', content);
   broker.publish('run', 'run.start', cloneContent(content));
 
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 
@@ -320,6 +325,8 @@ Activity.prototype.resume = function resume() {
 
   const content = this._createMessage();
   this.broker.publish('run', 'run.resume', content, { persistent: false });
+
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 
@@ -332,6 +339,7 @@ Activity.prototype.discard = function discard(discardContent) {
   const broker = this.broker;
   broker.getQueue('run-q').purge();
   broker.publish('run', 'run.discard', cloneContent(this[kStateMessage].content));
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 
@@ -398,6 +406,7 @@ Activity.prototype._runDiscard = function runDiscard(discardContent) {
   const content = this._createMessage({ ...discardContent, executionId });
   this.broker.publish('run', 'run.discard', content);
 
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 
@@ -409,6 +418,7 @@ Activity.prototype._discardRun = function discardRun() {
   if (execution && !execution.completed) return;
 
   switch (status) {
+    case 'end':
     case 'executing':
     case 'error':
     case 'discarded':
@@ -417,11 +427,13 @@ Activity.prototype._discardRun = function discardRun() {
 
   this._deactivateRunConsumers();
 
-  const message = this[kStateMessage];
-  if (this.extensions) this.extensions.deactivate(cloneMessage(message));
+  const stateMessage = this[kStateMessage];
+  if (this.extensions) this.extensions.deactivate(cloneMessage(stateMessage));
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', cloneContent(message.content));
+
+  broker.publish('run', 'run.discard', cloneContent(stateMessage.content));
+  this[kConsuming] = true;
   this._consumeRunQ();
 };
 
@@ -444,12 +456,15 @@ Activity.prototype._consumeInbound = function consumeInbound() {
   if (!this[kActivated]) return;
 
   if (this.status) return;
+
   const inboundQ = this.broker.getQueue('inbound-q');
+  const onInbound = this[kMessageHandlers].onInbound;
+
   if (this[kFlags].isParallelJoin) {
-    return inboundQ.consume(this[kMessageHandlers].onInbound, { consumerTag: '_run-on-inbound', prefetch: 1000 });
+    return inboundQ.consume(onInbound, { consumerTag: '_run-on-inbound', prefetch: 1000 });
   }
 
-  return inboundQ.consume(this[kMessageHandlers].onInbound, { consumerTag: '_run-on-inbound' });
+  return inboundQ.consume(onInbound, { consumerTag: '_run-on-inbound' });
 };
 
 Activity.prototype._onInbound = function onInbound(routingKey, message) {
@@ -542,12 +557,17 @@ Activity.prototype._onInboundEvent = function onInboundEvent(routingKey, message
 };
 
 Activity.prototype._consumeRunQ = function consumeRunQ() {
-  if (this[kConsuming]) return;
-
-  this[kConsuming] = true;
+  this[kConsumingRunQ] = true;
   this.broker.getQueue('run-q').assertConsumer(this[kMessageHandlers].onRunMessage, { exclusive: true, consumerTag: '_activity-run' });
 };
 
+Activity.prototype._pauseRunQ = function pauseRunQ() {
+  if (!this[kConsumingRunQ]) return;
+
+  this[kConsumingRunQ] = false;
+  this.broker.cancel('_activity-run');
+};
+
 Activity.prototype._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
   switch (routingKey) {
     case 'run.outbound.discard':
@@ -695,8 +715,9 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
       break;
     }
     case 'run.next':
-      this._consumeInbound();
-      break;
+      message.ack();
+      this._pauseRunQ();
+      return this._consumeInbound();
   }
 
   if (!step) message.ack();
@@ -857,7 +878,6 @@ Activity.prototype._publishEvent = function publishEvent(state, content, propert
     ...properties,
     type: state,
     mandatory: state === 'error',
-    persistent: 'persistent' in properties ? properties.persistent : state !== 'stop',
   });
 };
 
@@ -868,15 +888,16 @@ Activity.prototype._onStop = function onStop(message) {
 
   this[kConsuming] = false;
   const broker = this.broker;
-  broker.cancel('_activity-run');
+  this._pauseRunQ();
   broker.cancel('_activity-api');
   broker.cancel('_activity-execution');
   broker.cancel('_run-on-inbound');
   broker.cancel('_format-consumer');
 
+  if (this.extensions) this.extensions.deactivate(cloneMessage(message));
+
   if (running) {
-    if (this.extensions) this.extensions.deactivate(cloneMessage(message));
-    this._publishEvent('stop', this._createMessage());
+    this._publishEvent('stop', this._createMessage(), { persistent: false });
   }
 };
 
@@ -933,7 +954,7 @@ Activity.prototype._getOutboundSequenceFlowById = function getOutboundSequenceFl
 Activity.prototype._deactivateRunConsumers = function _deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_activity-api');
-  broker.cancel('_activity-run');
+  this._pauseRunQ();
   broker.cancel('_activity-execution');
   this[kConsuming] = false;
 };

package/src/error/Errors.js

@@ -16,7 +16,12 @@ class ActivityError extends Error {
   }
 }
 
-class RunError extends ActivityError {}
+class RunError extends ActivityError {
+  constructor(...args) {
+    super(...args);
+    this.type = 'RunError';
+  }
+}
 
 class BpmnError extends Error {
   constructor(description, behaviour = {}, sourceMessage, inner) {
@@ -38,12 +43,14 @@ export { ActivityError, BpmnError, RunError, makeErrorFromMessage };
 
 function makeErrorFromMessage(errorMessage) {
   const { content } = errorMessage;
+
   if (isKnownError(content)) return content;
 
   const { error } = content;
   if (!error) return new Error(`Malformatted error message with routing key ${errorMessage.fields && errorMessage.fields.routingKey}`);
 
   if (isKnownError(error)) return error;
+
   switch (error.type) {
     case 'ActivityError':
       return new ActivityError(

package/src/eventDefinitions/TimerEventDefinition.js

@@ -1,10 +1,12 @@
 import { cloneContent } from '../messageHelper.js';
-import { toSeconds, parse as parseIsoDuration } from '../iso-duration.js';
+import { ISOInterval, getDate } from '@0dep/piso';
 
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
 
+const timerTypes = ['timeDuration', 'timeDate', 'timeCycle'];
+
 export default function TimerEventDefinition(activity, eventDefinition) {
   const type = (this.type = eventDefinition.type || 'TimerEventDefinition');
   this.activity = activity;
@@ -80,7 +82,6 @@ TimerEventDefinition.prototype.execute = function execute(executeMessage) {
 
   if (this.stopped) return;
 
-  if (timerContent.timeout === undefined) return this._debug(`waiting for ${timerContent.timerType || 'signal'}`);
   if (timerContent.timeout <= 0) return this._completed();
 
   const timers = this.environment.timers.register(timerContent);
@@ -188,23 +189,19 @@ TimerEventDefinition.prototype._stop = function stop() {
 
 TimerEventDefinition.prototype.parse = function parse(timerType, value) {
   let repeat, delay, expireAt;
+  const now = new Date();
   switch (timerType) {
     case 'timeCycle':
     case 'timeDuration': {
-      const parsed = parseIsoDuration(value);
+      const parsed = new ISOInterval(value).parse();
       if (parsed.repeat) repeat = parsed.repeat;
-      delay = toSeconds(parsed) * 1000;
-      expireAt = new Date(Date.now() + delay);
+      expireAt = parsed.getExpireAt(now, now);
+      delay = expireAt.getTime() - now.getTime();
       break;
     }
     case 'timeDate': {
-      const ms = Date.parse(value);
-      if (!isNaN(ms)) {
-        expireAt = new Date(ms);
-        delay = Date.now() - expireAt;
-      } else {
-        throw new TypeError(`invalid timeDate >${value}<`);
-      }
+      expireAt = getDate(value);
+      delay = now.getTime() - expireAt;
       break;
     }
   }
@@ -223,29 +220,23 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     ...('expireAt' in content && { expireAt: new Date(content.expireAt) }),
   };
 
-  let parseErr;
-  for (const t of ['timeDuration', 'timeDate', 'timeCycle']) {
-    if (t in content) result[t] = content[t];
-    else if (t in this) result[t] = this.environment.resolveExpression(this[t], executeMessage);
+  for (const timerType of timerTypes) {
+    if (timerType in content) result[timerType] = content[timerType];
+    else if (timerType in this) result[timerType] = this.environment.resolveExpression(this[timerType], executeMessage);
     else continue;
 
     let expireAtDate, repeat;
-    const timerStr = result[t];
+    const timerStr = result[timerType];
     if (timerStr) {
-      try {
-        const { repeat: parsedRepeat, expireAt: parsedExpireAt } = this.parse(t, timerStr);
-        repeat = parsedRepeat;
-        expireAtDate = parsedExpireAt;
-      } catch (err) {
-        parseErr = err;
-      }
+      const { repeat: parsedRepeat, expireAt: parsedExpireAt } = this.parse(timerType, timerStr);
+      repeat = parsedRepeat;
+      expireAtDate = parsedExpireAt;
     } else {
       expireAtDate = new Date();
     }
 
-    if (!expireAtDate) continue;
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
-      result.timerType = t;
+      result.timerType = timerType;
       result.expireAt = expireAtDate;
       result.repeat = repeat;
     }
@@ -259,10 +250,6 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     result.timeout = 0;
   }
 
-  if (!('timeout' in result) && parseErr) {
-    this.logger.warn(`<${this.activity.id}> failed to parse timer: ${parseErr.message}`);
-  }
-
   if (content.inbound && 'repeat' in content.inbound[0]) {
     result.repeat = content.inbound[0].repeat;
   }

package/src/index.js

@@ -48,7 +48,8 @@ import TerminateEventDefinition from './eventDefinitions/TerminateEventDefinitio
 import TimerEventDefinition from './eventDefinitions/TimerEventDefinition.js';
 import Transaction from './tasks/Transaction.js';
 import { Timers } from './Timers.js';
-import * as ISODuration from './iso-duration.js';
+
+export { ActivityError, RunError } from './error/Errors.js';
 
 export {
   Association,
@@ -108,5 +109,4 @@ export {
   TimerEventDefinition,
   Transaction,
   Timers,
-  ISODuration,
 };

package/src/iso-duration.js

@@ -1,87 +0,0 @@
-// License MIT @ https://tolu.mit-license.org/
-
-const numbers = '\\d+';
-const fractionalNumbers = ''.concat(numbers, '(?:[\\.,]').concat(numbers, ')?');
-const datePattern = '('.concat(numbers, 'Y)?(').concat(numbers, 'M)?(').concat(numbers, 'W)?(').concat(fractionalNumbers, 'D)?');
-const timePattern = 'T('.concat(fractionalNumbers, 'H)?(').concat(fractionalNumbers, 'M)?(').concat(fractionalNumbers, 'S)?');
-
-const rPattern = '(?:R('.concat(numbers).concat(')/)?');
-const iso8601 = rPattern.concat('P(?:').concat(datePattern, '(?:').concat(timePattern, ')?)');
-const objMap = ['years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds'];
-const defaultDuration = Object.freeze({
-  years: 0,
-  months: 0,
-  weeks: 0,
-  days: 0,
-  hours: 0,
-  minutes: 0,
-  seconds: 0,
-});
-
-/**
- * The ISO8601 regex for matching / testing durations
- */
-const pattern = new RegExp(iso8601);
-
-/** Parse PnYnMnDTnHnMnS format to object */
-export function parse(durationString) {
-  const matches = durationString.replace(/,/g, '.').match(pattern);
-  if (!matches) {
-    throw new RangeError('invalid duration: ' + durationString);
-  }
-
-  // Slice away repeat and first entry in match-array (the input string)
-  const slicedMatches = matches.slice(2);
-  if (slicedMatches.filter(Boolean).length === 0) {
-    throw new RangeError('invalid duration: ' + durationString);
-  }
-  // Check only one fraction is used
-  if (
-    slicedMatches.filter((v) => {
-      return /\./.test(v || '');
-    }).length > 1
-  ) {
-    throw new RangeError(
-      'Fractions are allowed on the smallest unit in the string, e.g. P0.5D or PT1.0001S but not PT0.5M0.1S: ' + durationString,
-    );
-  }
-
-  const result = {};
-  if (matches[1]) result.repeat = Number(matches[1]);
-
-  return slicedMatches.reduce((prev, next, idx) => {
-    prev[objMap[idx]] = parseFloat(next || '0') || 0;
-    return prev;
-  }, result);
-}
-
-/** Convert ISO8601 duration object to an end Date. */
-export function end(durationInput, startDate) {
-  const duration = Object.assign({}, defaultDuration, durationInput);
-  // Create two equal timestamps, add duration to 'then' and return time difference
-  const timestamp = startDate.getTime();
-  const then = new Date(timestamp);
-  then.setFullYear(then.getFullYear() + duration.years);
-  then.setMonth(then.getMonth() + duration.months);
-  then.setDate(then.getDate() + duration.days);
-  // set time as milliseconds to get fractions working for minutes/hours
-  const hoursInMs = duration.hours * 3600 * 1000;
-  const minutesInMs = duration.minutes * 60 * 1000;
-  then.setMilliseconds(then.getMilliseconds() + duration.seconds * 1000 + hoursInMs + minutesInMs);
-  // Special case weeks
-  then.setDate(then.getDate() + duration.weeks * 7);
-  return then;
-}
-
-/** Convert ISO8601 duration object to seconds */
-export function toSeconds(durationInput, startDate) {
-  if (startDate === void 0) {
-    startDate = new Date();
-  }
-  const duration = Object.assign({}, defaultDuration, durationInput);
-  const timestamp = startDate.getTime();
-  const now = new Date(timestamp);
-  const then = end(duration, now);
-  const seconds = (then.getTime() - now.getTime()) / 1000;
-  return seconds;
-}