fcr-ui-scene 3.4.2 → 3.4.3

package/lib/common/event-store.js

@@ -20,7 +20,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIEventStore = void 0;
+exports.NotificationContentType = exports.FcrUIEventStore = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.date.now.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -32,6 +32,11 @@ var _logger = require("agora-foundation/lib/logger");
 var _chat = require("../modules/chat");
 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; }
+var NotificationContentType = exports.NotificationContentType = /*#__PURE__*/function (NotificationContentType) {
+  NotificationContentType["WAITING_ROOM"] = "WAITING_ROOM";
+  NotificationContentType["INTERPRETER_STATUS"] = "INTERPRETER_STATUS";
+  return NotificationContentType;
+}({});
 var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   function FcrUIEventStore() {
     (0, _classCallCheck2["default"])(this, FcrUIEventStore);
@@ -41,13 +46,34 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   return (0, _createClass2["default"])(FcrUIEventStore, [{
     key: "sendEvent",
     value: function sendEvent(action, payload) {
-      this.logger.debug('[FcrUIEventStore] sendEvent', _constant.UIAction[action], payload);
-      this._observable.notifyObservers('onEvent', action, payload);
+      var start = Date.now();
+      try {
+        this._observable.notifyObservers('onEvent', action, payload);
+      } finally {
+        var end = Date.now();
+        var time = end - start;
+        if (time >= 10) {
+          this.logger.warn("[FcrUIEventStore] sendEvent ".concat(_constant.UIAction[action], ", payload: ").concat(payload, ", handlers took: ").concat(end - start, "ms"));
+        }
+      }
     }
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this.sendEvent(_constant.UIAction.SHOW_TOAST, params);
+      this.sendEvent(_constant.UIAction.OPEN_DIALOG, {
+        dialogKey: _constant.DialogKey.SHOW_TOAST,
+        params: params
+      });
+    }
+  }, {
+    key: "showNotification",
+    value: function showNotification(params) {
+      this.sendEvent(_constant.UIAction.SHOW_NOTIFICATION, params);
+    }
+  }, {
+    key: "closeNotification",
+    value: function closeNotification(key) {
+      this.sendEvent(_constant.UIAction.COLSE_NOTIFICATION, key);
     }
   }, {
     key: "showChatToast",
@@ -184,6 +210,16 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     value: function closeInviteDialog() {
       this.sendEvent(_constant.UIAction.CLOSE_INVITE_DIALOG);
     }
+  }, {
+    key: "closeWaitingRoomDialog",
+    value: function closeWaitingRoomDialog() {
+      this.sendEvent(_constant.UIAction.CLOSE_WAITING_ROOM_DIALOG);
+    }
+  }, {
+    key: "closeRemoveAdmitWaitingRoomDialog",
+    value: function closeRemoveAdmitWaitingRoomDialog(dialogKey) {
+      this.sendEvent(_constant.UIAction.CLOSE_REMOVE_ADMIT_WAITING_ROOM_DIALOG, dialogKey);
+    }
   }, {
     key: "closeConfirmDialog",
     value: function closeConfirmDialog() {
@@ -191,9 +227,10 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     }
   }, {
     key: "exitRoom",
-    value: function exitRoom(reason) {
+    value: function exitRoom(reason, roomType) {
       this.sendEvent(_constant.UIAction.EXIT_ROOM, {
-        reason: reason
+        reason: reason,
+        roomType: roomType
       });
     }
   }, {
@@ -225,8 +262,11 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     }
   }, {
     key: "notifyChatUpdateTarget",
-    value: function notifyChatUpdateTarget(user) {
-      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, user);
+    value: function notifyChatUpdateTarget(user, roomType) {
+      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, {
+        user: user,
+        roomType: roomType
+      });
     }
   }, {
     key: "notifyChatResetTarget",

package/lib/common/room-store.js

@@ -334,7 +334,7 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
     key: "joinInterpreterRoom",
     value: function () {
       var _joinInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(param) {
-        var control, roomJoinOptions;
+        var control, roomJoinOptions, _control$getRoomInfo, _control$getRoomInfo2;
         return _regenerator["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -344,14 +344,14 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
               _context6.next = 5;
               return control.join(roomJoinOptions);
             case 5:
-              this.logger.info("interpreterLog-joinInterpreterRoom succeed", param.language);
+              this.logger.info("interpreterLog-joinInterpreterRoom succeed", (_control$getRoomInfo = control.getRoomInfo()) === null || _control$getRoomInfo === void 0 ? void 0 : _control$getRoomInfo.roomName);
               this._observable.notifyObservers('onJoinInterpretingRoomSuccess', param);
               _context6.next = 13;
               break;
             case 9:
               _context6.prev = 9;
               _context6.t0 = _context6["catch"](1);
-              this.logger.info("interpreterLog-joinInterpreterRoom fail", param.language);
+              this.logger.info("interpreterLog-joinInterpreterRoom fail", (_control$getRoomInfo2 = control.getRoomInfo()) === null || _control$getRoomInfo2 === void 0 ? void 0 : _control$getRoomInfo2.roomName);
               this._observable.notifyObservers('onJoinInterpretingRoomFailed', param);
             case 13:
             case "end":
@@ -368,7 +368,7 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
     key: "leaveInterpreterRoom",
     value: function () {
       var _leaveInterpreterRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(param) {
-        var control;
+        var control, _control$getRoomInfo3, _control$getRoomInfo4;
         return _regenerator["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -378,14 +378,14 @@ var FcrRoomStore = exports.FcrRoomStore = /*#__PURE__*/function () {
               _context7.next = 5;
               return control.leave();
             case 5:
-              this.logger.info("interpreterLog-leaveInterpreterRoom  succeed", param.language);
+              this.logger.info("interpreterLog-leaveInterpreterRoom  succeed", (_control$getRoomInfo3 = control.getRoomInfo()) === null || _control$getRoomInfo3 === void 0 ? void 0 : _control$getRoomInfo3.roomName);
               this._observable.notifyObservers('onLeaveInterpretingRoomSuccess', param);
               _context7.next = 13;
               break;
             case 9:
               _context7.prev = 9;
               _context7.t0 = _context7["catch"](1);
-              this.logger.info("interpreterLog-leaveInterpreterRoom fail", param.language);
+              this.logger.info("interpreterLog-leaveInterpreterRoom fail", (_control$getRoomInfo4 = control.getRoomInfo()) === null || _control$getRoomInfo4 === void 0 ? void 0 : _control$getRoomInfo4.roomName);
               this._observable.notifyObservers('onLeaveInterpretingRoomFailed', param);
             case 13:
             case "end":

package/lib/common/security-store.d.ts

@@ -1,9 +1,10 @@
-import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
+import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
 import { FcrUIEventStore } from './event-store';
-import { FcrSharePermissionState } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
-import { FcrRoomSessionControl } from 'agora-edu-core/lib/room-control/room-session/type';
-import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload, FcrSecuritySharePayload, FcrSecurityWriteBoardPayload } from 'agora-edu-core/lib/room-control/privilege-control/type';
+import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-control/enums';
+import { FcrRoomSessionControl } from 'fcr-core/lib/room-control/room-session/type';
+import { FcrPermissionAction, FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
+import { InterpreterRoomControlInfoType } from './device-stream-store';
 export type FcrSecuritySendChatOriginalPayload = {
     public: 0 | 1;
     private: {
@@ -20,15 +21,19 @@ export declare class FcrSecurityStore {
     private _uiEventStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
+    private _prevWaterMarkEnable;
+    private _InterpreterRoomControlInfo;
     accessor securityInfos: FcrSecurityInfo[];
     accessor permissionInfos: FcrPermissionInfo[] | undefined;
     accessor privilegeOperator: FcrUserInfo | undefined;
     accessor boardOwnerUser: FcrUserInfo | undefined;
+    get hasSecurityPermission(): boolean;
     constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _roomSessionControl: FcrRoomSessionControl, _uiEventStore: FcrUIEventStore);
     release(): void;
     get localUser(): FcrUserInfo;
     allowChangeSelfName: () => boolean;
     allowChat: () => boolean;
+    getWaterMarkContent: () => string;
     convertSendChatPayload: (payload: FcrSecuritySendChatOriginalPayload) => FcrSecuritySendChatPayload;
     allowedAllChat: () => boolean | undefined;
     allowedPublicChatAndDisallowedPrivateChat: () => boolean | undefined;
@@ -42,6 +47,8 @@ export declare class FcrSecurityStore {
     allowUnmuteSelfAudio: () => boolean;
     isLockRoomEnabled: () => boolean;
     isWaitingRoomEnabled: () => boolean;
+    isWaterMarkEnabled: () => boolean;
+    hasWaitingRoomPermission: (role?: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasMutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasUnmutePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasRequestStartAudioPermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
@@ -54,16 +61,17 @@ export declare class FcrSecurityStore {
     hasAllUnmutePermission: () => boolean;
     hasRevokeHostPermission: () => boolean;
     hasKickOutPermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
-    hasCallMergePermission(): boolean;
-    hasCallSplitPermission(): boolean;
+    hasCallMergePermission: () => boolean;
+    hasCallSplitPermission: () => boolean;
     hasStartScreenSharePermission: () => boolean;
     hasChatSendPublicPermission: () => boolean;
+    hasChatSendPublicPermissionByTargetRole: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasPermissionToSendPrivateMessage: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasPermissionToControlAllowSendAll: () => boolean;
     hasPermissionToControlDisallowSendAll: () => boolean;
     hasPermissionToControlAllowSendPrivate: () => boolean;
     hasPermissionToControlDisallowSendPrivate: () => boolean;
-    hasSetRolePermission(targetRole: FcrUserRole, setToRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasSetRolePermission: (targetRole: FcrUserRole, setToRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasStartCloudRecordingPermission: () => boolean;
     hasStartLiveStreamingPermission: () => boolean;
     hasStopLiveStreamingPermission: () => boolean;
@@ -74,24 +82,33 @@ export declare class FcrSecurityStore {
     hasEnableJoinWithAudioPermission: () => boolean;
     hasEnableStartScreenSharePermission: () => boolean;
     hasLockRoomPermission: () => boolean;
-    hasEndRoomPermission(): boolean;
-    hasAssignHostBeforeLeavingPermission(role: FcrPrivilegeUserRole | FcrUserRole): boolean;
-    hasStartBoardPermission(): boolean;
-    hasCloseBoardPermission(): boolean;
-    hasWriteBoardPermission(): boolean;
-    hasAllowStartBoardPermission(): boolean;
-    hasDisallowStartBoardPermission(): boolean;
-    hasAllowWriteBoardPermission(): boolean;
-    hasDisallowWriteBoardPermission(): boolean;
-    hasAllowScreenShareAndBoardPermission(): boolean;
-    getAllowedOperations(targetUserRole: FcrUserRole, isSelf: boolean): string[];
-    allowShare(state: FcrSharePermissionState, payload: FcrSecuritySharePayload): Promise<void>;
-    setAllowWriteBoard(state: FcrSharePermissionState, payload: FcrSecurityWriteBoardPayload): Promise<void>;
+    hasWatermarkEnablePermission: () => boolean;
+    hasWatermarkDisablePermission: () => boolean;
+    hasEndRoomPermission: () => boolean;
+    hasAssignHostBeforeLeavingPermission: (role: FcrPrivilegeUserRole | FcrUserRole) => boolean;
+    hasStartBoardPermission: () => boolean;
+    hasCloseBoardPermission: () => boolean;
+    hasWriteBoardPermission: () => boolean;
+    hasAllowStartBoardPermission: () => boolean;
+    hasDisallowStartBoardPermission: () => boolean;
+    hasAllowWriteBoardPermission: () => boolean;
+    hasDisallowWriteBoardPermission: () => boolean;
+    hasAllowScreenShareAndBoardPermission: () => boolean;
+    hasAllowWaterMarkPermission: () => boolean;
+    hasEnableInterpreterPermission: () => boolean;
+    hasDisableInterpreterPermission: () => boolean;
+    hasAllowChangeNamePermission: () => boolean;
+    hasDisallowChangeNamePermission: () => boolean;
+    hasChangeNamePermission: (targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
+    isMulti: () => boolean;
+    getAllowedOperations: (targetUserRole: FcrUserRole, isSelf: boolean) => string[];
+    allowShare: (state: FcrSharePermissionState) => Promise<void>;
+    setAllowWriteBoard: (state: FcrSharePermissionState | boolean) => Promise<void>;
     muteAll: () => void;
     unmuteAll: () => void;
     setLockRoomEnabled: (enable: boolean) => void;
     setWaitingRoomEnabled: () => void;
-    setAllowChangeSelfName: () => void;
+    setAllowChangeSelfName: (enable: boolean) => void;
     setAllowChat: (enable: boolean) => void;
     setAllowChatWithPayload: (enable: boolean, payload: FcrSecuritySendChatPayload) => void;
     setAllowedPublicChatAndDisallowedPrivateChat: () => void;
@@ -100,6 +117,7 @@ export declare class FcrSecurityStore {
     setAllowShareScreen: (state: boolean) => void;
     setAllowUnmuteSelfVideo: (enable: boolean) => void;
     setAllowUnmuteSelfAudio: (enable: boolean) => void;
+    hasSendAllChatPermission: () => boolean;
     _hasPermission: (action: FcrPermissionAction, targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     _hasPermissionWithParams: (action: FcrPermissionAction, targetRole: FcrPrivilegeUserRole | FcrUserRole, params: Record<string, unknown>) => boolean;
     private _handlePermissionUpdated;
@@ -107,7 +125,7 @@ export declare class FcrSecurityStore {
     private _handleUnmuteSessionReceived;
     permitPrivateChat(userId: string): boolean;
     private _printAllPermissions;
-    private _handleProcessEvent;
-    private _addReactions;
-    private _removeReactions;
+    setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
+    setInterpreterRoomControlInfo(payload: InterpreterRoomControlInfoType | null): void;
 }
+export declare const SecurityStoreContext: import("react").Context<FcrSecurityStore>;