fcr-ui-scene 3.4.4 → 3.5.0

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

@@ -40,14 +40,17 @@ exports.FcrUIScreenShareProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.some.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
@@ -57,7 +60,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _screenCapturePermission = require("../utilities/screen-capture-permission");
 var _fcrCore = require("fcr-core");
@@ -67,8 +69,12 @@ var _mobx = require("mobx");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _env = require("agora-foundation/lib/utilities/env");
+var _logger = require("../utilities/logger");
+var _type2 = require("agora-rte-sdk/lib/type");
+var _decorator = require("agora-foundation/lib/decorator");
+var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _FcrUIScreenShareProviderImpl;
-var _initProto, _init_applicationCaptureSources, _init_screenCaptureSources, _init_shareSelectionDialogId, _startShareScreenDecs, _ref;
+var _initProto, _init_applicationCaptureSources, _init_screenCaptureSources, _init_shareSelectionDialogId, _init_isSharingScreen, _init_isSeizeStream, _init_screenSharingOwner, _releaseDecs, _startShareScreenDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -82,19 +88,34 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_startShareScreenDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _D = /*#__PURE__*/new WeakMap();
+var _E = /*#__PURE__*/new WeakMap();
+var _F = /*#__PURE__*/new WeakMap();
+_ref = (_releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__PURE__*/function () {
   function FcrUIScreenShareProviderImpl(_deviceProvider, _dialogProvider, _roomProvider) {
+    var _this$_roomProvider$c;
     (0, _classCallCheck2["default"])(this, FcrUIScreenShareProviderImpl);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIScreenShareProviderImpl'
+    })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_controlBarDialogId", '');
+    (0, _defineProperty2["default"])(this, "_streamControlObserver", {
+      onStreamsAdded: this._handleStreamAdded,
+      onStreamsRemoved: this._handleStreamRemoved,
+      onStreamsUpdated: this._handleStreamUpdated
+    });
     _classPrivateFieldInitSpec(this, _A, _init_applicationCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _B, _init_screenCaptureSources(this, []));
     _classPrivateFieldInitSpec(this, _C, _init_shareSelectionDialogId(this, ''));
+    _classPrivateFieldInitSpec(this, _D, _init_isSharingScreen(this, false));
+    _classPrivateFieldInitSpec(this, _E, _init_isSeizeStream(this, false));
+    _classPrivateFieldInitSpec(this, _F, _init_screenSharingOwner(this));
     this._deviceProvider = _deviceProvider;
     this._dialogProvider = _dialogProvider;
     this._roomProvider = _roomProvider;
+    (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 || _this$_roomProvider$c.getStreamControl().addObserver(this._streamControlObserver);
   }
   return (0, _createClass2["default"])(FcrUIScreenShareProviderImpl, [{
     key: "applicationCaptureSources",
@@ -120,6 +141,65 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     set: function set(v) {
       _classPrivateFieldSet(_C, this, v);
     }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "isSeizeStream",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
+  }, {
+    key: "screenSharingOwner",
+    get: function get() {
+      return _classPrivateFieldGet(_F, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_F, this, v);
+    }
+  }, {
+    key: "_handleStreamAdded",
+    value: function _handleStreamAdded(roomId, events) {
+      this._handleStreamPublic();
+      this.isSeizeStream = events.some(function (event) {
+        return event.modifiedStream.videoSourceType === _type2.AgoraRteVideoSourceType.SCREEN;
+      });
+    }
+  }, {
+    key: "_handleStreamUpdated",
+    value: function _handleStreamUpdated(roomId, events) {
+      this._handleStreamPublic();
+    }
+  }, {
+    key: "_handleStreamRemoved",
+    value: function _handleStreamRemoved(roomId, events) {
+      this._handleStreamPublic();
+      this.isSeizeStream = events.some(function (event) {
+        var _event$cause, _event$operatorUser;
+        return event.modifiedStream.videoSourceType === _type2.AgoraRteVideoSourceType.SCREEN && ((_event$cause = event.cause) === null || _event$cause === void 0 || (_event$cause = _event$cause.data) === null || _event$cause === void 0 ? void 0 : _event$cause.reason) === _types.FcrBoardInactiveReason.SEIZE && ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) !== event.modifiedStream.owner.userId;
+      });
+    }
+  }, {
+    key: "_handleStreamPublic",
+    value: function _handleStreamPublic() {
+      var _this$_roomProvider$c2, _streams$find;
+      var streams = (_this$_roomProvider$c2 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c2 === void 0 ? void 0 : _this$_roomProvider$c2.getStreamControl().getStreamList();
+      var isSharingScreen = streams === null || streams === void 0 ? void 0 : streams.some(function (stream) {
+        return stream.videoSourceType === _type2.AgoraRteVideoSourceType.SCREEN;
+      });
+      this.isSharingScreen = !!isSharingScreen;
+      this.screenSharingOwner = streams === null || streams === void 0 || (_streams$find = streams.find(function (stream) {
+        return stream.videoSourceType === _type2.AgoraRteVideoSourceType.SCREEN;
+      })) === null || _streams$find === void 0 ? void 0 : _streams$find.owner;
+    }
   }, {
     key: "addObserver",
     value: function addObserver(observer) {
@@ -133,14 +213,20 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "startShareWhiteboard",
     value: function startShareWhiteboard() {
-      var _this$_roomProvider$c;
-      (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 || _this$_roomProvider$c.getBoardControl().active();
+      var _this$_roomProvider$c3;
+      (_this$_roomProvider$c3 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c3 === void 0 || _this$_roomProvider$c3.getBoardControl().active();
     }
   }, {
     key: "stopShareWhiteboard",
     value: function stopShareWhiteboard() {
-      var _this$_roomProvider$c2;
-      (_this$_roomProvider$c2 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c2 === void 0 || _this$_roomProvider$c2.getBoardControl().inactive();
+      var _this$_roomProvider$c4;
+      (_this$_roomProvider$c4 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c4 === void 0 || _this$_roomProvider$c4.getBoardControl().inactive();
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var _this$_roomProvider$c5;
+      (_this$_roomProvider$c5 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c5 === void 0 || _this$_roomProvider$c5.getStreamControl().removeObserver(this._streamControlObserver);
     }
   }, {
     key: "startShareScreen",
@@ -230,9 +316,12 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }]);
 }();
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "shareSelectionDialogId"], [_startShareScreenDecs, 18, "startShareScreen"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareProviderImpl, [[_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "shareSelectionDialogId"], [_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenSharingOwner"], [_decorator.bound, 2, "_handleStreamAdded"], [_decorator.bound, 2, "_handleStreamUpdated"], [_decorator.bound, 2, "_handleStreamRemoved"], [_decorator.bound, 2, "_handleStreamPublic"], [_releaseDecs, 18, "release"], [_startShareScreenDecs, 18, "startShareScreen"]], []).e, 7);
 _init_applicationCaptureSources = _applyDecs$e[0];
 _init_screenCaptureSources = _applyDecs$e[1];
 _init_shareSelectionDialogId = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
+_init_isSharingScreen = _applyDecs$e[3];
+_init_isSeizeStream = _applyDecs$e[4];
+_init_screenSharingOwner = _applyDecs$e[5];
+_initProto = _applyDecs$e[6];
 (0, _base.registerDependency)('screenShareProvider');

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

@@ -1,5 +1,5 @@
 import { FcrUIRoomProvider } from '../providers/room-provider';
-import { FcrUIWebWidget, ID } from '../modules/widget/type';
+import { FcrRegisteredWidgetConfigs, FcrUIWebWidget, ID } from '../modules/widget/type';
 import { FcrUIWebWidgetConfig } from '../type';
 import { FcrUIDialogProvider } from './dialog-provider';
 export interface FcrUIWidgetProvider {
@@ -8,14 +8,18 @@ export interface FcrUIWidgetProvider {
      *存储已注册的widget
      *渲染在应用窗口中
      */
-    registeredWidgetConfigs: Map<ID, FcrUIWebWidgetConfig>;
-    dialogIds: Map<ID, string>;
+    get registeredWidgetConfigs(): Map<ID, FcrUIWebWidgetConfig>;
     /**
      *Map<id, FcrUIWebWidget>
      *存储已打开的widget对象
      *渲染widget容器
      */
-    openedWidgets: Map<ID, FcrUIWebWidget>;
+    get openedWidgets(): Map<ID, FcrUIWebWidget>;
+    /**
+     *Map<id, FcrUIWebWidget>
+     *存储已打开的widget对象对应的 dialogId
+     */
+    get dialogIds(): Map<ID, string>;
     /**
      * 根据widgetId打开widget
      *实例化FcrUIBaseWidget，加入openedWidgets
@@ -35,9 +39,13 @@ export declare class FcrUIWidgetProviderImpl implements FcrUIWidgetProvider {
     private _dialogProvider;
     private _dialogProviderObserver;
     accessor dialogIds: Map<ID, string>;
-    accessor registeredWidgetConfigs: Map<ID, FcrUIWebWidgetConfig>;
+    accessor registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
     accessor openedWidgets: Map<ID, FcrUIWebWidget>;
-    constructor(roomProvider: FcrUIRoomProvider, dialogProvider: FcrUIDialogProvider);
+    constructor({ registeredWidgetConfigs, roomProvider, dialogProvider, }: {
+        registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
+        roomProvider: FcrUIRoomProvider;
+        dialogProvider: FcrUIDialogProvider;
+    });
     openWidget(widgetId: string): void;
     closeWidget(widgetId: string): void;
     release(): void;

package/lib/providers/widget-provider.js

@@ -29,7 +29,6 @@ require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -73,16 +72,19 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/function () {
-  function FcrUIWidgetProviderImpl(roomProvider, dialogProvider) {
+  function FcrUIWidgetProviderImpl(_ref) {
     var _this = this;
+    var registeredWidgetConfigs = _ref.registeredWidgetConfigs,
+      roomProvider = _ref.roomProvider,
+      dialogProvider = _ref.dialogProvider;
     (0, _classCallCheck2["default"])(this, FcrUIWidgetProviderImpl);
     (0, _defineProperty2["default"])(this, "_roomProvider", void _initProto(this));
     (0, _defineProperty2["default"])(this, "_dialogProviderObserver", {
       onDialogClosed: function onDialogClosed(dialogId) {
         var _Array$from$find;
-        var widgetId = (_Array$from$find = Array.from(_this.dialogIds.entries()).find(function (_ref) {
-          var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
-            id = _ref2[1];
+        var widgetId = (_Array$from$find = Array.from(_this.dialogIds.entries()).find(function (_ref2) {
+          var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
+            id = _ref3[1];
           return id === dialogId;
         })) === null || _Array$from$find === void 0 ? void 0 : _Array$from$find[0];
         if (widgetId) {
@@ -95,11 +97,12 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       }
     });
     _classPrivateFieldInitSpec(this, _A, _init_dialogIds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _B, _init_registeredWidgetConfigs(this, new Map([])));
+    _classPrivateFieldInitSpec(this, _B, _init_registeredWidgetConfigs(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_openedWidgets(this, new Map()));
     this._roomProvider = roomProvider;
     this._dialogProvider = dialogProvider;
     this._dialogProvider.addObserver(this._dialogProviderObserver);
+    this.registeredWidgetConfigs = registeredWidgetConfigs;
   }
   return (0, _createClass2["default"])(FcrUIWidgetProviderImpl, [{
     key: "dialogIds",
@@ -130,8 +133,8 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
     value: function openWidget(widgetId) {
       var widgetConfig = this.registeredWidgetConfigs.get(widgetId);
       var isOpened = this.openedWidgets.has(widgetId);
-      if (widgetConfig && this._roomProvider.mainRoomControl && !isOpened) {
-        var webWidget = new _webWidget.FcrUIWebWidgetImpl(this._roomProvider.mainRoomControl);
+      if (widgetConfig && this._roomProvider.currentRoomControl && !isOpened) {
+        var webWidget = new _webWidget.FcrUIWebWidgetImpl(this._roomProvider.currentRoomControl);
         this.openedWidgets.set(widgetId, webWidget);
         var dialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.WIDGET, widgetId, widgetConfig);
         this.dialogIds.set(widgetId, dialogId);

package/lib/scenes/main-scene.d.ts

@@ -26,6 +26,11 @@ import { FcrUIPhoneAudioConnectorProviderImpl } from '../providers/phone-audio-p
 import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
 import { FcrUISharedChatDataSource } from '../shared-data-source/chat-data';
 import { FcrUISharedDevicePrivilegeDataSource } from '../shared-data-source/device-privilege-data';
+import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
+import { FcrUIWidgetProvider } from '../providers/widget-provider';
+import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
+import { FcrUIMeetingTimeSharedDataSource } from '../shared-data-source/meeting-time';
+import { FcrUISecuritySharedDataSource } from '../shared-data-source/security-data';
 export type FcrMainUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -40,6 +45,7 @@ export type FcrMainUISceneArgs = {
     dialogProvider: FcrUIDialogProvider;
     sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+    widgetProvider: FcrUIWidgetProvider;
 };
 export declare class FcrMainUIScene extends FcrBaseUIScene {
     eventProvider: FcrUIEventProvider;
@@ -63,6 +69,8 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     dialogProvider: FcrUIDialogProvider;
     screenShareProvider: FcrUIScreenShareProviderImpl;
     phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProviderImpl;
+    widgetProvider: FcrUIWidgetProvider;
+    abilityProvider: FcrUIAbilityProviderImpl;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
@@ -73,6 +81,9 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     sharedChatDataSource: FcrUISharedChatDataSource;
     sharedWaitingRoomDataSource: FcrUISharedWaitingRoomDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+    sharedMemberDataSource: FcrUIMemberSharedDataSource;
+    sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
+    sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
     private _isWaitingRoomNotify;
     constructor(args: FcrMainUISceneArgs);
     private _addObservers;

package/lib/scenes/main-scene.js

@@ -48,8 +48,6 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -62,7 +60,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _type = require("fcr-core/lib/room-control/type");
 var _env = require("agora-foundation/lib/utilities/env");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -104,10 +101,10 @@ var _devicePrivilegeProvider = require("../providers/device-privilege-provider")
 var _interpreterProvider = require("../providers/interpreter-provider");
 var _localStorageProvider = require("../providers/local-storage-provider");
 var _roomProvider = require("../providers/room-provider");
-var _type2 = require("fcr-core/lib/type");
-var _type3 = require("../type");
+var _type = require("fcr-core/lib/type");
+var _type2 = require("../type");
 var _lodash = require("lodash");
-var _type4 = require("fcr-core/lib/room-control/privilege-control/type");
+var _type3 = require("fcr-core/lib/room-control/privilege-control/type");
 var _sessionProvider = require("../providers/session-provider");
 var _deviceStreamProvider = require("../providers/device-stream-provider");
 var _monitorProvider = require("../providers/monitor-provider");
@@ -122,6 +119,12 @@ var _phoneAudioProvider = require("../providers/phone-audio-provider");
 var _decorator = require("agora-foundation/lib/decorator");
 var _misc = require("agora-foundation/lib/utilities/misc");
 var _chatData = require("../shared-data-source/chat-data");
+var _memberData = require("../shared-data-source/member-data");
+var _widget = _interopRequireDefault(require("../modules/dialog/components/widget"));
+var _widget2 = require("../modules/widget");
+var _abilityProvider = require("../providers/ability-provider");
+var _meetingTime = require("../shared-data-source/meeting-time");
+var _securityData = require("../shared-data-source/security-data");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrMainUIScene;
 var _initProto; // import { RemoveAdmitWaitingRoomDialog } from '../modules/dialog/components/remove-admit-waiting-room';
@@ -154,34 +157,37 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       messageProvider = args.messageProvider,
       dialogProvider = args.dialogProvider,
       sharedVideoWindowDataSource = args.sharedVideoWindowDataSource,
-      sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource;
-    var mainRoomControl = roomProvider.mainRoomControl;
+      sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource,
+      widgetProvider = args.widgetProvider;
+    var mainRoomControl = roomProvider.currentRoomControl;
     var privilegeControl = mainRoomControl.getPrivilegeControl();
     var streamControl = mainRoomControl.getStreamControl();
     var userControl = mainRoomControl.getUserControl();
     var interpreterControl = mainRoomControl.getInterpreterControl();
-    var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl);
+    var abilityControl = mainRoomControl.getAbilityControl();
+    var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
+    var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
     var sharedInterpreterDataSource = new _interpreter3.FcrUISharedInterpreterDataSourceImpl(interpreterControl, userControl);
+    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, mainRoomControl.getBoardControl());
     var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
     var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider);
     var remoteVideoRenderProvider = new _rendererProvider.FcrUIRemoteVideoRenderProviderImpl(mainRoomControl.getStreamControl());
     var mainRoomControlProvider = new _roomProvider.FcrUIMainRoomControlProviderImpl(mainRoomControl, eventProvider, messageProvider, dialogProvider, sharedInterpreterDataSource);
     var privilegeProvider = mainRoomControlProvider.privilegeProvider;
-    var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
-    var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-    var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
-    var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, eventProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource);
-    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider);
+    var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
     var interpreterProvider = new _interpreterProvider.FcrUIInterpreterProviderImpl({
       privilegeProvider: privilegeProvider,
       interpreterControl: interpreterControl,
       userControl: userControl,
       sharedInterpreterDataSource: sharedInterpreterDataSource,
       eventProvider: eventProvider,
-      streamControl: streamControl,
-      deviceProvider: deviceProvider,
       devicePrivilegeProvider: devicePrivilegeProvider
     });
+    var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
+    var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
+    var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
+    var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(mainRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource, interpreterProvider, sharedInterpreterDataSource);
+    var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider);
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var chatProvider = new _chatProvider.FcrUIChatProviderImpl(currentRoomControlProvider.currentRoomControl, roomProvider);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
@@ -192,6 +198,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       deviceProvider: deviceProvider
     });
     var sharedChatDataSource = new _chatData.FcrUISharedChatDataSourceImpl(chatProvider);
+    var sharedMeetingTimeDataSource = new _meetingTime.FcrUIMeetingTimeSharedDataSourceImpl({
+      mainRoomControl: mainRoomControl
+    });
     _this.messageProvider = messageProvider;
     _this.dialogProvider = dialogProvider;
     _this.eventProvider = eventProvider;
@@ -223,6 +232,11 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.sharedInterpreterDataSource = sharedInterpreterDataSource;
     _this.sharedChatDataSource = sharedChatDataSource;
     _this.sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
+    _this.sharedMemberDataSource = sharedMemberDataSource;
+    _this.sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
+    _this.sharedSecuritySharedDataSource = sharedSecurityDataSource;
+    _this.widgetProvider = widgetProvider;
+    _this.abilityProvider = abilityProvider;
     _this._addObservers();
     return _this;
   }
@@ -231,7 +245,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     key: "_addObservers",
     value: function _addObservers() {
       var _this2 = this,
-        _this$roomProvider$ma;
+        _this$roomProvider$cu;
       var mainRoomObserver = {
         onLocalUserMovedToWaitingRoom: function onLocalUserMovedToWaitingRoom() {
           var cameraEnabled = _this2.deviceProvider.cameraEnabled;
@@ -249,9 +263,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       };
       var waitingRoomObserver = {
         onRoomMessageReceived: function onRoomMessageReceived(roomId, message) {
-          if ((0, _lodash.get)(message, 'payload.data.messageKey') === _type2.RoomMessageKey.USER_WAITING_ROOM_JOINED && _this2._isWaitingRoomNotify) {
+          if ((0, _lodash.get)(message, 'payload.data.messageKey') === _type.RoomMessageKey.USER_WAITING_ROOM_JOINED && _this2._isWaitingRoomNotify) {
             _this2.messageProvider.showNotification({
-              type: _type3.FcrUINotificationContentType.WAITING_ROOM,
+              type: _type2.FcrUINotificationContentType.WAITING_ROOM,
               onOk: function onOk() {
                 _this2._notifyParticipantShowWaitingRoom();
                 _this2.sharedWaitingRoomDataSource.unReadState = false;
@@ -262,7 +276,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           }
         }
       };
-      (_this$roomProvider$ma = this.roomProvider.mainRoomControl) === null || _this$roomProvider$ma === void 0 || _this$roomProvider$ma.addObserver(mainRoomObserver);
+      (_this$roomProvider$cu = this.roomProvider.currentRoomControl) === null || _this$roomProvider$cu === void 0 || _this$roomProvider$cu.addObserver(mainRoomObserver);
       this.roomProvider.addObserver({
         onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
           var room = roomControl;
@@ -271,7 +285,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           waitingRoomUserControl.addObserver({
             onRemoteUsersLeft: function onRemoteUsersLeft(roomId, events) {
               var _getPrivilegeControl$;
-              var targetRoles = (_getPrivilegeControl$ = _this2.roomProvider.mainRoomControl.getPrivilegeControl().getSecurityInfo(_type4.FcrSecurityAction.WaitingRoom).info) === null || _getPrivilegeControl$ === void 0 ? void 0 : _getPrivilegeControl$.targetRoles;
+              var targetRoles = (_getPrivilegeControl$ = _this2.roomProvider.currentRoomControl.getPrivilegeControl().getSecurityInfo(_type3.FcrSecurityAction.WaitingRoom).info) === null || _getPrivilegeControl$ === void 0 ? void 0 : _getPrivilegeControl$.targetRoles;
               if (waitingRoomUserControl) {
                 var users = waitingRoomUserControl.getUsers();
                 var userCount = Object.entries(users).map(function (_ref) {
@@ -283,7 +297,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                   return targetRoles.includes(user.userRole);
                 }).length;
                 if (userCount === 0) {
-                  _this2.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type3.FcrUINotificationContentType.WAITING_ROOM);
+                  _this2.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type2.FcrUINotificationContentType.WAITING_ROOM);
                 }
               }
             }
@@ -316,6 +330,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var inviteUIModule = new _invite2.InviteUIModule(this, this);
       var pcAudioConnection = new _pcAudioConnect.PcAudioConnectionUIModule(this, this);
       var phoneAudioConnection = new _phoneAudioConnect.PhoneAudioConnectionUIModule(this, this);
+      var webWidgetUIModule = new _widget2.WebWidgetUIModule(this, this);
       this.addSubNode(chatModule);
       this.addSubNode(audioStreamUIModule);
       this.addSubNode(soundEffectUIModule);
@@ -337,6 +352,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.addSubNode(inviteUIModule);
       this.addSubNode(pcAudioConnection);
       this.addSubNode(phoneAudioConnection);
+      this.addSubNode(webWidgetUIModule);
       var getView = function getView() {
         dialogModule.addDialogs([{
           key: _constant.FcrUIDialogKey.DEVICE_SETTINGS,
@@ -347,11 +363,19 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           }
         }, {
           key: _constant.FcrUIDialogKey.INTERPRETER,
-          component: function component(params) {
+          component: function component() {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreter["default"], {
               children: interpreterUIModule.getComponent()
             }, "InterpreterDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.WIDGET,
+          component: function component(props) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_widget["default"], {
+              params: props.params,
+              children: webWidgetUIModule.getComponent(props.params)
+            }, "WidgetDialog");
+          }
         }, {
           key: _constant.FcrUIDialogKey.PARTICIPANT,
           component: function component() {
@@ -393,9 +417,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           }
         }, {
           key: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
-          component: function component(params) {
+          component: function component(props) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_connectionGateway.ConnectionGatewayDialog, {
-              params: params,
+              params: props.params,
               computerChildren: pcAudioConnection.getComponent(),
               phoneChildren: phoneAudioConnection.getComponent()
             }, "ConnectionGatewayDialog");
@@ -409,25 +433,25 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           }
         }, {
           key: _constant.FcrUIDialogKey.SHARE_SCREEN,
-          component: function component(params) {
+          component: function component(props) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenSelection.ShareScreenSelectronDialog, {
-              params: params,
+              params: props.params,
               children: shareScreenModule.getSelectionComponent()
             }, "ShareScreenSelection");
           }
         }, {
           key: _constant.FcrUIDialogKey.CONTROL_BAR,
-          component: function component(params) {
+          component: function component(props) {
             return (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar2.ControlBarDialog, {
               module: controlbarUIModule,
-              params: params
+              params: props.params
             }, "ControlBar") : shareScreenModule.getComponent();
           }
         }, {
           key: _constant.FcrUIDialogKey.SYSTEM_PREFERENCE,
-          component: function component(params) {
+          component: function component(props) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_systemPreference.SystemPreferenceDialog, {
-              params: params
+              params: props.params
             }, "SystemPreference");
           }
         }]);
@@ -477,19 +501,20 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.privilegeProvider.release();
       this.deviceStreamProvider.release();
       this.sharedInterpreterDataSource.release();
+      this.sharedMemberDataSource.release();
     }
   }, {
     key: "_setIsWaitingRoomNotify",
     value: function _setIsWaitingRoomNotify() {
       this._isWaitingRoomNotify = false;
-      this.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type3.FcrUINotificationContentType.WAITING_ROOM);
+      this.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type2.FcrUINotificationContentType.WAITING_ROOM);
     }
   }, {
     key: "_notifyParticipantShowWaitingRoom",
     value: function _notifyParticipantShowWaitingRoom() {
-      this.eventProvider.sendEvent(_constant.FcrUIAction.TOGGLE_PARTICIPANT_TAB, _type.FcrRoomType.Waitingroom);
-      this.eventProvider.sendEvent(_constant.FcrUIAction.CHANGE_PARTICIPANT_TAB, _type.FcrRoomType.Waitingroom);
-      this.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type3.FcrUINotificationContentType.WAITING_ROOM);
+      this.eventProvider.sendEvent(_constant.FcrUIAction.TOGGLE_PARTICIPANT_TAB, _type2.FcrUIRoomType.MAIN_ROOM);
+      this.eventProvider.sendEvent(_constant.FcrUIAction.CHANGE_PARTICIPANT_TAB, _type2.FcrUIRoomType.WAITING_ROOM);
+      this.eventProvider.sendEvent(_constant.FcrUIAction.COLSE_NOTIFICATION, _type2.FcrUINotificationContentType.WAITING_ROOM);
     }
   }, {
     key: "_runSettingConfig",

package/lib/scenes/waiting-scene.d.ts

@@ -18,6 +18,10 @@ import { FcrUIDevicePrivilegeProviderImpl } from '../providers/device-privilege-
 import { FcrUISharedDevicePrivilegeDataSource } from '../shared-data-source/device-privilege-data';
 import { FcrUISharedChatDataSource } from '../shared-data-source/chat-data';
 import { FcrUIDeviceStreamProviderImpl } from '../providers/device-stream-provider';
+import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
+import { FcrUIWidgetProvider } from '../providers/widget-provider';
+import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-room';
+import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
 export type FcrWaitingUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -29,6 +33,7 @@ export type FcrWaitingUISceneArgs = {
     sharedLayoutDataSource: FcrUISharedLayoutDataSource;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
+    widgetProvider: FcrUIWidgetProvider;
 };
 export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     eventProvider: FcrUIEventProvider;
@@ -45,6 +50,7 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProviderImpl;
     monitorProvider: FcrUIMonitorProviderImpl;
     deviceStreamProvider: FcrUIDeviceStreamProviderImpl;
+    widgetProvider: FcrUIWidgetProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     messageProvider: FcrUIMessageProvider;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
@@ -52,6 +58,9 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     sharedSettingDataSource: FcrUISharedSettingDataSource;
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     sharedChatDataSource: FcrUISharedChatDataSource;
+    sharedMemberDataSource: FcrUIMemberSharedDataSource;
+    sharedWaitingRoomDataSource: FcrUISharedWaitingRoomDataSource;
+    abilityProvider: FcrUIAbilityProviderImpl;
     constructor(args: FcrWaitingUISceneArgs);
     mount(dom: HTMLElement): void;
     onNodeWillActive(): void;