fcr-ui-scene 3.4.4 → 3.5.0

package/lib/utilities/logger.js

@@ -8,7 +8,6 @@ exports.trace = exports.getLogger = exports.generateLogObserver = exports.create
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.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.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");

package/lib/utilities/meeting-detail.js

@@ -21,11 +21,6 @@ var generateMeetingDetail = exports.generateMeetingDetail = function generateMee
   parts.push((0, _i18n.transI18n)('fmt_link_invitation_topic', {
     reason1: roomName
   }));
-  if (invitationTime) {
-    parts.push((0, _i18n.transI18n)('fmt_link_invitation_time', {
-      reason1: invitationTime
-    }));
-  }
   parts.push((0, _i18n.transI18n)('fmt_link_invitation_link', {
     reason1: shareLink
   }));
@@ -37,6 +32,11 @@ var generateMeetingDetail = exports.generateMeetingDetail = function generateMee
       reason1: password
     }));
   }
+  if (invitationTime) {
+    parts.push((0, _i18n.transI18n)('fmt_link_invitation_time', {
+      reason1: invitationTime
+    }));
+  }
   // 拼接所有部分并去除多余的空白行
   return parts.join('\n').replace(/^\s*\n/gm, '');
 };
@@ -44,13 +44,14 @@ var generateMeetingDuration = exports.generateMeetingDuration = function generat
   if (startTime === 0 || duration === 0) {
     return '';
   }
-  var durationStamp = duration || 86400000;
-  var startDate = (0, _dayjs["default"])(startTime).format('YYYY/MM/DD HH:mm');
+  var durationStamp = (duration || 86400000) * 1000;
+  var startTimeStamp = startTime * 1000;
+  var startDate = (0, _dayjs["default"])(startTimeStamp).format('YYYY/MM/DD HH:mm');
   var endDate = '';
-  if ((0, _dayjs["default"])(startTime + durationStamp).format('YYYY/MM/DD') !== startDate.split(' ')[0]) {
-    endDate = (0, _dayjs["default"])(startTime + durationStamp).format('YYYY/MM/DD HH:mm');
+  if ((0, _dayjs["default"])(startTimeStamp + durationStamp).format('YYYY/MM/DD') !== startDate.split(' ')[0]) {
+    endDate = (0, _dayjs["default"])(startTimeStamp + durationStamp).format('YYYY/MM/DD HH:mm');
   } else {
-    endDate = (0, _dayjs["default"])(startTime + durationStamp).format('HH:mm');
+    endDate = (0, _dayjs["default"])(startTimeStamp + durationStamp).format('HH:mm');
   }
   return "".concat(startDate, " - ").concat(endDate);
 };

package/lib/utilities/parameters.d.ts

@@ -1,3 +1,4 @@
+import type { FcrDualVideoStreamConfig } from 'fcr-core';
 type FcrUISceneParameters = {
     scene?: Record<string, unknown>;
 };
@@ -8,4 +9,7 @@ export declare const getDefaultVideoGallerySize: (parameters?: FcrUISceneParamet
 export declare const isRobotPullingMode: (parameters?: FcrUISceneParameters) => boolean;
 export declare const getRobotPullingCount: (parameters?: FcrUISceneParameters) => number;
 export declare const getRobotPullingStreamType: (parameters?: FcrUISceneParameters) => number;
+export declare const getDualCameraVideoStreamConfig: (parameters?: FcrUISceneParameters) => FcrDualVideoStreamConfig;
+export declare const getDualScreenVideoStreamConfig: (parameters?: FcrUISceneParameters) => FcrDualVideoStreamConfig;
+export declare const getStartScreenSharing: (parameters?: FcrUISceneParameters) => boolean;
 export {};

package/lib/utilities/parameters.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSkipPretest = exports.isRobotPullingMode = exports.isOpenDefaultMicrophone = exports.isOpenDefaultCamera = exports.getRobotPullingStreamType = exports.getRobotPullingCount = exports.getDefaultVideoGallerySize = void 0;
+exports.isSkipPretest = exports.isRobotPullingMode = exports.isOpenDefaultMicrophone = exports.isOpenDefaultCamera = exports.getStartScreenSharing = exports.getRobotPullingStreamType = exports.getRobotPullingCount = exports.getDualScreenVideoStreamConfig = exports.getDualCameraVideoStreamConfig = exports.getDefaultVideoGallerySize = void 0;
 var _valueCheck = require("agora-foundation/lib/utilities/value-check");
 var isSkipPretest = exports.isSkipPretest = function isSkipPretest(parameters) {
   var _parameters$scene$ski, _parameters$scene;
@@ -35,4 +35,16 @@ var getRobotPullingCount = exports.getRobotPullingCount = function getRobotPulli
 var getRobotPullingStreamType = exports.getRobotPullingStreamType = function getRobotPullingStreamType(parameters) {
   var _parameters$scene7;
   return parameters === null || parameters === void 0 || (_parameters$scene7 = parameters.scene) === null || _parameters$scene7 === void 0 ? void 0 : _parameters$scene7.robotPullingStreamType;
+};
+var getDualCameraVideoStreamConfig = exports.getDualCameraVideoStreamConfig = function getDualCameraVideoStreamConfig(parameters) {
+  var _parameters$scene8;
+  return parameters === null || parameters === void 0 || (_parameters$scene8 = parameters.scene) === null || _parameters$scene8 === void 0 ? void 0 : _parameters$scene8.dualCameraVideoStreamConfig;
+};
+var getDualScreenVideoStreamConfig = exports.getDualScreenVideoStreamConfig = function getDualScreenVideoStreamConfig(parameters) {
+  var _parameters$scene9;
+  return parameters === null || parameters === void 0 || (_parameters$scene9 = parameters.scene) === null || _parameters$scene9 === void 0 ? void 0 : _parameters$scene9.dualScreenVideoStreamConfig;
+};
+var getStartScreenSharing = exports.getStartScreenSharing = function getStartScreenSharing(parameters) {
+  var _parameters$scene10;
+  return (0, _valueCheck.isTrueValue)(parameters === null || parameters === void 0 || (_parameters$scene10 = parameters.scene) === null || _parameters$scene10 === void 0 ? void 0 : _parameters$scene10.startScreenSharing);
 };

package/lib/utilities/privilege.js

@@ -10,8 +10,6 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.some.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.some.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.some.js");

package/lib/utilities/renderer-event.js

@@ -11,8 +11,6 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.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");

package/lib/utilities/renderer.js

@@ -10,7 +10,6 @@ require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");

package/lib/utilities/setting-config-storage.js

@@ -9,8 +9,6 @@ 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.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");

package/lib/utilities/tools.d.ts

@@ -51,12 +51,7 @@ export declare function handleCheckMouseOver(params: {
      */
     dialog?: FcrUIDialogKey.CONTROL_BAR | FcrUIDialogKey.CONFIRM;
 }): NodeJS.Timeout | undefined;
-export declare function getCurrentSharingWorkArea(params: {
-    currentShareId: string;
-    currentShareType: AgoraRtcScreenCaptureType;
-    currentShareBounds: CurrentShareBounds;
-    allApplicationWindows: AgoraRtcWindowInfo[];
-}): {
+export type CurrentShareScreenWorkArea = {
     x: number;
     y: number;
     width: number;
@@ -65,4 +60,10 @@ export declare function getCurrentSharingWorkArea(params: {
     topOffset: number;
     scaleFactor: number;
 };
+export declare function getCurrentSharingWorkArea(params: {
+    currentShareId: string;
+    currentShareType: AgoraRtcScreenCaptureType;
+    currentShareBounds: CurrentShareBounds;
+    allApplicationWindows: AgoraRtcWindowInfo[];
+}): CurrentShareScreenWorkArea;
 export {};

package/lib/utilities/tools.js

@@ -29,9 +29,6 @@ require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.match.js");
 require("core-js/modules/es.string.replace.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.reduce.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");
@@ -296,7 +293,6 @@ function handleCheckMouseOver(params) {
   return timerId;
 }
 function getCurrentSharingWorkArea(params) {
-  var _appWindow$bounds$x, _appWindow$bounds, _appWindow$bounds$y, _appWindow$bounds2;
   var currentShareId = params.currentShareId,
     currentShareType = params.currentShareType,
     currentShareBounds = params.currentShareBounds,
@@ -309,10 +305,7 @@ function getCurrentSharingWorkArea(params) {
   var appWindow = allApplicationWindows.find(function (app) {
     return app.id === currentShareId;
   });
-  var nearDisplay = window.runtime.screen.getDisplayNearestPoint({
-    x: (_appWindow$bounds$x = appWindow === null || appWindow === void 0 || (_appWindow$bounds = appWindow.bounds) === null || _appWindow$bounds === void 0 ? void 0 : _appWindow$bounds.x) !== null && _appWindow$bounds$x !== void 0 ? _appWindow$bounds$x : 0,
-    y: (_appWindow$bounds$y = appWindow === null || appWindow === void 0 || (_appWindow$bounds2 = appWindow.bounds) === null || _appWindow$bounds2 === void 0 ? void 0 : _appWindow$bounds2.y) !== null && _appWindow$bounds$y !== void 0 ? _appWindow$bounds$y : 0
-  });
+  var nearDisplay = window.runtime.screen.getDisplayNearestPoint(currentShareBounds);
   var dataStruct = {
     bounds: {
       x: 0,
@@ -344,7 +337,7 @@ function getCurrentSharingWorkArea(params) {
       return id === Number(currentShareId);
     });
   };
-  var _ref5 = (isDisplay ? matchBounds() || matchIdOrIndex() : nearDisplay) || dataStruct,
+  var _ref5 = nearDisplay || dataStruct,
     _ref5$bounds = _ref5.bounds,
     x = _ref5$bounds.x,
     y = _ref5$bounds.y,

package/lib/waiting-room-control-manager.d.ts

@@ -0,0 +1,28 @@
+import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUISceneConfig } from './type';
+import { FcrCoreEngine } from 'fcr-core/lib/imports';
+export interface FcrUIWaitingRoomControlManagerObserver {
+    onWaitingRoomControlCreated?: (roomControl: FcrWaitingRoomControl) => void;
+    onWaitingRoomControlLeft?: () => void;
+}
+export default class FcrUIWaitingRoomControlManager {
+    private _sceneConfig;
+    private _engine;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observable;
+    private _waitingRoomControl;
+    private _mainRoomControl?;
+    private _isJoining;
+    constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine);
+    joinWaitingRoom(): void;
+    leaveWaitingRoom(): void;
+    private _createAndJoinWaitingRoom;
+    private _leaveWaitingRoom;
+    private _getMainRoomControlInfo;
+    private _getJoinRoomOption;
+    getWaitingRoomControl(): FcrWaitingRoomControl | null;
+    addObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
+    removeObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
+    setMainRoomControl(mainRoomControl: FcrMainRoomControl): void;
+    release(): void;
+}

package/lib/waiting-room-control-manager.js

@@ -0,0 +1,210 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.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/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.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.join.js");
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+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 _fcrCore = require("fcr-core");
+var _type = require("fcr-core/lib/room-control/user-control/type");
+var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
+var _imports = require("fcr-core/lib/imports");
+var _type3 = require("agora-rte-sdk/lib/type");
+var _logger = require("./utilities/logger");
+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 FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function () {
+  function FcrUIWaitingRoomControlManager(_sceneConfig, _engine) {
+    (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlManager);
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUIWaitingRoomControlManagerObserver'
+    }));
+    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
+    (0, _defineProperty2["default"])(this, "_isJoining", false);
+    this._sceneConfig = _sceneConfig;
+    this._engine = _engine;
+  }
+  return (0, _createClass2["default"])(FcrUIWaitingRoomControlManager, [{
+    key: "joinWaitingRoom",
+    value: function joinWaitingRoom() {
+      this._createAndJoinWaitingRoom();
+    }
+  }, {
+    key: "leaveWaitingRoom",
+    value: function leaveWaitingRoom() {
+      this._leaveWaitingRoom();
+    }
+  }, {
+    key: "_createAndJoinWaitingRoom",
+    value: function () {
+      var _createAndJoinWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var info, waitingRoomId, room;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (this._isJoining) {
+                _context.next = 28;
+                break;
+              }
+              info = this._getMainRoomControlInfo();
+              if (this._waitingRoomControl) {
+                _context.next = 25;
+                break;
+              }
+              this._isJoining = true;
+              if (!info) {
+                _context.next = 21;
+                break;
+              }
+              waitingRoomId = info.payload.roomUuid;
+              room = this._engine.createWaitingRoomControl(waitingRoomId);
+              this._waitingRoomControl = room;
+              this.logger.info("before waitingRoomManager join waiting room, waitingRoomId:", waitingRoomId);
+              _context.prev = 9;
+              _context.next = 12;
+              return room.join(_objectSpread(_objectSpread({}, this._getJoinRoomOption()), {}, {
+                createStreamConfigs: []
+              }));
+            case 12:
+              this._observable.notifyObservers('onWaitingRoomControlCreated', room);
+              this.logger.info("after waitingRoomManager join waiting room");
+              _context.next = 19;
+              break;
+            case 16:
+              _context.prev = 16;
+              _context.t0 = _context["catch"](9);
+              this.logger.error("waiting room join error: ".concat(_context.t0));
+            case 19:
+              _context.next = 22;
+              break;
+            case 21:
+              this.logger.info('mainroomControl info is null, cannot create waiting room');
+            case 22:
+              this._isJoining = false;
+              _context.next = 26;
+              break;
+            case 25:
+              this.logger.info('waiting room is already created, cannot create waiting room');
+            case 26:
+              _context.next = 29;
+              break;
+            case 28:
+              this.logger.info('waiting room is joining, cannot create waiting room');
+            case 29:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[9, 16]]);
+      }));
+      function _createAndJoinWaitingRoom() {
+        return _createAndJoinWaitingRoom2.apply(this, arguments);
+      }
+      return _createAndJoinWaitingRoom;
+    }()
+  }, {
+    key: "_leaveWaitingRoom",
+    value: function () {
+      var _leaveWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var _this$_waitingRoomCon;
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this._isJoining = false;
+              this.logger.info('mainRoomControl is not waiting room manager, leave waiting room');
+              (_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 || _this$_waitingRoomCon.leave();
+              this._waitingRoomControl = null;
+              this._observable.notifyObservers('onWaitingRoomControlLeft');
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function _leaveWaitingRoom() {
+        return _leaveWaitingRoom2.apply(this, arguments);
+      }
+      return _leaveWaitingRoom;
+    }()
+  }, {
+    key: "_getMainRoomControlInfo",
+    value: function _getMainRoomControlInfo() {
+      var _getPrivilegeControl$ = this._mainRoomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom),
+        info = _getPrivilegeControl$.info;
+      return info;
+    }
+  }, {
+    key: "_getJoinRoomOption",
+    value: function _getJoinRoomOption() {
+      var config = this._sceneConfig;
+      var streams = [{
+        streamName: 'default',
+        streamType: _imports.AgoraRteMediaStreamType.BOTH,
+        videoSourceType: _imports.AgoraRteVideoSourceType.CAMERA,
+        audioSourceType: _type3.AgoraRteAudioSourceType.MICROPHONE,
+        videoSourceState: _type3.AgoraRteMediaSourceState.CLOSE,
+        audioSourceState: _type3.AgoraRteMediaSourceState.CLOSE
+      }];
+      if (config.userRole === _type.FcrUserRole.ROBOT) {
+        streams = [];
+      }
+      return {
+        userName: config.userName,
+        userRole: config.userRole,
+        userProperties: config.userProperties,
+        streamLatency: _fcrCore.FcrStreamLatencyLevel.ULTRA_LOW,
+        createStreamConfigs: streams,
+        roomToken: config.roomToken,
+        password: config.password
+      };
+    }
+  }, {
+    key: "getWaitingRoomControl",
+    value: function getWaitingRoomControl() {
+      return this._waitingRoomControl;
+    }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
+  }, {
+    key: "setMainRoomControl",
+    value: function setMainRoomControl(mainRoomControl) {
+      this._mainRoomControl = mainRoomControl;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      if (this._waitingRoomControl) {
+        this._leaveWaitingRoom();
+        this._waitingRoomControl = null;
+      }
+    }
+  }]);
+}();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.4.4",
+  "version": "3.5.0",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -13,7 +13,8 @@
     "test-electron": "agora-tc-test-karma-electron",
     "build": "agora-tc-transpile",
     "bundle": "agora-tc-bundle --entry src/index && agora-tc-transpile --src ./src/electron --out dist/electron --transpile-only",
-    "build-electron-mac": "CSC_IDENTITY_AUTO_DISCOVERY=false agora-tc-pack-sdk --platform darwin --arch x64",
+    "build-electron-mac-x64": "CSC_IDENTITY_AUTO_DISCOVERY=false agora-tc-pack-sdk --platform darwin --arch x64",
+    "build-electron-mac-arm64": "CSC_IDENTITY_AUTO_DISCOVERY=false agora-tc-pack-sdk --platform darwin --arch arm64",
     "build-electron-win": "agora-tc-pack-sdk --platform win32 --arch x64"
   },
   "dependencies": {
@@ -21,13 +22,13 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.11-rc.1",
-    "agora-foundation": "^3.4.4",
-    "agora-ui-foundation": "^3.4.4",
+    "agora-foundation": "^3.5.0",
+    "agora-ui-foundation": "^3.5.0",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "^3.4.4",
+    "fcr-core": "^3.5.0",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -58,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "^3.4.4",
+    "agora-toolchain": "^3.5.0",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/index.html

@@ -75,7 +75,7 @@
     <div id="root"></div>
     <div id="fcr-launch-failure-comp" style="display: none">
       <div class="fcr-launch-failure-comp-modal">
-        <img class="fcr-launch-failure-comp-banner" src="./assets/leave-meeting.png" />
+        <img class="fcr-launch-failure-comp-banner" src="assets/leave-meeting.png" />
         <div class="fcr-launch-failure-comp-info">
           <div class="fcr-launch-failure-comp-h">
             <span id="fcr-launch-failure-comp-title"></span>
@@ -177,6 +177,7 @@
         cameraExpectedOff,
         autoConnectAudio,
         microphoneExpectedOff,
+        widgets,
         ...others
       } = launchOptionsObj;
       const creator = new FcrUIScene.FcrUISceneCreator({
@@ -190,6 +191,11 @@
         autoConnectAudio,
         microphoneExpectedOff,
       };
+      if (widgets && widgets instanceof Array) {
+        widgets.forEach((w) => {
+          creator.registerWidget(w);
+        });
+      }
       const uiScene = creator.launch(
         others,
         () => {

package/lib/ scenes/base.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-import { FcrUIRootNode } from '../ui-node';
-export declare abstract class FcrBaseUIScene extends FcrUIRootNode {
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    abstract mount(dom: HTMLElement): void;
-    abstract unmount(dom: HTMLElement): void;
-    protected renderLayers(layers: JSX.Element[]): import("react/jsx-runtime").JSX.Element[];
-    protected renderWithErrorBoundary(layoutComponent: JSX.Element, spaceName: string): import("react/jsx-runtime").JSX.Element;
-    protected logError(error: Error, info: React.ErrorInfo, space: string): void;
-}

package/lib/ scenes/base.js

@@ -1,75 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.reflect.construct.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FcrBaseUIScene = void 0;
-require("core-js/modules/es.array.concat.js");
-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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
-var _reactErrorBoundary = require("react-error-boundary");
-var _errorFallback = require("../error-fallback");
-var _uiNode = require("../ui-node");
-var _logger = require("agora-foundation/lib/logger");
-var _jsxRuntime = require("react/jsx-runtime");
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-var FcrBaseUIScene = exports.FcrBaseUIScene = /*#__PURE__*/function (_FcrUIRootNode) {
-  function FcrBaseUIScene() {
-    var _this;
-    (0, _classCallCheck2["default"])(this, FcrBaseUIScene);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, FcrBaseUIScene, [].concat(args));
-    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.getLogger)());
-    return _this;
-  }
-  (0, _inherits2["default"])(FcrBaseUIScene, _FcrUIRootNode);
-  return (0, _createClass2["default"])(FcrBaseUIScene, [{
-    key: "renderLayers",
-    value: function renderLayers(layers) {
-      return layers.map(function (el, i) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react["default"].Fragment, {
-          children: el
-        }, i);
-      });
-    }
-  }, {
-    key: "renderWithErrorBoundary",
-    value: function renderWithErrorBoundary(layoutComponent, spaceName) {
-      var _this2 = this;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
-        FallbackComponent: _errorFallback.ErrorFallback,
-        onError: function onError(error, info) {
-          return _this2.logError(error, info, spaceName);
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: {
-            width: '100vw',
-            height: '100vh'
-          },
-          children: layoutComponent
-        })
-      });
-    }
-  }, {
-    key: "logError",
-    value: function logError(error, info, space) {
-      var errorMessage = "[UIScene]: ErrorBoundary wrap ".concat(space, " error:");
-      var componentStackMessage = "componentStack: ".concat(info.componentStack);
-      this.logger.error("".concat(errorMessage, "\n") + "  Error: ".concat(error.message, "\n") + "  Stack: ".concat(error.stack, "\n") + "  ".concat(componentStackMessage));
-    }
-  }]);
-}(_uiNode.FcrUIRootNode);

package/lib/ scenes/main-scene.d.ts

@@ -1,43 +0,0 @@
-import { FcrCoreEngine } from 'fcr-core';
-import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrUILocalVideoRenderProviderImpl, FcrUIRemoteVideoRenderProviderImpl } from '../providers/renderer-provider';
-import { FcrUIEventProvider } from '../providers/event-provider';
-import { FcrBaseUIScene } from './base';
-import { FcrUIDevicePrivilegeProviderImpl } from '../providers/device-privilege-provider';
-import { FcrUIDeviceProvider } from '../providers/device-provider';
-import { FcrUIInterpreterProviderImpl } from '../providers/interpreter-provider';
-import { FcrUILocalStorageProviderImpl } from '../providers/local-storage-provider';
-import { FcrUIPrivilegeProviderImpl } from '../providers/privilege-provider';
-import { FcrUIConnectionProviderImpl, FcrUICurrentRoomControlProviderImpl, FcrUIMainRoomControlProviderImpl, FcrUIRoomProvider, FcrUIWaitingRoomControlProviderImpl } from '../providers/room-provider';
-import { FcrUISharedConfigDataSource } from '../shared-data-source/config';
-export type FcrMainUISceneArgs = {
-    engine: FcrCoreEngine;
-    mainRoomControl: FcrMainRoomControl;
-    eventProvider: FcrUIEventProvider;
-    deviceProvider: FcrUIDeviceProvider;
-    roomProvider: FcrUIRoomProvider;
-    sharedConfigDataSource: FcrUISharedConfigDataSource;
-};
-export declare class FcrMainUIScene extends FcrBaseUIScene {
-    private _getView;
-    eventProvider: FcrUIEventProvider;
-    roomProvider: FcrUIRoomProvider;
-    deviceProvider: FcrUIDeviceProvider;
-    mainRoomControlProvider: FcrUIMainRoomControlProviderImpl;
-    connectionProvider: FcrUIConnectionProviderImpl;
-    currentRoomControlProvider: FcrUICurrentRoomControlProviderImpl;
-    localVideoRenderProvider: FcrUILocalVideoRenderProviderImpl;
-    remoteVideoRenderProvider: FcrUIRemoteVideoRenderProviderImpl;
-    devicePrivilegeProvider: FcrUIDevicePrivilegeProviderImpl;
-    interpreterProvider: FcrUIInterpreterProviderImpl;
-    localStorageProvider: FcrUILocalStorageProviderImpl;
-    privilegeProvider: FcrUIPrivilegeProviderImpl;
-    sharedConfigDataSource: FcrUISharedConfigDataSource;
-    waitingRoomControlProvider?: FcrUIWaitingRoomControlProviderImpl;
-    isWaitingRoomNotify: boolean;
-    constructor(args: FcrMainUISceneArgs);
-    setIsWaitingRoomNotify(): void;
-    notifyParticipantShowWaitingRoom(): void;
-    mount(dom: HTMLElement): void;
-    unmount(dom: HTMLElement): void;
-}