fcr-ui-scene 3.7.5 → 3.7.7

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

@@ -23,7 +23,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = exports.FcrUIMainRoomControlProviderImpl = exports.FcrUICurrentRoomControlProviderImpl = exports.FcrUIConnectionProviderImpl = void 0;
+exports.FcrUIWaitingRoomControlProviderImpl = exports.FcrUIRoomProviderImpl = exports.FcrUIMainRoomControlProviderImpl = exports.FcrUICurrentRoomControlProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
@@ -81,7 +81,7 @@ var _waitingRoomControlManager = _interopRequireDefault(require("./waiting-room-
 var _constant = require("../../utilities/constant");
 var _privilegeProvider = require("../privilege-provider");
 var _FcrUIRoomProviderImpl, _FcrUIMainRoomControlProviderImpl;
-var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initBaseRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _handleSecurityUpdatedDecs, _ref2;
+var _initProto, _init_liveStreamingState, _init_liveStreamingConfig, _init_cloudRecordingState, _initBaseRoomStateDecs, _ref, _initProto2, _init_privilegeOperator, _init_boardOwnerUser, _initUserMapDecs, _handleSecurityUpdatedDecs, _ref2;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -99,7 +99,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 _ref = (_initBaseRoomStateDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/function () {
-  function FcrUIRoomProviderImpl(_eventProvider, _sceneConfig, _engine, _messageProvider) {
+  function FcrUIRoomProviderImpl(_sceneConfig, _engine, _messageProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIRoomProviderImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
@@ -166,12 +166,9 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     _classPrivateFieldInitSpec(this, _A, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
     _classPrivateFieldInitSpec(this, _B, _init_liveStreamingConfig(this, undefined));
     _classPrivateFieldInitSpec(this, _C, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
-    this._eventProvider = _eventProvider;
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
     this._messageProvider = _messageProvider;
-    //@ts-ignore
-    window.roomStore = this;
     this._baseRoomControlObserver = {
       onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
         if (state === _type3.FcrRoomState.Closed) {
@@ -248,6 +245,7 @@ var FcrUIRoomProviderImpl = exports.FcrUIRoomProviderImpl = /*#__PURE__*/functio
     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);
@@ -349,29 +347,9 @@ _init_liveStreamingState = _applyDecs$e[0];
 _init_liveStreamingConfig = _applyDecs$e[1];
 _init_cloudRecordingState = _applyDecs$e[2];
 _initProto = _applyDecs$e[3];
-var FcrUIConnectionProviderImpl = exports.FcrUIConnectionProviderImpl = /*#__PURE__*/function () {
-  function FcrUIConnectionProviderImpl(_engine) {
-    (0, _classCallCheck2["default"])(this, FcrUIConnectionProviderImpl);
-    this._engine = _engine;
-  }
-  return (0, _createClass2["default"])(FcrUIConnectionProviderImpl, [{
-    key: "addObserver",
-    value: function addObserver(observer) {
-      this._engine.addObserver(observer);
-    }
-  }, {
-    key: "removeObserver",
-    value: function removeObserver(observer) {
-      this._engine.removeObserver(observer);
-    }
-  }, {
-    key: "release",
-    value: function release() {}
-  }]);
-}();
 var _A2 = /*#__PURE__*/new WeakMap();
 var _B2 = /*#__PURE__*/new WeakMap();
-_ref2 = (_handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
+_ref2 = (_initUserMapDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "_privilegeProvider");
 var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIMainRoomControlProviderImpl(_mainRoomControl, eventProvider, messageProvider, dialogProvider, _sharedInterpreterDataSource) {
     var _this2 = this;
@@ -388,6 +366,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._privilegeControl = _mainRoomControl.getPrivilegeControl();
     this._userControl = _mainRoomControl.getUserControl();
     this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl(), eventProvider);
+    this._initUserMap();
     this._privilegeObserver = {
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
@@ -404,8 +383,8 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
         if (event.reason === _type3.FcrUserUpdatedReason.ROLE) {
-          _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
           _this2._handleUserRoleChangeToast(event.modifiedUser);
+          _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
         }
       }
     };
@@ -466,6 +445,15 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       this._userControl.removeObserver(this._userObserver);
       this._privilegeProvider.release();
     }
+  }, {
+    key: "_initUserMap",
+    value: function _initUserMap() {
+      var _this3 = this;
+      var userList = this._userControl.getUserList();
+      userList.forEach(function (user) {
+        _this3._userMap.set(user.userId, user);
+      });
+    }
   }, {
     key: "_handleSecurityUpdated",
     value: function _handleSecurityUpdated(roomId, event) {
@@ -478,7 +466,7 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
         _securityInfo$info4,
         _securityInfo$info5,
         _securityInfo$info6,
-        _this3 = this,
+        _this4 = this,
         _event$securityInfo$i,
         _event$securityInfo$i2;
       this.privilegeOperator = event.operatorUser;
@@ -552,10 +540,10 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
             okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
             showCancel: false,
             onOk: function onOk() {
-              _this3._dialogProvider.closeDialogById(dialogId);
+              _this4._dialogProvider.closeDialogById(dialogId);
             },
             onCancel: function onCancel() {
-              _this3._dialogProvider.closeDialogById(dialogId);
+              _this4._dialogProvider.closeDialogById(dialogId);
             },
             height: 160
           });
@@ -677,25 +665,25 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
   }]);
 }();
 _FcrUIMainRoomControlProviderImpl = FcrUIMainRoomControlProviderImpl;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMainRoomControlProviderImpl, [[_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"]], []).e, 3);
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIMainRoomControlProviderImpl, [[_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_initUserMapDecs, 18, "_initUserMap"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"]], []).e, 3);
 _init_privilegeOperator = _applyDecs$e2[0];
 _init_boardOwnerUser = _applyDecs$e2[1];
 _initProto2 = _applyDecs$e2[2];
 var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProviderImpl = /*#__PURE__*/function () {
   function FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider) {
-    var _this4 = this;
+    var _this5 = this;
     (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlProviderImpl);
     this._roomProvider = roomProvider;
     this._eventProvider = eventProvider;
     this._roomObserver = {
       onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
-        _this4._setWaitingRoomControl(roomControl);
+        _this5._setWaitingRoomControl(roomControl);
       },
       onLeaveWaitingRoom: function onLeaveWaitingRoom() {
-        var _this4$_privilegeProv;
-        (_this4$_privilegeProv = _this4._privilegeProvider) === null || _this4$_privilegeProv === void 0 || _this4$_privilegeProv.release();
-        _this4._privilegeProvider = undefined;
-        _this4._waitingRoomControl = undefined;
+        var _this5$_privilegeProv;
+        (_this5$_privilegeProv = _this5._privilegeProvider) === null || _this5$_privilegeProv === void 0 || _this5$_privilegeProv.release();
+        _this5._privilegeProvider = undefined;
+        _this5._waitingRoomControl = undefined;
       }
     };
     roomProvider.addObserver(this._roomObserver);
@@ -730,6 +718,7 @@ var FcrUICurrentRoomControlProviderImpl = exports.FcrUICurrentRoomControlProvide
   function FcrUICurrentRoomControlProviderImpl(_currentRoomControl) {
     (0, _classCallCheck2["default"])(this, FcrUICurrentRoomControlProviderImpl);
     this._currentRoomControl = _currentRoomControl;
+    this._roomType = this._currentRoomControl.getRoomInfo().roomType;
   }
   return (0, _createClass2["default"])(FcrUICurrentRoomControlProviderImpl, [{
     key: "currentRoomControl",
@@ -739,7 +728,7 @@ var FcrUICurrentRoomControlProviderImpl = exports.FcrUICurrentRoomControlProvide
   }, {
     key: "currentRoomType",
     get: function get() {
-      return this._currentRoomControl.getRoomInfo().roomType;
+      return this._roomType;
     }
   }, {
     key: "release",

package/lib/providers/room-provider.d.ts

@@ -0,0 +1,194 @@
+import { FcrCoreEngine } from 'fcr-core';
+import { FcrBaseRoomControl, FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrLiveStreamingConfig, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIConnectionObserver, FcrUIExitReason, FcrUIRoomObserver, FcrUISceneConfig } from '../type';
+import { FcrUIEventProvider } from './event-provider';
+import { FcrUIPrivilegeProvider, FcrUIPrivilegeProviderImpl } from './privilege-provider';
+import { FcrUIMessageProvider } from './message-provider';
+import { FcrUIDialogProvider } from './dialog-provider';
+import { FcrUISharedInterpreterDataSource } from '../shared-data-source/interpreter';
+import FcrUIWaitingRoomControlManager from '../waiting-room-control-manager';
+export interface FcrUIMainRoomControlProvider {
+    /**
+     * 主房间 privilegeProvider
+     */
+    get privilegeProvider(): FcrUIPrivilegeProvider;
+    /**
+     * 主房间
+     */
+    get mainRoomControl(): FcrMainRoomControl;
+}
+export interface FcrUIWaitingRoomControlProvider {
+    /**
+     * 等候室 privilegeProvider
+     */
+    get privilegeProvider(): FcrUIPrivilegeProvider | undefined;
+    /**
+     * 等候室
+     */
+    get waitingRoomControl(): FcrWaitingRoomControl | undefined;
+}
+export interface FcrUICurrentRoomControlProvider {
+    /**
+     * 当前房间
+     */
+    get currentRoomControl(): FcrBaseRoomControl;
+    /**
+     * 当前房间类型
+     */
+    get currentRoomType(): FcrRoomType;
+}
+export interface FcrUIExitRoomParamsType {
+    reason: FcrUIExitReason;
+    roomType?: number;
+}
+export interface FcrUIRoomProvider {
+    /**
+     * 当前房间
+     */
+    get currentRoomControl(): FcrBaseRoomControl | undefined;
+    /**
+     * 直播状态
+     */
+    get liveStreamingState(): FcrLiveStreamingState;
+    /**
+     * 直播配置
+     */
+    get liveStreamingConfig(): FcrLiveStreamingConfig | undefined;
+    /**
+     * 云录制状态
+     */
+    get cloudRecordingState(): FcrRecordingState;
+    /**
+     * 是不是自己结束会议的
+     */
+    get isSelfEndMeeting(): boolean;
+    /**
+     * 设置是不是自己结束会议的
+     */
+    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
+    getRoomDetailCopyText(): string;
+    /**
+     * 启动直播
+     */
+    startLiveStreaming(params: FcrLiveStreamingConfig): Promise<void>;
+    /**
+     * 停止直播
+     */
+    stopLiveStreaming(): Promise<void>;
+    /**
+     * 退出房间
+     */
+    exitRoom(): void;
+    /**
+     * 开启云录制
+     */
+    startCloudRecording(): Promise<void>;
+    /**
+     * 暂停云录制
+     */
+    pauseCloudRecording(): Promise<void>;
+    /**
+     * 恢复云录制
+     */
+    resumeCloudRecording(): Promise<void>;
+    /**
+     * 停止云录制
+     */
+    stopCloudRecording(): Promise<void>;
+    addObserver(observer: FcrUIRoomObserver): void;
+    removeObserver(observer: FcrUIRoomObserver): void;
+}
+export interface FcrUIConnectionProvider {
+    addObserver(observer: FcrUIConnectionObserver): void;
+    removeObserver(observer: FcrUIConnectionObserver): void;
+}
+export declare class FcrUIRoomProviderImpl implements FcrUIRoomProvider {
+    private _eventProvider;
+    private _sceneConfig;
+    private _engine;
+    private _messageProvider;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observable;
+    private _waitingRoomManager?;
+    private _lastRoomControlType?;
+    private _isSelfJoinRoom;
+    private _roomInfo?;
+    private _roomSchedule?;
+    private _localUserInfo?;
+    private _waitingRoomManagerObserver;
+    private _baseRoomControlObserver;
+    private _userControlObserver;
+    private _currentRoomControl?;
+    private _roomRouter;
+    private _isSelfEndMeeting;
+    private _roomRouterObserver;
+    accessor liveStreamingState: FcrLiveStreamingState;
+    accessor liveStreamingConfig: FcrLiveStreamingConfig | undefined;
+    accessor cloudRecordingState: FcrRecordingState;
+    constructor(_eventProvider: FcrUIEventProvider, _sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _messageProvider: FcrUIMessageProvider);
+    getRoomDetailCopyText(): string;
+    get currentRoomControl(): FcrBaseRoomControl;
+    get waitingRoomManager(): FcrUIWaitingRoomControlManager;
+    setIsSelfEndMeeting(isSelfEndMeeting: boolean): void;
+    get isSelfEndMeeting(): boolean;
+    release(): void;
+    private _releaseWaitingRoomManager;
+    handleJoinRoom(): Promise<void>;
+    startLiveStreaming(params: FcrLiveStreamingConfig): Promise<void>;
+    stopLiveStreaming(): Promise<void>;
+    exitRoom(): void;
+    startCloudRecording(): Promise<void>;
+    pauseCloudRecording(): Promise<void>;
+    resumeCloudRecording(): Promise<void>;
+    stopCloudRecording(): Promise<void>;
+    addObserver(observer: FcrUIRoomObserver): void;
+    removeObserver(observer: FcrUIRoomObserver): void;
+    private _getJoinRoomOption;
+    private _initBaseRoomState;
+}
+export declare class FcrUIConnectionProviderImpl implements FcrUIConnectionProvider {
+    private _engine;
+    constructor(_engine: FcrCoreEngine);
+    addObserver(observer: FcrUIConnectionObserver): void;
+    removeObserver(observer: FcrUIConnectionObserver): void;
+}
+export declare class FcrUIMainRoomControlProviderImpl implements FcrUIMainRoomControlProvider {
+    private _mainRoomControl;
+    private _sharedInterpreterDataSource;
+    private _privilegeProvider;
+    private _privilegeControl;
+    private _userControl;
+    private _privilegeObserver;
+    private _eventObserver;
+    private _userObserver;
+    private _messageProvider;
+    private _dialogProvider;
+    private _eventProvider;
+    private _prevWaterMarkEnable;
+    private _userMap;
+    accessor privilegeOperator: FcrUserInfo | undefined;
+    accessor boardOwnerUser: FcrUserInfo | undefined;
+    constructor(_mainRoomControl: FcrMainRoomControl, eventProvider: FcrUIEventProvider, messageProvider: FcrUIMessageProvider, dialogProvider: FcrUIDialogProvider, _sharedInterpreterDataSource: FcrUISharedInterpreterDataSource);
+    get mainRoomControl(): FcrMainRoomControl;
+    get privilegeProvider(): FcrUIPrivilegeProviderImpl;
+    private get _localUser();
+    release(): void;
+    private _handleSecurityUpdated;
+    private _handleUserRoleChangeToast;
+}
+export declare class FcrUIWaitingRoomControlProviderImpl implements FcrUIWaitingRoomControlProvider {
+    private _waitingRoomControl?;
+    private _privilegeProvider?;
+    private _eventProvider?;
+    constructor(roomProvider: FcrUIRoomProvider, eventProvider: FcrUIEventProvider);
+    get waitingRoomControl(): FcrWaitingRoomControl | undefined;
+    get privilegeProvider(): FcrUIPrivilegeProviderImpl | undefined;
+    private _setWaitingRoomControl;
+}
+export declare class FcrUICurrentRoomControlProviderImpl implements FcrUICurrentRoomControlProvider {
+    private _currentRoomControl;
+    constructor(_currentRoomControl: FcrBaseRoomControl);
+    get currentRoomControl(): FcrBaseRoomControl;
+    get currentRoomType(): FcrRoomType;
+}