fcr-ui-scene 3.3.0 → 3.4.0

package/lib/utilities/renderer.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setInMeetingState = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.handleWillClose = exports.getCurrentWorkArea = exports.close = void 0;
+exports.setInMeetingState = exports.restartApp = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.handleWillClose = exports.getCurrentSharingWorkArea = exports.close = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.index-of.js");
@@ -23,7 +23,7 @@ var close = exports.close = function close(path) {
 var isWindows = exports.isWindows = function isWindows() {
   return navigator.userAgent.indexOf('Windows') > -1;
 };
-var getCurrentWorkArea = exports.getCurrentWorkArea = function getCurrentWorkArea(currentShareId, currentShareType, allApplicationWindows) {
+var getCurrentSharingWorkArea = exports.getCurrentSharingWorkArea = function getCurrentSharingWorkArea(currentShareId, currentShareType, allApplicationWindows) {
   var displays = window.runtime.screen.getAllDisplays();
   var bounds = {
     x: 0,
@@ -33,7 +33,7 @@ var getCurrentWorkArea = exports.getCurrentWorkArea = function getCurrentWorkAre
     displayId: 1,
     availTop: 0
   };
-  if (currentShareType === _type.AgoraRtcScreenCaptureType.DISPLAY) {
+  if (currentShareType === _type.AgoraRtcScreenCaptureType.SCREEN) {
     var display;
     if (isWindows()) {
       display = displays.find(function (display, index) {
@@ -115,4 +115,7 @@ var releaseSubAllWindowRefs = exports.releaseSubAllWindowRefs = function release
 };
 var setInMeetingState = exports.setInMeetingState = function setInMeetingState(state) {
   window.runtime.setInMeetingState(state);
+};
+var restartApp = exports.restartApp = function restartApp() {
+  window.runtime.restartApp();
 };

package/lib/utilities/screen-capture-permission.d.ts

@@ -0,0 +1 @@
+export declare const hasScreenCapturePermission: () => boolean;

package/lib/utilities/screen-capture-permission.js

@@ -0,0 +1,16 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasScreenCapturePermission = void 0;
+var _env = require("agora-foundation/lib/utilities/env");
+var hasScreenCapturePermission = exports.hasScreenCapturePermission = function hasScreenCapturePermission() {
+  if ((0, _env.isElectron)()) {
+    var _window$require = window.require('@electron/remote'),
+      systemPreferences = _window$require.systemPreferences;
+    return systemPreferences.getMediaAccessStatus('screen') === 'granted';
+  }
+  return true;
+};

package/lib/utilities/screen.js

@@ -5,37 +5,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isFullScreen = exports.exitFullScreen = exports.enterFullScreen = void 0;
+var _env = require("agora-foundation/lib/utilities/env");
 var isFullScreen = exports.isFullScreen = function isFullScreen() {
-  return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement);
+  return !!(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement || (0, _env.isElectron)() && window.runtime.browserWindow.isFullScreen());
 };
 var enterFullScreen = exports.enterFullScreen = function enterFullScreen() {
   if (isFullScreen()) return;
   var elem = document.documentElement;
-  if (elem.requestFullscreen) {
-    elem.requestFullscreen();
-  } else if (elem.mozRequestFullScreen) {
-    /* Firefox */
-    elem.mozRequestFullScreen();
-  } else if (elem.webkitRequestFullscreen) {
-    /* Chrome, Safari and Opera */
-    elem.webkitRequestFullscreen();
-  } else if (elem.msRequestFullscreen) {
-    /* IE/Edge */
-    elem.msRequestFullscreen();
+  if ((0, _env.isElectron)()) {
+    window.runtime.browserWindow.setFullScreen(true);
+  } else {
+    if (elem.requestFullscreen) {
+      elem.requestFullscreen();
+    } else if (elem.mozRequestFullScreen) {
+      /* Firefox */
+      elem.mozRequestFullScreen();
+    } else if (elem.webkitRequestFullscreen) {
+      /* Chrome, Safari and Opera */
+      elem.webkitRequestFullscreen();
+    } else if (elem.msRequestFullscreen) {
+      /* IE/Edge */
+      elem.msRequestFullscreen();
+    }
   }
 };
 var exitFullScreen = exports.exitFullScreen = function exitFullScreen() {
   if (!isFullScreen()) return;
-  if (document.exitFullscreen) {
-    document.exitFullscreen();
-  } else if (document.mozCancelFullScreen) {
-    /* Firefox */
-    document.mozCancelFullScreen();
-  } else if (document.webkitExitFullscreen) {
-    /* Chrome, Safari and Opera */
-    document.webkitExitFullscreen();
-  } else if (document.msExitFullscreen) {
-    /* IE/Edge */
-    document.msExitFullscreen();
+  if ((0, _env.isElectron)()) {
+    window.runtime.browserWindow.setFullScreen(false);
+  } else {
+    if (document.exitFullscreen) {
+      document.exitFullscreen();
+    } else if (document.mozCancelFullScreen) {
+      /* Firefox */
+      document.mozCancelFullScreen();
+    } else if (document.webkitExitFullscreen) {
+      /* Chrome, Safari and Opera */
+      document.webkitExitFullscreen();
+    } else if (document.msExitFullscreen) {
+      /* IE/Edge */
+      document.msExitFullscreen();
+    }
   }
 };

package/lib/utilities/tools.d.ts

@@ -1,3 +1,4 @@
+import { Bounds } from 'electron-screenshots';
 export declare const uint8ArrayToImageData: (target: {
     buffer?: Uint8Array;
     width?: number;
@@ -18,8 +19,16 @@ export declare const matchVirtualSoundCardPattern: (deviceName: string) => boole
 export declare const isResourceZipUrl: (url: string) => boolean;
 export declare const isPngOrJpg: (path: string) => boolean;
 export declare const isMp4: (path: string) => boolean;
+export declare const isMp3OrWav: (path: string) => boolean;
 export declare function getFileNameWithoutExtension(filePath: string): string;
 export declare const setLanguage: (language: string) => void;
 export declare const getLanguage: () => string | null;
-export declare const waitUntil: (prediction: () => boolean | Promise<boolean>, memo?: string, intervalMs?: number) => Promise<void>;
+export declare const waitUntil: (prediction: () => boolean | Promise<boolean>, memo?: string, intervalMs?: number, timeout?: number) => Promise<void>;
+export declare const renderMeetingId: (meetingId: string | undefined, roomId: string) => string;
+export declare function handleCheckMouseOver(params: {
+    elem: HTMLDivElement;
+    browserWindow: Electron.BrowserWindow;
+    screenBounds: Bounds;
+    callback?: (timerId: NodeJS.Timeout) => void;
+}): NodeJS.Timeout;
 export {};

package/lib/utilities/tools.js

@@ -7,10 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getAssetUrl = exports.convertToFixedNumber = exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
 exports.getFileNameWithoutExtension = getFileNameWithoutExtension;
-exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.matchVirtualSoundCardPattern = exports.isResourceZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.getLanguage = void 0;
+exports.getLanguage = void 0;
+exports.handleCheckMouseOver = handleCheckMouseOver;
+exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.renderMeetingId = exports.matchVirtualSoundCardPattern = exports.isResourceZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.isMp3OrWav = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.reduce.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.date.now.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.object.to-string.js");
@@ -19,9 +23,11 @@ require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.match.js");
+require("core-js/modules/es.string.replace.js");
 require("core-js/modules/esnext.async-iterator.reduce.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.reduce.js");
+require("core-js/modules/web.timers.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"));
@@ -116,6 +122,10 @@ var isMp4 = exports.isMp4 = function isMp4(path) {
   if (!path || typeof path !== 'string') return false;
   return path.endsWith('.mp4');
 };
+var isMp3OrWav = exports.isMp3OrWav = function isMp3OrWav(path) {
+  if (!path || typeof path !== 'string') return false;
+  return path.endsWith('.mp3') || path.endsWith('.wav');
+};
 function getFileNameWithoutExtension(filePath) {
   var match = filePath.match(/([^\\/]+)(?=\.\w+$)/);
   return match ? match[1] : '';
@@ -129,33 +139,46 @@ var getLanguage = exports.getLanguage = function getLanguage() {
 var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(prediction, memo) {
     var intervalMs,
+      timeout,
       logger,
+      startTs,
       _args2 = arguments;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           intervalMs = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : 100;
+          timeout = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : 3000;
           logger = (0, _logger.getLogger)();
+          startTs = Date.now();
           return _context2.abrupt("return", new Promise(function (resolve) {
             var task = _schedule.AgoraScheduler.shared.addPollingTask(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
               var isTrue;
               return _regenerator["default"].wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
+                    if (!(Date.now() - startTs > timeout)) {
+                      _context.next = 5;
+                      break;
+                    }
+                    logger.warn("[wait-until] predict ".concat(memo, ": timeout"));
+                    task.stop();
+                    resolve();
+                    return _context.abrupt("return");
+                  case 5:
                     isTrue = prediction();
                     logger.info("[wait-until] predict ".concat(memo, ": ").concat(isTrue));
                     if (isTrue) {
                       task.stop();
                       resolve();
                     }
-                  case 3:
+                  case 8:
                   case "end":
                     return _context.stop();
                 }
               }, _callee);
             })), intervalMs, false);
           }));
-        case 3:
+        case 5:
         case "end":
           return _context2.stop();
       }
@@ -164,4 +187,46 @@ var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
   return function waitUntil(_x, _x2) {
     return _ref.apply(this, arguments);
   };
-}();
+}();
+var renderMeetingId = exports.renderMeetingId = function renderMeetingId(meetingId, roomId) {
+  var renderMeetingId = '';
+  if (meetingId) {
+    renderMeetingId = meetingId;
+  } else {
+    if (roomId.endsWith('-waiting')) {
+      renderMeetingId = roomId.slice(0, -8).replace(/(.{3})/g, '$1 ');
+    } else {
+      renderMeetingId = roomId.replace(/(.{3})/g, '$1 ');
+    }
+  }
+  return renderMeetingId;
+};
+// 修复 windows 无法响应 hover 的问题
+function handleCheckMouseOver(params) {
+  var elem = params.elem,
+    browserWindow = params.browserWindow,
+    screenBounds = params.screenBounds,
+    callback = params.callback;
+  browserWindow.focus();
+  browserWindow.setIgnoreMouseEvents(true);
+  var timerId = setInterval(function () {
+    var _window$runtime$scree = window.runtime.screen.getCursorScreenPoint(),
+      x = _window$runtime$scree.x,
+      y = _window$runtime$scree.y;
+    var offsetWidth = elem.offsetWidth,
+      offsetHeight = elem.offsetHeight;
+    var _elem$getBoundingClie = elem.getBoundingClientRect(),
+      left = _elem$getBoundingClie.left,
+      top = _elem$getBoundingClie.top;
+    var sx = screenBounds.x,
+      sy = screenBounds.y;
+    if (x > left + sx && x < left + offsetWidth + sx && y > 0 + sy && y < offsetHeight + top + sy) {
+      browserWindow.setIgnoreMouseEvents(false);
+      if (!browserWindow.isFocused()) {
+        browserWindow.focus();
+      }
+    }
+  }, 50);
+  callback === null || callback === void 0 || callback(timerId);
+  return timerId;
+}

package/lib/utilities/ui-resources.d.ts

@@ -1,2 +1,3 @@
 export declare const BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST: string[];
 export declare const BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST: string[];
+export declare const BUILTIN_SOUND_EFFECT_URL_LIST: string[];

package/lib/utilities/ui-resources.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = void 0;
+exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = void 0;
 var BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = [
 // electron zip
 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip'
@@ -23,4 +23,7 @@ var BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROU
 // browser png
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default8.mp4',
 // 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default9.mp4',
-];
+];
+var BUILTIN_SOUND_EFFECT_URL_LIST = exports.BUILTIN_SOUND_EFFECT_URL_LIST = ['https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/sound_effect_audios.zip',
+// browser mp3
+'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/remote_user_joined.mp3', 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/speaker_test.mp3', 'https://solutions-apaas.agora.io/fcr-ui-scene/audio/common/recording_started.mp3'];

package/lib/utilities/video-track-render-context.d.ts

@@ -1,7 +1,7 @@
 import { FcrDeviceStore } from '../common/device-store';
-import { FcrStreamControl } from 'agora-edu-core';
+import { FcrRemoteVideoRenderManager } from '../common/remote-renderer';
 export interface FcrVideoTrackRenderer {
     deviceStore?: FcrDeviceStore;
-    streamControl?: FcrStreamControl;
+    remoteVideoRenderManager?: FcrRemoteVideoRenderManager;
 }
 export declare const FcrVideoTrackRenderContext: import("react").Context<FcrVideoTrackRenderer>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -20,7 +20,7 @@
     "@electron/remote": "2.0.1",
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-electron-sdk": "4.3.2-build.90-rc.1",
+    "agora-electron-sdk": "4.3.2-build.11-rc.1",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
@@ -40,9 +40,9 @@
     "systeminformation": "^5.22.11",
     "jszip": "^3.10.1",
     "winston": "^3.16.0",
-    "agora-foundation": "^3.3.0",
-    "agora-ui-foundation": "^3.3.0",
-    "agora-edu-core": "^3.3.0"
+    "agora-foundation": "^3.4.0",
+    "agora-ui-foundation": "^3.4.0",
+    "fcr-core": "^3.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
@@ -58,13 +58,13 @@
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
     "core-js": "^3.33.3",
-    "electron": "24.8.8",
+    "electron": "22.3.27",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
     "react-hot-loader": "^4.13.1",
     "tslib": "^2.6.2",
-    "agora-toolchain": "^3.3.0"
+    "agora-toolchain": "^3.4.0"
   },
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"

package/public/index.html

@@ -3,14 +3,31 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>Meeting</title>
   </head>
 
-  <body>
+  <body style="background: rgb(251, 252, 255)">
+    <div
+      style="display: flex; align-items: center; justify-content: center; height: 100vh"
+      id="launch-loading">
+      <img src="assets/loading.gif" alt="loading" width="128" height="128" />
+    </div>
     <div id="root"></div>
   </body>
   <script>
+    const setLoading = (visible) => {
+      const dom = document.querySelector('#launch-loading');
+      if (dom) {
+        if (visible) {
+          dom.style.display = 'flex';
+        } else {
+          dom.style.display = 'none';
+        }
+      }
+    };
+
     (async () => {
+      setLoading(true);
       const launchOptions = await window.runtime.getLaunchOptions();
       let launchOptionsObj = launchOptions;
       try {
@@ -18,23 +35,50 @@
       } catch (e) {
         console.error('Failed to parse launch options', e);
       }
-      const { appId, userId, parameters, ...others } = launchOptionsObj;
-      const uiScene = new FcrUIScene.FcrUISceneCreator({
+      const {
+        appId,
+        userId,
+        parameters,
+        cameraExpectedOff,
+        autoConnectAudio,
+        microphoneExpectedOff,
+        ...others
+      } = launchOptionsObj;
+      const creator = new FcrUIScene.FcrUISceneCreator({
         appId,
         userId,
         parameters,
-      }).launch(
+      });
+      const settingConfig = creator.getSettingConfig();
+      settingConfig.media = {
+        cameraExpectedOff,
+        autoConnectAudio,
+        microphoneExpectedOff,
+      };
+      const uiScene = creator.launch(
         others,
         () => {
           window.runtime.quitApp();
         },
-        () => {},
+        () => {
+          document.querySelector('title').innerText =
+            window.$$agora_language === 'zh'
+              ? '参会者ID:' + userId
+              : 'Meeting Participant ID:' + userId;
+        },
         () => {
           window.runtime.quitApp();
         },
         document.getElementById('root'),
       );
       uiScene.addObserver({
+        onLaunchSuccess: () => {
+          setLoading(false);
+        },
+        onLaunchFailure: () => {
+          setLoading(false);
+          window.runtime.quitApp();
+        },
         onExited: (reason) => {
           window.runtime.quitApp();
         },