fcr-ui-scene 3.1.1 → 3.2.0

package/lib/modules/chat/index.js

@@ -16,6 +16,22 @@ require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -50,9 +66,9 @@ var _store = _interopRequireDefault(require("./store"));
 var _chat = require("./chat");
 var _decorator = require("agora-foundation/lib/decorator");
 var _contex = require("./contex");
-var _type = require("agora-edu-core/lib/type");
 var _messageTextarea = require("agora-ui-foundation/lib/components/message-textarea");
 var _chatWrapper = require("agora-ui-foundation/lib/components/chat-wrapper");
+var _type = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ChatUIModule;
 var _initProto;
@@ -124,7 +140,7 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
   }, {
     key: "sendMessage",
     value: function () {
-      var _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
+      var _sendMessage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -159,7 +175,7 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
   }, {
     key: "updateReadMsgIndex",
     value: function () {
-      var _updateReadMsgIndex = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
+      var _updateReadMsgIndex = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:

package/lib/modules/chat/message-list.js

@@ -10,6 +10,13 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.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");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -27,6 +34,20 @@ require("core-js/modules/es.array.iterator.js");
 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/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.timers.js");
 var _react = _interopRequireWildcard(require("react"));
@@ -186,7 +207,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     scrollToIdx(viewIdx);
   }, [newMsgsUnReadCnt]);
   var handleCopyMsg = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(msg, time, publisherNickName, targetNickname) {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, time, publisherNickName, targetNickname) {
       var msgHandled;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -357,8 +378,8 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
                       marginLeft: publisherUid !== localUserId && !multiSelectActive ? 34 : 0,
                       width: 'auto'
                     },
-                    onCopy: ( /*#__PURE__*/function () {
-                      var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(type) {
+                    onCopy: (/*#__PURE__*/function () {
+                      var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(type) {
                         var currentScrollTop;
                         return _regenerator["default"].wrap(function _callee2$(_context2) {
                           while (1) switch (_context2.prev = _context2.next) {

package/lib/modules/chat/store.d.ts

@@ -1,12 +1,12 @@
 import { FcrUserControl } from 'agora-edu-core';
 import { RoleType } from 'agora-ui-foundation/lib/components/message-bubble';
-import { FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control';
-import { FcrChatRoomMessageType, FcrUserRole, FcrUserInfo, FcrChatRoomFile, FcrChatRoomConnectionState } from 'agora-edu-core/lib/type';
+import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { CellMeasurerCache, List } from 'react-virtualized';
 import { AllowChatLevelType } from 'agora-ui-foundation/lib/components/chat-manager';
 import { ToastConfig } from 'agora-ui-foundation/lib/components/toast';
+import { FcrChatRoomConnectionState, FcrChatRoomControl, FcrChatRoomFile, FcrChatRoomMessageType } from 'agora-edu-core/lib/room-control/chatroom-control/type';
 export interface MsgListType {
     id: string;
     nickName: string;
@@ -128,5 +128,5 @@ export default class ChatStore {
     setAllowChatWithPayload(type: 'public' | 'private_to_manager'): void;
     private _handleConnectionUpdated;
 }
-export declare function isManager(role: FcrUserRole): boolean;
+export declare function isManager(role: FcrUserRole): role is FcrUserRole.HOST | FcrUserRole.COHOST;
 export declare function sortUsers(users: FcrUserInfo[]): FcrUserInfo[];

package/lib/modules/chat/store.js

@@ -15,6 +15,8 @@ require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -42,6 +44,31 @@ require("core-js/modules/es.object.entries.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.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.some.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.for-each.js");
+require("core-js/modules/esnext.iterator.some.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.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");
 require("core-js/modules/web.timers.js");
@@ -51,21 +78,22 @@ var _toConsumableArray2 = _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 _agoraEduCore = require("agora-edu-core");
 var _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
 var _type = require("agora-edu-core/lib/type");
 var _helper = require("agora-ui-foundation/lib/components/avatar/helper");
 var _decorator = require("agora-foundation/lib/decorator");
 var _reactVirtualized = require("react-virtualized");
-var _mock = require("./mock");
 var _constant = require("../../utilities/constant");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _ChatStore;
 var _initProto, _init__userInfo, _init_messageList, _init_readMsgIndex, _init_readIdx, _init_viewIdx, _init_historyUnreadCount, _init_hasHistoryMsg, _init_newMsgsUnReadCnt, _init_privateTargetUser, _init_chatLevel, _init_currentUserMap, _init_textMsg, _init_privateTargetList, _init_chatRoomState, _setLastScrollTopDecs, _setMessageListDecs, _sendMessageDecs, _handleTextMessageReceivedDecs, _onRemoteUserUpdateDecs, _refreshUserListDecs, _handleNewMsgDecs, _updateReadMsgIndexDecs, _initReadInfoDecs, _updateHistoryUnreadCntDecs, _updateHasHistoryMsgDecs, _updateScrollInfoDecs, _updateViewIdxDecs, _updateReadIdxDecs, _updateFirstMsgIdDecs, _updateHistoryUnReadCountDecs, _updateListDecs, _updateMostRecentHeightDecs, _updateMostRecentWidthDecs, _patchHandleMsgDecs, _forceNotifyMsgsDecs, _resetComponentCacheDecs, _resetTargetUserDecs, _initChatLevelDecs, _setTargetUserDecs, _updateChatLevelDecs, _updateChatTextMsgDecs, _permitPrivateChatDecs, _handleToastDecs, _handleConnectionUpdatedDecs, _ref;
 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(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
@@ -81,7 +109,7 @@ var allToUser = exports.allToUser = {
   userId: USER_ALL,
   userName: USER_ALL,
   userRole: _type.FcrUserRole.ROBOT,
-  connectorType: _type.FcrRoomConnectorType.NONE
+  connectorType: _agoraEduCore.FcrRoomConnectorType.NONE
 };
 
 // 没有可选的 User
@@ -89,7 +117,7 @@ var noUser = exports.noUser = {
   userId: USER_NONE,
   userName: (0, _i18n.transI18n)('fmt_chat_tips_selecthost'),
   userRole: _type.FcrUserRole.ROBOT,
-  connectorType: _type.FcrRoomConnectorType.NONE
+  connectorType: _agoraEduCore.FcrRoomConnectorType.NONE
 };
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
@@ -150,10 +178,11 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _K, _init_currentUserMap(this, new Map()));
     _classPrivateFieldInitSpec(this, _L, _init_textMsg(this, ''));
     _classPrivateFieldInitSpec(this, _M, _init_privateTargetList(this, []));
-    _classPrivateFieldInitSpec(this, _N, _init_chatRoomState(this, _type.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _N, _init_chatRoomState(this, _type2.FcrChatRoomConnectionState.Disconnected));
     (0, _defineProperty2["default"])(this, "_chatRoomObserver", {
       onTextMessageReceived: this.messageReceived.bind(this),
-      onConnectionStateUpdated: this._handleConnectionUpdated.bind(this)
+      onConnectionStateUpdated: this._handleConnectionUpdated.bind(this),
+      onErrorOccurred: function onErrorOccurred() {}
     });
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onRemoteUsersJoined: this._onRemoteUserUpdate.bind(this),
@@ -169,7 +198,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     this._chatRoomControl = chatRoomControl;
     this._userControl = userControl;
     this._userInfo = userControl.getLocalUser();
-    (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 || _this$_chatRoomContro.addobserver(this._chatRoomObserver);
+    (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 || _this$_chatRoomContro.addObserver(this._chatRoomObserver);
     this._userControl.addObserver(this._userObserver);
     this._refreshUserList();
     intervalId = setInterval(this.patchHandleMsg, 500);
@@ -187,68 +216,6 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     this.privateTargetList = (0, _toConsumableArray2["default"])(this.remoteUsers);
     this.initChatLevel();
     this.resetTargetUser();
-
-    // TODO: mock data, 提测删除
-    var _this$_userInfo = this._userInfo,
-      userName = _this$_userInfo.userName,
-      userId = _this$_userInfo.userId;
-    var color = (0, _helper.getNameColor)(userName);
-    _mock.messages.push({
-      id: '34',
-      nickName: userName,
-      uid: userId,
-      color: color,
-      role: 'host',
-      time: Date.now(),
-      msg: '测试消息'
-    }, {
-      id: '35',
-      nickName: userName,
-      uid: userId,
-      color: color,
-      role: 'union-host',
-      time: Date.now(),
-      msg: '很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息很长的测试消息',
-      isPrivate: true,
-      target: 'Zxq'
-    }, {
-      id: '36',
-      nickName: userName,
-      uid: userId,
-      color: color,
-      role: 'participant',
-      time: Date.now(),
-      msg: '测试消息',
-      img: {
-        url: 'https://www.baidu.com/img/PCtm_d9c8750bed0b3c7d089fa7d55720d6cf.png',
-        filename: 'test_filename',
-        filetype: 'test_filetype',
-        data: 'test_data' // TODO: any
-      }
-    }, {
-      id: '37',
-      nickName: 'Zxq',
-      uid: '037',
-      color: color,
-      role: 'union-host',
-      time: Date.now(),
-      msg: '测试图片消息',
-      img: {
-        url: 'https://www.baidu.com/img/PCtm_d9c8750bed0b3c7d089fa7d55720d6cf.png',
-        filename: 'test_filename',
-        filetype: 'test_filetype',
-        data: 'test_data' // TODO: any
-      }
-    });
-    // zxq-TODO: 提测删除
-    // messages.forEach((msg) => {
-    //   const { isPrivate, target } = msg;
-    //   this.handleNewMsg({
-    //     ...msg,
-    //     color: getNameColor(msg.nickName),
-    //     target: target || (isPrivate ? 'Me' : 'All'),
-    //   });
-    // });
   }
   return (0, _createClass2["default"])(ChatStore, [{
     key: "_userInfo",
@@ -385,13 +352,13 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "sendMessage",
     value: function () {
-      var _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
+      var _sendMessage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
         var _this$_chatRoomContro3;
         var target, isPrivate, message, resp;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(type === _type.FcrChatRoomMessageType.Image)) {
+              if (!(type === _type2.FcrChatRoomMessageType.Image)) {
                 _context.next = 3;
                 break;
               }
@@ -402,7 +369,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
             case 3:
               target = this.privateTargetUser;
               isPrivate = target.userId !== USER_ALL;
-              message = _objectSpread(_objectSpread({}, type === _type.FcrChatRoomMessageType.Text ? {
+              message = _objectSpread(_objectSpread({}, type === _type2.FcrChatRoomMessageType.Text ? {
                 content: msg
               } : {
                 file: msg
@@ -420,7 +387,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
                 resp: resp,
                 type: type
               }, 'message sent');
-              this._handleTextMessageReceived(this._chatRoomControl.initConfig.chatRoomId, resp, isPrivate ? target.userName : undefined);
+              this._handleTextMessageReceived(resp, isPrivate ? target.userName : undefined);
               this.updateReadMsgIndex({
                 index: this.messageList.length - 1,
                 msgId: resp.id
@@ -443,7 +410,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "_handleTextMessageReceived",
-    value: function _handleTextMessageReceived(_roomId, message, target) {
+    value: function _handleTextMessageReceived(message, target) {
       var id = message.id,
         _message$from = message.from,
         userId = _message$from.userId,
@@ -456,7 +423,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
         message: message,
         target: target
       }, 'message received');
-      if (type !== _type.FcrChatRoomMessageType.Text) {
+      if (type !== _type2.FcrChatRoomMessageType.Text) {
         return;
       }
       var color = (0, _helper.getNameColor)(userName);
@@ -481,7 +448,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
         uid: userId,
         isPrivate: isPrivate,
         target: target || (isPrivate ? 'Me' : 'All')
-      }, type === _type.FcrChatRoomMessageType.Text ? {
+      }, type === _type2.FcrChatRoomMessageType.Text ? {
         msg: message.content
       } : {
         img: message.file
@@ -713,8 +680,7 @@ var ChatStore = exports["default"] = /*#__PURE__*/function () {
       var notifyMsgs = this._originalMessages.splice(0, this.newMsgsUnReadCnt || 10);
       // 通知列表中前10条消息
       notifyMsgs.forEach(function (msg) {
-        var _this3$_chatRoomContr;
-        _this3._handleTextMessageReceived((_this3$_chatRoomContr = _this3._chatRoomControl) === null || _this3$_chatRoomContr === void 0 || (_this3$_chatRoomContr = _this3$_chatRoomContr.initConfig) === null || _this3$_chatRoomContr === void 0 ? void 0 : _this3$_chatRoomContr.chatRoomId, msg);
+        _this3._handleTextMessageReceived(msg);
       });
       notifyMsgs.length > 0 && this._uiEventStore.receiveNewChatMessages({
         latestMessage: notifyMsgs[notifyMsgs.length - 1],

package/lib/modules/chat/util.js

@@ -48,7 +48,7 @@ var handleChatLevelChangedSystemMsg = exports.handleChatLevelChangedSystemMsg =
   var needMsgPrefix = chatLevel === 'everyone' || chatLevel === 'no_one';
   var msgPrefix = '';
   if (needMsgPrefix) {
-    msgPrefix = "".concat(publisherRole === 'union-host' || publisherRole === _type.FcrUserRole.COHOST ? t('fmt_role_cohost') : t('fmt_role_host'), " (").concat(isSelf ? t('I') : breakWord(publisherUsername), ") ");
+    msgPrefix = "".concat(publisherRole === 'union-host' || publisherRole === _type.FcrUserRole.COHOST ? t('fmt_role_cohost') : t('fmt_role_host'), " (").concat(isSelf ? t('fmt_participant_label_Me') : breakWord(publisherUsername), ") ");
   }
   var msg = msgPrefix;
   switch (chatLevel) {

package/lib/modules/connection-gateway/components/phone/components/callinfo/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.slice.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _select = require("agora-ui-foundation/lib/components/select");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");

package/lib/modules/connection-gateway/components/phone/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _button = require("agora-ui-foundation/lib/components/button");

package/lib/modules/connection-gateway/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrMainRoomControl } from 'agora-edu-core';
+import { FcrBaseRoomControl } from 'agora-edu-core';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import './index.css';
@@ -6,7 +6,7 @@ import { FcrDeviceStore } from '../../common/device-store';
 export declare class ConnectionGatewayUIModule extends UIModule {
     private _store;
     constructor(args: {
-        roomControl: FcrMainRoomControl;
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
     });

package/lib/modules/connection-gateway/index.js

@@ -7,6 +7,8 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.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");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");

package/lib/modules/connection-gateway/store.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
-import { FcrMainRoomControl } from 'agora-edu-core';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'agora-edu-core/lib/room-control/room-connector-control/type';
 import { FcrDeviceStore } from '../../common/device-store';
+import { FcrMainRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare enum ConnectorRegion {
     CHINA = 1,
     AMERICA = 2

package/lib/modules/connection-gateway/store.js

@@ -20,6 +20,22 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -40,9 +56,20 @@ require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.object.values.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.find.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.some.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.for-each.js");
+require("core-js/modules/esnext.iterator.some.js");
+require("core-js/modules/esnext.json.parse.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");
 require("core-js/modules/web.timers.js");
@@ -51,23 +78,23 @@ 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 _agoraEduCore = require("agora-edu-core");
 var _mobx = require("mobx");
 var _react = require("react");
 var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _store = require("../setting/store");
 var _type = require("agora-edu-core/lib/room-control/room-connector-control/type");
-var _type2 = require("agora-edu-core/lib/type");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _tools = require("../../utilities/tools");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _ConnectionGatewayStore;
 var _initProto, _init_connectType, _init_activeTabKey, _init_rememberMe, _init_rememberedNumberList, _init_connectionPhoneInfo, _init_currentRegion, _init_currentCallInfo, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _onTabChangeDecs, _onGetConnectInfoDecs, _regionChangeHandlerDecs, _startCallDecs, _stopCallDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
@@ -351,7 +378,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "onGetConnectInfo",
     value: function () {
-      var _onGetConnectInfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _onGetConnectInfo = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -395,7 +422,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startCall",
     value: function () {
-      var _startCall = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var _startCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this$_userControl$ge, phoneUserId, userName;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -432,7 +459,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopCall",
     value: function () {
-      var _stopCall = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _stopCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -616,16 +643,16 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     value: function _setStreamState() {
       var matchPSTN = function matchPSTN(_ref3) {
         var connectorType = _ref3.connectorType;
-        return connectorType === _type2.FcrRoomConnectorType.PSTN;
+        return connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
       };
       var _this$_userControl$ge2 = this._userControl.getLocalUser(),
         userId = _this$_userControl$ge2.userId;
       var myStreams = this._streamControl.getStreamsByUserId(userId);
-      var allStreams = Object.values(this._streamControl.getStreams());
+      var allStreams = this._streamControl.getStreamList();
       this.hasPstnStream = allStreams.some(matchPSTN);
       this.hasOwnPstnStream = myStreams.some(matchPSTN);
       this.hasNeedMergedStream = allStreams.some(function (stream) {
-        return stream.owner.connectorType === _type2.FcrRoomConnectorType.PSTN && stream.connectorType === _type2.FcrRoomConnectorType.PSTN;
+        return stream.owner.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN && stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
       });
       this.connectType = this.hasOwnPstnStream ? ConnectType.PHONE : this._deviceStore.microphoneId ? ConnectType.COMPUTER : ConnectType.NONE;
       return {
@@ -650,7 +677,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       try {
         var _loop = function _loop() {
             var modifiedStream = _step.value.modifiedStream;
-            if (modifiedStream.connectorType !== _type2.FcrRoomConnectorType.PSTN) return {
+            if (modifiedStream.connectorType !== _agoraEduCore.FcrRoomConnectorType.PSTN) return {
               v: void 0
             };
             if (myStreams.findIndex(function (stream) {

package/lib/modules/device-pretest/audio-preview/microphone-detection.d.ts

@@ -9,4 +9,5 @@ export declare const MicrophoneDetection: FC<{
     startMicrophoneTest: () => void;
     stopMicrophoneTest: () => void;
     disabled?: boolean;
+    microphoneDetecting: boolean;
 }>;

package/lib/modules/device-pretest/audio-preview/microphone-detection.js

@@ -22,7 +22,8 @@ var MicrophoneDetection = exports.MicrophoneDetection = (0, _mobxReact.observer)
     setMicrophoneDevice = _ref.setMicrophoneDevice,
     startMicrophoneTest = _ref.startMicrophoneTest,
     stopMicrophoneTest = _ref.stopMicrophoneTest,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    microphoneDetecting = _ref.microphoneDetecting;
   var ns = (0, _useNamespace.useNamespace)('microphone-detection');
   var t = (0, _i18n.useI18n)();
   var _useState = (0, _react.useState)(false),
@@ -64,7 +65,7 @@ var MicrophoneDetection = exports.MicrophoneDetection = (0, _mobxReact.observer)
         disabled: disabled,
         type: "secondary-bordered",
         shape: "rounded",
-        children: t(isDetecting ? 'fmt_internalsetting_status_recording' : 'fmt_setting_button_Mic')
+        children: t(microphoneDetecting ? 'fmt_internalsetting_status_recording' : 'fmt_setting_button_Mic')
       })
     })]
   });

package/lib/modules/device-pretest/audio-preview/speaker-control.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const SpeakerControl: React.FC<{}>;

package/lib/modules/device-pretest/context.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { FcrPretestStore } from './store';
 export declare const PretestStoreContext: import("react").Context<FcrPretestStore>;

package/lib/modules/device-pretest/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 import 'agora-ui-foundation/lib/components/local-video-player/index.css';
 import '../setting/video-settings/index.css';