@bigbinary/neeto-media-recorder 2.5.3 → 2.5.5

package/core.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { isPresent, existsBy, isNotEmpty, isNot, noop } from '@bigbinary/neeto-cist';
-import { MIME_TYPE as MIME_TYPE$1, RETRYABLE_ERRORS, UPLOAD_STATUS, UPLOAD_EVENT, SCREEN_RECORDER_STATUS, START_RECORDING_SOUND, RECORDING_LIMIT_REACHED_WARNING_SOUND, SCREEN_RECORDER_ERROR, SCREEN_RECORDER_EVENT, RECORDING_TIME_LIMIT_FREE_PLAN, ONE_SECOND, HALF_A_SECOND_IN_MILLISECONDS, ONE_SECOND_IN_MILLISECONDS, TWO_HUNDRED_MILLISECONDS, ONE_MINUTE_IN_MILLISECONDS, STOP_RECORDING_DUE_TO_LIMIT_REACHED_SOUND, IS_EXTENSION } from '@bigbinary/neeto-media-recorder/constants';
+import { RETRYABLE_ERRORS, MIME_TYPE as MIME_TYPE$1, UPLOAD_STATUS, UPLOAD_EVENT, SCREEN_RECORDER_STATUS, START_RECORDING_SOUND, RECORDING_LIMIT_REACHED_WARNING_SOUND, SCREEN_RECORDER_ERROR, SCREEN_RECORDER_EVENT, RECORDING_TIME_LIMIT_FREE_PLAN, ONE_SECOND, HALF_A_SECOND_IN_MILLISECONDS, ONE_SECOND_IN_MILLISECONDS, TWO_HUNDRED_MILLISECONDS, ONE_MINUTE_IN_MILLISECONDS, STOP_RECORDING_DUE_TO_LIMIT_REACHED_SOUND, IS_EXTENSION } from '@bigbinary/neeto-media-recorder/constants';
 import { isNotNil, min, isNil, identity, isEmpty, pick, equals, not } from 'ramda';
 import platform from 'platform';
 import '@bigbinary/neeto-media-recorder/core';
@@ -773,14 +773,6 @@ var partPresignedUrlApi = {
   create: retryableCreate
 };
 
-// https://www.w3.org/TR/screen-capture/#displaycapturesurfacetype
-var DISPLAY_SURFACE = {
-  monitor: "monitor",
-  window: "window",
-  browser: "browser"
-};
-var MINIMUM_CHROMIUM_VERSION_FOR_MP4 = "128.0.6613.85";
-
 var getUnSupportedConstraints = function getUnSupportedConstraints(mediaType) {
   var supportedMediaConstraints = navigator.mediaDevices.getSupportedConstraints();
   return Object.keys(mediaType).filter(function (constraint) {
@@ -807,51 +799,45 @@ var isStreamEnded = function isStreamEnded(mediaStream) {
     readyState: "ended"
   }, mediaStream.getTracks());
 };
-function getChromiumVersion() {
-  var userAgent = navigator.userAgent;
-  var match = userAgent.match(/Chrom(e|ium)\/(([0-9][.]?)+)/);
-  if (match) {
-    return match[2];
-  }
-  return null;
-}
-function compareChromiumVersions(version1, version2) {
-  var v1Parts = version1.split(".").map(Number);
-  var v2Parts = version2.split(".").map(Number);
-  for (var i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
-    var v1Part = v1Parts[i] || 0;
-    var v2Part = v2Parts[i] || 0;
-    if (v1Part > v2Part) return 1;
-    if (v1Part < v2Part) return -1;
-  }
-  return 0;
-}
-var getSupportedMimeType = function getSupportedMimeType(fallback) {
-  var _platform$os, _platform$os$family;
-  var isWindows = (_platform$os = platform.os) === null || _platform$os === void 0 ? void 0 : (_platform$os$family = _platform$os.family) === null || _platform$os$family === void 0 ? void 0 : _platform$os$family.includes("Windows");
-  if (MediaRecorder.isTypeSupported(MIME_TYPE.mp4) && !isWindows) {
-    if (platform.name === "Safari") {
-      return MIME_TYPE.mp4;
-    }
-    var chromiumVersion = getChromiumVersion();
-    if (isNil(chromiumVersion)) {
-      return MIME_TYPE.webmH264;
-    }
-    var isChromiumVersionSupported = compareChromiumVersions(chromiumVersion, MINIMUM_CHROMIUM_VERSION_FOR_MP4) >= 0;
-    if (isChromiumVersionSupported) {
-      return MIME_TYPE.mp4;
-    }
-    return MIME_TYPE.webmH264;
-  } else if (MediaRecorder.isTypeSupported(MIME_TYPE.webmH264)) {
-    return MIME_TYPE.webmH264;
-  }
-  return fallback;
+var getSupportedMimeType = function getSupportedMimeType() {
+  return MIME_TYPE.webmH264;
 };
 
-// TODO: Support for mp4 in chrome version 126
+// TODO: Uncomment this when mp4 is stable
+// export const getSupportedMimeType = fallback => {
+//   const isWindows = platform.os?.family?.includes("Windows");
+
+//   if (MediaRecorder.isTypeSupported(MIME_TYPE.mp4) && !isWindows) {
+//     if (platform.name === "Safari") {
+//       return MIME_TYPE.mp4;
+//     }
+
+//     const chromiumVersion = getChromiumVersion();
+
+//     if (isNil(chromiumVersion)) {
+//       return MIME_TYPE.webmH264;
+//     }
+
+//     const isChromiumVersionSupported =
+//       compareChromiumVersions(
+//         chromiumVersion,
+//         MINIMUM_CHROMIUM_VERSION_FOR_MP4
+//       ) >= 0;
+
+//     if (isChromiumVersionSupported) {
+//       return MIME_TYPE.mp4;
+//     }
+
+//     return MIME_TYPE.webmH264;
+//   } else if (MediaRecorder.isTypeSupported(MIME_TYPE.webmH264)) {
+//     return MIME_TYPE.webmH264;
+//   }
+
+//   return fallback;
+// };
+
 var getMediaRecorderOptions = function getMediaRecorderOptions() {
   var mimeType = getSupportedMimeType();
-  if (!mimeType) return {};
   return {
     mimeType: mimeType
   };
@@ -859,7 +845,7 @@ var getMediaRecorderOptions = function getMediaRecorderOptions() {
 
 var s3AxiosInstance = axios.create({
   headers: {
-    "Content-Type": getSupportedMimeType(MIME_TYPE$1.webmH264)
+    "Content-Type": getSupportedMimeType()
   }
 });
 s3AxiosInstance.interceptors.response.use(identity, function (error) {
@@ -1011,11 +997,12 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               status: UPLOAD_STATUS.uploading
             });
             if (!_classPrivateFieldGet(_this, _isNotInitialized)) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
+            logger.error("completeUpload -> not initialized");
             return _context.abrupt("return");
-          case 4:
+          case 5:
             // Upload last chunk; only if last chunk has data
             if (_classPrivateFieldGet(_this, _getCurrentUnUploadedBlob).call(_this).size > 0) {
               logger.info("completeUpload -> need to upload last chunk");
@@ -1032,16 +1019,16 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
              * This results in incorrect partNumbers.
              */
             logger.info("completeUpload -> uploading all pending chunks...", _classPrivateFieldGet(_this, _pendingS3ChunkUploads).length);
-            _context.next = 8;
+            _context.next = 9;
             return Promise.all(_classPrivateFieldGet(_this, _pendingS3ChunkUploads));
-          case 8:
+          case 9:
             logger.info("completeUpload -> finishing part uploads...");
-            _context.next = 11;
+            _context.next = 12;
             return Promise.all(_classPrivateFieldGet(_this, _s3PartUploadPromises));
-          case 11:
+          case 12:
             resolvedS3PartUploadPromises = _context.sent;
             if (!isNotEmpty(_classPrivateFieldGet(_this, _failedUpload))) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
             logger.info("completeUpload -> chunks with these partNumbers failed:", _classPrivateFieldGet(_this, _failedUpload));
@@ -1053,9 +1040,9 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               status: UPLOAD_STATUS.error
             });
             return _context.abrupt("return");
-          case 18:
+          case 19:
             if (!(resolvedS3PartUploadPromises.length === 0)) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             logger.info("completeUpload -> insufficient data");
@@ -1063,7 +1050,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               status: UPLOAD_STATUS.insufficient_data
             });
             return _context.abrupt("return");
-          case 22:
+          case 23:
             parts = resolvedS3PartUploadPromises.filter(isNotCancelledRequest).map(function (resolvedResponse) {
               return {
                 etag: resolvedResponse.headers.etag,
@@ -1085,25 +1072,25 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               }
             }));
             logger.info("completeUpload -> completing upload... ");
-            _context.next = 28;
+            _context.next = 29;
             return _classPrivateFieldGet(_this, _completeUploadPromise);
-          case 28:
+          case 29:
             logger.info("completeUpload -> upload completed");
             if (!(_classPrivateFieldGet(_this, _store$1).getState().status === UPLOAD_STATUS.aborting)) {
-              _context.next = 32;
+              _context.next = 33;
               break;
             }
             logger.info("completeUpload -> upload was marked as aborted");
             return _context.abrupt("return");
-          case 32:
+          case 33:
             _classPrivateFieldGet(_this, _store$1).setState({
               status: UPLOAD_STATUS.completed
             });
             _classPrivateFieldGet(_this, _fireCallbacks$1).call(_this, UPLOAD_EVENT.onComplete);
-            _context.next = 39;
+            _context.next = 40;
             break;
-          case 36:
-            _context.prev = 36;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](0);
             // ignore if aborted
             if (!axios.isCancel(_context.t0)) {
@@ -1113,35 +1100,43 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               _classPrivateFieldGet(_this, _fireCallbacks$1).call(_this, UPLOAD_EVENT.onError);
               logger.error(_context.t0);
             }
-          case 39:
-            _context.prev = 39;
+          case 40:
+            _context.prev = 40;
             _classPrivateFieldSet(_this, _completeUploadPromise, null);
-            return _context.finish(39);
-          case 42:
+            return _context.finish(40);
+          case 43:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 36, 39, 42]]);
+      }, _callee, null, [[0, 37, 40, 43]]);
     })));
     _defineProperty(this, "abortUpload", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
+            if (!(_classPrivateFieldGet(_this, _store$1).getState().status === UPLOAD_STATUS.aborting)) {
+              _context2.next = 4;
+              break;
+            }
+            logger.info("abortUpload -> already aborting");
+            return _context2.abrupt("return");
+          case 4:
             _classPrivateFieldGet(_this, _store$1).setState({
               status: UPLOAD_STATUS.aborting
             });
             if (!_classPrivateFieldGet(_this, _isNotInitialized)) {
-              _context2.next = 4;
+              _context2.next = 8;
               break;
             }
+            logger.info("abortUpload -> not initialized");
             return _context2.abrupt("return");
-          case 4:
-            _context2.next = 6;
+          case 8:
+            _context2.next = 10;
             return _classPrivateFieldGet(_this, _completeUploadPromise);
-          case 6:
+          case 10:
             _classPrivateFieldGet(_this, _abortController).abort();
-            _context2.next = 9;
+            _context2.next = 13;
             return abortUploadApi.create({
               recordingId: _classPrivateFieldGet(_this, _recordingId),
               payload: {
@@ -1149,7 +1144,8 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
                 isMp4: isMp4Supported()
               }
             });
-          case 9:
+          case 13:
+            logger.info("abortUpload -> abort successful");
             _classPrivateFieldSet(_this, _unUploadedChunks, []);
             _classPrivateFieldSet(_this, _partNumber, 1);
             _classPrivateFieldSet(_this, _s3PartUploadPromises, []);
@@ -1157,17 +1153,17 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               status: ""
             });
             _classPrivateFieldSet(_this, _abortController, null);
-            _context2.next = 19;
+            _context2.next = 24;
             break;
-          case 16:
-            _context2.prev = 16;
+          case 21:
+            _context2.prev = 21;
             _context2.t0 = _context2["catch"](0);
             logger.error(_context2.t0);
-          case 19:
+          case 24:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 21]]);
     })));
     _defineProperty(this, "resetState", function () {
       _classPrivateFieldSet(_this, _recordingId, "");
@@ -1175,6 +1171,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       _classPrivateFieldSet(_this, _unUploadedChunks, []);
       _classPrivateFieldSet(_this, _partNumber, 1);
       _classPrivateFieldSet(_this, _s3PartUploadPromises, []);
+      _classPrivateFieldSet(_this, _pendingS3ChunkUploads, []);
       _classPrivateFieldSet(_this, _callbacks$1, {});
       _classPrivateFieldSet(_this, _failedUpload, []);
       _classPrivateFieldSet(_this, _uploadProgress, {});
@@ -1214,15 +1211,15 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               case 0:
                 logger.info("Part ready to be uploaded: ", _classPrivateFieldGet(_this, _partNumber));
                 partNumber = _classPrivateFieldGet(_this, _partNumber);
+                mimeType = getSupportedMimeType();
                 _classPrivateFieldSet(_this, _partNumber, (_this$partNumber = _classPrivateFieldGet(_this, _partNumber), _this$partNumber++, _this$partNumber));
                 _classPrivateFieldGet(_this, _uploadProgress)[partNumber] = {
                   uploaded: 0,
                   total: new Blob(chunks, {
-                    type: MIME_TYPE.webmH264
+                    type: mimeType
                   }).size
                 };
-                _context3.prev = 4;
-                mimeType = getSupportedMimeType(MIME_TYPE.webmH264);
+                _context3.prev = 5;
                 _context3.next = 8;
                 return partPresignedUrlApi.create({
                   recordingId: _classPrivateFieldGet(_this, _recordingId),
@@ -1265,7 +1262,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
                 break;
               case 15:
                 _context3.prev = 15;
-                _context3.t0 = _context3["catch"](4);
+                _context3.t0 = _context3["catch"](5);
                 // ignore if aborted
                 if (!axios.isCancel(_context3.t0)) {
                   logger.error("Failed to upload partNumber:", partNumber);
@@ -1282,7 +1279,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               case "end":
                 return _context3.stop();
             }
-          }, _callee3, null, [[4, 15]]);
+          }, _callee3, null, [[5, 15]]);
         }));
         function value(_x) {
           return _value.apply(this, arguments);
@@ -1294,7 +1291,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       writable: true,
       value: function value() {
         return new Blob(_classPrivateFieldGet(_this, _unUploadedChunks), {
-          type: getSupportedMimeType(MIME_TYPE.webmH264)
+          type: getSupportedMimeType()
         });
       }
     });
@@ -1360,6 +1357,13 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
+// https://www.w3.org/TR/screen-capture/#displaycapturesurfacetype
+var DISPLAY_SURFACE = {
+  monitor: "monitor",
+  window: "window",
+  browser: "browser"
+};
+
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var initialState = {
@@ -1499,7 +1503,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
     });
     _defineProperty(this, "getWebmMediaBlob", function () {
       return new Blob(_classPrivateFieldGet(_this, _mediaChunks), {
-        type: getSupportedMimeType(MIME_TYPE$1.webmH264)
+        type: getSupportedMimeType()
       });
     });
     _defineProperty(this, "addCallback", function (event, callback) {
@@ -1879,6 +1883,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _classPrivateFieldGet(_this, _mediaRecorder).start(5000);
                 _classPrivateFieldGet(_this, _startTimer).call(_this);
               } catch (error) {
+                clearInterval(_classPrivateFieldGet(_this, _timerId));
                 _classPrivateFieldGet(_this, _store).setState({
                   status: SCREEN_RECORDER_STATUS.idle,
                   error: SCREEN_RECORDER_ERROR[error.name]
@@ -1887,8 +1892,9 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 // To prevent triggering #onRecordingStop when the mediaRecorder is failed to start.
                 _classPrivateFieldGet(_this, _mediaRecorder).onstop = noop;
                 if (_classPrivateFieldGet(_this, _mediaStream)) {
-                  _classPrivateFieldGet(_this, _mediaStream).getVideoTracks()[0].stop();
-                  _classPrivateFieldGet(_this, _mediaStream).getAudioTracks()[0].stop();
+                  _classPrivateFieldGet(_this, _mediaStream).getTracks().forEach(function (track) {
+                    return track.stop();
+                  });
                   _classPrivateFieldSet(_this, _mediaStream, null);
                 }
                 _classPrivateFieldSet(_this, _stream, null);