fcr-ui-scene 3.7.7 → 3.7.8

package/lib/providers/screen-share-provider.d.ts

@@ -84,7 +84,7 @@ export interface FcrUIScreenShareProvider {
      * @param isReplace - 是否替换当前已有的共享
      * @returns 返回一个Promise，成功时解析为屏幕共享轨道对象，失败时返回null
      */
-    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<void>;
+    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
     /**
      * 停止屏幕共享
      * @param targetScreenTrack - 可选参数，要停止的屏幕共享轨道对象，默认停止当前活动的共享
@@ -173,13 +173,13 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     private _privilegeProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     shareLock: boolean;
-    private _sharingControl;
+    private _sharingControl?;
     private _previewDom;
     private _prevFullScalc;
     private _observable;
     private _streamObserver;
     private _screenCaptureObserver;
-    private _streamControl;
+    private _streamControl?;
     private _maxScalcValue;
     private _minScalcValue;
     private _diffScalcValue;
@@ -194,7 +194,6 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
         height: number;
     };
     get screenShareScenarioType(): FcrScreenScenarioType;
-    private get _currentRoomControl();
     constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl, _privilegeProvider: FcrUIPrivilegeProvider);
     setSharingInReplace(isInReplace: boolean): void;
     zoomOut(): void;
@@ -208,13 +207,15 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     bootstrap(): void;
     private _handleWebScreenCaptureStateUpdated;
     private _handleScreenCaptureStateUpdated;
+    private _handleShareStopWithAudio;
     replaceScreenShare(id: string, type: FcrScreenCaptureType, withAudio: boolean, bounds: CurrentShareBounds): void;
     private _handleRemoteVideoStatsUpdated;
     get localUserId(): string;
     get shareAudioTrack(): import("fcr-core/lib/media-control/type").FcrLoopbackTrack | null;
+    get loopbackAudioSourceId(): string;
     get currentShareId(): string;
     get screenTrack(): FcrScreenTrack | null;
-    get currentShareStreamId(): string | undefined;
+    get currentShareStreamId(): string;
     get currentSelectionBounds(): CurrentShareBounds;
     setShareLock(lock: boolean): void;
     createScreenShareWithSelectionId(videoSourceId: string, bounds: CurrentShareBounds): Promise<string>;
@@ -231,11 +232,9 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     removeObserver(observer: FcrUIScreenShareObserver): void;
     startShareWhiteboard(): void;
     release(): void;
-    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<void>;
+    startShareScreen(id: string, type: FcrScreenCaptureType, withAudio: boolean, isReplace: boolean): Promise<FcrScreenTrack | null>;
     stopShareScreen(targetScreenTrack?: FcrScreenTrack | null | undefined): void;
     stopShareScreenByExitRoom(targetScreenTrack?: FcrScreenTrack | null | undefined): void;
-    private _updateShareAudioPrivilege;
-    private _handleShareStopWithAudio;
     private _handleShareStartWithAudio;
     toggleScreenshareWithAudio(withAudio: boolean): void;
     private _getExcludeWindows;

package/lib/providers/screen-share-provider.js

@@ -78,16 +78,19 @@ var _constant = require("../utilities/constant");
 var _lodash = require("lodash");
 var _config = require("../modules/setting/config");
 var _FcrUIScreenShareProviderImpl;
-var _initProto, _zoomOutDecs, _zoomInDecs, _fullContainerDecs, _setOriginScalcDecs, _handleScreenCaptureStateUpdatedDecs, _replaceScreenShareDecs, _handleRemoteVideoStatsUpdatedDecs, _handleStreamUpdateDecs, _syncScreenShareStreamInfosDecs, _releaseDecs, _startShareScreenDecs, _updateShareAudioPrivilegeDecs, _handleShareStopWithAudioDecs, _handleShareStartWithAudioDecs, _ref;
+var _initProto, _zoomOutDecs, _zoomInDecs, _fullContainerDecs, _setOriginScalcDecs, _handleScreenCaptureStateUpdatedDecs, _handleShareStopWithAudioDecs, _replaceScreenShareDecs, _handleRemoteVideoStatsUpdatedDecs, _handleStreamUpdateDecs, _syncScreenShareStreamInfosDecs, _releaseDecs, _startShareScreenDecs, _handleShareStartWithAudioDecs, _ref;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_zoomOutDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _replaceScreenShareDecs = [_mobx.action, _mobx.action.bound], _handleRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _syncScreenShareStreamInfosDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], _updateShareAudioPrivilegeDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_zoomOutDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _replaceScreenShareDecs = [_mobx.action, _mobx.action.bound], _handleRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _syncScreenShareStreamInfosDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__PURE__*/function () {
   function FcrUIScreenShareProviderImpl(_deviceProvider, _eventProvider, _roomProvider, _sharingProvider, _sharedScreenShareSharedDataSource, _sharedMemberDataSource, _privilegeProvider) {
-    var _this = this;
+    var _this = this,
+      _this$_roomProvider$c,
+      _this$_roomProvider$c2,
+      _this$_streamControl;
     (0, _classCallCheck2["default"])(this, FcrUIScreenShareProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIScreenShareProviderImpl'
@@ -127,9 +130,9 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
     this._sharedMemberDataSource = _sharedMemberDataSource;
     this._privilegeProvider = _privilegeProvider;
-    this._sharingControl = this._currentRoomControl.getSharingControl();
-    this._streamControl = this._currentRoomControl.getStreamControl();
-    this._streamControl.addObserver(this._streamObserver);
+    this._sharingControl = (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.getSharingControl();
+    this._streamControl = (_this$_roomProvider$c2 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c2 === void 0 ? void 0 : _this$_roomProvider$c2.getStreamControl();
+    (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.addObserver(this._streamObserver);
     this._syncScreenShareStreamInfos();
     this._addEventListeners();
     this._syncShareStreamState();
@@ -164,15 +167,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     get: function get() {
       return this._sharedScreenShareSharedDataSource.screenShareScenarioType;
     }
-  }, {
-    key: "_currentRoomControl",
-    get: function get() {
-      var currentRoomControl = this._roomProvider.currentRoomControl;
-      if (!currentRoomControl) {
-        throw new Error('currentRoomControl is not initialized');
-      }
-      return currentRoomControl;
-    }
   }, {
     key: "setSharingInReplace",
     value: function setSharingInReplace(isInReplace) {
@@ -228,8 +222,9 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "currentScreenSharingOwner",
     get: function get() {
-      var allStreams = this._streamControl.getStreamList();
-      var screenShareStream = allStreams.find(function (stream) {
+      var _this$_streamControl2;
+      var allStreams = (_this$_streamControl2 = this._streamControl) === null || _this$_streamControl2 === void 0 ? void 0 : _this$_streamControl2.getStreamList();
+      var screenShareStream = allStreams === null || allStreams === void 0 ? void 0 : allStreams.find(function (stream) {
         return stream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN && (stream.streamType === _type.FcrStreamType.BOTH || stream.streamType === _type.FcrStreamType.VIDEO);
       });
       if (screenShareStream) {
@@ -332,6 +327,17 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       }
       this._sharedScreenShareSharedDataSource.setLocalUserScreenSharingState(state);
     }
+  }, {
+    key: "_handleShareStopWithAudio",
+    value: function _handleShareStopWithAudio() {
+      if (!this.shareAudioTrack) {
+        return;
+      }
+      if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
+        this.logger.info('[screen-share-provider][handleShareStopWithAudio] shareAudioTrack.stop');
+        this.shareAudioTrack.stop();
+      }
+    }
   }, {
     key: "replaceScreenShare",
     value: function replaceScreenShare(id, type, withAudio, bounds) {
@@ -346,7 +352,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         var _observer = {
           onScreenCaptureStateUpdated: function () {
             var _onScreenCaptureStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(sourceId, state) {
-              var _this2$screenTrack, loopbackAudioSourceId, bindConfig;
+              var _this2$screenTrack;
               return _regenerator["default"].wrap(function (_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -360,21 +366,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                     return _this2.startShareScreen(id, type, withAudio, true);
                   case 1:
                     _this2._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
-                    if (_this2.currentShareStreamId) {
-                      loopbackAudioSourceId = _this2._sharedScreenShareSharedDataSource.getLoopbackDeviceId();
-                      bindConfig = {
+                    if (_this2.currentShareStreamId && _this2._streamControl) {
+                      _this2._streamControl.bindLocalStreams([{
                         streamId: _this2.currentShareStreamId,
+                        audioSourceId: _this2.loopbackAudioSourceId,
                         videoSourceId: id
-                      };
-                      if (loopbackAudioSourceId) {
-                        bindConfig.audioSourceId = loopbackAudioSourceId;
-                      } else {
-                        _this2.logger.warn('cannot get loopbackAudioSourceId before calling bindLocalStreams');
-                      }
-                      _this2._streamControl.bindLocalStreams([bindConfig]);
+                      }]);
                       _this2.toggleScreenshareWithAudio(shareWithAudio);
-                    } else {
-                      _this2.logger.error('currentShareStreamId is not set');
                     }
                   case 2:
                   case "end":
@@ -396,7 +394,8 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_handleRemoteVideoStatsUpdated",
     value: function _handleRemoteVideoStatsUpdated(roomId, streamId, videoStats) {
-      var stream = this._streamControl.getStreamByStreamId(streamId);
+      var _this$_streamControl3;
+      var stream = (_this$_streamControl3 = this._streamControl) === null || _this$_streamControl3 === void 0 ? void 0 : _this$_streamControl3.getStreamByStreamId(streamId);
       if ((stream === null || stream === void 0 ? void 0 : stream.videoSourceType) === _fcrCore.FcrVideoSourceType.SCREEN) {
         var _videoStats$dimension = videoStats.dimensions,
           width = _videoStats$dimension.width,
@@ -419,6 +418,14 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     get: function get() {
       return this._sharedScreenShareSharedDataSource.shareWithAudioTrack;
     }
+  }, {
+    key: "loopbackAudioSourceId",
+    get: function get() {
+      if (!this._sharedScreenShareSharedDataSource.loopbackAudioSourceId) {
+        throw new Error('loopbackAudioSourceId is null');
+      }
+      return this._sharedScreenShareSharedDataSource.loopbackAudioSourceId;
+    }
   }, {
     key: "currentShareId",
     get: function get() {
@@ -448,35 +455,32 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "createScreenShareWithSelectionId",
     value: function () {
       var _createScreenShareWithSelectionId = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(videoSourceId, bounds) {
-        var loopbackAudioSourceId, targetEncoderConfig, shareWithAudio, streamCreateConfig, streamId;
+        var audioSourceId, _this$_sharingControl, targetEncoderConfig, shareWithAudio, streamId;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.logger.info("screen-share-provider: createScreenShareWithSelectionId: ".concat(videoSourceId, ", annotation-use-bounds-width: ").concat(bounds.width, ", annotation-use-bounds-height: ").concat(bounds.height));
-              loopbackAudioSourceId = this._sharedScreenShareSharedDataSource.getLoopbackDeviceId();
+              audioSourceId = this.loopbackAudioSourceId;
+              if (!(this._sharingControl && this._streamControl)) {
+                _context3.next = 2;
+                break;
+              }
               targetEncoderConfig = this.screenShareScenarioType === _imports.FcrScreenScenarioType.CLEARITY ? _config.clearityEncoderConfig : _config.smoothEncoderConfig;
               this._streamControl.setScreenScenario(this.screenShareScenarioType);
               shareWithAudio = this._sharedScreenShareSharedDataSource.shareWithAudio;
-              streamCreateConfig = {
-                streamType: shareWithAudio ? _type.FcrStreamType.BOTH : _type.FcrStreamType.VIDEO,
-                videoSourceId: videoSourceId
-              };
-              if (loopbackAudioSourceId) {
-                streamCreateConfig.audioSourceId = loopbackAudioSourceId;
-              } else {
-                this.logger.warn('cannot get loopbackAudioSourceId before calling startScreenSharing');
-              }
               _context3.next = 1;
-              return this._sharingControl.startScreenSharing(streamCreateConfig, bounds);
+              return (_this$_sharingControl = this._sharingControl) === null || _this$_sharingControl === void 0 ? void 0 : _this$_sharingControl.startScreenSharing({
+                streamType: shareWithAudio ? _type.FcrStreamType.BOTH : _type.FcrStreamType.VIDEO,
+                videoSourceId: videoSourceId,
+                audioSourceId: audioSourceId
+              }, bounds);
             case 1:
               streamId = _context3.sent;
-              if (shareWithAudio) {
-                this._updateShareAudioPrivilege(streamId, true);
-                this._handleShareStartWithAudio();
-              }
               this._streamControl.setVideoEncoderConfig(streamId, targetEncoderConfig, _type.FcrVideoStreamType.HIGH_STREAM);
               return _context3.abrupt("return", Promise.resolve(streamId));
             case 2:
+              return _context3.abrupt("return", Promise.reject());
+            case 3:
             case "end":
               return _context3.stop();
           }
@@ -598,8 +602,8 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_syncScreenShareStreamInfos",
     value: function _syncScreenShareStreamInfos() {
-      var _this$_roomProvider$c, _streams$find;
-      var streams = (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.getStreamControl().getStreamList();
+      var _this$_roomProvider$c3, _streams$find;
+      var streams = (_this$_roomProvider$c3 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c3 === void 0 ? void 0 : _this$_roomProvider$c3.getStreamControl().getStreamList();
       var isSharingScreen = streams === null || streams === void 0 ? void 0 : streams.some(function (stream) {
         return stream.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN;
       });
@@ -633,10 +637,11 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "release",
     value: function release() {
+      var _this$_streamControl4;
       this.logger.info('[screen-share-provider] in release');
       this._hasStop = false;
       this.stop();
-      this._streamControl.removeObserver(this._streamObserver);
+      (_this$_streamControl4 = this._streamControl) === null || _this$_streamControl4 === void 0 || _this$_streamControl4.removeObserver(this._streamObserver);
       this._removeEventListeners();
     }
   }, {
@@ -693,13 +698,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 7:
               _context4.prev = 7;
               _t2 = _context4["catch"](1);
-              this.setShareLock(false);
-              throw _t2;
+              return _context4.abrupt("return", null);
             case 8:
+              _context4.prev = 8;
+              return _context4.abrupt("return", this.screenTrack);
+            case 9:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 7]]);
+        }, _callee4, this, [[1, 7, 8, 9]]);
       }));
       function startShareScreen(_x7, _x8, _x9, _x0) {
         return _startShareScreen.apply(this, arguments);
@@ -726,34 +733,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       this._stopScreenTrack();
       this._cleanShareWithAudioDataSource();
     }
-  }, {
-    key: "_updateShareAudioPrivilege",
-    value: function _updateShareAudioPrivilege(streamId, withAudio) {
-      this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, streamId, {
-        audioPrivilege: withAudio ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
-        videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
-      }));
-    }
-  }, {
-    key: "_handleShareStopWithAudio",
-    value: function _handleShareStopWithAudio() {
-      if (!this.shareAudioTrack) {
-        return;
-      }
-      if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE)) {
-        this.logger.info('[screen-share-provider][handleShareStopWithAudio] shareAudioTrack.stop');
-        this.shareAudioTrack.stop();
-      }
-    }
   }, {
     key: "_handleShareStartWithAudio",
     value: function _handleShareStartWithAudio() {
-      var loopbackAudioSourceId = this._sharedScreenShareSharedDataSource.getLoopbackDeviceId();
-      if (!loopbackAudioSourceId) {
-        this.logger.error('cannot get loopbackAudioSourceId before calling getLoopbackTrack');
-        return;
-      }
-      var shareAudioTrack = this._deviceProvider.getLoopbackTrack(loopbackAudioSourceId);
+      var shareAudioTrack = this._deviceProvider.getLoopbackTrack(this.loopbackAudioSourceId);
       this._sharedScreenShareSharedDataSource.setShareWithAudioTrack(shareAudioTrack);
       if (this._deviceProvider.isCapabilitySupported(_fcrCore.FcrCapability.LOOPBACK_CAPTURE) && this.shareAudioTrack && this.shareAudioTrack.getState() === _fcrCore.FcrMediaSourceState.CLOSE) {
         this.shareAudioTrack.start();
@@ -764,15 +747,16 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function toggleScreenshareWithAudio(withAudio) {
       this._sharedScreenShareSharedDataSource.setShareWithAudio(withAudio);
       this.logger.info("[screen-share-provider] current-share with audio: ".concat(withAudio));
-      if (this.currentShareStreamId) {
-        this._updateShareAudioPrivilege(this.currentShareStreamId, withAudio);
+      if (this.currentShareStreamId && this._streamControl) {
+        this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, this.currentShareStreamId, {
+          audioPrivilege: withAudio ? _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE : _fcrCore.FcrStreamPrivilegeOperation.NOPRIVILEGE,
+          videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
+        }));
         if (withAudio) {
           this._handleShareStartWithAudio();
         } else {
           this._handleShareStopWithAudio();
         }
-      } else {
-        this.logger.error('currentShareStreamId is not set');
       }
     }
   }, {
@@ -818,9 +802,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "removeScreenStream",
     value: function removeScreenStream() {
       try {
+        var _this$_streamControl5;
         this.logger.info('screen-share-provider: remove screen streams');
-        this._streamControl.removeScreenStream();
-        this._sharedScreenShareSharedDataSource.setCurrentShareStreamId(undefined);
+        (_this$_streamControl5 = this._streamControl) === null || _this$_streamControl5 === void 0 || _this$_streamControl5.removeScreenStream();
+        this._sharedScreenShareSharedDataSource.setCurrentShareStreamId('');
         return true;
       } catch (error) {
         this.logger.error('removeScreenStream error', error);
@@ -845,6 +830,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }]);
 }();
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.bound, 2, "setSharingInReplace"], [_zoomOutDecs, 18, "zoomOut"], [_zoomInDecs, 18, "zoomIn"], [_fullContainerDecs, 18, "fullContainer"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "bootstrap"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_replaceScreenShareDecs, 18, "replaceScreenShare"], [_handleRemoteVideoStatsUpdatedDecs, 18, "_handleRemoteVideoStatsUpdated"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "startRenderSharePreview"], [_decorator.bound, 2, "stopRenderSharePreview"], [_syncScreenShareStreamInfosDecs, 18, "_syncScreenShareStreamInfos"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"], [_decorator.bound, 2, "stopShareScreen"], [_decorator.bound, 2, "stopShareScreenByExitRoom"], [_updateShareAudioPrivilegeDecs, 18, "_updateShareAudioPrivilege"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_decorator.bound, 2, "toggleScreenshareWithAudio"], [_decorator.bound, 2, "_getExcludeWindows"], [_decorator.bound, 2, "removeScreenStream"], [_decorator.bound, 2, "_stopScreenTrack"], [_decorator.bound, 2, "_cleanShareWithAudioDataSource"]], []).e, 1);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.bound, 2, "setSharingInReplace"], [_zoomOutDecs, 18, "zoomOut"], [_zoomInDecs, 18, "zoomIn"], [_fullContainerDecs, 18, "fullContainer"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "bootstrap"], [_decorator.bound, 2, "_handleWebScreenCaptureStateUpdated"], [_handleScreenCaptureStateUpdatedDecs, 18, "_handleScreenCaptureStateUpdated"], [_handleShareStopWithAudioDecs, 18, "_handleShareStopWithAudio"], [_replaceScreenShareDecs, 18, "replaceScreenShare"], [_handleRemoteVideoStatsUpdatedDecs, 18, "_handleRemoteVideoStatsUpdated"], [_decorator.bound, 2, "_syncShareStreamState"], [_handleStreamUpdateDecs, 18, "_handleStreamUpdate"], [_decorator.bound, 2, "startRenderSharePreview"], [_decorator.bound, 2, "stopRenderSharePreview"], [_syncScreenShareStreamInfosDecs, 18, "_syncScreenShareStreamInfos"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"], [_decorator.bound, 2, "stopShareScreen"], [_decorator.bound, 2, "stopShareScreenByExitRoom"], [_handleShareStartWithAudioDecs, 18, "_handleShareStartWithAudio"], [_decorator.bound, 2, "toggleScreenshareWithAudio"], [_decorator.bound, 2, "_getExcludeWindows"], [_decorator.bound, 2, "removeScreenStream"], [_decorator.bound, 2, "_stopScreenTrack"], [_decorator.bound, 2, "_cleanShareWithAudioDataSource"]], []).e, 1);
 _initProto = _applyDecs$e[0];
 (0, _base.registerDependency)('screenShareProvider');

package/lib/providers/sharing-provider.js

@@ -89,9 +89,6 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
         }
       },
       onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
-        if (_this.whiteboardState === _type.FcrWhiteboardState.START) {
-          return;
-        }
         _this.whiteboardOwnerId = ownerId;
         _this.whiteboardState = _type.FcrWhiteboardState.START;
         var owner = _this._userControl.getUser(ownerId);
@@ -105,13 +102,9 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
         _this.logger.info("[sharing-provider]: onWhiteboardStarted ".concat(ownerId, ", ").concat(JSON.stringify(operatorUser), ", backgroundColor: ").concat(_this._whiteboardProvider.backgroundColor));
       },
       onWhiteboardEnded: function onWhiteboardEnded(reason, operatorUser) {
-        if (_this.whiteboardState === _type.FcrWhiteboardState.END) {
-          return;
-        }
         _this._sharedWhiteboardDataSource.setJoinSuccess(false);
         _this._sharedWhiteboardDataSource.setShowLoading(true);
         _this._sharedWhiteboardDataSource.inActive();
-        _this._sharedWhiteboardDataSource.setSharingUser(undefined);
         _this.logger.info("[sharing-provider]: onWhiteboardEnded, joinSuccess: ".concat(_this._sharedWhiteboardDataSource.joinSuccess));
         _this.whiteboardState = _type.FcrWhiteboardState.END;
       }

package/lib/providers/whiteboard-provider.js

@@ -78,7 +78,6 @@ var FcrUIWhiteboardProviderImpl = exports.FcrUIWhiteboardProviderImpl = /*#__PUR
       },
       onInactive: function onInactive(reason, operatorUser) {
         _this.logger.info("[whiteboard-provider]: onInactive ".concat(reason, ", ").concat(JSON.stringify(operatorUser)));
-        _this._sharedWhiteboardDataSource.setSharingUser(undefined);
       },
       onConnectionStateUpdated: function onConnectionStateUpdated(state) {
         _this.logger.info("[whiteboard-provider]: onConnectionStateUpdated ".concat(state));

package/lib/shared-data-source/confirm-data.d.ts

@@ -1,4 +1,3 @@
-import { CurrentShareBounds } from '../modules/control-bar/types';
 export interface FcrUISharedConfirmDataSource {
     get position(): {
         x: number;
@@ -12,33 +11,15 @@ export interface FcrUISharedConfirmDataSource {
         x: number;
         y: number;
     }): void;
-    setWindowBounds(key: string, window: CurrentShareBounds): void;
-    removeWindowBounds(key: string): void;
-    addObserver(observer: FcrMousePositionObserver): void;
-    removeObserver(observer: FcrMousePositionObserver): void;
 }
-export type FcrMousePositionObserver = {
-    onMouseOver(key: string): void;
-    onMouseOut(key: string): void;
-};
 export declare class FcrUISharedConfirmDataSourceImpl implements FcrUISharedConfirmDataSource {
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _observable;
     accessor position: {
         x: number;
         y: number;
     };
-    accessor windows: Map<string, CurrentShareBounds>;
-    accessor mouseOverState: Set<unknown>;
-    constructor();
     setPosition(position: {
         x: number;
         y: number;
     }): void;
-    setWindowBounds(key: string, window: CurrentShareBounds): void;
-    removeWindowBounds(key: string): void;
-    addObserver(observer: FcrMousePositionObserver): void;
-    removeObserver(observer: FcrMousePositionObserver): void;
-    release(): void;
-    private _addLogObserver;
 }