@bigbinary/neeto-media-recorder 2.7.33 → 2.7.34

package/core.js

@@ -1719,6 +1719,7 @@ var _fireCallbacks = /*#__PURE__*/new WeakMap();
 var _onRecordingStart = /*#__PURE__*/new WeakMap();
 var _onRecordingActive = /*#__PURE__*/new WeakMap();
 var _onRecordingStop = /*#__PURE__*/new WeakMap();
+var _queryMicPermissionState = /*#__PURE__*/new WeakMap();
 var _serializeError = /*#__PURE__*/new WeakMap();
 var _summarizeStream = /*#__PURE__*/new WeakMap();
 var _summarizeRecorderState = /*#__PURE__*/new WeakMap();
@@ -2171,7 +2172,7 @@ var ScreenRecorder = /*#__PURE__*/function () {
       writable: true,
       value: function () {
         var _value = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          var acquireStartedAt, stream, constraints, displayMediaStartedAt, audioConfig, micStartedAt, audioStream, workletUrl, workletStartedAt, audioContext, audioStreamSource, destinationStream, noiseSuppressorNode, finalStream, _audioContext, desktopAudio, microphoneAudio, combinedAudio;
+          var acquireStartedAt, micState, stream, 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:
@@ -2185,37 +2186,58 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _classPrivateFieldGet(_this, _store).setState({
                   status: SCREEN_RECORDER_STATUS.acquiring_media
                 });
-                _context2.prev = 3;
+                if (!(_classPrivateFieldGet(_this, _audio) && !_classPrivateFieldGet(_this, _videoStream))) {
+                  _context2.next = 11;
+                  break;
+                }
+                _context2.next = 6;
+                return _classPrivateFieldGet(_this, _queryMicPermissionState).call(_this);
+              case 6:
+                micState = _context2.sent;
+                if (!(micState === "denied")) {
+                  _context2.next = 11;
+                  break;
+                }
+                _classPrivateFieldGet(_this, _logger).warn("acquireMediaStream -> mic permission denied, skipping screen prompt", {
+                  micState: micState
+                });
+                _classPrivateFieldGet(_this, _store).setState({
+                  error: SCREEN_RECORDER_ERROR.MicPermissionDenied,
+                  status: SCREEN_RECORDER_STATUS.idle
+                });
+                return _context2.abrupt("return");
+              case 11:
+                _context2.prev = 11;
                 if (!_classPrivateFieldGet(_this, _videoStream)) {
-                  _context2.next = 9;
+                  _context2.next = 17;
                   break;
                 }
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> using injected videoStream", _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _videoStream)));
                 stream = _classPrivateFieldGet(_this, _videoStream);
-                _context2.next = 17;
+                _context2.next = 25;
                 break;
-              case 9:
+              case 17:
                 constraints = {
                   video: _classPrivateFieldGet(_this, _video),
                   audio: _classPrivateFieldGet(_this, _recordSystemAudio)
                 };
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> getDisplayMedia constraints", constraints);
                 displayMediaStartedAt = Date.now();
-                _context2.next = 14;
+                _context2.next = 22;
                 return window.navigator.mediaDevices.getDisplayMedia(constraints);
-              case 14:
+              case 22:
                 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 17:
+              case 25:
                 if (!_classPrivateFieldGet(_this, _audio)) {
-                  _context2.next = 57;
+                  _context2.next = 68;
                   break;
                 }
-                _context2.prev = 18;
+                _context2.prev = 26;
                 audioConfig = {
                   audio: _objectSpread(_objectSpread({
                     echoCancellation: false
@@ -2230,9 +2252,9 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _context2.t0 = _classPrivateFieldSet;
                 _context2.t1 = _this;
                 _context2.t2 = _micAudioStream;
-                _context2.next = 27;
+                _context2.next = 35;
                 return window.navigator.mediaDevices.getUserMedia(audioConfig);
-              case 27:
+              case 35:
                 _context2.t3 = _context2.sent;
                 (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t3);
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> mic acquired", {
@@ -2242,10 +2264,10 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 audioStream = addGainNode(_classPrivateFieldGet(_this, _micAudioStream), 1.75); // Increase volume by 50%
                 _classPrivateFieldSet(_this, _audioStream, audioStream);
                 if (!_classPrivateFieldGet(_this, _enableNoiseCancellation)) {
-                  _context2.next = 52;
+                  _context2.next = 60;
                   break;
                 }
-                _context2.prev = 33;
+                _context2.prev = 41;
                 workletUrl = IS_EXTENSION ?
                 // eslint-disable-next-line no-undef
                 chrome.runtime.getURL("public/NoiseSuppressorWorklet.js") : "NoiseSuppressorWorklet.js";
@@ -2254,9 +2276,9 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 });
                 workletStartedAt = Date.now();
                 audioContext = new AudioContext();
-                _context2.next = 40;
+                _context2.next = 48;
                 return audioContext.audioWorklet.addModule(workletUrl);
-              case 40:
+              case 48:
                 audioStreamSource = audioContext.createMediaStreamSource(audioStream);
                 destinationStream = audioContext.createMediaStreamDestination();
                 noiseSuppressorNode = new AudioWorkletNode(audioContext, "nn-suppressor-processor");
@@ -2266,26 +2288,38 @@ var ScreenRecorder = /*#__PURE__*/function () {
                 _classPrivateFieldGet(_this, _logger).info("acquireMediaStream -> noise suppressor wired up", {
                   durationMs: Date.now() - workletStartedAt
                 });
-                _context2.next = 52;
+                _context2.next = 60;
                 break;
-              case 49:
-                _context2.prev = 49;
-                _context2.t4 = _context2["catch"](33);
+              case 57:
+                _context2.prev = 57;
+                _context2.t4 = _context2["catch"](41);
                 _classPrivateFieldGet(_this, _logger).error("acquireMediaStream -> failed to load audio worklet", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t4));
-              case 52:
-                _context2.next = 57;
+              case 60:
+                _context2.next = 68;
                 break;
-              case 54:
-                _context2.prev = 54;
-                _context2.t5 = _context2["catch"](18);
+              case 62:
+                _context2.prev = 62;
+                _context2.t5 = _context2["catch"](26);
                 // Mic access can fail independently of screen capture (OS-level
-                // block, no device, deviceId mismatch). Screen sharing already
-                // succeeded, so fall back to a video-only recording instead of
-                // surfacing the failure as a screen permission error.
-                _classPrivateFieldGet(_this, _logger).warn("acquireMediaStream -> mic unavailable, falling back to video-only", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t5), {
+                // block, no device, deviceId mismatch). Stop the screen stream and
+                // surface a mic-only error so the user sees the proper callout
+                // ("doesn't have access to your microphone" with Grant / I don't
+                // need audio actions) instead of being misrouted to the screen
+                // permission denied flow.
+                _classPrivateFieldGet(_this, _logger).warn("acquireMediaStream -> mic unavailable", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t5), {
                   audioConfigRequested: _classPrivateFieldGet(_this, _audio)
                 });
-              case 57:
+                if (!_classPrivateFieldGet(_this, _videoStream)) {
+                  stream.getTracks().forEach(function (track) {
+                    return track.stop();
+                  });
+                }
+                _classPrivateFieldGet(_this, _store).setState({
+                  error: SCREEN_RECORDER_ERROR.MicPermissionDenied,
+                  status: SCREEN_RECORDER_STATUS.idle
+                });
+                return _context2.abrupt("return");
+              case 68:
                 // Event triggered when the user clicks on the stop sharing overlay button
                 stream.getVideoTracks()[0].addEventListener("ended", function () {
                   var _classPrivateFieldGet15;
@@ -2335,11 +2369,11 @@ var ScreenRecorder = /*#__PURE__*/function () {
                   totalDurationMs: Date.now() - acquireStartedAt,
                   finalStream: _classPrivateFieldGet(_this, _summarizeStream).call(_this, _classPrivateFieldGet(_this, _mediaStream))
                 });
-                _context2.next = 71;
+                _context2.next = 82;
                 break;
-              case 67:
-                _context2.prev = 67;
-                _context2.t6 = _context2["catch"](3);
+              case 78:
+                _context2.prev = 78;
+                _context2.t6 = _context2["catch"](11);
                 _classPrivateFieldGet(_this, _logger).error("acquireMediaStream -> error", _classPrivateFieldGet(_this, _serializeError).call(_this, _context2.t6), {
                   totalDurationMs: Date.now() - acquireStartedAt,
                   hasAudio: Boolean(_classPrivateFieldGet(_this, _audio)),
@@ -2362,11 +2396,11 @@ var ScreenRecorder = /*#__PURE__*/function () {
                     status: SCREEN_RECORDER_STATUS.idle
                   });
                 }
-              case 71:
+              case 82:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[3, 67], [18, 54], [33, 49]]);
+          }, _callee2, null, [[11, 78], [26, 62], [41, 57]]);
         }));
         function value() {
           return _value.apply(this, arguments);
@@ -2445,6 +2479,41 @@ var ScreenRecorder = /*#__PURE__*/function () {
         }
       }
     });
+    _classPrivateFieldInitSpec(this, _queryMicPermissionState, {
+      writable: true,
+      value: function () {
+        var _value2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+          var result;
+          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.prev = 0;
+                _context3.next = 3;
+                return window.navigator.permissions.query({
+                  name: "microphone"
+                });
+              case 3:
+                result = _context3.sent;
+                return _context3.abrupt("return", result.state);
+              case 7:
+                _context3.prev = 7;
+                _context3.t0 = _context3["catch"](0);
+                // Permissions API or the "microphone" descriptor is unsupported
+                // (e.g. Safari). Fall through to the live getUserMedia attempt.
+                _classPrivateFieldGet(_this, _logger).info("queryMicPermissionState -> unsupported", _classPrivateFieldGet(_this, _serializeError).call(_this, _context3.t0));
+                return _context3.abrupt("return", "prompt");
+              case 11:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3, null, [[0, 7]]);
+        }));
+        function value() {
+          return _value2.apply(this, arguments);
+        }
+        return value;
+      }()
+    });
     _classPrivateFieldInitSpec(this, _serializeError, {
       writable: true,
       value: function value(error) {