fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/utilities/renderer.js

@@ -234,6 +234,12 @@ export var FcrUIRendererWrapper = /*#__PURE__*/function () {
       this._checkRuntime();
       cppSdkHelper.setInMeetingState(state);
     }
+  }, {
+    key: "setMainWindowDisplaySupport",
+    value: function setMainWindowDisplaySupport(isSupported) {
+      this._checkRuntime();
+      cppSdkHelper.setMainWindowDisplaySupport(isSupported);
+    }
   }, {
     key: "release",
     value: function release() {
@@ -424,7 +430,7 @@ export var FcrUIRendererWrapper = /*#__PURE__*/function () {
   }]);
 }();
 _FcrUIRendererWrapper = FcrUIRendererWrapper;
-var _applyDecs$e = _applyDecs(_FcrUIRendererWrapper, [[trace, 2, "addEventListener"], [trace, 2, "removeEventListener"], [trace, 2, "removeAllEventListener"], [trace, 2, "sendEvent"], [trace, 2, "openLinkInDefaultBrowser"], [trace, 2, "getMediaSourcesIdByTitle"], [trace, 2, "open"], [trace, 2, "close"], [trace, 2, "handleWillClose"], [trace, 2, "setInMeetingState"], [trace, 2, "release"], [trace, 2, "initialize"], [trace, 2, "restartApp"], [trace, 2, "quitApp"], [trace, 2, "getDisplayMatching"], [trace, 2, "setUserSettingData"], [trace, 2, "getUserSettingData"], [trace, 2, "getAllDisplays"], [trace, 2, "checkMediaPermission"], [trace, 2, "openSystemPreferences"], [trace, 2, "captureScreen"], [trace, 2, "getDisplayNearestPoint"], [trace, 2, "fileToBlob"], [trace, 2, "downloadAndExtractResourceFileFromZip"], [trace, 2, "downloadResourceFile"], [trace, 2, "loadBuiltinResources"], [trace, 2, "openDirectory"], [trace, 2, "showItemInFolder"], [trace, 2, "openRendererWindow"], [trace, 2, "getBaseUrl"], [trace, 2, "getWindowInfoList"], [trace, 2, "getNetworkType"], [trace, 2, "getSystemCpuInfo"], [trace, 2, "getSystemMemorySize"], [trace, 2, "setFragmentOptions"], [trace, 2, "getCurrentBrowserWindow"], [trace, 2, "createWindowProxy"], [trace, 2, "getBrowserWindowById"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIRendererWrapper, [[trace, 2, "addEventListener"], [trace, 2, "removeEventListener"], [trace, 2, "removeAllEventListener"], [trace, 2, "sendEvent"], [trace, 2, "openLinkInDefaultBrowser"], [trace, 2, "getMediaSourcesIdByTitle"], [trace, 2, "open"], [trace, 2, "close"], [trace, 2, "handleWillClose"], [trace, 2, "setInMeetingState"], [trace, 2, "setMainWindowDisplaySupport"], [trace, 2, "release"], [trace, 2, "initialize"], [trace, 2, "restartApp"], [trace, 2, "quitApp"], [trace, 2, "getDisplayMatching"], [trace, 2, "setUserSettingData"], [trace, 2, "getUserSettingData"], [trace, 2, "getAllDisplays"], [trace, 2, "checkMediaPermission"], [trace, 2, "openSystemPreferences"], [trace, 2, "captureScreen"], [trace, 2, "getDisplayNearestPoint"], [trace, 2, "fileToBlob"], [trace, 2, "downloadAndExtractResourceFileFromZip"], [trace, 2, "downloadResourceFile"], [trace, 2, "loadBuiltinResources"], [trace, 2, "openDirectory"], [trace, 2, "showItemInFolder"], [trace, 2, "openRendererWindow"], [trace, 2, "getBaseUrl"], [trace, 2, "getWindowInfoList"], [trace, 2, "getNetworkType"], [trace, 2, "getSystemCpuInfo"], [trace, 2, "getSystemMemorySize"], [trace, 2, "setFragmentOptions"], [trace, 2, "getCurrentBrowserWindow"], [trace, 2, "createWindowProxy"], [trace, 2, "getBrowserWindowById"]], []).e;
 var _applyDecs$e2 = _slicedToArray(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib-es/utilities/shared-storage.js

@@ -2,16 +2,16 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import "core-js/modules/es.date.to-json.js";
+import "core-js/modules/es.json.stringify.js";
+import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.for-each.js";
 import "core-js/modules/es.array.push.js";
-import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/es.object.define-properties.js";
 import "core-js/modules/es.object.define-property.js";
 import "core-js/modules/es.object.get-own-property-descriptor.js";
 import "core-js/modules/es.object.get-own-property-descriptors.js";
-import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
@@ -25,16 +25,7 @@ import "core-js/modules/web.dom-collections.for-each.js";
 var STORAGE_KEY_ANNOTATION_RTM_APP_ID = 'annotation_rtm_app_id';
 var STORAGE_KEY_ANNOTATION_BOARD_OPTIONS = 'annotation_board_options';
 var STORAGE_KEY_ANNOTATION_NICK_NAME = 'annotation_nickname';
-export var setAnnotationEngineState = function setAnnotationEngineState(state) {
-  localStorage.setItem('annotation_engine_state', JSON.stringify(state));
-};
-export var getAnnotationEngineState = function getAnnotationEngineState() {
-  var stateStr = localStorage.getItem('annotation_engine_state');
-  if (!stateStr) {
-    return 0;
-  }
-  return JSON.parse(stateStr);
-};
+var STORAGE_KEY_ANNOTATION_VIEWPORT_SIZE = 'annotation_viewport_size';
 export var setAnnotationRtmAppId = function setAnnotationRtmAppId(appId) {
   localStorage.setItem(STORAGE_KEY_ANNOTATION_RTM_APP_ID, appId);
 };
@@ -53,4 +44,17 @@ export var getBoardOptions = function getBoardOptions() {
     });
   }
   return undefined;
+};
+export var getAnnotationViewportSize = function getAnnotationViewportSize() {
+  var sizeStr = localStorage.getItem(STORAGE_KEY_ANNOTATION_VIEWPORT_SIZE);
+  if (sizeStr) {
+    return JSON.parse(sizeStr);
+  }
+  return {
+    width: 1920,
+    height: 1080
+  };
+};
+export var setAnnotationViewportSize = function setAnnotationViewportSize(size) {
+  localStorage.setItem(STORAGE_KEY_ANNOTATION_VIEWPORT_SIZE, JSON.stringify(size));
 };

package/lib-es/utilities/tools.js

@@ -1,128 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import "core-js/modules/es.array.concat.js";
-import "core-js/modules/es.array.reduce.js";
 import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.date.now.js";
-import "core-js/modules/es.number.constructor.js";
-import "core-js/modules/es.number.to-fixed.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.regexp.test.js";
-import "core-js/modules/es.string.ends-with.js";
-import "core-js/modules/es.string.match.js";
-import "core-js/modules/es.string.replace.js";
-import "core-js/modules/es.string.starts-with.js";
 import { AgoraScheduler } from 'agora-foundation/lib/schedule';
-import { getLogger } from 'agora-foundation/lib/logger';
-import { isWindows } from './platform';
-export var uint8ArrayToImageData = function uint8ArrayToImageData(target) {
-  var _target$buffer;
-  if (!target || !(target !== null && target !== void 0 && (_target$buffer = target.buffer) !== null && _target$buffer !== void 0 && _target$buffer.length)) {
-    return '';
-  }
-  var canvas = document.createElement('canvas');
-  var ctx = canvas.getContext('2d');
-  if (!ctx) return '';
-  var width = canvas.width = target.width;
-  var height = canvas.height = target.height;
-  var rowBytes = width * 4;
-  for (var row = 0; row < height; row++) {
-    var srow = row;
-    var imageData = ctx.createImageData(width, 1);
-    var start = srow * width * 4;
-    if (isWindows()) {
-      for (var i = 0; i < rowBytes; i += 4) {
-        imageData.data[i] = target.buffer[start + i + 2];
-        imageData.data[i + 1] = target.buffer[start + i + 1];
-        imageData.data[i + 2] = target.buffer[start + i];
-        imageData.data[i + 3] = target.buffer[start + i + 3];
-      }
-    } else {
-      for (var _i = 0; _i < rowBytes; ++_i) {
-        imageData.data[_i] = target.buffer[start + _i];
-      }
-    }
-    ctx.putImageData(imageData, 0, row);
-  }
-  return canvas.toDataURL('image/png');
-};
-var LocalStorage = /*#__PURE__*/function () {
-  function LocalStorage() {
-    _classCallCheck(this, LocalStorage);
-  }
-  return _createClass(LocalStorage, [{
-    key: "set",
-    value: function set(key, value) {
-      localStorage.setItem(key, value);
-    }
-  }, {
-    key: "get",
-    value: function get(key) {
-      return localStorage.getItem(key);
-    }
-  }, {
-    key: "remove",
-    value: function remove(key) {
-      localStorage.removeItem(key);
-    }
-  }, {
-    key: "clear",
-    value: function clear() {
-      localStorage.clear();
-    }
-  }]);
-}();
-export var storage = new LocalStorage();
-export var ASIDE_WIDTH = 'aside_width';
-export var PARTICIPANT_POSITION = 'participant_position';
-export var convertToFixedNumber = function convertToFixedNumber(value) {
-  var divisor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100;
-  var fractionDigits = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
-  return Number((value / divisor).toFixed(fractionDigits));
-};
-var virtualSoundCardPatternList = [/BlackHole/i, /SoundFlower/i, /AgoraALD/i];
-export var matchVirtualSoundCardPattern = function matchVirtualSoundCardPattern(deviceName) {
-  return virtualSoundCardPatternList.reduce(function (prev, pattern) {
-    pattern.test(deviceName) && (prev = true);
-    return prev;
-  }, false);
-};
-export var isZipUrl = function isZipUrl(url) {
-  if (!url || typeof url !== 'string') return false;
-  var regex = /^https?:\/\/.+\.(zip)(\?.*)?$/i;
-  return regex.test(url);
-};
-export var isMp3OrWavUrl = function isMp3OrWavUrl(url) {
-  if (!url || typeof url !== 'string') return false;
-  var regex = /^https?:\/\/.+\.(mp3|wav)(\?.*)?$/i;
-  return regex.test(url);
-};
-export var isPngOrJpg = function isPngOrJpg(path) {
-  if (!path || typeof path !== 'string') return false;
-  return path.endsWith('.png') || path.endsWith('.jpg');
-};
-export var isMp4 = function isMp4(path) {
-  if (!path || typeof path !== 'string') return false;
-  return path.endsWith('.mp4');
-};
-export var isMp3OrWav = function isMp3OrWav(path) {
-  if (!path || typeof path !== 'string') return false;
-  return path.endsWith('.mp3') || path.endsWith('.wav');
-};
-export function getFileNameWithoutExtension(filePath) {
-  var match = filePath.match(/([^\\/]+)(?=\.\w+$)/);
-  return match ? match[1] : '';
-}
-export var setLanguage = function setLanguage(language) {
-  storage.set('$$fcr_language', language);
-};
-export var getLanguage = function getLanguage() {
-  return storage.get('$$fcr_language');
-};
+import { getLogger } from './logger';
+export { renderMeetingId, uint8ArrayToImageData, getLanguage, convertToFixedNumber } from 'agora-foundation/lib/utilities/tools';
 export var waitUntil = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(prediction, memo) {
     var intervalMs,
@@ -178,75 +63,4 @@ export var waitUntil = /*#__PURE__*/function () {
 export var renderMeetingName = function renderMeetingName(meetingName) {
   if (meetingName.length <= 20) return meetingName;
   return meetingName.slice(0, 20) + '...';
-};
-export var renderMeetingId = function renderMeetingId(meetingId, roomId) {
-  var renderMeetingId = '';
-  if (meetingId) {
-    // 检查meetingId是否为纯数字
-    var isNumeric = /^\d+$/.test(meetingId);
-    if (!isNumeric) {
-      renderMeetingId = meetingId;
-    } else {
-      renderMeetingId = meetingId.replace(/(.{3})/g, '$1 ');
-    }
-  } else {
-    if (roomId.endsWith('-waiting')) {
-      renderMeetingId = roomId.slice(0, -8).replace(/(.{3})/g, '$1 ');
-    } else {
-      renderMeetingId = roomId.replace(/(.{3})/g, '$1 ');
-    }
-  }
-  return renderMeetingId;
-};
-export function calcAnnotationAreaSize(
-/**
- * @param boardView {HTMLElement} 白板容器的 dom
- */
-boardView,
-/**
- * @param width {number} 分享容器的宽度
- */
-width,
-/**
- * @param height {number} 分享容器的高度
- */
-height) {
-  var isProvider = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  var logger = getLogger();
-  /**
-   * 如果宽大于高, 则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
-   * 用新的高度计算宽高比为 16:9 的比例下的宽度是否大于原宽度，如果大于等于原宽度，则把 boardView 的高度设置为当前高度
-   * 以新的高度计算出宽高比为 16:9 的宽度，设置为当前宽度
-   * 否则，把 boardView 的宽度设置为100vw，并重新获取 boardView 的最新宽度，用新的宽度计算宽高比为 16:9 的高度
-   * 并分别设置 boardView 的高度和宽度
-   * 如果宽小于高，则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
-   * 用新的高度计算宽高比为 16:9 的比例下宽度是否大于宽度，如果大于等于宽度，则把 boardView 的尺寸设置为当前宽度和高度
-   * */
-  if (width > height) {
-    boardView.style.height = isProvider ? "100vh" : "".concat(boardView.getBoundingClientRect().height, "px");
-    var newHeight = boardView.offsetHeight;
-    var ratioWidth = newHeight / 9 * 16;
-    if (ratioWidth >= width) {
-      boardView.style.width = "".concat(ratioWidth, "px");
-      boardView.style.height = "".concat(newHeight, "px");
-    } else {
-      boardView.style.width = isProvider ? "100vw" : "".concat(width, "px");
-      var newWidth = boardView.offsetWidth;
-      boardView.style.width = "".concat(newWidth, "px");
-      boardView.style.height = "".concat(newWidth / 16 * 9, "px");
-    }
-  } else {
-    boardView.style.height = isProvider ? "100vh" : "".concat(boardView.getBoundingClientRect().height, "px");
-    var _newHeight = boardView.offsetHeight;
-    boardView.style.width = "".concat(_newHeight / 9 * 16, "px");
-    boardView.style.height = "".concat(_newHeight, "px");
-  }
-  logger.info('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
-}
-export var getBrowserLanguage = function getBrowserLanguage() {
-  var usrlang = navigator.language;
-  if (usrlang.startsWith('zh')) {
-    return 'zh';
-  }
-  return 'en';
 };

package/lib-es/utilities/validate-params.js

@@ -1,9 +1,7 @@
-import "core-js/modules/es.error.cause.js";
-import "core-js/modules/es.error.to-string.js";
-import { generateFcrCoreClientError, FcrErrorCode } from 'fcr-core/lib/utilities/error';
 import { validateParams } from 'agora-foundation/lib/decorator';
+import { DetailErrorCode, ErrorServiceType, ErrorModuleCode } from 'agora-foundation/lib/utilities/error/error-code';
+import { AgoraError } from 'agora-foundation/lib/utilities/error/agora-error';
 export default validateParams(function (error) {
   var message = "invalid params: ".concat(error.message);
-  var fcrErrorModuleCode = '00';
-  generateFcrCoreClientError(fcrErrorModuleCode, FcrErrorCode.INVALID_PARAMS, message, new Error(message));
+  return AgoraError.create(ErrorServiceType.FCR_UI_SCENE, ErrorModuleCode.FCR_UI_SCENE_CREATOR, DetailErrorCode.INVALID_PARAMS, message);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.8.2",
+  "version": "3.9.0-alpha",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -30,15 +30,15 @@
     "@electron/remote": "2.0.1",
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-electron-sdk": "4.3.2-build.163-rc.3",
-    "agora-foundation": "3.8.2",
-    "agora-ui-foundation": "3.8.2",
+    "agora-electron-sdk": "4.3.2-build.167-rc.2",
+    "agora-foundation": "3.9.0-alpha",
+    "agora-ui-foundation": "3.9.0-alpha",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "3.8.2",
-    "fcr-ui-widget-sdk": "3.8.0",
+    "fcr-core": "3.9.0-alpha",
+    "fcr-ui-widget-sdk": "3.9.0-alpha",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -50,7 +50,6 @@
     "react-dom": "^17.0.2",
     "react-error-boundary": "^5.0.0",
     "react-rnd": "^10.4.1",
-    "react-use-measure": "^2.1.1",
     "react-virtualized": "^9.22.5",
     "tinycolor2": "^1.6.0",
     "winston": "^3.16.0",
@@ -70,7 +69,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "3.8.2",
+    "agora-toolchain": "3.9.0-alpha",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/js/meeting-manager.js

@@ -154,15 +154,7 @@ class MeetingManager {
       others,
       async () => {
         this.logInfo('UI scene closed callback');
-        const currentBrowserWindow = window.runtime.getCurrentBrowserWindow();
-        if(currentBrowserWindow.isFullScreen()) {
-          currentBrowserWindow.setFullScreen(false);
-          await new Promise(resolve => setTimeout(resolve, 500));
-        }
-        
-        if (currentBrowserWindow) {
-          currentBrowserWindow.hide();
-        }
+        this.hideBrowserWindow();
       },
       () => { }, // 空回调
       () => { }, // 空回调
@@ -183,6 +175,16 @@ class MeetingManager {
     });
   }
 
+
+  async hideBrowserWindow() {
+    this.logInfo('hideBrowserWindow and leave full screen');
+    const currentBrowserWindow = window.runtime.getCurrentBrowserWindow();
+    if(currentBrowserWindow.isFullScreen()) {
+      currentBrowserWindow.setFullScreen(false);
+      await new Promise(resolve => setTimeout(resolve, 1000));
+    }
+    currentBrowserWindow.hide();
+  }
   /**
    * 处理启动成功
    */
@@ -266,7 +268,7 @@ class MeetingManager {
 
     setTimeout(() => {
       this.logInfo('UI scene exited callback');
-      window.runtime.getCurrentBrowserWindow().hide();
+      this.hideBrowserWindow();
     });
   }
 
@@ -306,7 +308,7 @@ class MeetingManager {
   handleConfirmClick() {
     this.setFullScreenFailureComp(false);
     this.logInfo('Error confirmation button clicked');
-    window.runtime.getCurrentBrowserWindow().hide();
+    this.hideBrowserWindow();
   }
 
   /**