fcr-ui-scene 3.7.2 → 3.7.3

package/lib/providers/privilege-provider.js

@@ -45,9 +45,7 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
-require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
@@ -406,7 +404,6 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       });
       var shareState = info === null || info === void 0 ? void 0 : info.payload;
       var annotationStartSecurityInfoState = (shareState === null || shareState === void 0 ? void 0 : shareState.start) === _enums.FcrSharePermissionState.ON;
-      _this.logger.info("[Annotation] hasAnnotationStartPermission, ".concat(annotationStartSecurityInfoState));
       return annotationStartSecurityInfoState;
     });
     (0, _defineProperty2["default"])(this, "hasAnnotationAllowWritePermission", function () {
@@ -710,9 +707,6 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
       _this._userControl.removeObserver(userObserver);
       _this._privilegeControl.removeObserver(privilegeObserver);
     });
-
-    //@ts-ignore
-    window.securityStore = this;
   }
   return (0, _createClass2["default"])(FcrUIPrivilegeProviderImpl, [{
     key: "canOperateWatermark",
@@ -774,7 +768,7 @@ var FcrUIPrivilegeProviderImpl = exports.FcrUIPrivilegeProviderImpl = /*#__PURE_
   }, {
     key: "printAllPermissions",
     value: function printAllPermissions() {
-      this.logger.debug(JSON.stringify((0, _mobx.toJS)(this.permissionInfos)));
+      this.logger.debug((0, _imports.jsonstring)((0, _mobx.toJS)(this.permissionInfos)));
     }
   }, {
     key: "release",

package/lib/providers/room-provider.js

@@ -556,6 +556,9 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
     this._privilegeControl = _mainRoomControl.getPrivilegeControl();
     this._userControl = _mainRoomControl.getUserControl();
     this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(_mainRoomControl.getPrivilegeControl(), _mainRoomControl.getUserControl(), _mainRoomControl.getStreamControl(), eventProvider);
+
+    // @ts-ignore
+    window._mainRoomPrivilegeProvider = this._privilegeProvider;
     this._privilegeObserver = {
       onSecurityInfoUpdated: this._handleSecurityUpdated.bind(this)
     };
@@ -572,8 +575,8 @@ var FcrUIMainRoomControlProviderImpl = exports.FcrUIMainRoomControlProviderImpl
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
         if (event.reason === _type4.AgoraRteUserUpdatedReason.ROLE) {
-          _this2._handleUserRoleChangeToast(event.modifiedUser);
           _this2._userMap.set(event.modifiedUser.userId, event.modifiedUser);
+          _this2._handleUserRoleChangeToast(event.modifiedUser);
         }
       }
     };
@@ -884,6 +887,9 @@ var FcrUIWaitingRoomControlProviderImpl = exports.FcrUIWaitingRoomControlProvide
     value: function _setWaitingRoomControl(roomControl) {
       this._waitingRoomControl = roomControl;
       this._privilegeProvider = new _privilegeProvider.FcrUIPrivilegeProviderImpl(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), this._eventProvider);
+
+      // @ts-ignore
+      window._waitingRoomPrivilegeProvider = this._privilegeProvider;
     }
   }]);
 }();

package/lib/providers/screen-share-provider.d.ts

@@ -9,6 +9,7 @@ import { FcrUIEventProvider } from './event-provider';
 import { FcrUIMemberSharedDataSourceImpl } from '../shared-data-source/member-data';
 import { CurrentShareBounds } from '../modules/control-bar/types';
 import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIPrivilegeProvider } from './privilege-provider';
 export interface FcrUIScreenShareObserver {
     /**
      * 本地屏幕开启采集
@@ -169,6 +170,7 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
     private _sharingProvider;
     private _sharedScreenShareSharedDataSource;
     private _sharedMemberDataSource;
+    private _privilegeProvider;
     protected logger: import("agora-foundation/lib/logger").Logger;
     shareLock: boolean;
     private _sharingControl?;
@@ -192,7 +194,7 @@ export declare class FcrUIScreenShareProviderImpl implements FcrUIScreenSharePro
         height: number;
     };
     get screenShareScenarioType(): FcrScreenScenarioType;
-    constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl);
+    constructor(_deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _roomProvider: FcrUIRoomProvider, _sharingProvider: FcrUISharingProvider, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedMemberDataSource: FcrUIMemberSharedDataSourceImpl, _privilegeProvider: FcrUIPrivilegeProvider);
     setSharingInReplace(isInReplace: boolean): void;
     zoomOut(): void;
     zoomIn(): void;

package/lib/providers/screen-share-provider.js

@@ -41,6 +41,7 @@ exports.FcrUIScreenShareProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 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.includes.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
@@ -52,7 +53,9 @@ require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.includes.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.iterator.some.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -83,7 +86,7 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 _ref = (_zoomOutDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _handleScreenCaptureStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleShareStopWithAudioDecs = [_mobx.action, _mobx.action.bound], _replaceScreenShareDecs = [_mobx.action, _mobx.action.bound], _handleRemoteVideoStatsUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdateDecs = [_mobx.action, _mobx.action.bound], _syncScreenShareStreamInfosDecs = [_mobx.action, _mobx.action.bound], _releaseDecs = [_mobx.action, _mobx.action.bound], _startShareScreenDecs = [_mobx.action, _mobx.action.bound], _handleShareStartWithAudioDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__PURE__*/function () {
-  function FcrUIScreenShareProviderImpl(_deviceProvider, _eventProvider, _roomProvider, _sharingProvider, _sharedScreenShareSharedDataSource, _sharedMemberDataSource) {
+  function FcrUIScreenShareProviderImpl(_deviceProvider, _eventProvider, _roomProvider, _sharingProvider, _sharedScreenShareSharedDataSource, _sharedMemberDataSource, _privilegeProvider) {
     var _this = this,
       _this$_roomProvider$c,
       _this$_roomProvider$c2,
@@ -126,6 +129,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     this._sharingProvider = _sharingProvider;
     this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
     this._sharedMemberDataSource = _sharedMemberDataSource;
+    this._privilegeProvider = _privilegeProvider;
     this._sharingControl = (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.getSharingControl();
     this._streamControl = (_this$_roomProvider$c2 = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c2 === void 0 ? void 0 : _this$_roomProvider$c2.getStreamControl();
     (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.addObserver(this._streamObserver);
@@ -259,17 +263,28 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 0:
               this._sharedScreenShareSharedDataSource.setLocalUserScreenSharingState(state);
               if (!(state === _fcrCore.FcrMediaSourceState.OPEN)) {
-                _context.next = 2;
+                _context.next = 3;
                 break;
               }
-              _context.next = 1;
-              return this.createScreenShareWithSelectionId(this.currentShareId, this.currentSelectionBounds);
+              if (this._privilegeProvider.hasStartScreenSharePermission()) {
+                _context.next = 1;
+                break;
+              }
+              this._eventProvider.sendEvent(_constant.FcrUIAction.SHOW_TOAST, {
+                type: 'error',
+                message: (0, _i18n.transI18n)('fmt_screenshare_cohost_can_not_share_remind')
+              });
+              this.stop();
+              return _context.abrupt("return");
             case 1:
+              _context.next = 2;
+              return this.createScreenShareWithSelectionId(this.currentShareId, this.currentSelectionBounds);
+            case 2:
               streamId = _context.sent;
               if (streamId) {
                 this._sharedScreenShareSharedDataSource.setCurrentShareStreamId(streamId);
               }
-            case 2:
+            case 3:
               if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
                 (_this$screenTrack = this.screenTrack) === null || _this$screenTrack === void 0 || _this$screenTrack.removeObserver(this._screenCaptureObserver);
                 this._isReplaceScreen ? this._stopScreenTrack() : this.stop();
@@ -280,7 +295,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                 this.setShareLock(false);
                 this._isReplaceScreen = false;
               }
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -493,7 +508,8 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }, {
     key: "_syncShareStreamState",
     value: function _syncShareStreamState() {
-      if (this._sharedScreenShareSharedDataSource.localUserScreenSharingState !== _fcrCore.FcrMediaSourceState.OPEN) {
+      var _this$_sharedScreenSh;
+      if (this._sharedScreenShareSharedDataSource.localUserScreenSharingState !== _fcrCore.FcrMediaSourceState.OPEN && ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) === this.localUserId) {
         this._hasStop = false;
         this.stop();
       }
@@ -665,7 +681,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               this.toggleScreenshareWithAudio(withAudio);
               screenTrack = this._deviceProvider.getScreenTrack(id);
               this.setScreenTrack(screenTrack);
-              this.logger.info('screen-share-provider: start share screen with track start');
+              this.logger.info("[screen-share-provider]: start share screen with track start, excludeWindows: ".concat(JSON.stringify(excludeWindows)));
               (_this$screenTrack3 = this.screenTrack) === null || _this$screenTrack3 === void 0 || _this$screenTrack3.addObserver(this._screenCaptureObserver);
               (_this$screenTrack4 = this.screenTrack) === null || _this$screenTrack4 === void 0 || _this$screenTrack4.start(type, {
                 withAudio: withAudio,
@@ -742,46 +758,29 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "_getExcludeWindows",
     value: function () {
       var _getExcludeWindows2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-        var excludeWindows;
+        var excludeWindows, windowNames;
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               excludeWindows = [];
+              windowNames = [];
               _context5.next = 1;
               return (0, _tools.waitUntil)(function () {
-                var _getControlBarMediaSo, _getVideoWindowMediaS, _getAnnotationMediaSo, _getAnnotationMediaSo2;
-                var windowId = (_getControlBarMediaSo = (0, _rendererEvent.getControlBarMediaSourceId)()) !== null && _getControlBarMediaSo !== void 0 ? _getControlBarMediaSo : '';
-                var _windowId$split = windowId.split(':'),
-                  _windowId$split2 = (0, _slicedToArray2["default"])(_windowId$split, 2),
-                  videoWindowId = _windowId$split2[1];
-                if (videoWindowId && !excludeWindows.includes(videoWindowId)) {
-                  excludeWindows.push(videoWindowId);
-                }
-                windowId = (_getVideoWindowMediaS = (0, _rendererEvent.getVideoWindowMediaSourceId)()) !== null && _getVideoWindowMediaS !== void 0 ? _getVideoWindowMediaS : '';
-                var _windowId$split3 = windowId.split(':'),
-                  _windowId$split4 = (0, _slicedToArray2["default"])(_windowId$split3, 2),
-                  controlBarWindowId = _windowId$split4[1];
-                if (controlBarWindowId && !excludeWindows.includes(controlBarWindowId)) {
-                  excludeWindows.push(controlBarWindowId);
-                }
-                windowId = (_getAnnotationMediaSo = (0, _rendererEvent.getAnnotationMediaSourceId)('Annotation')) !== null && _getAnnotationMediaSo !== void 0 ? _getAnnotationMediaSo : '';
-                var _windowId$split5 = windowId.split(':'),
-                  _windowId$split6 = (0, _slicedToArray2["default"])(_windowId$split5, 2),
-                  annotationWindowId = _windowId$split6[1];
-                if (annotationWindowId && !excludeWindows.includes(annotationWindowId)) {
-                  excludeWindows.push(annotationWindowId);
-                }
-                windowId = (_getAnnotationMediaSo2 = (0, _rendererEvent.getAnnotationMediaSourceId)('Annotation tool bar')) !== null && _getAnnotationMediaSo2 !== void 0 ? _getAnnotationMediaSo2 : '';
-                var _windowId$split7 = windowId.split(':'),
-                  _windowId$split8 = (0, _slicedToArray2["default"])(_windowId$split7, 2),
-                  annotationToolWindowId = _windowId$split8[1];
-                if (annotationToolWindowId && !excludeWindows.includes(annotationToolWindowId)) {
-                  excludeWindows.push(annotationToolWindowId);
-                }
-                return !!videoWindowId && !!controlBarWindowId;
+                var windowsIds = (0, _rendererEvent.getMediaSourcesIdByTitle)(['Control Bar', 'Video Window', 'Annotation', 'Annotation tool bar']);
+                windowsIds === null || windowsIds === void 0 || windowsIds.forEach(function (windowInfo) {
+                  var windowName = windowInfo.windowName,
+                    windowId = windowInfo.windowId;
+                  if (windowId && !excludeWindows.includes(windowId)) {
+                    excludeWindows.push(windowId);
+                  }
+                  if (windowName && !windowNames.includes(windowName)) {
+                    windowNames.push(windowName);
+                  }
+                });
+                return windowNames.includes('Control Bar') && windowNames.includes('Video Window');
               }, 'control bar is open');
             case 1:
-              this.logger.info('exclude win:', JSON.stringify(excludeWindows));
+              this.logger.info("[screen-share-provider] windowNames: ".concat(JSON.stringify(windowNames), ", excludeWindows: ").concat(JSON.stringify(excludeWindows)));
               return _context5.abrupt("return", excludeWindows);
             case 2:
             case "end":

package/lib/providers/sharing-provider.d.ts

@@ -1,6 +1,9 @@
 import { FcrScreenSharingState, FcrSharingControl, FcrWhiteboardState } from 'fcr-core/lib/room-control/sharing-control/type';
 import { FcrScreenStreamCreateConfig } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrUserControl } from 'fcr-core/lib/type';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+import { FcrUIWhiteboardProvider } from './whiteboard-provider';
 export interface FcrUISharingProvider {
     get screenSharingOwnerId(): string;
     get whiteboardOwnerId(): string;
@@ -17,6 +20,9 @@ export interface FcrUISharingProvider {
 export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
     private _sharingControl;
     private _sharedScreenShareSharedDataSource;
+    private _sharedWhiteboardDataSource;
+    private _whiteboardProvider;
+    private _userControl;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observer;
     accessor screenSharingOwnerId: string;
@@ -24,7 +30,7 @@ export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
     accessor screenSharingState: FcrScreenSharingState;
     accessor whiteboardState: FcrWhiteboardState;
     get isSeizeStream(): boolean;
-    constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource);
+    constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource, _whiteboardProvider: FcrUIWhiteboardProvider, _userControl: FcrUserControl);
     startScreenSharing(config: FcrScreenStreamCreateConfig): void;
     startWhiteboard(): void;
     updateScreenSharing(enableAnnotation: boolean): void;

package/lib/providers/sharing-provider.js

@@ -37,7 +37,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISharingProviderImpl = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.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");
@@ -71,7 +74,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/function () {
-  function FcrUISharingProviderImpl(_sharingControl, _sharedScreenShareSharedDataSource) {
+  function FcrUISharingProviderImpl(_sharingControl, _sharedScreenShareSharedDataSource, _sharedWhiteboardDataSource, _whiteboardProvider, _userControl) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharingProviderImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
@@ -88,8 +91,21 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
       onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
         _this.whiteboardOwnerId = ownerId;
         _this.whiteboardState = _type.FcrWhiteboardState.START;
+        var owner = _this._userControl.getUser(ownerId);
+        if (owner) {
+          _this._sharedWhiteboardDataSource.setSharingUser(owner);
+        }
+        var background = _this._whiteboardProvider.backgroundColor;
+        if (background) {
+          _this._sharedWhiteboardDataSource.setBackgroundColor(background);
+        }
+        _this.logger.info("[sharing-provider]: onWhiteboardStarted ".concat(ownerId, ", ").concat(JSON.stringify(operatorUser), ", backgroundColor: ").concat(_this._whiteboardProvider.backgroundColor));
       },
       onWhiteboardEnded: function onWhiteboardEnded(reason, operatorUser) {
+        _this._sharedWhiteboardDataSource.setJoinSuccess(false);
+        _this._sharedWhiteboardDataSource.setShowLoading(true);
+        _this._sharedWhiteboardDataSource.inActive();
+        _this.logger.info("[sharing-provider]: onWhiteboardEnded, joinSuccess: ".concat(_this._sharedWhiteboardDataSource.joinSuccess));
         _this.whiteboardState = _type.FcrWhiteboardState.END;
       }
     });
@@ -99,9 +115,22 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
     _classPrivateFieldInitSpec(this, _D, _init_whiteboardState(this, _type.FcrWhiteboardState.END));
     this._sharingControl = _sharingControl;
     this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
-    // @ts-ignore
-    // this._sharingControl.getToken();
+    this._sharedWhiteboardDataSource = _sharedWhiteboardDataSource;
+    this._whiteboardProvider = _whiteboardProvider;
+    this._userControl = _userControl;
     this._sharingControl.addObserver(this._observer);
+    this.screenSharingState = this._sharingControl.getScreenSharingState();
+    this.whiteboardState = this._sharingControl.getWhiteboardState();
+    if (this.screenSharingState !== _type.FcrScreenSharingState.END) {
+      var _this$_sharedScreenSh;
+      this.screenSharingOwnerId = ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) || '';
+    }
+    if (this.whiteboardState === _type.FcrWhiteboardState.START) {
+      this.whiteboardOwnerId = this._sharingControl.getBoardControl().getOwnerId();
+    }
+
+    // @ts-ignore
+    window._sharingProvider = this;
   }
   return (0, _createClass2["default"])(FcrUISharingProviderImpl, [{
     key: "screenSharingOwnerId",

package/lib/providers/whiteboard-provider.d.ts

@@ -0,0 +1,24 @@
+import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
+import { FcrConnectionState, FcrUserControl, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+export interface FcrUIWhiteboardProvider {
+    get backgroundColor(): string;
+    get isActive(): boolean;
+    get connectionState(): FcrConnectionState;
+    get ownerUser(): FcrUserInfo | undefined;
+    setBackground: (color: string) => void;
+}
+export declare class FcrUIWhiteboardProviderImpl implements FcrUIWhiteboardProvider {
+    private _whiteboardControl;
+    private _sharedWhiteboardDataSource;
+    private _userControl;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _ownerUser;
+    private _whiteboardObserver;
+    get backgroundColor(): string;
+    get isActive(): boolean;
+    get connectionState(): FcrConnectionState;
+    get ownerUser(): FcrUserInfo | undefined;
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource, _userControl: FcrUserControl);
+    setBackground(color: string): void;
+}

package/lib/providers/whiteboard-provider.js

@@ -0,0 +1,127 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.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.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.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
+});
+exports.FcrUIWhiteboardProviderImpl = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+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 _base = require("../base");
+var _logger = require("../utilities/logger");
+var _decorator = require("agora-foundation/lib/decorator");
+var _FcrUIWhiteboardProviderImpl;
+var _initProto;
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var FcrUIWhiteboardProviderImpl = exports.FcrUIWhiteboardProviderImpl = /*#__PURE__*/function () {
+  function FcrUIWhiteboardProviderImpl(_whiteboardControl, _sharedWhiteboardDataSource, _userControl) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUIWhiteboardProviderImpl);
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIWhiteboardProvider'
+    })));
+    (0, _defineProperty2["default"])(this, "_whiteboardObserver", {
+      onBackgroundColorUpdated: function onBackgroundColorUpdated(color) {
+        _this.logger.info("[whiteboard-provider]: onBackgroundColorUpdated ".concat(color));
+        _this._sharedWhiteboardDataSource.setBackgroundColor(color);
+      },
+      onActive: function onActive(ownerId, operatorUser) {
+        _this.logger.info("[whiteboard-provider]: onActive ".concat(ownerId, ", ").concat(JSON.stringify(operatorUser)));
+        var owner = _this._userControl.getUser(ownerId);
+        _this._sharedWhiteboardDataSource.setSharingUser(owner);
+        _this._ownerUser = owner;
+      },
+      onInactive: function onInactive(reason, operatorUser) {
+        _this.logger.info("[whiteboard-provider]: onInactive ".concat(reason, ", ").concat(JSON.stringify(operatorUser)));
+      },
+      onConnectionStateUpdated: function onConnectionStateUpdated(state) {
+        _this.logger.info("[whiteboard-provider]: onConnectionStateUpdated ".concat(state));
+      }
+    });
+    this._whiteboardControl = _whiteboardControl;
+    this._sharedWhiteboardDataSource = _sharedWhiteboardDataSource;
+    this._userControl = _userControl;
+    _whiteboardControl.addObserver(this._whiteboardObserver);
+  }
+  return (0, _createClass2["default"])(FcrUIWhiteboardProviderImpl, [{
+    key: "backgroundColor",
+    get: function get() {
+      var bgColor = this._whiteboardControl.getBackgroundColor();
+      if (!bgColor) {
+        return '#ffffff';
+      }
+      return bgColor;
+    }
+  }, {
+    key: "isActive",
+    get: function get() {
+      var isActive = this._whiteboardControl.getActivity();
+      return isActive;
+    }
+  }, {
+    key: "connectionState",
+    get: function get() {
+      return this._whiteboardControl.getConnectionState();
+    }
+  }, {
+    key: "ownerUser",
+    get: function get() {
+      return this._ownerUser;
+    }
+  }, {
+    key: "setBackground",
+    value: function setBackground(color) {
+      var _this$_whiteboardCont;
+      (_this$_whiteboardCont = this._whiteboardControl) === null || _this$_whiteboardCont === void 0 || _this$_whiteboardCont.setBackgroundColor(color);
+    }
+  }]);
+}();
+_FcrUIWhiteboardProviderImpl = FcrUIWhiteboardProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIWhiteboardProviderImpl, [[_decorator.bound, 2, "setBackground"]], []).e, 1);
+_initProto = _applyDecs$e[0];
+(0, _base.registerDependency)('whiteboardProvider');

package/lib/runtime.d.ts

@@ -38,6 +38,7 @@ declare global {
         dom: Element,
         browserWindow: Electron.BrowserWindow,
         newRendererWindow: Window,
+        baseUrl: string,
       ) => void,
       windowOptions: import('electron').BrowserWindowConstructorOptions,
     ): void;

package/lib/scenes/main-scene.d.ts

@@ -38,6 +38,9 @@ import { FcrUIApplistProvider } from '../providers/app-list-provider';
 import { FcrUISharedApplistSourceImpl } from '../shared-data-source/app-list-data';
 import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
 import { FcrUISharedAnnotationSource } from '../shared-data-source/annotation-data';
+import { FcrUIMultiDisplayProvider } from '../providers/multi-display-provider';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+import { FcrUIWhiteboardProvider } from '../providers/whiteboard-provider';
 export type FcrMainUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -84,6 +87,8 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     annotationProvider: FcrUIAnnotationProvider;
     sharingProvider: FcrUISharingProvider;
     applistProvider: FcrUIApplistProvider;
+    multiDisplayProvider: FcrUIMultiDisplayProvider;
+    whiteboardProvider: FcrUIWhiteboardProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
@@ -101,6 +106,7 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     sharedApplistDataSource: FcrUISharedApplistSourceImpl;
     sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+    sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource;
     private _isWaitingRoomNotify;
     constructor(args: FcrMainUISceneArgs);
     private _addObservers;