fcr-ui-scene 3.4.1 → 3.4.3

package/lib/utilities/meeting-detail.js

@@ -0,0 +1,39 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateMeetingDuration = exports.generateMeetingDetail = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.replace.js");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var generateMeetingDetail = exports.generateMeetingDetail = function generateMeetingDetail(userName, roomName, invitationTime, shareLink, displayMeetingId, password) {
+  return "\n".concat((0, _i18n.transI18n)('fmt_link_invitation', {
+    reason1: userName
+  }), "\n").concat((0, _i18n.transI18n)('fmt_link_invitation_topic', {
+    reason1: roomName
+  }), "\n").concat((0, _i18n.transI18n)('fmt_link_invitation_time', {
+    reason1: invitationTime
+  }), "\n").concat((0, _i18n.transI18n)('fmt_link_invitation_link', {
+    reason1: shareLink
+  }), "\n").concat((0, _i18n.transI18n)('fmt_link_invitation_id', {
+    reason1: displayMeetingId
+  }), "\n").concat(!!password ? (0, _i18n.transI18n)('fmt_link_invitation_password', {
+    reason1: password
+  }) : '').replace(/^\s*\n/gm, '');
+};
+var generateMeetingDuration = exports.generateMeetingDuration = function generateMeetingDuration(startTime, duration) {
+  var durationStamp = duration || 86400000;
+  var startDate = (0, _dayjs["default"])(startTime).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');
+  } else {
+    endDate = (0, _dayjs["default"])(startTime + durationStamp).format('HH:mm');
+  }
+  return "".concat(startDate, " - ").concat(endDate);
+};

package/lib/utilities/privilege.d.ts

@@ -0,0 +1,4 @@
+import { FcrPermissionAction, FcrPrivilegeUserRole } from 'fcr-core';
+import { FcrPermissionInfo } from 'fcr-core/lib/room-control/privilege-control/type';
+export declare const hasPermissionWithTargetRoleEnabled: (permissionInfos: FcrPermissionInfo[], action: FcrPermissionAction, targetRole: FcrPrivilegeUserRole) => boolean;
+export declare const isPermissionWithTargetRoleEnabled: (permissionInfo: FcrPermissionInfo, targetRole: FcrPrivilegeUserRole) => boolean;

package/lib/utilities/privilege.js

@@ -0,0 +1,29 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isPermissionWithTargetRoleEnabled = exports.hasPermissionWithTargetRoleEnabled = void 0;
+require("core-js/modules/es.array.find.js");
+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.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.some.js");
+var hasPermissionWithTargetRoleEnabled = exports.hasPermissionWithTargetRoleEnabled = function hasPermissionWithTargetRoleEnabled(permissionInfos, action, targetRole) {
+  var info = permissionInfos.find(function (permissionInfo) {
+    var _permissionInfo$info;
+    return ((_permissionInfo$info = permissionInfo.info) === null || _permissionInfo$info === void 0 ? void 0 : _permissionInfo$info.action) === action && isPermissionWithTargetRoleEnabled(permissionInfo, targetRole);
+  });
+  return !!info;
+};
+var isPermissionWithTargetRoleEnabled = exports.isPermissionWithTargetRoleEnabled = function isPermissionWithTargetRoleEnabled(permissionInfo, targetRole) {
+  var _permissionInfo$info2;
+  return !!((((_permissionInfo$info2 = permissionInfo.info) === null || _permissionInfo$info2 === void 0 || (_permissionInfo$info2 = _permissionInfo$info2.targetRoles) === null || _permissionInfo$info2 === void 0 ? void 0 : _permissionInfo$info2.length) === 0 || [targetRole].some(function (role) {
+    var _permissionInfo$info3;
+    return (_permissionInfo$info3 = permissionInfo.info) === null || _permissionInfo$info3 === void 0 || (_permissionInfo$info3 = _permissionInfo$info3.targetRoles) === null || _permissionInfo$info3 === void 0 ? void 0 : _permissionInfo$info3.includes(role);
+  })) && permissionInfo.enable);
+};

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.d.ts

@@ -0,0 +1,12 @@
+import { FcrUIMediaConfig, FcrUISettingConfig } from '../type';
+export declare const settingConfigStorageKey = "fcr-ui-setting-config";
+export declare class FcrSettingConfigStorage implements FcrUISettingConfig {
+    private _isElectron;
+    private _settingConfig;
+    constructor();
+    get media(): FcrUIMediaConfig;
+    set media(media: FcrUIMediaConfig);
+    private _initSettingConfig;
+    private _setSettingConfig;
+    private _createMediaProxy;
+}

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

@@ -0,0 +1,100 @@
+"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.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.settingConfigStorageKey = exports.FcrSettingConfigStorage = void 0;
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.json.parse.js");
+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 _env = require("agora-foundation/lib/utilities/env");
+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 settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
+var FcrSettingConfigStorage = exports.FcrSettingConfigStorage = /*#__PURE__*/function () {
+  function FcrSettingConfigStorage() {
+    (0, _classCallCheck2["default"])(this, FcrSettingConfigStorage);
+    (0, _defineProperty2["default"])(this, "_isElectron", false);
+    (0, _defineProperty2["default"])(this, "_settingConfig", {
+      media: {
+        autoConnectAudio: true,
+        microphoneExpectedOff: true,
+        cameraExpectedOff: true
+      }
+    });
+    this._isElectron = (0, _env.isElectron)();
+    this._initSettingConfig();
+  }
+  return (0, _createClass2["default"])(FcrSettingConfigStorage, [{
+    key: "media",
+    get: function get() {
+      return this._settingConfig.media;
+    },
+    set: function set(media) {
+      this._settingConfig.media = this._createMediaProxy(media);
+      this._setSettingConfig(this._settingConfig);
+    }
+  }, {
+    key: "_initSettingConfig",
+    value: function _initSettingConfig() {
+      if (this._isElectron) {
+        var settingConfig = window.runtime.getUserSettingData();
+        if (Object.keys(settingConfig).length === 0) {
+          window.runtime.setUserSettingData(this._settingConfig);
+        } else {
+          this._settingConfig = settingConfig;
+        }
+      } else {
+        var _settingConfig = localStorage.getItem(settingConfigStorageKey);
+        if (!_settingConfig) return;
+        try {
+          this._settingConfig = JSON.parse(_settingConfig);
+        } catch (e) {
+          localStorage.setItem(settingConfigStorageKey, JSON.stringify(this._settingConfig));
+        }
+      }
+      this._settingConfig.media = this._createMediaProxy(this._settingConfig.media);
+    }
+  }, {
+    key: "_setSettingConfig",
+    value: function _setSettingConfig(settingConfig) {
+      this._settingConfig = settingConfig;
+      if (this._isElectron) {
+        window.runtime.setUserSettingData(settingConfig);
+      } else {
+        localStorage.setItem(settingConfigStorageKey, JSON.stringify(settingConfig));
+      }
+    }
+  }, {
+    key: "_createMediaProxy",
+    value: function _createMediaProxy(media) {
+      var _this = this;
+      var handler = {
+        set: function set(target, property, value) {
+          target[property] = value;
+          _this._setSettingConfig(_objectSpread({}, _this._settingConfig));
+          return true;
+        }
+      };
+      return new Proxy(media, handler);
+    }
+  }]);
+}();

package/lib/utilities/tools.d.ts

@@ -1,4 +1,6 @@
-import { Bounds } from 'electron-screenshots';
+import { FcrUIDialogKey } from './constant';
+import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { CurrentShareBounds } from '../modules/control-bar/types';
 export declare const uint8ArrayToImageData: (target: {
     buffer?: Uint8Array;
     width?: number;
@@ -26,11 +28,41 @@ export declare const getLanguage: () => string | null;
 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;
     /** @param newRendererWindow 处理 controlbar 中的 popover */
     newRendererWindow?: Window;
-    screenBounds: Bounds;
+    /**
+     * 当前主窗口所在的窗口 bounds 信息
+     */
+    screenBounds: CurrentShareBounds;
+    /**
+     * 回调函数，返回 timerId，用于清理定时器
+     */
     callback?: (timerId: NodeJS.Timeout) => void;
-}): NodeJS.Timeout;
+    /**
+     * 当前打开的 dialog key，如果是 control bar，会计算内部控制栏的边界信息，用于精确定位其位置
+     */
+    dialog?: FcrUIDialogKey.CONTROL_BAR | FcrUIDialogKey.CONFIRM;
+}): NodeJS.Timeout | undefined;
+export declare function getCurrentSharingWorkArea(params: {
+    currentShareId: string;
+    currentShareType: AgoraRtcScreenCaptureType;
+    currentShareBounds: CurrentShareBounds;
+    allApplicationWindows: AgoraRtcWindowInfo[];
+}): {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    displayId: number;
+    topOffset: number;
+    scaleFactor: number;
+};
 export {};

package/lib/utilities/tools.js

@@ -6,13 +6,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getAssetUrl = exports.convertToFixedNumber = exports.PARTICIPANT_POSITION = exports.ASIDE_WIDTH = void 0;
+exports.getCurrentSharingWorkArea = getCurrentSharingWorkArea;
 exports.getFileNameWithoutExtension = getFileNameWithoutExtension;
 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.find.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.includes.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");
@@ -23,11 +26,11 @@ require("core-js/modules/es.promise.js");
 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.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.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");
 require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -38,6 +41,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _schedule = require("agora-foundation/lib/schedule");
 var _logger = require("agora-foundation/lib/logger");
 var _platform = require("./platform");
+var _constant = require("./constant");
+var _type = require("agora-rte-sdk/lib/core/rtc/type");
+var _env = require("agora-foundation/lib/utilities/env");
 var uint8ArrayToImageData = exports.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)) {
@@ -207,11 +213,13 @@ var renderMeetingId = exports.renderMeetingId = function renderMeetingId(meeting
 };
 // 修复 windows 无法响应 hover 的问题
 function handleCheckMouseOver(params) {
+  if (!(0, _env.isElectron)()) return;
   var elem = params.elem,
     browserWindow = params.browserWindow,
     screenBounds = params.screenBounds,
     callback = params.callback,
-    newRendererWindow = params.newRendererWindow;
+    newRendererWindow = params.newRendererWindow,
+    dialog = params.dialog;
   browserWindow.focus();
   browserWindow.setIgnoreMouseEvents(true);
   var MAX_HEIGHT = 430; // 内容最多的 popover 高度
@@ -250,7 +258,29 @@ function handleCheckMouseOver(params) {
     var bar_x2 = bar_left + bar_w + screen_x;
     var bar_y1 = threshold ? bar_top + screen_y : bar_top + screen_y - offsetHeight;
     var bar_y2 = threshold ? bar_top + bar_h + offsetHeight + screen_y : bar_top + bar_h + screen_y;
-    if (mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2) {
+
+    // controlbar 独有逻辑，获取 controlbar state nav 的位置，并计算其边界
+    var insideElem = elem.querySelector('.share-state-nav');
+    var _ref3 = insideElem || {
+        offsetHeight: 0,
+        offsetWidth: 0
+      },
+      inside_h = _ref3.offsetHeight,
+      inside_w = _ref3.offsetWidth;
+    var _ref4 = (insideElem === null || insideElem === void 0 ? void 0 : insideElem.getBoundingClientRect()) || {
+        left: 0,
+        top: 0
+      },
+      inside_x = _ref4.left,
+      inside_y = _ref4.top;
+    var inside_x1 = inside_x + screen_x;
+    var inside_x2 = inside_x + inside_w + screen_x;
+    var inside_y1 = inside_y + screen_y;
+    var inside_y2 = inside_y + inside_h + screen_y;
+    var barWrapBoundary = mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2;
+    var barControlBoundary = mouse_x > inside_x1 && mouse_x < inside_x2 && mouse_y > inside_y1 && mouse_y < inside_y2;
+    var barWrapWithInsideBoundary = mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2 - inside_h || barControlBoundary;
+    if (dialog === _constant.FcrUIDialogKey.CONTROL_BAR ? barWrapWithInsideBoundary : barWrapBoundary) {
       browserWindow.setIgnoreMouseEvents(false);
       if (!browserWindow.isFocused()) {
         browserWindow.focus();
@@ -261,4 +291,73 @@ function handleCheckMouseOver(params) {
   }, 50);
   callback === null || callback === void 0 || callback(timerId);
   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,
+    allApplicationWindows = params.allApplicationWindows;
+  var _window$screen = window.screen,
+    availWidth = _window$screen.availWidth,
+    availHeight = _window$screen.availHeight;
+  var displays = window.runtime.screen.getAllDisplays();
+  var isDisplay = currentShareType === _type.AgoraRtcScreenCaptureType.SCREEN;
+  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 dataStruct = {
+    bounds: {
+      x: 0,
+      y: 0,
+      width: availWidth,
+      height: availHeight
+    },
+    id: 0,
+    workArea: {
+      y: 0
+    },
+    scaleFactor: 1
+  };
+  var matchBounds = function matchBounds() {
+    return displays.find(function (display) {
+      var x = currentShareBounds.x,
+        y = currentShareBounds.y;
+      var bounds = display.bounds,
+        scaleFactor = display.scaleFactor;
+      var cx = x > 0 ? Math.round(x / scaleFactor) : Math.floor(x / scaleFactor);
+      var cy = y > 0 ? Math.round(y / scaleFactor) : Math.floor(y / scaleFactor);
+      var matchBounds = [cx, x].includes(bounds.x) && [cy, y].includes(bounds.y);
+      return matchBounds;
+    });
+  };
+  var matchIdOrIndex = function matchIdOrIndex() {
+    return displays.find(function (display, index) {
+      var id = (0, _platform.isWindows)() ? index : display.id;
+      return id === Number(currentShareId);
+    });
+  };
+  var _ref5 = (isDisplay ? matchBounds() || matchIdOrIndex() : nearDisplay) || dataStruct,
+    _ref5$bounds = _ref5.bounds,
+    x = _ref5$bounds.x,
+    y = _ref5$bounds.y,
+    width = _ref5$bounds.width,
+    height = _ref5$bounds.height,
+    displayId = _ref5.id,
+    scaleFactor = _ref5.scaleFactor,
+    workAreaY = _ref5.workArea.y;
+  return {
+    x: x,
+    y: y,
+    width: width,
+    height: height,
+    displayId: displayId,
+    topOffset: workAreaY - y,
+    // 此算法能确保显示器在不同的上下排列和主次组合时，获取到的偏移值始终正确。
+    scaleFactor: scaleFactor
+  };
 }

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

@@ -1,7 +1,6 @@
-import { FcrDeviceStore } from '../common/device-store';
-import { FcrRemoteVideoRenderManager } from '../common/remote-renderer';
+import { FcrUILocalVideoRenderProvider, FcrUIRemoteVideoRenderProvider } from '../providers/renderer-provider';
 export interface FcrVideoTrackRenderer {
-    deviceStore?: FcrDeviceStore;
-    remoteVideoRenderManager?: FcrRemoteVideoRenderManager;
+    localVideoRenderProvider: FcrUILocalVideoRenderProvider;
+    remoteVideoRenderProvider: FcrUIRemoteVideoRenderProvider;
 }
 export declare const FcrVideoTrackRenderContext: import("react").Context<FcrVideoTrackRenderer>;

package/lib/utilities/video-track-render-context.js

@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrVideoTrackRenderContext = void 0;
 var _react = require("react");
-var FcrVideoTrackRenderContext = exports.FcrVideoTrackRenderContext = /*#__PURE__*/(0, _react.createContext)({});
+var FcrVideoTrackRenderContext = exports.FcrVideoTrackRenderContext = /*#__PURE__*/(0, _react.createContext)(null);

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
   "license": "MIT",
+  "files": [
+    "lib",
+    "installer",
+    "public"
+  ],
   "scripts": {
     "prepare": "husky",
     "dev": "agora-tc-dev-server",
@@ -21,13 +26,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.1",
-    "agora-ui-foundation": "^3.4.1",
+    "agora-foundation": "^3.4.3",
+    "agora-ui-foundation": "^3.4.3",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "^3.4.1",
+    "fcr-core": "^3.4.3",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -58,7 +63,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "^3.4.1",
+    "agora-toolchain": "^3.4.3",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/public/index.html

@@ -75,10 +75,10 @@
     <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/fcr_leave2.svg" />
+        <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">Launch Failure</span>
+            <span id="fcr-launch-failure-comp-title"></span>
           </div>
           <div id="fcr-launch-failure-error-info" class="fcr-launch-failure-comp-desc"></div>
         </div>
@@ -90,16 +90,19 @@
   </body>
   <script>
     window.enLangResource = {
-      fmt_role_host: 'Host',
       fmt_statusbar_label_unknown: 'unknown error',
-      fmt_information_tips_lockedbyhost:
-        'The {reason1} has locked the meeting and no one else is allowed to join',
+      fmt_pc_room_not_exist_error: 'The room does not exist or the password is wrong',
+      fmt_lock_error: 'The host has locked the meeting and no one else can join',
+      fmt_end_error: 'The meeting has ended',
+      fmt_host_leave_error: 'The moderator is not in the meeting',
     };
 
     window.zhLangResource = {
-      fmt_role_host: '主持人',
       fmt_statusbar_label_unknown: '未知错误',
-      fmt_information_tips_lockedbyhost: '{reason1}锁定了会议，其他人不可入会',
+      fmt_pc_room_not_exist_error: '房间不存在或密码错误',
+      fmt_lock_error: '主持人锁定了会议，其他人不可入会',
+      fmt_end_error: '会议已结束',
+      fmt_host_leave_error: '主持人不在会议中',
     };
 
     function replacePlaceholders(str, obj) {
@@ -143,7 +146,7 @@
       if (dom) {
         if (visible) {
           dom.style.display = 'flex';
-          titleDom.innerText = window.$$agora_language === 'zh' ? '启动错误' : 'Launch Failure';
+          // titleDom.innerText = window.$$agora_language === 'zh' ? '锁定会议' : 'Meeting Locked';
           btnTextDom.innerText = window.$$agora_language === 'zh' ? '我已知悉' : 'I know';
           if (errorMsg) {
             const msgDom = document.querySelector('#fcr-launch-failure-error-info');
@@ -206,16 +209,23 @@
         },
         onLaunchFailure: (roomId, error) => {
           const errorCode = Number(error.code);
+          let errorMessage = error.message;
+
           if (errorCode === 732403100) {
-            const lockErrorMsg = window._transI18n('fmt_information_tips_lockedbyhost', {
-              reason1: window._transI18n('fmt_role_host'),
-            });
-            setFullScreenFailureComp(true, lockErrorMsg);
+            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 {
-            const errorMsg = window._transI18n('fmt_statusbar_label_unknown');
-            setFullScreenFailureComp(true, errorMsg);
+            errorMessage = `Error: code=${errorCode}, message=${errorMessage}`;
           }
+
+          setFullScreenFailureComp(true, errorMessage);
         },
+
         onExited: (reason) => {
           window.runtime.quitApp();
         },

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);