@bigbinary/neeto-media-recorder 2.7.0 → 2.7.2

package/core.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
-import { isPresent, isNotEmpty, existsBy, isNot, noop } from '@bigbinary/neeto-cist';
-import { RETRYABLE_ERRORS, MIME_TYPE as MIME_TYPE$1, UPLOAD_EVENT, UPLOAD_STATUS, SCREEN_RECORDER_STATUS, START_RECORDING_SOUND, RECORDING_LIMIT_REACHED_WARNING_SOUND, RECORDING_TIME_LIMIT_FREE_PLAN, SCREEN_RECORDER_ERROR, SCREEN_RECORDER_EVENT, 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 { isNotEmpty, existsBy, isNot, noop } from '@bigbinary/neeto-cist';
+import { MIME_TYPE as MIME_TYPE$1, UPLOAD_EVENT, UPLOAD_STATUS, SCREEN_RECORDER_STATUS, START_RECORDING_SOUND, RECORDING_LIMIT_REACHED_WARNING_SOUND, RECORDING_TIME_LIMIT_FREE_PLAN, SCREEN_RECORDER_ERROR, SCREEN_RECORDER_EVENT, 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 { useMultipartS3UploadStatus as useMultipartS3UploadStatus$1, getMultipartS3Uploader as getMultipartS3Uploader$1 } from '@bigbinary/neeto-media-recorder/core';
 import { isNotNil, min, isNil, identity, isEmpty, pick, equals, not } from 'ramda';
 import platform from 'platform';
@@ -639,11 +639,6 @@ var DEFAULT_RETRY_CONFIG = {
   retryDelay: INITIAL_RETRY_DELAY,
   retryableStatuses: []
 };
-
-// No need to localize this since it will only be used in the code
-// eslint-disable-next-line @bigbinary/neeto/hard-coded-strings-should-be-localized
-var NETWORK_ERROR = "Network Error";
-var TIMEOUT_ERROR = "ECONNABORTED";
 var HAS_CHROME_NAMESPACE = (typeof chrome === "undefined" ? "undefined" : _typeof$1(chrome)) === "object";
 HAS_CHROME_NAMESPACE && isNotNil(chrome.extension);
 platform.name === "Safari";
@@ -675,12 +670,11 @@ var buildRetryableApi = function buildRetryableApi(apiConnector) {
     _ref$retries = _ref.retries,
     retries = _ref$retries === void 0 ? TOTAL_RETRIES : _ref$retries,
     _ref$retryDelay = _ref.retryDelay,
-    retryDelay = _ref$retryDelay === void 0 ? INITIAL_RETRY_DELAY : _ref$retryDelay,
-    retryableStatuses = _ref.retryableStatuses;
+    retryDelay = _ref$retryDelay === void 0 ? INITIAL_RETRY_DELAY : _ref$retryDelay;
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(apiConnectorArgs) {
       var _config$signal;
-      var _apiConnectorArgs$con, config, remainingAttempts, shouldCancelRetries, _error$config, _error$response, isRetryableStatus, isRetryableError;
+      var _apiConnectorArgs$con, config, remainingAttempts, shouldCancelRetries, _error$config, _error$response, _error$response2;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -692,7 +686,7 @@ var buildRetryableApi = function buildRetryableApi(apiConnector) {
             });
           case 4:
             if (!(remainingAttempts-- && !shouldCancelRetries)) {
-              _context.next = 26;
+              _context.next = 24;
               break;
             }
             _context.prev = 5;
@@ -703,28 +697,26 @@ var buildRetryableApi = function buildRetryableApi(apiConnector) {
           case 11:
             _context.prev = 11;
             _context.t0 = _context["catch"](5);
-            logger.error("buildRetryableApi -> Failed to connect, remainingAttempts:", _context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$config = _context.t0.config) === null || _error$config === void 0 ? void 0 : _error$config.url, remainingAttempts);
-            isRetryableStatus = isPresent(retryableStatuses) && retryableStatuses.includes((_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : _error$response.status);
-            isRetryableError = isRetryableStatus || _context.t0.message === NETWORK_ERROR || _context.t0.code === TIMEOUT_ERROR;
-            if (!(isRetryableError && remainingAttempts > 0)) {
-              _context.next = 23;
+            logger.error("buildRetryableApi -> Failed to connect, remainingAttempts:", _context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$config = _context.t0.config) === null || _error$config === void 0 ? void 0 : _error$config.url, (_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : _error$response.status, remainingAttempts);
+            if (!(((_error$response2 = _context.t0.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) !== 401 && remainingAttempts > 0)) {
+              _context.next = 21;
               break;
             }
-            logger.info("buildRetryableApi -> Failed to connect, retry in:", retryDelay);
-            _context.next = 20;
+            logger.info("buildRetryableApi -> Failed to connect -> retry in:", retryDelay);
+            _context.next = 18;
             return sleep(retryDelay);
-          case 20:
+          case 18:
             retryDelay = min(retryDelay * 2, MAX_RETRY_DELAY);
-            _context.next = 24;
+            _context.next = 22;
             break;
-          case 23:
+          case 21:
             throw _context.t0;
-          case 24:
+          case 22:
             _context.next = 4;
             break;
-          case 26:
+          case 24:
             throw new RetryError("Request cancelled or request retries exhausted");
-          case 27:
+          case 25:
           case "end":
             return _context.stop();
         }
@@ -843,6 +835,17 @@ var getMediaRecorderOptions = function getMediaRecorderOptions() {
     mimeType: mimeType
   };
 };
+var addGainNode = function addGainNode(audioStream) {
+  var gain = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1.5;
+  var audioContext = new AudioContext();
+  var audioStreamSource = audioContext.createMediaStreamSource(audioStream);
+  var destinationStream = audioContext.createMediaStreamDestination();
+  var gainNode = audioContext.createGain();
+  gainNode.gain.value = gain;
+  audioStreamSource.connect(gainNode);
+  gainNode.connect(destinationStream);
+  return destinationStream.stream;
+};
 
 var s3AxiosInstance = axios.create({
   headers: {
@@ -858,9 +861,7 @@ var presignedUpload = function presignedUpload(_ref) {
     config = _ref.config;
   return s3AxiosInstance.put(presignedUrl, blob, config);
 };
-var retryablePresignedUpload = buildRetryableApi(presignedUpload, {
-  retryableStatuses: RETRYABLE_ERRORS
-});
+var retryablePresignedUpload = buildRetryableApi(presignedUpload);
 var s3Api = {
   presignedUpload: retryablePresignedUpload
 };
@@ -1825,7 +1826,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 });
                 _context2.prev = 1;
                 if (!_classPrivateFieldGet(_this, _audio)) {
-                  _context2.next = 24;
+                  _context2.next = 25;
                   break;
                 }
                 _context2.next = 5;
@@ -1836,46 +1837,47 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 });
               case 5:
                 audioStream = _context2.sent;
+                audioStream = addGainNode(audioStream, 1.75); // Increase volume by 50%
                 _classPrivateFieldSet(_this, _audioStream, audioStream);
                 if (!_classPrivateFieldGet(_this, _enableNoiseCancellation)) {
-                  _context2.next = 24;
+                  _context2.next = 25;
                   break;
                 }
-                _context2.prev = 8;
+                _context2.prev = 9;
                 workletUrl = IS_EXTENSION ? chrome.runtime.getURL("public/NoiseSuppressorWorklet.js") : "NoiseSuppressorWorklet.js";
                 audioContext = new AudioContext();
-                _context2.next = 13;
+                _context2.next = 14;
                 return audioContext.audioWorklet.addModule(workletUrl);
-              case 13:
+              case 14:
                 audioStreamSource = audioContext.createMediaStreamSource(audioStream);
                 destinationStream = audioContext.createMediaStreamDestination();
                 noiseSuppressorNode = new AudioWorkletNode(audioContext, "nn-suppressor-processor");
                 audioStreamSource.connect(noiseSuppressorNode);
                 noiseSuppressorNode.connect(destinationStream);
                 _classPrivateFieldSet(_this, _audioStream, destinationStream.stream);
-                _context2.next = 24;
+                _context2.next = 25;
                 break;
-              case 21:
-                _context2.prev = 21;
-                _context2.t0 = _context2["catch"](8);
+              case 22:
+                _context2.prev = 22;
+                _context2.t0 = _context2["catch"](9);
                 console.error("Failed to load audio worklet:", _context2.t0);
-              case 24:
+              case 25:
                 if (!_classPrivateFieldGet(_this, _videoStream)) {
-                  _context2.next = 28;
+                  _context2.next = 29;
                   break;
                 }
                 stream = _classPrivateFieldGet(_this, _videoStream);
-                _context2.next = 31;
+                _context2.next = 32;
                 break;
-              case 28:
-                _context2.next = 30;
+              case 29:
+                _context2.next = 31;
                 return window.navigator.mediaDevices.getDisplayMedia({
                   video: _classPrivateFieldGet(_this, _video) || true,
                   audio: true
                 });
-              case 30:
-                stream = _context2.sent;
               case 31:
+                stream = _context2.sent;
+              case 32:
                 // Event triggered when the user clicks on the stop sharing overlay button
                 stream.getVideoTracks()[0].addEventListener("ended", function () {
                   _this.stopRecording();
@@ -1906,10 +1908,10 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _classPrivateFieldGet(_this, _store).setState({
                   status: SCREEN_RECORDER_STATUS.media_acquired
                 });
-                _context2.next = 43;
+                _context2.next = 44;
                 break;
-              case 40:
-                _context2.prev = 40;
+              case 41:
+                _context2.prev = 41;
                 _context2.t1 = _context2["catch"](1);
                 if (_classPrivateFieldGet(_this, _audio) && !_classPrivateFieldGet(_this, _audioStream)) {
                   _classPrivateFieldGet(_this, _store).setState({
@@ -1922,11 +1924,11 @@ var ScreenRecorder = /*#__PURE__*/function () {
                     status: SCREEN_RECORDER_STATUS.idle
                   });
                 }
-              case 43:
+              case 44:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[1, 40], [8, 21]]);
+          }, _callee2, null, [[1, 41], [9, 22]]);
         }));
         function value() {
           return _value.apply(this, arguments);