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

package/lib/creator.d.ts

@@ -8,26 +8,27 @@ export declare class FcrUISceneCreator {
     private _config;
     accessor observableSettingStore: FcrObservableSettingStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _settingConfigStorage;
     private _userSettingStorageProvider;
     private _registeredWidgetConfigs;
     private _released;
     private _scene;
     private _microphoneKeepRecording;
-    private _parameters;
+    private _sceneObserver;
     constructor(_config: FcrUISceneCreatorConfig);
+    private _initProviders;
     launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
     getSettingConfig(): FcrUISettingConfig;
     registerWidget(config: FcrUIWebWidgetConfig): void;
     unregisterWidget(widgetId: string): void;
     renewUserToken(token: string): void;
     setParameters(parameters: Record<string, unknown>): void;
-    private _initSettingStore;
     openSetting(): void;
     closeSetting(): void;
+    private _releaseProviders;
     release(): void;
     private _resetScene;
     private _precheckState;
     private _filterKeepRecordingValueFromParameters;
     private _setKeepRecordingValueFromParameters;
+    private _createSettingStore;
 }

package/lib/creator.js

@@ -25,9 +25,10 @@ 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"));
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.filter.js");
@@ -64,13 +65,10 @@ 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");
 require("core-js/modules/web.timers.js");
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uiScene = require("./ui-scene");
-var _i18n = require("agora-ui-foundation/lib/i18n");
-var _settingConfigStorage = require("./utilities/setting-config-storage");
 var _validateParams = _interopRequireDefault(require("./utilities/validate-params"));
 var _schema = require("./schema");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -93,6 +91,7 @@ var _localStorageProvider = require("./providers/local-storage-provider");
 var _logger = require("./utilities/logger");
 var _uiResources = require("./utilities/ui-resources");
 var _userSettingStorageProvider = require("./providers/user-setting-storage-provider");
+var _layoutData = require("./shared-data-source/layout-data");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["rtc.microphone.keep.recording"];
 var _FcrUISceneCreator;
@@ -118,7 +117,6 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     _classPrivateFieldInitSpec(this, _A, _init_observableSettingStore(this, {
       value: null
-      // isPreMeetingSettingsStore: true
     }));
     (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
       prefix: 'FcrUISceneCreator'
@@ -126,16 +124,14 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map([]));
     (0, _defineProperty2["default"])(this, "_released", false);
     (0, _defineProperty2["default"])(this, "_scene", null);
-    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", true);
-    (0, _defineProperty2["default"])(this, "_parameters", {});
+    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", false);
+    (0, _defineProperty2["default"])(this, "_sceneObserver", null);
     this._config = _config;
     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._settingConfigStorage = new _settingConfigStorage.FcrSettingConfigStorage({
-      userSettingStorageProvider: this._userSettingStorageProvider
-    });
+    this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._config, this._userSettingStorageProvider);
     this._setKeepRecordingValueFromParameters(this._config.parameters || {});
     var filteredParameters = this._filterKeepRecordingValueFromParameters(this._config.parameters || {});
     this.logger.info("[MicrophoneKeepRecording][initSettingStore] filteredParameters ==> ".concat(JSON.stringify(filteredParameters)));
@@ -167,7 +163,8 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     // @ts-ignore
     window.__core_engine = engine;
     this._engine = engine;
-    this._initSettingStore();
+    this._initProviders();
+    this._createSettingStore();
   }
   return (0, _createClass2["default"])(FcrUISceneCreator, [{
     key: "observableSettingStore",
@@ -177,6 +174,33 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "_initProviders",
+    value: function _initProviders() {
+      this._eventProvider = new _eventProvider.FcrUIEventProviderImpl();
+      this._messageProvider = new _messageProvider.FcrUIMessageProviderImpl();
+      this._dialogProvider = new _dialogProvider.FcrUIDialogProviderImpl();
+      this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, this._engine.getDesktopMediaControl(), this._sharedSettingDataSource);
+      this._sharedConfigDataSource = new _config2.FcrUISharedConfigDataSourceImpl({
+        creatorConfig: this._config
+      });
+      this._monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(this._engine.getMonitorControl());
+      this._sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(this._sharedConfigDataSource);
+      var openDefaultCamera = (0, _parameters.isOpenDefaultCamera)(this._config.parameters);
+      var openDefaultMicrophone = (0, _parameters.isOpenDefaultMicrophone)(this._config.parameters);
+      if (openDefaultCamera) {
+        this._sharedSettingDataSource.setMedia({
+          cameraExpectedOff: false
+        });
+      }
+      if (openDefaultMicrophone) {
+        this._sharedSettingDataSource.setMedia({
+          autoConnectAudio: true,
+          microphoneExpectedOff: false
+        });
+      }
+      this._deviceProvider.loadUiResources((0, _uiResources.getNormalDownloadResources)(this._config.resource));
+    }
   }, {
     key: "launch",
     value: function launch(config, onCancel, onSuccess, onFailure, dom) {
@@ -185,9 +209,26 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       if (this._scene) {
         throw new Error('scene is launched, please exit it before launching a new one.');
       }
-      (0, _i18n.changeLanguage)(config.language);
-      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage, this._registeredWidgetConfigs, this._engine);
-      scene.addObserver({
+
+      // changeLanguage(config.language);
+
+      var scene = new _uiScene.FcrUIDefaultScene({
+        config: config,
+        creatorConfig: this._config,
+        dom: dom,
+        registeredWidgetConfigs: this._registeredWidgetConfigs,
+        engine: this._engine,
+        eventProvider: this._eventProvider,
+        monitorProvider: this._monitorProvider,
+        deviceProvider: this._deviceProvider,
+        messageProvider: this._messageProvider,
+        dialogProvider: this._dialogProvider,
+        localStorageProvider: this._localStorageProvider,
+        sharedConfigDataSource: this._sharedConfigDataSource,
+        sharedSettingDataSource: this._sharedSettingDataSource,
+        sharedLayoutDataSource: this._sharedLayoutDataSource
+      });
+      var observer = {
         onLaunchSuccess: function onLaunchSuccess() {
           if (_this._microphoneKeepRecording) {
             var parameters = {
@@ -200,9 +241,17 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
           }
           onSuccess.apply(void 0, arguments);
         },
-        onLaunchFailure: onFailure,
-        onLaunchCancel: onCancel,
+        onLaunchFailure: function onLaunchFailure() {
+          onFailure.apply(void 0, arguments);
+          _this._resetScene();
+        },
+        onLaunchCancel: function onLaunchCancel() {
+          onCancel.apply(void 0, arguments);
+          _this._resetScene();
+        },
         onSettingStore: function onSettingStore(store) {
+          var _this$observableSetti;
+          (_this$observableSetti = _this.observableSettingStore.value) === null || _this$observableSetti === void 0 || _this$observableSetti.release();
           _this.observableSettingStore.value = store;
           _this.closeSetting();
         },
@@ -217,18 +266,17 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             _this._engine.setParameters(parameters);
           }
           _this.closeSetting();
-          _this._initSettingStore();
+          _this._releaseProviders();
+          _this._initProviders();
+          _this._createSettingStore();
           _this._resetScene();
         },
         onOpenSettingDialog: function onOpenSettingDialog() {
           _this.openSetting();
         }
-      });
-      scene.addObserver({
-        onLaunchFailure: this._resetScene,
-        onLaunchCancel: this._resetScene,
-        onExited: this._resetScene
-      });
+      };
+      this._sceneObserver = observer;
+      scene.addObserver(this._sceneObserver);
       scene.launch();
       this._scene = scene;
       return scene;
@@ -237,7 +285,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     key: "getSettingConfig",
     value: function getSettingConfig() {
       this._precheckState();
-      return this._settingConfigStorage;
+      return this._sharedSettingDataSource.settingConfig;
     }
   }, {
     key: "registerWidget",
@@ -259,89 +307,26 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
   }, {
     key: "setParameters",
     value: function setParameters(parameters) {
+      var _this$_engine;
       this._precheckState();
+      var filteredParameters = parameters;
+      this.logger.info("[MicrophoneKeepRecording][setParameters] parameters has no rtc ==> ".concat(JSON.stringify(parameters)));
       if (parameters.rtc) {
-        var _this$_engine;
-        this.logger.info("[MicrophoneKeepRecording][setParameters] parameters has rtc ==> ".concat(JSON.stringify(parameters)));
         this._setKeepRecordingValueFromParameters(parameters);
-        var filteredParameters = this._filterKeepRecordingValueFromParameters(parameters);
+        filteredParameters = this._filterKeepRecordingValueFromParameters(parameters);
         this.logger.info("[MicrophoneKeepRecording][setParameters] rtc filtered ==> ".concat(JSON.stringify(filteredParameters)));
-        this._parameters = filteredParameters;
-        (_this$_engine = this._engine) === null || _this$_engine === void 0 || _this$_engine.setParameters(filteredParameters);
-      } else {
-        var _this$_engine2;
-        this.logger.info("[MicrophoneKeepRecording][setParameters] parameters has no rtc ==> ".concat(JSON.stringify(parameters)));
-        this._parameters = parameters;
-        (_this$_engine2 = this._engine) === null || _this$_engine2 === void 0 || _this$_engine2.setParameters(parameters);
       }
+      (_this$_engine = this._engine) === null || _this$_engine === void 0 || _this$_engine.setParameters(filteredParameters);
+      this._sharedConfigDataSource.setParameters(parameters);
     }
-  }, {
-    key: "_initSettingStore",
-    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 (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              this._eventProvider = new _eventProvider.FcrUIEventProviderImpl();
-              this._messageProvider = new _messageProvider.FcrUIMessageProviderImpl();
-              this._dialogProvider = new _dialogProvider.FcrUIDialogProviderImpl();
-              this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, this._engine.getDesktopMediaControl(), this._settingConfigStorage.media, this._userSettingStorageProvider);
-              this._sharedConfigDataSource = new _config2.FcrUISharedConfigDataSourceImpl({
-                creatorConfig: this._config,
-                settingConfig: this._settingConfigStorage
-              });
-              this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._config, this._userSettingStorageProvider);
-              openDefaultCamera = (0, _parameters.isOpenDefaultCamera)(this._config.parameters);
-              openDefaultMicrophone = (0, _parameters.isOpenDefaultMicrophone)(this._config.parameters);
-              if (openDefaultCamera) {
-                this._settingConfigStorage.media.cameraExpectedOff = false;
-              }
-              if (openDefaultMicrophone) {
-                this._settingConfigStorage.media.autoConnectAudio = true;
-                this._settingConfigStorage.media.microphoneExpectedOff = false;
-              }
-              eventProvider = this._eventProvider;
-              deviceProvider = this._deviceProvider;
-              dialogProvider = this._dialogProvider;
-              messageProvider = this._messageProvider;
-              sharedConfigDataSource = this._sharedConfigDataSource;
-              sharedSettingDataSource = this._sharedSettingDataSource;
-              monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(this._engine.getMonitorControl());
-              deviceProvider.loadUiResources((0, _uiResources.getNormalDownloadResources)(this._config.resource));
-              _context.next = 1;
-              return deviceProvider.init();
-            case 1:
-              this.observableSettingStore.value = new _store["default"]({
-                uiEventStore: eventProvider,
-                monitorControl: monitorProvider,
-                deviceStore: deviceProvider,
-                config: sharedConfigDataSource === null || sharedConfigDataSource === void 0 ? void 0 : sharedConfigDataSource.sceneConfig,
-                parameters: sharedConfigDataSource === null || sharedConfigDataSource === void 0 ? void 0 : sharedConfigDataSource.creatorConfig.parameters,
-                messageProvider: messageProvider,
-                sharedSettingDataSource: sharedSettingDataSource,
-                dialogProvider: dialogProvider,
-                settingConfig: sharedConfigDataSource.settingConfig,
-                userId: this._config.userId,
-                userSettingStorageProvider: this._userSettingStorageProvider
-              });
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function _initSettingStore() {
-        return _initSettingStore2.apply(this, arguments);
-      }
-      return _initSettingStore;
-    }()
   }, {
     key: "openSetting",
     value: function openSetting() {
-      var _this2 = this;
+      var _this$observableSetti2,
+        _this2 = this;
       this._precheckState();
       this.closeSetting();
+      (_this$observableSetti2 = this.observableSettingStore.value) === null || _this$observableSetti2 === void 0 || _this$observableSetti2.initSettingConfig();
       setTimeout(function () {
         var settingContainer = document.createElement('div');
         settingContainer.setAttribute('id', 'setting-container');
@@ -365,17 +350,28 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
         document.body.removeChild(settingContainer);
       }
     }
+  }, {
+    key: "_releaseProviders",
+    value: function _releaseProviders() {
+      this._eventProvider.release();
+      this._deviceProvider.release();
+    }
   }, {
     key: "release",
     value: function release() {
-      var _this$_engine3;
-      (_this$_engine3 = this._engine) === null || _this$_engine3 === void 0 || _this$_engine3.release();
+      var _this$_engine2;
+      this._releaseProviders();
+      (_this$_engine2 = this._engine) === null || _this$_engine2 === void 0 || _this$_engine2.release();
       this._released = true;
       this._resetScene();
     }
   }, {
     key: "_resetScene",
     value: function _resetScene() {
+      if (this._sceneObserver) {
+        var _this$_scene;
+        (_this$_scene = this._scene) === null || _this$_scene === void 0 || _this$_scene.removeObserver(this._sceneObserver);
+      }
       this._scene = null;
     }
   }, {
@@ -424,6 +420,48 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
         this.logger.error("[MicrophoneKeepRecording][setParameters] error: ".concat(e));
       }
     }
+  }, {
+    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;
+    }()
   }]);
 }();
 _FcrUISceneCreator = FcrUISceneCreator;

package/lib/electron/app.js

@@ -188,7 +188,7 @@ var hookApp = exports.hookApp = function hookApp(app) {
       var execMap = {
         camera: "open x-apple.systempreferences:com.apple.preference.security?Privacy_Camera",
         microphone: "open x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone",
-        sharing: "open x-apple.systempreferences:com.apple.preference.security?Privacy_AudioCapture"
+        sharing: "open x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture"
       };
       (0, _child_process.exec)(execMap[mediaType]);
     });

package/lib/electron/bootstrap-sdk.js

@@ -2,18 +2,16 @@
 
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.push.js");
 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.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
@@ -23,7 +21,9 @@ require("core-js/modules/es.parse-int.js");
 require("core-js/modules/es.string.starts-with.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");
 require("core-js/modules/esnext.json.parse.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.timers.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _electron = require("electron");
@@ -62,7 +62,13 @@ ipcClient.addObserver({
     }
   },
   onDisconnected: function onDisconnected() {
-    (0, _logger.getLogger)().info('IPC client disconnected from server');
+    (0, _logger.getLogger)().info('IPC client disconnected from server, close all windows');
+    _electron.BrowserWindow.getAllWindows().forEach(function (window) {
+      if (window.isDestroyed()) {
+        return;
+      }
+      window.close();
+    });
     _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   },
   onMessageReceived: function onMessageReceived(message) {
@@ -117,6 +123,18 @@ ipcClient.addObserver({
           mainWindow.webContents.send(_type.IPCMessageCMD.SetParameters, message.data);
         }
         break;
+      case _type.IPCMessageCMD.RenewUserToken:
+        (0, _logger.getLogger)().info("RenewUserToken: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.RenewUserToken, message.data);
+        }
+        break;
+      case _type.IPCMessageCMD.ExitUiScene:
+        (0, _logger.getLogger)().info("ExitUiScene: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.ExitUiScene, message.data);
+        }
+        break;
       default:
         (0, _logger.getLogger)().info("Unknown command: ".concat(message.cmd));
         break;
@@ -169,6 +187,22 @@ _electron.app.addListener('ready', function () {
       }
     });
   });
+  _electron.ipcMain.addListener('widget-clicked', function (_, widgetId) {
+    (0, _logger.getLogger)().info("widget-clicked in bootstrap-sdk: ".concat(widgetId));
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.WidgetClicked,
+      data: {
+        widgetId: widgetId
+      }
+    });
+  });
+  _electron.ipcMain.addListener('user-token-will-expire', function () {
+    (0, _logger.getLogger)().info("user-token-will-expire in bootstrap-sdk");
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.TokenWillExpire,
+      data: {}
+    });
+  });
   (0, _2.hookWindow)(mainWindow);
   mainWindow.webContents.addListener('did-finish-load', function () {
     mainWindowReady = true;
@@ -202,4 +236,15 @@ _electron.app.addListener('ready', function () {
 });
 _electron.app.addListener('browser-window-created', function (_, window) {
   (0, _main.enable)(window.webContents);
+});
+
+// 添加退出事件监听器用于诊断
+_electron.app.addListener('before-quit', function (event) {
+  (0, _logger.getLogger)().info('app before-quit event triggered');
+});
+_electron.app.addListener('will-quit', function (event) {
+  (0, _logger.getLogger)().info('app will-quit event triggered');
+});
+_electron.app.addListener('quit', function (event, exitCode) {
+  (0, _logger.getLogger)().info("app quit event triggered with exit code: ".concat(exitCode));
 });

package/lib/electron/injections.d.ts

@@ -32,7 +32,7 @@ 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 checkMediaPermission: (mediaType: "microphone" | "camera" | "sharing") => Promise<any>;
-export declare const openSystemPreferences: (mediaType: "microphone" | "camera") => void;
+export declare const openSystemPreferences: (mediaType: "microphone" | "camera" | "sharing") => void;
 export declare const closeRendererWindow: (frameName: string) => Promise<void>;
 export declare const launch: (options: any) => Promise<any>;
 export declare const quitApp: () => void;
@@ -64,3 +64,7 @@ export declare const launchFailure: (roomId: string, errorCode: number) => void;
 export declare const setParameters: (parameters: string) => void;
 export declare const exitedMeeting: (roomId: string, reason: string) => void;
 export declare const getIsMeetingLaunched: () => Promise<any>;
+export declare const onWidgetClicked: (widgetId: string) => void;
+export declare const onUserTokenWillExpire: () => void;
+export declare const refreshUserToken: (token: string) => void;
+export declare const onExitUiScene: () => void;

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.setParameters = exports.setInMeetingState = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.releaseSubAllWindowRefs = exports.registerListenerReady = exports.quitApp = exports.openSystemPreferences = exports.openSetting = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.loadBuiltinResources = exports.launchSuccess = exports.launchFailure = exports.launch = exports.initSDK = exports.getWindows = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getResourceByFileType = exports.getNetworkType = exports.getMediaSourceIdList = exports.getLaunchOptions = exports.getIsSDKReady = exports.getIsMeetingLaunched = exports.getBundleType = exports.getBrowserWindowById = exports.getActiveWindow = exports.fileToBlob = exports.fileToBase64 = exports.exitedMeeting = exports.closeRendererWindow = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.browserWindow = exports.addEventListener = exports.FcrNumericExitReason = void 0;
+exports.showItemInFolder = exports.setUserSettingData = exports.setParameters = exports.setInMeetingState = exports.setFragmentOptions = exports.setFragmentBaseUrl = exports.sendEvent = exports.screen = exports.restartApp = exports.removeEventListener = exports.releaseSubAllWindowRefs = exports.registerListenerReady = exports.refreshUserToken = exports.quitApp = exports.openSystemPreferences = exports.openSetting = exports.openRendererWindow = exports.openLinkInDefaultBrowser = exports.openDirectory = exports.open = exports.onWidgetClicked = exports.onUserTokenWillExpire = exports.onExitUiScene = exports.loadBuiltinResources = exports.launchSuccess = exports.launchFailure = exports.launch = exports.initSDK = exports.getWindows = exports.getUserSettingData = exports.getSystemMemorySize = exports.getSystemCpuInfo = exports.getResourceByFileType = exports.getNetworkType = exports.getMediaSourceIdList = exports.getLaunchOptions = exports.getIsSDKReady = exports.getIsMeetingLaunched = exports.getBundleType = exports.getBrowserWindowById = exports.getActiveWindow = exports.fileToBlob = exports.fileToBase64 = exports.exitedMeeting = exports.closeRendererWindow = exports.close = exports.checkMediaPermission = exports.captureScreen = exports.browserWindow = exports.addEventListener = exports.FcrNumericExitReason = 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");
@@ -898,4 +898,16 @@ var getIsMeetingLaunched = exports.getIsMeetingLaunched = /*#__PURE__*/function
   return function getIsMeetingLaunched() {
     return _ref13.apply(this, arguments);
   };
-}();
+}();
+var onWidgetClicked = exports.onWidgetClicked = function onWidgetClicked(widgetId) {
+  _electron.ipcRenderer.send('widget-clicked', widgetId);
+};
+var onUserTokenWillExpire = exports.onUserTokenWillExpire = function onUserTokenWillExpire() {
+  _electron.ipcRenderer.send('user-token-will-expire');
+};
+var refreshUserToken = exports.refreshUserToken = function refreshUserToken(token) {
+  _electron.ipcRenderer.send('refresh-user-token', token);
+};
+var onExitUiScene = exports.onExitUiScene = function onExitUiScene() {
+  _electron.ipcRenderer.send('exit-ui-scene');
+};

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

@@ -1,11 +1,15 @@
 export declare enum IPCMessageCMD {
     ElectronMainWindowLoaded = "electron-main-window-loaded",
-    InitCreator = "init-creator",
+    LaunchSuccess = "launch-meeting-success",
+    LaunchFailure = "launch-meeting-failure",
+    ExitedMeeting = "exited-meeting",
+    WidgetClicked = "widget-clicked",
+    TokenWillExpire = "user-token-will-expire",
     LaunchMeeting = "launch-meeting",
+    InitCreator = "init-creator",
     OpenSetting = "open-setting",
     CloseSetting = "close-setting",
-    LaunchSuccess = "launch-meeting-success",
-    LaunchFailure = "launch-meeting-failure",
     SetParameters = "set-parameters",
-    ExitedMeeting = "exited-meeting"
+    RenewUserToken = "renew-user-token",
+    ExitUiScene = "exit-ui-scene"
 }

package/lib/electron/ipc/type.js

@@ -6,14 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.IPCMessageCMD = void 0;
 var IPCMessageCMD = exports.IPCMessageCMD = /*#__PURE__*/function (IPCMessageCMD) {
+  // send
   IPCMessageCMD["ElectronMainWindowLoaded"] = "electron-main-window-loaded";
-  IPCMessageCMD["InitCreator"] = "init-creator";
+  IPCMessageCMD["LaunchSuccess"] = "launch-meeting-success";
+  IPCMessageCMD["LaunchFailure"] = "launch-meeting-failure";
+  IPCMessageCMD["ExitedMeeting"] = "exited-meeting";
+  IPCMessageCMD["WidgetClicked"] = "widget-clicked";
+  IPCMessageCMD["TokenWillExpire"] = "user-token-will-expire";
+  // handle
   IPCMessageCMD["LaunchMeeting"] = "launch-meeting";
+  IPCMessageCMD["InitCreator"] = "init-creator";
   IPCMessageCMD["OpenSetting"] = "open-setting";
   IPCMessageCMD["CloseSetting"] = "close-setting";
-  IPCMessageCMD["LaunchSuccess"] = "launch-meeting-success";
-  IPCMessageCMD["LaunchFailure"] = "launch-meeting-failure";
   IPCMessageCMD["SetParameters"] = "set-parameters";
-  IPCMessageCMD["ExitedMeeting"] = "exited-meeting";
+  IPCMessageCMD["RenewUserToken"] = "renew-user-token";
+  IPCMessageCMD["ExitUiScene"] = "exit-ui-scene";
   return IPCMessageCMD;
 }({});

package/lib/electron/logger.js

@@ -21,7 +21,7 @@ var LoggerManager = /*#__PURE__*/function () {
   function LoggerManager() {
     (0, _classCallCheck2["default"])(this, LoggerManager);
     this.initialize({
-      logFilePath: _path["default"].resolve(_electron.app.getPath('logs'), 'logs', 'apaas-main.log'),
+      logFilePath: _path["default"].resolve(_electron.app.getPath('logs'), 'logs', 'agora-main.log'),
       console: true
     });
   }

package/lib/electron/main.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.hookWindow = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/web.timers.js");
 var _electron = require("electron");
@@ -19,7 +21,7 @@ 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'];
+    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'];
     if (!builtinFrameNames.includes(details.frameName) && !details.frameName.startsWith('widget')) {
       logger.info("[electron][window]: frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
@@ -126,10 +128,11 @@ var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, ac
   if (typeof func === 'function') {
     // @ts-ignore
     browserWindow[method] = function () {
+      logger.info("[electron][window]: attachEventOnMethod, method: ".concat(String(method), ", action: ").concat(action, ", broswerWindow title: ").concat(browserWindow.title, ", browserWindow bounds: ").concat(JSON.stringify(browserWindow.getBounds())));
+      // @ts-ignore
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      // @ts-ignore
       func.apply(this, args);
       this.webContents.send('custom-event', {
         action: action