fcr-ui-scene 3.4.5 → 3.5.1

package/lib/shared-data-source/waiting-room.js

@@ -37,30 +37,36 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUISharedWaitingRoomDataSourceImpl = void 0;
 require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.function.bind.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/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.async-iterator.for-each.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.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.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _type = require("fcr-core/lib/room-control/type");
-var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
+var _type = require("fcr-core/lib/room-control/privilege-control/type");
 var _mobx = require("mobx");
 var _constant = require("../utilities/constant");
 var _base = require("../base");
+var _memberListDataSource = require("../modules/participant/member-list-data-source");
+var _type2 = require("../type");
 var _FcrUISharedWaitingRoomDataSourceImpl;
-var _initProto, _init_totalWaitingRoomUser, _init_unReadState, _handleEventDecs, _ref;
+var _initProto, _init_waitingRoomDataSource, _init_totalWaitingRoomUser, _init_unReadState, _initWaitingRoomUserListDecs, _releaseDecs, _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; }
@@ -73,32 +79,45 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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; }
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
-_ref = (_handleEventDecs = [_mobx.action, _mobx.action.bound], "_waitingRoomControl");
+var _C = /*#__PURE__*/new WeakMap();
+_ref = (_initWaitingRoomUserListDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], "_waitingRoomControl");
 var FcrUISharedWaitingRoomDataSourceImpl = exports.FcrUISharedWaitingRoomDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedWaitingRoomDataSourceImpl(roomProvider, _uiEventStore) {
+  function FcrUISharedWaitingRoomDataSourceImpl(_roomProvider, _uiEventStore) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharedWaitingRoomDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    _classPrivateFieldInitSpec(this, _A, _init_totalWaitingRoomUser(this, 0));
-    _classPrivateFieldInitSpec(this, _B, _init_unReadState(this, false));
+    _classPrivateFieldInitSpec(this, _A, _init_waitingRoomDataSource(this, new _memberListDataSource.FcrUIMemberListDataSourceImpl()));
+    (0, _defineProperty2["default"])(this, "_userControlObserver", {
+      onRemoteUsersJoined: this._handleRemoteWaitingUserJoined.bind(this),
+      onRemoteUsersLeft: this._handleRemoteWaitingUserLeft.bind(this)
+    });
+    _classPrivateFieldInitSpec(this, _B, _init_totalWaitingRoomUser(this, 0));
+    _classPrivateFieldInitSpec(this, _C, _init_unReadState(this, false));
+    this._roomProvider = _roomProvider;
     this._uiEventStore = _uiEventStore;
-    this._mainRoomControl = roomProvider.mainRoomControl;
-    roomProvider.addObserver({
+    this._mainRoomControl = _roomProvider.currentRoomControl;
+    this._roomProviderObserver = {
       onJoinWaitingRoom: function onJoinWaitingRoom(roomControl) {
+        var _privilegeControl$get;
         _this._waitingRoomControl = roomControl;
+        _this._waitingRoomUserControl = roomControl.getUserControl();
+        var privilegeControl = _this._mainRoomControl.getPrivilegeControl();
+        _this._waitingRoomTargetUserRole = (_privilegeControl$get = privilegeControl.getSecurityInfo(_type.FcrSecurityAction.WaitingRoom).info) === null || _privilegeControl$get === void 0 ? void 0 : _privilegeControl$get.targetRoles;
         _this.totalWaitingRoomUser = _this._getWaitingRoomUserCount();
-        roomControl.getUserControl().addObserver({
-          onRemoteUsersJoined: _this._handleRemoteWaitingUserJoined.bind(_this),
-          onRemoteUsersLeft: _this._handleRemoteWaitingUserLeft.bind(_this)
-        });
+        _this._localUserId = _this._waitingRoomUserControl.getLocalUser().userId;
+        _this._streamControl = _this._waitingRoomControl.getStreamControl();
+        _this._initWaitingRoomUserList();
+        roomControl.getUserControl().addObserver(_this._userControlObserver);
+      },
+      onWaitingRoomManageCanceled: function onWaitingRoomManageCanceled() {
+        _this.totalWaitingRoomUser = 0;
+        _this.unReadState = false;
       }
-    });
-    this._uiEventStore.addObserver({
-      onEvent: this._handleEvent.bind(this)
-    });
+    };
+    _roomProvider.addObserver(this._roomProviderObserver);
   }
   return (0, _createClass2["default"])(FcrUISharedWaitingRoomDataSourceImpl, [{
-    key: "totalWaitingRoomUser",
+    key: "waitingRoomDataSource",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -106,53 +125,98 @@ var FcrUISharedWaitingRoomDataSourceImpl = exports.FcrUISharedWaitingRoomDataSou
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "unReadState",
+    key: "totalWaitingRoomUser",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
+  }, {
+    key: "unReadState",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "_isWaitingRoomTargetUser",
+    value: function _isWaitingRoomTargetUser(user) {
+      if (this._waitingRoomTargetUserRole) {
+        return this._waitingRoomTargetUserRole.includes(user.userRole);
+      }
+    }
   }, {
     key: "_getWaitingRoomUserCount",
     value: function _getWaitingRoomUserCount() {
-      var _privilegeControl$get;
-      var userControl = this._waitingRoomControl.getUserControl();
-      var privilegeControl = this._mainRoomControl.getPrivilegeControl();
-      var targetRoles = (_privilegeControl$get = privilegeControl.getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom).info) === null || _privilegeControl$get === void 0 ? void 0 : _privilegeControl$get.targetRoles;
-      this.totalWaitingRoomUser = userControl.getUserList().filter(function (user) {
-        return targetRoles.includes(user.userRole);
-      }).length;
-      if (this.totalWaitingRoomUser === 0) {
-        this._uiEventStore.sendEvent(_constant.FcrUIAction.CHANGE_PARTICIPANT_TAB, _type.FcrRoomType.Mainroom);
-        this.unReadState = false;
+      var _this2 = this;
+      if (this._waitingRoomUserControl) {
+        this.totalWaitingRoomUser = this._waitingRoomUserControl.getUserList().filter(function (user) {
+          return _this2._isWaitingRoomTargetUser(user);
+        }).length;
+        if (this.totalWaitingRoomUser === 0) {
+          this._uiEventStore.sendEvent(_constant.FcrUIAction.CHANGE_PARTICIPANT_TAB, _type2.FcrUIRoomType.MAIN_ROOM);
+          this.unReadState = false;
+        }
+        return this.totalWaitingRoomUser;
+      } else {
+        return 0;
       }
-      return this.totalWaitingRoomUser;
     }
   }, {
     key: "_handleRemoteWaitingUserJoined",
     value: function _handleRemoteWaitingUserJoined(roomId, events) {
+      var _this3 = this;
       this._getWaitingRoomUserCount();
       this.unReadState = true;
+      events.forEach(function (event) {
+        var userInfo = event.userInfo;
+        _this3._addWaitingRoomDataSource(userInfo);
+      });
     }
   }, {
     key: "_handleRemoteWaitingUserLeft",
     value: function _handleRemoteWaitingUserLeft(roomId, events) {
+      var _this4 = this;
       this._getWaitingRoomUserCount();
+      events.forEach(function (event) {
+        var userInfo = event.userInfo;
+        _this4.waitingRoomDataSource["delete"](userInfo);
+      });
     }
   }, {
-    key: "_handleEvent",
-    value: function _handleEvent(action, payload) {
-      if (action === _constant.FcrUIAction.WAITING_ROOM_DESTROYED) {
-        this.totalWaitingRoomUser = 0;
-        this.unReadState = false;
+    key: "_addWaitingRoomDataSource",
+    value: function _addWaitingRoomDataSource(modifiedUser) {
+      if (modifiedUser.userId !== this._localUserId && this._isWaitingRoomTargetUser(modifiedUser)) {
+        this.waitingRoomDataSource.add(modifiedUser, this._streamControl.getStreamsByUserId(modifiedUser.userId), false);
       }
     }
+  }, {
+    key: "_initWaitingRoomUserList",
+    value: function _initWaitingRoomUserList() {
+      if (!this._waitingRoomUserControl) return;
+      var users = this._waitingRoomUserControl.getUsers();
+      for (var _i = 0, _Object$entries = Object.entries(users); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+          userId = _Object$entries$_i[0],
+          user = _Object$entries$_i[1];
+        this._addWaitingRoomDataSource(user);
+      }
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var _this$_waitingRoomUse;
+      (_this$_waitingRoomUse = this._waitingRoomUserControl) === null || _this$_waitingRoomUse === void 0 || _this$_waitingRoomUse.removeObserver(this._userControlObserver);
+      this._roomProvider.removeObserver(this._roomProviderObserver);
+    }
   }]);
 }();
 _FcrUISharedWaitingRoomDataSourceImpl = FcrUISharedWaitingRoomDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedWaitingRoomDataSourceImpl, [[_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "unReadState"], [_handleEventDecs, 18, "_handleEvent"]], []).e, 3);
-_init_totalWaitingRoomUser = _applyDecs$e[0];
-_init_unReadState = _applyDecs$e[1];
-_initProto = _applyDecs$e[2];
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedWaitingRoomDataSourceImpl, [[_mobx.observable, 1, "waitingRoomDataSource"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "unReadState"], [_initWaitingRoomUserListDecs, 18, "_initWaitingRoomUserList"], [_releaseDecs, 18, "release"]], []).e, 4);
+_init_waitingRoomDataSource = _applyDecs$e[0];
+_init_totalWaitingRoomUser = _applyDecs$e[1];
+_init_unReadState = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 (0, _base.registerDependency)('sharedWaitingRoomDataSource');

package/lib/translations/enUS.d.ts

@@ -31,6 +31,9 @@ export declare const enUs: {
     fmt_attendies_options_sethost: string;
     fmt_attendies_options_revokecohost: string;
     fmt_attendies_options_setcohost: string;
+    fmt_attendies_toast_cant_sethost: string;
+    fmt_attendies_toast_cant_setcohost: string;
+    fmt_attendies_button_revokehost_error: string;
     fmt_attendies_button_rename: string;
     fmt_attendies_options_allowlocalrecord: string;
     fmt_attendies_options_putinwaitingroom: string;
@@ -91,7 +94,6 @@ export declare const enUs: {
     fmt_additional_popup_label_enter_nickname_ok: string;
     fmt_additional_label_toast_rename_off: string;
     fmt_actionbar_tips_leavemeeting: string;
-    fmt_actionbar_button_plenarysession: string;
     fmt_actionbar_tips_locked: string;
     fmt_actionbar_tips_recheckleave: string;
     fmt_aside_status_connecting: string;
@@ -187,6 +189,7 @@ export declare const enUs: {
     fmt_toolbar_tips_leave_host_select_submit_tips: string;
     fmt_toolbar_leave_confirm_dialog_kick_title: string;
     fmt_toolbar_tips_leave_confirm_dialog_kick_info: string;
+    fmt_toolbar_tips_leave_confirm_dialog_kick_info_content: string;
     fmt_toolbar_leave_confirm_dialog_submit: string;
     fmt_toolbar_tips_leave_confirm_dialog_end_title: string;
     fmt_toolbar_tips_leave_confirm_dialog_end_info: string;
@@ -238,6 +241,8 @@ export declare const enUs: {
     fmt_broadcast_livestream_tips_hand_over_pc_to_mobile: string;
     fmt_broadcast_livestream_tips_hand_over_mobile: string;
     fmt_broadcast_livestream_label_stop_pc_only: string;
+    fmt_broadcast_livestream_button_hide: string;
+    fmt_broadcast_livestream_button_show: string;
     fmt_device_label_audio_mute: string;
     fmt_device_label_audio_unmute: string;
     fmt_device_label_video_start: string;
@@ -327,15 +332,12 @@ export declare const enUs: {
     fmt_uimanager_option_Selfieview: string;
     fmt_uimanager_tips_urmuted: string;
     fmt_uimanager_tips_urturnedoff: string;
-    fmt_uimanager_tips_norightsvideo: string;
-    fmt_uimanager_tips_norightsaudio: string;
     fmt_uimanager_tips_inviteturnon: string;
     fmt_uimanager_tips_Remove: string;
     fmt_uimanager_tips_designedas: string;
     fmt_uimanager_tips_userleaft: string;
     fmt_uimanager_labels_Setas: string;
     fmt_uimanager_tips_allmuted: string;
-    fmt_uimanager_tips_meetinglocked: string;
     fmt_uimanager_tips_meetingunlocked: string;
     fmt_uimanager_labels_designate: string;
     fmt_uimanager_labels_Becoming: string;
@@ -363,7 +365,6 @@ export declare const enUs: {
     fmt_uimanager_window_un_pin: string;
     fmt_uimanager_window_pin_success: string;
     fmt_uimanager_window_un_pin_success: string;
-    fmt_uimanager_window_pin_error_hide_mine: string;
     fmt_uimanager_window_pin_error_hide_no_video: string;
     fmt_uimanager_follow_pc: string;
     fmt_chat_label_chat: string;
@@ -495,7 +496,6 @@ export declare const enUs: {
     fmt_screenshare_tips_hostprohibitssharing: string;
     fmt_screenshare_tips_faild_reselect: string;
     fmt_screenshare_tips_faild_screenselect: string;
-    fmt_screenshare_tips_faild_nopermission: string;
     fmt_screenshare_tips_faild_restrict: string;
     fmt_screenshare_tips_faild_alreadysharing: string;
     fmt_screenshare_options_allowshare: string;
@@ -504,7 +504,6 @@ export declare const enUs: {
     fmt_screenshare_options_enableedit: string;
     fmt_actionbar_screenshare_option_selectcontent: string;
     fmt_actionbar_screenshare_labels_others: string;
-    fmt_actionbar_screenshare_tips_restrictshare: string;
     fmt_modules_labels_sharing: string;
     fmt_share_tips_othsersharing: string;
     fmt_share_tips_stopothersharing: string;
@@ -532,7 +531,6 @@ export declare const enUs: {
     fmt_screenshare_stop_share_board: string;
     fmt_screenshare_stop_share_screen: string;
     fmt_screenshare_no_permission_open_board: string;
-    fmt_screenshare_administrator_disables_share_screen_board: string;
     fmt_screenshare_no_permission_close_board: string;
     fmt_screenshare_clash_board_remind_title: string;
     fmt_screenshare_clash_board_remind_content: string;
@@ -731,8 +729,6 @@ export declare const enUs: {
     fmt_security_tips_share_screen_off: string;
     fmt_security_tips_start_audio_on: string;
     fmt_security_tips_start_audio_off: string;
-    fmt_security_tips_host_start_audio_on: string;
-    fmt_security_tips_host_start_audio_off: string;
     fmt_security_tips_start_video_on: string;
     fmt_security_tips_start_video_off: string;
     fmt_security_tips_host_start_video_on: string;
@@ -972,6 +968,8 @@ export declare const enUs: {
     fmt_record_record_started: string;
     fmt_record_record_stop_ask: string;
     fmt_record_record_stop_confirm: string;
+    fmt_record_toast_record_paused: string;
+    fmt_record_toast_record_resumed: string;
     fmt_pstn_label_accessmethod: string;
     fmt_pstn_options_PCaudioconnet: string;
     fmt_pstn_options_phoneaudioconnet: string;
@@ -1118,7 +1116,6 @@ export declare const enUs: {
     fmt_waitingroom_mainwindow_popup_button_view_detailed: string;
     fmt_waitingroom_mainwindow_popup_button_not_remind: string;
     fmt_waitingroom_attendie_popup_label_Leave: string;
-    fmt_waitingroom_attendie_popup_label_click_leave: string;
     fmt_waitingroom_attendie_overview_label_waitingroom: string;
     fmt_waitingroom_attendie_overview_label_wait_moment: string;
     fmt_waitingroom_attendie_overview_label_move_in_by_host: string;
@@ -1327,7 +1324,6 @@ export declare const enUs: {
     fmt_security_setting_mobile_label_rename: string;
     fmt_security_setting_mobile_label_unmute: string;
     fmt_security_setting_mobile_label_start_video: string;
-    fmt_security_setting_mobile_popup_toast_lock_meeting: string;
     fmt_security_setting_mobile_popup_toast_unlock_meeting: string;
     fmt_security_setting_mobile_chat_popup_label_participants: string;
     fmt_security_setting_mobile_chat_popup_option_no_one: string;
@@ -1876,4 +1872,21 @@ export declare const enUs: {
     fmt_lock_error: string;
     fmt_end_error: string;
     fmt_host_leave_error: string;
+    fmt_hostkey_window_title_reclaim_host: string;
+    fmt_hostkey_window_content_reclaim_host: string;
+    fmt_hostkey_window_button_reclaim_host: string;
+    fmt_hostkey_window_button_remain_cohost: string;
+    fmt_hostkey_window_button_remain_attendees: string;
+    fmt_hostkey_meetingroom_toast_now_host: string;
+    fmt_hostkey_participant_button_reclaim_host: string;
+    fmt_hostkey_participant_button_claim_host: string;
+    fmt_hostkey_input_hostkey_title_enter_key: string;
+    fmt_hostkey_input_hostkey_text_hint_enter_key: string;
+    fmt_hostkey_input_hostkey_button_cancel: string;
+    fmt_hostkey_input_hostkey_button_ok: string;
+    fmt_hostkey_input_hostkey_tips_incorrect_key: string;
+    fmt_hostkey_meetingroom_toast_unable_to_claim_host: string;
+    fmt_jbh_title_host_not_in_meeting: string;
+    fmt_jbh_title_host_in_meeting: string;
+    fmt_jbh_title_meeting_topic: string;
 };