@bigbinary/neeto-media-recorder 2.7.35 → 2.7.36

package/core.js

@@ -745,54 +745,74 @@ var buildRetryableApi = function buildRetryableApi(apiConnector) {
     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 _config$signal, _config$signal2;
       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:
-            _apiConnectorArgs$con = apiConnectorArgs.config, config = _apiConnectorArgs$con === void 0 ? null : _apiConnectorArgs$con;
+            _apiConnectorArgs$con = apiConnectorArgs.config, config = _apiConnectorArgs$con === void 0 ? null : _apiConnectorArgs$con; // If the signal is already aborted before we start, addEventListener("abort")
+            // will never fire — so we'd otherwise run the full retry/backoff schedule
+            // against an aborted request.
+            if (!(config !== null && config !== void 0 && (_config$signal = config.signal) !== null && _config$signal !== void 0 && _config$signal.aborted)) {
+              _context.next = 3;
+              break;
+            }
+            throw new RetryError("Request cancelled or request retries exhausted");
+          case 3:
             remainingAttempts = retries + 1;
             shouldCancelRetries = false;
-            config === null || config === void 0 ? void 0 : (_config$signal = config.signal) === null || _config$signal === void 0 ? void 0 : _config$signal.addEventListener("abort", function () {
+            config === null || config === void 0 ? void 0 : (_config$signal2 = config.signal) === null || _config$signal2 === void 0 ? void 0 : _config$signal2.addEventListener("abort", function () {
               shouldCancelRetries = true;
             });
-          case 4:
+          case 6:
             if (!(remainingAttempts-- && !shouldCancelRetries)) {
-              _context.next = 24;
+              _context.next = 30;
               break;
             }
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 7;
+            _context.next = 10;
             return apiConnector(apiConnectorArgs);
-          case 8:
+          case 10:
             return _context.abrupt("return", _context.sent);
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](5);
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](7);
+            if (!axios.isCancel(_context.t0)) {
+              _context.next = 17;
+              break;
+            }
+            throw _context.t0;
+          case 17:
             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;
+              _context.next = 27;
               break;
             }
             logger.info("buildRetryableApi -> Failed to connect -> retry in:", retryDelay);
-            _context.next = 18;
+            _context.next = 22;
             return sleep(retryDelay);
-          case 18:
+          case 22:
             retryDelay = min(retryDelay * 2, MAX_RETRY_DELAY);
-            _context.next = 22;
+            if (!shouldCancelRetries) {
+              _context.next = 25;
+              break;
+            }
+            throw _context.t0;
+          case 25:
+            _context.next = 28;
             break;
-          case 21:
+          case 27:
             throw _context.t0;
-          case 22:
-            _context.next = 4;
+          case 28:
+            _context.next = 6;
             break;
-          case 24:
+          case 30:
             throw new RetryError("Request cancelled or request retries exhausted");
-          case 25:
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 11]]);
+      }, _callee, null, [[7, 13]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -1007,10 +1027,15 @@ var _serializeUploadError = /*#__PURE__*/new WeakMap();
 var _uploadChunkToS = /*#__PURE__*/new WeakMap();
 var _getCurrentUnUploadedBlob = /*#__PURE__*/new WeakMap();
 var _isRecordingNotSet = /*#__PURE__*/new WeakMap();
+var _isTerminalStatus = /*#__PURE__*/new WeakMap();
 var MultipartS3Uploader = /*#__PURE__*/function () {
   function MultipartS3Uploader() {
     var _this = this;
     _classCallCheck(this, MultipartS3Uploader);
+    _classPrivateFieldInitSpec$1(this, _isTerminalStatus, {
+      get: _get_isTerminalStatus,
+      set: void 0
+    });
     _classPrivateFieldInitSpec$1(this, _isRecordingNotSet, {
       get: _get_isRecordingNotSet,
       set: void 0
@@ -1097,6 +1122,19 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       _classPrivateFieldSet(_this, _abortController, new AbortController());
     });
     _defineProperty(this, "push", function (data) {
+      // Once an uploader has been aborted, any further chunks belong to a
+      // recording that no longer exists server-side. Drop them so we don't
+      // spawn new part uploads against an aborted multipart upload (which
+      // would otherwise loop on retries until the network gives up).
+      if (_classPrivateFieldGet(_this, _isTerminalStatus)) {
+        _classPrivateFieldGet(_this, _logger$1).warn("push -> uploader is no longer active, dropping chunk", {
+          chunkBytes: data === null || data === void 0 ? void 0 : data.size,
+          status: _classPrivateFieldGet(_this, _status),
+          recordingId: _classPrivateFieldGet(_this, _recordingId)
+        });
+        _classPrivateFieldSet(_this, _unUploadedChunks, []);
+        return;
+      }
       if (data.size > 0) {
         _classPrivateFieldGet(_this, _unUploadedChunks).push(data);
       }
@@ -1280,6 +1318,8 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       var forceAbort,
         sessionLogs,
         abortStartedAt,
+        phase,
+        _classPrivateFieldGet3,
         recordingId,
         uploadId,
         _args2 = arguments;
@@ -1289,24 +1329,25 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
             forceAbort = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : false;
             sessionLogs = _args2.length > 1 ? _args2[1] : undefined;
             abortStartedAt = Date.now();
-            _context2.prev = 3;
+            phase = "init";
+            _context2.prev = 4;
             if (!(_this.status === UPLOAD_STATUS.aborting && !forceAbort)) {
-              _context2.next = 7;
+              _context2.next = 8;
               break;
             }
             _classPrivateFieldGet(_this, _logger$1).info("abortUpload -> already aborting", {
               forceAbort: forceAbort
             });
             return _context2.abrupt("return");
-          case 7:
+          case 8:
             _classPrivateFieldSet(_this, _status2, UPLOAD_STATUS.aborting);
             if (!_classPrivateFieldGet(_this, _isRecordingNotSet)) {
-              _context2.next = 11;
+              _context2.next = 12;
               break;
             }
             _classPrivateFieldGet(_this, _logger$1).info("abortUpload -> not initialized");
             return _context2.abrupt("return");
-          case 11:
+          case 12:
             recordingId = _classPrivateFieldGet(_this, _recordingId);
             uploadId = _classPrivateFieldGet(_this, _uploadId);
             _classPrivateFieldGet(_this, _logger$1).info("abortUpload -> begin", {
@@ -1314,18 +1355,25 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
               uploadId: uploadId,
               forceAbort: forceAbort,
               partsStarted: _classPrivateFieldGet(_this, _partNumber) - 1,
-              pendingS3ChunkUploads: _classPrivateFieldGet(_this, _pendingS3ChunkUploads).length
+              pendingS3ChunkUploads: _classPrivateFieldGet(_this, _pendingS3ChunkUploads).length,
+              hasAbortController: Boolean(_classPrivateFieldGet(_this, _abortController))
             });
 
             // Don't let a rejected completeUpload stop us from issuing the abort API
             // call below — we still need to release the upload server-side.
+            phase = "awaitCompleteUploadPromise";
             // eslint-disable-next-line promise/prefer-await-to-then
-            _context2.next = 16;
+            _context2.next = 18;
             return Promise.resolve(_classPrivateFieldGet(_this, _completeUploadPromise))["catch"](function () {});
-          case 16:
-            _classPrivateFieldGet(_this, _abortController).abort();
-            _context2.prev = 17;
-            _context2.next = 20;
+          case 18:
+            // Guard against a missing AbortController. If abortUpload is somehow
+            // invoked twice, the second call would hit a null #abortController and
+            // throw a TypeError into the outer catch — masking the real failure.
+            phase = "abortInflight";
+            (_classPrivateFieldGet3 = _classPrivateFieldGet(_this, _abortController)) === null || _classPrivateFieldGet3 === void 0 ? void 0 : _classPrivateFieldGet3.abort();
+            phase = "abortUploadApi";
+            _context2.prev = 21;
+            _context2.next = 24;
             return abortUploadApi.create({
               recordingId: recordingId,
               payload: {
@@ -1334,41 +1382,45 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
                 logs: sessionLogs
               }
             });
-          case 20:
+          case 24:
             _classPrivateFieldGet(_this, _logger$1).info("abortUpload -> success", {
               durationMs: Date.now() - abortStartedAt
             });
-            _context2.next = 26;
+            _context2.next = 30;
             break;
-          case 23:
-            _context2.prev = 23;
-            _context2.t0 = _context2["catch"](17);
+          case 27:
+            _context2.prev = 27;
+            _context2.t0 = _context2["catch"](21);
             // After retries are exhausted, proceed with local cleanup so the
             // caller can navigate away / close tab. The server-side upload
             // will be cleaned up by S3 lifecycle rules.
             _classPrivateFieldGet(_this, _logger$1).error("abortUpload -> mark as discarded failed", _objectSpread$2(_objectSpread$2({}, _classPrivateFieldGet(_this, _serializeUploadError).call(_this, _context2.t0)), {}, {
               durationMs: Date.now() - abortStartedAt
             }));
-          case 26:
+          case 30:
+            phase = "fireOnAbort";
             _classPrivateFieldGet(_this, _fireCallbacks$1).call(_this, UPLOAD_EVENT.onAbort);
+            phase = "cleanup";
             _classPrivateFieldSet(_this, _unUploadedChunks, []);
             _classPrivateFieldSet(_this, _partNumber, 1);
             _classPrivateFieldSet(_this, _s3PartUploadPromises, []);
             _classPrivateFieldSet(_this, _status2, "");
             _classPrivateFieldSet(_this, _abortController, null);
-            _context2.next = 37;
+            _context2.next = 43;
             break;
-          case 34:
-            _context2.prev = 34;
-            _context2.t1 = _context2["catch"](3);
-            _classPrivateFieldGet(_this, _logger$1).error("abortUpload -> failed", _objectSpread$2(_objectSpread$2({}, _classPrivateFieldGet(_this, _serializeUploadError).call(_this, _context2.t1)), {}, {
+          case 40:
+            _context2.prev = 40;
+            _context2.t1 = _context2["catch"](4);
+            _classPrivateFieldGet(_this, _logger$1).error("abortUpload -> failed", _objectSpread$2(_objectSpread$2({
+              phase: phase
+            }, _classPrivateFieldGet(_this, _serializeUploadError).call(_this, _context2.t1)), {}, {
               durationMs: Date.now() - abortStartedAt
             }));
-          case 37:
+          case 43:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 34], [17, 23]]);
+      }, _callee2, null, [[4, 40], [21, 27]]);
     })));
     _defineProperty(this, "resetState", function () {
       _classPrivateFieldSet(_this, _recordingId, "");
@@ -1384,22 +1436,22 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       _classPrivateFieldSet(_this, _status2, "");
     });
     _defineProperty(this, "addCallback", function (event, callback) {
-      var _classPrivateFieldGet3;
-      var existingCallbacks = (_classPrivateFieldGet3 = _classPrivateFieldGet(_this, _callbacks$1)[event]) !== null && _classPrivateFieldGet3 !== void 0 ? _classPrivateFieldGet3 : [];
+      var _classPrivateFieldGet4;
+      var existingCallbacks = (_classPrivateFieldGet4 = _classPrivateFieldGet(_this, _callbacks$1)[event]) !== null && _classPrivateFieldGet4 !== void 0 ? _classPrivateFieldGet4 : [];
       _classPrivateFieldSet(_this, _callbacks$1, _objectSpread$2(_objectSpread$2({}, _classPrivateFieldGet(_this, _callbacks$1)), {}, _defineProperty({}, event, [].concat(_toConsumableArray(existingCallbacks), [callback]))));
     });
     _defineProperty(this, "removeCallback", function (event, callback) {
-      var _classPrivateFieldGet4;
-      var registeredCallbacks = (_classPrivateFieldGet4 = _classPrivateFieldGet(_this, _callbacks$1)[event]) !== null && _classPrivateFieldGet4 !== void 0 ? _classPrivateFieldGet4 : [];
+      var _classPrivateFieldGet5;
+      var registeredCallbacks = (_classPrivateFieldGet5 = _classPrivateFieldGet(_this, _callbacks$1)[event]) !== null && _classPrivateFieldGet5 !== void 0 ? _classPrivateFieldGet5 : [];
       var updatedCallbacks = registeredCallbacks.filter(isNot(callback));
       _classPrivateFieldSet(_this, _callbacks$1, _objectSpread$2(_objectSpread$2({}, _classPrivateFieldGet(_this, _callbacks$1)), {}, _defineProperty({}, event, updatedCallbacks)));
     });
     _classPrivateFieldInitSpec$1(this, _fireCallbacks$1, {
       writable: true,
       value: function value(event) {
-        var _classPrivateFieldGet5;
+        var _classPrivateFieldGet6;
         var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-        (_classPrivateFieldGet5 = _classPrivateFieldGet(_this, _callbacks$1)[event]) === null || _classPrivateFieldGet5 === void 0 ? void 0 : _classPrivateFieldGet5.forEach(function (callback) {
+        (_classPrivateFieldGet6 = _classPrivateFieldGet(_this, _callbacks$1)[event]) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.forEach(function (callback) {
           callback.apply(void 0, _toConsumableArray(args));
         });
       }
@@ -1449,7 +1501,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "generatePreSignedUrl", function (partNumber) {
-      var _classPrivateFieldGet6;
+      var _classPrivateFieldGet7;
       return partPresignedUrlApi.create({
         recordingId: _classPrivateFieldGet(_this, _recordingId),
         payload: {
@@ -1458,7 +1510,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
           isMp4: _classPrivateFieldGet(_this, _mimeType$1).includes(MIME_TYPE.mp4)
         },
         config: {
-          signal: (_classPrivateFieldGet6 = _classPrivateFieldGet(_this, _abortController)) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.signal
+          signal: (_classPrivateFieldGet7 = _classPrivateFieldGet(_this, _abortController)) === null || _classPrivateFieldGet7 === void 0 ? void 0 : _classPrivateFieldGet7.signal
         }
       });
     });
@@ -1466,7 +1518,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
       writable: true,
       value: function () {
         var _value = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(chunks) {
-          var _this$partNumber, _classPrivateFieldGet7;
+          var _this$partNumber, _classPrivateFieldGet8;
           var partNumber, partBlob, partBytes, presignStartedAt, presignedUrl, _yield$_this$generate, uploadStartedAt, s3PartUploadPromise;
           return _regeneratorRuntime.wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
@@ -1520,7 +1572,7 @@ var MultipartS3Uploader = /*#__PURE__*/function () {
                       "Content-Type": _classPrivateFieldGet(_this, _mimeType$1)
                     },
                     includeMetadataInResponse: true,
-                    signal: (_classPrivateFieldGet7 = _classPrivateFieldGet(_this, _abortController)) === null || _classPrivateFieldGet7 === void 0 ? void 0 : _classPrivateFieldGet7.signal,
+                    signal: (_classPrivateFieldGet8 = _classPrivateFieldGet(_this, _abortController)) === null || _classPrivateFieldGet8 === void 0 ? void 0 : _classPrivateFieldGet8.signal,
                     onUploadProgress: function onUploadProgress(e) {
                       _classPrivateFieldGet(_this, _uploadProgress)[partNumber] = {
                         uploaded: e.loaded,
@@ -1621,6 +1673,9 @@ function _set_status(status) {
 function _get_isRecordingNotSet() {
   return isEmpty(_classPrivateFieldGet(this, _uploadId) + _classPrivateFieldGet(this, _recordingId));
 }
+function _get_isTerminalStatus() {
+  return _classPrivateFieldGet(this, _status) === UPLOAD_STATUS.aborting || _classPrivateFieldGet(this, _status) === UPLOAD_STATUS.completed || _classPrivateFieldGet(this, _status) === UPLOAD_STATUS.error;
+}
 var multipartS3Uploader = new MultipartS3Uploader();
 var getMultipartS3Uploader = function getMultipartS3Uploader() {
   var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},