@bigbinary/neeto-media-recorder 2.7.56 → 2.7.57

package/core.js

@@ -1271,9 +1271,8 @@ var isMp4Supported = function isMp4Supported() {
   var mimeType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getSupportedMimeType();
   return mimeType.includes(MIME_TYPE.mp4);
 };
-var addGainNode = function addGainNode(audioStream) {
-  var gain = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1.5;
-  var audioContext = new AudioContext();
+var addGainNode = function addGainNode(audioContext, audioStream) {
+  var gain = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1.5;
   var audioStreamSource = audioContext.createMediaStreamSource(audioStream);
   var destinationStream = audioContext.createMediaStreamDestination();
   var gainNode = audioContext.createGain();
@@ -2113,6 +2112,7 @@ var _stopRecordingDueToLimitReachedAudio = /*#__PURE__*/new WeakMap();
 var _stream = /*#__PURE__*/new WeakMap();
 var _audioStream = /*#__PURE__*/new WeakMap();
 var _micAudioStream = /*#__PURE__*/new WeakMap();
+var _audioContexts = /*#__PURE__*/new WeakMap();
 var _timeLimit = /*#__PURE__*/new WeakMap();
 var _startRecordingTimeoutID = /*#__PURE__*/new WeakMap();
 var _enableNoiseCancellation = /*#__PURE__*/new WeakMap();
@@ -2123,6 +2123,8 @@ var _dataReceiving = /*#__PURE__*/new WeakMap();
 var _recordSystemAudio = /*#__PURE__*/new WeakMap();
 var _hasSpeechSourceForTitle = /*#__PURE__*/new WeakMap();
 var _stopAllStreams = /*#__PURE__*/new WeakMap();
+var _createAudioContext = /*#__PURE__*/new WeakMap();
+var _releaseAudio = /*#__PURE__*/new WeakMap();
 var _playCountdownBeep = /*#__PURE__*/new WeakMap();
 var _checkCompatibility = /*#__PURE__*/new WeakMap();
 var _acquireMediaStream = /*#__PURE__*/new WeakMap();
@@ -2140,6 +2142,9 @@ var _startTimer = /*#__PURE__*/new WeakMap();
 var _stopTimer = /*#__PURE__*/new WeakMap();
 var _checkIfTimeLimitReached = /*#__PURE__*/new WeakMap();
 var ScreenRecorder = /*#__PURE__*/function () {
+  // Every AudioContext created for gain, noise suppression and mixing. Kept so
+  // they can be closed when the streams stop instead of leaking per recording.
+
   // Lets a host (e.g. the chrome extension) take over the countdown beeps and
   // recording-start chime so it can schedule them via Web Audio. Defaults to
   // true to preserve behavior for callers that don't manage audio themselves.
@@ -2223,6 +2228,10 @@ var ScreenRecorder = /*#__PURE__*/function () {
       writable: true,
       value: void 0
     });
+    _classPrivateFieldInitSpec(this, _audioContexts, {
+      writable: true,
+      value: []
+    });
     _classPrivateFieldInitSpec(this, _timeLimit, {
       writable: true,
       value: RECORDING_TIME_LIMIT_FREE_PLAN
@@ -2353,15 +2362,19 @@ var ScreenRecorder = /*#__PURE__*/function () {
             return _classPrivateFieldGet(_this, _acquireMediaStream).call(_this);
           case 6:
             if (!(_classPrivateFieldGet(_this, _mediaStream) && isStreamEnded(_classPrivateFieldGet(_this, _mediaStream)))) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             _classPrivateFieldGet(_this, _logger).info("startRecording -> media stream ended, re-acquiring", _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _mediaStream)));
-            _context.next = 10;
+            // Re-acquiring opens a new mic stream, so release the old one first or
+            // the previous mic stays in use. Only the audio side is released: an
+            // injected videoStream is reused as-is by #acquireMediaStream.
+            _classPrivateFieldGet(_this, _releaseAudio).call(_this);
+            _context.next = 11;
             return _classPrivateFieldGet(_this, _acquireMediaStream).call(_this);
-          case 10:
+          case 11:
             if (!(!_classPrivateFieldGet(_this, _mediaStream) || isStreamEnded(_classPrivateFieldGet(_this, _mediaStream)))) {
-              _context.next = 13;
+              _context.next = 14;
               break;
             }
             _classPrivateFieldGet(_this, _logger).warn("startRecording -> aborting, media stream unavailable", {
@@ -2369,7 +2382,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
               isEnded: _classPrivateFieldGet(_this, _mediaStream) ? isStreamEnded(_classPrivateFieldGet(_this, _mediaStream)) : true
             });
             return _context.abrupt("return");
-          case 13:
+          case 14:
             options = getMediaRecorderOptions();
             _classPrivateFieldGet(_this, _logger).info("startRecording -> creating MediaRecorder", {
               options: options,
@@ -2377,13 +2390,13 @@ var ScreenRecorder = /*#__PURE__*/function () {
               stream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _mediaStream))
             });
             _classPrivateFieldSet(_this, _mediaChunks, []);
-            _context.prev = 16;
+            _context.prev = 17;
             _classPrivateFieldSet(_this, _mediaRecorder, new MediaRecorder(_classPrivateFieldGet(_this, _mediaStream), options));
-            _context.next = 25;
+            _context.next = 26;
             break;
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](16);
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](17);
             _classPrivateFieldGet(_this, _logger).error("startRecording -> failed to construct MediaRecorder", _classPrivateFieldGet(_this, _serializeError).call(_this, _context.t0), {
               options: options,
               mimeType: _classPrivateFieldGet(_this, _mimeType)
@@ -2393,7 +2406,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
               error: SCREEN_RECORDER_ERROR.NoRecorder
             });
             return _context.abrupt("return");
-          case 25:
+          case 26:
             _classPrivateFieldGet(_this, _logger).info("startRecording -> MediaRecorder created", {
               state: _classPrivateFieldGet(_this, _mediaRecorder).state,
               mimeType: _classPrivateFieldGet(_this, _mediaRecorder).mimeType,
@@ -2428,11 +2441,11 @@ var ScreenRecorder = /*#__PURE__*/function () {
               });
               _classPrivateFieldGet(_this, _startMediaRecorder).call(_this);
             }
-          case 31:
+          case 32:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[16, 20]]);
+      }, _callee, null, [[17, 21]]);
     })));
     _defineProperty(this, "stopRecording", function () {
       var _classPrivateFieldGet5;
@@ -2578,7 +2591,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _stopAllStreams, {
       writable: true,
       value: function value() {
-        var _classPrivateFieldGet14, _classPrivateFieldGet15, _classPrivateFieldGet16, _classPrivateFieldGet17, _classPrivateFieldGet18, _classPrivateFieldGet19;
+        var _classPrivateFieldGet14, _classPrivateFieldGet15;
         getFastTitleRunner().stop();
         _classPrivateFieldGet(_this, _logger).info("stopAllStreams", {
           mediaStream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _mediaStream)),
@@ -2592,12 +2605,31 @@ var ScreenRecorder = /*#__PURE__*/function () {
         (_classPrivateFieldGet15 = _classPrivateFieldGet(_this, _stream)) === null || _classPrivateFieldGet15 === void 0 ? void 0 : _classPrivateFieldGet15.getTracks().forEach(function (track) {
           return track.stop();
         });
+        _classPrivateFieldGet(_this, _releaseAudio).call(_this);
+      }
+    });
+    _classPrivateFieldInitSpec(this, _createAudioContext, {
+      writable: true,
+      value: function value() {
+        var audioContext = new AudioContext();
+        _classPrivateFieldGet(_this, _audioContexts).push(audioContext);
+        return audioContext;
+      }
+    });
+    _classPrivateFieldInitSpec(this, _releaseAudio, {
+      writable: true,
+      value: function value() {
+        var _classPrivateFieldGet16, _classPrivateFieldGet17, _classPrivateFieldGet18, _classPrivateFieldGet19;
         (_classPrivateFieldGet16 = _classPrivateFieldGet(_this, _audioStream)) === null || _classPrivateFieldGet16 === void 0 ? void 0 : (_classPrivateFieldGet17 = _classPrivateFieldGet16.getAudioTracks()) === null || _classPrivateFieldGet17 === void 0 ? void 0 : _classPrivateFieldGet17.forEach(function (track) {
           return track.stop();
         });
         (_classPrivateFieldGet18 = _classPrivateFieldGet(_this, _micAudioStream)) === null || _classPrivateFieldGet18 === void 0 ? void 0 : (_classPrivateFieldGet19 = _classPrivateFieldGet18.getAudioTracks()) === null || _classPrivateFieldGet19 === void 0 ? void 0 : _classPrivateFieldGet19.forEach(function (track) {
           return track.stop();
         });
+        _classPrivateFieldGet(_this, _audioContexts).forEach(function (audioContext) {
+          if (audioContext.state !== "closed") audioContext.close();
+        });
+        _classPrivateFieldSet(_this, _audioContexts, []);
       }
     });
     _classPrivateFieldInitSpec(this, _playCountdownBeep, {
@@ -2630,7 +2662,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
       writable: true,
       value: function () {
         var _value = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          var acquireStartedAt, micState, stream, constraints, displayMediaStartedAt, audioConfig, micStartedAt, audioStream, workletUrl, workletStartedAt, audioContext, audioStreamSource, destinationStream, noiseSuppressorNode, finalStream, _audioContext, desktopAudio, microphoneAudio, combinedAudio;
+          var acquireStartedAt, micState, stream, hasAcquiredMedia, constraints, displayMediaStartedAt, audioConfig, micStartedAt, audioStream, workletUrl, workletStartedAt, audioContext, audioStreamSource, destinationStream, noiseSuppressorNode, finalStream, _audioContext, desktopAudio, microphoneAudio, combinedAudio;
           return _regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -2665,37 +2697,38 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 });
                 return _context2.abrupt("return");
               case 11:
-                _context2.prev = 11;
+                hasAcquiredMedia = false;
+                _context2.prev = 12;
                 if (!_classPrivateFieldGet(_this, _videoStream)) {
-                  _context2.next = 17;
+                  _context2.next = 18;
                   break;
                 }
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> using injected videoStream", _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _videoStream)));
                 stream = _classPrivateFieldGet(_this, _videoStream);
-                _context2.next = 25;
+                _context2.next = 26;
                 break;
-              case 17:
+              case 18:
                 constraints = {
                   video: _classPrivateFieldGet(_this, _video),
                   audio: _classPrivateFieldGet(_this, _recordSystemAudio)
                 };
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> getDisplayMedia constraints", constraints);
                 displayMediaStartedAt = Date.now();
-                _context2.next = 22;
+                _context2.next = 23;
                 return window.navigator.mediaDevices.getDisplayMedia(constraints);
-              case 22:
+              case 23:
                 stream = _context2.sent;
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> getDisplayMedia resolved", {
                   durationMs: Date.now() - displayMediaStartedAt,
                   stream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, stream)
                 });
                 _classPrivateFieldGet(_this, _fireCallbacks).call(_this, SCREEN_RECORDER_EVENT.onShareSelected);
-              case 25:
+              case 26:
                 if (!_classPrivateFieldGet(_this, _audio)) {
-                  _context2.next = 68;
+                  _context2.next = 69;
                   break;
                 }
-                _context2.prev = 26;
+                _context2.prev = 27;
                 audioConfig = {
                   audio: _objectSpread(_objectSpread({
                     echoCancellation: false
@@ -2710,31 +2743,31 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _context2.t0 = _classPrivateFieldSet;
                 _context2.t1 = _this;
                 _context2.t2 = _micAudioStream;
-                _context2.next = 35;
+                _context2.next = 36;
                 return window.navigator.mediaDevices.getUserMedia(audioConfig);
-              case 35:
+              case 36:
                 _context2.t3 = _context2.sent;
                 (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t3);
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> mic acquired", {
                   durationMs: Date.now() - micStartedAt,
                   stream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _micAudioStream))
                 });
-                audioStream = addGainNode(_classPrivateFieldGet(_this, _micAudioStream), 1.75); // Increase volume by 50%
+                audioStream = addGainNode(_classPrivateFieldGet(_this, _createAudioContext).call(_this), _classPrivateFieldGet(_this, _micAudioStream), 1.75); // Increase volume by 50%
                 _classPrivateFieldSet(_this, _audioStream, audioStream);
                 if (!_classPrivateFieldGet(_this, _enableNoiseCancellation)) {
-                  _context2.next = 60;
+                  _context2.next = 61;
                   break;
                 }
-                _context2.prev = 41;
+                _context2.prev = 42;
                 workletUrl = IS_EXTENSION ? chrome.runtime.getURL("public/NoiseSuppressorWorklet.js") : "NoiseSuppressorWorklet.js";
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> loading noise suppressor worklet", {
                   workletUrl: workletUrl
                 });
                 workletStartedAt = Date.now();
-                audioContext = new AudioContext();
-                _context2.next = 48;
+                audioContext = _classPrivateFieldGet(_this, _createAudioContext).call(_this);
+                _context2.next = 49;
                 return audioContext.audioWorklet.addModule(workletUrl);
-              case 48:
+              case 49:
                 audioStreamSource = audioContext.createMediaStreamSource(audioStream);
                 destinationStream = audioContext.createMediaStreamDestination();
                 noiseSuppressorNode = new AudioWorkletNode(audioContext, "nn-suppressor-processor");
@@ -2744,18 +2777,18 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> noise suppressor wired up", {
                   durationMs: Date.now() - workletStartedAt
                 });
-                _context2.next = 60;
+                _context2.next = 61;
                 break;
-              case 57:
-                _context2.prev = 57;
-                _context2.t4 = _context2["catch"](41);
+              case 58:
+                _context2.prev = 58;
+                _context2.t4 = _context2["catch"](42);
                 _classPrivateFieldGet(_this, _logger).error("acquireMediaStream -> failed to load audio worklet", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t4));
-              case 60:
-                _context2.next = 68;
+              case 61:
+                _context2.next = 69;
                 break;
-              case 62:
-                _context2.prev = 62;
-                _context2.t5 = _context2["catch"](26);
+              case 63:
+                _context2.prev = 63;
+                _context2.t5 = _context2["catch"](27);
                 // Mic access can fail independently of screen capture (OS-level
                 // block, no device, deviceId mismatch). Stop the screen stream and
                 // surface a mic-only error so the user sees the proper callout
@@ -2775,7 +2808,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
                   status: SCREEN_RECORDER_STATUS.idle
                 });
                 return _context2.abrupt("return");
-              case 68:
+              case 69:
                 // Fired when capture ends without the app calling stop() — the browser's
                 // "Stop sharing" pill or an OS-level termination. When a consumer is
                 // listening for onUnexpectedEnd, hand the decision (finish/discard, show
@@ -2800,7 +2833,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 if (_classPrivateFieldGet(_this, _audio) && _classPrivateFieldGet(_this, _audioStream)) {
                   if (isNotEmpty(stream.getAudioTracks())) {
                     _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> mixing system audio + mic");
-                    _audioContext = new AudioContext();
+                    _audioContext = _classPrivateFieldGet(_this, _createAudioContext).call(_this);
                     desktopAudio = _audioContext.createMediaStreamSource(stream);
                     microphoneAudio = _audioContext.createMediaStreamSource(_classPrivateFieldGet(_this, _audioStream));
                     combinedAudio = _audioContext.createMediaStreamDestination();
@@ -2828,6 +2861,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 });
                 _classPrivateFieldSet(_this, _mediaStream, finalStream);
                 _classPrivateFieldSet(_this, _stream, stream);
+                hasAcquiredMedia = true;
                 _classPrivateFieldGet(_this, _store).setState({
                   status: SCREEN_RECORDER_STATUS.media_acquired
                 });
@@ -2835,11 +2869,11 @@ var ScreenRecorder = /*#__PURE__*/function () {
                   totalDurationMs: Date.now() - acquireStartedAt,
                   finalStream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _mediaStream))
                 });
-                _context2.next = 82;
+                _context2.next = 85;
                 break;
-              case 78:
-                _context2.prev = 78;
-                _context2.t6 = _context2["catch"](11);
+              case 80:
+                _context2.prev = 80;
+                _context2.t6 = _context2["catch"](12);
                 _classPrivateFieldGet(_this, _logger).error("acquireMediaStream -> error", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t6), {
                   totalDurationMs: Date.now() - acquireStartedAt,
                   hasAudio: Boolean(_classPrivateFieldGet(_this, _audio)),
@@ -2862,11 +2896,27 @@ var ScreenRecorder = /*#__PURE__*/function () {
                     status: SCREEN_RECORDER_STATUS.idle
                   });
                 }
-              case 82:
+
+                // A failure after the display/mic were opened but before they were
+                // handed to #mediaStream leaves them running with nothing to stop them,
+                // keeping the mic in use. Release them here, after the error checks
+                // above have read #audioStream. An injected videoStream is owned by the
+                // caller, so it is left alone.
+                if (!hasAcquiredMedia) {
+                  if (stream && stream !== _classPrivateFieldGet(_this, _videoStream)) {
+                    stream.getTracks().forEach(function (track) {
+                      return track.stop();
+                    });
+                  }
+                  _classPrivateFieldGet(_this, _releaseAudio).call(_this);
+                  _classPrivateFieldSet(_this, _audioStream, null);
+                  _classPrivateFieldSet(_this, _micAudioStream, null);
+                }
+              case 85:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[11, 78], [26, 62], [41, 57]]);
+          }, _callee2, null, [[12, 80], [27, 63], [42, 58]]);
         }));
         function value() {
           return _value.apply(this, arguments);