fcr-ui-scene 3.3.0 → 3.4.0

package/lib/electron/injections.js

@@ -6,7 +6,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showItemInFolder = exports.setInMeetingState = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.setAlwaysOnTop = exports.sendEvent = exports.screen = exports.removeEventListener = exports.releaseSubAllWindowRefs = exports.registerListenerReady = exports.quitApp = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.launch = exports.getVirtualBgResource = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getRendererProcessUsage = exports.getNetworkType = exports.getMediaSourceIdList = exports.getLaunchOptions = exports.getBrowserWindowById = exports.getAssetUrl = exports.fileToBase64 = exports.closeRendererWindow = exports.close = exports.captureScreen = exports.browserWindow = exports.addEventListener = void 0;
+exports.showItemInFolder = exports.setInMeetingState = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.releaseSubAllWindowRefs = exports.registerListenerReady = exports.quitApp = exports.openSystemPreferences = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.launch = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getResourceByFileType = exports.getRendererProcessUsage = exports.getNetworkType = exports.getMediaSourceIdList = exports.getLaunchOptions = exports.getBundleType = exports.getBrowserWindowById = exports.getAssetUrl = exports.fileToBase64 = exports.closeRendererWindow = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.browserWindow = exports.addEventListener = void 0;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
@@ -54,6 +54,9 @@ var _child_process = require("child_process");
 var _path2 = _interopRequireDefault(require("path"));
 var _fs2 = _interopRequireDefault(require("fs"));
 var _jszip = _interopRequireDefault(require("jszip"));
+var getBundleType = exports.getBundleType = function getBundleType() {
+  return _electron.ipcRenderer.invoke('getBundleType');
+};
 var openDirectory = exports.openDirectory = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
     var _yield$dialog$showOpe, filePaths;
@@ -149,7 +152,7 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
         case 0:
           rendererWindow = rendererWindows[frameName];
           if (rendererWindow) {
-            _context3.next = 36;
+            _context3.next = 37;
             break;
           }
           windowConstructorOptionsString = Object.entries(windowOptions).reduce(function (acc, _ref4) {
@@ -176,18 +179,19 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
           _browserWindow = _remote.BrowserWindow.getAllWindows().find(function (win) {
             return win.id === windowId;
           });
+          _browserWindow === null || _browserWindow === void 0 || _browserWindow.webContents.setBackgroundThrottling(false);
           if (!newRendererWindow) {
-            _context3.next = 34;
+            _context3.next = 35;
             break;
           }
           newRendererWindow.document.write('<div id="root"></div>');
           renderDom = newRendererWindow.document.getElementById('root');
           if (renderDom) {
-            _context3.next = 16;
+            _context3.next = 17;
             break;
           }
           return _context3.abrupt("return");
-        case 16:
+        case 17:
           // copy styles from parent window
           parentWindow = window;
           parentHead = parentWindow.document.head;
@@ -237,39 +241,39 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
             delete rendererWindows[frameName];
           };
           Promise.allSettled(stylesLoadedPromises)["finally"](function () {
-            renderFn(renderDom, _browserWindow);
+            renderFn(renderDom, _browserWindow, newRendererWindow);
           });
-        case 34:
-          _context3.next = 51;
+        case 35:
+          _context3.next = 52;
           break;
-        case 36:
-          _context3.next = 38;
+        case 37:
+          _context3.next = 39;
           return _electron.ipcRenderer.invoke('getBrowserWindowId', frameName);
-        case 38:
+        case 39:
           _windowId = _context3.sent;
           if (_windowId) {
-            _context3.next = 42;
+            _context3.next = 43;
             break;
           }
           console.error('windowId not found');
           return _context3.abrupt("return");
-        case 42:
+        case 43:
           _browserWindow2 = _remote.BrowserWindow.getAllWindows().find(function (win) {
             return win.id === _windowId;
           });
           _newRendererWindow = rendererWindows[frameName];
           _renderDom = _newRendererWindow.document.getElementById('root');
           if (_renderDom) {
-            _context3.next = 47;
+            _context3.next = 48;
             break;
           }
           return _context3.abrupt("return");
-        case 47:
-          renderFn(_renderDom, _browserWindow2);
+        case 48:
+          renderFn(_renderDom, _browserWindow2, _newRendererWindow);
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.show();
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.focus();
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.moveTop();
-        case 51:
+        case 52:
         case "end":
           return _context3.stop();
       }
@@ -279,16 +283,40 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
-var closeRendererWindow = exports.closeRendererWindow = /*#__PURE__*/function () {
-  var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(frameName) {
-    var windowId, _browserWindow3;
+var checkMediaPermission = exports.checkMediaPermission = /*#__PURE__*/function () {
+  var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(mediaType) {
+    var res;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           _context4.next = 2;
+          return _electron.ipcRenderer.invoke('checkMediaPermission', mediaType);
+        case 2:
+          res = _context4.sent;
+          return _context4.abrupt("return", res);
+        case 4:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function checkMediaPermission(_x4) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+var openSystemPreferences = exports.openSystemPreferences = function openSystemPreferences(mediaType) {
+  _electron.ipcRenderer.send('openSystemPreferences', mediaType);
+};
+var closeRendererWindow = exports.closeRendererWindow = /*#__PURE__*/function () {
+  var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(frameName) {
+    var windowId, _browserWindow3;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
           return _electron.ipcRenderer.invoke('getBrowserWindowId', frameName);
         case 2:
-          windowId = _context4.sent;
+          windowId = _context5.sent;
           if (windowId) {
             _browserWindow3 = _remote.BrowserWindow.getAllWindows().find(function (win) {
               return win.id === windowId;
@@ -299,49 +327,35 @@ var closeRendererWindow = exports.closeRendererWindow = /*#__PURE__*/function ()
           }
         case 4:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return function closeRendererWindow(_x4) {
-    return _ref6.apply(this, arguments);
+  return function closeRendererWindow(_x5) {
+    return _ref7.apply(this, arguments);
   };
 }();
 var launch = exports.launch = /*#__PURE__*/function () {
-  var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(options) {
+  var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(options) {
     var res;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regenerator["default"].wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          _context5.next = 2;
+          _context6.next = 2;
           return _electron.ipcRenderer.invoke('launch', options);
         case 2:
-          res = _context5.sent;
-          return _context5.abrupt("return", res);
+          res = _context6.sent;
+          return _context6.abrupt("return", res);
         case 4:
         case "end":
-          return _context5.stop();
+          return _context6.stop();
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function launch(_x5) {
-    return _ref7.apply(this, arguments);
+  return function launch(_x6) {
+    return _ref8.apply(this, arguments);
   };
 }();
-var setAlwaysOnTop = exports.setAlwaysOnTop = function setAlwaysOnTop() {
-  var _app$dock;
-  _remote.app.dock && _remote.app.dock.hide();
-  var browserWindow = (0, _remote.getCurrentWindow)();
-  browserWindow.setVisibleOnAllWorkspaces(true, {
-    visibleOnFullScreen: true
-  });
-  browserWindow.setAlwaysOnTop(true);
-  browserWindow.show();
-  browserWindow.focus();
-  if (!((_app$dock = _remote.app.dock) !== null && _app$dock !== void 0 && _app$dock.isVisible())) {
-    _remote.app.dock && _remote.app.dock.show();
-  }
-};
 var quitApp = exports.quitApp = function quitApp() {
   _remote.app.quit();
 };
@@ -450,11 +464,11 @@ var getAssetUrl = exports.getAssetUrl = function getAssetUrl(path) {
   return _path2["default"].resolve(_remote.app.getAppPath(), '..', path);
 };
 var getRendererProcessUsage = exports.getRendererProcessUsage = /*#__PURE__*/function () {
-  var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-    return _regenerator["default"].wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          return _context6.abrupt("return", {
+          return _context7.abrupt("return", {
             memoryUsage: 0,
             cpuUsage: 0,
             totalMemoryUsage: 0,
@@ -462,40 +476,43 @@ var getRendererProcessUsage = exports.getRendererProcessUsage = /*#__PURE__*/fun
           });
         case 1:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6);
+    }, _callee7);
   }));
   return function getRendererProcessUsage() {
-    return _ref8.apply(this, arguments);
+    return _ref9.apply(this, arguments);
   };
 }();
 var userDataPath = _remote.app.getPath('userData');
 var cachePath = _path2["default"].resolve(userDataPath, 'cache');
 var imageExtensions = ['.png', '.jpg'];
 var videoExtensions = ['.mp4'];
+var audioExtensions = ['.mp3', '.wav'];
 var zipExtensions = ['.zip'];
 var getZipCachePath = function getZipCachePath(type) {
-  return _path2["default"].resolve(cachePath, "fcr_scene/virtual_bg_".concat(type, "s"));
+  var resourcePath = type === 'audio' ? 'sound_effect_' : 'virtual_bg_';
+  return _path2["default"].resolve(cachePath, "fcr_scene/".concat(resourcePath).concat(type, "s"));
 };
 var getResourcePath = function getResourcePath(type, md5Url) {
-  return _path2["default"].resolve(userDataPath, "fcr_scene/virtual_bg_".concat(type, "s/").concat(md5Url));
+  var resourcePath = type === 'audio' ? 'sound_effect_' : 'virtual_bg_';
+  return _path2["default"].resolve(userDataPath, "fcr_scene/".concat(resourcePath).concat(type, "s/").concat(md5Url));
 };
 
 // 解压 zip 文件并保存
 var unZipAndSaveFile = /*#__PURE__*/function () {
-  var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(zipFile, outputPath, type) {
+  var _ref10 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(zipFile, outputPath, type) {
     var zipBuffer, zip, fileNames;
-    return _regenerator["default"].wrap(function _callee8$(_context8) {
-      while (1) switch (_context8.prev = _context8.next) {
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
           zipBuffer = _fs2["default"].readFileSync(zipFile);
-          _context8.next = 3;
+          _context9.next = 3;
           return _jszip["default"].loadAsync(zipBuffer);
         case 3:
-          zip = _context8.sent;
+          zip = _context9.sent;
           fileNames = [];
-          _context8.next = 7;
+          _context9.next = 7;
           return Promise.all(Object.keys(zip.files).filter(function (filename) {
             // 忽略目录、扩展文件或不需要的文件
             var isDirectory = zip.files[filename].dir;
@@ -503,18 +520,18 @@ var unZipAndSaveFile = /*#__PURE__*/function () {
             // 忽略以.开头的文件（隐藏文件）
             filename.includes('Thumbs.db'); // 忽略 Windows 的缩略图数据库文件
 
-            var isImageOrVideo = type === 'image' ? imageExtensions.includes(_path2["default"].extname(filename)) : videoExtensions.includes(_path2["default"].extname(filename));
-            return !isDirectory && !isExtensionFile && isImageOrVideo;
+            var isUserDataFile = type === 'image' ? imageExtensions.includes(_path2["default"].extname(filename)) : type === 'video' ? videoExtensions.includes(_path2["default"].extname(filename)) : audioExtensions.includes(_path2["default"].extname(filename));
+            return !isDirectory && !isExtensionFile && isUserDataFile;
           }).map(/*#__PURE__*/function () {
-            var _ref10 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(filenameTmp) {
+            var _ref11 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(filenameTmp) {
               var fileData, realFileName, outputFile;
-              return _regenerator["default"].wrap(function _callee7$(_context7) {
-                while (1) switch (_context7.prev = _context7.next) {
+              return _regenerator["default"].wrap(function _callee8$(_context8) {
+                while (1) switch (_context8.prev = _context8.next) {
                   case 0:
-                    _context7.next = 2;
+                    _context8.next = 2;
                     return zip.files[filenameTmp].async('nodebuffer');
                   case 2:
-                    fileData = _context7.sent;
+                    fileData = _context8.sent;
                     realFileName = _path2["default"].basename(filenameTmp);
                     outputFile = _path2["default"].resolve(outputPath, realFileName);
                     _fs2["default"].mkdirSync(_path2["default"].dirname(outputFile), {
@@ -524,26 +541,26 @@ var unZipAndSaveFile = /*#__PURE__*/function () {
                     fileNames.push(outputFile);
                   case 8:
                   case "end":
-                    return _context7.stop();
+                    return _context8.stop();
                 }
-              }, _callee7);
+              }, _callee8);
             }));
-            return function (_x9) {
-              return _ref10.apply(this, arguments);
+            return function (_x10) {
+              return _ref11.apply(this, arguments);
             };
           }()));
         case 7:
           // 删除 zip 文件
           _fs2["default"].unlinkSync(zipFile);
-          return _context8.abrupt("return", fileNames);
+          return _context9.abrupt("return", fileNames);
         case 9:
         case "end":
-          return _context8.stop();
+          return _context9.stop();
       }
-    }, _callee8);
+    }, _callee9);
   }));
-  return function unZipAndSaveFile(_x6, _x7, _x8) {
-    return _ref9.apply(this, arguments);
+  return function unZipAndSaveFile(_x7, _x8, _x9) {
+    return _ref10.apply(this, arguments);
   };
 }();
 
@@ -582,27 +599,27 @@ function getSpecificFiles(directory, extensions, fileName) {
     return [];
   }
 }
-function downloadFile(_x10, _x11) {
+function downloadFile(_x11, _x12) {
   return _downloadFile.apply(this, arguments);
 } // 获取资源
 function _downloadFile() {
-  _downloadFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee10(url, destination) {
-    return _regenerator["default"].wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+  _downloadFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee11(url, destination) {
+    return _regenerator["default"].wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
         case 0:
-          return _context10.abrupt("return", new Promise(function (resolve, reject) {
+          return _context11.abrupt("return", new Promise(function (resolve, reject) {
             var request = _remote.net.request(url);
             request.on('response', function (response) {
               var fileStream = _fs2["default"].createWriteStream(destination);
               fileStream.on('finish', function () {
                 resolve();
               });
-              response.on('data', function (chunk) {
-                fileStream.write(chunk);
-              });
               response.on('end', function () {
                 fileStream.end();
               });
+              response.on('data', function (chunk) {
+                fileStream.write(chunk);
+              });
               response.on('error', function (err) {
                 reject(new Error("Download failed: ".concat(err.message)));
               });
@@ -614,62 +631,67 @@ function _downloadFile() {
           }));
         case 1:
         case "end":
-          return _context10.stop();
+          return _context11.stop();
       }
-    }, _callee10);
+    }, _callee11);
   }));
   return _downloadFile.apply(this, arguments);
 }
-var getVirtualBgResource = exports.getVirtualBgResource = /*#__PURE__*/function () {
-  var _ref11 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(url, md5Url, type) {
-    var resourcePath, extensions, cachedFiles, zipFileName, zipCacheDir, zipFiles, tempZipPath, zipPath;
-    return _regenerator["default"].wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+var getResourceByFileType = exports.getResourceByFileType = /*#__PURE__*/function () {
+  var _ref12 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee10(url, md5Url, type) {
+    var resourcePath, extensionMap, extensions, cachedFiles, zipFileName, zipCacheDir, zipFiles, tempZipPath, zipPath;
+    return _regenerator["default"].wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           resourcePath = getResourcePath(type, md5Url);
-          extensions = type === 'image' ? imageExtensions : videoExtensions; // 已有背景文件，直接使用
+          extensionMap = {
+            image: imageExtensions,
+            video: videoExtensions,
+            audio: audioExtensions
+          };
+          extensions = extensionMap[type]; // 已有背景文件，直接使用
           cachedFiles = getSpecificFiles(resourcePath, extensions);
           if (!(cachedFiles.length > 0)) {
-            _context9.next = 5;
+            _context10.next = 6;
             break;
           }
-          return _context9.abrupt("return", cachedFiles);
-        case 5:
+          return _context10.abrupt("return", cachedFiles);
+        case 6:
           // 已有 zip
           zipFileName = "".concat(md5Url, ".zip");
           zipCacheDir = getZipCachePath(type);
           zipFiles = getSpecificFiles(zipCacheDir, zipExtensions, zipFileName); // 没有 zip，需要下载
           if (!(zipFiles.length <= 0)) {
-            _context9.next = 15;
+            _context10.next = 16;
             break;
           }
           tempZipPath = _path2["default"].resolve("".concat(zipCacheDir, "/").concat(md5Url, ".temp"));
           zipPath = _path2["default"].resolve("".concat(zipCacheDir, "/").concat(zipFileName));
-          _context9.next = 13;
+          _context10.next = 14;
           return downloadFile(url, tempZipPath);
-        case 13:
+        case 14:
           // temp 文件重命名为 zip
           _fs2["default"].renameSync(tempZipPath, zipPath);
           zipFiles = getSpecificFiles(zipCacheDir, zipExtensions, zipFileName);
-        case 15:
+        case 16:
           if (!(!zipFiles || zipFiles.length <= 0)) {
-            _context9.next = 17;
+            _context10.next = 18;
             break;
           }
-          return _context9.abrupt("return", []);
-        case 17:
-          _context9.next = 19;
+          return _context10.abrupt("return", []);
+        case 18:
+          _context10.next = 20;
           return unZipAndSaveFile(zipFiles[0], resourcePath, type);
-        case 19:
-          return _context9.abrupt("return", _context9.sent);
         case 20:
+          return _context10.abrupt("return", _context10.sent);
+        case 21:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }));
-  return function getVirtualBgResource(_x12, _x13, _x14) {
-    return _ref11.apply(this, arguments);
+  return function getResourceByFileType(_x13, _x14, _x15) {
+    return _ref12.apply(this, arguments);
   };
 }();
 
@@ -680,6 +702,8 @@ var fileToBase64 = exports.fileToBase64 = function fileToBase64(file, type) {
   });
   if (type === 'video') {
     return "data:video/mp4;base64,".concat(data);
+  } else if (type === 'audio') {
+    return "data:audio/mp3;base64,".concat(data);
   } else {
     return "data:image/jpeg;base64,".concat(data);
   }
@@ -699,4 +723,8 @@ var getMediaSourceIdList = exports.getMediaSourceIdList = function getMediaSourc
 };
 var setInMeetingState = exports.setInMeetingState = function setInMeetingState(state) {
   _electron.ipcRenderer.send('set-in-meeting-state', state);
+};
+var restartApp = exports.restartApp = function restartApp() {
+  _remote.app.relaunch();
+  _remote.app.exit(0);
 };

package/lib/electron/logger.js

@@ -33,7 +33,9 @@ var LoggerManager = /*#__PURE__*/function () {
       var transports = [];
       if (logFilePath) {
         transports.push(new _winston["default"].transports.File({
-          filename: logFilePath
+          filename: logFilePath,
+          maxFiles: 5,
+          maxsize: 1048576 //1MB
         }));
       }
       if (enableConsole) {

package/lib/electron/main.js

@@ -12,11 +12,12 @@ var _window = require("./window");
 var _screenshot = require("./plugins/screenshot");
 var _logger = require("./logger");
 var _meetingState = require("./plugins/meeting-state");
+var _devtoolShortcut = require("./plugins/devtool-shortcut");
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   var logger = (0, _logger.getLogger)();
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     logger.info("browser window is opened, frameName: ".concat(details.frameName));
-    var builtinFrameNames = ['device-setting', 'chat', 'live-streaming', 'participant', 'screen-selection', 'invite', 'video-window', 'confirm-dialog', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room-remove', 'operation-waiting-room-removeAll', 'operation-waiting-room-admitAll'];
+    var builtinFrameNames = ['device-settings', 'chat', 'live-streaming', 'participant', 'share-screen-selection', 'invite', 'video-window', 'confirm', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room', 'interpreter-setting', 'waiting-room-single-remove', 'waiting-room-all-remove', 'waiting-room-all-admit', 'control-bar', 'show-toast', 'system-preference'];
     if (!builtinFrameNames.includes(details.frameName)) {
       logger.info("frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
@@ -46,8 +47,19 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
       mainWindow.reload();
     }, 1000);
   });
+  mainWindow.on('enter-full-screen', function () {
+    mainWindow.webContents.send('custom-event', {
+      action: 'ENTER_FULL_SCREEN'
+    });
+  });
+  mainWindow.on('leave-full-screen', function () {
+    mainWindow.webContents.send('custom-event', {
+      action: 'LEAVE_FULL_SCREEN'
+    });
+  });
   (0, _screenshot.listenScreenshot)(mainWindow);
   (0, _meetingState.listenMeetingState)(mainWindow);
+  (0, _devtoolShortcut.listenDevToolShortcut)(mainWindow);
 };
 var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, action) {
   var func = browserWindow[method];

package/lib/electron/plugins/devtool-shortcut.d.ts

@@ -0,0 +1,2 @@
+import { BrowserWindow } from 'electron';
+export declare const listenDevToolShortcut: (window: BrowserWindow) => void;

package/lib/electron/plugins/devtool-shortcut.js

@@ -0,0 +1,19 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.listenDevToolShortcut = void 0;
+var _electron = require("electron");
+var _logger = require("../logger");
+var listenDevToolShortcut = exports.listenDevToolShortcut = function listenDevToolShortcut(window) {
+  _electron.globalShortcut.register('CommandOrControl+Shift+X', function () {
+    if (window.isFocused()) {
+      (0, _logger.getLogger)().info('CommandOrControl+Shift+X is pressed');
+      window.webContents.openDevTools({
+        mode: 'detach'
+      });
+    }
+  });
+};

package/lib/electron/preload.js

@@ -18,7 +18,6 @@ window.runtime = {
   showItemInFolder: _injections.showItemInFolder,
   screen: _injections.screen,
   launch: _injections.launch,
-  setAlwaysOnTop: _injections.setAlwaysOnTop,
   quitApp: _injections.quitApp,
   getLaunchOptions: _injections.getLaunchOptions,
   getSystemMemorySize: _injections.getSystemMemorySize,
@@ -27,10 +26,14 @@ window.runtime = {
   getAssetUrl: _injections.getAssetUrl,
   getRendererProcessUsage: _injections.getRendererProcessUsage,
   setFragmentBaseUrl: _injections.setFragmentBaseUrl,
-  getVirtualBgResource: _injections.getVirtualBgResource,
+  getResourceByFileType: _injections.getResourceByFileType,
   fileToBase64: _injections.fileToBase64,
   registerListenerReady: _injections.registerListenerReady,
   releaseSubAllWindowRefs: _injections.releaseSubAllWindowRefs,
   getMediaSourceIdList: _injections.getMediaSourceIdList,
-  setInMeetingState: _injections.setInMeetingState
+  setInMeetingState: _injections.setInMeetingState,
+  restartApp: _injections.restartApp,
+  getBundleType: _injections.getBundleType,
+  checkMediaPermission: _injections.checkMediaPermission,
+  openSystemPreferences: _injections.openSystemPreferences
 };

package/lib/fragments/control-bar/cloud-recording-buttons.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.CloudRecordingButtons = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");

package/lib/fragments/control-bar/control-bar-store.d.ts

@@ -1,7 +1,7 @@
 import { RendererEventAction } from '../../utilities/constant';
 import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState, FcrRoomInfo, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState, FcrRoomInfo, FcrUserInfo, FcrLineType } from 'fcr-core/lib/type';
 import { ConnectType } from '../../modules/action-bar/type';
 export default class ControlBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -31,6 +31,7 @@ export default class ControlBarStore {
     accessor allowUnmuteSelfAudio: boolean;
     accessor isLockRoomEnabled: boolean;
     accessor isWaitingRoomEnabled: boolean;
+    accessor isWaterMarkEnabled: boolean;
     accessor showSecurity: boolean;
     accessor isHost: boolean;
     accessor hasEnableStartScreenSharePermission: boolean;
@@ -52,8 +53,11 @@ export default class ControlBarStore {
     accessor hasStopLiveStreamingPermission: boolean;
     accessor hasStartLiveStreamingPermission: boolean;
     accessor hasWaitingRoomPermission: boolean;
+    accessor hasWatermarkDisablePermission: boolean;
+    accessor hasWatermarkEnablePermission: boolean;
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
     accessor phoneMicEnabled: boolean;
+    accessor isMulti: boolean;
     accessor roomInfo: FcrRoomInfo;
     accessor userName: string;
     accessor inviteLink: string;
@@ -154,6 +158,12 @@ export default class ControlBarStore {
     setLockRoomEnabled(lock: boolean): void;
     updateLockRoomEnabled(lock: boolean): void;
     setWaitingRoomEnabled(allow: boolean): void;
+    setWaterMarkLineType(lineType: FcrLineType): void;
+    setAllowWaterMark(): void;
+    setIsMulti(isMulti: boolean): void;
+    setWaterMarkEnabled(allow: boolean): void;
+    setHasWatermarkDisablePermission(allow: boolean): void;
+    setHasWatermarkEnablePermission(allow: boolean): void;
     setHasStartCloudRecordingPermission(allow: boolean): void;
     setHasWaitingRoomPermission(allow: boolean): void;
     setHasGetLiveStreamingUrlPermission(hasGetLiveStreamingUrlPermission: boolean): void;