fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/providers/room-provider/room-provider.js

@@ -12,7 +12,6 @@ import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.to-primitive.js";
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.error.to-string.js";
-import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.find.js";
 import "core-js/modules/es.array.for-each.js";
@@ -74,12 +73,12 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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; }
 import { FcrStreamLatencyLevel } from 'fcr-core';
-import { getLogger } from 'agora-foundation/lib/logger';
+import { getLogger } from '../../utilities/logger';
 import { FcrRoomType } from 'fcr-core/lib/room-control/type';
 import { FcrSecurityAction } from 'fcr-core/lib/room-control/privilege-control/type';
-import { FcrLiveStreamingState, FcrRecordingState, FcrRoomState, FcrUserRole, RoomMessageKey, FcrUserUpdatedReason, FcrStreamType, FcrAudioSourceType, FcrVideoSourceType, FcrMediaSourceState } from 'fcr-core/lib/type';
+import { FcrLiveStreamingState, FcrRecordingState, FcrRoomState, FcrUserRole, RoomMessageKey, FcrUserUpdatedReason, FcrStreamType, FcrAudioSourceType, FcrVideoSourceType, FcrMediaSourceState, FcrConnectionState } from 'fcr-core/lib/type';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
-import { FcrUINotificationContentType } from '../../type';
+import { FcrUIMeetingExitReason, FcrUINotificationContentType } from '../../type';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { action, observable } from 'mobx';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
@@ -108,7 +107,36 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
         _this._messageProvider.closeNotification(FcrUINotificationContentType.WAITING_ROOM);
       }
     });
+    _defineProperty(this, "_baseRoomControlObserver", {
+      onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
+        if (state === FcrRoomState.Closed) {
+          // this._observable.notifyObservers('onRoomClosed');
+          var reason = _this._isSelfEndMeeting ? FcrUIMeetingExitReason.USER_INITIATED_END : FcrUIMeetingExitReason.SYSTEM_MEETING_ENDED;
+          _this._observable.notifyObservers('onExitMeeting', reason);
+        }
+      },
+      onCloudRecordingStateUpdated: action(function (roomId, state) {
+        _this.cloudRecordingState = state;
+      }),
+      onLiveStreamingStateUpdated: action(function (roomId, state) {
+        _this.liveStreamingState = state;
+        _this.liveStreamingConfig = _this.currentRoomControl.getLiveStreamingConfig();
+      })
+    });
+    _defineProperty(this, "_userControlObserver", {
+      onLocalUserKickedOut: function onLocalUserKickedOut() {
+        _this._observable.notifyObservers('onExitMeeting', FcrUIMeetingExitReason.ADMIN_KICKED);
+        // this._observable.notifyObservers('onLocalUserKickedOut');
+      }
+    });
     _defineProperty(this, "_isSelfEndMeeting", false);
+    _defineProperty(this, "_engineObserver", {
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        if (state === FcrConnectionState.ABORTED) {
+          _this._observable.notifyObservers('onExitMeeting', FcrUIMeetingExitReason.SYSTEM_NETWORK_ERROR);
+        }
+      }
+    });
     _defineProperty(this, "_roomRouterObserver", {
       onRoomRouteSwitched: function onRoomRouteSwitched() {
         var _this$currentRoomCont, _this$currentRoomCont2;
@@ -132,6 +160,8 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
       onRoomJoined: function onRoomJoined(roomControl) {
         var _roomControl$getRoomI;
         // nextStep: FcrRoomControlType
+
+        _this._releaseCurrentRoomControl();
         _this._currentRoomControl = roomControl;
         _this._currentRoomControl.addObserver(_this._baseRoomControlObserver);
         _this._currentRoomControl.getUserControl().addObserver(_this._userControlObserver);
@@ -150,9 +180,9 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
         _this._observable.notifyObservers('onRoutingChanged', roomControl);
       },
       onErrorOccurred: function onErrorOccurred(error) {
-        // 如果是自己点击加入房间 会触发onLunchFailure 不应该直接onExited
+        // 如果是自己点击加入房间 会触发onLaunchFailure 不应该直接onExited
         if (!_this._isSelfJoinRoom) {
-          _this._observable.notifyObservers('onExitRoom');
+          _this._observable.notifyObservers('onExitMeeting', FcrUIMeetingExitReason.SYSTEM_JOIN_ROOM_FAILED);
         }
       }
     });
@@ -162,25 +192,7 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
     this._messageProvider = _messageProvider;
-    this._baseRoomControlObserver = {
-      onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
-        if (state === FcrRoomState.Closed) {
-          _this._observable.notifyObservers('onRoomClosed');
-        }
-      },
-      onCloudRecordingStateUpdated: action(function (roomId, state) {
-        _this.cloudRecordingState = state;
-      }),
-      onLiveStreamingStateUpdated: action(function (roomId, state) {
-        _this.liveStreamingState = state;
-        _this.liveStreamingConfig = _this.currentRoomControl.getLiveStreamingConfig();
-      })
-    };
-    this._userControlObserver = {
-      onLocalUserKickedOut: function onLocalUserKickedOut() {
-        _this._observable.notifyObservers('onLocalUserKickedOut');
-      }
-    };
+    this._engine.addObserver(this._engineObserver);
     this._roomRouter = this._engine.createRoomRouter(this._sceneConfig.roomId);
     this._roomRouter.addObserver(this._roomRouterObserver);
   }
@@ -224,25 +236,26 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
       }
       return this._waitingRoomManager;
     }
-  }, {
-    key: "setIsSelfEndMeeting",
-    value: function setIsSelfEndMeeting(isSelfEndMeeting) {
-      this._isSelfEndMeeting = isSelfEndMeeting;
-    }
-  }, {
-    key: "isSelfEndMeeting",
-    get: function get() {
-      return this._isSelfEndMeeting;
-    }
   }, {
     key: "release",
     value: function release() {
       var _this$_currentRoomCon;
       this._roomRouter.leaveRoom();
       (_this$_currentRoomCon = this._currentRoomControl) === null || _this$_currentRoomCon === void 0 || _this$_currentRoomCon.leave();
-      this._currentRoomControl = undefined;
-      this.setIsSelfEndMeeting(false);
+      this._releaseCurrentRoomControl();
+      this._setIsSelfEndMeeting(false);
       this._releaseWaitingRoomManager();
+      this._engine.removeObserver(this._engineObserver);
+      this._roomRouter.removeObserver(this._roomRouterObserver);
+    }
+  }, {
+    key: "_releaseCurrentRoomControl",
+    value: function _releaseCurrentRoomControl() {
+      if (this._currentRoomControl) {
+        this._currentRoomControl.removeObserver(this._baseRoomControlObserver);
+        this._currentRoomControl.getUserControl().removeObserver(this._userControlObserver);
+        this._currentRoomControl = undefined;
+      }
     }
   }, {
     key: "_releaseWaitingRoomManager",
@@ -284,10 +297,16 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
       }
       return handleJoinRoom;
     }()
+  }, {
+    key: "closeRoom",
+    value: function closeRoom() {
+      this._setIsSelfEndMeeting(true);
+      this.currentRoomControl.close();
+    }
   }, {
     key: "exitRoom",
     value: function exitRoom() {
-      this._observable.notifyObservers('onExitRoom');
+      this._observable.notifyObservers('onExitMeeting', FcrUIMeetingExitReason.USER_INITIATED_LEAVE);
     }
   }, {
     key: "addObserver",
@@ -299,6 +318,11 @@ export var FcrUIRoomProviderImpl = /*#__PURE__*/function () {
     value: function removeObserver(observer) {
       this._observable.removeObserver(observer);
     }
+  }, {
+    key: "_setIsSelfEndMeeting",
+    value: function _setIsSelfEndMeeting(isSelfEndMeeting) {
+      this._isSelfEndMeeting = isSelfEndMeeting;
+    }
   }, {
     key: "_getJoinRoomOption",
     value: function _getJoinRoomOption() {
@@ -342,12 +366,12 @@ _init_cloudRecordingState = _applyDecs$e[2];
 _initProto = _applyDecs$e[3];
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
-_ref2 = (_initUserMapDecs = [action, action.bound], _handleSecurityUpdatedDecs = [action, action.bound], "_privilegeProvider");
+_ref2 = (_initUserMapDecs = [action, action.bound], _handleSecurityUpdatedDecs = [action, action.bound], "_observable");
 export var FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIMainRoomControlProviderImpl(_mainRoomControl, eventProvider, messageProvider, dialogProvider, _sharedInterpreterDataSource) {
     var _this2 = this;
     _classCallCheck(this, FcrUIMainRoomControlProviderImpl);
-    _defineProperty(this, _ref2, void _initProto2(this));
+    _defineProperty(this, _ref2, (_initProto2(this), new AgoraObservable()));
     _defineProperty(this, "_userMap", new Map());
     _classPrivateFieldInitSpec(this, _A2, _init_privilegeOperator(this));
     _classPrivateFieldInitSpec(this, _B2, _init_boardOwnerUser(this));
@@ -415,6 +439,11 @@ export var FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_B2, this, v);
     }
+  }, {
+    key: "prevWaterMarkEnable",
+    get: function get() {
+      return this._prevWaterMarkEnable;
+    }
   }, {
     key: "mainRoomControl",
     get: function get() {
@@ -438,6 +467,16 @@ export var FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
       this._userControl.removeObserver(this._userObserver);
       this._privilegeProvider.release();
     }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
   }, {
     key: "_initUserMap",
     value: function _initUserMap() {
@@ -450,76 +489,21 @@ export var FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
-      var _event$operatorUser,
-        _event$operatorUser2,
-        _this$privilegeOperat,
+      var _this$privilegeOperat,
         _securityInfo$info,
-        _securityInfo$info2,
-        _securityInfo$info3,
-        _securityInfo$info4,
-        _securityInfo$info5,
-        _securityInfo$info6,
         _this4 = this,
-        _event$securityInfo$i,
-        _event$securityInfo$i2;
-      this.privilegeOperator = event.operatorUser;
-      var securityInfo = event.securityInfo;
+        _securityInfo$info2;
+      var securityInfo = event.securityInfo,
+        operatorUser = event.operatorUser;
+      this.privilegeOperator = operatorUser;
       var enable = securityInfo.enable;
-      var isPersonalOperation = this._localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId);
-      var toastType = isPersonalOperation ? 'normal' : enable ? 'info' : 'error';
-      var operator = isPersonalOperation ? transI18n('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === FcrUserRole.HOST ? transI18n('fmt_role_host') : transI18n('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
-      if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === FcrSecurityAction.JoinWithMuteAudio) {
-        if (enable) {
-          this._messageProvider.showToast({
-            type: toastType,
-            message: transI18n('fmt_settings_tips_muteallwhilejoin', {
-              reason1: operator
-            })
-          });
-        }
-      } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) === FcrSecurityAction.StartAudio) {
-        var toastMessage = enable ? transI18n('fmt_settings_tips_allowedselfunmuting') : transI18n('fmt_settings_tips_disabledselfunmuting');
-        if (!this._sharedInterpreterDataSource.localInterpreterUserInfo) {
-          this._messageProvider.showToast({
-            type: enable ? 'normal' : 'error',
-            message: toastMessage
-          });
-        }
-      } else if (((_securityInfo$info3 = securityInfo.info) === null || _securityInfo$info3 === void 0 ? void 0 : _securityInfo$info3.action) === FcrSecurityAction.StartVideo) {
-        var _toastMessage = enable ? transI18n('fmt_settings_tips_videoenabled') : transI18n('fmt_settings_tips_disabledvideo');
-        this._messageProvider.showToast({
-          type: enable ? 'normal' : 'error',
-          message: _toastMessage
-        });
-      } else if (((_securityInfo$info4 = securityInfo.info) === null || _securityInfo$info4 === void 0 ? void 0 : _securityInfo$info4.action) === FcrSecurityAction.ShareScreen) {
-        var _toastMessage2 = enable ? transI18n('fmt_settings_tips_allowedScreensharing', {
-          reason1: operator
-        }) : transI18n('fmt_settings_tips_disabledScreensharing', {
-          reason1: operator
-        });
-        this._messageProvider.showToast({
-          type: toastType,
-          message: _toastMessage2
-        });
-      } else if (((_securityInfo$info5 = securityInfo.info) === null || _securityInfo$info5 === void 0 ? void 0 : _securityInfo$info5.action) === FcrSecurityAction.SendChat) {
-        var _toastMessage3 = enable ? transI18n('fmt_settings_tips_allowedchat', {
-          reason1: operator
-        }) : transI18n('fmt_settings_tips_banedchat', {
-          reason1: operator
-        });
-        this._messageProvider.showToast({
-          type: enable ? 'normal' : 'error',
-          message: _toastMessage3
-        });
-      } else if (((_securityInfo$info6 = securityInfo.info) === null || _securityInfo$info6 === void 0 ? void 0 : _securityInfo$info6.action) === FcrSecurityAction.Sharing && !enable) {
+      var isPersonalOperation = this._localUser.userId === (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId);
+      var operator = isPersonalOperation ? transI18n('fmt_settings_labels_you') : ((operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userRole) === FcrUserRole.HOST ? transI18n('fmt_role_host') : transI18n('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
+      if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === FcrSecurityAction.Sharing && !enable) {
         var _this$boardOwnerUser, _this$boardOwnerUser2;
         if (!this.boardOwnerUser) return;
         var isHost = [FcrUserRole.HOST, FcrUserRole.COHOST].includes((_this$boardOwnerUser = this.boardOwnerUser) === null || _this$boardOwnerUser === void 0 ? void 0 : _this$boardOwnerUser.userRole);
         if (((_this$boardOwnerUser2 = this.boardOwnerUser) === null || _this$boardOwnerUser2 === void 0 ? void 0 : _this$boardOwnerUser2.userId) !== this._localUser.userId) {
-          this._messageProvider.showToast({
-            type: toastType,
-            message: transI18n('fmt_screenshare_whiteboard_tips_alreadyopend')
-          });
           if (!isHost) {
             this._eventProvider.sendEvent(FcrUIAction.CLOSE_WHITEBOARD);
           }
@@ -541,119 +525,29 @@ export var FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
             height: 160
           });
         }
-      } else if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) === FcrSecurityAction.WaitingRoom) {
-        var _event$operatorUser3, _event$operatorUser4;
-        var isSelf = this._localUser.userId === ((_event$operatorUser3 = event.operatorUser) === null || _event$operatorUser3 === void 0 ? void 0 : _event$operatorUser3.userId);
-        var userName = (_event$operatorUser4 = event.operatorUser) === null || _event$operatorUser4 === void 0 ? void 0 : _event$operatorUser4.userName;
-        if (!isSelf) {
-          if (enable) {
-            this._messageProvider.showToast({
-              type: toastType,
-              message: "".concat(userName).concat(transI18n('fmt_waitingroom_setting_tips_enable'))
-            });
-          } else {
-            this._messageProvider.showToast({
-              type: toastType,
-              message: "".concat(userName).concat(transI18n('fmt_waitingroom_mobile_setting_label_disable'))
-            });
-          }
-        }
-      } else if (((_event$securityInfo$i2 = event.securityInfo.info) === null || _event$securityInfo$i2 === void 0 ? void 0 : _event$securityInfo$i2.action) == FcrSecurityAction.WaterMark) {
-        var _enable = event.securityInfo.enable;
+      } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) == FcrSecurityAction.WaterMark) {
+        var _enable = securityInfo.enable;
         if (this._prevWaterMarkEnable !== _enable) {
-          var _event$operatorUser5;
-          var toastText = '';
-          var roleValue = (_event$operatorUser5 = event.operatorUser) === null || _event$operatorUser5 === void 0 ? void 0 : _event$operatorUser5.userRole;
+          var roleValue = operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userRole;
           var canTriggerToast = roleValue === FcrUserRole.HOST || roleValue === FcrUserRole.COHOST;
           if (canTriggerToast) {
-            if (_enable) {
-              if (roleValue === FcrUserRole.HOST) {
-                toastText = transI18n('fmt_security_setting_popup_toast_facilitator_watermark');
-              } else if (roleValue === FcrUserRole.COHOST) {
-                toastText = transI18n('fmt_security_setting_popup_toast_co_facilitator_watermark');
-              }
-            } else {
-              toastText = transI18n('fmt_security_setting_popup_toast_turn_off_watermark');
-            }
+            this._observable.notifyObservers('onWaterMarkEnableUpdated', _enable, operatorUser);
             this._prevWaterMarkEnable = _enable;
-            if (toastText) {
-              this._messageProvider.showToast({
-                type: toastType,
-                message: toastText
-              });
-            }
           }
         }
       }
-      // else if(event.securityInfo.info?.action == FcrSecurityAction.){
-
-      // }
     }
   }, {
     key: "_handleUserRoleChangeToast",
     value: function _handleUserRoleChangeToast(targetUser) {
-      var _this$_mainRoomContro;
-      var localUser = (_this$_mainRoomContro = this._mainRoomControl) === null || _this$_mainRoomContro === void 0 ? void 0 : _this$_mainRoomContro.getUserControl().getLocalUser();
       var oldUser = this._userMap.get(targetUser.userId);
-      var isSelf = targetUser.userId === localUser.userId;
       var hasHost = this._userMap.values().some(function (user) {
         return user.userRole === FcrUserRole.HOST;
       });
-      // 被设置为主持人
-      //  本人：
-      //  xxx(我)成为新主持人
-      //  其他人：
-      //   xxx成为新主持人
-      // 被收回主持人
-      //  本人：
-      //    xxx成为新主持人
-      //  其他人：
-      //    xxx成为新主持人
-      // 被设置为联席
-      //  本人：
-      //    你被设置为联席主持人
-      //  其他人：
-      //    xxx现在成为联席主持人
-      //
-      // 被收回联席
-      //  本人：
-      //     你的联席主持人身份已被收回
-      //  其他人：
-      //    xxx不再是联席主持人
-      // 当会议没有主持人的时候，我通过 hostkey 成为主持人，不需要提醒，如果会议有主持人，代表是移交主持人，走原有逻辑
-      if (!hasHost && !isSelf || hasHost && targetUser.userRole === FcrUserRole.HOST) {
-        this._messageProvider.showToast({
-          type: isSelf ? 'info' : 'normal',
-          message: transI18n(isSelf ? 'fmt_attendies_tips_mine_new_host' : 'fmt_attendies_tips_new_host', {
-            reason1: targetUser.userName
-          })
-        });
-      } else if (targetUser.userRole === FcrUserRole.COHOST) {
-        this._messageProvider.showToast({
-          type: isSelf ? 'info' : 'normal',
-          message: transI18n(isSelf ? 'fmt_attendies_tips_mine_new_co_host' : 'fmt_attendies_tips_new_co_host', {
-            reason1: targetUser.userName
-          })
-        });
-      } else if (targetUser.userRole === FcrUserRole.PARTICIPANT) {
-        if ((oldUser === null || oldUser === void 0 ? void 0 : oldUser.userRole) === FcrUserRole.COHOST) {
-          if (isSelf) {
-            this._messageProvider.showToast({
-              type: 'error',
-              message: transI18n('fmt_pairicipant_tips_cohostbeenrevoke'),
-              duration: 3000
-            });
-          } else {
-            this._messageProvider.showToast({
-              type: 'normal',
-              message: transI18n('fmt_pairicipant_tips_nolongercohost', {
-                reason1: targetUser.userName
-              }),
-              duration: 3000
-            });
-          }
-        }
-      }
+      this._observable.notifyObservers('onUserRoleChanged', targetUser, {
+        oldUser: oldUser,
+        hasHost: hasHost
+      });
     }
   }]);
 }();

package/lib-es/providers/room-provider/waiting-room-control-manager.js

@@ -23,9 +23,9 @@ import "core-js/modules/web.dom-collections.for-each.js";
 import { FcrAudioSourceType, FcrStreamLatencyLevel } from 'fcr-core';
 import { FcrUserRole } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrPermissionAction, FcrSecurityAction } from 'fcr-core/lib/room-control/privilege-control/type';
-import { AgoraObservable } from 'fcr-core/lib/imports';
 import { createLogger } from '../../utilities/logger';
 import { FcrStreamType, FcrVideoSourceType, FcrMediaSourceState } from 'fcr-core/lib/type';
+import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 var FcrUIWaitingRoomControlManager = /*#__PURE__*/function () {
   function FcrUIWaitingRoomControlManager(_sceneConfig, _engine, _mainRoomControl) {
     var _this = this;

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

@@ -124,7 +124,7 @@ export var FcrUIScreenShareProviderBase = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _B, _init__isRemoteUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _C, _init__isSharingWithAudio(this, false));
     _classPrivateFieldInitSpec(this, _D, _init__isSharingInSmoothMode(this, false));
-    _classPrivateFieldInitSpec(this, _E, _init__isSharingInStereoAudioMode(this, true));
+    _classPrivateFieldInitSpec(this, _E, _init__isSharingInStereoAudioMode(this, false));
     _classPrivateFieldInitSpec(this, _F, _init__shareStreamId(this, null));
     _classPrivateFieldInitSpec(this, _G, _init__sharingUser(this, null));
     this.objectManager = objectManager;
@@ -288,6 +288,11 @@ export var FcrUIScreenShareProviderBase = /*#__PURE__*/function () {
     get: function get() {
       return this._isLocalUserScreenSharing;
     }
+  }, {
+    key: "isScreenShareStarted",
+    get: function get() {
+      return this._isScreenShareStarted;
+    }
   }, {
     key: "addObserver",
     value: function addObserver(observer) {

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

@@ -110,7 +110,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
     key: "startShare",
     value: function () {
       var _startShare = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, _ref$excludeWindows, excludeWindows, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, dimensions, frameRate, bitrate, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, _ref$excludeWindows, excludeWindows, createConfig, screenTrack, errorPayload, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, dimensions, frameRate, bitrate, _t, _t2;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -119,19 +119,23 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 streamType: FcrStreamType.BOTH,
                 videoSourceId: videoSourceId
               };
-              screenTrack = this.strategy.getScreenTrack(); // check if there's a screen track exists
+              screenTrack = this.strategy.getScreenTrack();
+              errorPayload = {
+                videoSourceId: videoSourceId,
+                captureType: captureType
+              }; // check if there's a screen track exists
               if (!screenTrack) {
                 _context3.next = 1;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT, errorPayload);
               throw new Error('cannot start screen share twice: screen track already exists');
             case 1:
               if (!this._screenStreamSync.checkIfMyScreenShareStreamExists()) {
                 _context3.next = 2;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT, errorPayload);
               throw new Error('cannot start screen share twice: my screen stream already exists');
             case 2:
               // check if screen capture permission is granted
@@ -140,7 +144,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 _context3.next = 3;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_SCREEN_RECORDING_PERMISSION);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_SCREEN_RECORDING_PERMISSION, errorPayload);
               throw new Error('no screen recording permission');
             case 3:
               // check if screen sharing is permitted
@@ -149,7 +153,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 _context3.next = 4;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_PUBLISH_PRIVILIGE);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_PUBLISH_PRIVILIGE, errorPayload);
               throw new Error('no screen sharing permission');
             case 4:
               audioSourceId = this.strategy.getLoopbackDeviceId();
@@ -181,7 +185,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
             case 7:
               _context3.prev = 7;
               _t = _context3["catch"](5);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE, errorPayload);
               throw new Error("cannot start screen capture, error: ".concat(_t));
             case 8:
               if (this._facilityProvider.isNetworkConnected) {
@@ -189,7 +193,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 break;
               }
               this.strategy.stopScreenCapture();
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED, errorPayload);
               throw new Error('network is disconnected while starting screen share');
             case 9:
               _context3.prev = 9;
@@ -201,7 +205,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
             case 11:
               _context3.prev = 11;
               _t2 = _context3["catch"](9);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM, errorPayload);
               throw new Error("cannot create screen stream, error: ".concat(_t2));
             case 12:
             case "end":