@webex/internal-media-core 0.0.12-beta → 0.0.13-beta

package/dist/esm/index.js

@@ -2430,7 +2430,8 @@ var getErrorDescription = error => {
 };
 
 var NUM$1 = '\\d+';
-var TOKEN$1 = '\\S+';
+var SDP_TOKEN = "[!#$%&'*+\\-.^_`{|}~a-zA-Z0-9]+";
+var ANY_NON_WS = '\\S+';
 var SP$1 = '\\s';
 var REST$1 = '.+';
 class Line$1 {}
@@ -2524,7 +2525,7 @@ class CandidateLine$1 extends Line$1 {
 }
 _a$4$1 = CandidateLine$1;
 CandidateLine$1.ICE_CHARS = "[a-zA-Z0-9+/]+";
-CandidateLine$1.regex = new RegExp("^candidate:(".concat(_a$4$1.ICE_CHARS, ") (").concat(NUM$1, ") (").concat(TOKEN$1, ") (").concat(NUM$1, ") (").concat(TOKEN$1, ") (").concat(NUM$1, ") typ (").concat(TOKEN$1, ")(?: raddr (").concat(TOKEN$1, "))?(?: rport (").concat(NUM$1, "))?(?: (").concat(REST$1, "))?"));
+CandidateLine$1.regex = new RegExp("^candidate:(".concat(_a$4$1.ICE_CHARS, ") (").concat(NUM$1, ") (").concat(ANY_NON_WS, ") (").concat(NUM$1, ") (").concat(ANY_NON_WS, ") (").concat(NUM$1, ") typ (").concat(ANY_NON_WS, ")(?: raddr (").concat(ANY_NON_WS, "))?(?: rport (").concat(NUM$1, "))?(?: (").concat(REST$1, "))?"));
 class ConnectionLine$1 extends Line$1 {
   constructor(netType, addrType, ipAddr) {
     super();
@@ -2546,7 +2547,7 @@ class ConnectionLine$1 extends Line$1 {
     return "c=".concat(this.netType, " ").concat(this.addrType, " ").concat(this.ipAddr);
   }
 }
-ConnectionLine$1.regex = new RegExp("^(".concat(TOKEN$1, ") (").concat(TOKEN$1, ") (").concat(TOKEN$1, ")"));
+ConnectionLine$1.regex = new RegExp("^(".concat(ANY_NON_WS, ") (").concat(ANY_NON_WS, ") (").concat(ANY_NON_WS, ")"));
 class ContentLine$1 extends Line$1 {
   constructor(values) {
     super();
@@ -2618,7 +2619,7 @@ class ExtMapLine$1 extends Line$1 {
 }
 _a$3$1 = ExtMapLine$1;
 ExtMapLine$1.EXTMAP_DIRECTION = "sendonly|recvonly|sendrecv|inactive";
-ExtMapLine$1.regex = new RegExp("^extmap:(".concat(NUM$1, ")(?:/(").concat(_a$3$1.EXTMAP_DIRECTION, "))? (").concat(TOKEN$1, ")(?: (").concat(REST$1, "))?"));
+ExtMapLine$1.regex = new RegExp("^extmap:(".concat(NUM$1, ")(?:/(").concat(_a$3$1.EXTMAP_DIRECTION, "))? (").concat(ANY_NON_WS, ")(?: (").concat(REST$1, "))?"));
 class FingerprintLine$1 extends Line$1 {
   constructor(fingerprint) {
     super();
@@ -2692,7 +2693,7 @@ class IcePwdLine$1 extends Line$1 {
     return "a=ice-pwd:".concat(this.pwd);
   }
 }
-IcePwdLine$1.regex = new RegExp("^ice-pwd:(".concat(TOKEN$1, ")$"));
+IcePwdLine$1.regex = new RegExp("^ice-pwd:(".concat(ANY_NON_WS, ")$"));
 class IceUfragLine$1 extends Line$1 {
   constructor(ufrag) {
     super();
@@ -2710,7 +2711,7 @@ class IceUfragLine$1 extends Line$1 {
     return "a=ice-ufrag:".concat(this.ufrag);
   }
 }
-IceUfragLine$1.regex = new RegExp("^ice-ufrag:(".concat(TOKEN$1, ")$"));
+IceUfragLine$1.regex = new RegExp("^ice-ufrag:(".concat(ANY_NON_WS, ")$"));
 class MaxMessageSizeLine$1 extends Line$1 {
   constructor(maxMessageSize) {
     super();
@@ -2755,7 +2756,7 @@ class MediaLine$1 extends Line$1 {
 }
 _a$2$1 = MediaLine$1;
 MediaLine$1.MEDIA_TYPE = 'audio|video|application';
-MediaLine$1.regex = new RegExp("^(".concat(_a$2$1.MEDIA_TYPE, ") (").concat(NUM$1, ") (").concat(TOKEN$1, ") (").concat(REST$1, ")"));
+MediaLine$1.regex = new RegExp("^(".concat(_a$2$1.MEDIA_TYPE, ") (").concat(NUM$1, ") (").concat(ANY_NON_WS, ") (").concat(REST$1, ")"));
 class MidLine$1 extends Line$1 {
   constructor(mid) {
     super();
@@ -2773,7 +2774,7 @@ class MidLine$1 extends Line$1 {
     return "a=mid:".concat(this.mid);
   }
 }
-MidLine$1.regex = new RegExp("^mid:(".concat(TOKEN$1, ")$"));
+MidLine$1.regex = new RegExp("^mid:(".concat(ANY_NON_WS, ")$"));
 class OriginLine$1 extends Line$1 {
   constructor(username, sessionId, sessionVersion, netType, addrType, ipAddr) {
     super();
@@ -2801,7 +2802,7 @@ class OriginLine$1 extends Line$1 {
     return "o=".concat(this.username, " ").concat(this.sessionId, " ").concat(this.sessionVersion, " ").concat(this.netType, " ").concat(this.addrType, " ").concat(this.ipAddr);
   }
 }
-OriginLine$1.regex = new RegExp("^(".concat(TOKEN$1, ") (").concat(TOKEN$1, ") (").concat(NUM$1, ") (").concat(TOKEN$1, ") (").concat(TOKEN$1, ") (").concat(TOKEN$1, ")"));
+OriginLine$1.regex = new RegExp("^(".concat(ANY_NON_WS, ") (").concat(ANY_NON_WS, ") (").concat(NUM$1, ") (").concat(ANY_NON_WS, ") (").concat(ANY_NON_WS, ") (").concat(ANY_NON_WS, ")"));
 var _a$1$1;
 class RidLine$1 extends Line$1 {
   constructor(id, direction, params) {
@@ -3069,7 +3070,60 @@ class SimulcastLine$1 extends Line$1 {
     return str;
   }
 }
-SimulcastLine$1.regex = new RegExp("^simulcast:(send|recv) (".concat(TOKEN$1, ")(?: (send|recv) (").concat(TOKEN$1, "))?"));
+SimulcastLine$1.regex = new RegExp("^simulcast:(send|recv) (".concat(ANY_NON_WS, ")(?: (send|recv) (").concat(ANY_NON_WS, "))?"));
+class SsrcLine extends Line$1 {
+  constructor(ssrcId, attribute) {
+    var attributeValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+    var attributeData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
+    super();
+    this.ssrcId = ssrcId;
+    this.attribute = attribute;
+    this.attributeValue = attributeValue;
+    this.attributeData = attributeData;
+  }
+  static fromSdpLine(line) {
+    if (!SsrcLine.regex.test(line)) {
+      return undefined;
+    }
+    var tokens = line.match(SsrcLine.regex);
+    var ssrcId = parseInt(tokens[1], 10);
+    var attribute = tokens[2];
+    var attributeValue = tokens[3];
+    var attributeData = tokens[4];
+    return new SsrcLine(ssrcId, attribute, attributeValue, attributeData);
+  }
+  toSdpLine() {
+    var str = "a=ssrc:".concat(this.ssrcId, " ").concat(this.attribute);
+    if (this.attributeValue) {
+      str += ":".concat(this.attributeValue);
+    }
+    if (this.attributeData) {
+      str += " ".concat(this.attributeData);
+    }
+    return str;
+  }
+}
+SsrcLine.regex = new RegExp("^ssrc:(".concat(NUM$1, ") (").concat(SDP_TOKEN, ")(?::(").concat(SDP_TOKEN, ")?(?: (").concat(ANY_NON_WS, "))?)?$"));
+class SsrcGroupLine extends Line$1 {
+  constructor(semantics, ssrcs) {
+    super();
+    this.semantics = semantics;
+    this.ssrcs = ssrcs;
+  }
+  static fromSdpLine(line) {
+    if (!SsrcGroupLine.regex.test(line)) {
+      return undefined;
+    }
+    var tokens = line.match(SsrcGroupLine.regex);
+    var semantics = tokens[1];
+    var ssrcs = tokens[2].split(' ').map(ssrcStr => parseInt(ssrcStr, 10));
+    return new SsrcGroupLine(semantics, ssrcs);
+  }
+  toSdpLine() {
+    return "a=ssrc-group:".concat(this.semantics, " ").concat(this.ssrcs.join(' '));
+  }
+}
+SsrcGroupLine.regex = new RegExp("^ssrc-group:(SIM|FID|FEC) ((?:".concat(NUM$1).concat(SP$1, "*)+)"));
 class TimingLine$1 extends Line$1 {
   constructor(startTime, stopTime) {
     super();
@@ -3306,6 +3360,8 @@ class AvMediaDescription$1 extends MediaDescription$1 {
     this.rids = [];
     this.codecs = new Map();
     this.rtcpMux = false;
+    this.ssrcs = [];
+    this.ssrcGroups = [];
     this.pts = mediaLine.formats.map(fmt => {
       return parseInt(fmt, 10);
     });
@@ -3345,6 +3401,8 @@ class AvMediaDescription$1 extends MediaDescription$1 {
       lines.push(new DirectionLine$1(this.direction));
     }
     this.codecs.forEach(codec => lines.push(...codec.toLines()));
+    lines.push(...this.ssrcs);
+    lines.push(...this.ssrcGroups);
     lines.push(...this.otherLines);
     return lines;
   }
@@ -3383,6 +3441,14 @@ class AvMediaDescription$1 extends MediaDescription$1 {
       codec.addLine(line);
       return true;
     }
+    if (line instanceof SsrcLine) {
+      this.ssrcs.push(line);
+      return true;
+    }
+    if (line instanceof SsrcGroupLine) {
+      this.ssrcGroups.push(line);
+      return true;
+    }
     this.otherLines.push(line);
     return true;
   }
@@ -3527,6 +3593,8 @@ class SdpGrammar$1 extends Grammar$1 {
     this.addParser('a', RidLine$1.fromSdpLine);
     this.addParser('a', CandidateLine$1.fromSdpLine);
     this.addParser('a', SimulcastLine$1.fromSdpLine);
+    this.addParser('a', SsrcLine.fromSdpLine);
+    this.addParser('a', SsrcGroupLine.fromSdpLine);
   }
 }
 var DefaultSdpGrammar$1 = new SdpGrammar$1();
@@ -6910,6 +6978,29 @@ function shimRTCIceCandidate$1(window) {
     return e;
   });
 }
+function shimRTCIceCandidateRelayProtocol(window) {
+  if (!window.RTCIceCandidate || window.RTCIceCandidate && 'relayProtocol' in window.RTCIceCandidate.prototype) {
+    return;
+  }
+
+  // Hook up the augmented candidate in onicecandidate and
+  // addEventListener('icecandidate', ...)
+  wrapPeerConnectionEvent$1(window, 'icecandidate', e => {
+    if (e.candidate) {
+      var parsedCandidate = SDPUtils$1.parseCandidate(e.candidate.candidate);
+      if (parsedCandidate.type === 'relay') {
+        // This is a libwebrtc-specific mapping of local type preference
+        // to relayProtocol.
+        e.candidate.relayProtocol = {
+          0: 'tls',
+          1: 'tcp',
+          2: 'udp'
+        }[parsedCandidate.priority >> 24];
+      }
+    }
+    return e;
+  });
+}
 function shimMaxMessageSize$1(window, browserDetails) {
   if (!window.RTCPeerConnection) {
     return;
@@ -7246,6 +7337,7 @@ function shimParameterlessSetLocalDescription$1(window, browserDetails) {
 var commonShim$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   shimRTCIceCandidate: shimRTCIceCandidate$1,
+  shimRTCIceCandidateRelayProtocol: shimRTCIceCandidateRelayProtocol,
   shimMaxMessageSize: shimMaxMessageSize$1,
   shimSendThrowTypeError: shimSendThrowTypeError$1,
   shimConnectionState: shimConnectionState$1,
@@ -7313,6 +7405,7 @@ function adapterFactory$1() {
       shimSenderReceiverGetStats$1(window);
       fixNegotiationNeeded$1(window, browserDetails);
       shimRTCIceCandidate$1(window);
+      shimRTCIceCandidateRelayProtocol(window);
       shimConnectionState$1(window);
       shimMaxMessageSize$1(window, browserDetails);
       shimSendThrowTypeError$1(window);
@@ -7367,6 +7460,7 @@ function adapterFactory$1() {
       shimGetUserMedia$3(window);
       shimAudioContext$1(window);
       shimRTCIceCandidate$1(window);
+      shimRTCIceCandidateRelayProtocol(window);
       shimMaxMessageSize$1(window, browserDetails);
       shimSendThrowTypeError$1(window);
       removeExtmapAllowMixed$1(window, browserDetails);
@@ -8285,18 +8379,44 @@ function error(id, data) {
   };
   return eventObject;
 }
-function resolveActions(machine, currentState, currentContext, _event, actions, predictableExec, preserveActionOrder) {
+var pluckAssigns = function pluckAssigns(actionBlocks) {
+  var e_1, _a;
+  var assignActions = [];
+  try {
+    for (var actionBlocks_1 = __values(actionBlocks), actionBlocks_1_1 = actionBlocks_1.next(); !actionBlocks_1_1.done; actionBlocks_1_1 = actionBlocks_1.next()) {
+      var block = actionBlocks_1_1.value;
+      var i = 0;
+      while (i < block.length) {
+        if (block[i].type === assign$2) {
+          assignActions.push(block[i]);
+          block.splice(i, 1);
+          continue;
+        }
+        i++;
+      }
+    }
+  } catch (e_1_1) {
+    e_1 = {
+      error: e_1_1
+    };
+  } finally {
+    try {
+      if (actionBlocks_1_1 && !actionBlocks_1_1.done && (_a = actionBlocks_1.return)) _a.call(actionBlocks_1);
+    } finally {
+      if (e_1) throw e_1.error;
+    }
+  }
+  return assignActions;
+};
+function resolveActions(machine, currentState, currentContext, _event, actionBlocks, predictableExec, preserveActionOrder) {
   if (preserveActionOrder === void 0) {
     preserveActionOrder = false;
   }
-  var _a = __read(preserveActionOrder ? [[], actions] : partition(actions, function (action) {
-      return action.type === assign$2;
-    }), 2),
-    assignActions = _a[0],
-    otherActions = _a[1];
+  var assignActions = preserveActionOrder ? [] : pluckAssigns(actionBlocks);
   var updatedContext = assignActions.length ? updateContext(currentContext, _event, assignActions, currentState) : currentContext;
   var preservedContexts = preserveActionOrder ? [currentContext] : undefined;
-  var resolvedActions = flatten(otherActions.map(function (actionObject) {
+  var deferredToBlockEnd = [];
+  function handleAction(actionObject) {
     var _a;
     switch (actionObject.type) {
       case raise$1:
@@ -8312,8 +8432,8 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
           // tslint:disable-next-line:max-line-length
           "No delay reference for delay expression '".concat(actionObject.delay, "' was found on machine '").concat(machine.id, "'"));
         }
-        if (sendAction.to !== SpecialTargets.Internal) {
-          predictableExec === null || predictableExec === void 0 ? void 0 : predictableExec(sendAction, updatedContext, _event);
+        if (predictableExec && sendAction.to !== SpecialTargets.Internal) {
+          deferredToBlockEnd.push(sendAction);
         }
         return sendAction;
       case log$2:
@@ -8332,7 +8452,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
           if (!matchedActions) {
             return [];
           }
-          var _b = __read(resolveActions(machine, currentState, updatedContext, _event, toActionObjects(toArray(matchedActions), machine.options.actions), predictableExec, preserveActionOrder), 2),
+          var _b = __read(resolveActions(machine, currentState, updatedContext, _event, [toActionObjects(toArray(matchedActions), machine.options.actions)], predictableExec, preserveActionOrder), 2),
             resolvedActionsFromChoose = _b[0],
             resolvedContextFromChoose = _b[1];
           updatedContext = resolvedContextFromChoose;
@@ -8345,7 +8465,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
           if (!matchedActions) {
             return [];
           }
-          var _c = __read(resolveActions(machine, currentState, updatedContext, _event, toActionObjects(toArray(matchedActions), machine.options.actions), predictableExec, preserveActionOrder), 2),
+          var _c = __read(resolveActions(machine, currentState, updatedContext, _event, [toActionObjects(toArray(matchedActions), machine.options.actions)], predictableExec, preserveActionOrder), 2),
             resolvedActionsFromPure = _c[0],
             resolvedContext = _c[1];
           updatedContext = resolvedContext;
@@ -8355,7 +8475,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
       case stop$1:
         {
           var resolved = resolveStop(actionObject, updatedContext, _event);
-          predictableExec === null || predictableExec === void 0 ? void 0 : predictableExec(resolved, updatedContext, _event);
+          predictableExec === null || predictableExec === void 0 ? void 0 : predictableExec(resolved, currentContext, _event);
           return resolved;
         }
       case assign$2:
@@ -8383,9 +8503,36 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
         }
         return resolvedActionObject;
     }
-  }).filter(function (a) {
-    return !!a;
-  }));
+  }
+  function processBlock(block) {
+    var e_2, _a;
+    var resolvedActions = [];
+    try {
+      for (var block_1 = __values(block), block_1_1 = block_1.next(); !block_1_1.done; block_1_1 = block_1.next()) {
+        var action = block_1_1.value;
+        var resolved = handleAction(action);
+        if (resolved) {
+          resolvedActions = resolvedActions.concat(resolved);
+        }
+      }
+    } catch (e_2_1) {
+      e_2 = {
+        error: e_2_1
+      };
+    } finally {
+      try {
+        if (block_1_1 && !block_1_1.done && (_a = block_1.return)) _a.call(block_1);
+      } finally {
+        if (e_2) throw e_2.error;
+      }
+    }
+    deferredToBlockEnd.forEach(function (action) {
+      predictableExec(action, updatedContext, _event);
+    });
+    deferredToBlockEnd.length = 0;
+    return resolvedActions;
+  }
+  var resolvedActions = flatten(actionBlocks.map(processBlock));
   return [resolvedActions, updatedContext];
 }
 
@@ -9134,10 +9281,10 @@ function () {
    * @param options Interpreter options
    */
   function Interpreter(machine, options) {
-    var _this = this;
     if (options === void 0) {
       options = Interpreter.defaultOptions;
     }
+    var _this = this;
     this.machine = machine;
     this.delayedEventsMap = {};
     this.listeners = new Set();
@@ -9154,6 +9301,7 @@ function () {
     this.status = InterpreterStatus.NotStarted;
     this.children = new Map();
     this.forwardTo = new Set();
+    this._outgoingQueue = [];
     /**
      * Alias for Interpreter.prototype.start
      */
@@ -9189,14 +9337,14 @@ function () {
       _this.scheduler.schedule(function () {
         // Forward copy of event to child actors
         _this.forward(_event);
-        var nextState = _this.nextState(_event);
+        var nextState = _this._nextState(_event);
         _this.update(nextState, _event);
       });
       return _this._state; // TODO: deprecate (should return void)
       // tslint:disable-next-line:semicolon
     };
 
-    this.sendTo = function (event, to) {
+    this.sendTo = function (event, to, immediate) {
       var isParent = _this.parent && (to === SpecialTargets.Parent || _this.parent.id === to);
       var target = isParent ? _this.parent : isString(to) ? _this.children.get(to) || registry.get(to) : isActor$1(to) ? to : undefined;
       if (!target) {
@@ -9216,14 +9364,23 @@ function () {
         // we need to send events to the parent from exit handlers of a machine that reached its final state
         _this.state.done) {
           // Send SCXML events to machines
-          target.send(_assign(_assign({}, event), {
+          var scxmlEvent = _assign(_assign({}, event), {
             name: event.name === error$1 ? "".concat(error(_this.id)) : event.name,
             origin: _this.sessionId
-          }));
+          });
+          if (!immediate && _this.machine.config.predictableActionArguments) {
+            _this._outgoingQueue.push([target, scxmlEvent]);
+          } else {
+            target.send(scxmlEvent);
+          }
         }
       } else {
         // Send normal events to other targets
-        target.send(event.data);
+        if (!immediate && _this.machine.config.predictableActionArguments) {
+          _this._outgoingQueue.push([target, event.data]);
+        } else {
+          target.send(event.data);
+        }
       }
     };
     this._exec = function (action, context, _event, actionFunctionMap) {
@@ -9260,7 +9417,7 @@ function () {
             return;
           } else {
             if (sendAction.to) {
-              _this.sendTo(sendAction._event, sendAction.to);
+              _this.sendTo(sendAction._event, sendAction.to, _event === initEvent);
             } else {
               _this.send(sendAction._event);
             }
@@ -9381,6 +9538,9 @@ function () {
     configurable: true
   });
   Object.defineProperty(Interpreter.prototype, "state", {
+    /**
+     * @deprecated Use `.getSnapshot()` instead.
+     */
     get: function get() {
       if (!IS_PRODUCTION) {
         warn(this.status !== InterpreterStatus.NotStarted, "Attempted to read state from uninitialized service '".concat(this.id, "'. Make sure the service is started first."));
@@ -9429,6 +9589,11 @@ function () {
     // we can't just recompute it (and execute actions while doing so) because we try to preserve identity of actors created within initial assigns
     _event === initEvent) && this.options.execute) {
       this.execute(this.state);
+    } else {
+      var item = void 0;
+      while (item = this._outgoingQueue.shift()) {
+        item[0].send(item[1]);
+      }
     } // Update children
 
     this.children.forEach(function (child) {
@@ -9512,6 +9677,7 @@ function () {
         }
       }
       this._stop();
+      this._stopChildren();
     }
   };
   /*
@@ -9647,6 +9813,15 @@ function () {
     });
     return this;
   };
+  Interpreter.prototype._stopChildren = function () {
+    // TODO: think about converting those to actions
+    this.children.forEach(function (child) {
+      if (isFunction(child.stop)) {
+        child.stop();
+      }
+    });
+    this.children.clear();
+  };
   Interpreter.prototype._stop = function () {
     var e_6, _a, e_7, _b, e_8, _c, e_9, _d, e_10, _e;
     try {
@@ -9770,7 +9945,7 @@ function () {
         }).map(function (stateNode) {
           return toActionObjects(stateNode.onExit, _this.machine.options.actions);
         }));
-        var _a = __read(resolveActions(_this.machine, _this.state, _this.state.context, _event, exitActions, _this.machine.config.predictableActionArguments ? _this._exec : undefined, _this.machine.config.predictableActionArguments || _this.machine.config.preserveActionOrder), 2),
+        var _a = __read(resolveActions(_this.machine, _this.state, _this.state.context, _event, [exitActions], _this.machine.config.predictableActionArguments ? _this._exec : undefined, _this.machine.config.predictableActionArguments || _this.machine.config.preserveActionOrder), 2),
           resolvedActions = _a[0],
           updatedContext = _a[1];
         var newState = new State({
@@ -9795,15 +9970,8 @@ function () {
         newState.changed = true;
         return newState;
       });
-      _this.update(nextState, _event); // TODO: think about converting those to actions
-      // Stop all children
-
-      _this.children.forEach(function (child) {
-        if (isFunction(child.stop)) {
-          child.stop();
-        }
-      });
-      _this.children.clear();
+      _this.update(nextState, _event);
+      _this._stopChildren();
       registry.free(_this.sessionId);
     });
     return this;
@@ -9820,6 +9988,10 @@ function () {
       // tslint:disable-next-line:max-line-length
       "".concat(events.length, " event(s) were sent to uninitialized service \"").concat(this.machine.id, "\". Make sure .start() is called for this service, or set { deferEvents: true } in the service options."));
     }
+    if (!events.length) {
+      return;
+    }
+    var exec = !!this.machine.config.predictableActionArguments && this._exec;
     this.scheduler.schedule(function () {
       var e_11, _a;
       var nextState = _this.state;
@@ -9829,9 +10001,9 @@ function () {
         var _event = toSCXMLEvent(event_1);
         _this.forward(_event);
         nextState = provide(_this, function () {
-          return _this.machine.transition(nextState, _event);
+          return _this.machine.transition(nextState, _event, undefined, exec || undefined);
         });
-        batchedActions.push.apply(batchedActions, __spreadArray([], __read(nextState.actions.map(function (a) {
+        batchedActions.push.apply(batchedActions, __spreadArray([], __read(_this.machine.config.predictableActionArguments ? nextState.actions : nextState.actions.map(function (a) {
           return bindActionToState(a, nextState);
         })), false));
         batchChanged = batchChanged || !!nextState.changed;
@@ -9866,8 +10038,11 @@ function () {
   Interpreter.prototype.sender = function (event) {
     return this.send.bind(this, event);
   };
-  Interpreter.prototype._nextState = function (event) {
+  Interpreter.prototype._nextState = function (event, exec) {
     var _this = this;
+    if (exec === void 0) {
+      exec = !!this.machine.config.predictableActionArguments && this._exec;
+    }
     var _event = toSCXMLEvent(event);
     if (_event.name.indexOf(errorPlatform) === 0 && !this.state.nextEvents.some(function (nextEvent) {
       return nextEvent.indexOf(errorPlatform) === 0;
@@ -9875,7 +10050,7 @@ function () {
       throw _event.data.data;
     }
     var nextState = provide(this, function () {
-      return _this.machine.transition(_this.state, _event, undefined, _this.machine.config.predictableActionArguments ? _this._exec : undefined);
+      return _this.machine.transition(_this.state, _event, undefined, exec || undefined);
     });
     return nextState;
   };
@@ -9888,7 +10063,7 @@ function () {
    */
 
   Interpreter.prototype.nextState = function (event) {
-    return this._nextState(event);
+    return this._nextState(event, false);
   };
   Interpreter.prototype.forward = function (event) {
     var e_12, _a;
@@ -9917,7 +10092,7 @@ function () {
     var _this = this;
     this.delayedEventsMap[sendAction.id] = this.clock.setTimeout(function () {
       if (sendAction.to) {
-        _this.sendTo(sendAction._event, sendAction.to);
+        _this.sendTo(sendAction._event, sendAction.to, true);
       } else {
         _this.send(sendAction._event);
       }
@@ -10412,10 +10587,10 @@ function () {
   _context,
   // TODO: this is unsafe, but we're removing it in v5 anyway
   _stateInfo) {
-    var _this = this;
     if (_context === void 0) {
       _context = 'context' in config ? config.context : undefined;
     }
+    var _this = this;
     var _a;
     this.config = config;
     this._context = _context;
@@ -10954,13 +11129,14 @@ function () {
     nodes.push(possibleAncestor);
     return nodes;
   };
-  StateNode.prototype.getActions = function (resolvedConfig, isDone, transition, currentContext, _event, prevState) {
+  StateNode.prototype.getActions = function (resolvedConfig, isDone, transition, currentContext, _event, prevState, predictableExec) {
     var e_4, _a, e_5, _b;
+    var _this = this;
     var prevConfig = getConfiguration([], prevState ? this.getStateNodes(prevState.value) : [this]);
     try {
       for (var resolvedConfig_1 = __values(resolvedConfig), resolvedConfig_1_1 = resolvedConfig_1.next(); !resolvedConfig_1_1.done; resolvedConfig_1_1 = resolvedConfig_1.next()) {
         var sn = resolvedConfig_1_1.value;
-        if (!has(prevConfig, sn) || has(transition.entrySet, sn.parent)) {
+        if (!has(prevConfig, sn) || has(transition.entrySet, sn.parent) && !has(transition.entrySet, sn)) {
           transition.entrySet.push(sn);
         }
       }
@@ -11023,18 +11199,19 @@ function () {
     });
     var entryStates = new Set(transition.entrySet);
     var exitStates = new Set(transition.exitSet);
-    var _c = __read([flatten(Array.from(entryStates).map(function (stateNode) {
-        return __spreadArray(__spreadArray([], __read(stateNode.activities.map(function (activity) {
-          return start(activity);
-        })), false), __read(stateNode.onEntry), false);
-      })).concat(doneEvents.map(raise)), flatten(Array.from(exitStates).map(function (stateNode) {
-        return __spreadArray(__spreadArray([], __read(stateNode.onExit), false), __read(stateNode.activities.map(function (activity) {
-          return stop(activity);
-        })), false);
-      }))], 2),
-      entryActions = _c[0],
-      exitActions = _c[1];
-    var actions = toActionObjects(exitActions.concat(transition.actions).concat(entryActions), this.machine.options.actions);
+    var entryActions = Array.from(entryStates).map(function (stateNode) {
+      var entryActions = stateNode.onEntry;
+      var invokeActions = stateNode.activities.map(function (activity) {
+        return start(activity);
+      });
+      return toActionObjects(predictableExec ? __spreadArray(__spreadArray([], __read(entryActions), false), __read(invokeActions), false) : __spreadArray(__spreadArray([], __read(invokeActions), false), __read(entryActions), false), _this.machine.options.actions);
+    }).concat([doneEvents.map(raise)]);
+    var exitActions = Array.from(exitStates).map(function (stateNode) {
+      return toActionObjects(__spreadArray(__spreadArray([], __read(stateNode.onExit), false), __read(stateNode.activities.map(function (activity) {
+        return stop(activity);
+      })), false), _this.machine.options.actions);
+    });
+    var actions = exitActions.concat([toActionObjects(transition.actions, this.machine.options.actions)]).concat(entryActions);
     if (isDone) {
       var stopActions = toActionObjects(flatten(__spreadArray([], __read(resolvedConfig), false).sort(function (a, b) {
         return b.order - a.order;
@@ -11043,7 +11220,7 @@ function () {
       })), this.machine.options.actions).filter(function (action) {
         return action.type !== raise$1 && (action.type !== send$1 || !!action.to && action.to !== SpecialTargets.Internal);
       });
-      return actions.concat(stopActions);
+      return actions.concat([stopActions]);
     }
     return actions;
   };
@@ -11101,7 +11278,7 @@ function () {
     return state;
   };
   StateNode.prototype.resolveTransition = function (stateTransition, currentState, context, predictableExec, _event) {
-    var e_6, _a;
+    var e_6, _a, e_7, _b;
     var _this = this;
     if (_event === void 0) {
       _event = initEvent;
@@ -11115,15 +11292,30 @@ function () {
     var isDone = isInFinalState(resolvedConfiguration, this);
     var resolvedStateValue = willTransition ? getValue(this.machine, configuration) : undefined;
     var historyValue = currentState ? currentState.historyValue ? currentState.historyValue : stateTransition.source ? this.machine.historyValue(currentState.value) : undefined : undefined;
-    var actions = this.getActions(new Set(resolvedConfiguration), isDone, stateTransition, context, _event, currentState);
+    var actionBlocks = this.getActions(new Set(resolvedConfiguration), isDone, stateTransition, context, _event, currentState, predictableExec);
     var activities = currentState ? _assign({}, currentState.activities) : {};
     try {
-      for (var actions_1 = __values(actions), actions_1_1 = actions_1.next(); !actions_1_1.done; actions_1_1 = actions_1.next()) {
-        var action = actions_1_1.value;
-        if (action.type === start$1) {
-          activities[action.activity.id || action.activity.type] = action;
-        } else if (action.type === stop$1) {
-          activities[action.activity.id || action.activity.type] = false;
+      for (var actionBlocks_1 = __values(actionBlocks), actionBlocks_1_1 = actionBlocks_1.next(); !actionBlocks_1_1.done; actionBlocks_1_1 = actionBlocks_1.next()) {
+        var block = actionBlocks_1_1.value;
+        try {
+          for (var block_1 = (e_7 = void 0, __values(block)), block_1_1 = block_1.next(); !block_1_1.done; block_1_1 = block_1.next()) {
+            var action = block_1_1.value;
+            if (action.type === start$1) {
+              activities[action.activity.id || action.activity.type] = action;
+            } else if (action.type === stop$1) {
+              activities[action.activity.id || action.activity.type] = false;
+            }
+          }
+        } catch (e_7_1) {
+          e_7 = {
+            error: e_7_1
+          };
+        } finally {
+          try {
+            if (block_1_1 && !block_1_1.done && (_b = block_1.return)) _b.call(block_1);
+          } finally {
+            if (e_7) throw e_7.error;
+          }
         }
       }
     } catch (e_6_1) {
@@ -11132,19 +11324,19 @@ function () {
       };
     } finally {
       try {
-        if (actions_1_1 && !actions_1_1.done && (_a = actions_1.return)) _a.call(actions_1);
+        if (actionBlocks_1_1 && !actionBlocks_1_1.done && (_a = actionBlocks_1.return)) _a.call(actionBlocks_1);
       } finally {
         if (e_6) throw e_6.error;
       }
     }
-    var _b = __read(resolveActions(this, currentState, context, _event, actions, predictableExec, this.machine.config.predictableActionArguments || this.machine.config.preserveActionOrder), 2),
-      resolvedActions = _b[0],
-      updatedContext = _b[1];
-    var _c = __read(partition(resolvedActions, function (action) {
+    var _c = __read(resolveActions(this, currentState, context, _event, actionBlocks, predictableExec, this.machine.config.predictableActionArguments || this.machine.config.preserveActionOrder), 2),
+      resolvedActions = _c[0],
+      updatedContext = _c[1];
+    var _d = __read(partition(resolvedActions, function (action) {
         return action.type === raise$1 || action.type === send$1 && action.to === SpecialTargets.Internal;
       }), 2),
-      raisedEvents = _c[0],
-      nonRaisedActions = _c[1];
+      raisedEvents = _d[0],
+      nonRaisedActions = _d[1];
     var invokeActions = resolvedActions.filter(function (action) {
       var _a;
       return action.type === start$1 && ((_a = action.activity) === null || _a === void 0 ? void 0 : _a.type) === invoke;
@@ -11352,7 +11544,7 @@ function () {
     var configuration = this.getStateNodes(stateValue);
     return this.resolveTransition({
       configuration: configuration,
-      entrySet: __spreadArray([], __read(configuration), false),
+      entrySet: configuration,
       exitSet: [],
       transitions: [],
       source: undefined,
@@ -11518,7 +11710,7 @@ function () {
      * All the event types accepted by this state node and its descendants.
      */
     get: function get() {
-      var e_7, _a, e_8, _b;
+      var e_8, _a, e_9, _b;
       if (this.__cache.events) {
         return this.__cache.events;
       }
@@ -11531,32 +11723,32 @@ function () {
             var state = states[stateId];
             if (state.states) {
               try {
-                for (var _e = (e_8 = void 0, __values(state.events)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                for (var _e = (e_9 = void 0, __values(state.events)), _f = _e.next(); !_f.done; _f = _e.next()) {
                   var event_1 = _f.value;
                   events.add("".concat(event_1));
                 }
-              } catch (e_8_1) {
-                e_8 = {
-                  error: e_8_1
+              } catch (e_9_1) {
+                e_9 = {
+                  error: e_9_1
                 };
               } finally {
                 try {
                   if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
                 } finally {
-                  if (e_8) throw e_8.error;
+                  if (e_9) throw e_9.error;
                 }
               }
             }
           }
-        } catch (e_7_1) {
-          e_7 = {
-            error: e_7_1
+        } catch (e_8_1) {
+          e_8 = {
+            error: e_8_1
           };
         } finally {
           try {
             if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
           } finally {
-            if (e_7) throw e_7.error;
+            if (e_8) throw e_8.error;
           }
         }
       }
@@ -11638,7 +11830,7 @@ function () {
     return transition;
   };
   StateNode.prototype.formatTransitions = function () {
-    var e_9, _a;
+    var e_10, _a;
     var _this = this;
     var onConfig;
     if (!this.config.on) {
@@ -11688,15 +11880,15 @@ function () {
         var delayedTransition = delayedTransitions_1_1.value;
         formattedTransitions.push(delayedTransition);
       }
-    } catch (e_9_1) {
-      e_9 = {
-        error: e_9_1
+    } catch (e_10_1) {
+      e_10 = {
+        error: e_10_1
       };
     } finally {
       try {
         if (delayedTransitions_1_1 && !delayedTransitions_1_1.done && (_a = delayedTransitions_1.return)) _a.call(delayedTransitions_1);
       } finally {
-        if (e_9) throw e_9.error;
+        if (e_10) throw e_10.error;
       }
     }
     return formattedTransitions;