fcr-ui-scene 3.7.5 → 3.7.7

package/installer/mac/entitlements.mac.plist

@@ -12,9 +12,5 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
-    <key>com.apple.security.network.server</key>
-    <true />
-    <key>com.apple.security.network.client</key>
-    <true />
   </dict>
-</plist>
+</plist>

package/lib/creator/index.js

@@ -113,7 +113,7 @@ 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", false);
+    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", true);
     (0, _defineProperty2["default"])(this, "_sceneObserver", null);
     (0, _defineProperty2["default"])(this, "_settingModule", null);
     (0, _defineProperty2["default"])(this, "_eventToastModule", null);
@@ -183,11 +183,17 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             type: _type.FcrUIGlobalNodeEventType.LAUNCH_SUCCESS,
             data: args
           });
-          if ((0, _env.isElectron)()) {
-            var windowProvider = _this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
-            var mainWindow = windowProvider.getCurrentWindow();
-            (0, _focusHelper.focusWindow)(mainWindow);
-          }
+
+          // if (isElectron()) {
+          //   const windowProvider = this._objectManager.getObject<FcrUIWindowProvider>(
+          //     FcrUIObjectKeys.P_WINDOW_PROVIDER,
+          //   );
+
+          //   const mainWindow = windowProvider.getCurrentWindow();
+
+          //   focusWindow(mainWindow);
+          // }
+
           onSuccess.apply(void 0, args);
         },
         onLaunchFailure: function onLaunchFailure() {
@@ -428,7 +434,9 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       this._globalNode.addSubNode(eventToastModule);
       this._globalNode.addSubNode(settingModule);
       this._globalNode.addToSlot('dialog', dialogModule.getComponent());
-      this._globalNode.addToSlot('toast', eventToastModule.getComponent('local'));
+      if (!(0, _env.isElectron)()) {
+        this._globalNode.addToSlot('toast', eventToastModule.getComponent('global'));
+      }
 
       // other global modules...
 

package/lib/creator/provider-initializer.browser.js

@@ -34,6 +34,7 @@ var _privilegeProvider = require("../providers/privilege-provider");
 var _rendererProvider = require("../providers/renderer-provider");
 var _roomProvider = require("../providers/room-provider/room-provider");
 var _sessionProvider = require("../providers/session-provider");
+var _widgetProvider = require("../providers/widget-provider");
 var _appListData = require("../shared-data/app-list-data");
 var _chatData = require("../shared-data/chat-data");
 var _devicePrivilegeData = require("../shared-data/device-privilege-data");
@@ -51,6 +52,7 @@ var _pinData = require("../shared-data/pin-data");
 var _provider5 = require("../providers/screen-share/provider.browser");
 var _provider6 = require("../providers/board-share/provider.browser");
 var _logger = require("../utilities/logger");
+var _widgetData = require("../shared-data/widget-data");
 var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer = /*#__PURE__*/function () {
   function FcrUIBrowserProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIBrowserProviderInitializer);
@@ -97,6 +99,8 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER, monitorProvider);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var sharedWidgetDataSource = new _widgetData.FcrUISharedWidgetDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE, sharedWidgetDataSource);
     }
   }, {
     key: "onCreatorRelease",
@@ -113,6 +117,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE);
       if (objectManager.size() > 0) {
         this.logger.error("remaing objects: ".concat(objectManager.keys()));
@@ -133,7 +138,13 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       var dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       var sharedScreenShareDataSource = new _screenShare.FcrUISharedScreenShareDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE, sharedScreenShareDataSource);
-      var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+      var sharedWidgetDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
+      var widgetProvider = new _widgetProvider.FcrUIWidgetProviderImpl({
+        sharedWidgetDataSource: sharedWidgetDataSource,
+        roomProvider: roomProvider,
+        dialogProvider: dialogProvider
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER, widgetProvider);
       var mainRoomControl = roomProvider.currentRoomControl;
       var sharingControl = mainRoomControl.getSharingControl();
       var streamControl = mainRoomControl.getStreamControl();
@@ -165,8 +176,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -225,7 +234,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);
@@ -246,6 +254,7 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_INTERPRETER_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
       // 其它如有遗漏可补充
     }
   }, {

package/lib/creator/provider-initializer.electron.js

@@ -35,6 +35,7 @@ var _phoneAudioProvider = require("../providers/phone-audio-provider");
 var _rendererProvider = require("../providers/renderer-provider");
 var _roomProvider = require("../providers/room-provider/room-provider");
 var _sessionProvider = require("../providers/session-provider");
+var _widgetProvider = require("../providers/widget-provider");
 var _appListData = require("../shared-data/app-list-data");
 var _chatData = require("../shared-data/chat-data");
 var _devicePrivilegeData = require("../shared-data/device-privilege-data");
@@ -57,6 +58,7 @@ var _speakerSpotlight = require("../shared-data/speaker-spotlight");
 var _pinData = require("../shared-data/pin-data");
 var _logger = require("../utilities/logger");
 var _provider8 = require("../providers/mouse-detect/provider");
+var _widgetData = require("../shared-data/widget-data");
 var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer = /*#__PURE__*/function () {
   function FcrUIElectronProviderInitializer(args) {
     (0, _classCallCheck2["default"])(this, FcrUIElectronProviderInitializer);
@@ -71,12 +73,14 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
     value: function onCreatorInitialize(engineConfig) {
       // initialize all providers and shared data sources
       var objectManager = this._objectManager;
+      var fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
+
+      // @ts-ignore
+      window.FcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
       var engine = new _fcrCore.FcrCoreEngine(engineConfig);
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE, engine);
       var renderer = new _renderer.FcrUIRendererWrapper();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER, renderer);
-      var mouseDetectProvider = new _provider8.FcrUIMouseDetectProviderImpl(objectManager);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MOUSE_DETECT_PROVIDER, mouseDetectProvider);
       var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_LOCAL_STORAGE_PROVIDER, localStorageProvider);
       var facilityProvider = new _provider5.FcrUIElectronFacilityProviderImpl({
@@ -93,6 +97,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         renderer: renderer
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER, windowProvider);
+      var mouseDetectProvider = new _provider8.FcrUIMouseDetectProviderImpl(objectManager);
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MOUSE_DETECT_PROVIDER, mouseDetectProvider);
       var eventProvider = new _eventProvider.FcrUIEventProviderImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER, eventProvider);
       var messageProvider = new _provider2.FcrUIMessageProviderImpl();
@@ -100,7 +106,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var sharedConfirmDataSource = new _confirmData.FcrUISharedConfirmDataSourceImpl();
       this._objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIRM_DATA_SOURCE, sharedConfirmDataSource);
       var dialogProvider = new _provider.FcrUIElectronDialogProviderImpl({
-        windowProvider: windowProvider
+        windowProvider: windowProvider,
+        renderer: renderer
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER, dialogProvider);
       var deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(renderer, facilityProvider, messageProvider, engine.getDesktopMediaControl(), sharedSettingDataSource);
@@ -113,6 +120,8 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MONITOR_PROVIDER, monitorProvider);
       var sharedLayoutDataSource = new _layoutData.FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_LAYOUT_DATA_SOURCE, sharedLayoutDataSource);
+      var sharedWidgetDataSource = new _widgetData.FcrUISharedWidgetDataSourceImpl();
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE, sharedWidgetDataSource);
     }
   }, {
     key: "onCreatorRelease",
@@ -132,6 +141,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.CORE_ENGINE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_CONFIRM_DATA_SOURCE);
       if (objectManager.size() > 0) {
@@ -152,7 +162,13 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       var sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
       var messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
       var dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
-      var widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+      var sharedWidgetDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_WIDGET_DATA_SOURCE);
+      var widgetProvider = new _widgetProvider.FcrUIWidgetProviderImpl({
+        sharedWidgetDataSource: sharedWidgetDataSource,
+        roomProvider: roomProvider,
+        dialogProvider: dialogProvider
+      });
+      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER, widgetProvider);
       var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
       var sharedScreenShareDataSource = new _screenShare.FcrUISharedScreenShareDataSourceImpl();
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE, sharedScreenShareDataSource);
@@ -187,8 +203,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -215,10 +229,9 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEETING_TIME_DATA_SOURCE, sharedMeetingTimeDataSource);
       var sharedMemberDataSource = new _memberData.FcrUISharedMemberDataSourceImpl(userControl, streamControl, sharedScreenShareDataSource, eventProvider, mainRoomControl.getSharingControl().getBoardControl());
       objectManager.setObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE, sharedMemberDataSource);
-      var fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
 
       // @ts-ignore
-      window.FcrUIMainWindowRenderer = fcrUIMainWindowRenderer;
+      var fcrUIMainWindowRenderer = window.FcrUIMainWindowRenderer;
       var whiteboardProvider = new _provider7.FcrUIBoardShareProviderImpl(objectManager, fcrUIMainWindowRenderer);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_BOARD_SHARE_PROVIDER, whiteboardProvider);
       var sharedSecurityDataSource = new _securityData.FcrUISecurityDataSourceImpl(privilegeProvider, sharedMemberDataSource);
@@ -241,7 +254,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         windowProvider: windowProvider,
         sharingControl: sharingControl,
         whiteboardProvider: whiteboardProvider,
-        fcrUIMainWindowRenderer: fcrUIMainWindowRenderer,
         screenShareProvider: screenShareProvider
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER, multiDisplayProvider);
@@ -262,7 +274,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);
@@ -284,6 +295,7 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.S_SHARED_INTERPRETER_DATA_SOURCE);
+      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
     }
   }, {
     key: "onWaitingSceneInitialize",

package/lib/creator.d.ts

@@ -0,0 +1,36 @@
+import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from './type';
+import { FcrUIDefaultScene } from './ui-scene';
+import SettingStore from './modules/setting/store';
+export interface FcrObservableSettingStore {
+    value: SettingStore | null;
+}
+export declare class FcrUISceneCreator {
+    private _config;
+    accessor observableSettingStore: FcrObservableSettingStore;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _userSettingStorageProvider;
+    private _registeredWidgetConfigs;
+    private _released;
+    private _scene;
+    private _microphoneKeepRecording;
+    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;
+    getVersion(): string;
+    getDependencyVersions(): Record<string, string>;
+    openSetting(): void;
+    closeSetting(): void;
+    private _releaseProviders;
+    release(): void;
+    private _resetScene;
+    private _precheckState;
+    private _filterKeepRecordingValueFromParameters;
+    private _setKeepRecordingValueFromParameters;
+    private _createSettingStore;
+}