@webex/internal-media-core 0.0.7-beta → 0.0.8-beta

package/dist/cjs/index.js

@@ -4292,7 +4292,70 @@ function appendToH264fmtpParams(sdp, paramsToAppend) {
 }
 
 function setH264MaxFs(sdp, maxFsValue) {
-  appendToH264fmtpParams(sdp, "max-fs=".concat(maxFsValue));
+  var maxFsForProfileLevel = {
+    10: 99,
+    11: 396,
+    12: 396,
+    13: 396,
+    20: 396,
+    21: 792,
+    22: 1620,
+    30: 1620,
+    31: 3600,
+    32: 5120,
+    40: 8192,
+    41: 8192,
+    42: 8704,
+    50: 22080,
+    51: 36864,
+    52: 36864,
+    60: 139264,
+    61: 139264,
+    62: 139264
+  };
+  sdp.avMedia.forEach(media => {
+    if (media.type === 'video') {
+      media.codecs.forEach(codec => {
+        var _codec$name3;
+
+        if (((_codec$name3 = codec.name) === null || _codec$name3 === void 0 ? void 0 : _codec$name3.toUpperCase()) === 'H264') {
+          codec.fmtParams = codec.fmtParams.map(fmtp => {
+            var parsedRegex = fmtp.match(/(.*)profile-level-id=(\w{4})(\w{2})(.*)/);
+
+            if (parsedRegex && parsedRegex.length === 5) {
+              var stuffBeforeProfileLevelId = parsedRegex[1];
+              var profile = parsedRegex[2].toLowerCase();
+              var levelId = parseInt(parsedRegex[3], 16);
+              var stuffAfterProfileLevelId = parsedRegex[4];
+
+              if (!maxFsForProfileLevel[levelId]) {
+                throw new Error("found unsupported h264 profile level id value in the SDP: ".concat(levelId));
+              }
+
+              if (maxFsForProfileLevel[levelId] === maxFsValue) {
+                return fmtp;
+              }
+
+              if (maxFsForProfileLevel[levelId] < maxFsValue) {
+                return "".concat(fmtp, ";max-fs=").concat(maxFsValue);
+              }
+
+              var newLevelId = Object.keys(maxFsForProfileLevel).reverse().find(key => maxFsForProfileLevel[key] === maxFsValue);
+
+              if (newLevelId) {
+                var newLevelIdHex = parseInt(newLevelId, 10).toString(16);
+                return "".concat(stuffBeforeProfileLevelId, "profile-level-id=").concat(profile).concat(newLevelIdHex).concat(stuffAfterProfileLevelId);
+              }
+
+              throw new Error("unsupported maxFsValue: ".concat(maxFsValue));
+            }
+
+            return fmtp;
+          });
+        }
+      });
+    }
+  });
 }
 
 function disableRtx(sdp) {
@@ -4448,8 +4511,8 @@ class MediaConnection$1 extends EventEmitter {
     _defineProperty__default["default"](this, "lastEmittedMediaConnectionState", void 0);
 
     this.config = mediaConnectionConfig;
-    this.receiveOptions = options.receive;
-    this.localTracks = options.send;
+    this.receiveOptions = _objectSpread$1({}, options.receive);
+    this.localTracks = _objectSpread$1({}, options.send);
     this.id = debugId || 'MediaConnection';
     this.transceivers = {};
     this.mediaConnectionState = ConnectionState.NEW;
@@ -4466,6 +4529,10 @@ class MediaConnection$1 extends EventEmitter {
     getLogger().info("".concat(this.id, ":").concat(action, " ").concat(description));
   }
 
+  warn(action, description) {
+    getLogger().warn("".concat(this.id, ":").concat(action, " ").concat(description));
+  }
+
   error(action, description, error) {
     getLogger().error("".concat(this.id, ":").concat(action, " ").concat(description, " ").concat(getErrorDescription(error)));
   }
@@ -4523,9 +4590,20 @@ class MediaConnection$1 extends EventEmitter {
     };
   }
 
+  updateRemoteQualityLevel(newValue) {
+    if (newValue !== this.receiveOptions.remoteQualityLevel) {
+      this.receiveOptions.remoteQualityLevel = newValue;
+      return true;
+    }
+
+    return false;
+  }
+
   updateTransceivers(options) {
     var newOfferNeeded = false;
-    this.receiveOptions = options.receive;
+    this.receiveOptions.audio = options.receive.audio;
+    this.receiveOptions.video = options.receive.video;
+    this.receiveOptions.screenShareVideo = options.receive.screenShareVideo;
     this.identifyTransceivers();
     localTrackTypes.forEach(_ref2 => {
       var {
@@ -4567,14 +4645,34 @@ class MediaConnection$1 extends EventEmitter {
   }
 
   updateReceiveOptions(options) {
-    return this.updateTransceivers({
+    var sdpNegotiationNeeded = false;
+
+    if (this.updateRemoteQualityLevel(options.remoteQualityLevel)) {
+      sdpNegotiationNeeded = true;
+    }
+
+    if (this.updateTransceivers({
       send: this.localTracks,
       receive: options
-    });
+    })) {
+      sdpNegotiationNeeded = true;
+    }
+
+    return sdpNegotiationNeeded;
   }
 
   updateSendReceiveOptions(options) {
-    return this.updateTransceivers(options);
+    var sdpNegotiationNeeded = false;
+
+    if (this.updateRemoteQualityLevel(options.receive.remoteQualityLevel)) {
+      sdpNegotiationNeeded = true;
+    }
+
+    if (this.updateTransceivers(options)) {
+      sdpNegotiationNeeded = true;
+    }
+
+    return sdpNegotiationNeeded;
   }
 
   getConnectionState() {
@@ -4790,18 +4888,43 @@ class MediaConnection$1 extends EventEmitter {
     }
   }
 
+  createSdpMungingConfig() {
+    if (this.receiveOptions.remoteQualityLevel) {
+      var maxFsValues = {
+        LOW: 1620,
+        MEDIUM: 3600,
+        HIGH: 8192
+      };
+
+      if (!maxFsValues[this.receiveOptions.remoteQualityLevel]) {
+        throw new Error("invalid value for receiveOptions.remoteQualityLevel: ".concat(this.receiveOptions.remoteQualityLevel));
+      }
+
+      if (this.config.sdpMunging.h264MaxFs) {
+        this.warn('createSdpMungingConfig', 'conflict: both config.sdpMunging.h264MaxFs and receiveOptions.remoteQualityLevel are set, remoteQualityLevel will override the config');
+      }
+
+      return _objectSpread$1(_objectSpread$1({}, this.config.sdpMunging), {}, {
+        h264MaxFs: maxFsValues[this.receiveOptions.remoteQualityLevel]
+      });
+    }
+
+    return this.config.sdpMunging;
+  }
+
   createLocalOffer() {
+    var sdpMungingConfig = this.createSdpMungingConfig();
     return this.pc.createOffer().then(description => {
       this.log('createLocalOffer', 'local SDP offer created');
       var mungedDescription = {
         type: description.type,
-        sdp: mungeLocalSdpForBrowser(this.config.sdpMunging, (description === null || description === void 0 ? void 0 : description.sdp) || '')
+        sdp: mungeLocalSdpForBrowser(sdpMungingConfig, (description === null || description === void 0 ? void 0 : description.sdp) || '')
       };
       return this.pc.setLocalDescription(mungedDescription);
     }).then(() => this.waitForIceCandidates()).then(() => {
       var _this$pc$localDescrip;
 
-      var mungedSdp = mungeLocalSdp(this.config.sdpMunging, ((_this$pc$localDescrip = this.pc.localDescription) === null || _this$pc$localDescrip === void 0 ? void 0 : _this$pc$localDescrip.sdp) || '');
+      var mungedSdp = mungeLocalSdp(sdpMungingConfig, ((_this$pc$localDescrip = this.pc.localDescription) === null || _this$pc$localDescrip === void 0 ? void 0 : _this$pc$localDescrip.sdp) || '');
       return {
         sdp: mungedSdp
       };
@@ -4816,19 +4939,20 @@ class MediaConnection$1 extends EventEmitter {
     }
 
     var mungedRemoteSdp = mungeRemoteSdp(this.config.sdpMunging, sdp);
+    var sdpMungingConfig = this.createSdpMungingConfig();
     return this.pc.setRemoteDescription(new window.RTCSessionDescription({
       type: 'offer',
       sdp: mungedRemoteSdp
     })).then(() => this.pc.createAnswer()).then(answer => {
       var mungedAnswer = {
         type: answer.type,
-        sdp: mungeLocalSdpForBrowser(this.config.sdpMunging, (answer === null || answer === void 0 ? void 0 : answer.sdp) || '')
+        sdp: mungeLocalSdpForBrowser(sdpMungingConfig, (answer === null || answer === void 0 ? void 0 : answer.sdp) || '')
       };
       return this.pc.setLocalDescription(mungedAnswer);
     }).then(() => this.waitForIceCandidates()).then(() => {
       var _this$pc$localDescrip2;
 
-      var mungedLocalSdp = mungeLocalSdp(this.config.sdpMunging, ((_this$pc$localDescrip2 = this.pc.localDescription) === null || _this$pc$localDescrip2 === void 0 ? void 0 : _this$pc$localDescrip2.sdp) || '');
+      var mungedLocalSdp = mungeLocalSdp(sdpMungingConfig, ((_this$pc$localDescrip2 = this.pc.localDescription) === null || _this$pc$localDescrip2 === void 0 ? void 0 : _this$pc$localDescrip2.sdp) || '');
       return {
         sdp: mungedLocalSdp
       };
@@ -5096,7 +5220,7 @@ function detectBrowser(window) {
     // Firefox.
     result.browser = 'firefox';
     result.version = extractVersion(navigator.userAgent, /Firefox\/(\d+)\./, 1);
-  } else if (navigator.webkitGetUserMedia || window.isSecureContext === false && window.webkitRTCPeerConnection && !window.RTCIceGatherer) {
+  } else if (navigator.webkitGetUserMedia || window.isSecureContext === false && window.webkitRTCPeerConnection) {
     // Chrome, Chromium, Webview, Opera.
     // Version matches Chrome/WebRTC version.
     // Chrome 74 removed webkitGetUserMedia on http as well so we need the
@@ -6456,13 +6580,20 @@ function shimAddTransceiver(window) {
 
   if (origAddTransceiver) {
     window.RTCPeerConnection.prototype.addTransceiver = function addTransceiver() {
-      this.setParametersPromises = [];
-      var initParameters = arguments[1];
-      var shouldPerformCheck = initParameters && 'sendEncodings' in initParameters;
+      this.setParametersPromises = []; // WebIDL input coercion and validation
+
+      var sendEncodings = arguments[1] && arguments[1].sendEncodings;
+
+      if (sendEncodings === undefined) {
+        sendEncodings = [];
+      }
+
+      sendEncodings = [...sendEncodings];
+      var shouldPerformCheck = sendEncodings.length > 0;
 
       if (shouldPerformCheck) {
         // If sendEncodings params are provided, validate grammar
-        initParameters.sendEncodings.forEach(encodingParam => {
+        sendEncodings.forEach(encodingParam => {
           if ('rid' in encodingParam) {
             var ridRegex = /^[a-z0-9]{0,16}$/i;
 
@@ -6502,8 +6633,8 @@ function shimAddTransceiver(window) {
 
         if (!('encodings' in params) || // Avoid being fooled by patched getParameters() below.
         params.encodings.length === 1 && Object.keys(params.encodings[0]).length === 0) {
-          params.encodings = initParameters.sendEncodings;
-          sender.sendEncodings = initParameters.sendEncodings;
+          params.encodings = sendEncodings;
+          sender.sendEncodings = sendEncodings;
           this.setParametersPromises.push(sender.setParameters(params).then(() => {
             delete sender.sendEncodings;
           }).catch(() => {
@@ -9455,20 +9586,52 @@ 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) {
@@ -9486,8 +9649,8 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
           "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;
@@ -9511,7 +9674,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
             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];
 
@@ -9528,7 +9691,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions,
             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];
 
@@ -9540,7 +9703,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;
         }
 
@@ -9574,9 +9737,42 @@ 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];
 }
 
@@ -10442,12 +10638,12 @@ 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();
@@ -10464,6 +10660,7 @@ function () {
     this.status = InterpreterStatus.NotStarted;
     this.children = new Map();
     this.forwardTo = new Set();
+    this._outgoingQueue = [];
     /**
      * Alias for Interpreter.prototype.start
      */
@@ -10506,7 +10703,7 @@ 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);
       });
@@ -10515,7 +10712,7 @@ function () {
       // 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;
 
@@ -10538,14 +10735,24 @@ function () {
         if (_this.status !== InterpreterStatus.Stopped || _this.parent !== target || // 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);
+        }
       }
     };
 
@@ -10589,7 +10796,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);
             }
@@ -10738,6 +10945,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."));
@@ -10790,6 +11000,12 @@ 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
 
 
@@ -10880,6 +11096,8 @@ function () {
       }
 
       this._stop();
+
+      this._stopChildren();
     }
   };
   /*
@@ -11038,6 +11256,16 @@ 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;
 
@@ -11175,7 +11403,7 @@ function () {
           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];
 
@@ -11202,17 +11430,9 @@ function () {
         return newState;
       });
 
-      _this.update(nextState, _event); // TODO: think about converting those to actions
-      // Stop all children
+      _this.update(nextState, _event);
 
-
-      _this.children.forEach(function (child) {
-        if (isFunction(child.stop)) {
-          child.stop();
-        }
-      });
-
-      _this.children.clear();
+      _this._stopChildren();
 
       registry.free(_this.sessionId);
     });
@@ -11232,6 +11452,11 @@ function () {
       "".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;
 
@@ -11245,9 +11470,9 @@ function () {
         _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;
@@ -11288,9 +11513,13 @@ function () {
     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) {
@@ -11300,7 +11529,7 @@ function () {
     }
 
     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;
   };
@@ -11314,7 +11543,7 @@ function () {
 
 
   Interpreter.prototype.nextState = function (event) {
-    return this._nextState(event);
+    return this._nextState(event, false);
   };
 
   Interpreter.prototype.forward = function (event) {
@@ -11349,7 +11578,7 @@ function () {
 
     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);
       }
@@ -11925,12 +12154,12 @@ 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;
@@ -12540,9 +12769,11 @@ function () {
     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 {
@@ -12620,20 +12851,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) {
+    var entryActions = Array.from(entryStates).map(function (stateNode) {
+      var entryActions = stateNode.onEntry;
+      var invokeActions = 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 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);
-    }))], 2),
-        entryActions = _c[0],
-        exitActions = _c[1];
-
-    var actions = toActionObjects(exitActions.concat(transition.actions).concat(entryActions), this.machine.options.actions);
+      })), 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) {
@@ -12643,7 +12873,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;
@@ -12714,7 +12944,7 @@ function () {
   };
 
   StateNode.prototype.resolveTransition = function (stateTransition, currentState, context, predictableExec, _event) {
-    var e_6, _a;
+    var e_6, _a, e_7, _b;
 
     var _this = this;
 
@@ -12731,17 +12961,33 @@ 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;
+      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;
+            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) {
@@ -12750,21 +12996,21 @@ 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(resolveActions(this, currentState, context, _event, actionBlocks, predictableExec, this.machine.config.predictableActionArguments || this.machine.config.preserveActionOrder), 2),
+        resolvedActions = _c[0],
+        updatedContext = _c[1];
 
-    var _c = __read(partition(resolvedActions, function (action) {
+    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;
@@ -13213,7 +13459,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;
@@ -13230,32 +13476,32 @@ function () {
 
             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;
           }
         }
       }
@@ -13350,7 +13596,7 @@ function () {
   };
 
   StateNode.prototype.formatTransitions = function () {
-    var e_9, _a;
+    var e_10, _a;
 
     var _this = this;
 
@@ -13414,15 +13660,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;
       }
     }