fcr-ui-scene-mobile 3.7.2 → 3.7.3

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export { FcrUISceneCreator } from './creator';
 export { FcrUIExitReason, FcrUserRole, FcrRegion, FcrStreamLatencyLevel } from './type';
+import './plugins/browser-runtime-plugin';
 import './plugins/css-preset-plugin';
 import './plugins/multi-lang-plugin';
 import './plugins/rtm-plugin';

package/lib/index.js

@@ -40,6 +40,7 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _duration = _interopRequireDefault(require("dayjs/plugin/duration"));
 var _creator = require("./creator");
 var _type = require("./type");
+require("./plugins/browser-runtime-plugin");
 require("./plugins/css-preset-plugin");
 require("./plugins/multi-lang-plugin");
 require("./plugins/rtm-plugin");

package/lib/modules/member-layout/store.d.ts

@@ -7,7 +7,7 @@ import { FcrParticipantStore } from '../../common/participant-store';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
 import { AgoraRtcVideoStreamType } from 'fcr-core/lib/imports';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 export interface IMemberProps {
     streamControl: FcrStreamControl;
     deviceStore: FcrDeviceStore;
@@ -15,7 +15,7 @@ export interface IMemberProps {
     userControl: FcrUserControl;
     settingStore: SettingStore;
     uiEventStore: FcrUIEventStore;
-    whiteBoredControl: FcrWhiteboardControl;
+    whiteBoredControl: FcrPrivilegedWhiteboardControl;
     participantStore: FcrParticipantStore;
 }
 export default class Store {

package/lib/modules/state-bar/store.d.ts

@@ -55,7 +55,6 @@ export default class StateBarStore {
     setScheduleInfo(scheduleInfo: FcrRoomSchedule): void;
     toggleLayout(layout: 'speaker' | 'gallery'): void;
     toggleLayoutBarLock(state: boolean): void;
-    openVideoWindowDialog(): void;
     refreshLayoutSize(size: 16 | 25): void;
     release(): void;
     stopLiveStreamingDialog(): void;

package/lib/modules/state-bar/store.js

@@ -4,6 +4,7 @@ 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");
@@ -35,19 +36,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.GALLERY_MIN_SIZE = void 0;
-require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.object.assign.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
-require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -77,12 +72,8 @@ require("core-js/modules/esnext.set.union.v2.js");
 require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.btoa.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/web.dom-exception.constructor.js");
-require("core-js/modules/web.dom-exception.stack.js");
-require("core-js/modules/web.dom-exception.to-string-tag.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"));
@@ -173,7 +164,6 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     this._onNetworkQualityUpdated = this._onNetworkQualityUpdated.bind(this);
     this.toggleLayout = this.toggleLayout.bind(this);
     this.toggleLayoutBarLock = this.toggleLayoutBarLock.bind(this);
-    this.openVideoWindowDialog = this.openVideoWindowDialog.bind(this);
     this._onCloudRecordingStateUpdated(((_this$_roomControl$ge = this._roomControl.getRoomInfo()) === null || _this$_roomControl$ge === void 0 ? void 0 : _this$_roomControl$ge.roomId) || '', this._roomControl.getCloudRecordingState());
     this._initRoomInfo();
   }
@@ -395,11 +385,6 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function toggleLayoutBarLock(state) {
       this._uiEventStore.sendEvent(_constant.UIAction.TOGGLE_LAYOUT_BAR_LOCK, state);
     }
-  }, {
-    key: "openVideoWindowDialog",
-    value: function openVideoWindowDialog() {
-      this._uiEventStore.openDialog(_constant.DialogKey.VIDEO_WINDOW);
-    }
   }, {
     key: "refreshLayoutSize",
     value: function refreshLayoutSize(size) {
@@ -442,18 +427,9 @@ var StateBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getShareLink",
     value: function getShareLink() {
-      var _this$roomInfo, _this$roomInfo2, _this$localUser2;
-      var info = {
-        roomId: (_this$roomInfo = this.roomInfo) === null || _this$roomInfo === void 0 ? void 0 : _this$roomInfo.roomId,
-        roomName: (_this$roomInfo2 = this.roomInfo) === null || _this$roomInfo2 === void 0 ? void 0 : _this$roomInfo2.roomName,
-        userName: (_this$localUser2 = this.localUser) === null || _this$localUser2 === void 0 ? void 0 : _this$localUser2.userName
-      };
-      var strArgs = "info=".concat(btoa(encodeURIComponent(JSON.stringify(info))));
-      var baseLink = "".concat(this._config.inviteLink);
-      if (baseLink.includes('?')) {
-        return "".concat(baseLink, "&").concat(strArgs);
-      }
-      return "".concat(baseLink, "?").concat(strArgs);
+      var _this$roomInfo;
+      var baseLink = "".concat((_this$roomInfo = this.roomInfo) === null || _this$roomInfo === void 0 ? void 0 : _this$roomInfo.inviteLink);
+      return baseLink;
     }
   }, {
     key: "toastCopyInfo",

package/lib/modules/whiteboard/components/toolbar/hooks/index.d.ts

@@ -1,9 +1,9 @@
 export declare const useVisibleTools: (diraction?: "horizontal") => {
-    mainTools: ({
+    mainTools: {
         renderItem: ({ offset }?: {
             offset?: number;
         }) => import("react/jsx-runtime").JSX.Element;
-    } | undefined)[];
+    }[];
     additionTools: {
         renderItem: ({ offset }?: {
             offset?: number;

package/lib/modules/whiteboard/index.d.ts

@@ -7,7 +7,7 @@ import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrUIVideoWindowLayoutType } from './type';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
     private _uiEventStore;
@@ -60,7 +60,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
         uiEventStore: FcrUIEventStore;
         userControl: FcrUserControl;
         roomControl: FcrBaseRoomControl;
-        whiteboardControl: FcrWhiteboardControl;
+        whiteboardControl: FcrPrivilegedWhiteboardControl;
         streamControl: FcrStreamControl;
         securityStore: FcrSecurityStore;
     });

package/lib/plugins/browser-runtime-plugin.js

@@ -0,0 +1,110 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.promise.js");
+if (!window.runtime) {
+  window.runtime = {
+    screen: null,
+    browserWindow: null,
+    sendEvent: function sendEvent(event) {},
+    open: function open(entryPath) {},
+    close: function close(entryPath) {},
+    addEventListener: function addEventListener() {},
+    removeEventListener: function removeEventListener() {},
+    setFragmentOptions: function setFragmentOptions() {},
+    openDirectory: function openDirectory() {
+      return Promise.resolve(undefined);
+    },
+    showItemInFolder: function showItemInFolder() {},
+    openRendererWindow: function openRendererWindow() {},
+    closeRendererWindow: function closeRendererWindow() {},
+    getLaunchOptions: function getLaunchOptions() {
+      return null;
+    },
+    openLinkInDefaultBrowser: function openLinkInDefaultBrowser() {},
+    getSystemMemorySize: function getSystemMemorySize() {
+      return 0;
+    },
+    getSystemCpuInfo: function getSystemCpuInfo() {
+      return [];
+    },
+    getNetworkType: function getNetworkType() {
+      return Promise.resolve({
+        isWifiConnected: false,
+        connection: ''
+      });
+    },
+    quitApp: function quitApp() {},
+    setFragmentBaseUrl: function setFragmentBaseUrl() {},
+    getBrowserWindowById: function getBrowserWindowById(id) {
+      return undefined;
+    },
+    captureScreen: function captureScreen() {},
+    getResourceByFileType: function getResourceByFileType() {
+      return Promise.resolve([]);
+    },
+    fileToBlob: function fileToBlob() {
+      return new Blob();
+    },
+    registerListenerReady: function registerListenerReady() {},
+    releaseSubAllWindowRefs: function releaseSubAllWindowRefs() {},
+    getMediaSourceIdList: function getMediaSourceIdList() {
+      return [];
+    },
+    setInMeetingState: function setInMeetingState() {},
+    restartApp: function restartApp() {},
+    getBundleType: function getBundleType() {
+      return Promise.resolve('JS_BUNDLE');
+    },
+    checkMediaPermission: function () {
+      var _checkMediaPermission = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(mediaType) {
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", true);
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function checkMediaPermission(_x) {
+        return _checkMediaPermission.apply(this, arguments);
+      }
+      return checkMediaPermission;
+    }(),
+    openSystemPreferences: function openSystemPreferences() {},
+    getUserSettingData: function getUserSettingData() {
+      return {};
+    },
+    setUserSettingData: function setUserSettingData() {},
+    getActiveWindow: function getActiveWindow() {
+      return undefined;
+    },
+    getWindows: function getWindows() {
+      return [];
+    },
+    initSDK: function initSDK() {},
+    getIsSDKReady: function getIsSDKReady() {
+      return Promise.resolve(false);
+    },
+    openSetting: function openSetting() {},
+    loadBuiltinResources: function loadBuiltinResources() {
+      return Promise.resolve({
+        virtualBackgroundImages: [],
+        virtualBackgroundVideos: [],
+        soundEffects: []
+      });
+    },
+    launchSuccess: function launchSuccess(roomId) {},
+    launchFailure: function launchFailure(roomId, errorCode) {},
+    onSetParameters: function onSetParameters(parameters) {},
+    setParameters: function setParameters(parameters) {},
+    getIsMeetingLaunched: function getIsMeetingLaunched() {
+      return Promise.resolve(false);
+    }
+  };
+}

package/lib/runtime.d.ts

@@ -0,0 +1,95 @@
+export {};
+declare global {
+  interface Runtime {
+    sendEvent: (event: RendererCustomEvent) => void;
+    open(entryPath: string, dialogId?: string): void;
+    close(entryPath: string, dialogId?: string): void;
+    openRendererWindow(
+      frameName: string,
+      renderFn: (
+        dom: Element,
+        browserWindow: Electron.BrowserWindow,
+        newRendererWindow: Window,
+      ) => void,
+      windowOptions: import('electron').BrowserWindowConstructorOptions,
+    ): void;
+    closeRendererWindow(frameName: string): void;
+    addEventListener(
+      listener: (ipcEvent: import('electron').IpcRendererEvent, event: RendererCustomEvent) => void,
+    ): void;
+    removeEventListener(
+      listener: (ipcEvent: import('electron').IpcRendererEvent, event: RendererCustomEvent) => void,
+    ): void;
+
+    browserWindow: import('electron').BrowserWindow;
+    captureScreen(options?: { hideWindow?: boolean; alwaysHide?: boolean }): void;
+    setFragmentOptions(
+      entryPath: string,
+      windowOptions: import('electron').BrowserWindowConstructorOptions,
+      webPreferences: import('electron').WebPreferences,
+    ): void;
+    getLaunchOptions?(): Promise<Record<string, any>>;
+    openLinkInDefaultBrowser(url: string): void;
+    openDirectory(): Promise<string | undefined>;
+    showItemInFolder(path: string): void;
+    screen: Electron.Screen;
+    launch?(options: any): void;
+    quitApp(): void;
+    getSystemMemorySize(): number;
+    getSystemCpuInfo(): import('os').CpuInfo[];
+    getNetworkType(): Promise<NetworkType>;
+    setFragmentBaseUrl(isDev: boolean, baseUrl: string): void;
+    getBrowserWindowById(id: number): import('electron').BrowserWindow | undefined;
+    getResourceByFileType(
+      url: string,
+      md5Url: string,
+      type: 'image' | 'video' | 'audio',
+    ): Promise<string[]>;
+    fileToBlob(filePath: string, type: 'image' | 'video' | 'audio'): Blob;
+    registerListenerReady(): void;
+    releaseSubAllWindowRefs(): void;
+    getMediaSourceIdList(): { title: string; mediaSourceId: string }[];
+    setInMeetingState(state: 0 | 1): void;
+    restartApp(): void;
+    getBundleType(): Promise<'JS_BUNDLE' | 'NATIVE_BUNDLE'>;
+    checkMediaPermission(mediaType: 'microphone' | 'camera' | 'sharing'): Promise<boolean>;
+    openSystemPreferences(mediaType: 'microphone' | 'camera' | 'sharing'): void;
+    getUserSettingData(): object;
+    setUserSettingData(data: object): void;
+    getActiveWindow(): WindowManager | undefined;
+    getWindows(): WindowManager[];
+    onCreatorInit?: (initOptions: any) => void;
+    onSettingOpen?: () => void;
+    onSettingClose?: () => void;
+    onLaunchMeeting?: (launchOptions: any) => void;
+    onRenewUserToken?: (token: string) => void;
+    initSDK: (options: any) => void;
+    openSetting: () => void;
+    getIsSDKReady: () => Promise<boolean>;
+    onSDKReady?: () => void;
+    onLaunchFailure?: (roomId: string, errorCode: string) => void;
+    loadBuiltinResources: () => Promise<{
+      virtualBackgroundImages: string[];
+      virtualBackgroundVideos: string[];
+      soundEffects: string[];
+    }>;
+    launchSuccess: (roomId: string) => void;
+    onLaunchSuccess?: (roomId: string) => void;
+    launchFailure: (roomId: string, errorCode: number) => void;
+    onSetParameters?: (parameters: Record<string, unknown>) => void;
+    setParameters: (parameters: string) => void;
+    exitUiScene?: () => void;
+    onExitUiScene?: () => void;
+    exitedMeeting?: (roomId: string, reason: FcrUIExitReason) => void;
+    onExitedMeeting?: (roomId: string, reason: number) => void;
+    getIsMeetingLaunched: () => Promise<boolean>;
+    onWidgetClicked?: (widgetId: string) => void;
+    onUserTokenWillExpire?: () => void;
+    onRefreshUserToken?: () => void;
+    refreshUserToken?: (token: string) => void;
+  }
+
+  interface Window {
+    runtime: Runtime;
+  }
+}

package/lib/translations/enUS.d.ts

@@ -1889,4 +1889,5 @@ export declare const enUs: {
     fmt_jbh_title_host_not_in_meeting: string;
     fmt_jbh_title_host_in_meeting: string;
     fmt_jbh_title_meeting_topic: string;
+    fmt_jbh_toast_meeting_not_start: string;
 };

package/lib/translations/enUS.js

@@ -1895,5 +1895,6 @@ var enUs = exports.enUs = {
   fmt_hostkey_meetingroom_toast_unable_to_claim_host: 'Unable to claim host role because there is already a host in the meeting',
   fmt_jbh_title_host_not_in_meeting: 'The meeting has not started yet',
   fmt_jbh_title_host_in_meeting: 'Please wait.The host will let you into the meeting soon.',
-  fmt_jbh_title_meeting_topic: 'Meeting Topic'
+  fmt_jbh_title_meeting_topic: 'Meeting Topic',
+  fmt_jbh_toast_meeting_not_start: "The meeting hasn't started yet. Please try again later."
 };

package/lib/translations/zhCN.d.ts

@@ -1887,4 +1887,5 @@ export declare const zhCn: {
     fmt_jbh_title_host_not_in_meeting: string;
     fmt_jbh_title_host_in_meeting: string;
     fmt_jbh_title_meeting_topic: string;
+    fmt_jbh_toast_meeting_not_start: string;
 };

package/lib/translations/zhCN.js

@@ -1893,5 +1893,6 @@ var zhCn = exports.zhCn = {
   fmt_hostkey_meetingroom_toast_unable_to_claim_host: '会议已有主持人，无法通过密钥获取主持人权限',
   fmt_jbh_title_host_not_in_meeting: '会议未开始，等待主持人进入',
   fmt_jbh_title_host_in_meeting: '请稍等，主持人即将邀请您入会',
-  fmt_jbh_title_meeting_topic: '会议主题'
+  fmt_jbh_title_meeting_topic: '会议主题',
+  fmt_jbh_toast_meeting_not_start: '会议暂未开始，请稍后再试'
 };

package/lib/ui-manager.d.ts

@@ -16,6 +16,8 @@ export declare class DefaultSceneUIManager {
     private _mainRoomControl?;
     private _waitingRoomControl?;
     private _chatModule?;
+    private _roomRouter;
+    private _roomRouterObserver;
     _participantsModule: any;
     _stateBarUIModule?: FcrMobileStateBarUIModule;
     _mediaPlayerModule?: MediaPlayerUIModule;

package/lib/ui-manager.js

@@ -3,6 +3,8 @@
 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.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -38,8 +40,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DefaultSceneUIManager = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -88,6 +88,7 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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; }
 var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/function () {
   function DefaultSceneUIManager(_sceneConfig, _engine, _observable) {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, DefaultSceneUIManager);
     // @internal
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
@@ -97,11 +98,51 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     (0, _defineProperty2["default"])(this, "_roomObserver", {});
     // @internal
     (0, _defineProperty2["default"])(this, "_eventObserver", {});
+    (0, _defineProperty2["default"])(this, "_roomRouterObserver", {
+      onRoomJoined: function onRoomJoined(roomControl) {
+        // nextStep: FcrRoomControlType
+        var roomInfo = roomControl.getRoomInfo();
+        if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Mainroom) {
+          _this._mainRoomControl = roomControl;
+          _this._mainRoomControl.addObserver(_this._roomObserver);
+          // @ts-ignore
+          window.__mainRoom_control = roomControl;
+          _this.renderMainMobile();
+          return _type5.FcrRoomType.Mainroom;
+        } else if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Waitingroom) {
+          _this._waitingRoomControl = roomControl;
+          if (_this._waitingRoomControl) {
+            _this._waitingRoomControl.leave();
+            _this._observable.notifyObservers('onExited', _this._sceneConfig.roomId, _type.FcrUIExitReason.LEAVE_ROOM);
+          }
+          _toast.FcrToastApi.open({
+            toastProps: {
+              type: 'error',
+              content: (0, _i18n.transI18n)('fmt_h_tips_host_enabled_waiting_room')
+            }
+          });
+        } else if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.JoinBeforeHostWaitingRoom) {
+          _this._waitingRoomControl = roomControl;
+          if (_this._waitingRoomControl) {
+            _this._waitingRoomControl.leave();
+            _this._observable.notifyObservers('onExited', _this._sceneConfig.roomId, _type.FcrUIExitReason.LEAVE_ROOM);
+          }
+          _toast.FcrToastApi.open({
+            toastProps: {
+              type: 'error',
+              content: (0, _i18n.transI18n)('fmt_h_tips_host_enabled_waiting_room')
+            }
+          });
+        }
+      }
+    });
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
     this._observable = _observable;
     this._uiEventStore = new _eventStore.FcrUIEventStore();
     this._deviceStore = new _deviceStore.FcrDeviceStore(_sceneConfig.userName, this._engine.getMobileMediaControl());
+    this._roomRouter = this._engine.createRoomRouter(this._sceneConfig.roomId);
+    this._roomRouter.addObserver(this._roomRouterObserver);
   }
   return (0, _createClass2["default"])(DefaultSceneUIManager, [{
     key: "_initWhiteBoardUIModule",
@@ -122,11 +163,11 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
   }, {
     key: "_renderWithErrorBoundary",
     value: function _renderWithErrorBoundary(layoutComponent, spaceName) {
-      var _this = this;
+      var _this2 = this;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
         FallbackComponent: _errorFallback.ErrorFallback,
         onError: function onError(error, info) {
-          return _this._logError(error, info, spaceName);
+          return _this2._logError(error, info, spaceName);
         },
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
@@ -160,7 +201,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
   }, {
     key: "render",
     value: function render(dom) {
-      var _this2 = this;
+      var _this3 = this;
       this._dom = dom;
       if (!this._dom) {
         this.logger.error('Scene UI cannot be rendered as dom is not exist');
@@ -171,12 +212,10 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                return _context.abrupt("return", _this2._engine.login().then(function () {
-                  return _this2._handleJoinRoom();
-                }).then(function () {
-                  _this2.renderMainMobile();
+                return _context.abrupt("return", _this3._engine.login().then(function () {
+                  return _this3._handleJoinRoom();
                 })["catch"](function (e) {
-                  _this2._observable.notifyObservers('onLaunchFailure', _this2._sceneConfig.roomId, e);
+                  _this3._observable.notifyObservers('onLaunchFailure', _this3._sceneConfig.roomId, e);
                 }));
               case 1:
               case "end":
@@ -194,7 +233,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "renderMainMobile",
     value: function renderMainMobile() {
       var _this$_initChatUIModu,
-        _this3 = this;
+        _this4 = this;
       /**
        * Common Stores
        */
@@ -292,14 +331,14 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
       this._eventObserver = {
         onEvent: function onEvent(action, payload) {
           if (action === _constant.UIAction.EXIT_ROOM) {
-            _this3._observable.notifyObservers('onExited', _this3._sceneConfig.roomId, payload.reason, _this3._mainRoomControl);
+            _this4._observable.notifyObservers('onExited', _this4._sceneConfig.roomId, payload.reason, _this4._mainRoomControl);
           }
         }
       };
       this._roomObserver = {
         onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
           if (state === _type6.FcrRoomState.Closed) {
-            _this3._observable.notifyObservers('onExited', roomId, _type.FcrUIExitReason.CLOSE_ROOM);
+            _this4._observable.notifyObservers('onExited', roomId, _type.FcrUIExitReason.CLOSE_ROOM);
           }
         }
       };
@@ -330,18 +369,18 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "_createRoomControl",
     value: function () {
       var _createRoomControl2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomId) {
-        var _this4 = this;
+        var _this5 = this;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               return _context3.abrupt("return", new Promise(/*#__PURE__*/function () {
                 var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(resolve, reject) {
-                  var engine, config, streams, room, _t;
+                  var engine, config, streams, _t;
                   return _regenerator["default"].wrap(function (_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        engine = _this4._engine;
-                        config = _this4._sceneConfig;
+                        engine = _this5._engine;
+                        config = _this5._sceneConfig;
                         if (engine) {
                           _context2.next = 1;
                           break;
@@ -363,7 +402,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
                         }
                         _context2.prev = 2;
                         _context2.next = 3;
-                        return engine.createRoomControlAndJoin(roomId, {
+                        return _this5._roomRouter.joinRoom({
                           userName: config.userName,
                           userRole: config.userRole,
                           userProperties: config.userProperties,
@@ -373,8 +412,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
                           password: config.password
                         });
                       case 3:
-                        room = _context2.sent;
-                        resolve(room);
+                        resolve();
                         _context2.next = 5;
                         break;
                       case 4:
@@ -406,33 +444,12 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "_handleJoinRoom",
     value: function () {
       var _handleJoinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var _this5 = this;
+        var _this6 = this;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context4.abrupt("return", this._createRoomControl(this._sceneConfig.roomId).then(function (room) {
-                var roomInfo = room.getRoomInfo();
-                if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Mainroom) {
-                  _this5._mainRoomControl = room;
-                  _this5._mainRoomControl.addObserver(_this5._roomObserver);
-                  // @ts-ignore
-                  window.__mainRoom_control = room;
-                  return _type5.FcrRoomType.Mainroom;
-                } else if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Waitingroom) {
-                  _this5._waitingRoomControl = room;
-                  if (_this5._waitingRoomControl) {
-                    _this5._waitingRoomControl.leave();
-                  }
-                  _toast.FcrToastApi.open({
-                    toastProps: {
-                      type: 'error',
-                      content: (0, _i18n.transI18n)('fmt_h_tips_host_enabled_waiting_room')
-                    }
-                  });
-                  throw new Error('host_enabled_waiting_room');
-                }
-              })["catch"](function (e) {
-                _this5._observable.notifyObservers('onLaunchFailure', _this5._sceneConfig.roomId, e);
+              return _context4.abrupt("return", this._createRoomControl(this._sceneConfig.roomId)["catch"](function (e) {
+                _this6._observable.notifyObservers('onLaunchFailure', _this6._sceneConfig.roomId, e);
                 throw e;
               }));
             case 1:

package/lib/utilities/logger.d.ts

@@ -4,5 +4,4 @@ export declare const createLogger: (opts: {
     prefix: string;
     database?: boolean;
 }) => import("agora-foundation/lib/logger").Logger;
-export declare const trace: (originalMethod: any, context: ClassMethodDecoratorContext) => void;
 export declare const generateLogObserver: <T>(logger: ReturnType<typeof _getLogger>, callbackMethods: (keyof T)[]) => T;

package/lib/utilities/logger.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.trace = exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
+exports.getLogger = exports.generateLogObserver = exports.createLogger = void 0;
 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");
@@ -12,7 +12,6 @@ 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");
 var _logger = require("agora-foundation/lib/logger");
-var _decorator = require("agora-foundation/lib/decorator");
 var _logSerializer = require("agora-foundation/lib/decorator/log/log-serializer");
 var getLogger = exports.getLogger = function getLogger() {
   return (0, _logger.getLogger)({
@@ -26,7 +25,6 @@ var createLogger = exports.createLogger = function createLogger(opts) {
     database: opts.database
   });
 };
-var trace = exports.trace = _decorator.trace.to('ui-scene-mobile');
 var generateLogObserver = exports.generateLogObserver = function generateLogObserver(logger, callbackMethods) {
   var observer = {};
   callbackMethods.forEach(function (method) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene-mobile",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-mobile.git",
   "author": "agora.io",
@@ -14,12 +14,12 @@
   "dependencies": {
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-foundation": "~3.7.2",
-    "agora-ui-foundation": "~3.7.2",
+    "agora-foundation": "~3.7.3",
+    "agora-ui-foundation": "~3.7.3",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
-    "fcr-core": "~3.7.2",
+    "fcr-core": "~3.7.3",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -49,7 +49,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "~3.7.2",
+    "agora-toolchain": "~3.7.3",
     "core-js": "^3.33.3",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",