fcr-ui-scene 3.5.0 → 3.6.0

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

@@ -10,6 +10,8 @@ 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");
@@ -34,7 +36,8 @@ 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) {
+  function FcrUIWaitingRoomControlManager(_sceneConfig, _engine, _mainRoomControl) {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlManager);
     (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
       prefix: 'FcrUIWaitingRoomControlManagerObserver'
@@ -42,18 +45,36 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
     (0, _defineProperty2["default"])(this, "_isJoining", false);
+    (0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {
+      onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
+        var isLocalUserInfoUpdated = event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
+
+        // 权限变更的时候
+        if (isLocalUserInfoUpdated) {
+          _this._sceneConfig.userRole = event.modifiedUser.userRole;
+          var isWaitingRoomManager = _this._isWaitingRoomManager();
+          if (isWaitingRoomManager) {
+            _this._createAndJoinWaitingRoom();
+          } else {
+            _this._leaveWaitingRoom();
+          }
+        }
+      }
+    });
     this._sceneConfig = _sceneConfig;
     this._engine = _engine;
-  }
-  return (0, _createClass2["default"])(FcrUIWaitingRoomControlManager, [{
-    key: "joinWaitingRoom",
-    value: function joinWaitingRoom() {
+    this._mainRoomControl = _mainRoomControl;
+    this._mainRoomControl.getUserControl().addObserver(this._mainRoomUserObserver);
+    var _isWaitingRoomManager = this._isWaitingRoomManager();
+    if (_isWaitingRoomManager) {
       this._createAndJoinWaitingRoom();
     }
-  }, {
-    key: "leaveWaitingRoom",
-    value: function leaveWaitingRoom() {
-      this._leaveWaitingRoom();
+  }
+  return (0, _createClass2["default"])(FcrUIWaitingRoomControlManager, [{
+    key: "_isWaitingRoomManager",
+    value: function _isWaitingRoomManager() {
+      var isWaitingRoomManager = this._mainRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
+      return isWaitingRoomManager;
     }
   }, {
     key: "_createAndJoinWaitingRoom",
@@ -203,6 +224,7 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
     value: function release() {
       if (this._waitingRoomControl) {
         this._leaveWaitingRoom();
+        this._mainRoomControl.getUserControl().removeObserver(this._mainRoomUserObserver);
         this._waitingRoomControl = null;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,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.5.0",
-    "agora-ui-foundation": "^3.5.0",
+    "agora-foundation": "^3.6.0",
+    "agora-ui-foundation": "^3.6.0",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "^3.5.0",
+    "fcr-core": "^3.6.0",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -59,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "^3.5.0",
+    "agora-toolchain": "^3.6.0",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",
@@ -71,4 +71,4 @@
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"
   }
-}
+}

package/public/index.html

@@ -3,24 +3,23 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Meeting</title>
+    <title></title>
     <style>
       #fcr-launch-failure-comp {
         width: 100vw;
         height: 100vh;
         background-color: rgba(144, 144, 144, 0.6);
         position: fixed;
-        z-index: 9999;
         top: 0px;
         left: 0px;
         display: flex;
         justify-content: center;
         align-items: center;
+        z-index: 9999;
       }
 
       .fcr-launch-failure-comp-modal {
-        width: 320px;
-        height: 374px;
+        width: 280px;
         background-color: rgba(255, 255, 255, 0.85);
         border-radius: 24px;
         display: flex;
@@ -28,12 +27,16 @@
         border: 1px solid #e3e7efff;
         display: flex;
         flex-direction: column;
+        padding: 0px 24px 24px 24px;
+        box-sizing: content-box;
       }
 
       .fcr-launch-failure-comp-banner {
         margin: 0 auto;
         width: 280px;
         align-self: flex-start;
+        position: absolute;
+        top: -12px;
       }
 
       .fcr-launch-failure-comp-info {
@@ -53,16 +56,22 @@
       }
 
       .fcr-confirm-btn {
-        width: 280px;
+        width: 100%;
         height: 36px;
         background-color: rgba(66, 98, 255, 1);
         color: #ffffff;
         text-align: center;
         line-height: 36px;
-        border-radius: 50px;
+        border-radius: 6px;
         margin: 0 auto;
         cursor: pointer;
       }
+      .fcr-launch-failure-comp-banner-box {
+        position: relative;
+        width: 100%;
+        height: 180px;
+        margin: 0 auto;
+      }
     </style>
   </head>
 
@@ -75,12 +84,16 @@
     <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" />
+        <div class="fcr-launch-failure-comp-banner-box">
+          <img class="fcr-launch-failure-comp-banner" src="assets/leave-meeting.png" />
+        </div>
         <div class="fcr-launch-failure-comp-info">
-          <div class="fcr-launch-failure-comp-h">
+          <!-- <div class="fcr-launch-failure-comp-h">
             <span id="fcr-launch-failure-comp-title"></span>
+          </div> -->
+          <div id="fcr-launch-failure-error-info" class="fcr-launch-failure-comp-desc">
+            Error: code=100050051, message=domain:RTE-CLIENT,info: failed to detect AP
           </div>
-          <div id="fcr-launch-failure-error-info" class="fcr-launch-failure-comp-desc"></div>
         </div>
         <div id="fcr-launch-failure-confirm-btn" class="fcr-confirm-btn">
           <span id="fcr-launch-failure-btn-text">I know</span>
@@ -118,6 +131,11 @@
       });
     }
 
+    function renderMeetingName(meetingName) {
+      if (meetingName.length <= 20) return meetingName;
+      return meetingName.slice(0, 20) + '...';
+    }
+
     window._transI18n = (key, replaceKeys) => {
       const currentLang = window.$$agora_language === 'zh' ? 'zh' : 'en';
       const langResource = window[`${currentLang}LangResource`];
@@ -157,85 +175,88 @@
         }
       }
     };
+
     (async () => {
-      setLoading(true);
-      document.querySelector('#fcr-launch-failure-confirm-btn').addEventListener('click', () => {
-        setFullScreenFailureComp(false);
-        window.runtime.quitApp();
-      });
-      const launchOptions = await window.runtime.getLaunchOptions();
-      let launchOptionsObj = launchOptions;
-      try {
-        launchOptionsObj = JSON.parse(launchOptions);
-      } catch (e) {
-        console.error('Failed to parse launch options', e);
-      }
-      const {
-        appId,
-        userId,
-        parameters,
-        cameraExpectedOff,
-        autoConnectAudio,
-        microphoneExpectedOff,
-        widgets,
-        ...others
-      } = launchOptionsObj;
-      const creator = new FcrUIScene.FcrUISceneCreator({
-        appId,
-        userId,
-        parameters,
-      });
-      const settingConfig = creator.getSettingConfig();
-      settingConfig.media = {
-        cameraExpectedOff,
-        autoConnectAudio,
-        microphoneExpectedOff,
+      let creator;
+      window.runtime.onCreatorInit = (config) => {
+        creator = new FcrUIScene.FcrUISceneCreator(config);
+      };
+
+      window.runtime.onSettingOpen = () => {
+        creator.openSetting();
       };
-      if (widgets && widgets instanceof Array) {
-        widgets.forEach((w) => {
-          creator.registerWidget(w);
+
+      window.runtime.onSettingClose = () => {
+        creator.closeSetting();
+      };
+
+      window.runtime.onSetParameters = (parameters) => {
+        creator.setParameters(parameters);
+      };
+
+      window.runtime.onLaunchMeeting = (launchOptions) => {
+        setFullScreenFailureComp(false);
+        setLoading(true);
+        document.querySelector('#fcr-launch-failure-confirm-btn').addEventListener('click', () => {
+          setFullScreenFailureComp(false);
+          window.runtime.browserWindow.hide();
         });
-      }
-      const uiScene = creator.launch(
-        others,
-        () => {
-          window.runtime.quitApp();
-        },
-        () => {},
-        () => {},
-        document.getElementById('root'),
-      );
-      uiScene.addObserver({
-        onLaunchSuccess: () => {
-          setLoading(false);
-          document.querySelector('title').innerText =
-            window.$$agora_language === 'zh'
-              ? '参会者ID:' + userId
-              : 'Meeting Participant ID:' + userId;
-        },
-        onLaunchFailure: (roomId, error) => {
-          const errorCode = Number(error.code);
-          let errorMessage = error.message;
-
-          if (errorCode === 732403100) {
-            errorMessage = window._transI18n('fmt_lock_error');
-          } else if (errorCode === 732403101) {
-            errorMessage = window._transI18n('fmt_pc_room_not_exist_error');
-          } else if (errorCode === 732403103) {
-            errorMessage = window._transI18n('fmt_host_leave_error');
-          } else if (errorCode === 720410100) {
-            errorMessage = window._transI18n('fmt_end_error');
-          } else {
-            errorMessage = `Error: code=${errorCode}, message=${errorMessage}`;
-          }
+        const { widgets, ...others } = launchOptions;
 
-          setFullScreenFailureComp(true, errorMessage);
-        },
+        if (widgets && widgets instanceof Array) {
+          widgets.forEach((w) => {
+            creator.registerWidget(w);
+          });
+        }
+        const uiScene = creator.launch(
+          others,
+          () => {
+            window.runtime.browserWindow.hide();
+          },
+          () => {},
+          () => {},
+          document.getElementById('root'),
+        );
 
-        onExited: (reason) => {
-          window.runtime.quitApp();
-        },
-      });
+        window.runtime.onCloseWindowBeforeLaunchSuccess = () => {
+          uiScene.exit();
+        };
+
+        uiScene.addObserver({
+          onLaunchSuccess: () => {
+            setLoading(false);
+            const roomName = uiScene._roomProvider._currentRoomControl.getRoomInfo().roomName || '';
+            // document.querySelector('title').innerText = renderMeetingName(roomName);
+            document.querySelector('title').innerText = roomName;
+            const roomId = uiScene._roomProvider._currentRoomControl.getRoomInfo().roomId || '';
+            window.runtime.launchSuccess(roomId);
+          },
+          onLaunchFailure: (roomId, error) => {
+            const errorCode = Number(error.code);
+            let errorMessage = error.message;
+
+            if (errorCode === 732403100 || errorCode === 631735290) {
+              errorMessage = window._transI18n('fmt_lock_error');
+            } else if (errorCode === 732403101) {
+              errorMessage = window._transI18n('fmt_pc_room_not_exist_error');
+            } else if (errorCode === 732403103) {
+              errorMessage = window._transI18n('fmt_host_leave_error');
+            } else if (errorCode === 720410100) {
+              errorMessage = window._transI18n('fmt_end_error');
+            } else {
+              errorMessage = `Error: code=${errorCode}, message=${errorMessage}`;
+            }
+
+            setFullScreenFailureComp(true, errorMessage);
+            window.runtime.launchFailure(roomId, errorCode);
+          },
+
+          onExited: (roomId, reason) => {
+            window.runtime.exitedMeeting(roomId, reason);
+            window.runtime.browserWindow.hide();
+          },
+        });
+      };
     })();
   </script>
 </html>

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

@@ -1,149 +0,0 @@
-import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
-import { FcrDeviceInfo } from 'fcr-core/lib/type';
-import { VirtualBackground } from '../modules/device-pretest/assets/virtual-backdound-resources';
-import { FcrUIResource } from '../type';
-import { FcrAiDenoiseLevel, FcrDesktopMediaControl } from 'fcr-core';
-import { FcrUIEventStore } from './event-store';
-export type BeautyKey = 'none' | 'smoothnessLevel' | 'lighteningLevel' | 'lighteningLevel';
-export interface FcrDeviceObserver {
-    onCameraChanged?(cameraId: string): void;
-    onMicrophoneChanged?(microphoneId: string): void;
-    onSpeakerChanged?(speakerId: string): void;
-    onCameraListUpdated?(cameraList: FcrDeviceInfo[]): void;
-    onMicrophoneListUpdated?(microphoneList: FcrDeviceInfo[]): void;
-    onSpeakerListUpdated?(speakerList: FcrDeviceInfo[]): void;
-}
-interface DeviceItem {
-    text: string;
-    value: string;
-}
-declare enum VideoEffectType {
-    NONE = 0,
-    BEAUTY = 1,
-    VIRTUAL_BACKGROUND = 2
-}
-export declare enum ConnectType {
-    NONE = 0,
-    COMPUTER = 1,
-    PHONE = 2
-}
-export declare class FcrDeviceStore {
-    private _mediaControl;
-    private _uiEventStore;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _observable;
-    private _listeners;
-    private _cameraVideoTrack?;
-    private _microphoneAudioTrack?;
-    private _localVideoViewSet;
-    private _videoRotation;
-    private _playAudioTimer?;
-    private _isForceEnableBeauty;
-    private _isForceEnableVirtualBackground;
-    private _lastEnableVideoEffectType;
-    private _microphoneObserver;
-    private _defaultMirror;
-    private _volumeIndicationInterval;
-    private _microponeInitCount;
-    private _speakerInitCount;
-    private accessor _microphoneDeviceId;
-    private accessor _speakerDeviceId;
-    accessor currentIsMirror: boolean;
-    accessor showForceOpenEffectDialog: boolean;
-    accessor cameraId: string;
-    accessor microphoneId: string;
-    accessor speakerId: string;
-    accessor cameraEnabled: boolean;
-    accessor showCameraPreview: boolean;
-    accessor microphoneEnabled: boolean;
-    accessor cameraList: FcrDeviceInfo[];
-    accessor microphoneList: FcrDeviceInfo[];
-    accessor microphoneVolumeLevel: number;
-    accessor speakerList: FcrDeviceInfo[];
-    accessor isLocalMirrorEnabled: boolean;
-    accessor isLocalEditBeautyOptions: boolean;
-    accessor speakerVolumeLevel: number;
-    accessor speakerVolume: number;
-    accessor microphoneVolume: number;
-    accessor currentVirtualBackgroundName: string;
-    accessor enableBeauty: boolean;
-    accessor currentBeautyKey: BeautyKey;
-    accessor beautyOptions: FcrBeautyOptions;
-    accessor virtualBackgroundList: VirtualBackground[];
-    accessor soundEffectList: Map<string, Record<string, string>>;
-    accessor microphoneDetecting: boolean;
-    accessor speakerDetecting: boolean;
-    accessor connectType: ConnectType;
-    accessor isAudioConnected: boolean;
-    accessor isMainRoomAudioOff: boolean;
-    get defaultMirror(): boolean;
-    get followSystemMicrophoneDevice(): boolean;
-    get followSystemSpeakerDevice(): boolean;
-    get cameraDeviceList(): DeviceItem[];
-    get microphoneDeviceList(): DeviceItem[];
-    get speakerDeviceList(): DeviceItem[];
-    get mediaControl(): FcrDesktopMediaControl;
-    get lastEnableVideoEffectType(): VideoEffectType;
-    set lastEnableVideoEffectType(type: VideoEffectType);
-    get currentDeviceId(): {
-        cameraDeviceId: string;
-        microphoneDeviceId: string;
-        speakerDeviceId: string;
-    };
-    constructor(_mediaControl: FcrDesktopMediaControl, _uiEventStore: FcrUIEventStore);
-    addObserver(observer: FcrDeviceObserver): void;
-    removeObserver(observer: FcrDeviceObserver): void;
-    startPlayLocalVideo(view: HTMLElement, isMirror?: boolean): void;
-    stopPlayLocalVideo(view: HTMLElement): void;
-    startSpeakerTest(): void;
-    stopSpeakerTest(): void;
-    setCurrentIsMirror(isMirror: boolean): void;
-    toggleLocalMirrorPreview(mirror: boolean): void;
-    setBeautyOptions(beautyOption: Partial<FcrBeautyOptions>): void;
-    handleCancelForceOpenVideoEffect(): void;
-    handleForceOpenVideoEffect(): void;
-    setVideoOrientation(): void;
-    setCameraEnabled(enable: boolean): void;
-    setMicrophoneEnabled(enable: boolean): void;
-    toggleLocalMirror(enable: boolean): void;
-    resetMirror(): void;
-    startMicrophoneTest(): void;
-    stopMicrophoneTest(): void;
-    enableVirtualBackground(enable: boolean, source?: VirtualBackground): void;
-    setEditBeautyKey(key: BeautyKey): void;
-    enableBeautyEffect(enable: boolean): void;
-    enableAudioHiFiMode(enable: boolean): void;
-    enableAudioEchoCancellation(enable: boolean): void;
-    enableAudioStereo(enable: boolean): void;
-    setNoiseLevel(level: FcrAiDenoiseLevel): void;
-    setCameraId(cameraId: string): void;
-    setSpeakerId(speakerId: string): Promise<void>;
-    setMicrophoneId(microphoneId: string): Promise<void>;
-    setSpeakerVolume: import("lodash").DebouncedFuncLeading<(value: number) => void>;
-    setMicrophoneVolume(value: number): void;
-    actionsBeforeJoin(): void;
-    startOrStopCamera(enable: boolean): void;
-    setShowCameraPreview(enable: boolean): void;
-    handleRealCameraEnabledChanged(realEnable: boolean): void;
-    handleCameraChanged(enabled: boolean): void;
-    downloadUiResources(uiResource?: FcrUIResource): Promise<void>;
-    release(): void;
-    joinAudioByComputer(): Promise<void>;
-    stopAudioByComputer(): void;
-    private _fileToUiData;
-    openFirstCamera(): void;
-    openFirstMicrophone(): void;
-    setConnectType(connectType: ConnectType): void;
-    private _fetchZipAndUnzip;
-    private _updateVirtualBackgroundList;
-    private _handleSpeakerTestVolumeIndicationUpdated;
-    private _handleSpeakerVolumeUpdated;
-    private _handleMicrophoneVolumeIndicationUpdated;
-    private _handleCameraChanged;
-    private _handleCameraListUpdated;
-    private _handleMicrophoneListUpdated;
-    private _handleSpeakerListUpdated;
-    setAudioConnected(enable: boolean): void;
-    setMainRoomAudioOff(enable: boolean): void;
-}
-export {};