fcr-ui-scene 3.7.9-alpha → 3.8.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.setUserSettingData = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.quitApp = exports.openSystemPreferences = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.loadBuiltinResources = exports.initialize = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getResourceByFileType = exports.getPrimaryDisplay = exports.getNetworkType = exports.getMediaSourceIdList = exports.getDisplayNearestPoint = exports.getDisplayMatching = exports.getCursorScreenPoint = exports.getCurrentBrowserWindow = exports.getBrowserWindowById = exports.getBaseUrl = exports.getAllDisplays = exports.fileToBlob = exports.fileToBase64 = exports.createBrowserWindowProxy = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.addEventListener = void 0;
+exports.showItemInFolder = exports.setUserSettingData = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.quitApp = exports.openSystemPreferences = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.loadBuiltinResources = exports.initialize = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getPrimaryDisplay = exports.getNetworkType = exports.getMediaSourceIdList = exports.getDisplayNearestPoint = exports.getDisplayMatching = exports.getCursorScreenPoint = exports.getCurrentBrowserWindow = exports.getBrowserWindowById = exports.getBaseUrl = exports.getAllDisplays = exports.fileToBlob = exports.fileToBase64 = exports.downloadResourceFile = exports.downloadAndExtractResourceFileFromZip = exports.createBrowserWindowProxy = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.addEventListener = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -70,9 +70,30 @@ var _jszip = _interopRequireDefault(require("jszip"));
 var _exitCodes = require("./exit-codes");
 var _browserWindowProxy = require("./window-proxy/browser-window-proxy");
 var _env = require("./env");
-// import { windowManager as wm } from 'node-window-manager';
-
+var _jsMd = require("js-md5");
 var USER_SETTING_DATA_FILE_NAME = 'UserSettingData.json';
+var isDevMode = process.env.DEV === 'true';
+var appPath = _remote.app.getAppPath();
+var appDataPath = _remote.app.getPath('appData');
+var buildtinResourcesPath = isDevMode ? _path2["default"].resolve(_path2["default"].dirname(require.resolve('fcr-ui-scene/package.json')), 'public/assets/electron') : _path2["default"].resolve(appPath, '../assets');
+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 extensionMap = {
+  image: imageExtensions,
+  video: videoExtensions,
+  audio: audioExtensions
+};
+console.log("Preload script loaded, process id: ".concat(process.pid));
+console.log("Is dev mode: ".concat(isDevMode));
+console.log("App path: ".concat(appPath));
+console.log("App data path: ".concat(appDataPath));
+console.log("Builtin ui resource path: ".concat(buildtinResourcesPath));
+console.log("User data path: ".concat(userDataPath));
+console.log("Cache path: ".concat(cachePath));
 var rendererWindows = new Map();
 var openDirectory = exports.openDirectory = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -337,22 +358,23 @@ var getNetworkType = exports.getNetworkType = function getNetworkType() {
         });
         return;
       }
-      if (stdout.includes('You are not associated with an AirPort network.')) {
+      if (stdout.includes('Wi-Fi power is currently off')) {
         resolve({
           isWifiConnected: false,
           connection: ''
         });
       } else {
-        var network = stdout.split(': ')[1].trim();
+        var _stdout$split$;
+        var network = (_stdout$split$ = stdout.split(': ')[1]) === null || _stdout$split$ === void 0 ? void 0 : _stdout$split$.trim();
         resolve({
           isWifiConnected: true,
-          connection: network
+          connection: network || ''
         });
       }
     });
   } else if (platform === 'win32') {
     // windows
-    (0, _child_process.exec)('netsh wlan show interfaces', function (error, stdout, stderr) {
+    (0, _child_process.exec)('chcp 65001 && netsh wlan show interfaces', function (error, stdout, stderr) {
       if (error || stderr) {
         resolve({
           isWifiConnected: false,
@@ -362,11 +384,10 @@ var getNetworkType = exports.getNetworkType = function getNetworkType() {
       }
       var lines = stdout.split('\n');
       lines.forEach(function (line) {
-        if (line.includes('State') && line.includes('connected') && line.includes('SSID')) {
-          var ssid = line.split(': ')[1].trim();
+        if (line.includes('State') && line.includes('connected')) {
           resolve({
             isWifiConnected: true,
-            connection: ssid
+            connection: ''
           });
         }
       });
@@ -412,30 +433,13 @@ var getNetworkType = exports.getNetworkType = function getNetworkType() {
   }
   return p;
 };
-var isDevMode = process.env.DEV === 'true';
-var appPath = _remote.app.getAppPath();
-var appDataPath = _remote.app.getPath('appData');
-var buildtinResourcesPath = isDevMode ? _path2["default"].resolve(_path2["default"].dirname(require.resolve('fcr-ui-scene/package.json')), 'public/assets/electron') : _path2["default"].resolve(appPath, '../assets');
-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'];
-console.log("Preload script loaded, process id: ".concat(process.pid));
-console.log("Is dev mode: ".concat(isDevMode));
-console.log("App path: ".concat(appPath));
-console.log("App data path: ".concat(appDataPath));
-console.log("Builtin ui resource path: ".concat(buildtinResourcesPath));
-console.log("User data path: ".concat(userDataPath));
-console.log("Cache path: ".concat(cachePath));
 var getZipCachePath = function getZipCachePath(type) {
   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, md5Str) {
+var getResourcePath = function getResourcePath(type, path) {
   var resourcePath = type === 'audio' ? 'sound_effect_' : 'virtual_bg_';
-  return _path2["default"].resolve(userDataPath, "fcr_scene/".concat(resourcePath).concat(type, "s/").concat(md5Str));
+  return _path2["default"].resolve(userDataPath, "fcr_scene/".concat(resourcePath).concat(type, "s/").concat(path));
 };
 
 // 解压 zip 文件并保存
@@ -542,11 +546,11 @@ function downloadFile(_x9, _x0) {
   return _downloadFile.apply(this, arguments);
 } // 获取资源
 function _downloadFile() {
-  _downloadFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(url, destination) {
-    return _regenerator["default"].wrap(function (_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+  _downloadFile = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee0(url, destination) {
+    return _regenerator["default"].wrap(function (_context0) {
+      while (1) switch (_context0.prev = _context0.next) {
         case 0:
-          return _context9.abrupt("return", new Promise(function (resolve, reject) {
+          return _context0.abrupt("return", new Promise(function (resolve, reject) {
             var request = _remote.net.request(url);
             request.on('response', function (response) {
               var fileStream = _fs2["default"].createWriteStream(destination);
@@ -560,35 +564,31 @@ function _downloadFile() {
                 fileStream.write(chunk);
               });
               response.on('error', function (err) {
-                reject(new Error("Download failed: ".concat(err.message)));
+                reject(new Error("Download failed: ".concat(err.message, ", url: ").concat(url, ", file path: ").concat(destination)));
               });
             });
             request.on('error', function (err) {
-              reject(new Error("Request failed: ".concat(err.message)));
+              reject(new Error("Request failed: ".concat(err.message, ", url: ").concat(url, ", file path: ").concat(destination)));
             });
             request.end();
           }));
         case 1:
         case "end":
-          return _context9.stop();
+          return _context0.stop();
       }
-    }, _callee9);
+    }, _callee0);
   }));
   return _downloadFile.apply(this, arguments);
 }
-var getResourceByFileType = exports.getResourceByFileType = /*#__PURE__*/function () {
-  var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(zipUrl, md5Str, type) {
-    var resourcePath, extensionMap, extensions, cachedFiles, zipFileName, zipCacheDir, zipFiles, tempZipPath, zipPath, zipFilePath, filePathList;
+var downloadAndExtractResourceFileFromZip = exports.downloadAndExtractResourceFileFromZip = /*#__PURE__*/function () {
+  var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(zipUrl, type) {
+    var md5Str, resourcePath, extensions, cachedFiles, zipFileName, zipCacheDir, zipFiles, tempZipPath, zipPath, zipFilePath, filePathList;
     return _regenerator["default"].wrap(function (_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
+          md5Str = (0, _jsMd.md5)(zipUrl);
           resourcePath = getResourcePath(type, md5Str);
-          extensionMap = {
-            image: imageExtensions,
-            video: videoExtensions,
-            audio: audioExtensions
-          };
-          extensions = extensionMap[type]; // 已有背景文件，直接使用
+          extensions = extensionMap[type]; // 已有缓存文件，直接使用
           cachedFiles = getSpecificFiles(resourcePath, extensions);
           if (!(cachedFiles.length > 0)) {
             _context6.next = 1;
@@ -638,10 +638,51 @@ var getResourceByFileType = exports.getResourceByFileType = /*#__PURE__*/functio
       }
     }, _callee6);
   }));
-  return function getResourceByFileType(_x1, _x10, _x11) {
+  return function downloadAndExtractResourceFileFromZip(_x1, _x10) {
     return _ref8.apply(this, arguments);
   };
 }();
+var downloadResourceFile = exports.downloadResourceFile = /*#__PURE__*/function () {
+  var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(fileUrl, type) {
+    var md5Str, resourceDirPath, resourceFilePath, _t;
+    return _regenerator["default"].wrap(function (_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.prev = 0;
+          md5Str = (0, _jsMd.md5)(fileUrl);
+          resourceDirPath = getResourcePath(type, md5Str);
+          resourceFilePath = _path2["default"].resolve(resourceDirPath, 'sound.mp3');
+          if (!_fs2["default"].existsSync(resourceFilePath)) {
+            _context7.next = 1;
+            break;
+          }
+          console.log("Using cached file for ".concat(fileUrl, ": ").concat(resourceFilePath));
+          return _context7.abrupt("return", resourceFilePath);
+        case 1:
+          if (!_fs2["default"].existsSync(resourceDirPath)) {
+            _fs2["default"].mkdirSync(resourceDirPath, {
+              recursive: true
+            });
+          }
+          _context7.next = 2;
+          return downloadFile(fileUrl, resourceFilePath);
+        case 2:
+          return _context7.abrupt("return", resourceFilePath);
+        case 3:
+          _context7.prev = 3;
+          _t = _context7["catch"](0);
+          console.error('download error', _t);
+          throw _t;
+        case 4:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7, null, [[0, 3]]);
+  }));
+  return function downloadResourceFile(_x11, _x12) {
+    return _ref9.apply(this, arguments);
+  };
+}();
 
 // UI 层拿到 file path 需要转为 base64
 var fileToBase64 = exports.fileToBase64 = function fileToBase64(file, type) {
@@ -665,24 +706,24 @@ var fileToBlob = exports.fileToBlob = function fileToBlob(file, type) {
   });
 };
 var loadBuiltinResources = exports.loadBuiltinResources = /*#__PURE__*/function () {
-  var _ref9 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8() {
-    var buildtinVirtualBackgroundImagePath, buildtinVirtualBackgroundVideoPath, buildtinSoundEffectsPath;
-    return _regenerator["default"].wrap(function (_context8) {
-      while (1) switch (_context8.prev = _context8.next) {
+  var _ref0 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9() {
+    var builtinVirtualBackgroundImagePath, builtinVirtualBackgroundVideoPath, builtinSoundEffectsPath;
+    return _regenerator["default"].wrap(function (_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          buildtinVirtualBackgroundImagePath = _path2["default"].join(buildtinResourcesPath, 'images');
-          buildtinVirtualBackgroundVideoPath = _path2["default"].join(buildtinResourcesPath, 'videos');
-          buildtinSoundEffectsPath = _path2["default"].join(buildtinResourcesPath, 'sound_effects');
-          return _context8.abrupt("return", new Promise(/*#__PURE__*/function () {
-            var _ref0 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(resolve) {
-              var _yield$Promise$allSet, _yield$Promise$allSet2, images, videos, sounds, virtualBackgroundImages, virtualBackgroundVideos, soundEffects;
-              return _regenerator["default"].wrap(function (_context7) {
-                while (1) switch (_context7.prev = _context7.next) {
+          builtinVirtualBackgroundImagePath = _path2["default"].join(buildtinResourcesPath, 'images');
+          builtinVirtualBackgroundVideoPath = _path2["default"].join(buildtinResourcesPath, 'videos');
+          builtinSoundEffectsPath = _path2["default"].join(buildtinResourcesPath, 'sound_effects');
+          return _context9.abrupt("return", new Promise(/*#__PURE__*/function () {
+            var _ref1 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(resolve) {
+              var _yield$Promise$allSet, _yield$Promise$allSet2, images, videos, sounds, virtualBackgroundImages, virtualBackgroundVideos, soundEffectAudios;
+              return _regenerator["default"].wrap(function (_context8) {
+                while (1) switch (_context8.prev = _context8.next) {
                   case 0:
-                    _context7.next = 1;
-                    return Promise.allSettled([_promises["default"].readdir(buildtinVirtualBackgroundImagePath), _promises["default"].readdir(buildtinVirtualBackgroundVideoPath), _promises["default"].readdir(buildtinSoundEffectsPath)]);
+                    _context8.next = 1;
+                    return Promise.allSettled([_promises["default"].readdir(builtinVirtualBackgroundImagePath), _promises["default"].readdir(builtinVirtualBackgroundVideoPath), _promises["default"].readdir(builtinSoundEffectsPath)]);
                   case 1:
-                    _yield$Promise$allSet = _context7.sent;
+                    _yield$Promise$allSet = _context8.sent;
                     _yield$Promise$allSet2 = (0, _slicedToArray2["default"])(_yield$Promise$allSet, 3);
                     images = _yield$Promise$allSet2[0];
                     videos = _yield$Promise$allSet2[1];
@@ -692,7 +733,7 @@ var loadBuiltinResources = exports.loadBuiltinResources = /*#__PURE__*/function
                       images.value.forEach(function (file) {
                         var ext = _path2["default"].extname(file).toLowerCase();
                         if (imageExtensions.includes(ext)) {
-                          virtualBackgroundImages.push(_path2["default"].join(buildtinVirtualBackgroundImagePath, file));
+                          virtualBackgroundImages.push(_path2["default"].join(builtinVirtualBackgroundImagePath, file));
                         }
                       });
                     }
@@ -701,42 +742,43 @@ var loadBuiltinResources = exports.loadBuiltinResources = /*#__PURE__*/function
                       videos.value.forEach(function (file) {
                         var ext = _path2["default"].extname(file).toLowerCase();
                         if (videoExtensions.includes(ext)) {
-                          virtualBackgroundVideos.push(_path2["default"].join(buildtinVirtualBackgroundVideoPath, file));
+                          virtualBackgroundVideos.push(_path2["default"].join(builtinVirtualBackgroundVideoPath, file));
                         }
                       });
                     }
-                    soundEffects = [];
+                    soundEffectAudios = {};
                     if (sounds.status === 'fulfilled') {
                       sounds.value.forEach(function (file) {
                         var ext = _path2["default"].extname(file).toLowerCase();
+                        var fileNameWithoutExt = _path2["default"].basename(file, ext);
                         if (audioExtensions.includes(ext)) {
-                          soundEffects.push(_path2["default"].join(buildtinSoundEffectsPath, file));
+                          soundEffectAudios[fileNameWithoutExt] = _path2["default"].join(builtinSoundEffectsPath, file);
                         }
                       });
                     }
                     resolve({
                       virtualBackgroundImages: virtualBackgroundImages,
                       virtualBackgroundVideos: virtualBackgroundVideos,
-                      soundEffects: soundEffects
+                      soundEffectAudios: soundEffectAudios
                     });
                   case 2:
                   case "end":
-                    return _context7.stop();
+                    return _context8.stop();
                 }
-              }, _callee7);
+              }, _callee8);
             }));
-            return function (_x12) {
-              return _ref0.apply(this, arguments);
+            return function (_x13) {
+              return _ref1.apply(this, arguments);
             };
           }()));
         case 1:
         case "end":
-          return _context8.stop();
+          return _context9.stop();
       }
-    }, _callee8);
+    }, _callee9);
   }));
   return function loadBuiltinResources() {
-    return _ref9.apply(this, arguments);
+    return _ref0.apply(this, arguments);
   };
 }();
 var getMediaSourceIdList = exports.getMediaSourceIdList = function getMediaSourceIdList() {

package/lib/electron/ipc/ipc.js

@@ -35,40 +35,42 @@ var IPCClient = exports.IPCClient = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_observable", new _events["default"]());
     (0, _defineProperty2["default"])(this, "_buffer", Buffer.alloc(0));
     (0, _defineProperty2["default"])(this, "_handleMessage", function (message) {
-      _this._logger.log('Received message:', message);
+      _this._logger.log('IPC SOCKET: Received message:', message);
       try {
         var parsedMessage = JSON.parse(message);
         _this._observable.emit('onMessageReceived', parsedMessage);
       } catch (error) {
-        _this._logger.error('Error parsing message:', error);
+        _this._logger.error('IPC SOCKET: Error parsing message:', error);
       }
     });
     (0, _defineProperty2["default"])(this, "_handleError", function (error) {
-      _this._logger.error('Error:', error);
+      _this._logger.error('IPC SOCKET: Error:', error);
       _this._observable.emit('onError', error);
     });
-    this._logger.info('initialize tcp connection');
+    this._logger.info('IPC SOCKET: initialize tcp connection', 'port:', port);
     this._socket = (0, _net.createConnection)({
       port: port,
-      timeout: 5000
+      timeout: 5000,
+      host: '127.0.0.1'
     }, function () {
-      _this._logger.info('connected to server!');
+      _this._logger.info("IPC SOCKET: connected to server!remote info:".concat(JSON.stringify(_this._socket), ",remote address:").concat(_this._socket.remoteAddress, ",remote port:").concat(_this._socket.remotePort));
     });
     this._socket.on('end', function () {
-      _this._logger.info('disconnected from server');
+      _this._logger.info('IPC SOCKET: disconnected from server');
     });
     this._socket.on('close', function () {
-      _this._logger.info('disconnected from server');
+      _this._logger.info('IPC SOCKET: disconnected from server');
       _this._observable.emit('onDisconnected');
     });
     this._socket.on('data', function (data) {
+      _this._logger.info("IPC SOCKET: received data,this.socket.remoteAddress:".concat(_this._socket.remoteAddress, ",this.socket").concat(JSON.stringify(_this._socket)));
       // 将新数据追加到现有缓冲区
       _this._buffer = Buffer.concat([_this._buffer, data]);
       // 处理可能的多条消息
       _this._processBuffer();
     });
     this._socket.on('error', function (error) {
-      _this._logger.error('Socket error:', error);
+      _this._logger.error('IPC SOCKET: Socket error:', error);
       _this._handleError(error);
     });
   }
@@ -110,9 +112,9 @@ var IPCClient = exports.IPCClient = /*#__PURE__*/function () {
 
       this._socket.write(Buffer.concat([lengthBuffer, Buffer.from(messageString)]), function (error) {
         if (error) {
-          _this2._logger.error('Error sending message:', error);
+          _this2._logger.error('IPC SOCKET: Error sending message:', error);
         } else {
-          _this2._logger.log('Message sent:', messageString);
+          _this2._logger.log('IPC SOCKET: Message sent:', messageString);
         }
       });
     }

package/lib/electron/ipc/type.d.ts

@@ -7,11 +7,13 @@ export declare enum IPCMessageCMD {
     TokenWillExpire = "user-token-will-expire",
     ExitUiSceneFromMainProcess = "exit-ui-scene-from-main-process",
     Error = "error",
+    CurrentDependencyVersions = "current-dependency-versions",
     LaunchMeeting = "launch-meeting",
     InitCreator = "init-creator",
     OpenSetting = "open-setting",
     CloseSetting = "close-setting",
     SetParameters = "set-parameters",
     RenewUserToken = "renew-user-token",
-    ExitUiScene = "exit-ui-scene"
+    ExitUiScene = "exit-ui-scene",
+    GetDependencyVersions = "get-dependency-versions"
 }

package/lib/electron/ipc/type.js

@@ -15,6 +15,7 @@ var IPCMessageCMD = exports.IPCMessageCMD = /*#__PURE__*/function (IPCMessageCMD
   IPCMessageCMD["TokenWillExpire"] = "user-token-will-expire";
   IPCMessageCMD["ExitUiSceneFromMainProcess"] = "exit-ui-scene-from-main-process";
   IPCMessageCMD["Error"] = "error";
+  IPCMessageCMD["CurrentDependencyVersions"] = "current-dependency-versions";
   // handle
   IPCMessageCMD["LaunchMeeting"] = "launch-meeting";
   IPCMessageCMD["InitCreator"] = "init-creator";
@@ -23,5 +24,6 @@ var IPCMessageCMD = exports.IPCMessageCMD = /*#__PURE__*/function (IPCMessageCMD
   IPCMessageCMD["SetParameters"] = "set-parameters";
   IPCMessageCMD["RenewUserToken"] = "renew-user-token";
   IPCMessageCMD["ExitUiScene"] = "exit-ui-scene";
+  IPCMessageCMD["GetDependencyVersions"] = "get-dependency-versions";
   return IPCMessageCMD;
 }({});

package/lib/electron/main.js

@@ -85,7 +85,9 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
     setTimeout(function () {
       logger.info('start reloading main window...');
       try {
-        if (!mainWindow.isDestroyed()) {
+        // 如果窗口被杀死，则不重新加载,
+        // 在C++中，15s没链接成功会kill掉进程，这个捕捉到kill之后不应该重新加载了，否则会重新创建窗口，导致pid不一致
+        if (!mainWindow.isDestroyed() && details.reason !== 'killed') {
           mainWindow.reload();
           mainWindow.show();
           mainWindow.focus();

package/lib/electron/preload.js

@@ -30,7 +30,8 @@ var runtime = {
   getPrimaryDisplay: _injections.getPrimaryDisplay,
   getDisplayNearestPoint: _injections.getDisplayNearestPoint,
   fileToBlob: _injections.fileToBlob,
-  getResourceByFileType: _injections.getResourceByFileType,
+  downloadAndExtractResourceFileFromZip: _injections.downloadAndExtractResourceFileFromZip,
+  downloadResourceFile: _injections.downloadResourceFile,
   loadBuiltinResources: _injections.loadBuiltinResources,
   getSystemCpuInfo: _injections.getSystemCpuInfo,
   getSystemMemorySize: _injections.getSystemMemorySize,

package/lib/electron/process-manager/constants.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_TIMEOUT = 300;

package/lib/electron/process-manager/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULT_TIMEOUT = void 0;
+var DEFAULT_TIMEOUT = exports.DEFAULT_TIMEOUT = 300;

package/lib/electron/{event-manager.d.ts → process-manager/event-manager.d.ts}

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { FcrUISceneLaunchState as LaunchState, FcrUISceneLaunchEndReason as EndReason } from './struct';
+import { FcrUISceneLaunchState as LaunchState, FcrUISceneLaunchEndReason as EndReason } from '../struct';
 export interface StateChangeEvent {
     previousState: LaunchState;
     currentState: LaunchState;
@@ -47,7 +47,7 @@ export declare class EventManager extends EventEmitter {
     /**
      * 设置启动状态
      */
-    private setState;
+    private _setState;
     /**
      * 检查是否可以启动新的会议
      */
@@ -83,6 +83,5 @@ export declare class EventManager extends EventEmitter {
     /**
      * 清理资源
      */
-    dispose(): void;
+    release(): void;
 }
-export declare const eventManager: EventManager;