fcr-ui-scene 3.4.1 → 3.4.2

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

@@ -1,17 +1,16 @@
-import { DialogKey, RoomType, UIAction } from '../utilities/constant';
-import { FcrUserInfo } from 'fcr-core/lib/type';
+import { DialogKey, UIAction } from '../utilities/constant';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 import { DeviceSettingDialogConfig, CustomSetting } from '../modules/setting/store';
 import { FcrUIExitReason } from '../type';
 import { ToastSize } from 'agora-ui-foundation/lib/components/toast';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { ButtonType } from 'agora-ui-foundation/lib/components/button';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
-import { FcrChatRoomReceiveBaseMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
-import React from 'react';
-export interface FcrUIDialogParams<T> {
+import { FcrChatRoomReceiveBaseMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
+export interface FcrUIDialogParams {
     dialogKey: DialogKey;
     dialogId: string;
-    params?: T extends unknown ? unknown : T;
+    params?: unknown;
 }
 export interface FcrUIToastParams {
     type: 'error' | 'warn' | 'info' | 'normal';
@@ -21,18 +20,6 @@ export interface FcrUIToastParams {
     size?: ToastSize;
     customRootClass?: string;
 }
-export declare enum NotificationContentType {
-    WAITING_ROOM = "WAITING_ROOM",
-    INTERPRETER_STATUS = "INTERPRETER_STATUS"
-}
-export interface FcrNotificationParams {
-    duration?: number;
-    placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
-    type: NotificationContentType;
-    onOk?: () => void;
-    onClose?: () => void;
-    data?: any;
-}
 export interface FcrUIConfirmDialogParams {
     title: string;
     content: React.ReactNode;
@@ -57,7 +44,6 @@ export interface FcrUIUpdateAsideParams {
 export interface FcrUINewChatMessagesParams {
     latestMessage: FcrChatRoomReceiveBaseMessage;
     count: number;
-    type: string;
 }
 export interface FcrUIToggleLayoutParams {
     layout: 'speaker' | 'gallery';
@@ -96,22 +82,12 @@ export declare class FcrUIEventStore {
     private _observable;
     sendEvent(action: UIAction, payload?: unknown): void;
     showToast(params: FcrUIToastParams): void;
-    showNotification(params: FcrNotificationParams): void;
-    closeNotification(key: NotificationContentType): void;
     showChatToast(params: FcrUIToastParams): void;
-    /**
-     * 默认同一个 title 或 content 的 confirm 窗口只打开一个实例
-     * @param key 可以通过 key 区分相同 title 或 content 的 confirm 窗口
-     * @param duration 可以通过 duration 配置自动关闭时间
-     * @mulitple 可以通过 mulitple 配置打开多个实例（忽略 key）
-     * */
     openConfirmDialog(params: ConfirmContentProps & {
-        key?: string;
-        duration?: number;
-    }, mulitple?: boolean): string;
+        height?: number;
+    }): string;
     openDialog(dialogKey: DialogKey, instanceId?: string, params?: unknown): string;
     closeDialog(dialogId: string): void;
-    closeConfirm(dialogId: string): void;
     startShareScreen(): void;
     stopShareScreen(): void;
     updateAside(params: FcrUIUpdateAsideParams): void;
@@ -130,15 +106,14 @@ export declare class FcrUIEventStore {
     stopLiveStreaming(): void;
     openInviteDialog(): void;
     closeInviteDialog(): void;
-    closeWaitingRoomDialog(): void;
-    closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
-    exitRoom(reason: FcrUIExitReason, roomType: number): void;
+    closeConfirmDialog(): void;
+    exitRoom(reason: FcrUIExitReason): void;
     cloudRecording(action: FcrCloudRecordingParams['action']): void;
     notifySpotlightStreamChanged(params: FcrSpotlightStreamChangedParams): void;
     notifyCustomSettingsChanged(settings: CustomSetting): void;
     addObserver(observer: FcrUIEventObserver): void;
     removeObserver(observer: FcrUIEventObserver): void;
-    notifyChatUpdateTarget(user: FcrUserInfo, roomType: RoomType): void;
+    notifyChatUpdateTarget(user: FcrUserInfo): void;
     notifyChatResetTarget(): void;
     release(): void;
 }

package/lib/common/event-store.js

@@ -20,7 +20,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NotificationContentType = exports.FcrUIEventStore = void 0;
+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,11 +32,6 @@ 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);
@@ -46,35 +41,13 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
   return (0, _createClass2["default"])(FcrUIEventStore, [{
     key: "sendEvent",
     value: function sendEvent(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"));
-        }
-      }
+      this.logger.debug('[FcrUIEventStore] sendEvent', _constant.UIAction[action], payload);
+      this._observable.notifyObservers('onEvent', action, payload);
     }
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this.sendEvent(_constant.UIAction.OPEN_DIALOG, {
-        dialogKey: _constant.DialogKey.SHOW_TOAST,
-        dialogId: "".concat(_constant.DialogKey.SHOW_TOAST, "_").concat(Date.now()),
-        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);
+      this.sendEvent(_constant.UIAction.SHOW_TOAST, params);
     }
   }, {
     key: "showChatToast",
@@ -83,18 +56,11 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
         customRootClass: _chat.CHAT_WRAPPER_CLASS
       }));
     }
-
-    /**
-     * 默认同一个 title 或 content 的 confirm 窗口只打开一个实例
-     * @param key 可以通过 key 区分相同 title 或 content 的 confirm 窗口
-     * @param duration 可以通过 duration 配置自动关闭时间
-     * @mulitple 可以通过 mulitple 配置打开多个实例（忽略 key）
-     * */
   }, {
     key: "openConfirmDialog",
-    value: function openConfirmDialog(params, mulitple) {
+    value: function openConfirmDialog(params) {
       var dialogKey = _constant.DialogKey.CONFIRM;
-      var dialogId = mulitple ? "".concat(dialogKey, "_").concat(Date.now()) : "".concat(dialogKey, "_").concat(params.key || params.title || params.content);
+      var dialogId = "".concat(dialogKey, "_").concat(Date.now());
       this.sendEvent(_constant.UIAction.OPEN_DIALOG, {
         dialogKey: dialogKey,
         dialogId: dialogId,
@@ -120,14 +86,6 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
         dialogId: dialogId
       });
     }
-  }, {
-    key: "closeConfirm",
-    value: function closeConfirm(dialogId) {
-      this.sendEvent(_constant.UIAction.CLOSE_DIALOG, {
-        dialogId: dialogId,
-        dialogKey: _constant.DialogKey.CONFIRM
-      });
-    }
   }, {
     key: "startShareScreen",
     value: function startShareScreen() {
@@ -227,21 +185,15 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
       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() {
+      this.closeDialog(_constant.DialogKey.CONFIRM);
     }
   }, {
     key: "exitRoom",
-    value: function exitRoom(reason, roomType) {
+    value: function exitRoom(reason) {
       this.sendEvent(_constant.UIAction.EXIT_ROOM, {
-        reason: reason,
-        roomType: roomType
+        reason: reason
       });
     }
   }, {
@@ -273,11 +225,8 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     }
   }, {
     key: "notifyChatUpdateTarget",
-    value: function notifyChatUpdateTarget(user, roomType) {
-      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, {
-        user: user,
-        roomType: roomType
-      });
+    value: function notifyChatUpdateTarget(user) {
+      this.sendEvent(_constant.UIAction.CHAT_UPDATE_TARGET, user);
     }
   }, {
     key: "notifyChatResetTarget",

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

@@ -1,30 +1,34 @@
-import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
+import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
+import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from './event-store';
-import { FcrSharePermissionState } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-import { FcrPermissionInfo, FcrPrivilegeUserRole, FcrSecurityInfo, FcrSecuritySendChatPayload } from 'fcr-core/lib/room-control/privilege-control/type';
-import { FcrInterpreterControl } from 'fcr-core/lib/room-control/interpreter-control/types';
-import { FcrSecuritySendChatOriginalPayload } from './type';
+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';
+export type FcrSecuritySendChatOriginalPayload = {
+    public: 0 | 1;
+    private: {
+        host: 0 | 1;
+        cohost: 0 | 1;
+        participant: 0 | 1;
+    };
+};
 export declare class FcrSecurityStore {
     private _privilegeControl;
     private _userControl;
     private _streamControl;
+    private _roomSessionControl;
     private _uiEventStore;
-    private _interpterControl?;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
-    private _prevWaterMarkEnable;
     accessor securityInfos: FcrSecurityInfo[];
-    accessor permissionInfos: FcrPermissionInfo[];
+    accessor permissionInfos: FcrPermissionInfo[] | undefined;
     accessor privilegeOperator: FcrUserInfo | undefined;
     accessor boardOwnerUser: FcrUserInfo | undefined;
-    get hasSecurityPermission(): boolean;
-    constructor(_privilegeControl: FcrPrivilegeControl, _userControl: FcrUserControl, _streamControl: FcrStreamControl, _uiEventStore: FcrUIEventStore, _interpterControl?: FcrInterpreterControl | undefined);
+    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;
@@ -38,8 +42,6 @@ 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;
@@ -52,17 +54,16 @@ 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;
@@ -73,33 +74,24 @@ export declare class FcrSecurityStore {
     hasEnableJoinWithAudioPermission: () => boolean;
     hasEnableStartScreenSharePermission: () => boolean;
     hasLockRoomPermission: () => boolean;
-    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>;
+    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>;
     muteAll: () => void;
     unmuteAll: () => void;
     setLockRoomEnabled: (enable: boolean) => void;
     setWaitingRoomEnabled: () => void;
-    setAllowChangeSelfName: (enable: boolean) => void;
+    setAllowChangeSelfName: () => void;
     setAllowChat: (enable: boolean) => void;
     setAllowChatWithPayload: (enable: boolean, payload: FcrSecuritySendChatPayload) => void;
     setAllowedPublicChatAndDisallowedPrivateChat: () => void;
@@ -108,14 +100,14 @@ export declare class FcrSecurityStore {
     setAllowShareScreen: (state: boolean) => void;
     setAllowUnmuteSelfVideo: (enable: boolean) => void;
     setAllowUnmuteSelfAudio: (enable: boolean) => void;
-    hasSendAllChatPermission: () => boolean;
-    private _hasPermission;
-    private _hasPermissionWithParams;
+    _hasPermission: (action: FcrPermissionAction, targetRole: FcrPrivilegeUserRole | FcrUserRole) => boolean;
+    _hasPermissionWithParams: (action: FcrPermissionAction, targetRole: FcrPrivilegeUserRole | FcrUserRole, params: Record<string, unknown>) => boolean;
     private _handlePermissionUpdated;
     private _handleSecurityUpdated;
+    private _handleUnmuteSessionReceived;
     permitPrivateChat(userId: string): boolean;
     private _printAllPermissions;
-    setAllowWaterMark(state: boolean, lineType?: FcrLineType): Promise<void>;
-    _getInterpreterInfo(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo | null | undefined;
+    private _handleProcessEvent;
+    private _addReactions;
+    private _removeReactions;
 }
-export declare const SecurityStoreContext: import("react").Context<FcrSecurityStore>;