fcr-ui-scene 3.7.2 → 3.7.3

package/lib/creator.js

@@ -25,9 +25,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISceneCreator = 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"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
@@ -130,7 +128,6 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     this.logger.info("creator config: ".concat(JSON.stringify(_config)));
     this._localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
     this._userSettingStorageProvider = new _userSettingStorageProvider.FcrUIUserSettingStorageProviderImpl();
-    this._localStorageProvider.write('annotation_rtm_app_id', this._config.appId);
     this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._config, this._userSettingStorageProvider);
     this._setKeepRecordingValueFromParameters(this._config.parameters || {});
     var filteredParameters = this._filterKeepRecordingValueFromParameters(this._config.parameters || {});
@@ -422,50 +419,32 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     }
   }, {
     key: "_createSettingStore",
-    value: function () {
-      var _createSettingStore2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var _this$observableSetti3;
-        var eventProvider, deviceProvider, dialogProvider, messageProvider, sharedConfigDataSource, sharedSettingDataSource, monitorProvider, sharedLayoutDataSource;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 1;
-              return this._deviceProvider.initDeviceList();
-            case 1:
-              eventProvider = this._eventProvider;
-              deviceProvider = this._deviceProvider;
-              dialogProvider = this._dialogProvider;
-              messageProvider = this._messageProvider;
-              sharedConfigDataSource = this._sharedConfigDataSource;
-              sharedSettingDataSource = this._sharedSettingDataSource;
-              monitorProvider = this._monitorProvider;
-              sharedLayoutDataSource = this._sharedLayoutDataSource;
-              (_this$observableSetti3 = this.observableSettingStore.value) === null || _this$observableSetti3 === void 0 || _this$observableSetti3.release();
-              this.observableSettingStore.value = new _store["default"]({
-                eventProvider: eventProvider,
-                deviceProvider: deviceProvider,
-                monitorProvider: monitorProvider,
-                sharedConfigDataSource: sharedConfigDataSource,
-                messageProvider: messageProvider,
-                sharedSettingDataSource: sharedSettingDataSource,
-                dialogProvider: dialogProvider,
-                sharedLayoutDataSource: sharedLayoutDataSource
-              });
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function _createSettingStore() {
-        return _createSettingStore2.apply(this, arguments);
-      }
-      return _createSettingStore;
-    }()
+    value: function _createSettingStore() {
+      var _this$observableSetti3;
+      var eventProvider = this._eventProvider;
+      var deviceProvider = this._deviceProvider;
+      var dialogProvider = this._dialogProvider;
+      var messageProvider = this._messageProvider;
+      var sharedConfigDataSource = this._sharedConfigDataSource;
+      var sharedSettingDataSource = this._sharedSettingDataSource;
+      var monitorProvider = this._monitorProvider;
+      var sharedLayoutDataSource = this._sharedLayoutDataSource;
+      (_this$observableSetti3 = this.observableSettingStore.value) === null || _this$observableSetti3 === void 0 || _this$observableSetti3.release();
+      this.observableSettingStore.value = new _store["default"]({
+        eventProvider: eventProvider,
+        deviceProvider: deviceProvider,
+        monitorProvider: monitorProvider,
+        sharedConfigDataSource: sharedConfigDataSource,
+        messageProvider: messageProvider,
+        sharedSettingDataSource: sharedSettingDataSource,
+        dialogProvider: dialogProvider,
+        sharedLayoutDataSource: sharedLayoutDataSource
+      });
+    }
   }]);
 }();
 _FcrUISceneCreator = FcrUISceneCreator;
-var _applyDecs$e = _applyDecs(_FcrUISceneCreator, [[_mobx.observable, 1, "observableSettingStore"], [_launchDecs, 2, "launch"], [_decorator.trace, 2, "getSettingConfig"], [_decorator.trace, 2, "registerWidget"], [_decorator.trace, 2, "unregisterWidget"], [_decorator.trace, 2, "renewUserToken"], [_decorator.trace, 2, "setParameters"], [[_decorator.trace, _decorator.bound], 2, "openSetting"], [[_decorator.trace, _decorator.bound], 2, "closeSetting"], [_decorator.bound, 2, "_resetScene"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUISceneCreator, [[_mobx.observable, 1, "observableSettingStore"], [_launchDecs, 2, "launch"], [_decorator.trace, 2, "getSettingConfig"], [_decorator.trace, 2, "registerWidget"], [_decorator.trace, 2, "unregisterWidget"], [_decorator.trace, 2, "renewUserToken"], [_decorator.trace, 2, "setParameters"], [[_decorator.trace, _decorator.bound], 2, "openSetting"], [[_decorator.trace, _decorator.bound], 2, "closeSetting"], [_decorator.trace, 2, "release"], [_decorator.bound, 2, "_resetScene"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
 _init_observableSettingStore = _applyDecs$e2[0];
 _initProto = _applyDecs$e2[1];

package/lib/electron/app.js

@@ -35,6 +35,13 @@ var hookApp = exports.hookApp = function hookApp(app) {
     return window.isDestroyed();
   };
   app.commandLine.appendSwitch('ignore-certificate-errors');
+  // app.commandLine.appendSwitch('enable-logging');
+  // app.commandLine.appendSwitch('log-level', '0');
+  // app.commandLine.appendSwitch('v', '1');
+
+  // 启用 V8 调试信息
+  // app.commandLine.appendSwitch('js-flags', '--expose-gc --trace-gc');
+
   app.addListener('browser-window-created', function (_, window) {
     var windowId = window.id;
     logger.info("[electron][window]: browser window is created, id: ".concat(windowId));

package/lib/electron/injections.d.ts

@@ -30,7 +30,7 @@ export declare const captureScreen: (options?: {
 }) => void;
 export declare const getActiveWindow: () => WindowManager;
 export declare const getWindows: () => WindowManager[];
-export declare const openRendererWindow: (frameName: string, renderFn: (dom: Element, browserWindow: Electron.BrowserWindow, newRendererWindow: Window) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
+export declare const openRendererWindow: (frameName: string, renderFn: (dom: Element, browserWindow: Electron.BrowserWindow, newRendererWindow: Window, baseUrl: string) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
 export declare const checkMediaPermission: (mediaType: "microphone" | "camera" | "sharing") => Promise<any>;
 export declare const openSystemPreferences: (mediaType: "microphone" | "camera" | "sharing") => void;
 export declare const closeRendererWindow: (frameName: string) => Promise<void>;

package/lib/electron/injections.js

@@ -54,6 +54,7 @@ var _promises = _interopRequireDefault(require("fs/promises"));
 var _jszip = _interopRequireDefault(require("jszip"));
 var _nodeWindowManager = require("node-window-manager");
 var _exitCodes = require("./exit-codes");
+var _env = require("./env");
 var USER_SETTING_DATA_FILE_NAME = 'UserSettingData.json';
 
 // Numeric exit reason enum
@@ -173,11 +174,12 @@ var rendererWindows = {};
 var rendererWindowMutationObservers = {};
 var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(frameName, renderFn, windowOptions) {
-    var rendererWindow, windowConstructorOptionsString, newRendererWindow, windowId, _browserWindow, renderDom, parentWindow, parentHead, parentStyles, parentStyleLinks, stylesLoadedPromises, oldenObserver, observer, parentRoot, parentRootStyles, _windowId, _browserWindow2, _newRendererWindow, _renderDom;
+    var rendererWindow, baseUrl, windowConstructorOptionsString, newRendererWindow, windowId, _browserWindow, renderDom, parentWindow, parentHead, parentStyles, parentStyleLinks, stylesLoadedPromises, oldenObserver, observer, parentRoot, parentRootStyles, _windowId, _browserWindow2, _newRendererWindow, _renderDom;
     return _regenerator["default"].wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           rendererWindow = rendererWindows[frameName];
+          baseUrl = _env.isDev ? "".concat(_env.devPageUrl) : ".";
           if (rendererWindow) {
             _context3.next = 5;
             break;
@@ -269,7 +271,7 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
             delete rendererWindows[frameName];
           };
           Promise.allSettled(stylesLoadedPromises)["finally"](function () {
-            renderFn(renderDom, _browserWindow, newRendererWindow);
+            renderFn(renderDom, _browserWindow, newRendererWindow, baseUrl);
           });
         case 4:
           _context3.next = 9;
@@ -297,7 +299,7 @@ var openRendererWindow = exports.openRendererWindow = /*#__PURE__*/function () {
           }
           return _context3.abrupt("return");
         case 8:
-          renderFn(_renderDom, _browserWindow2, _newRendererWindow);
+          renderFn(_renderDom, _browserWindow2, _newRendererWindow, baseUrl);
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.show();
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.focus();
           _browserWindow2 === null || _browserWindow2 === void 0 || _browserWindow2.moveTop();

package/lib/electron/main.js

@@ -21,7 +21,9 @@ var logger = (0, _logger.getLogger)();
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     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', 'end-meeting'];
+    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', 'end-meeting', 'sub-window'];
+    // const builtinFrameNames = Object.values(FcrUIDialogKey);
+
     if (!builtinFrameNames.includes(details.frameName) && !details.frameName.startsWith('widget')) {
       logger.info("[electron][window]: frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;

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

@@ -1,5 +1,6 @@
 import { BaseFragment } from '../base';
 export declare class AnnotationFragment extends BaseFragment {
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _fragmentStore;
     get name(): string;
     get component(): import("react/jsx-runtime").JSX.Element;

package/lib/fragments/annotation/index.js

@@ -19,6 +19,7 @@ var _constant = require("../../utilities/constant");
 var _base = require("../base");
 var _store = require("./store");
 var _view = _interopRequireDefault(require("./view"));
+var _logger = require("../../utilities/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -27,6 +28,9 @@ var AnnotationFragment = exports.AnnotationFragment = /*#__PURE__*/function (_Ba
     var _this;
     (0, _classCallCheck2["default"])(this, AnnotationFragment);
     _this = _callSuper(this, AnnotationFragment, [runtime]);
+    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.createFragmentLogger)({
+      prefix: 'AnnotationFragment'
+    }));
     (0, _defineProperty2["default"])(_this, "_fragmentStore", new _store.FragmentAnnotationStore());
     window.addEventListener('keydown', function (event) {
       if ((event.ctrlKey || event.metaKey) && event.key === 'w') {
@@ -55,28 +59,28 @@ var AnnotationFragment = exports.AnnotationFragment = /*#__PURE__*/function (_Ba
       switch (event.action) {
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_OPEN:
           if (event.payload) {
-            console.log('onEvent open annotation');
+            this.logger.info('onEvent open annotation');
             this._fragmentStore.open();
           } else {
-            console.log('onEvent close annotation');
+            this.logger.info('onEvent close annotation');
             this._fragmentStore.close();
           }
           break;
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW:
           if (event.payload) {
-            console.log('show annotation');
+            this.logger.info('show annotation');
             this._fragmentStore.show();
           } else {
-            console.log('hide annotation');
+            this.logger.info('hide annotation');
             this._fragmentStore.hide();
           }
           break;
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_FOCUS:
-          console.log('focus annotation');
+          this.logger.info('focus annotation');
           this._fragmentStore.focus();
           break;
         case _constant.FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS:
-          console.log('[annotation][onEvent]: set current share screen bounds', event);
+          this.logger.info('[annotation][onEvent]: set current share screen bounds', event);
           this._fragmentStore.setBounds(event.payload);
           break;
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_IGNORE:
@@ -115,7 +119,9 @@ var windowOptions = exports.windowOptions = {
   y: 0,
   hiddenInMissionControl: true,
   type: 'panel',
-  skipTaskbar: true
+  skipTaskbar: true,
+  minimizable: false,
+  maximizable: false
 };
 var title = exports.title = 'Annotation';
 var webPreferences = exports.webPreferences = {

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

@@ -6,16 +6,19 @@ export declare class FragmentAnnotationStore {
     private _boardRoom;
     private _boardView;
     private _boardDom?;
-    private _config;
+    private _config?;
     accessor joined: boolean;
     accessor bounds: Electron.Rectangle;
     accessor currentTool: string;
-    accessor isIgnore: boolean;
     accessor drawing: boolean;
     private _hasWaitingOpen;
     private _lastViewPortSet;
-    private _currentAnntationView;
     private _pollingCancelHandler;
+    private _checkForConnectTask;
+    private _checkForConnectTaskInterval;
+    private _isEngineInitialized;
+    private _openAbortController;
+    private _openLock;
     constructor();
     open(): Promise<void>;
     handleBoardDomLoad(dom: HTMLDivElement): void;
@@ -35,7 +38,7 @@ export declare class FragmentAnnotationStore {
     private _handleSetTool;
     private _init;
     private _initBoardRoom;
-    private _initEngine;
+    private _createEngine;
     private _launchHandler;
     private _terminalHandler;
     private _resizeToMax;
@@ -43,5 +46,6 @@ export declare class FragmentAnnotationStore {
     private _handlePollingUpdateWindowSize;
     private _handleBoardRoomUserJoin;
     private _syncScreenShareOwnerOpenDone;
+    private _checkForConnect;
 }
 export declare const FragmentAnnotationStoreContext: import("react").Context<FragmentAnnotationStore>;