fcr-ui-scene 3.4.4 → 3.5.0

package/lib/common/event-store.js

@@ -62,7 +62,6 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     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
       });
     }
@@ -83,18 +82,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 +112,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() {
@@ -236,6 +220,11 @@ var FcrUIEventStore = exports.FcrUIEventStore = /*#__PURE__*/function () {
     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) {

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

@@ -2,24 +2,33 @@ import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core'
 import { FcrUserRole, FcrUserInfo, FcrLineType } from 'fcr-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 { 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: {
+        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;
+    private _InterpreterRoomControlInfo;
     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;
@@ -109,13 +118,14 @@ export declare class FcrSecurityStore {
     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;
+    setInterpreterRoomControlInfo(payload: InterpreterRoomControlInfoType | null): void;
 }
 export declare const SecurityStoreContext: import("react").Context<FcrSecurityStore>;

package/lib/common/security-store.js

@@ -88,7 +88,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type4 = require("fcr-core/lib/room-control/privilege-control/type");
 var _react = require("react");
 var _FcrSecurityStore;
-var _initProto, _init_securityInfos, _init_permissionInfos, _init_privilegeOperator, _init_boardOwnerUser, _handlePermissionUpdatedDecs, _handleSecurityUpdatedDecs, _getInterpreterInfoDecs, _ref;
+var _initProto, _init_securityInfos, _init_permissionInfos, _init_privilegeOperator, _init_boardOwnerUser, _handlePermissionUpdatedDecs, _handleSecurityUpdatedDecs, _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; }
@@ -103,13 +103,14 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
-_ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], _getInterpreterInfoDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_handlePermissionUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleSecurityUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
-  function FcrSecurityStore(_privilegeControl, _userControl, _streamControl, _uiEventStore, _interpterControl) {
+  function FcrSecurityStore(_privilegeControl, _userControl, _streamControl, _roomSessionControl, _uiEventStore) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrSecurityStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2["default"])(this, "_disposers", []);
+    (0, _defineProperty2["default"])(this, "_InterpreterRoomControlInfo", null);
     _classPrivateFieldInitSpec(this, _A, _init_securityInfos(this));
     _classPrivateFieldInitSpec(this, _B, _init_permissionInfos(this));
     _classPrivateFieldInitSpec(this, _C, _init_privilegeOperator(this));
@@ -497,12 +498,13 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              _this.logger.info('setAllowWriteBoard', state);
               enable = typeof state === 'boolean' ? state : state === _enums.FcrSharePermissionState.ON;
-              _context2.next = 3;
+              _context2.next = 4;
               return _this._privilegeControl.allowWriteBoard(enable, [_type4.FcrPrivilegeUserRole.PARTICIPANT]);
-            case 3:
-              return _context2.abrupt("return", _context2.sent);
             case 4:
+              return _context2.abrupt("return", _context2.sent);
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -629,11 +631,12 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       });
       return !!(info !== null && info !== void 0 && info.enable);
     }));
+    (0, _defineProperty2["default"])(this, "_handleUnmuteSessionReceived", function () {});
     this._privilegeControl = _privilegeControl;
     this._userControl = _userControl;
     this._streamControl = _streamControl;
+    this._roomSessionControl = _roomSessionControl;
     this._uiEventStore = _uiEventStore;
-    this._interpterControl = _interpterControl;
     this.securityInfos = this._privilegeControl.getAllSecurityInfo();
     this.permissionInfos = this._privilegeControl.getAllLocalUserPermissionInfo();
     this._uiEventStore.addObserver({
@@ -731,27 +734,26 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       this.privilegeOperator = event.operatorUser;
       var securityInfo = event.securityInfo;
       var enable = securityInfo.enable;
-      var isPersonalOperation = this.localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId);
-      var toastType = isPersonalOperation ? 'normal' : 'info';
-      var operator = isPersonalOperation ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
+      var operator = this.localUser.userId === ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) ? (0, _i18n.transI18n)('fmt_settings_labels_you') : (((_event$operatorUser2 = event.operatorUser) === null || _event$operatorUser2 === void 0 ? void 0 : _event$operatorUser2.userRole) === _type.FcrUserRole.HOST ? (0, _i18n.transI18n)('fmt_role_host') : (0, _i18n.transI18n)('fmt_role_cohost')) + " ".concat((_this$privilegeOperat = this.privilegeOperator) === null || _this$privilegeOperat === void 0 ? void 0 : _this$privilegeOperat.userName, " ");
       if (((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) === _type4.FcrSecurityAction.JoinWithMuteAudio) {
         if (enable) {
           this._uiEventStore.showToast({
-            type: toastType,
+            type: 'info',
             message: (0, _i18n.transI18n)('fmt_settings_tips_muteallwhilejoin', {
               reason1: operator
             })
           });
         }
       } else if (((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) === _type4.FcrSecurityAction.StartAudio) {
+        var _this$_InterpreterRoo;
         var toastMessage = enable ? (0, _i18n.transI18n)('fmt_settings_tips_allowedselfunmuting', {
           reason1: operator
         }) : (0, _i18n.transI18n)('fmt_settings_tips_disabledselfunmuting', {
           reason1: operator
         });
-        if (!this._getInterpreterInfo()) {
+        if (!((_this$_InterpreterRoo = this._InterpreterRoomControlInfo) !== null && _this$_InterpreterRoo !== void 0 && _this$_InterpreterRoo.interpreter)) {
           this._uiEventStore.showToast({
-            type: toastType,
+            type: 'info',
             message: toastMessage
           });
         }
@@ -762,7 +764,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           reason1: operator
         });
         this._uiEventStore.showToast({
-          type: toastType,
+          type: 'info',
           message: _toastMessage
         });
       } else if (((_securityInfo$info4 = securityInfo.info) === null || _securityInfo$info4 === void 0 ? void 0 : _securityInfo$info4.action) === _type4.FcrSecurityAction.ShareScreen) {
@@ -772,7 +774,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           reason1: operator
         });
         this._uiEventStore.showToast({
-          type: toastType,
+          type: 'info',
           message: _toastMessage2
         });
       } else if (((_securityInfo$info5 = securityInfo.info) === null || _securityInfo$info5 === void 0 ? void 0 : _securityInfo$info5.action) === _type4.FcrSecurityAction.SendChat) {
@@ -782,7 +784,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
           reason1: operator
         });
         this._uiEventStore.showToast({
-          type: toastType,
+          type: 'info',
           message: _toastMessage3
         });
       } else if (((_securityInfo$info6 = securityInfo.info) === null || _securityInfo$info6 === void 0 ? void 0 : _securityInfo$info6.action) === _type4.FcrSecurityAction.Sharing && !enable) {
@@ -796,7 +798,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         }
         if (((_this$boardOwnerUser2 = this.boardOwnerUser) === null || _this$boardOwnerUser2 === void 0 ? void 0 : _this$boardOwnerUser2.userId) !== this.localUser.userId) {
           this._uiEventStore.showToast({
-            type: toastType,
+            type: 'info',
             message: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_alreadyopend')
           });
         } else {
@@ -813,9 +815,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
             },
             onCancel: function onCancel() {
               _this2._uiEventStore.closeDialog(dialogKey);
-            },
-            width: 400,
-            height: 160
+            }
           });
         }
       } else if (((_event$securityInfo$i = event.securityInfo.info) === null || _event$securityInfo$i === void 0 ? void 0 : _event$securityInfo$i.action) === _type4.FcrSecurityAction.WaitingRoom) {
@@ -825,12 +825,12 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
         if (!isSelf) {
           if (enable) {
             this._uiEventStore.showToast({
-              type: toastType,
+              type: 'normal',
               message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable'))
             });
           } else {
             this._uiEventStore.showToast({
-              type: toastType,
+              type: 'normal',
               message: "".concat(userName).concat((0, _i18n.transI18n)('fmt_waitingroom_mobile_setting_label_disable'))
             });
           }
@@ -856,7 +856,7 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
             this._prevWaterMarkEnable = _enable;
             if (toastText) {
               this._uiEventStore.showToast({
-                type: toastType,
+                type: 'normal',
                 message: toastText
               });
             }
@@ -941,26 +941,14 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
       return setAllowWaterMark;
     }()
   }, {
-    key: "_getInterpreterInfo",
-    value: function
-    // 获取本地用户关联的翻译官信息
-    _getInterpreterInfo() {
-      var _this3 = this;
-      if (this._interpterControl) {
-        var interpreterUsers = this._interpterControl.getInterpreterUserList(); //翻译官列表
-        if (interpreterUsers) {
-          var interpreter = interpreterUsers.find(function (ele) {
-            return ele.userId === _this3.localUser.userId;
-          }); //本地用户关联的翻译官信息
-          return interpreter;
-        }
-      }
-      return null;
+    key: "setInterpreterRoomControlInfo",
+    value: function setInterpreterRoomControlInfo(payload) {
+      this._InterpreterRoomControlInfo = payload;
     }
   }]);
 }();
 _FcrSecurityStore = FcrSecurityStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrSecurityStore, [[_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_decorator.bound, 2, "setAllowWaterMark"], [_getInterpreterInfoDecs, 18, "_getInterpreterInfo"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrSecurityStore, [[_mobx.observable, 1, "securityInfos"], [_mobx.observable, 1, "permissionInfos"], [_mobx.observable, 1, "privilegeOperator"], [_mobx.observable, 1, "boardOwnerUser"], [_handlePermissionUpdatedDecs, 18, "_handlePermissionUpdated"], [_handleSecurityUpdatedDecs, 18, "_handleSecurityUpdated"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setInterpreterRoomControlInfo"]], []).e, 5);
 _init_securityInfos = _applyDecs$e[0];
 _init_permissionInfos = _applyDecs$e[1];
 _init_privilegeOperator = _applyDecs$e[2];

package/lib/creator.d.ts

@@ -1,10 +1,13 @@
-import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig } from './type';
+import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from './type';
 import { FcrUIDefaultScene } from './ui-scene';
 export declare class FcrUISceneCreator {
     private _config;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _settingConfigStorage;
+    private _registeredWidgetConfigs;
     constructor(_config: FcrUISceneCreatorConfig);
     launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
     getSettingConfig(): FcrUISettingConfig;
+    registerWidget(config: FcrUIWebWidgetConfig): void;
+    unregisterWidget(widgetId: string): void;
 }

package/lib/creator.js

@@ -1,13 +1,49 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.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", {
   value: true
 });
 exports.FcrUISceneCreator = void 0;
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.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");
+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"));
@@ -15,11 +51,23 @@ var _logger = require("agora-foundation/lib/logger");
 var _uiScene = require("./ui-scene");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _settingConfigStorage = require("./utilities/setting-config-storage");
+var _validateParams = _interopRequireDefault(require("./utilities/validate-params"));
+var _schema = require("./schema");
+var _decorator = require("agora-foundation/lib/decorator");
+var _FcrUISceneCreator;
+var _initProto, _launchDecs, _ref;
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+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; }
+_ref = (_launchDecs = [(0, _validateParams["default"])(_schema.fcrUISceneConfigSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneFailureCallbackSchema, _schema.fcrRenderViewSchema), _decorator.trace], "logger");
 var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
   function FcrUISceneCreator(_config) {
     (0, _classCallCheck2["default"])(this, FcrUISceneCreator);
-    (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2["default"])(this, "_settingConfigStorage", new _settingConfigStorage.FcrSettingConfigStorage());
+    (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map([]));
     this._config = _config;
     this.logger.info("[FcrUISceneCreator] creator config: ".concat(JSON.stringify(_config)));
   }
@@ -28,7 +76,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     value: function launch(config, onCancel, onSuccess, onFailure, dom) {
       this.logger.info("[FcrUISceneCreator] scene config: ".concat(JSON.stringify(config)));
       (0, _i18n.changeLanguage)(config.language);
-      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage);
+      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage, this._registeredWidgetConfigs);
       scene.addObserver({
         onLaunchSuccess: onSuccess,
         onLaunchFailure: onFailure,
@@ -42,5 +90,20 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     value: function getSettingConfig() {
       return this._settingConfigStorage;
     }
+  }, {
+    key: "registerWidget",
+    value: function registerWidget(config) {
+      this._registeredWidgetConfigs.set(config.id, config);
+    }
+  }, {
+    key: "unregisterWidget",
+    value: function unregisterWidget(widgetId) {
+      this._registeredWidgetConfigs["delete"](widgetId);
+    }
   }]);
-}();
+}();
+_FcrUISceneCreator = FcrUISceneCreator;
+var _applyDecs$e = _applyDecs(_FcrUISceneCreator, [[_launchDecs, 2, "launch"], [_decorator.trace, 2, "getSettingConfig"], [_decorator.trace, 2, "registerWidget"], [_decorator.trace, 2, "unregisterWidget"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

package/lib/electron/app.js

@@ -17,8 +17,6 @@ require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.starts-with.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.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -212,7 +210,4 @@ var hookApp = exports.hookApp = function hookApp(app) {
       (0, _window.clearAllRendererWindows)();
     });
   });
-  app.addListener('will-quit', function () {
-    _electron.globalShortcut.unregister('CommandOrControl+Shift+X');
-  });
 };

package/lib/electron/bootstrap-dev.js

@@ -10,8 +10,6 @@ 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.object.to-string.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");
@@ -24,6 +22,7 @@ var _app = require("./app");
 var _defaultOptions = require("./default-options");
 var _env = require("./env");
 var _main2 = require("./main");
+var _devtoolShortcut = require("./plugins/devtool-shortcut");
 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; }
 (0, _main.initialize)();
@@ -41,4 +40,5 @@ _electron.app.addListener('ready', function () {
   });
   mainWindow.loadURL(_env.devPageUrl);
   (0, _main.enable)(mainWindow.webContents);
+  (0, _devtoolShortcut.listenDevToolShortcut)(mainWindow);
 });

package/lib/electron/bootstrap-sdk.js

@@ -10,8 +10,6 @@ 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.object.to-string.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");
@@ -28,6 +26,7 @@ var _defaultOptions = require("./default-options");
 var _env = require("./env");
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("./logger");
+var _devtoolShortcut = require("./plugins/devtool-shortcut");
 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; }
 (0, _main.initialize)();
@@ -60,6 +59,7 @@ _electron.app.addListener('ready', function () {
   } else {
     mainWindow.loadFile(_path["default"].join(_env.distPathPrefix, _env.distIndexFileName));
   }
+  (0, _devtoolShortcut.listenDevToolShortcut)(mainWindow);
   return mainWindow;
 });
 _electron.app.addListener('browser-window-created', function (_, window) {

package/lib/electron/injections.js

@@ -31,11 +31,6 @@ require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/es.string.trim.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.map.js");
-require("core-js/modules/esnext.async-iterator.reduce.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");

package/lib/electron/main.js

@@ -7,18 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.hookWindow = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/web.timers.js");
 var _window = require("./window");
 var _screenshot = require("./plugins/screenshot");
 var _logger = require("./logger");
 var _meetingState = require("./plugins/meeting-state");
-var _devtoolShortcut = require("./plugins/devtool-shortcut");
 var logger = (0, _logger.getLogger)();
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     logger.info("browser window is opened, frameName: ".concat(details.frameName));
     var builtinFrameNames = ['device-settings', 'chat', 'live-streaming', 'participant', 'share-screen-selection', 'invite', 'video-window', 'confirm', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room', 'interpreter-setting', 'waiting-room-single-remove', 'waiting-room-all-remove', 'waiting-room-all-admit', 'control-bar', 'show-toast', 'system-preference'];
-    if (!builtinFrameNames.includes(details.frameName)) {
+    if (!builtinFrameNames.includes(details.frameName) && !details.frameName.startsWith('widget')) {
       logger.info("frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
     }
@@ -35,6 +35,18 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
       logger.info("Window [".concat(window.title, ":").concat(window.id, "] is closed by shortcut CMD + W, send 'will-close' event to that window"));
       window.emit('will-close');
     });
+    window.addListener('will-resize', function (event, newBounds, details) {
+      logger.info("Window [".concat(window.title, ":").concat(window.id, "] is resized, send 'will-resize' event to that window"));
+      window.emit('custom-resize', event, newBounds, details);
+    });
+
+    // screen?.addListener('display-metrics-changed', (event, display, changedMetrics) => {
+    //   logger.info(
+    //     `Screen metrics [${window.title}:${window.id}] is changed, send 'display-metrics-changed' event to that window`,
+    //   );
+    //   window.emit('display-metrics-changed', event, display, changedMetrics);
+    // });
+
     attachEventOnMethod(window, 'hide', 'CALL_HIDE');
     attachEventOnMethod(window, 'show', 'CALL_SHOW');
   });
@@ -59,7 +71,6 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   });
   (0, _screenshot.listenScreenshot)(mainWindow);
   (0, _meetingState.listenMeetingState)(mainWindow);
-  (0, _devtoolShortcut.listenDevToolShortcut)(mainWindow);
 };
 var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, action) {
   var func = browserWindow[method];

package/lib/electron/plugins/devtool-shortcut.js

@@ -25,4 +25,9 @@ var listenDevToolShortcut = exports.listenDevToolShortcut = function listenDevTo
   });
   logger.info("CommandOrControl+Shift+X is ".concat(_electron.globalShortcut.isRegistered('CommandOrControl+Shift+X') ? 'registered' : 'not registered', " "));
   logger.info("CommandOrControl+Shift+R is ".concat(_electron.globalShortcut.isRegistered('CommandOrControl+Shift+R') ? 'registered' : 'not registered', " "));
+  var unregister = function unregister() {
+    _electron.globalShortcut.unregister('CommandOrControl+Shift+X');
+    _electron.globalShortcut.unregister('CommandOrControl+Shift+R');
+  };
+  window.addListener('closed', unregister);
 };