fcr-ui-scene 3.6.2 → 3.6.4

package/lib/electron/main.js

@@ -9,40 +9,66 @@ require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/web.timers.js");
+var _electron = require("electron");
 var _window = require("./window");
 var _screenshot = require("./plugins/screenshot");
 var _logger = require("./logger");
 var _meetingState = require("./plugins/meeting-state");
+var _exitCodes = require("./exit-codes");
 var logger = (0, _logger.getLogger)();
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
-    logger.info("browser window is opened, frameName: ".concat(details.frameName));
+    logger.info("[electron][window]: browser window is opened, frameName: ".concat(details.frameName, ", windowId: ").concat(window.id));
     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', 'rename', 'annotation-tool', 'leave-meeting'];
     if (!builtinFrameNames.includes(details.frameName) && !details.frameName.startsWith('widget')) {
-      logger.info("frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
+      logger.info("[electron][window]: frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
     }
     (0, _window.putRendererWindow)(details.frameName, window);
     window.webContents.addListener('destroyed', function () {
-      logger.info("browser window is destroyed, frameName: ".concat(details.frameName));
+      logger.info("[electron][window]: browser window is destroyed, frameName: ".concat(details.frameName));
       (0, _window.deleteRendererWindow)(details.frameName);
     });
 
+    // 监听渲染进程崩溃事件
+    window.webContents.addListener('render-process-gone', function (event, details) {
+      // 安全地获取 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]: 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');
+      _electron.app.exit(_exitCodes.AppExitCode.RENDERER_PROCESS_GONE);
+    });
+
     // prevent the close event to keep the window alive and renderer process will take charge of when to close the window
     // renderer process will receive the will-close event, do some clean up and then call window.close() to close the window
     window.addListener('close', function (event) {
       event.preventDefault();
-      logger.info("Window [".concat(window.title, ":").concat(window.id, "] is closed by shortcut CMD + W, send 'will-close' event to that window"));
+      logger.info("[electron][window]: Window [".concat(window.title, ":").concat(window.id, "] is closed by shortcut CMD + W, send 'will-close' event to that window"));
       window.emit('will-close');
     });
     window.addListener('will-resize', function (event, newBounds, details) {
-      logger.info("Window [".concat(window.title, ":").concat(window.id, "] is resized, send 'custom-resize' event to that window"));
+      logger.info("[electron][window]: Window [".concat(window.title, ":").concat(window.id, "] is resized, send 'custom-resize' event to that window"));
       window.emit('custom-resize', event, newBounds, details);
     });
-    window.addListener('move', function () {
-      logger.info("Window [".concat(window.title, ":").concat(window.id, "] is move, send 'custom-move' event to that window"));
-      window.emit('custom-move');
-    });
+
+    // window.addListener('move', () => {
+    //   logger.info(
+    //     `Window [${window.title}:${window.id}] is move, send 'custom-move' event to that window`,
+    //   );
+    //   window.emit('custom-move');
+    // });
 
     // screen?.addListener('display-metrics-changed', (event, display, changedMetrics) => {
     //   logger.info(
@@ -55,12 +81,30 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
     attachEventOnMethod(window, 'show', 'CALL_SHOW');
   });
   mainWindow.webContents.addListener('render-process-gone', function (event, details) {
-    logger.info("main window render-process-gone, details: ".concat(details));
+    // 安全地获取主窗口信息，避免在崩溃状态下访问可能失效的属性
+    var mainWindowTitle = 'Main Window';
+    var mainWindowId = 'Unknown';
+    try {
+      // 检查主窗口是否仍然有效
+      if (!mainWindow.isDestroyed()) {
+        mainWindowTitle = mainWindow.getTitle() || 'Main Window';
+        mainWindowId = String(mainWindow.id);
+      }
+    } catch (error) {
+      logger.warn("[electron][window]: failed to get main window info during crash: ".concat(error));
+    }
+    logger.info("[electron][window]: main browser window render-process-gone, window [".concat(mainWindowTitle, ":").concat(mainWindowId, "], details.exitCode: ").concat(details.exitCode, ", details.reason: ").concat(details.reason));
     (0, _window.closeAllWindows)();
     (0, _window.clearAllRendererWindows)();
     setTimeout(function () {
-      logger.info('start reloading main window...');
-      mainWindow.reload();
+      logger.info('[electron][window]: start reloading main window...');
+      try {
+        if (!mainWindow.isDestroyed()) {
+          mainWindow.reload();
+        }
+      } catch (error) {
+        logger.error("[electron][window]: failed to reload main window: ".concat(error));
+      }
     }, 1000);
   });
   mainWindow.on('enter-full-screen', function () {
@@ -78,6 +122,7 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
 };
 var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, action) {
   var func = browserWindow[method];
+  logger.info("[electron][window]: attachEventOnMethod, method: ".concat(String(method), ", action: ").concat(action));
   if (typeof func === 'function') {
     // @ts-ignore
     browserWindow[method] = function () {

package/lib/electron/tools.js

@@ -18,10 +18,6 @@ require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.includes.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.async-iterator.reduce.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/electron/window.js

@@ -12,8 +12,6 @@ require("core-js/modules/es.object.get-own-property-descriptors.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.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");
@@ -34,8 +32,7 @@ var _electron = require("electron");
 var _defaultOptions = require("./default-options");
 var env = _interopRequireWildcard(require("./env"));
 var _logger = require("./logger");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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 windowOptionsMap = exports.windowOptionsMap = {};
@@ -68,9 +65,6 @@ var open = exports.open = function open(entryPath, dialogId) {
       delete windows[key];
       delete windowKeyById[windowId];
     });
-    browserWindow.webContents.addListener('render-process-gone', function (event, arg) {
-      logger.info("BrowserWindow [".concat(entryPath, "] render-process-gone: ").concat(arg));
-    });
     loadFragment(browserWindow, entryPath);
     windows[key] = browserWindow;
     windowKeyById[windowId] = entryPath;

package/lib/fragments/annotation/index.d.ts

@@ -1,5 +1,6 @@
 import { BaseFragment } from '../base';
 export declare class Annotation extends BaseFragment {
+    private _store;
     get name(): string;
     get component(): import("react/jsx-runtime").JSX.Element;
     constructor(runtime: Runtime);

package/lib/fragments/annotation/index.js

@@ -1,8 +1,17 @@
 "use strict";
 
+require("core-js/modules/es.array.iterator.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.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,62 +24,64 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _base = require("../base");
-var _root = require("react-hot-loader/root");
+var _store = _interopRequireWildcard(require("./store"));
+var _constant = require("../../utilities/constant");
+var _view = _interopRequireDefault(require("./view"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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 Annotation = exports.Annotation = /*#__PURE__*/function (_BaseFragment) {
   function Annotation(runtime) {
+    var _this;
     (0, _classCallCheck2["default"])(this, Annotation);
-    return _callSuper(this, Annotation, [runtime]); // this._store = new AnnotationStore();
-    // window.addEventListener('keydown', (event) => {
-    //   if ((event.ctrlKey || event.metaKey) && event.key === 'w') {
-    //     event.preventDefault();
-    //   }
-    // });
+    _this = _callSuper(this, Annotation, [runtime]);
+    _this._store = new _store["default"]();
+    window.addEventListener('keydown', function (event) {
+      if ((event.ctrlKey || event.metaKey) && event.key === 'w') {
+        event.preventDefault();
+      }
+    });
+    return _this;
   }
   (0, _inherits2["default"])(Annotation, _BaseFragment);
   return (0, _createClass2["default"])(Annotation, [{
     key: "name",
-    get:
-    // private _store: AnnotationStore;
-
-    function get() {
+    get: function get() {
       return 'annotation';
     }
   }, {
     key: "component",
     get: function get() {
-      // return (
-      //   <AnnotationStoreContext.Provider value={this._store}>
-      //     <View />
-      //   </AnnotationStoreContext.Provider>
-      // );
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.AnnotationStoreContext.Provider, {
+        value: this._store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
+      });
     }
   }, {
     key: "onEvent",
     value: function onEvent(event) {
-      // switch (event.action) {
-      //   case FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW:
-      //     if (event.payload) {
-      //       console.log('show annotation');
-      //       this._store.open();
-      //     } else {
-      //       console.log('hide annotation');
-      //       this._store.close();
-      //     }
-      //     break;
-      //   case FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS:
-      //     this._store.setBounds(event.payload as Electron.Rectangle);
-      //     break;
-      //   case FcrUIRendererEventAction.SET_ANNOTATION_IGNORE:
-      //     this._store.setIgnore(event.payload as boolean);
-      //     break;
-      //   default:
-      //     this._store.toolChanged(event);
-      //     break;
-      // }
+      switch (event.action) {
+        case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW:
+          if (event.payload) {
+            console.log('show annotation');
+            this._store.open();
+          } else {
+            console.log('hide annotation');
+            this._store.close();
+          }
+          break;
+        case _constant.FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS:
+          console.log('[annotation][onEvent]: set current share screen bounds', event);
+          this._store.setBounds(event.payload);
+          break;
+        case _constant.FcrUIRendererEventAction.SET_ANNOTATION_IGNORE:
+          this._store.setIgnore(event.payload);
+          break;
+        default:
+          this._store.toolChanged(event);
+          break;
+      }
     }
   }]);
 }(_base.BaseFragment);
@@ -91,16 +102,19 @@ var windowOptions = exports.windowOptions = {
   enableLargerThanScreen: true,
   hasShadow: false,
   x: 0,
-  y: 0
+  y: 0,
+  hiddenInMissionControl: true,
+  type: 'panel',
+  skipTaskbar: true
 };
 var title = exports.title = 'Annotation';
 var webPreferences = exports.webPreferences = {
   nodeIntegration: true
 };
 var $$fragment = new Annotation(window.runtime);
-var App = (0, _root.hot)(function () {
+var App = function App() {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react["default"].Fragment, {
     children: $$fragment.component
   });
-});
+};
 _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.getElementById('root'));

package/lib/fragments/annotation/store.d.ts

@@ -9,17 +9,22 @@ declare class AnnotationStore {
     private _config;
     accessor joined: boolean;
     accessor bounds: Electron.Rectangle;
+    accessor currentTool: string;
+    private timer;
     constructor();
     open(): Promise<void>;
     handleBoardDomLoad(dom: HTMLDivElement): void;
-    close(): void;
+    close(): Promise<void>;
     setBounds(bounds: Electron.Rectangle): void;
     setIgnore(ignore: boolean): void;
     toolChanged(event: RendererCustomEvent): void;
-    private _setBoardInstance;
+    private _initBoardStyle;
+    private _handleSetTool;
     private _init;
     private _initBoardRoom;
     private _initEngine;
+    private _launchHandler;
+    private _terminalHandler;
 }
 export default AnnotationStore;
 export declare const AnnotationStoreContext: import("react").Context<AnnotationStore>;