fcr-ui-scene 3.6.3 → 3.6.4-rc.1

package/lib/base.js

@@ -51,9 +51,6 @@ require("core-js/modules/es.reflect.has.js");
 require("core-js/modules/es.reflect.set.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.map.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");

package/lib/creator.js

@@ -15,7 +15,6 @@ 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/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.symbol.metadata.js");
@@ -42,9 +41,6 @@ require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");
@@ -191,18 +187,19 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       }
       (0, _i18n.changeLanguage)(config.language);
       var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage, this._registeredWidgetConfigs, this._engine);
-      var onLaunchSuccess = function onLaunchSuccess() {
-        var parameters = _objectSpread(_objectSpread({}, _this._parameters), {}, {
-          rtc: [JSON.stringify({
-            'rtc.microphone.keep.recording': _this._microphoneKeepRecording
-          })]
-        });
-        _this.logger.info("[MicrophoneKeepRecording][onLaunchSuccess] parameters ==> ".concat(JSON.stringify(parameters)));
-        _this._engine.setParameters(parameters);
-        return onSuccess;
-      };
       scene.addObserver({
-        onLaunchSuccess: onLaunchSuccess(),
+        onLaunchSuccess: function onLaunchSuccess() {
+          if (_this._microphoneKeepRecording) {
+            var parameters = {
+              rtc: [JSON.stringify({
+                'rtc.microphone.keep.recording': true
+              })]
+            };
+            _this.logger.info("[MicrophoneKeepRecording][onLaunchSuccess] parameters ==> ".concat(JSON.stringify(parameters)));
+            _this._engine.setParameters(parameters);
+          }
+          onSuccess.apply(void 0, arguments);
+        },
         onLaunchFailure: onFailure,
         onLaunchCancel: onCancel,
         onSettingStore: function onSettingStore(store) {
@@ -210,13 +207,15 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
           _this.closeSetting();
         },
         onExited: function onExited() {
-          var parameters = _objectSpread(_objectSpread({}, _this._parameters), {}, {
-            rtc: [JSON.stringify({
-              'rtc.microphone.keep.recording': false
-            })]
-          });
-          _this.logger.info("[MicrophoneKeepRecording][onExited] parameters ==> ".concat(JSON.stringify(parameters)));
-          _this._engine.setParameters(parameters);
+          if (_this._microphoneKeepRecording) {
+            var parameters = {
+              rtc: [JSON.stringify({
+                'rtc.microphone.keep.recording': false
+              })]
+            };
+            _this.logger.info("[MicrophoneKeepRecording][onExited] parameters ==> ".concat(JSON.stringify(parameters)));
+            _this._engine.setParameters(parameters);
+          }
           _this.closeSetting();
           _this._initSettingStore();
           _this._resetScene();
@@ -281,7 +280,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     value: function () {
       var _initSettingStore2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var openDefaultCamera, openDefaultMicrophone, eventProvider, deviceProvider, dialogProvider, messageProvider, sharedConfigDataSource, sharedSettingDataSource, monitorProvider;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this._eventProvider = new _eventProvider.FcrUIEventProviderImpl();
@@ -310,9 +309,9 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
               sharedSettingDataSource = this._sharedSettingDataSource;
               monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(this._engine.getMonitorControl());
               deviceProvider.loadUiResources((0, _uiResources.getNormalDownloadResources)(this._config.resource));
-              _context.next = 20;
+              _context.next = 1;
               return deviceProvider.init();
-            case 20:
+            case 1:
               this.observableSettingStore.value = new _store["default"]({
                 uiEventStore: eventProvider,
                 monitorControl: monitorProvider,
@@ -326,7 +325,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
                 userId: this._config.userId,
                 userSettingStorageProvider: this._userSettingStorageProvider
               });
-            case 21:
+            case 2:
             case "end":
               return _context.stop();
           }

package/lib/electron/app.js

@@ -16,8 +16,6 @@ require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.starts-with.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");
@@ -29,16 +27,17 @@ var _electron = require("electron");
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("./logger");
 var _child_process = require("child_process");
+var _exitCodes = require("./exit-codes");
 var logger = (0, _logger.getLogger)();
 var hookApp = exports.hookApp = function hookApp(app) {
+  logger.info("hook app, main process id: ".concat(process.pid));
   var isWindowDestroyed = function isWindowDestroyed(window) {
     return window.isDestroyed();
   };
   app.commandLine.appendSwitch('ignore-certificate-errors');
   app.addListener('browser-window-created', function (_, window) {
     var windowId = window.id;
-    var windowTitle = window.getTitle();
-    logger.info("browser window is created, id: ".concat(windowId, ", title: ").concat(windowTitle));
+    logger.info("[electron][window]: browser window is created, id: ".concat(windowId));
     window.addListener('close', function () {
       _electron.BrowserWindow.getAllWindows().forEach(function (window) {
         if (!isWindowDestroyed(window)) {
@@ -50,9 +49,28 @@ var hookApp = exports.hookApp = function hookApp(app) {
       });
     });
     window.webContents.addListener('render-process-gone', function (event, details) {
-      logger.info("rowser window render-process-gone, window id: ".concat(windowId, ", window title: ").concat(windowTitle, ", details.exitCode: ").concat(details.exitCode, ", details.reason: ").concat(details.reason));
+      // 安全地获取 window 信息，避免在崩溃状态下访问可能失效的属性
+      var windowTitle = 'Unknown';
+      var windowId = 'Unknown';
+      try {
+        // 检查 window 是否仍然有效
+        if (!window.isDestroyed()) {
+          windowTitle = window.getTitle() || 'Unknown';
+          windowId = String(window.id);
+        }
+      } catch (error) {
+        logger.warn("[electron][window]: failed to get window info during crash: ".concat(error));
+      }
+
+      // 输出详细的崩溃信息
+      logger.error("[electron][window]: app exit due to render-process-gone event, window crash details - title: ".concat(windowTitle, ", id: ").concat(windowId, ", exitCode: ").concat(details.exitCode, ", reason: ").concat(details.reason));
+      logger.error('[electron][window]: exiting process due to render-process-gone event');
+      app.exit(_exitCodes.AppExitCode.RENDERER_PROCESS_GONE);
     });
     window.webContents.addListener('did-finish-load', function () {
+      var title = window.getTitle();
+      var processId = window.webContents.getOSProcessId();
+      logger.info("[electron][window]: browser window did finish load, id: ".concat(windowId, ", title: ").concat(title, ", process id: ").concat(processId));
       setTimeout(function () {
         _electron.BrowserWindow.getAllWindows().forEach(function (window) {
           if (!isWindowDestroyed(window)) {
@@ -131,11 +149,11 @@ var hookApp = exports.hookApp = function hookApp(app) {
     _electron.ipcMain.handle('checkMediaPermission', /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_, mediaType) {
         var accessStatus, res;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(mediaType === 'sharing')) {
-                _context.next = 3;
+                _context.next = 1;
                 break;
               }
               // below API call will trigger the system to add the permission for screen recording on macOS
@@ -143,20 +161,20 @@ var hookApp = exports.hookApp = function hookApp(app) {
                 types: ['screen']
               });
               return _context.abrupt("return", true);
-            case 3:
+            case 1:
               accessStatus = _electron.systemPreferences.getMediaAccessStatus(mediaType);
               if (!(accessStatus !== 'granted')) {
-                _context.next = 11;
+                _context.next = 3;
                 break;
               }
-              _context.next = 7;
+              _context.next = 2;
               return _electron.systemPreferences.askForMediaAccess(mediaType);
-            case 7:
+            case 2:
               res = _context.sent;
               return _context.abrupt("return", res);
-            case 11:
+            case 3:
               return _context.abrupt("return", true);
-            case 12:
+            case 4:
             case "end":
               return _context.stop();
           }

package/lib/electron/bootstrap-dev.js

@@ -10,8 +10,6 @@ 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.keys.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.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.filter.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -25,6 +23,7 @@ var _defaultOptions = require("./default-options");
 var _env = require("./env");
 var _main2 = require("./main");
 var _devtoolShortcut = require("./plugins/devtool-shortcut");
+var _exitCodes = require("./exit-codes");
 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; }
 (0, _main.initialize)();
@@ -38,7 +37,7 @@ _electron.app.addListener('ready', function () {
   }));
   (0, _main2.hookWindow)(mainWindow);
   mainWindow.addListener('closed', function () {
-    _electron.app.exit(0);
+    _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   });
   mainWindow.webContents.openDevTools({
     mode: 'detach'

package/lib/electron/bootstrap-sdk.js

@@ -8,8 +8,6 @@ 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/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -23,7 +21,6 @@ require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.parse-int.js");
 require("core-js/modules/es.string.starts-with.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");
 require("core-js/modules/esnext.json.parse.js");
@@ -41,6 +38,7 @@ var _devtoolShortcut = require("./plugins/devtool-shortcut");
 var _ipc = require("./ipc/ipc");
 var _type = require("./ipc/type");
 var _meetingState = require("./plugins/meeting-state");
+var _exitCodes = require("./exit-codes");
 var _process$argv$find;
 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; }
@@ -65,7 +63,7 @@ ipcClient.addObserver({
   },
   onDisconnected: function onDisconnected() {
     (0, _logger.getLogger)().info('IPC client disconnected from server');
-    _electron.app.exit(0);
+    _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   },
   onMessageReceived: function onMessageReceived(message) {
     switch (message.cmd) {
@@ -180,21 +178,17 @@ _electron.app.addListener('ready', function () {
     });
   });
   mainWindow.addListener('closed', function () {
-    _electron.app.exit(0);
+    _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   });
   mainWindow.addListener('close', function (e) {
     var closeListenerCount = mainWindow.listenerCount('close');
-    (0, _logger.getLogger)().info("mainWindow close listener count: ".concat(closeListenerCount, ", isInMeeting: ").concat(_meetingState.isInMeeting));
+    (0, _logger.getLogger)().info("main window close listener count: ".concat(closeListenerCount, ", isInMeeting: ").concat(_meetingState.isInMeeting));
     if (_meetingState.isInMeeting === 0) {
       e.preventDefault();
       mainWindow.hide();
       mainWindow.webContents.send('close-window-before-launch-success');
     }
   });
-  mainWindow.webContents.addListener('render-process-gone', function (e, details) {
-    (0, _logger.getLogger)().info("app exit due to render-process-gone event: ".concat(JSON.stringify(details)));
-    _electron.app.exit(0);
-  });
   if (_env.isDev) {
     mainWindow.webContents.openDevTools({
       mode: 'detach'

package/lib/electron/exit-codes.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Application exit codes
+ *
+ * These codes are used when calling app.exit() to indicate the reason for application termination.
+ * Using specific exit codes helps with debugging and process monitoring.
+ */
+export declare enum AppExitCode {
+    NORMAL_EXIT = 0,
+    /**
+     * Renderer process has unexpectedly terminated
+     * This typically indicates a crash or critical error in the sub window renderer process
+     */
+    RENDERER_PROCESS_GONE = 100
+}

package/lib/electron/exit-codes.js

@@ -0,0 +1,22 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AppExitCode = void 0;
+/**
+ * Application exit codes
+ *
+ * These codes are used when calling app.exit() to indicate the reason for application termination.
+ * Using specific exit codes helps with debugging and process monitoring.
+ */
+var AppExitCode = exports.AppExitCode = /*#__PURE__*/function (AppExitCode) {
+  AppExitCode[AppExitCode["NORMAL_EXIT"] = 0] = "NORMAL_EXIT";
+  /**
+   * Renderer process has unexpectedly terminated
+   * This typically indicates a crash or critical error in the sub window renderer process
+   */
+  AppExitCode[AppExitCode["RENDERER_PROCESS_GONE"] = 100] = "RENDERER_PROCESS_GONE";
+  return AppExitCode;
+}({});